@opengsd/gsd-pi 1.5.0 → 1.6.0

package/src/resources/extensions/gsd/tests/auto-worktree-merge-already-merged.test.ts

@@ -0,0 +1,177 @@
+// gsd-pi — Regression tests for already-merged milestone cleanup safety.
+
+import { execFileSync } from "node:child_process";
+import assert from "node:assert/strict";
+import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, test } from "node:test";
+
+import {
+  finalizeAlreadyMergedMilestoneIfReachable,
+  type AlreadyMergedMilestoneRequest,
+} from "../auto-worktree-merge-already-merged.js";
+import {
+  _resetMilestoneCleanupDepsForTests,
+  _setMilestoneCleanupDepsForTests,
+} from "../auto-worktree-merge-cleanup.js";
+import { GSDError } from "../errors.js";
+
+const cleanupPaths: string[] = [];
+const initialCwd = process.cwd();
+
+beforeEach(() => {
+  _resetMilestoneCleanupDepsForTests();
+});
+
+afterEach(() => {
+  _resetMilestoneCleanupDepsForTests();
+  process.chdir(initialCwd);
+  for (const path of cleanupPaths.splice(0)) {
+    rmSync(path, { recursive: true, force: true });
+  }
+});
+
+function git(cwd: string, args: string[]): string {
+  return execFileSync("git", args, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf-8",
+  }).trim();
+}
+
+function commitFile(cwd: string, file: string, content: string, message: string): string {
+  writeFileSync(join(cwd, file), content);
+  git(cwd, ["add", file]);
+  git(cwd, ["commit", "-m", message]);
+  return git(cwd, ["rev-parse", "HEAD"]);
+}
+
+function createRepo(): string {
+  const repo = mkdtempSync(join(tmpdir(), "gsd-already-merged-"));
+  cleanupPaths.push(repo);
+  git(repo, ["init", "-b", "main"]);
+  git(repo, ["config", "user.email", "test@example.invalid"]);
+  git(repo, ["config", "user.name", "Test"]);
+  commitFile(repo, "README.md", "base\n", "initial");
+  return repo;
+}
+
+function createRegularMergedMilestone(repo: string, milestoneId = "M001"): { milestoneBranch: string } {
+  const milestoneBranch = `milestone/${milestoneId}`;
+  git(repo, ["checkout", "-b", milestoneBranch]);
+  commitFile(repo, "feature.txt", "milestone work\n", `feat: implement ${milestoneId}`);
+  git(repo, ["checkout", "main"]);
+  git(repo, ["merge", "--no-ff", milestoneBranch, "-m", `merge ${milestoneId}`]);
+  return { milestoneBranch };
+}
+
+function request(
+  repo: string,
+  milestoneBranch: string,
+  previousCwd: string,
+): AlreadyMergedMilestoneRequest {
+  return {
+    commitMessage: "merge milestone",
+    mainBranch: "main",
+    milestoneBranch,
+    milestoneId: "M001",
+    previousCwd,
+    projectRoot: repo,
+  };
+}
+
+describe("finalizeAlreadyMergedMilestoneIfReachable", () => {
+  test("returns null when the milestone branch is not reachable from integration branch", () => {
+    const repo = createRepo();
+    git(repo, ["checkout", "-b", "milestone/M001"]);
+    commitFile(repo, "feature.txt", "milestone work\n", "feat: implement M001");
+    git(repo, ["checkout", "main"]);
+
+    let cleanupCalled = false;
+    _setMilestoneCleanupDepsForTests({
+      removeWorktree: () => {
+        cleanupCalled = true;
+        return true;
+      },
+    });
+
+    const result = finalizeAlreadyMergedMilestoneIfReachable(
+      request(repo, "milestone/M001", repo),
+    );
+
+    assert.equal(result, null);
+    assert.equal(cleanupCalled, false, "unmerged branch must not be cleaned up");
+  });
+
+  test("cleans up a regular-merged milestone after main advances", () => {
+    const repo = createRepo();
+    const { milestoneBranch } = createRegularMergedMilestone(repo);
+    commitFile(repo, "hotfix.txt", "later main work\n", "fix: advance main");
+    const previousCwd = join(repo, ".gsd-worktrees", "M001");
+    const calls: string[] = [];
+
+    _setMilestoneCleanupDepsForTests({
+      removeWorktree: (_projectRoot, milestoneId, options) => {
+        assert.ok(options, "cleanup must pass branch options");
+        calls.push(
+          `remove:${milestoneId}:${options.branch}:${String(options.deleteBranch)}`,
+        );
+        return true;
+      },
+      nativeBranchDelete: (_projectRoot, branch) => {
+        calls.push(`delete:${branch}`);
+      },
+      setActiveWorkspace: (workspace) => {
+        calls.push(`workspace:${String(workspace)}`);
+      },
+      nudgeGitBranchCache: (path) => {
+        calls.push(`nudge:${path}`);
+      },
+      chdir: (path) => {
+        calls.push(`chdir:${path}`);
+      },
+    });
+
+    const result = finalizeAlreadyMergedMilestoneIfReachable(
+      request(repo, milestoneBranch, previousCwd),
+    );
+
+    assert.deepEqual(result, {
+      commitMessage: "merge milestone",
+      pushed: false,
+      prCreated: false,
+      codeFilesChanged: true,
+    });
+    assert.deepEqual(calls, [
+      "remove:M001:milestone/M001:false",
+      "delete:milestone/M001",
+      "workspace:null",
+      `nudge:${previousCwd}`,
+      `chdir:${repo}`,
+    ]);
+  });
+
+  test("throws and restores cwd when regular-merged code was later removed from main", () => {
+    const repo = createRepo();
+    const { milestoneBranch } = createRegularMergedMilestone(repo);
+    commitFile(repo, "feature.txt", "", "chore: remove milestone feature");
+    const previousCwd = join(repo, "caller-cwd");
+    mkdirSync(previousCwd);
+    process.chdir(repo);
+
+    assert.throws(
+      () => finalizeAlreadyMergedMilestoneIfReachable(
+        request(repo, milestoneBranch, previousCwd),
+      ),
+      (err: unknown) => err instanceof GSDError
+        && /milestone-touched code file/.test(err.message)
+        && /prevent data loss/.test(err.message),
+    );
+    assert.equal(
+      realpathSync(process.cwd()),
+      realpathSync(previousCwd),
+      "throws before cleanup but restores to the caller's previous cwd",
+    );
+  });
+});

