[repeat98]

Every Digitakt/Digitone module PR appends to the same four files:

• src/catalog/machine-modules.json
• src/community/module-changelogs.json
• vendor/elekloader/catalog/catalog.json
• vendor/elekloader/elekloader.lock.json

So when one of these PRs merges, every other open one conflicts with main and has to be repaired and regenerated by hand. That happened with #572, #574, #576 and #577.

What this adds

After a git merge main stops on those files, run npm run catalog:resolve. It:

• merges the generated module list by module, the changelog by module key, and the catalog pins by file;
• keeps main's order and appends the PR's new entries;
• recomputes the catalogue revision and the lock's catalogue hash and counts.

It runs no module code. It refuses, and leaves to a person:

• an entry both sides changed,
• any conflict in another file,
• a file whose layout on main it would reformat.

The Octatrack catalogue is left out on purpose. Its sourceRevision binds every compiled package, so two Octatrack PRs need a rebuild, not a merge.

docs/DEVELOPER_WORKFLOW.md names the command in the existing "main moved" step.

Tested

• On real PRs, in scratch worktrees:
  • Add Per-step Note Accumulator 1.1.1 for Digitakt OS 1.53 and 1.54 #574 merged onto main plus Add RAM Record and Playback 1.3.1 for Digitakt OS 1.53 and 1.54 #572: four conflicts resolved.
  • Add CC Assignment Names 2.1.1 for Digitakt OS 1.53 and 1.54 #576 merged on top of that: three conflicts resolved.
  • After each resolution, elekloader-vendor.ts (lock and catalogue hashes), the machine-modules.mjs staleness check, sdk-imports.mjs and the changelog check passed.
  • npm run modules:generate then changed nothing, so the result is what the generator would write.
• scripts/catalog-resolve.test.mjs covers ordering, derived hashes and the refusal when both sides edit one module's notes.
• npm run check -- --base origin/main passed: 285 test files, 2,328 tests.

Not included

No automatic refresh of open PRs. Pushing merge commits to authors' fork branches needs a push token stored as a secret, and that needs the owner's decision first.

🤖 Generated with Claude Code

[repeat98]

Closing without merging. #611 gave each module its own changelog file (src/community/module-changelogs/.json) and stopped committing the generated module list and the Elekloader catalogue, so three of the four files this script resolves no longer conflict between module PRs. Only vendor/elekloader/elekloader.lock.json is still shared. The branch also conflicts with main in package.json. Nothing is lost: the branch stays on origin if the lock-file case ever needs it.