gsd-pi 2.77.0-dev.eaa4973bc → 2.78.0-dev.aeeb2ca00

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

@@ -1,8 +1,8 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as os from "node:os";
 import {
   openDatabase,
   closeDatabase,
@@ -17,197 +17,181 @@ import {
   _getAdapter,
   copyWorktreeDb,
   reconcileWorktreeDb,
-} from '../gsd-db.ts';
+} from "../gsd-db.ts";
 
-
-// ═══════════════════════════════════════════════════════════════════════════
-// Helpers
-// ═══════════════════════════════════════════════════════════════════════════
+// ─── Helpers ──────────────────────────────────────────────────────────────
 
 function tempDir(): string {
-  return fs.mkdtempSync(path.join(os.tmpdir(), 'gsd-wt-test-'));
-}
-
-function cleanup(...dirs: string[]): void {
-  closeDatabase();
-  for (const dir of dirs) {
-    try {
-      fs.rmSync(dir, { recursive: true, force: true });
-    } catch {
-      // best effort
-    }
-  }
+  return fs.mkdtempSync(path.join(os.tmpdir(), "gsd-wt-test-"));
 }
 
 function seedMainDb(dbPath: string): void {
   openDatabase(dbPath);
   insertDecision({
-    id: 'D001',
-    when_context: '2025-01-01',
-    scope: 'M001/S01',
-    decision: 'Use SQLite',
-    choice: 'node:sqlite',
-    rationale: 'Built-in',
-    revisable: 'yes',
-    made_by: 'agent',
+    id: "D001",
+    when_context: "2025-01-01",
+    scope: "M001/S01",
+    decision: "Use SQLite",
+    choice: "node:sqlite",
+    rationale: "Built-in",
+    revisable: "yes",
+    made_by: "agent",
     superseded_by: null,
   });
   insertRequirement({
-    id: 'R001',
-    class: 'functional',
-    status: 'active',
-    description: 'Must store decisions',
-    why: 'Core feature',
-    source: 'design',
-    primary_owner: 'S01',
-    supporting_slices: '',
-    validation: 'test',
-    notes: '',
-    full_content: 'Full requirement text',
+    id: "R001",
+    class: "functional",
+    status: "active",
+    description: "Must store decisions",
+    why: "Core feature",
+    source: "design",
+    primary_owner: "S01",
+    supporting_slices: "",
+    validation: "test",
+    notes: "",
+    full_content: "Full requirement text",
     superseded_by: null,
   });
   insertArtifact({
-    path: 'docs/arch.md',
-    artifact_type: 'plan',
-    milestone_id: 'M001',
+    path: "docs/arch.md",
+    artifact_type: "plan",
+    milestone_id: "M001",
     slice_id: null,
     task_id: null,
-    full_content: 'Architecture document',
+    full_content: "Architecture document",
   });
 }
 
-// ═══════════════════════════════════════════════════════════════════════════
-// copyWorktreeDb tests
-// ═══════════════════════════════════════════════════════════════════════════
+function registerCleanup(t: { after: (fn: () => void) => void }, ...dirs: string[]) {
+  t.after(() => {
+    closeDatabase();
+    for (const dir of dirs) {
+      try {
+        fs.rmSync(dir, { recursive: true, force: true });
+      } catch {
+        // best effort
+      }
+    }
+  });
+}
 
-console.log('\n=== worktree-db: copyWorktreeDb ===');
+// ─── copyWorktreeDb ───────────────────────────────────────────────────────
 
