gsd-pi 2.79.0-dev.ece5fd8ba → 2.80.0-dev.b62439b9f

package/src/resources/extensions/gsd/tests/forensics-prompt-rendering.test.ts

@@ -0,0 +1,36 @@
+// Project/App: GSD-2
+// File Purpose: Verifies the forensics prompt renders required investigation and issue-routing guidance.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+test("forensics prompt renders compact investigation and issue routing guidance", async (t) => {
+  const previousGsdHome = process.env.GSD_HOME;
+  const providedGsdHome = process.env.GSD_TEST_HOME;
+  const isolatedHome = providedGsdHome ?? mkdtempSync(join(tmpdir(), "gsd-forensics-render-"));
+  process.env.GSD_HOME = isolatedHome;
+  t.after(() => {
+    if (previousGsdHome === undefined) delete process.env.GSD_HOME;
+    else process.env.GSD_HOME = previousGsdHome;
+    if (!providedGsdHome) rmSync(isolatedHome, { recursive: true, force: true });
+  });
+
+  const { loadPrompt } = await import(`../prompt-loader.ts?test=${Date.now()}`);
+  const prompt = loadPrompt("forensics", {
+    problemDescription: "Auto-mode repeats the same unit.",
+    forensicData: "stuck-detected event for execute-task/M001/S01/T01",
+    gsdSourceDir: process.env.GSD_TEST_WORKSPACE_ROOT ?? process.cwd(),
+    dedupSection: "No duplicate issue found.",
+  });
+
+  assert.match(prompt, /Investigation Protocol/);
+  assert.match(prompt, /gsd_milestone_status/);
+  assert.match(prompt, /sqlite3 .gsd\/gsd.db/);
+  assert.match(prompt, /gh issue create --repo gsd-build\/gsd-2/);
+  assert.match(prompt, /Do NOT use the `github_issues` tool/);
+  assert.match(prompt, /Redaction Rules/);
+  assert.doesNotMatch(prompt, /\{\{[a-zA-Z][a-zA-Z0-9_]*\}\}/);
+});

package/src/resources/extensions/gsd/tests/graph-operations.test.ts

@@ -233,6 +233,16 @@ describe("getNextPendingStep", () => {
     const next = getNextPendingStep(graph);
     assert.equal(next?.id, "b");
   });
+
+  it("treats expanded dependencies as satisfied", (t) => {
+    const graph = makeGraph([
+      makeStep({ id: "iter", status: "expanded" }),
+      makeStep({ id: "after", dependsOn: ["iter"] }),
+    ]);
+
+    const next = getNextPendingStep(graph);
+    assert.equal(next?.id, "after");
+  });
 });
 
 // ─── markStepComplete ────────────────────────────────────────────────────

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

@@ -1,3 +1,5 @@
+// GSD Extension - Database regression tests.
+
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 import * as fs from 'node:fs';
@@ -29,7 +31,10 @@ import {
   getTask,
   getSliceTasks,
   checkpointDatabase,
+  refreshOpenDatabaseFromDisk,
+  tryCreateMemoriesFts,
 } from '../gsd-db.ts';
+import { _resetLogs, peekLogs, setStderrLoggingEnabled } from '../workflow-logger.ts';
 
 const _require = createRequire(import.meta.url);
 
@@ -910,6 +915,31 @@ describe('gsd-db', () => {
     closeDatabase();
   });
 
+  test('gsd-db: FTS5 unavailable warning normalizes provider typo', () => {
+    const previousStderr = setStderrLoggingEnabled(false);
+    _resetLogs();
+    try {
+      const ok = tryCreateMemoriesFts({
+        exec(): void {
+          throw new Error('no such moduel : fts5');
+        },
+        prepare(): never {
+          throw new Error('prepare should not be called');
+        },
+        close(): void {},
+      });
+
+      assert.equal(ok, false, 'FTS5 creation should report fallback');
+      const warning = peekLogs().find((entry) => entry.component === 'db' && entry.message.includes('FTS5 unavailable'));
+      assert.ok(warning, 'FTS5 fallback warning should be logged');
+      assert.match(warning!.message, /no such module: fts5/);
+      assert.doesNotMatch(warning!.message, /moduel/);
+    } finally {
+      _resetLogs();
+      setStderrLoggingEnabled(previousStderr);
+    }
+  });
+
   // ─── checkpointDatabase ────────────────────────────────────────────────────
 
   describe('checkpointDatabase', () => {
@@ -952,6 +982,71 @@ describe('gsd-db', () => {
     });
   });
 