package/src/resources/extensions/gsd/tests/auto-worktree-merge-branch-head.test.ts

@@ -0,0 +1,118 @@
+// gsd-pi — Regression tests for milestone branch/head reconciliation before merge.
+
+import { execFileSync } from "node:child_process";
+import assert from "node:assert/strict";
+import { mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, describe, test } from "node:test";
+
+import { GSDError } from "../errors.js";
+import { reconcileMilestoneBranchHead } from "../auto-worktree-merge-branch-head.js";
+
+const cleanupPaths: string[] = [];
+const initialCwd = process.cwd();
+
+afterEach(() => {
+  process.chdir(initialCwd);
+  for (const path of cleanupPaths.splice(0)) {
+    rmSync(path, { recursive: true, force: true });
+  }
+});
+
+function git(cwd: string, args: string[]): string {
+  return execFileSync("git", args, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf-8",
+  }).trim();
+}
+
+function commitFile(cwd: string, file: string, content: string, message: string): string {
+  writeFileSync(join(cwd, file), content);
+  git(cwd, ["add", file]);
+  git(cwd, ["commit", "-m", message]);
+  return git(cwd, ["rev-parse", "HEAD"]);
+}
+
+function createRepoWithMilestoneWorktree(): { repo: string; worktree: string; branch: string } {
+  const repo = mkdtempSync(join(tmpdir(), "gsd-branch-head-"));
+  cleanupPaths.push(repo);
+  git(repo, ["init", "-b", "main"]);
+  git(repo, ["config", "user.email", "test@example.invalid"]);
+  git(repo, ["config", "user.name", "Test"]);
+  commitFile(repo, "README.md", "base\n", "initial");
+
+  const branch = "milestone/M001";
+  git(repo, ["branch", branch]);
+  const worktree = join(repo, ".gsd-worktrees", "M001");
+  git(repo, ["worktree", "add", worktree, branch]);
+  git(worktree, ["config", "user.email", "test@example.invalid"]);
+  git(worktree, ["config", "user.name", "Test"]);
+  return { repo, worktree, branch };
+}
+
+describe("reconcileMilestoneBranchHead", () => {
+  test("fast-forwards stale milestone branch ref to detached worktree HEAD", () => {
+    const { repo, worktree, branch } = createRepoWithMilestoneWorktree();
+    git(worktree, ["checkout", "--detach"]);
+    const detachedHead = commitFile(worktree, "feature.txt", "worktree-only\n", "worktree detached commit");
+
+    const result = reconcileMilestoneBranchHead({
+      projectRoot: repo,
+      worktreeCwd: worktree,
+      milestoneBranch: branch,
+      previousCwd: worktree,
+    });
+
+    assert.deepEqual(result, {
+      checked: true,
+      updated: true,
+      reason: "fast-forwarded",
+    });
+    assert.equal(git(repo, ["rev-parse", branch]), detachedHead);
+  });
+
+  test("throws and restores cwd when worktree HEAD diverges from milestone branch", () => {
+    const { repo, worktree, branch } = createRepoWithMilestoneWorktree();
+    const baseHead = git(repo, ["rev-parse", branch]);
+    git(worktree, ["checkout", "--detach", baseHead]);
+    const detachedHead = commitFile(worktree, "worktree.txt", "detached\n", "detached side");
+
+    git(repo, ["checkout", branch]);
+    const branchHead = commitFile(repo, "branch.txt", "branch\n", "branch side");
+    git(repo, ["checkout", "main"]);
+    process.chdir(repo);
+
+    assert.throws(
+      () => reconcileMilestoneBranchHead({
+        projectRoot: repo,
+        worktreeCwd: worktree,
+        milestoneBranch: branch,
+        previousCwd: worktree,
+      }),
+      (err: unknown) => err instanceof GSDError && /diverged/.test(err.message),
+    );
+
+    assert.equal(git(repo, ["rev-parse", branch]), branchHead, "diverged branch ref must not be moved");
+    assert.equal(git(worktree, ["rev-parse", "HEAD"]), detachedHead, "detached worktree commit remains for manual recovery");
+    assert.equal(realpathSync(process.cwd()), realpathSync(worktree), "divergence restores cwd to previous worktree");
+  });
+
+  test("skips reconciliation when cwd is already the project root", () => {
+    const { repo, branch } = createRepoWithMilestoneWorktree();
+
+    const result = reconcileMilestoneBranchHead({
+      projectRoot: repo,
+      worktreeCwd: repo,
+      milestoneBranch: branch,
+      previousCwd: repo,
+    });
+
+    assert.deepEqual(result, {
+      checked: false,
+      updated: false,
+      reason: "not-worktree",
+    });
+  });
+});