-// Test: copies DB file and data is queryable
-{
+test("copyWorktreeDb copies DB file and data is queryable", (t) => {
   const srcDir = tempDir();
   const destDir = tempDir();
-  const srcDb = path.join(srcDir, 'gsd.db');
-  const destDb = path.join(destDir, 'nested', 'gsd.db');
+  registerCleanup(t, srcDir, destDir);
+
+  const srcDb = path.join(srcDir, "gsd.db");
+  const destDb = path.join(destDir, "nested", "gsd.db");
 
   seedMainDb(srcDb);
   closeDatabase();
 
   const result = copyWorktreeDb(srcDb, destDb);
-  assert.ok(result === true, 'copyWorktreeDb returns true on success');
-  assert.ok(fs.existsSync(destDb), 'dest DB file exists after copy');
+  assert.equal(result, true, "copyWorktreeDb returns true on success");
+  assert.ok(fs.existsSync(destDb), "dest DB file exists after copy");
 
-  // Open the copy and verify data is queryable
   openDatabase(destDb);
-  const d = getDecisionById('D001');
-  assert.ok(d !== null, 'decision queryable in copied DB');
-  assert.deepStrictEqual(d?.choice, 'node:sqlite', 'decision data preserved in copy');
+  const d = getDecisionById("D001");
+  assert.ok(d !== null, "decision queryable in copied DB");
+  assert.equal(d?.choice, "node:sqlite", "decision data preserved in copy");
 
-  const r = getRequirementById('R001');
-  assert.ok(r !== null, 'requirement queryable in copied DB');
-  assert.deepStrictEqual(r?.description, 'Must store decisions', 'requirement data preserved in copy');
+  const r = getRequirementById("R001");
+  assert.ok(r !== null, "requirement queryable in copied DB");
+  assert.equal(r?.description, "Must store decisions", "requirement data preserved in copy");
+});
 
-  cleanup(srcDir, destDir);
-}
-
-// Test: skips -wal and -shm files
-{
+test("copyWorktreeDb skips -wal and -shm files", (t) => {
   const srcDir = tempDir();
   const destDir = tempDir();
-  const srcDb = path.join(srcDir, 'gsd.db');
-  const destDb = path.join(destDir, 'gsd.db');
+  registerCleanup(t, srcDir, destDir);
+
+  const srcDb = path.join(srcDir, "gsd.db");
+  const destDb = path.join(destDir, "gsd.db");
 
   seedMainDb(srcDb);
   closeDatabase();
 
-  // Create fake WAL/SHM files
-  fs.writeFileSync(srcDb + '-wal', 'fake wal data');
-  fs.writeFileSync(srcDb + '-shm', 'fake shm data');
+  fs.writeFileSync(srcDb + "-wal", "fake wal data");
+  fs.writeFileSync(srcDb + "-shm", "fake shm data");
 
   copyWorktreeDb(srcDb, destDb);
 
-  assert.ok(fs.existsSync(destDb), 'DB file copied');
-  assert.ok(!fs.existsSync(destDb + '-wal'), 'WAL file NOT copied');
-  assert.ok(!fs.existsSync(destDb + '-shm'), 'SHM file NOT copied');
+  assert.ok(fs.existsSync(destDb), "DB file copied");
+  assert.ok(!fs.existsSync(destDb + "-wal"), "WAL file NOT copied");
+  assert.ok(!fs.existsSync(destDb + "-shm"), "SHM file NOT copied");
+});
 
-  cleanup(srcDir, destDir);
-}
-
-// Test: returns false when source doesn't exist (no throw)
-{
+test("copyWorktreeDb returns false when source doesn't exist", (t) => {
   const destDir = tempDir();
-  const result = copyWorktreeDb('/nonexistent/path/gsd.db', path.join(destDir, 'gsd.db'));
-  assert.deepStrictEqual(result, false, 'returns false for missing source');
-  cleanup(destDir);
-}
+  registerCleanup(t, destDir);
 
-// Test: creates dest directory if needed
-{
+  const missingSrc = path.join(destDir, "missing", "gsd.db");
+  const result = copyWorktreeDb(missingSrc, path.join(destDir, "gsd.db"));
+  assert.equal(result, false, "returns false for missing source");
+});
+
+test("copyWorktreeDb creates deeply nested dest directories", (t) => {
   const srcDir = tempDir();
   const destDir = tempDir();
-  const srcDb = path.join(srcDir, 'gsd.db');
-  const deepDest = path.join(destDir, 'a', 'b', 'c', 'gsd.db');
+  registerCleanup(t, srcDir, destDir);
+
+  const srcDb = path.join(srcDir, "gsd.db");
+  const deepDest = path.join(destDir, "a", "b", "c", "gsd.db");
 
   seedMainDb(srcDb);
   closeDatabase();
 
   const result = copyWorktreeDb(srcDb, deepDest);
-  assert.ok(result === true, 'copyWorktreeDb succeeds with nested dest');
-  assert.ok(fs.existsSync(deepDest), 'DB file created at deeply nested path');
-
-  cleanup(srcDir, destDir);
-}
-
-// ═══════════════════════════════════════════════════════════════════════════
-// reconcileWorktreeDb tests
-// ═══════════════════════════════════════════════════════════════════════════
+  assert.equal(result, true, "copyWorktreeDb succeeds with nested dest");
+  assert.ok(fs.existsSync(deepDest), "DB file created at deeply nested path");
+});
 