+  // ─── refreshOpenDatabaseFromDisk ───────────────────────────────────────────
+
+  describe('refreshOpenDatabaseFromDisk', () => {
+    test('refreshOpenDatabaseFromDisk: reopens the active file-backed database and sees external writes', (t) => {
+      const dbPath = tempDbPath();
+      t.after(() => cleanup(dbPath));
+
+      openDatabase(dbPath);
+      insertMilestone({ id: 'M001', title: 'Test', status: 'active' });
+      insertSlice({
+        id: 'S01',
+        milestoneId: 'M001',
+        title: 'Slice 1',
+        status: 'pending',
+        sequence: 1,
+      });
+      insertTask({
+        id: 'T01',
+        milestoneId: 'M001',
+        sliceId: 'S01',
+        title: 'Task 1',
+        status: 'pending',
+        sequence: 1,
+      });
+
+      const adapterBefore = _getAdapter()!;
+
+      const externalDb = openRawSqliteForTest(dbPath);
+      try {
+        externalDb.exec(`
+          INSERT INTO tasks (milestone_id, slice_id, id, title, status, sequence)
+          VALUES ('M001', 'S01', 'T02', 'Task 2', 'pending', 2)
+        `);
+      } finally {
+        externalDb.close();
+      }
+
+      const visibleBeforeRefresh = getSliceTasks('M001', 'S01').map(task => task.id);
+      assert.ok(visibleBeforeRefresh.includes('T01'));
+
+      assert.equal(refreshOpenDatabaseFromDisk(), true);
+      assert.notEqual(_getAdapter(), adapterBefore, 'refresh must replace the active adapter rather than becoming a no-op');
+      const sliceTaskIds = getSliceTasks('M001', 'S01').map(task => task.id);
+      assert.deepEqual(sliceTaskIds, ['T01', 'T02']);
+      assert.equal(isDbAvailable(), true);
+    });
+
+    test('refreshOpenDatabaseFromDisk: refuses in-memory databases without closing them', () => {
+      openDatabase(':memory:');
+      insertMilestone({ id: 'M001', title: 'Test', status: 'active' });
+
+      assert.equal(refreshOpenDatabaseFromDisk(), false);
+      assert.equal(isDbAvailable(), true);
+      assert.ok(_getAdapter()!.prepare("SELECT 1 FROM milestones WHERE id = 'M001'").get());
+
+      closeDatabase();
+    });
+
+    test('refreshOpenDatabaseFromDisk: is a no-op when no database is open', () => {
+      closeDatabase();
+      assert.equal(refreshOpenDatabaseFromDisk(), false);
+      assert.equal(isDbAvailable(), false);
+    });
+  });
+
   // ─── getDbStatus ───────────────────────────────────────────────────────────
 
   describe('getDbStatus', () => {

package/src/resources/extensions/gsd/tests/guided-discuss-milestone-prompt-rendering.test.ts

@@ -0,0 +1,43 @@
+// Project/App: GSD-2
+// File Purpose: Verifies the guided milestone discussion prompt renders its core interview and persistence contracts.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+test("guided milestone prompt renders compact interview and context guidance", async (t) => {
+  const previousGsdHome = process.env.GSD_HOME;
+  const providedGsdHome = process.env.GSD_TEST_HOME;
+  const isolatedHome = providedGsdHome ?? mkdtempSync(join(tmpdir(), "gsd-guided-milestone-render-"));
+  process.env.GSD_HOME = isolatedHome;
+  t.after(() => {
+    if (previousGsdHome === undefined) delete process.env.GSD_HOME;
+    else process.env.GSD_HOME = previousGsdHome;
+    if (!providedGsdHome) rmSync(isolatedHome, { recursive: true, force: true });
+  });
+
+  const { loadPrompt } = await import(`../prompt-loader.ts?test=${Date.now()}`);
+  const prompt = loadPrompt("guided-discuss-milestone", {
+    workingDirectory: process.env.GSD_TEST_WORKSPACE_ROOT ?? process.cwd(),
+    milestoneId: "M001",
+    milestoneTitle: "Baseline And Safety",
+    structuredQuestionsAvailable: "true",
+    fastPathInstruction: "No fast path in this test.",
+    inlinedTemplates: "## Context\n\n## Decisions\n\n## Open Questions",
+    commitInstruction: "Do not commit during this test.",
+  });
+
+  assert.match(prompt, /M001 context written/);
+  assert.match(prompt, /Project Shape/);
+  assert.match(prompt, /default to `complex`/i);
+  assert.match(prompt, /3 or 4 concrete, researched options/);
+  assert.match(prompt, /"Other — let me discuss"/);
+  assert.match(prompt, /CONTEXT-DRAFT/);
+  assert.match(prompt, /Do NOT mention this save to the user/);
+  assert.match(prompt, /depth_verification_M001_confirm/);
+  assert.match(prompt, /artifact_type: "CONTEXT"/);
+  assert.match(prompt, /milestone_id: M001/);
+  assert.doesNotMatch(prompt, /\{\{[a-zA-Z][a-zA-Z0-9_]*\}\}/);
+});

