1ecde2b · 01d8937 · ef9a70f · 72f2ccb · f270d86 · d62951f
@@ -283,8 +283,10 @@
flag exists only in the stdio dev runner and is never reachable over SSH.
  records each name), so two pulls' migrations land in either order, and a
  database with one this build does not know boots and names it. Never edit
  an existing migration — an edited one is a new one and runs again; once
  pinned in `core/migration-pins.json` (`bun scripts/pin-migrations.ts`, run
  by the release agent, never by a pull) the schema test fails on an edit. It must only add
  pinned the schema test fails on an edit: the pull that adds a migration
  runs `bun scripts/pin-migrations.ts` and commits the one file it writes,
  `core/migration-pins/<name>.pin` (`core/migration-pins.json` is the frozen
  older pins); the release never touches pins. A migration must only add
      
        sentinelcrew
        18d ago
        outdated
      
      Nit: after "the release never touches pins." the following "It must only add" reads as if it refers to the release. It meant the migration. Consider "A migration must only add".
    
  (`test/schema-additive.test.ts`). A release is an annotated tag whose
  message is its record (`bun scripts/cut-release.ts <version> --tag`,
  read by `release/shipped.ts`); no pull and no release touches
@@ -1,33 +1,41 @@
/**
 * `bun scripts/pin-migrations.ts`: pin every migration in
 * `src/core/migrations/` that `src/core/migration-pins.json` does not
 * name yet, by its id (`migrationId`). An existing pin is never rewritten:
 * once pinned, a migration's text is history, and
 * `test/schema-migrations.test.ts` fails if it changes (#783).
 * `src/core/migrations/` that is not pinned yet, as its own file
 * `src/core/migration-pins/<name>.pin` holding its id (`migrationId`).
 * An existing pin is never rewritten: once pinned, a migration's text is
 * history, and `test/schema-migrations.test.ts` fails if it changes (#783).
 *
 * The release agent runs it, never a pull, so two pulls adding a
 * migration each never meet in the file. The release record itself is a
 * tag and moves no branch (`scripts/cut-release.ts`).
 * The pull that adds a migration runs this and commits the pin beside it.
 * One file per migration means parallel pulls never meet in a shared file,
 * and nothing commits to main at release time (#6646). The release record
 * itself is a tag and moves no branch (`scripts/cut-release.ts`).
 * `src/core/migration-pins.json` is the frozen pins from before.
 */
import { readFileSync, writeFileSync } from "node:fs";
import { join } from "node:path";
import { migrationFiles } from "../src/core/schema.ts";
import { type MigrationPins, pinBreaks, pinned } from "../src/kernel/migrate.ts";
import {
  type MigrationPins,
  migrationId,
  pinBreaks,
  readPins,
} from "../src/kernel/migrate.ts";
const file = join(import.meta.dir, "../src/core/migration-pins.json");
const pins = JSON.parse(readFileSync(file, "utf8")) as MigrationPins;
const core = join(import.meta.dir, "../src/core");
const legacy = JSON.parse(readFileSync(join(core, "migration-pins.json"), "utf8")) as MigrationPins;
const dir = join(core, "migration-pins");
const pins = readPins(dir, legacy);
const breaks = pinBreaks(migrationFiles, pins);
if (breaks.length > 0) {
  for (const line of breaks) console.error(`pin-migrations: ${line}`);
  process.exit(1);
}
      
        sentinelcrew
        18d ago
        outdated
      
      This replaces pinned(), which now has no non-test caller in src/kernel/migrate.ts. Delete it and its tests, or use it here.
    