-console.log('\n=== worktree-db: reconcileWorktreeDb ===');
+// ─── reconcileWorktreeDb ──────────────────────────────────────────────────
 
-// Test: merges new decisions from worktree into main
-{
+test("reconcileWorktreeDb merges new decisions from worktree into main", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
-  // Seed main with D001
   seedMainDb(mainDb);
   closeDatabase();
 
-  // Copy to worktree, add D002 in worktree
   copyWorktreeDb(mainDb, wtDb);
   openDatabase(wtDb);
   insertDecision({
-    id: 'D002',
-    when_context: '2025-02-01',
-    scope: 'M001/S02',
-    decision: 'Use WAL mode',
-    choice: 'WAL',
-    rationale: 'Performance',
-    revisable: 'yes',
-    made_by: 'agent',
+    id: "D002",
+    when_context: "2025-02-01",
+    scope: "M001/S02",
+    decision: "Use WAL mode",
+    choice: "WAL",
+    rationale: "Performance",
+    revisable: "yes",
+    made_by: "agent",
     superseded_by: null,
   });
   closeDatabase();
 
-  // Re-open main and reconcile
   openDatabase(mainDb);
   const result = reconcileWorktreeDb(mainDb, wtDb);
 
-  assert.ok(result.decisions > 0, 'decisions merged count > 0');
-  const d2 = getDecisionById('D002');
-  assert.ok(d2 !== null, 'D002 from worktree now in main');
-  assert.deepStrictEqual(d2?.choice, 'WAL', 'D002 data correct after merge');
+  assert.ok(result.decisions > 0, "decisions merged count > 0");
+  const d2 = getDecisionById("D002");
+  assert.ok(d2 !== null, "D002 from worktree now in main");
+  assert.equal(d2?.choice, "WAL", "D002 data correct after merge");
+});
 
-  cleanup(mainDir, wtDir);
-}
-
-// Test: merges new requirements from worktree into main
-{
+test("reconcileWorktreeDb merges new requirements from worktree into main", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
   seedMainDb(mainDb);
   closeDatabase();
@@ -215,17 +199,17 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
 
   openDatabase(wtDb);
   insertRequirement({
-    id: 'R002',
-    class: 'non-functional',
-    status: 'active',
-    description: 'Must be fast',
-    why: 'UX',
-    source: 'design',
-    primary_owner: 'S02',
-    supporting_slices: '',
-    validation: 'benchmark',
-    notes: '',
-    full_content: 'Performance requirement',
+    id: "R002",
+    class: "non-functional",
+    status: "active",
+    description: "Must be fast",
+    why: "UX",
+    source: "design",
+    primary_owner: "S02",
+    supporting_slices: "",
+    validation: "benchmark",
+    notes: "",
+    full_content: "Performance requirement",
     superseded_by: null,
   });
   closeDatabase();
@@ -233,20 +217,19 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
   openDatabase(mainDb);
   const result = reconcileWorktreeDb(mainDb, wtDb);
 
-  assert.ok(result.requirements > 0, 'requirements merged count > 0');
-  const r2 = getRequirementById('R002');
-  assert.ok(r2 !== null, 'R002 from worktree now in main');
-  assert.deepStrictEqual(r2?.description, 'Must be fast', 'R002 data correct after merge');
+  assert.ok(result.requirements > 0, "requirements merged count > 0");
+  const r2 = getRequirementById("R002");
+  assert.ok(r2 !== null, "R002 from worktree now in main");
+  assert.equal(r2?.description, "Must be fast", "R002 data correct after merge");
+});
 