package/src/resources/extensions/gsd/tests/guided-discuss-project-prompt-rendering.test.ts

@@ -0,0 +1,41 @@
+// Project/App: GSD-2
+// File Purpose: Verifies the guided project discussion prompt renders its core interview and persistence contracts.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+test("guided project prompt renders compact interview and artifact guidance", async (t) => {
+  const previousGsdHome = process.env.GSD_HOME;
+  const providedGsdHome = process.env.GSD_TEST_HOME;
+  const isolatedHome = providedGsdHome ?? mkdtempSync(join(tmpdir(), "gsd-guided-project-render-"));
+  process.env.GSD_HOME = isolatedHome;
+  t.after(() => {
+    if (previousGsdHome === undefined) delete process.env.GSD_HOME;
+    else process.env.GSD_HOME = previousGsdHome;
+    if (!providedGsdHome) rmSync(isolatedHome, { recursive: true, force: true });
+  });
+
+  const { loadPrompt } = await import(`../prompt-loader.ts?test=${Date.now()}`);
+  const prompt = loadPrompt("guided-discuss-project", {
+    workingDirectory: process.env.GSD_TEST_WORKSPACE_ROOT ?? process.cwd(),
+    structuredQuestionsAvailable: "true",
+    inlinedTemplates: "## Project\n\n## Project Shape\n\n## Capability Contract\n\n## Milestone Sequence",
+    commitInstruction: "Do not commit during this test.",
+  });
+
+  assert.match(prompt, /What do you want to build\?/);
+  assert.match(prompt, /Project shape: simple/);
+  assert.match(prompt, /Default to `complex` when uncertain/);
+  assert.match(prompt, /3 or 4 concrete, researched options/);
+  assert.match(prompt, /"Other — let me discuss"/);
+  assert.match(prompt, /depth_verification_project_confirm/);
+  assert.match(prompt, /artifact_type: "PROJECT"/);
+  assert.match(prompt, /omit `milestone_id`/);
+  assert.match(prompt, /Do NOT use `artifact_type: "CONTEXT"` and do NOT pass `milestone_id: "PROJECT"`/);
+  assert.match(prompt, /\*\*Complexity:\*\* simple/);
+  assert.match(prompt, /\*\*Complexity:\*\* complex/);
+  assert.doesNotMatch(prompt, /\{\{[a-zA-Z][a-zA-Z0-9_]*\}\}/);
+});

package/src/resources/extensions/gsd/tests/guided-discuss-requirements-prompt-rendering.test.ts

