@opengsd/gsd-pi 1.2.0-dev.fb12b103 → 1.2.0-dev.fbdca60b

package/src/resources/extensions/gsd/tests/single-writer-invariant.test.ts

@@ -1,18 +1,23 @@
-// Structural invariant: gsd-db.ts is the single writer for .gsd/gsd.db.
+// Structural invariant: gsd-db.ts and the typed writer layer own writes for .gsd/gsd.db.
 //
 // No file under src/resources/extensions/gsd/ may issue raw write SQL
 // (INSERT/UPDATE/DELETE/REPLACE) or raw transaction control (BEGIN/COMMIT/
 // ROLLBACK via `.exec(...)`) against the engine database. Every bypass must
-// route through a typed wrapper exported from gsd-db.ts.
+// route through an explicitly allowlisted typed writer.
 //
 // Allowlist:
-// - gsd-db.ts itself — the single writer
+// - gsd-db.ts itself — compatibility barrel and remaining mid-migration wrappers
+// - db/engine.ts — schema, migrations, lifecycle, and transaction primitives
+// - db/writers/** — domain writers
+// - typed coordination/runtime writer modules listed in TYPED_DB_WRITER_FILES
+// - schema/migration helper modules listed in SCHEMA_DB_WRITER_FILES
+// - ADR migration/backfill helpers listed in MIGRATION_BACKFILL_WRITER_FILES
 // - unit-ownership.ts — manages a separate .gsd/unit-claims.db for
 //   cross-worktree claim races; intentionally outside this invariant
 // - tests/** — fixtures and direct DB inspection are fair game
 //
 // When this test fails, do not add a new suppression. Instead:
-// 1. Add a typed wrapper to gsd-db.ts that captures the SQL
+// 1. Add a typed wrapper to the explicit writer layer that captures the SQL
 // 2. Switch the flagged site to call the wrapper
 //
 // See `.claude/plans/joyful-doodling-pony.md` for the full rationale.
@@ -29,17 +34,50 @@ const gsdDir = join(process.cwd(), "src/resources/extensions/gsd");
 //   - db/engine.ts — connection lifecycle, schema/migrations (DDL), and the
 //     BEGIN/COMMIT transaction primitives. The shared handle every writer reads.
 //   - db/writers/**.ts — the Single Writer Layer: one cohesive write subsystem
-//     per file (hierarchy, memory, gates, escalation, reconcile, manifest,
-//     legacy-import, cascades).
+//     per file.
 //   - gsd-db.ts — the barrel that re-exports the layer (still holds wrappers
 //     mid-migration).
+//   - typed coordination/runtime writers listed below.
+//   - schema/migration helpers listed below.
+//   - ADR migration/backfill helpers listed below.
 //   - unit-ownership.ts — a separate .gsd/unit-claims.db, intentionally outside.
 // db/queries.ts is explicitly NOT allowed write SQL (asserted separately below).
+const TYPED_DB_WRITER_FILES = new Set([
+  "db/auto-workers.ts",
+  "db/command-queue.ts",
+  "db/milestone-leases.ts",
+  "db/runtime-kv.ts",
+  "db/unit-dispatches.ts",
+]);
+
+const SCHEMA_DB_WRITER_FILES = new Set([
+  "db-memory-fts-schema.ts",
+  "db-schema-metadata.ts",
+  "db-verification-evidence-schema.ts",
+]);
+
+const MIGRATION_BACKFILL_WRITER_FILES = new Set([
+  "memory-backfill.ts",
+]);
+
+const DB_WRITER_ALLOWLIST_GUIDANCE = [
+  "gsd-db.ts",
+  "db/engine.ts",
+  "db/writers/**",
+  ...TYPED_DB_WRITER_FILES,
+  ...SCHEMA_DB_WRITER_FILES,
+  ...MIGRATION_BACKFILL_WRITER_FILES,
+  "unit-ownership.ts only for .gsd/unit-claims.db",
+].join(", ");
+
 function isSingleWriterFile(rel: string): boolean {
   const norm = rel.split("\\").join("/");
   if (norm === "gsd-db.ts" || norm === "unit-ownership.ts") return true;
   if (norm === "db/engine.ts") return true;
   if (norm.startsWith("db/writers/") && norm.endsWith(".ts")) return true;
+  if (TYPED_DB_WRITER_FILES.has(norm)) return true;
+  if (SCHEMA_DB_WRITER_FILES.has(norm)) return true;
+  if (MIGRATION_BACKFILL_WRITER_FILES.has(norm)) return true;
   return false;
 }
 