-  cleanup(mainDir, wtDir);
-}
-
-// Test: merges new artifacts from worktree into main
-{
+test("reconcileWorktreeDb merges new artifacts from worktree into main", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
   seedMainDb(mainDb);
   closeDatabase();
@@ -254,133 +237,124 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
 
   openDatabase(wtDb);
   insertArtifact({
-    path: 'docs/api.md',
-    artifact_type: 'reference',
-    milestone_id: 'M001',
-    slice_id: 'S01',
-    task_id: 'T01',
-    full_content: 'API documentation',
+    path: "docs/api.md",
+    artifact_type: "reference",
+    milestone_id: "M001",
+    slice_id: "S01",
+    task_id: "T01",
+    full_content: "API documentation",
   });
   closeDatabase();
 
   openDatabase(mainDb);
   const result = reconcileWorktreeDb(mainDb, wtDb);
 
-  assert.ok(result.artifacts > 0, 'artifacts merged count > 0');
+  assert.ok(result.artifacts > 0, "artifacts merged count > 0");
   const adapter = _getAdapter()!;
-  const row = adapter.prepare('SELECT * FROM artifacts WHERE path = ?').get('docs/api.md');
-  assert.ok(row !== null, 'artifact from worktree now in main');
-  assert.deepStrictEqual(row?.['artifact_type'], 'reference', 'artifact data correct after merge');
-
-  cleanup(mainDir, wtDir);
-}
-
-// Test: detects conflicts (same PK, different content in both DBs)
-{
+  const row = adapter.prepare("SELECT * FROM artifacts WHERE path = ?").get("docs/api.md");
+  // Statement#get returns undefined (not null) when no row matches, so use
+  // loose inequality to catch both — strict `!== null` would silently let a
+  // missing artifact row pass this assertion.
+  assert.ok(row != null, "artifact from worktree now in main");
+  assert.equal((row as any)["artifact_type"], "reference", "artifact data correct after merge");
+});
+
+test("reconcileWorktreeDb detects conflicts and applies worktree-wins policy", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
-  // Seed main with D001
   seedMainDb(mainDb);
   closeDatabase();
   copyWorktreeDb(mainDb, wtDb);
 
-  // Modify D001 in main
   openDatabase(mainDb);
-  const mainAdapter = _getAdapter()!;
-  mainAdapter.prepare(
+  _getAdapter()!.prepare(
     `UPDATE decisions SET choice = 'better-sqlite3' WHERE id = 'D001'`,
   ).run();
   closeDatabase();
 
-  // Modify D001 in worktree differently
   openDatabase(wtDb);
-  const wtAdapter = _getAdapter()!;
-  wtAdapter.prepare(
+  _getAdapter()!.prepare(
     `UPDATE decisions SET choice = 'sql.js' WHERE id = 'D001'`,
   ).run();
   closeDatabase();
 
-  // Reconcile
   openDatabase(mainDb);
   const result = reconcileWorktreeDb(mainDb, wtDb);
 
-  assert.ok(result.conflicts.length > 0, 'conflicts detected');
+  assert.ok(result.conflicts.length > 0, "conflicts detected");
   assert.ok(
-    result.conflicts.some(c => c.includes('D001')),
-    'conflict mentions D001',
+    result.conflicts.some((c) => c.includes("D001")),
+    "conflict mentions D001",
   );
 
-  // Worktree-wins: D001 should now have worktree's value
-  const d1 = getDecisionById('D001');
-  assert.deepStrictEqual(d1?.choice, 'sql.js', 'worktree wins on conflict (INSERT OR REPLACE)');
-
-  cleanup(mainDir, wtDir);
-}
+  const d1 = getDecisionById("D001");
+  assert.equal(d1?.choice, "sql.js", "worktree wins on conflict (INSERT OR REPLACE)");
+});
 