@@ -0,0 +1,45 @@
+// Project/App: GSD-2
+// File Purpose: Verifies the guided requirements discussion prompt renders core requirements and persistence contracts.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+test("guided requirements prompt renders compact capability and persistence guidance", async (t) => {
+  const previousGsdHome = process.env.GSD_HOME;
+  const providedGsdHome = process.env.GSD_TEST_HOME;
+  const isolatedHome = providedGsdHome ?? mkdtempSync(join(tmpdir(), "gsd-guided-requirements-render-"));
+  process.env.GSD_HOME = isolatedHome;
+  t.after(() => {
+    if (previousGsdHome === undefined) delete process.env.GSD_HOME;
+    else process.env.GSD_HOME = previousGsdHome;
+    if (!providedGsdHome) rmSync(isolatedHome, { recursive: true, force: true });
+  });
+
+  const { loadPrompt } = await import(`../prompt-loader.ts?test=${Date.now()}`);
+  const prompt = loadPrompt("guided-discuss-requirements", {
+    workingDirectory: process.env.GSD_TEST_WORKSPACE_ROOT ?? process.cwd(),
+    structuredQuestionsAvailable: "true",
+    inlinedTemplates: "## Active\n\n## Validated\n\n## Deferred\n\n## Out of Scope\n\n## Traceability\n\n## Coverage Summary",
+    commitInstruction: "Do not commit during this test.",
+  });
+
+  assert.match(prompt, /PROJECT\.md missing/);
+  assert.match(prompt, /Project Shape/);
+  assert.match(prompt, /R###/);
+  assert.match(prompt, /M###\/none yet/);
+  assert.match(prompt, /never bare `none yet`/);
+  assert.match(prompt, /3 or 4 concrete, researched options/);
+  assert.match(prompt, /"Other — let me discuss"/);
+  assert.match(prompt, /class-assignment and status questions are exempt/);
+  assert.match(prompt, /artifact_type: "REQUIREMENTS-DRAFT"/);
+  assert.match(prompt, /depth_verification_requirements_confirm/);
+  assert.match(prompt, /gsd_requirement_save/);
+  assert.match(prompt, /gsd_summary_save/);
+  assert.match(prompt, /artifact_type: "REQUIREMENTS"/);
+  assert.match(prompt, /Do NOT use `artifact_type: "CONTEXT"`/);
+  assert.match(prompt, /Requirements written\./);
+  assert.doesNotMatch(prompt, /\{\{[a-zA-Z][a-zA-Z0-9_]*\}\}/);
+});

package/src/resources/extensions/gsd/tests/headless-answers.test.ts