@@ -83,11 +121,126 @@ interface Violation {
   kind: string;
 }
 
-// Match .prepare("... INSERT|UPDATE|DELETE|REPLACE ...") in any quoting style.
-const PREPARE_WRITE_RE = /\.prepare\s*\(\s*[`'"][^`'"]*\b(INSERT|UPDATE|DELETE|REPLACE)\b/i;
+const DB_CALL_RE = /\.(prepare|exec)\s*\(/g;
+const PREPARE_WRITE_SQL_RE = /\b(INSERT|UPDATE|DELETE|REPLACE)\b/i;
+const EXEC_WRITE_SQL_RE = /\b(INSERT|UPDATE|DELETE|REPLACE|BEGIN|COMMIT|ROLLBACK)\b/i;
+
+function findRawWriteSqlViolations(file: string, content: string): Violation[] {
+  const violations: Violation[] = [];
+  DB_CALL_RE.lastIndex = 0;
+
+  let match: RegExpExecArray | null;
+  while ((match = DB_CALL_RE.exec(content)) !== null) {
+    const method = match[1] as "prepare" | "exec";
+    const sql = readFirstStringArgument(content, DB_CALL_RE.lastIndex);
+    if (sql === null) continue;
+
+    const keywordMatch =
+      method === "prepare"
+        ? PREPARE_WRITE_SQL_RE.exec(sql)
+        : EXEC_WRITE_SQL_RE.exec(sql);
+    if (keywordMatch === null) continue;
+
+    violations.push({
+      file,
+      line: lineNumberAt(content, match.index),
+      snippet: lineSnippetAt(content, match.index),
+      kind: `${method}(${keywordMatch[1].toUpperCase()})`,
+    });
+  }
+
+  return violations;
+}
+
+function readFirstStringArgument(content: string, index: number): string | null {
+  const quoteIndex = skipWhitespace(content, index);
+  const quote = content[quoteIndex];
+  if (quote !== "`" && quote !== "'" && quote !== '"') return null;
+  return readStringLiteral(content, quoteIndex, quote);
+}
+
+function skipWhitespace(content: string, index: number): number {
+  let cursor = index;
+  while (cursor < content.length && /\s/.test(content[cursor] ?? "")) {
+    cursor++;
+  }
+  return cursor;
+}
+
+function readStringLiteral(content: string, quoteIndex: number, quote: string): string | null {
+  let value = "";
+
+  for (let cursor = quoteIndex + 1; cursor < content.length; cursor++) {
+    const char = content[cursor];
+    if (char === "\\") {
+      value += char;
+      cursor++;
+      if (cursor < content.length) value += content[cursor];
+      continue;
+    }
+    if (char === quote) return value;
+    value += char;
+  }
+
+  return null;
+}
+
+function lineNumberAt(content: string, index: number): number {
+  return content.slice(0, index).split("\n").length;
+}
+
+function lineSnippetAt(content: string, index: number): string {
+  const lineStart = content.lastIndexOf("\n", index) + 1;
+  const nextNewline = content.indexOf("\n", index);
+  const lineEnd = nextNewline === -1 ? content.length : nextNewline;
+  return content.slice(lineStart, lineEnd).trim();
+}
+
+test("scanner catches multiline template-literal db.prepare write SQL", () => {
+  const violations = findRawWriteSqlViolations(
+    "fixture.ts",
+    [
+      "const stmt = db.prepare(",
+      "  `INSERT INTO tasks (id)",
+      "   VALUES (?)`",
+      ");",
+    ].join("\n"),
+  );
+
+  assert.deepEqual(violations.map(({ line, kind }) => ({ line, kind })), [
+    { line: 1, kind: "prepare(INSERT)" },
+  ]);
+});
+
+test("scanner catches multiline raw transaction control in exec", () => {
+  const violations = findRawWriteSqlViolations(
+    "fixture.ts",
+    [
+      "db.exec(",
+      "  `BEGIN`",
+      ");",
+    ].join("\n"),
+  );
+
+  assert.deepEqual(violations.map(({ line, kind }) => ({ line, kind })), [
+    { line: 1, kind: "exec(BEGIN)" },
+  ]);
+});
+
+test("scanner ignores multiline SELECT statements", () => {
+  const violations = findRawWriteSqlViolations(
+    "fixture.ts",
+    [
+      "const stmt = db.prepare(",
+      "  `SELECT id",
+      "   FROM tasks`",
+      ");",
+    ].join("\n"),
+  );
+
+  assert.deepEqual(violations, []);
+});
 
-// Match .exec("... INSERT|UPDATE|DELETE|REPLACE ...") or raw BEGIN/COMMIT/ROLLBACK.
-const EXEC_WRITE_RE = /\.exec\s*\(\s*[`'"][^`'"]*\b(INSERT|UPDATE|DELETE|REPLACE|BEGIN|COMMIT|ROLLBACK)\b/i;
 const DB_WORKSPACE_MECHANICS = new Set([
   "backupDatabaseSnapshot",
   "checkpointDatabase",
@@ -112,7 +265,7 @@ function importNames(specifierBlock: string): string[] {
     .filter(Boolean);
 }
 
-test("no module outside gsd-db.ts issues raw write SQL against the engine DB", () => {
+test("no module outside the explicit DB writer allowlist issues raw write SQL", () => {
   const files = walkTsFiles(gsdDir);
   assert.ok(files.length >= 20, `Expected at least 20 .ts files under gsd/, found ${files.length}`);
 
@@ -129,30 +282,7 @@ test("no module outside gsd-db.ts issues raw write SQL against the engine DB", (
       continue;
     }
 
-    const lines = content.split("\n");
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-
-      const prepareMatch = PREPARE_WRITE_RE.exec(line);
-      if (prepareMatch) {
-        violations.push({
-          file: rel,
-          line: i + 1,
-          snippet: line.trim(),
-          kind: `prepare(${prepareMatch[1].toUpperCase()})`,
-        });
-      }
-
-      const execMatch = EXEC_WRITE_RE.exec(line);
-      if (execMatch) {
-        violations.push({
-          file: rel,
-          line: i + 1,
-          snippet: line.trim(),
-          kind: `exec(${execMatch[1].toUpperCase()})`,
-        });
-      }
-    }
+    violations.push(...findRawWriteSqlViolations(rel, content));
   }
 
   if (violations.length > 0) {
@@ -160,9 +290,9 @@ test("no module outside gsd-db.ts issues raw write SQL against the engine DB", (
       (v) => `  ${v.file}:${v.line} [${v.kind}] — ${v.snippet}`,
     );
     assert.fail(
-      `Found ${violations.length} raw write SQL bypass(es) outside gsd-db.ts:\n` +
+      `Found ${violations.length} raw write SQL bypass(es) outside the explicit DB writer allowlist:\n` +
         lines.join("\n") +
-        "\n\nEach of these must be replaced with a typed wrapper exported from gsd-db.ts.",
+        `\n\nMove each write to the appropriate allowlisted owner: ${DB_WRITER_ALLOWLIST_GUIDANCE}.`,
     );
   }
 });
@@ -174,19 +304,11 @@ test("db/queries.ts (the Query Module) is read-only — contains no write SQL",
   // db/writers/ — this is the explicit, positive statement of intent.)
   const queriesPath = join(gsdDir, "db", "queries.ts");
   const content = readFileSync(queriesPath, "utf-8");
-  const lines = content.split("\n");
-  const violations: Violation[] = [];
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const m = PREPARE_WRITE_RE.exec(line) ?? EXEC_WRITE_RE.exec(line);
-    if (m) {
-      violations.push({ file: "db/queries.ts", line: i + 1, snippet: line.trim(), kind: m[1].toUpperCase() });
-    }
-  }
+  const violations = findRawWriteSqlViolations("db/queries.ts", content);
   assert.equal(
     violations.length,
     0,
-    `db/queries.ts must contain no write SQL — move write wrappers to db/writers/:\n` +
+    `db/queries.ts must contain no write SQL — move write wrappers to the explicit DB writer allowlist:\n` +
       violations.map((v) => `  db/queries.ts:${v.line} [${v.kind}] — ${v.snippet}`).join("\n"),
   );
 });
@@ -299,7 +421,7 @@ test("production modules do not import DB open-state mechanics from gsd-db.ts",
     assert.fail(
       `Found ${violations.length} DB open-state import(s) from gsd-db.ts:\n` +
         lines.join("\n") +
-        "\n\nImport these through db-workspace.ts so gsd-db.ts stays the single-writer implementation, not the caller-facing DB Workspace Interface.",
+        "\n\nImport these through db-workspace.ts so gsd-db.ts stays the writer compatibility barrel, not the caller-facing DB Workspace Interface.",
     );
   }
 });

package/src/resources/extensions/gsd/tests/skill-activation.test.ts

@@ -92,14 +92,14 @@ test("buildSkillActivationBlock activates skills via prefer_skills when context
       prefer_skills: ["react"],
     });
 
-    assert.match(result, /Call Skill\(\{ skill: 'react' \}\)/);
+    assert.match(result, /Read the installed 'react' skill file from <available_skills>/);
     assert.doesNotMatch(result, /swiftui/);
   } finally {
     cleanup(base);
   }
 });
 
-test("buildSkillActivationBlock includes always_use_skills from preferences using exact Skill tool format", () => {
+test("buildSkillActivationBlock includes always_use_skills using read-based skill loading", () => {
   const base = makeTempBase();
   try {
     writeSkill(base, "swift-testing", "Use for Swift Testing assertions and verification patterns.");
@@ -109,7 +109,10 @@ test("buildSkillActivationBlock includes always_use_skills from preferences usin
       always_use_skills: ["swift-testing"],
     });
 
-    assert.equal(result, "<skill_activation>Call Skill({ skill: 'swift-testing' }).</skill_activation>");
+    assert.equal(
+      result,
+      "<skill_activation>Read the installed 'swift-testing' skill file from <available_skills>.</skill_activation>",
+    );
   } finally {
     cleanup(base);
   }
@@ -137,8 +140,8 @@ test("buildSkillActivationBlock includes skill_rules matches and task-plan skill
       skill_rules: [{ when: "prisma database schema", use: ["prisma"] }],
     });
 
-    assert.match(result, /Call Skill\(\{ skill: 'accessibility' \}\)/);
-    assert.match(result, /Call Skill\(\{ skill: 'prisma' \}\)/);
+    assert.match(result, /Read the installed 'accessibility' skill file from <available_skills>/);
+    assert.match(result, /Read the installed 'prisma' skill file from <available_skills>/);
   } finally {
     cleanup(base);
   }
@@ -160,7 +163,7 @@ test("buildSkillActivationBlock matches skill_rules against exact unit type cont
       ],
     });
 