const next = pinned(migrationFiles, pins);
const added = Object.keys(next).filter((name) => !(name in pins));
writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`);
const added = migrationFiles.filter((m) => !(m.name in pins));
for (const m of added) writeFileSync(join(dir, `${m.name}.pin`), `${migrationId(m.sql)}\n`);
      
        sentinelcrew
        18d ago
        
      
      Low: nothing tests this write path. A small test could run the script on a temporary core directory, or this line could be pulled into a pure pinFiles(files, pins) that returns [path, text] pairs, and it would cover the .pin naming and content that readPins later relies on.
    
// CLI answer for the person at the terminal.
console.log(
  added.length === 0
    ? "pin-migrations: every migration is already pinned"
    : `pin-migrations: pinned ${added.join(", ")}`,
    : `pin-migrations: pinned ${added.map((m) => m.name).join(", ")}`,
);
@@ -0,0 +1,1 @@
3f18731f13df744c3ca48127e79827c95d721dc3bbd1d5814ce3b8c597b1d1f8
@@ -0,0 +1,1 @@
5757b81a1e0aa6a5c81b414c5951fcedfab43e558acf13f4e598b425f25c8c38
@@ -0,0 +1,1 @@
bf4729c0ef2aa1f977e6f9c587c9a75684a73e6f5a65e408f2a77a78ff14daa9
@@ -0,0 +1,1 @@
a22e6e8a1cf7463d9028d7603ed4ca52576f82dde6bfa61fbb8051d59ff90a7e
@@ -0,0 +1,1 @@
c3c7a15ef0ae42ee8a79b480eaf882076f0b1f4a2714e1a3e09f695e2315d8be
@@ -0,0 +1,1 @@
84dd42203e143cec7cb4d7a413aacd2c32099e82ef481a0ff9472b5e0e74fd41
@@ -0,0 +1,1 @@
2434275b464e0e83d7c0fda92949ff9697579cdd3ff443633eb3a4ee7ca7d94f
@@ -0,0 +1,1 @@
d8a75be36c8fe1ca1eafc3de355873336ae0503b38e85753e3bcef4cdc27be70
@@ -0,0 +1,1 @@
984f36a2285b39c038a87369d6c81d0ae7f6fde0156fec5db3e1e15a09055db4
@@ -0,0 +1,1 @@
b057087f7346f7ed7e156af7841be4f8fd0a7f121d4d4a3906554da139a30b93
@@ -0,0 +1,1 @@
09a9251efc56caf58661a606b3217639056ea3dca294d6c49412444fe1396a5a
@@ -0,0 +1,1 @@
99ce32c0dd714006403ede235f4d1fbe4cab54860e0ac8421a068cfe7bfd17a9
@@ -0,0 +1,1 @@
f8b27b72ef7a17a361a1d7b6c28d1d3ff7484e3b043edf896b718f811ab50822
@@ -0,0 +1,1 @@
b69e9d3a78bbfd87d3962817de5456e066b07473fdb897aac0984187666431d1
@@ -0,0 +1,1 @@
e0929ff22611bd6f9d152d311b02b1f389af38e0fc2df045e3d1764182603bbe
@@ -0,0 +1,1 @@
6bfe2d3c402da68827e26f5a8d330086bfa9d111ff8463d94fe5e60ef4e8d976
@@ -0,0 +1,1 @@
53b4531f571bd5e51a04380c6f7a40bd23665f194131e74fe86b761f7d424ae6
@@ -0,0 +1,1 @@
c4daa4de89b981e655fa3ca3808f755682e27081c3d5e4425f93869302c85e47
@@ -0,0 +1,1 @@
ba98b5800fc060727013e01994ba36a6df8db10b1d5ec107119311f10d6df0bb
@@ -0,0 +1,1 @@
d92914e16b21da7fdb388925428b59a89137976bcf9d61a527fac2d1ff439394
@@ -0,0 +1,1 @@
e23b5399e7e3dcf527e7988b345ccc62b85520c2eb78423fa34dc284fea9a137
@@ -0,0 +1,1 @@
803f4f754a85a2d766f87529512dd31cb34a01486491886d31e1d83bcb7eeabe
@@ -0,0 +1,1 @@
2509b10b0408df4e88af1e5046bed9017b06dbb03cfdf3ebc337a5a1c753f8c3
@@ -0,0 +1,1 @@
11568c875c9394ec16a6a935072cf29ea76f0c52c5be37139b3696a2ba698546
@@ -0,0 +1,1 @@
2de9998e760be62a5bc1b237c8439f63883d15d306493ffd44e040f8d2f2fa4e
@@ -0,0 +1,1 @@
45fd4c236c1fee0dcf0f2b107d36f851aecea9bd50f110241a6101841a1da551
@@ -0,0 +1,1 @@
96aaf03e67f6e7290cabe77e25fcc8ad8af5f91227195a544bb3bb63ac82f530
@@ -0,0 +1,1 @@
1826e2542eef31019a656e15fe68d6a9c33f3697dc78bb215fe0eb0d68e1fa8a
@@ -0,0 +1,1 @@
fed85e1907538d33a9307866c2f0f375371ffc1a507112e5c72709eabc7a64ce
@@ -0,0 +1,1 @@
d243581b876543707589b59de585d360054c9c671f5c2b1ca230126f4f208939
@@ -0,0 +1,1 @@
45f989a67b7c0223f1e7bee9c6cde30e0a9e2d567737f7cbf0866e09e6342b43
@@ -0,0 +1,1 @@
c688381bbf55aa366272d2caa90671e593b6fc914c8316ab3ed8e37f0650b6f1
@@ -0,0 +1,1 @@
931197e3c618fc90130d7de09001595e4f640f8d06d7cb42778ecad6be3ffd72
@@ -0,0 +1,1 @@
03775f3b8c539a002bb2359a4a693d9b4c7b60f913dd7f3302ff72261018cfa6
@@ -1,5 +1,5 @@
{
  "note": "The releases cut before #6642, newest first, and frozen: nothing adds to this file. A release since is an annotated tag `v<version>` on the forge's own repository whose message is its record, `{ \"version\", \"migrations\", \"ids\" }` (`bun scripts/cut-release.ts <version>` writes it; src/release/shipped.ts reads both). `migrations` counts the migration ids a release applied, and `ids` names the stamped ones among them, every file past 0090 by its name without .ts; a release from before #1837 has a count only: the first that many numbered files. test/schema-additive.test.ts holds every migration not in both of the two newest releases here to additive (notAdditive in src/kernel/migrate.ts).",
  "note": "The releases cut before #6642, newest first, and frozen: nothing adds to this file. A release since is an annotated tag `v<version>` on the forge's own repository whose message is its record, `{ \"version\", \"migrations\", \"ids\" }` (`bun scripts/cut-release.ts <version>` writes it; src/release/shipped.ts reads both). `migrations` counts the migration ids a release applied, and `ids` names the stamped ones among them, every file past 0090 by its name without .ts; a release from before #1837 has a count only: the first that many numbered files. test/schema-additive.test.ts holds every migration not in both of the two newest releases here to additive (notAdditive in src/kernel/migrate.ts). Pins are not the release's: each pull pins its own migration (`bun scripts/pin-migrations.ts`, src/core/migration-pins/).",
  "releases": [
    {
      "version": "0.7.271",
@@ -10,8 +10,8 @@
 * (`date -u +%Y%m%d%H%M%S`, e.g. `20261015093000-deploy-notes.ts`), so two
 * pulls that each add one add two files and never touch the same line
 * (#1837). Each file is one `export default` of SQL. The database records
 * each applied one by name (#783); `migration-pins.json` holds what each
 * said when it was released, and a test fails if one says something else.
 * each applied one by name (#783); `migration-pins/` (one file each, written by the
 * pull that adds it) and `migration-pins.json` (older) hold what each said, and a test fails if one says something else.
 */
import type { Database } from "bun:sqlite";
@@ -26,7 +26,7 @@
 */
import type { Database } from "bun:sqlite";
import { readdirSync } from "node:fs";
import { readdirSync, readFileSync } from "node:fs";
import { join } from "node:path";
import { defect } from "./error.ts";
import { sha256 } from "./hash.ts";
@@ -81,6 +81,28 @@
export function migrationId(sql: string): string {
/** Each pinned migration's id, by name: what it said when it was pinned. */
export type MigrationPins = Readonly<Record<string, string>>;
/**
 * Every pin: `legacy` (the one file that held them all, now frozen) and one
 * `<name>.pin` file in `dir` per migration since, holding its id. The pull
 * that adds a migration adds its pin file, so pins never meet in a shared
 * file and never wait for a release.
 */
export function readPins(dir: string, legacy: MigrationPins): MigrationPins {
  const all: Record<string, string> = { ...legacy };
  for (const file of readdirSync(dir).sort()) {
      
        sentinelcrew
        18d ago
        
      
      Good: refusing a .pin for a name already in the frozen JSON keeps the frozen list frozen. It also stops the two sources from disagreeing about one migration, where one would silently win.
    
    if (!file.endsWith(".pin"))
      defect("db.migration_name", `${file} in ${dir} is not <name>.pin`);
    const name = file.slice(0, -".pin".length);
    if (name in legacy)
      defect("db.pin_repinned", `${file} would re-pin ${name}, which is already pinned`);
      
        sentinelcrew
        18d ago
        outdated
      
      Nit: db.migration_missing is the wrong code here. The migration isn't missing, its pin is malformed.
    
      
        sentinelcrew
        18d ago
        
      
      Good: this closes the hole where a .pin could silently override a frozen pin. One gap remains, as the pull says: a pull that edits both a migration and its .pin still passes. Review is the guard for that, as it was with the JSON.
    
    const id = readFileSync(join(dir, file), "utf8").trim();
      
        sentinelcrew
        18d ago
        outdated
      
      A .pin here overwrites a legacy pin of the same name. That re-pins an edited frozen migration without touching migration-pins.json. Raise a defect when the name is already in legacy, and add a test for it.
    
    if (!/^[0-9a-f]{64}$/.test(id))
      defect("db.pin_malformed", `${file} does not hold a sha256 id`);
    all[name] = id;
  }
  return all;
}
/**
 * How `files` differ from what was pinned: one line for each pinned
 * migration whose text says something else now, or that is gone. A
@@ -102,22 +124,6 @@
export function pinBreaks(
  return breaks;
}
/**
 * `pins` with every migration in `files` it lacks added; a pin already
 * there is never rewritten. Sorted by name, so the file it is written to
 * changes only where a migration was added.
 */
export function pinned(
  files: readonly MigrationFile[],
  pins: MigrationPins,
): MigrationPins {
  const next: Record<string, string> = { ...pins };
  for (const m of files) next[m.name] ??= migrationId(m.sql);
  return Object.fromEntries(
    Object.entries(next).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)),
  );
}
/**
 * A migration as `migrate` takes it: its file, which names it, or bare SQL —
 * a test's own list — which is known by its position alone.
@@ -29,13 +29,15 @@
import {
  migrate,
  migrationId,
  pinBreaks,
  pinned,
  readMigrations,
  readPins,
  statements,
} from "../src/kernel/migrate.ts";
import { migrationFiles, migrations, NUMBERED } from "../src/core/schema.ts";
import { failureReason } from "../src/apps/process.ts";
import pins from "../src/core/migration-pins.json" with { type: "json" };
import legacyPins from "../src/core/migration-pins.json" with { type: "json" };
const pins = readPins(join(import.meta.dir, "../src/core/migration-pins"), legacyPins);
const root = mkdtempSync(join(tmpdir(), "forge-schema-"));
afterAll(() => rmSync(root, { recursive: true, force: true }));
@@ -425,8 +427,22 @@
describe("a migration on main is never edited (#783)", () => {
    expect(pinBreaks(migrationFiles, pins)).toEqual([]);
  });
  test("every numbered migration is pinned", () => {
    for (const m of migrationFiles.slice(0, NUMBERED)) expect(Object.hasOwn(pins, m.name)).toBe(true);
  test("every migration is pinned by its own pull: run bun scripts/pin-migrations.ts", () => {
    const missing = migrationFiles.filter((m) => !Object.hasOwn(pins, m.name)).map((m) => m.name);
    expect(missing).toEqual([]);
  });
  test("pin files are read beside the frozen list, and a bad one is a defect", () => {
    const dir = join(root, "pins");
    mkdirSync(dir);
    const id = migrationId("CREATE TABLE a (x INTEGER)");
    writeFileSync(join(dir, "20261015110000-a.pin"), `${id}\n`);
    expect(readPins(dir, { "0001-x": "f".repeat(64) })).toEqual({ "0001-x": "f".repeat(64), "20261015110000-a": id });
    writeFileSync(join(dir, "20261015120000-b.pin"), "nope");
    expect(() => readPins(dir, {})).toThrow(ForgeError);
    // A pin file cannot re-pin a frozen migration.
    rmSync(join(dir, "20261015120000-b.pin"));
    expect(() => readPins(dir, { "20261015110000-a": "f".repeat(64) })).toThrow(ForgeError);
  });
  test("an edit after its pin is named, a removal too; re-indenting is not an edit", () => {
@@ -434,7 +450,7 @@
describe("a migration on main is never edited (#783)", () => {
      { name: "20261015110000-a", sql: "CREATE TABLE a (x INTEGER)" },
      { name: "20261015120000-b", sql: "CREATE TABLE b (y INTEGER)" },
    ];
    const pin = pinned(files, {});
    const pin = Object.fromEntries(files.map((f) => [f.name, migrationId(f.sql)]));
    expect(pinBreaks(files, pin)).toEqual([]);
    expect(pinBreaks([files[0]!, { name: "20261015120000-b", sql: "CREATE TABLE b (y TEXT)" }], pin)).toEqual([
      "20261015120000-b was edited after it was pinned — add a new migration instead",
@@ -443,14 +459,4 @@
describe("a migration on main is never edited (#783)", () => {
    expect(pinBreaks([{ name: "20261015110000-a", sql: "\n  CREATE TABLE a\n    (x INTEGER)\n" }, files[1]!], pin)).toEqual([]);
  });
  test("pinning adds what is new and never rewrites a pin", () => {
    const a = { name: "20261015110000-a", sql: "CREATE TABLE a (x INTEGER)" };
    const b = { name: "20261015120000-b", sql: "CREATE TABLE b (y INTEGER)" };
    const pin = pinned([b], {});
    const edited = { ...b, sql: "CREATE TABLE b (y TEXT)" };
    const next = pinned([a, edited], pin);
    expect(Object.keys(next)).toEqual([a.name, b.name]);
    expect(next[b.name]).toBe(pin[b.name]!);
    expect(next[a.name]).toBe(migrationId(a.sql));
  });
});
		@@ -283,8 +283,10 @@ flag exists only in the stdio dev runner and is never reachable over SSH.
283	283	records each name), so two pulls' migrations land in either order, and a
284	284	database with one this build does not know boots and names it. Never edit
285	285	an existing migration — an edited one is a new one and runs again; once
286		pinned in `core/migration-pins.json` (`bun scripts/pin-migrations.ts`, run
287		by the release agent, never by a pull) the schema test fails on an edit. It must only add
	286	pinned the schema test fails on an edit: the pull that adds a migration
	287	runs `bun scripts/pin-migrations.ts` and commits the one file it writes,
	288	`core/migration-pins/<name>.pin` (`core/migration-pins.json` is the frozen
	289	older pins); the release never touches pins. A migration must only add
		sentinelcrew 18d ago outdated Nit: after "the release never touches pins." the following "It must only add" reads as if it refers to the release. It meant the migration. Consider "A migration must only add".
288	290	(`test/schema-additive.test.ts`). A release is an annotated tag whose
289	291	message is its record (`bun scripts/cut-release.ts <version> --tag`,
290	292	read by `release/shipped.ts`); no pull and no release touches
		@@ -1,33 +1,41 @@
1	1	/**
2	2	* `bun scripts/pin-migrations.ts`: pin every migration in
3		* `src/core/migrations/` that `src/core/migration-pins.json` does not
4		* name yet, by its id (`migrationId`). An existing pin is never rewritten:
5		* once pinned, a migration's text is history, and
6		* `test/schema-migrations.test.ts` fails if it changes (#783).
	3	* `src/core/migrations/` that is not pinned yet, as its own file
	4	* `src/core/migration-pins/<name>.pin` holding its id (`migrationId`).
	5	* An existing pin is never rewritten: once pinned, a migration's text is
	6	* history, and `test/schema-migrations.test.ts` fails if it changes (#783).
7	7	*
8		* The release agent runs it, never a pull, so two pulls adding a
9		* migration each never meet in the file. The release record itself is a
10		* tag and moves no branch (`scripts/cut-release.ts`).
	8	* The pull that adds a migration runs this and commits the pin beside it.
	9	* One file per migration means parallel pulls never meet in a shared file,
	10	* and nothing commits to main at release time (#6646). The release record
	11	* itself is a tag and moves no branch (`scripts/cut-release.ts`).
	12	* `src/core/migration-pins.json` is the frozen pins from before.
11	13	*/
12	14
13	15	import { readFileSync, writeFileSync } from "node:fs";
14	16	import { join } from "node:path";
15	17	import { migrationFiles } from "../src/core/schema.ts";
16		import { type MigrationPins, pinBreaks, pinned } from "../src/kernel/migrate.ts";
	18	import {
	19	type MigrationPins,
	20	migrationId,
	21	pinBreaks,
	22	readPins,
	23	} from "../src/kernel/migrate.ts";
17	24
18		const file = join(import.meta.dir, "../src/core/migration-pins.json");
19		const pins = JSON.parse(readFileSync(file, "utf8")) as MigrationPins;
	25	const core = join(import.meta.dir, "../src/core");
	26	const legacy = JSON.parse(readFileSync(join(core, "migration-pins.json"), "utf8")) as MigrationPins;
	27	const dir = join(core, "migration-pins");
	28	const pins = readPins(dir, legacy);
20	29	const breaks = pinBreaks(migrationFiles, pins);
21	30	if (breaks.length > 0) {
22	31	for (const line of breaks) console.error(`pin-migrations: ${line}`);
23	32	process.exit(1);
24	33	}
		sentinelcrew 18d ago outdated This replaces `pinned()`, which now has no non-test caller in `src/kernel/migrate.ts`. Delete it and its tests, or use it here.
25		const next = pinned(migrationFiles, pins);
26		const added = Object.keys(next).filter((name) => !(name in pins));
27		writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`);
	34	const added = migrationFiles.filter((m) => !(m.name in pins));
	35	for (const m of added) writeFileSync(join(dir, `${m.name}.pin`), `${migrationId(m.sql)}\n`);
		sentinelcrew 18d ago Low: nothing tests this write path. A small test could run the script on a temporary core directory, or this line could be pulled into a pure `pinFiles(files, pins)` that returns `[path, text]` pairs, and it would cover the `.pin` naming and content that `readPins` later relies on.
28	36	// CLI answer for the person at the terminal.
29	37	console.log(
30	38	added.length === 0
31	39	? "pin-migrations: every migration is already pinned"
32		: `pin-migrations: pinned ${added.join(", ")}`,
	40	: `pin-migrations: pinned ${added.map((m) => m.name).join(", ")}`,
33	41	);
		@@ -0,0 +1,1 @@
	1	3f18731f13df744c3ca48127e79827c95d721dc3bbd1d5814ce3b8c597b1d1f8
		@@ -0,0 +1,1 @@
	1	5757b81a1e0aa6a5c81b414c5951fcedfab43e558acf13f4e598b425f25c8c38
		@@ -0,0 +1,1 @@
	1	bf4729c0ef2aa1f977e6f9c587c9a75684a73e6f5a65e408f2a77a78ff14daa9
		@@ -0,0 +1,1 @@
	1	a22e6e8a1cf7463d9028d7603ed4ca52576f82dde6bfa61fbb8051d59ff90a7e
		@@ -0,0 +1,1 @@
	1	c3c7a15ef0ae42ee8a79b480eaf882076f0b1f4a2714e1a3e09f695e2315d8be
		@@ -0,0 +1,1 @@
	1	84dd42203e143cec7cb4d7a413aacd2c32099e82ef481a0ff9472b5e0e74fd41
		@@ -0,0 +1,1 @@
	1	2434275b464e0e83d7c0fda92949ff9697579cdd3ff443633eb3a4ee7ca7d94f
		@@ -0,0 +1,1 @@
	1	d8a75be36c8fe1ca1eafc3de355873336ae0503b38e85753e3bcef4cdc27be70