@@ -11,7 +11,7 @@ import assert from 'node:assert/strict';
 import { mkdirSync, writeFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
-import { loadAndValidateAnswerFile, AnswerInjector } from '../../../../headless-answers.ts';
+import { loadAndValidateAnswerFile, AnswerInjector } from '../../../../headless/headless-answers.ts';
 
 function makeTempDir(prefix: string): string {
   const dir = join(tmpdir(), `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2)}`);

package/src/resources/extensions/gsd/tests/headless-query.test.ts

@@ -11,8 +11,8 @@ import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 
-import { handleQuery } from '../../../../headless-query.ts'
-import type { QuerySnapshot } from '../../../../headless-query.ts'
+import { handleQuery } from '../../../../headless/headless-query.ts'
+import type { QuerySnapshot } from '../../../../headless/headless-query.ts'
 import { invalidateStateCache } from '../state.ts'
 
 // ─── Fixture Helpers ────────────────────────────────────────────────────────

package/src/resources/extensions/gsd/tests/integration/auto-recovery.test.ts

@@ -1,3 +1,5 @@
+// GSD Extension — Auto recovery integration tests.
+
 import test from "node:test";
 import assert from "node:assert/strict";
 import { mkdirSync, writeFileSync, existsSync, readFileSync, rmSync, chmodSync } from "node:fs";
@@ -401,6 +403,57 @@ test("verifyExpectedArtifact plan-slice fails for plan with no tasks (#699)", (t
   assert.equal(result, false, "should fail when plan has no task entries (empty scaffold, #699)");
 });
 
+test("verifyExpectedArtifact plan-slice trusts DB tasks over legacy plan syntax", (t) => {
+  const base = makeTmpBase();
+  t.after(() => {
+    closeDatabase();
+    cleanup(base);
+  });
+
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  insertMilestone({ id: "M001", title: "Milestone", status: "active" });
+  insertSlice({ id: "S01", milestoneId: "M001", title: "Slice", status: "pending" });
+  insertTask({ id: "T01", milestoneId: "M001", sliceId: "S01", title: "First task", status: "pending" });
+  insertTask({ id: "T02", milestoneId: "M001", sliceId: "S01", title: "Second task", status: "pending" });
+
+  const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
+  const tasksDir = join(sliceDir, "tasks");
+  writeFileSync(
+    join(sliceDir, "S01-PLAN.md"),
+    "# S01: Slice\n\n## Tasks\n\nTask rows live in the DB; this projection intentionally has no legacy task syntax.\n",
+  );
+  writeFileSync(join(tasksDir, "T01-PLAN.md"), "# T01 Plan\n");
+  writeFileSync(join(tasksDir, "T02-PLAN.md"), "# T02 Plan\n");
+
+  const result = verifyExpectedArtifact("plan-slice", "M001/S01", base);
+  assert.equal(result, true, "DB task rows plus task plan files should verify plan-slice");
+});
+
+test("verifyExpectedArtifact plan-slice still fails when a DB-backed task plan file is missing", (t) => {
+  const base = makeTmpBase();
+  t.after(() => {
+    closeDatabase();
+    cleanup(base);
+  });
+
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  insertMilestone({ id: "M001", title: "Milestone", status: "active" });
+  insertSlice({ id: "S01", milestoneId: "M001", title: "Slice", status: "pending" });
+  insertTask({ id: "T01", milestoneId: "M001", sliceId: "S01", title: "First task", status: "pending" });
+  insertTask({ id: "T02", milestoneId: "M001", sliceId: "S01", title: "Second task", status: "pending" });
+
+  const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
+  const tasksDir = join(sliceDir, "tasks");
+  writeFileSync(
+    join(sliceDir, "S01-PLAN.md"),
+    "# S01: Slice\n\n## Tasks\n\nTask rows live in the DB; this projection intentionally has no legacy task syntax.\n",
+  );
+  writeFileSync(join(tasksDir, "T01-PLAN.md"), "# T01 Plan\n");
+
+  const result = verifyExpectedArtifact("plan-slice", "M001/S01", base);
+  assert.equal(result, false, "DB task rows must still require matching task plan files");
+});
+
 // ─── verifyExpectedArtifact: heading-style plan tasks (#1691) ─────────────
 
 test("verifyExpectedArtifact accepts plan-slice with heading-style tasks (### T01 --)", (t) => {
@@ -456,6 +509,32 @@ test("verifyExpectedArtifact accepts plan-slice with colon-style heading tasks (
   );
 });
 
+test("verifyExpectedArtifact accepts indented legacy plan-slice task markers", (t) => {
+  const base = makeTmpBase();
+  t.after(() => cleanup(base));
+
+  const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
+  const tasksDir = join(sliceDir, "tasks");
+  mkdirSync(tasksDir, { recursive: true });
+  writeFileSync(join(sliceDir, "S01-PLAN.md"), [
+    "# S01: Test Slice",
+    "",
+    "## Tasks",
+    "",
+    "  - [ ] **T01: Implement feature** `est:1h`",
+    "",
+    "  ### T02 -- Write tests",
+  ].join("\n"));
+  writeFileSync(join(tasksDir, "T01-PLAN.md"), "# T01 Plan");
+  writeFileSync(join(tasksDir, "T02-PLAN.md"), "# T02 Plan");
+
+  assert.strictEqual(
+    verifyExpectedArtifact("plan-slice", "M001/S01", base),
+    true,
+    "Indented legacy task markers should be treated as completed plan-slice artifacts",
+  );
+});
+
 test("verifyExpectedArtifact execute-task rejects heading-style plan without checked checkbox (#3607)", (t) => {
   const base = makeTmpBase();
   t.after(() => cleanup(base));

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

@@ -24,6 +24,7 @@ import {
 } from "../../auto-worktree.ts";
 import { getSliceBranchName } from "../../worktree.ts";
 import { nativeMergeSquash } from "../../native-git-bridge.ts";
+import { drainLogs, setStderrLoggingEnabled } from "../../workflow-logger.ts";
 
 function run(cmd: string, cwd: string): string {
   // Safe: all inputs are hardcoded test strings, not user input
@@ -251,6 +252,42 @@ describe("auto-worktree-milestone-merge", { timeout: 300_000 }, () => {
     assert.strictEqual(typeof result.pushed, "boolean", "pushed flag remains boolean");
   });
 
+  test("external .gsd and local-only auto_push closeout without cleanup or push warnings", () => {
+    const { repo, externalState } = freshRepoWithExternalGsd();
+    const previousStderr = setStderrLoggingEnabled(false);
+    drainLogs();
+
+    try {
+      writeFileSync(
+        join(externalState, "PREFERENCES.md"),
+        "---\nversion: 1\n---\n\ngit:\n  auto_push: true\n",
+      );
+      mkdirSync(join(externalState, "milestones", "M041"), { recursive: true });
+      mkdirSync(join(externalState, "runtime", "units"), { recursive: true });
+      writeFileSync(join(externalState, "runtime", "units", "leftover.json"), "{}\n");
+
+      const wtPath = createAutoWorktree(repo, "M041");
+      addSliceToMilestone(repo, wtPath, "M041", "S01", "Local-only push", [
+        { file: "local-only.ts", content: "export const localOnly = true;\n", message: "add local only file" },
+      ]);
+
+      const roadmap = makeRoadmap("M041", "Local-only closeout", [
+        { id: "S01", title: "Local-only push" },
+      ]);
+
+      const result = mergeMilestoneToMain(repo, "M041", roadmap);
+      const logs = drainLogs();
+      const messages = logs.map((entry) => entry.message).join("\n");
+
+      assert.equal(result.pushed, false, "local-only repo should not report pushed");
+      assert.ok(!messages.includes("untracked file cleanup failed"), "external .gsd cleanup should not call git on paths outside the repo");
+      assert.ok(!messages.includes("git push failed"), "missing origin should skip auto-push instead of running git push");
+    } finally {
+      drainLogs();
+      setStderrLoggingEnabled(previousStderr);
+    }
+  });
+
   test("auto-resolve .gsd/ state file conflicts", () => {
     const repo = freshRepo();
     const wtPath = createAutoWorktree(repo, "M050");

package/src/resources/extensions/gsd/tests/integration/state-machine-live-validation.test.ts

@@ -575,7 +575,7 @@ describe("state-machine-live-validation", () => {
       assert.match((result as any).error, /verification did not pass/);
     });
 
-    test("double milestone completion returns error", async () => {
+    test("double milestone completion is idempotent", async () => {
       base = createFullFixture();
       openDatabase(join(base, ".gsd", "gsd.db"));
       insertMilestone({ id: "M001", title: "Done", status: "complete" });
@@ -583,8 +583,10 @@ describe("state-machine-live-validation", () => {
       insertTask({ id: "T01", sliceId: "S01", milestoneId: "M001", status: "complete" });
 
       const result = await handleCompleteMilestone(makeMilestoneParams("M001") as any, base);
-      assert.ok("error" in result);
-      assert.match((result as any).error, /already complete/);
+      assert.ok(!("error" in result), `already-complete milestone should be accepted: ${JSON.stringify(result)}`);
+      assert.equal(result.alreadyComplete, true);
+      assert.match(result.summaryPath, /M001-SUMMARY\.md$/);
+      assert.ok(isClosedStatus(getMilestone("M001")!.status), "milestone remains closed");
     });
   });
 

package/src/resources/extensions/gsd/tests/journal-integration.test.ts

@@ -399,6 +399,140 @@ test("runDispatch pauses when complete-milestone summary exists on disk but the
   assert.equal(stopCalls, 0, "mismatch pause should not hard-stop the loop");
 });
 
+test("runDispatch clears stuck state after Level 1 artifact recovery", async (t) => {
+  const capture = createEventCapture();
+  let invalidateCalls = 0;
+  let stopCalls = 0;
+  const base = join(tmpdir(), `gsd-stuck-plan-${randomUUID()}`);
+  t.after(() => {
+    closeDatabase();
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
+  const tasksDir = join(sliceDir, "tasks");
+  mkdirSync(tasksDir, { recursive: true });
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  insertMilestone({ id: "M001", title: "Test", status: "active" });
+  insertSlice({ id: "S01", milestoneId: "M001", title: "Slice", status: "pending" });
+  insertTask({ id: "T01", milestoneId: "M001", sliceId: "S01", title: "First task", status: "pending" });
+  writeFileSync(join(sliceDir, "S01-PLAN.md"), "# S01\n\n## Tasks\n\n- [ ] **T01: First task** `est:1h`\n");
+  writeFileSync(join(tasksDir, "T01-PLAN.md"), "# T01 Plan\n");
+
+  const deps = makeMockDeps(capture, {
+    invalidateAllCaches: () => { invalidateCalls++; },
+    stopAuto: async () => { stopCalls++; },
+    resolveDispatch: async () => ({
+      action: "dispatch" as const,
+      unitType: "plan-slice",
+      unitId: "M001/S01",
+      prompt: "plan the slice",
+      matchedRule: "planning → plan-slice",
+    }),
+  });
+  const ic = makeIC(deps, {
+    s: {
+      ...makeSession(),
+      basePath: base,
+      originalBasePath: base,
+    } as any,
+  });
+  const preData: PreDispatchData = {
+    state: {
+      phase: "planning",
+      activeMilestone: { id: "M001", title: "Test", status: "active" },
+      activeSlice: { id: "S01", title: "Slice" },
+      registry: [{ id: "M001", status: "active" }],
+      blockers: [],
+    } as any,
+    mid: "M001",
+    midTitle: "Test Milestone",
+  };
+  const loopState: LoopState = {
+    recentUnits: [
+      { key: "plan-slice/M001/S01" },
+      { key: "plan-slice/M001/S01" },
+    ],
+    stuckRecoveryAttempts: 0,
+    consecutiveFinalizeTimeouts: 0,
+  };
+
+  const result = await runDispatch(ic, preData, loopState);
+
+  assert.equal(result.action, "continue");
+  assert.equal(invalidateCalls, 1, "Level 1 artifact recovery should invalidate caches");
+  assert.equal(stopCalls, 0, "Level 1 artifact recovery should not hard-stop");
+  assert.deepEqual(loopState.recentUnits, [], "Level 1 artifact recovery should clear the stuck window");
+  assert.equal(loopState.stuckRecoveryAttempts, 0, "Level 1 artifact recovery should reset the recovery counter");
+});
+
+test("runDispatch escapes Level 2 stuck stop when artifact verifies after cache invalidation", async (t) => {
+  const capture = createEventCapture();
+  let invalidateCalls = 0;
+  let stopCalls = 0;
+  const base = join(tmpdir(), `gsd-stuck-plan-l2-${randomUUID()}`);
+  t.after(() => {
+    closeDatabase();
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  const sliceDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
+  const tasksDir = join(sliceDir, "tasks");
+  mkdirSync(tasksDir, { recursive: true });
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  insertMilestone({ id: "M001", title: "Test", status: "active" });
+  insertSlice({ id: "S01", milestoneId: "M001", title: "Slice", status: "pending" });
+  insertTask({ id: "T01", milestoneId: "M001", sliceId: "S01", title: "First task", status: "pending" });
+  writeFileSync(join(sliceDir, "S01-PLAN.md"), "# S01\n\n## Tasks\n\n- [ ] **T01: First task** `est:1h`\n");
+  writeFileSync(join(tasksDir, "T01-PLAN.md"), "# T01 Plan\n");
+
+  const deps = makeMockDeps(capture, {
+    invalidateAllCaches: () => { invalidateCalls++; },
+    stopAuto: async () => { stopCalls++; },
+    resolveDispatch: async () => ({
+      action: "dispatch" as const,
+      unitType: "plan-slice",
+      unitId: "M001/S01",
+      prompt: "plan the slice",
+      matchedRule: "planning → plan-slice",
+    }),
+  });
+  const ic = makeIC(deps, {
+    s: {
+      ...makeSession(),
+      basePath: base,
+      originalBasePath: base,
+    } as any,
+  });
+  const preData: PreDispatchData = {
+    state: {
+      phase: "planning",
+      activeMilestone: { id: "M001", title: "Test", status: "active" },
+      activeSlice: { id: "S01", title: "Slice" },
+      registry: [{ id: "M001", status: "active" }],
+      blockers: [],
+    } as any,
+    mid: "M001",
+    midTitle: "Test Milestone",
+  };
+  const loopState: LoopState = {
+    recentUnits: [
+      { key: "plan-slice/M001/S01" },
+      { key: "plan-slice/M001/S01" },
+    ],
+    stuckRecoveryAttempts: 1,
+    consecutiveFinalizeTimeouts: 0,
+  };
+
+  const result = await runDispatch(ic, preData, loopState);
+
+  assert.equal(result.action, "continue");
+  assert.equal(invalidateCalls, 1, "Level 2 escape should invalidate caches before rechecking artifacts");
+  assert.equal(stopCalls, 0, "verified artifacts should escape Level 2 hard stop");
+  assert.deepEqual(loopState.recentUnits, [], "Level 2 artifact escape should clear the stuck window");
+  assert.equal(loopState.stuckRecoveryAttempts, 0, "Level 2 artifact escape should reset the recovery counter");
+});
+
 test("runUnitPhase emits unit-start and unit-end with causedBy reference", async () => {
   const capture = createEventCapture();