-    assert.match(result, /Call Skill\(\{ skill: 'complete-slice-policies' \}\)/);
+    assert.match(result, /Read the installed 'complete-slice-policies' skill file from <available_skills>/);
     assert.doesNotMatch(result, /slice-broad/);
   } finally {
     cleanup(base);
@@ -264,8 +267,8 @@ test("buildSkillActivationBlock allows valid skill names and rejects invalid one
     });
 
     assert.match(result, /skill_activation/);
-    assert.match(result, /Call Skill\(\{ skill: 'react' \}\)/);
-    assert.match(result, /Call Skill\(\{ skill: 'good-skill-2' \}\)/);
+    assert.match(result, /Read the installed 'react' skill file from <available_skills>/);
+    assert.match(result, /Read the installed 'good-skill-2' skill file from <available_skills>/);
     assert.doesNotMatch(result, /bad'name/);
   } finally {
     cleanup(base);
@@ -289,8 +292,8 @@ test("buildSkillActivationBlock: explicit always_use_skills bypass the unit-type
       always_use_skills: ["write-docs", "swiftui"],
     });
 
-    assert.match(result, /Call Skill\(\{ skill: 'write-docs' \}\)/);
-    assert.match(result, /Call Skill\(\{ skill: 'swiftui' \}\)/);
+    assert.match(result, /Read the installed 'write-docs' skill file from <available_skills>/);
+    assert.match(result, /Read the installed 'swiftui' skill file from <available_skills>/);
   } finally {
     cleanup(base);
   }