package/src/resources/extensions/gsd/tests/auto-worktree-merge-cleanup.test.ts

@@ -0,0 +1,115 @@
+// gsd-pi — Regression tests for milestone merge cleanup ordering.
+
+import { execFileSync } from "node:child_process";
+import assert from "node:assert/strict";
+import { existsSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, test } from "node:test";
+
+import {
+  _resetMilestoneCleanupDepsForTests,
+  _setMilestoneCleanupDepsForTests,
+  cleanupMergedMilestoneWorktree,
+} from "../auto-worktree-merge-cleanup.js";
+import {
+  getActiveWorkspace,
+  setActiveWorkspace,
+} from "../auto-worktree-session-registry.js";
+
+function git(cwd: string, args: string[]): string {
+  return execFileSync("git", args, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf-8",
+  }).trim();
+}
+
+function createRepoWithMilestoneWorktree(): { repo: string; worktree: string; branch: string } {
+  const repo = mkdtempSync(join(tmpdir(), "gsd-merge-cleanup-"));
+  git(repo, ["init"]);
+  git(repo, ["config", "user.email", "test@example.invalid"]);
+  git(repo, ["config", "user.name", "Test"]);
+  writeFileSync(join(repo, "README.md"), "base\n");
+  git(repo, ["add", "README.md"]);
+  git(repo, ["commit", "-m", "initial"]);
+
+  const branch = "milestone/M001";
+  git(repo, ["branch", branch]);
+  const worktree = join(repo, ".gsd-worktrees", "M001");
+  git(repo, ["worktree", "add", worktree, branch]);
+  return { repo, worktree, branch };
+}
+
+describe("cleanupMergedMilestoneWorktree", () => {
+  let cleanupPaths: string[] = [];
+
+  beforeEach(() => {
+    cleanupPaths = [];
+    _resetMilestoneCleanupDepsForTests();
+    setActiveWorkspace(null);
+  });
+
+  afterEach(() => {
+    _resetMilestoneCleanupDepsForTests();
+    setActiveWorkspace(null);
+    for (const path of cleanupPaths) {
+      rmSync(path, { recursive: true, force: true });
+    }
+  });
+
+  test("removes the milestone worktree before deleting the milestone branch", () => {
+    const { repo, worktree, branch } = createRepoWithMilestoneWorktree();
+    cleanupPaths.push(repo);
+    process.chdir(worktree);
+    setActiveWorkspace({ projectRoot: repo, worktreeName: "M001", path: worktree } as never);
+
+    const result = cleanupMergedMilestoneWorktree({
+      projectRoot: repo,
+      milestoneId: "M001",
+      milestoneBranch: branch,
+      previousCwd: worktree,
+    });
+
+    assert.equal(result.worktreeRemoved, true);
+    assert.equal(result.branchDeleteAttempted, true);
+    assert.equal(existsSync(worktree), false, "worktree directory should be removed");
+    assert.equal(git(repo, ["branch", "--list", branch]), "", "milestone branch should be deleted after removal");
+    assert.equal(getActiveWorkspace(), null, "successful cleanup clears active workspace");
+    assert.equal(realpathSync(process.cwd()), realpathSync(repo), "cleanup anchors cwd at project root after removing current worktree");
+  });
+
+  test("preserves the milestone branch and active workspace when worktree removal aborts", () => {
+    const calls: string[] = [];
+    _setMilestoneCleanupDepsForTests({
+      clearProjectRootStateFiles: () => calls.push("clear-state"),
+      removeWorktree: () => {
+        calls.push("remove-worktree");
+        return false;
+      },
+      nativeBranchDelete: () => calls.push("delete-branch"),
+      setActiveWorkspace: () => calls.push("clear-active-workspace"),
+      nudgeGitBranchCache: () => calls.push("nudge-cache"),
+      chdir: () => calls.push("chdir-root"),
+    });
+
+    const result = cleanupMergedMilestoneWorktree({
+      projectRoot: "/repo",
+      milestoneId: "M001",
+      milestoneBranch: "milestone/M001",
+      previousCwd: "/repo/.gsd-worktrees/M001",
+      clearProjectRootState: true,
+    });
+
+    assert.deepEqual(result, {
+      worktreeRemoved: false,
+      branchDeleteAttempted: false,
+      activeWorkspaceCleared: false,
+    });
+    assert.deepEqual(
+      calls,
+      ["clear-state", "remove-worktree", "nudge-cache", "chdir-root"],
+      "cleanup must not delete the branch or clear session state when worktree removal aborts",
+    );
+  });
+});