-// Test: handles missing worktree DB gracefully
-{
+test("reconcileWorktreeDb handles missing worktree DB gracefully", (t) => {
   const mainDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
+  registerCleanup(t, mainDir);
 
+  const mainDb = path.join(mainDir, "gsd.db");
   seedMainDb(mainDb);
 
-  const result = reconcileWorktreeDb(mainDb, '/nonexistent/worktree.db');
-  assert.deepStrictEqual(result.decisions, 0, 'no decisions merged for missing worktree DB');
-  assert.deepStrictEqual(result.requirements, 0, 'no requirements merged for missing worktree DB');
-  assert.deepStrictEqual(result.artifacts, 0, 'no artifacts merged for missing worktree DB');
-  assert.deepStrictEqual(result.conflicts.length, 0, 'no conflicts for missing worktree DB');
+  const missingWt = path.join(mainDir, "missing-worktree.db");
+  const result = reconcileWorktreeDb(mainDb, missingWt);
+  assert.equal(result.decisions, 0, "no decisions merged for missing worktree DB");
+  assert.equal(result.requirements, 0, "no requirements merged for missing worktree DB");
+  assert.equal(result.artifacts, 0, "no artifacts merged for missing worktree DB");
+  assert.equal(result.conflicts.length, 0, "no conflicts for missing worktree DB");
+});
 
-  cleanup(mainDir);
-}
-
-// Test: path with spaces works
-{
+test("reconcileWorktreeDb handles paths containing spaces", (t) => {
   const baseDir = tempDir();
-  const mainDir = path.join(baseDir, 'main dir');
-  const wtDir = path.join(baseDir, 'worktree dir');
+  registerCleanup(t, baseDir);
+
+  const mainDir = path.join(baseDir, "main dir");
+  const wtDir = path.join(baseDir, "worktree dir");
   fs.mkdirSync(mainDir, { recursive: true });
   fs.mkdirSync(wtDir, { recursive: true });
 
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
   seedMainDb(mainDb);
   closeDatabase();
   copyWorktreeDb(mainDb, wtDb);
 
-  // Add a decision in worktree
   openDatabase(wtDb);
   insertDecision({
-    id: 'D003',
-    when_context: '2025-03-01',
-    scope: 'M001/S03',
-    decision: 'Path spaces test',
-    choice: 'yes',
-    rationale: 'Robustness',
-    revisable: 'no',
-    made_by: 'agent',
+    id: "D003",
+    when_context: "2025-03-01",
+    scope: "M001/S03",
+    decision: "Path spaces test",
+    choice: "yes",
+    rationale: "Robustness",
+    revisable: "no",
+    made_by: "agent",
     superseded_by: null,
   });
   closeDatabase();
 
   openDatabase(mainDb);
   const result = reconcileWorktreeDb(mainDb, wtDb);
-  assert.ok(result.decisions > 0, 'reconciliation works with spaces in path');
-  const d3 = getDecisionById('D003');
-  assert.ok(d3 !== null, 'D003 merged from worktree with spaces in path');
+  assert.ok(result.decisions > 0, "reconciliation works with spaces in path");
+  const d3 = getDecisionById("D003");
+  assert.ok(d3 !== null, "D003 merged from worktree with spaces in path");
+});
 
-  cleanup(baseDir);
-}
-
-// Test: main DB is usable after reconciliation (DETACH cleanup verified)
-{
+test("reconcileWorktreeDb leaves main DB usable after DETACH", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
   seedMainDb(mainDb);
   closeDatabase();
@@ -389,92 +363,78 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
   openDatabase(mainDb);
   reconcileWorktreeDb(mainDb, wtDb);
 
-  // Verify main DB is still fully usable after DETACH
-  assert.ok(isDbAvailable(), 'DB still available after reconciliation');
+  assert.ok(isDbAvailable(), "DB still available after reconciliation");
 
   insertDecision({
-    id: 'D099',
-    when_context: '2025-12-01',
-    scope: 'test',
-    decision: 'Post-reconcile insert',
-    choice: 'works',
-    rationale: 'Verify DETACH cleanup',
-    revisable: 'no',
-    made_by: 'agent',
+    id: "D099",
+    when_context: "2025-12-01",
+    scope: "test",
+    decision: "Post-reconcile insert",
+    choice: "works",
+    rationale: "Verify DETACH cleanup",
+    revisable: "no",
+    made_by: "agent",
     superseded_by: null,
   });
 
-  const d99 = getDecisionById('D099');
-  assert.ok(d99 !== null, 'can insert and query after reconciliation');
-  assert.deepStrictEqual(d99?.choice, 'works', 'post-reconcile data correct');
+  const d99 = getDecisionById("D099");
+  assert.ok(d99 !== null, "can insert and query after reconciliation");
+  assert.equal(d99?.choice, "works", "post-reconcile data correct");
 
-  // Verify no "wt" database still attached
+  // Verify wt database is detached
   const adapter = _getAdapter()!;
   let wtAccessible = false;
   try {
-    adapter.prepare('SELECT count(*) FROM wt.decisions').get();
+    adapter.prepare("SELECT count(*) FROM wt.decisions").get();
     wtAccessible = true;
   } catch {
     // Expected — wt should be detached
   }
-  assert.ok(!wtAccessible, 'wt database is detached after reconciliation');
+  assert.ok(!wtAccessible, "wt database is detached after reconciliation");
+});
 