@@ -307,7 +310,7 @@ test("buildSkillActivationBlock falls through to all skills for unknown unit typ
     });
 
     // Unknown unit type = wildcard fallback (pre-manifest behavior).
-    assert.match(result, /Call Skill\(\{ skill: 'swiftui' \}\)/);
+    assert.match(result, /Read the installed 'swiftui' skill file from <available_skills>/);
   } finally {
     cleanup(base);
   }
@@ -324,7 +327,7 @@ test("buildSkillActivationBlock without unitType preserves pre-manifest behavior
       always_use_skills: ["swiftui"],
     });
 
-    assert.match(result, /Call Skill\(\{ skill: 'swiftui' \}\)/);
+    assert.match(result, /Read the installed 'swiftui' skill file from <available_skills>/);
   } finally {
     cleanup(base);
   }
@@ -341,12 +344,12 @@ test("milestone prompt builders propagate always_use_skills through buildSkillAc
     loadOnlyTestSkills(base);
 
     const researchPrompt = await buildResearchMilestonePrompt("M001", "Test", base);
-    assert.match(researchPrompt, /Call Skill\(\{ skill: 'write-docs' \}\)/);
-    assert.match(researchPrompt, /Call Skill\(\{ skill: 'swiftui' \}\)/);
+    assert.match(researchPrompt, /Read the installed 'write-docs' skill file from <available_skills>/);
+    assert.match(researchPrompt, /Read the installed 'swiftui' skill file from <available_skills>/);
 
     const planPrompt = await buildPlanMilestonePrompt("M001", "Test", base);
-    assert.match(planPrompt, /Call Skill\(\{ skill: 'write-docs' \}\)/);
-    assert.match(planPrompt, /Call Skill\(\{ skill: 'swiftui' \}\)/);
+    assert.match(planPrompt, /Read the installed 'write-docs' skill file from <available_skills>/);
+    assert.match(planPrompt, /Read the installed 'swiftui' skill file from <available_skills>/);
   } finally {
     cleanup(base);
   }
