resolve-migrations cannot strip registrations written before the makeMigrationFromSqlFile rename #2147

Hit while rebasing #1801, a branch based on an April 2026 commit.

Problem

server/scripts/resolve-migrations.ts matches registry entries with:

migration\d+:\s*makeMigrationFromSqlFile\(\s*'\.\/sql\/${tag}\.sql'\s*...

The helper used to be called makeKyselyMigrationFromSqlFile. Any branch written before the rename registers its migration under the old name, so entryRegex does not match it. planProvider then strips nothing, finds the result differs from the merge base, and bails:

resolve-migrations: server/src/migration/DirectMigrationProvider.ts has conflicts and this
branch changed more than its migration registrations. Resolve it by hand, keeping both sides,
then run this again.

The message is misleading — the branch had changed only its migration registration. The script just could not see it.

Workaround

Resolve DirectMigrationProvider.ts to upstream's version by hand and re-run. The script then regenerates and registers correctly.

Fix

Accept either helper name in entryRegex:

make(?:Kysely)?MigrationFromSqlFile

Worth checking whether older branches use other spellings too. Only matters for branches predating the rename, but those are exactly the ones that need this script most.