-  cleanup(mainDir, wtDir);
-}
-
-// Test: reconcile with empty worktree DB (no new rows, no conflicts)
-{
+test("reconcileWorktreeDb is a no-op when DBs are identical", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
   seedMainDb(mainDb);
   closeDatabase();
   copyWorktreeDb(mainDb, wtDb);
 
-  // Don't modify the worktree DB at all — reconcile the identical copy
   openDatabase(mainDb);
   const result = reconcileWorktreeDb(mainDb, wtDb);
 
-  // Should still report counts for the existing rows (INSERT OR REPLACE touches them)
-  assert.ok(result.conflicts.length === 0, 'no conflicts when DBs are identical');
-  assert.ok(isDbAvailable(), 'DB usable after no-change reconciliation');
+  assert.equal(result.conflicts.length, 0, "no conflicts when DBs are identical");
+  assert.ok(isDbAvailable(), "DB usable after no-change reconciliation");
+});
 
-  cleanup(mainDir, wtDir);
-}
-
-// Test: reconcileWorktreeDb must NOT downgrade milestone status complete→active (#4372)
-{
+test("reconcileWorktreeDb does not downgrade milestone status complete→active (#4372)", (t) => {
   const mainDir = tempDir();
   const wtDir = tempDir();
-  const mainDb = path.join(mainDir, 'gsd.db');
-  const wtDb = path.join(wtDir, 'gsd.db');
+  registerCleanup(t, mainDir, wtDir);
+
+  const mainDb = path.join(mainDir, "gsd.db");
+  const wtDb = path.join(wtDir, "gsd.db");
 
-  // Seed main with a milestone already marked complete
   seedMainDb(mainDb);
   const mainAdapter = _getAdapter()!;
-  insertMilestone({ id: 'M-COMP', title: 'Completed Milestone', status: 'complete' });
-  // Manually mark completed_at so it's a realistic complete record
+  insertMilestone({ id: "M-COMP", title: "Completed Milestone", status: "complete" });
   mainAdapter.prepare(`UPDATE milestones SET completed_at = '2025-06-01T00:00:00.000Z' WHERE id = 'M-COMP'`).run();
   closeDatabase();
 
-  // Copy to worktree — the worktree has the milestone as 'active' (stale / older snapshot)
   copyWorktreeDb(mainDb, wtDb);
   openDatabase(wtDb);
-  const wtAdapter = _getAdapter()!;
-  wtAdapter.prepare(`UPDATE milestones SET status = 'active', completed_at = NULL WHERE id = 'M-COMP'`).run();
+  _getAdapter()!.prepare(`UPDATE milestones SET status = 'active', completed_at = NULL WHERE id = 'M-COMP'`).run();
   closeDatabase();
 
-  // Reconcile: main should win and keep 'complete'
   openDatabase(mainDb);
   reconcileWorktreeDb(mainDb, wtDb);
 
-  const m = getMilestone('M-COMP');
-  assert.ok(m !== null, 'milestone M-COMP still exists after reconcile');
-  assert.strictEqual(m!.status, 'complete', 'complete milestone must not be downgraded to active by stale worktree');
-
-  cleanup(mainDir, wtDir);
-}
-
-// ─── Final Report ──────────────────────────────────────────────────────────
+  const m = getMilestone("M-COMP");
+  assert.ok(m !== null, "milestone M-COMP still exists after reconcile");
+  assert.equal(m!.status, "complete", "complete milestone must not be downgraded to active by stale worktree");
+});