@@ -377,7 +380,7 @@ test("complete-slice prompt propagates always_use_skills through buildSkillActiv
 
     const prompt = await buildCompleteSlicePrompt("M001", "Test", "S01", "Slice", base);
 
-    assert.match(prompt, /Call Skill\(\{ skill: 'write-docs' \}\)/);
+    assert.match(prompt, /Read the installed 'write-docs' skill file from <available_skills>/);
   } finally {
     cleanup(base);
   }

package/src/resources/extensions/gsd/tests/start-auto-detached.test.ts

@@ -339,7 +339,7 @@ test("resume path only hard-exits on blocked stop, not blocked pause (#6154)", (
   );
 });
 
-test("prepareForUnit skips worktree safety when isolation is not worktree (#6154)", () => {
+test("prepareForUnit enforces worktree safety for all isolation modes (#6154)", () => {
   const orchSrc = readGsdFile("auto/orchestrator.ts");
   const prepareForUnitIdx = orchSrc.indexOf("private async prepareWorktreeForUnit(");
   const prepareForUnitBody = orchSrc.slice(prepareForUnitIdx, orchSrc.indexOf("private classifyAndRecover(", prepareForUnitIdx));
@@ -350,8 +350,12 @@ test("prepareForUnit skips worktree safety when isolation is not worktree (#6154
     "prepareForUnit should resolve the effective isolation mode once",
   );
   assert.ok(
-    prepareForUnitBody.includes('if (isolationMode !== "worktree")'),
-    "prepareForUnit should bypass worktree safety validation outside worktree isolation mode",
+    prepareForUnitBody.includes('const writeScope ='),
+    "prepareForUnit should classify the unit's write scope before validating",
+  );
+  assert.ok(
+    !prepareForUnitBody.includes('if (isolationMode !== "worktree")'),
+    "prepareForUnit must not bypass worktree safety outside worktree isolation mode",
   );
 });
 

package/src/resources/extensions/gsd/tests/stop-auto-race-null-unit.test.ts

@@ -3,7 +3,7 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 
-import { _resolveCurrentUnitStartedAtForTest } from "../auto/phases.ts";
+import { _resolveCurrentUnitStartedAtForTest } from "../auto/phase-helpers.ts";
 
 test("unit started-at resolver tolerates stopAuto clearing currentUnit", () => {
   assert.equal(_resolveCurrentUnitStartedAtForTest(null), undefined);

package/src/resources/extensions/gsd/tests/teardown-chdir-failure-clears-registry.test.ts

@@ -159,4 +159,21 @@ describe("teardown chdir failure clears registry", () => {
     assert.strictEqual(getAutoWorktreeOriginalBase(), null, "registry null after successful teardown");
     assert.strictEqual(getActiveAutoWorktreeContext(), null, "context null after successful teardown");
   });
+
+  test("teardown survives when current working directory was deleted", () => {
+    repoDir = createTempRepo();
+    seedMilestone(repoDir, "M003");
+
+    const worktreePath = createAutoWorktree(repoDir, "M003");
+    process.chdir(worktreePath);
+    rmSync(worktreePath, { recursive: true, force: true });
+
+    assert.doesNotThrow(
+      () => teardownAutoWorktree(repoDir, "M003"),
+      "teardownAutoWorktree should not call process.cwd() unguarded from a deleted cwd",
+    );
+
+    assert.strictEqual(getAutoWorktreeOriginalBase(), null, "registry null after deleted-cwd teardown");
+    assert.strictEqual(getActiveAutoWorktreeContext(), null, "context null after deleted-cwd teardown");
+  });
 });

package/src/resources/extensions/gsd/tests/token-tool-gating.test.ts

@@ -365,13 +365,14 @@ test("buildMinimalAutoGsdToolSet includes closeout tool for complete-slice", ()
     "gsd_complete_slice",
     "memory_query",
     "capture_thought",
+    "gsd_capture_thought",
   ], "complete-slice");
 
   assert.ok(result.includes("gsd_slice_complete"));
   assert.ok(result.includes("gsd_task_reopen"));
   assert.ok(result.includes("gsd_replan_slice"));
   assert.ok(result.includes("subagent"));
-  assert.ok(result.includes("capture_thought"));
+  assert.ok(result.includes("gsd_capture_thought"));
   assert.ok(!result.includes("gsd_task_complete"));
   assert.ok(!result.includes("gsd_complete_slice"));
 });
@@ -387,6 +388,7 @@ test("buildMinimalAutoGsdToolSet preserves workflow MCP-namespaced closeout tool
     "mcp__gsd-workflow__gsd_exec",
     "mcp__gsd-workflow__memory_query",
     "mcp__gsd-workflow__capture_thought",
+    "mcp__gsd-workflow__gsd_capture_thought",
   ], "complete-slice");
 
   assert.ok(result.includes("mcp__gsd-workflow__gsd_task_reopen"));
@@ -395,7 +397,7 @@ test("buildMinimalAutoGsdToolSet preserves workflow MCP-namespaced closeout tool
   assert.ok(!result.includes("mcp__gsd-workflow__gsd_complete_slice"));
   assert.ok(result.includes("mcp__gsd-workflow__gsd_exec"));
   assert.ok(result.includes("mcp__gsd-workflow__memory_query"));
-  assert.ok(result.includes("mcp__gsd-workflow__capture_thought"));
+  assert.ok(result.includes("mcp__gsd-workflow__gsd_capture_thought"));
 });
 
 test("buildMinimalAutoGsdToolSet covers execute-task-simple", () => {