package/src/resources/extensions/gsd/tests/auto-worktree-merge-code-changes.test.ts

@@ -0,0 +1,76 @@
+// gsd-pi — Code-change safety checks for auto-worktree merge closeout.
+
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { test } from "node:test";
+
+import {
+  assertNoUnanchoredCodeChangesAfterEmptyMerge,
+  detectMergedCodeFilesChanged,
+} from "../auto-worktree-merge-code-changes.ts";
+import { GSDError } from "../errors.ts";
+
+function git(cwd: string, args: string[]): string {
+  return execFileSync("git", args, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf-8",
+  });
+}
+
+function createRepo(t: { after: (fn: () => void) => void }): string {
+  const root = mkdtempSync(join(tmpdir(), "gsd-code-changes-test-"));
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+  git(root, ["init"]);
+  git(root, ["config", "user.email", "test@example.com"]);
+  git(root, ["config", "user.name", "Test User"]);
+  writeFileSync(join(root, "README.md"), "# test\n");
+  git(root, ["add", "."]);
+  git(root, ["commit", "-m", "init"]);
+  git(root, ["branch", "-M", "main"]);
+  return root;
+}
+
+test("detectMergedCodeFilesChanged ignores metadata-only commits and reports code commits", (t) => {
+  const metadataRepo = createRepo(t);
+  mkdirSync(join(metadataRepo, ".gsd", "milestones", "M001"), { recursive: true });
+  writeFileSync(join(metadataRepo, ".gsd", "milestones", "M001", "CONTEXT.md"), "# metadata\n");
+  git(metadataRepo, ["add", "."]);
+  git(metadataRepo, ["commit", "-m", "metadata only"]);
+  assert.equal(detectMergedCodeFilesChanged(metadataRepo, false), false);
+
+  const codeRepo = createRepo(t);
+  writeFileSync(join(codeRepo, "feature.ts"), "export const value = 1;\n");
+  git(codeRepo, ["add", "."]);
+  git(codeRepo, ["commit", "-m", "add code"]);
+  assert.equal(detectMergedCodeFilesChanged(codeRepo, false), true);
+});
+
+test("empty merge safety throws only when milestone has unanchored code changes", (t) => {
+  const codeRepo = createRepo(t);
+  git(codeRepo, ["checkout", "-b", "milestone/M001"]);
+  writeFileSync(join(codeRepo, "feature.ts"), "export const value = 1;\n");
+  git(codeRepo, ["add", "."]);
+  git(codeRepo, ["commit", "-m", "milestone code"]);
+  git(codeRepo, ["checkout", "main"]);
+
+  assert.throws(
+    () => assertNoUnanchoredCodeChangesAfterEmptyMerge(codeRepo, "main", "milestone/M001", "squash", true),
+    (err) => err instanceof GSDError && /1 code file\(s\)/u.test(err.message),
+  );
+
+  const metadataRepo = createRepo(t);
+  git(metadataRepo, ["checkout", "-b", "milestone/M002"]);
+  mkdirSync(join(metadataRepo, ".gsd", "milestones", "M002"), { recursive: true });
+  writeFileSync(join(metadataRepo, ".gsd", "milestones", "M002", "CONTEXT.md"), "# metadata\n");
+  git(metadataRepo, ["add", "."]);
+  git(metadataRepo, ["commit", "-m", "metadata"]);
+  git(metadataRepo, ["checkout", "main"]);
+
+  assert.doesNotThrow(() =>
+    assertNoUnanchoredCodeChangesAfterEmptyMerge(metadataRepo, "main", "milestone/M002", "squash", true),
+  );
+});

package/src/resources/extensions/gsd/tests/auto-worktree-merge-db-ready.test.ts

@@ -0,0 +1,140 @@
+// gsd-pi — Regression tests for milestone merge DB readiness.
+
+import assert from "node:assert/strict";
+import { afterEach, beforeEach, describe, test } from "node:test";
+
+import {
+  _resetMergeDbReadyDepsForTests,
+  _setMergeDbReadyDepsForTests,
+  assertMilestoneDbReadyForMerge,
+} from "../auto-worktree-merge-db-ready.js";
+import { GSDError } from "../errors.js";
+
+describe("assertMilestoneDbReadyForMerge", () => {
+  beforeEach(() => {
+    _resetMergeDbReadyDepsForTests();
+  });
+
+  afterEach(() => {
+    _resetMergeDbReadyDepsForTests();
+  });
+
+  test("does nothing when the workflow DB is unavailable", () => {
+    let resolvedPaths = 0;
+    _setMergeDbReadyDepsForTests({
+      isDbAvailable: () => false,
+      resolveGsdPathContract: () => {
+        resolvedPaths += 1;
+        throw new Error("should not resolve paths");
+      },
+    });
+
+    assert.doesNotThrow(() => assertMilestoneDbReadyForMerge({
+      milestoneId: "M002",
+      projectRoot: "/repo",
+      worktreeCwd: "/repo/.gsd-worktrees/M002",
+    }));
+    assert.equal(resolvedPaths, 0);
+  });
+
+  test("switches the active DB to the project DB before reconciling the worktree DB", () => {
+    const calls: string[] = [];
+    _setMergeDbReadyDepsForTests({
+      isDbAvailable: () => true,
+      resolveGsdPathContract: () => ({
+        projectDb: "/repo/.gsd/gsd.db",
+        worktreeGsd: "/repo/.gsd-worktrees/M002/.gsd",
+      } as never),
+      getWorkflowDatabasePath: () => "/repo/.gsd-worktrees/M002/.gsd/gsd.db",
+      shouldReconcileWorktreeDb: (candidate, main) => {
+        calls.push(`should:${candidate}->${main}`);
+        return true;
+      },
+      closeWorkflowDatabase: () => {
+        calls.push("close");
+      },
+      openWorkflowDatabasePath: (path) => {
+        calls.push(`open:${path}`);
+        return true;
+      },
+      reconcileWorktreeDb: (main, worktree) => {
+        calls.push(`reconcile:${main}<-${worktree}`);
+        return { conflicts: [] } as never;
+      },
+      proveMilestoneCloseout: (milestoneId) => {
+        calls.push(`prove:${milestoneId}`);
+        return { ok: true };
+      },
+    });
+
+    assertMilestoneDbReadyForMerge({
+      milestoneId: "M002",
+      projectRoot: "/repo",
+      worktreeCwd: "/repo/.gsd-worktrees/M002",
+    });
+
+    assert.deepEqual(calls, [
+      "should:/repo/.gsd-worktrees/M002/.gsd/gsd.db->/repo/.gsd/gsd.db",
+      "close",
+      "open:/repo/.gsd/gsd.db",
+      "should:/repo/.gsd-worktrees/M002/.gsd/gsd.db->/repo/.gsd/gsd.db",
+      "reconcile:/repo/.gsd/gsd.db<-/repo/.gsd-worktrees/M002/.gsd/gsd.db",
+      "prove:M002",
+    ]);
+  });
+
+  test("wraps DB open failures with the closeout consistency recovery reason", () => {
+    _setMergeDbReadyDepsForTests({
+      isDbAvailable: () => true,
+      resolveGsdPathContract: () => ({
+        projectDb: "/repo/.gsd/gsd.db",
+        worktreeGsd: "/repo/.gsd-worktrees/M002/.gsd",
+      } as never),
+      getWorkflowDatabasePath: () => "/repo/.gsd-worktrees/M002/.gsd/gsd.db",
+      shouldReconcileWorktreeDb: () => true,
+      closeWorkflowDatabase: () => undefined,
+      openWorkflowDatabasePath: () => false,
+      logError: () => undefined,
+    });
+
+    assert.throws(
+      () => assertMilestoneDbReadyForMerge({
+        milestoneId: "M002",
+        projectRoot: "/repo",
+        worktreeCwd: "/repo/.gsd-worktrees/M002",
+      }),
+      (err: unknown) => err instanceof GSDError
+        && /DB reconciliation failed before milestone M002 merge/.test(err.message)
+        && /Recovery reason: closeout-consistency-blocked/.test(err.message),
+    );
+  });
+
+  test("surfaces closeout proof failures after successful reconciliation", () => {
+    _setMergeDbReadyDepsForTests({
+      isDbAvailable: () => true,
+      resolveGsdPathContract: () => ({
+        projectDb: "/repo/.gsd/gsd.db",
+        worktreeGsd: "/repo/.gsd-worktrees/M002/.gsd",
+      } as never),
+      getWorkflowDatabasePath: () => "/repo/.gsd/gsd.db",
+      shouldReconcileWorktreeDb: () => false,
+      proveMilestoneCloseout: () => ({
+        ok: false,
+        reason: "consistency-blocked",
+        message: "closeout blocked",
+        recoveryReason: "closeout-consistency-blocked",
+      } as never),
+      formatCloseoutProofBlock: () => "formatted closeout proof failure",
+    });
+
+    assert.throws(
+      () => assertMilestoneDbReadyForMerge({
+        milestoneId: "M002",
+        projectRoot: "/repo",
+        worktreeCwd: "/repo/.gsd-worktrees/M002",
+      }),
+      (err: unknown) => err instanceof GSDError
+        && err.message === "formatted closeout proof failure",
+    );
+  });
+});