@opengsd/gsd-pi 1.2.0-dev.844675c9 → 1.2.0-dev.8e6112e9

package/src/resources/extensions/gsd/tests/unit-closeout.test.ts

@@ -0,0 +1,209 @@
+// gsd-pi — ADR-032 Unit Closeout module tests (Interactive Closeout adapter path).
+//
+// All git/preference/notification effects go through the injected deps seam —
+// no real repos, no notification store state.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import {
+  closeUnit,
+  isUnitCloseoutTool,
+  runInteractiveUnitCloseout,
+  type UnitCloseoutDeps,
+} from "../unit-closeout.ts";
+
+interface DepsLog {
+  commits: Array<{ unitType: string; unitId: string }>;
+  notices: Array<{ message: string; severity: string }>;
+}
+
+function makeDeps(overrides: {
+  isolation?: "none" | "worktree" | "branch";
+  branch?: string | null;
+  commitResult?: string | null | (() => string | null);
+} = {}): { deps: UnitCloseoutDeps; log: DepsLog } {
+  const log: DepsLog = { commits: [], notices: [] };
+  const deps: UnitCloseoutDeps = {
+    isolationMode: () => overrides.isolation ?? "none",
+    currentBranch: () => (overrides.branch === undefined ? "main" : overrides.branch),
+    commit: (_basePath, unitType, unitId) => {
+      log.commits.push({ unitType, unitId });
+      const result = overrides.commitResult;
+      if (typeof result === "function") return result();
+      return result === undefined ? "chore(gsd): closeout" : result;
+    },
+    notify: (message, severity) => {
+      log.notices.push({ message, severity });
+    },
+  };
+  return { deps, log };
+}
+
+const BASE = "/tmp/closeout-test-project";
+
+test("task boundary commits and stays quiet", () => {
+  const { deps, log } = makeDeps({ isolation: "worktree" });
+  const result = closeUnit(
+    { basePath: BASE, unitType: "execute-task", unitId: "M001/S01/T01", boundary: "task", outcome: "complete" },
+    deps,
+  );
+  assert.equal(result.gitVerdict, "committed");
+  assert.equal(result.notice, undefined);
+  assert.deepEqual(log.commits, [{ unitType: "execute-task", unitId: "M001/S01/T01" }]);
+  assert.equal(log.notices.length, 0);
+});
+
+test("milestone boundary under isolation none commits without a notice", () => {
+  const { deps, log } = makeDeps({ isolation: "none" });
+  const result = closeUnit(
+    { basePath: BASE, unitType: "complete-milestone", unitId: "M001", boundary: "milestone", outcome: "complete" },
+    deps,
+  );
+  assert.equal(result.gitVerdict, "committed");
+  assert.equal(log.notices.length, 0);
+});
+
+test("milestone boundary off-worktree under isolation worktree fails closed loudly", () => {
+  const { deps, log } = makeDeps({ isolation: "worktree", branch: "main" });
+  const result = closeUnit(
+    { basePath: BASE, unitType: "complete-milestone", unitId: "M001", boundary: "milestone", outcome: "complete" },
+    deps,
+  );
+  assert.equal(result.gitVerdict, "isolation-bypassed");
+  assert.equal(log.notices.length, 1);
+  assert.equal(log.notices[0].severity, "warning");
+  assert.match(log.notices[0].message, /isolation preference was not honoured/);
+  assert.match(log.notices[0].message, /git\.isolation is "worktree"/);
+  assert.match(log.notices[0].message, /committed directly on "main"/);
+});
+
+test("milestone boundary on a milestone branch defers the merge to worktree tooling", () => {
+  const { deps, log } = makeDeps({ isolation: "worktree", branch: "milestone/M001" });
+  const result = closeUnit(
+    { basePath: BASE, unitType: "complete-milestone", unitId: "M001", boundary: "milestone", outcome: "complete" },
+    deps,
+  );
+  assert.equal(result.gitVerdict, "milestone-branch");
+  assert.equal(log.notices.length, 1);
+  assert.equal(log.notices[0].severity, "info");
+  assert.match(log.notices[0].message, /worktree merge/);
+});
+
+test("clean tree records nothing-to-commit, and the bypass notice says so", () => {
+  const { deps, log } = makeDeps({ isolation: "branch", branch: "main", commitResult: null });
+  const result = closeUnit(
+    { basePath: BASE, unitType: "complete-milestone", unitId: "M001", boundary: "milestone", outcome: "complete" },
+    deps,
+  );
+  assert.equal(result.gitVerdict, "isolation-bypassed");
+  assert.equal(result.commitMessage, null);
+  assert.match(log.notices[0].message, /nothing left to commit/);
+});
+
+test("commit failure is surfaced, never thrown", () => {
+  const { deps, log } = makeDeps({
+    commitResult: () => {
+      throw new Error("index.lock exists");
+    },
+  });
+  const result = closeUnit(
+    { basePath: BASE, unitType: "complete-milestone", unitId: "M001", boundary: "milestone", outcome: "complete" },
+    deps,
+  );
+  assert.equal(result.gitVerdict, "commit-failed");
+  assert.equal(log.notices[0].severity, "error");
+  assert.match(log.notices[0].message, /index\.lock/);
+});
+
+test("re-entrancy is safe: a re-fire over an already-clean tree is nothing-to-commit", () => {
+  // No result cache — re-entrancy is absorbed by git itself. The second fire
+  // sees a clean tree (commit returns null) and records nothing-to-commit.
+  let firstFire = true;
+  const { deps, log } = makeDeps({
+    isolation: "worktree",
+    branch: "main",
+    commitResult: () => {
+      const committed = firstFire;
+      firstFire = false;
+      return committed ? "chore(gsd): closeout" : null;
+    },
+  });
+  const request = {
+    basePath: BASE,
+    unitType: "complete-milestone",
+    unitId: "M001",
+    boundary: "milestone" as const,
+    outcome: "complete" as const,
+  };
+  const first = closeUnit(request, deps);
+  const second = closeUnit(request, deps);
+  assert.equal(first.gitVerdict, "isolation-bypassed");
+  assert.equal(first.commitMessage, "chore(gsd): closeout");
+  assert.equal(second.gitVerdict, "isolation-bypassed");
+  assert.equal(second.commitMessage, null);
+  assert.match(second.notice ?? "", /nothing left to commit/);
+  assert.equal(log.commits.length, 2);
+});
+
+// ─── Interactive adapter mapping ──────────────────────────────────────────
+
+test("isUnitCloseoutTool recognizes exactly the closeout tools", () => {
+  assert.equal(isUnitCloseoutTool("gsd_complete_milestone"), true);
+  assert.equal(isUnitCloseoutTool("gsd_save_gate_result"), false);
+  assert.equal(isUnitCloseoutTool("read"), false);
+});
+
+test("interactive adapter is scoped to milestone boundaries — task/slice tools do not commit", () => {
+  const { deps, log } = makeDeps();
+  assert.equal(isUnitCloseoutTool("gsd_task_complete"), false);
+  assert.equal(isUnitCloseoutTool("gsd_slice_complete"), false);
+  assert.equal(
+    runInteractiveUnitCloseout(
+      { basePath: BASE, canonicalToolName: "gsd_task_complete", input: { milestoneId: "M001", sliceId: "S02", taskId: "T03" } },
+      deps,
+    ),
+    null,
+  );
+  assert.equal(
+    runInteractiveUnitCloseout(
+      { basePath: BASE, canonicalToolName: "gsd_slice_complete", input: { milestoneId: "M001", sliceId: "S02" } },
+      deps,
+    ),
+    null,
+  );
+  assert.equal(log.commits.length, 0);
+});
+
+test("interactive adapter maps milestone tool input to canonical unit type", () => {
+  const { deps, log } = makeDeps();
+  const result = runInteractiveUnitCloseout(
+    { basePath: BASE, canonicalToolName: "gsd_complete_milestone", input: { milestoneId: "M001" } },
+    deps,
+  );
+  assert.equal(result?.gitVerdict, "committed");
+  assert.deepEqual(log.commits, [{ unitType: "complete-milestone", unitId: "M001" }]);
+});
+
+test("interactive adapter accepts snake_case ids and milestone-only input", () => {
+  const { deps, log } = makeDeps();
+  const result = runInteractiveUnitCloseout(
+    { basePath: BASE, canonicalToolName: "gsd_complete_milestone", input: { milestone_id: "M007" } },
+    deps,
+  );
+  assert.equal(result?.gitVerdict, "committed");
+  assert.deepEqual(log.commits, [{ unitType: "complete-milestone", unitId: "M007" }]);
+});
+
+test("interactive adapter declines unidentifiable input instead of guessing", () => {
+  const { deps, log } = makeDeps();
+  assert.equal(
+    runInteractiveUnitCloseout({ basePath: BASE, canonicalToolName: "gsd_complete_milestone", input: {} }, deps),
+    null,
+  );
+  assert.equal(
+    runInteractiveUnitCloseout({ basePath: BASE, canonicalToolName: "not_a_closeout_tool", input: { milestoneId: "M001" } }, deps),
+    null,
+  );
+  assert.equal(log.commits.length, 0);
+});

package/src/resources/extensions/gsd/tests/unit-context-composer.test.ts

@@ -8,13 +8,16 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 
 import {
+  composeContractedUnitContext,
   composeContextModeInstructions,
   composeInlinedContext,
+  composeToolSurfaceInstructions,
   composeUnitContext,
   manifestBudgetChars,
   type ArtifactResolver,
   type ExcerptResolver,
 } from "../unit-context-composer.ts";
+import { compileUnitContextContract } from "../tool-contract.ts";
 import type {
   ArtifactKey,
   BaseResolverContext,
@@ -22,6 +25,7 @@ import type {
   UnitContextManifest,
 } from "../unit-context-manifest.ts";
 import { KNOWN_UNIT_TYPES, UNIT_MANIFESTS } from "../unit-context-manifest.ts";
+import { getUnitToolSurfaceContract } from "../unit-tool-contracts.ts";
 import {
   buildExecuteTaskPrompt,
   buildGateEvaluatePrompt,
@@ -163,12 +167,32 @@ test("Context Mode composer: every known eligible unit renders its configured la
     }
     assert.ok(out.startsWith("## Context Mode"), `${unitType} should render standalone Context Mode heading`);
     assert.match(out, new RegExp(`Lane: \\*\\*${laneLabelByMode[manifest.contextMode]} lane\\*\\*\\.`, "i"));
-    assert.match(out, /`gsd_exec`/, `${unitType} should mention gsd_exec`);
-    assert.match(out, /`gsd_exec_search`/, `${unitType} should mention gsd_exec_search`);
+    const forbidden = getUnitToolSurfaceContract(unitType)?.forbiddenGsdTools ?? {};
+    if ("gsd_exec" in forbidden) {
+      // Units that forbid gsd_exec (run-uat) have it stripped from their
+      // Claude Code dispatch surface; guidance steering to it produces
+      // "No such tool available" loops in the dispatched agent.
+      assert.doesNotMatch(out, /`gsd_exec`/, `${unitType} forbids gsd_exec; guidance must not steer to it`);
+      assert.doesNotMatch(out, /`gsd_exec_search`/, `${unitType} guidance must not steer to gsd_exec_search`);
+      assert.match(out, /`gsd_uat_exec`/, `${unitType} guidance should steer to gsd_uat_exec instead`);
+    } else {
+      assert.match(out, /`gsd_exec`/, `${unitType} should mention gsd_exec`);
+      assert.match(out, /`gsd_exec_search`/, `${unitType} should mention gsd_exec_search`);
+    }
     assert.match(out, /`gsd_resume`/, `${unitType} should mention gsd_resume`);
   }
 });
 
+test("Context Mode composer: run-uat guidance steers to gsd_uat_exec in both render modes", () => {
+  const nested = composeContextModeInstructions("run-uat", { enabled: true, renderMode: "nested" });
+  assert.match(nested, /^Context Mode \(verification lane\): /);
+  assert.match(nested, /`gsd_uat_exec`/);
+  assert.doesNotMatch(nested, /`gsd_exec`/);
+  const standalone = composeContextModeInstructions("run-uat", { enabled: true, renderMode: "standalone" });
+  assert.match(standalone, /`gsd_uat_exec`/);
+  assert.doesNotMatch(standalone, /`gsd_exec`/);
+});
+
 test("Context Mode composer: workflow-preferences and research-decision render no Context Mode block", () => {
   assert.strictEqual(
     composeContextModeInstructions("workflow-preferences", { enabled: true, renderMode: "standalone" }),
@@ -180,6 +204,49 @@ test("Context Mode composer: workflow-preferences and research-decision render n
   );
 });
 
+test("Tool Surface composer: run-uat forbids gsd_exec and Bash", () => {
+  const out = composeToolSurfaceInstructions("run-uat", { renderMode: "standalone" });
+  assert.match(out, /^## Tool Surface/);
+  assert.match(out, /Do not call `gsd_exec`/);
+  assert.match(out, /`Bash`/);
+  assert.match(out, /`gsd_uat_exec`/);
+  assert.match(out, /`gsd_save_gate_result`/);
+  assert.match(out, /`gsd_summary_save`/);
+});
+
+test("Tool Surface composer: complete-slice steers verification to gsd_exec", () => {
+  const out = composeToolSurfaceInstructions("complete-slice", { renderMode: "standalone" });
+  assert.match(out, /`gsd_exec`/);
+  assert.match(out, /not direct `bash`/);
+  assert.match(out, /`gsd_uat_result_save`/);
+});
+
+test("Tool Surface composer: planning units restrict writes to .gsd", () => {
+  const out = composeToolSurfaceInstructions("discuss-milestone", { renderMode: "standalone" });
+  assert.match(out, /restricted to `\.gsd\/\*\*`/);
+  assert.match(out, /`ask_user_questions`/);
+});
+
+test("Tool Surface composer: planning-dispatch lists allowed subagents", () => {
+  const out = composeToolSurfaceInstructions("plan-slice", { renderMode: "standalone" });
+  assert.match(out, /\*\*scout\*\*/);
+  assert.match(out, /\*\*planner\*\*/);
+});
+
+test("Tool Surface composer: execute-task warns against slice/milestone closeout tools", () => {
+  const out = composeToolSurfaceInstructions("execute-task", { renderMode: "nested" });
+  assert.match(out, /^Tool surface: /);
+  assert.match(out, /`gsd_task_complete`/);
+  assert.match(out, /Do not call `gsd_slice_complete`/);
+});
+
+test("Tool Surface composer: unknown unit renders empty block", () => {
+  assert.strictEqual(
+    composeToolSurfaceInstructions("never-dispatched", { renderMode: "standalone" }),
+    "",
+  );
+});
+
 // ─── Integration: migrated buildReassessRoadmapPrompt ─────────────────────
 
 function makeFixtureBase(): string {
@@ -268,6 +335,21 @@ test("#4782 phase 2: buildReassessRoadmapPrompt emits composer-shaped context wi
   assert.ok(!prompt.includes("Slice Context (from discussion)"));
 });
 
+test("execute-task prompt surfaces contract-declared on-demand slice research", async (t) => {
+  const base = makeFixtureBase();
+  t.after(() => cleanup(base));
+  invalidateAllCaches();
+
+  seed(base, "M001");
+  writeArtifacts(base);
+
+  const prompt = await buildExecuteTaskPrompt("M001", "S01", "First", "T01", "Task", base);
+
+  assert.match(prompt, /## On-demand Context/);
+  assert.match(prompt, /\.gsd\/milestones\/M001\/slices\/S01\/S01-RESEARCH\.md/);
+  assert.match(prompt, /Read it only if the inlined task plan, slice plan excerpt, and carry-forward context do not explain/);
+});
+
 test("Context Mode resume injection: eligible prompts include one bounded snapshot block above inlined context", async (t) => {
   const base = makeFixtureBase();
   t.after(() => cleanup(base));
@@ -370,6 +452,36 @@ test("#4924 v2 composer: returns empty sections for unknown unit type", async ()
   assert.deepEqual(out, { prepend: "", inline: "" });
 });
 
+test("Unit Context Contract composer exposes keyed blocks and on-demand artifacts", async () => {
+  const result = compileUnitContextContract("execute-task");
+  assert.equal(result.ok, true);
+  if (!result.ok) return;
+
+  const calls: ArtifactKey[] = [];
+  const out = await composeContractedUnitContext(result.contract, {
+    base: { ...fakeBase, unitType: "stale-unit", taskId: "T01" },
+    resolveArtifact: async (key) => {
+      calls.push(key);
+      return `BODY:${key}`;
+    },
+  });
+
+  assert.deepEqual(calls, [
+    "task-plan",
+    "slice-plan",
+    "prior-task-summaries",
+    "templates",
+  ]);
+  assert.deepEqual(out.blocks.map((block) => [block.key, block.mode]), [
+    ["task-plan", "inline"],
+    ["slice-plan", "inline"],
+    ["prior-task-summaries", "inline"],
+    ["templates", "inline"],
+  ]);
+  assert.deepEqual(out.onDemand, ["slice-research"]);
+  assert.match(out.inline, /BODY:task-plan\n\n---\n\nBODY:slice-plan/);
+});
+
 test("#4924 v2 composer: omitting resolveArtifact skips inline keys without erroring", async () => {
   const out = await composeUnitContext("reassess-roadmap", { base: fakeBase });
   assert.strictEqual(out.inline, "");

package/src/resources/extensions/gsd/tests/unit-registry.test.ts

@@ -0,0 +1,163 @@
+// gsd-pi — ADR-033 Unit Registry parity guard.
+//
+// Pins every view derived from UNIT_REGISTRY to the exact values the
+// hand-maintained tables held before the registry existed. A failure here
+// means a registry edit changed a derived surface — intended changes update
+// the pinned expectation in the same diff.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import {
+  KNOWN_UNIT_TYPES,
+  UNIT_REGISTRY,
+  EXECUTE_TASK_UNIT_TYPES,
+  SECTION_CLOSE_GATE_UNIT_TYPES,
+  getUnitDescriptor,
+  getUnitPhaseChain,
+} from "../unit-registry.ts";
+import {
+  AUTO_UNIT_SCOPED_TOOLS,
+  UNIT_TOOL_CONTRACTS,
+  getUnitToolSurfaceContract,
+} from "../unit-tool-contracts.ts";
+import { UNIT_MANIFESTS } from "../unit-context-manifest.ts";
+import { phaseChainForUnit } from "../preferences-models.ts";
+
+// ─── Pinned pre-registry values ───────────────────────────────────────────
+
+const EXPECTED_KNOWN_UNIT_TYPES = [
+  "research-milestone",
+  "plan-milestone",
+  "discuss-milestone",
+  "validate-milestone",
+  "complete-milestone",
+  "research-slice",
+  "plan-slice",
+  "refine-slice",
+  "replan-slice",
+  "complete-slice",
+  "reassess-roadmap",
+  "execute-task",
+  "reactive-execute",
+  "run-uat",
+  "gate-evaluate",
+  "rewrite-docs",
+  "triage-captures",
+  "quick-task",
+  "workflow-preferences",
+  "discuss-project",
+  "discuss-requirements",
+  "research-decision",
+  "research-project",
+];
+
+// The contract table carried two keys KNOWN_UNIT_TYPES never had (variants)
+// and lacked two it did have (sidecars without contracts).
+const EXPECTED_CONTRACT_ONLY_TYPES = ["discuss-slice", "execute-task-simple"];
+const EXPECTED_CONTRACT_LESS_TYPES = ["triage-captures", "quick-task"];
+
+const EXPECTED_EXECUTE_TASK_SET = ["execute-task", "execute-task-simple", "reactive-execute"];
+const EXPECTED_SECTION_CLOSE_SET = [
+  ...EXPECTED_EXECUTE_TASK_SET,
+  "complete-slice",
+  "validate-milestone",
+];
+
+const EXPECTED_PHASE_CHAINS: Record<string, string[] | undefined> = {
+  "research-milestone": ["research"],
+  "research-slice": ["research"],
+  "research-project": ["research"],
+  "plan-milestone": ["planning"],
+  "plan-slice": ["planning"],
+  "refine-slice": ["planning"],
+  "replan-slice": ["planning"],
+  "discuss-milestone": ["discuss", "planning"],
+  "discuss-slice": ["discuss", "planning"],
+  "discuss-project": ["discuss", "planning"],
+  "discuss-requirements": ["discuss", "planning"],
+  "workflow-preferences": ["discuss", "planning"],
+  "research-decision": ["discuss", "planning"],
+  "execute-task": ["execution"],
+  "reactive-execute": ["execution"],
+  "execute-task-simple": ["execution_simple", "execution"],
+  "complete-slice": ["completion"],
+  "complete-milestone": ["completion"],
+  "worktree-merge": ["completion"],
+  "run-uat": ["uat", "completion"],
+  "reassess-roadmap": ["validation", "planning"],
+  "rewrite-docs": ["validation", "planning"],
+  "gate-evaluate": ["validation", "planning"],
+  "validate-milestone": ["validation", "planning"],
+  "triage-captures": undefined,
+  "quick-task": undefined,
+  subagent: ["subagent"],
+  "subagent/scout": ["subagent"],
+  "no-such-unit": undefined,
+};
+
+// ─── Derived-view parity ──────────────────────────────────────────────────
+
+test("KNOWN_UNIT_TYPES derives exactly the pre-registry list, in order", () => {
+  assert.deepEqual([...KNOWN_UNIT_TYPES], EXPECTED_KNOWN_UNIT_TYPES);
+});
+
+test("UNIT_TOOL_CONTRACTS keeps the pre-registry key set, asymmetries included", () => {
+  const contractKeys = Object.keys(UNIT_TOOL_CONTRACTS);
+  for (const variant of EXPECTED_CONTRACT_ONLY_TYPES) {
+    assert.ok(contractKeys.includes(variant), `variant ${variant} must keep its contract`);
+    assert.ok(!KNOWN_UNIT_TYPES.includes(variant as never), `${variant} must stay out of KNOWN_UNIT_TYPES`);
+  }
+  for (const sidecar of EXPECTED_CONTRACT_LESS_TYPES) {
+    assert.ok(!contractKeys.includes(sidecar), `${sidecar} must stay contract-less`);
+    assert.equal(getUnitToolSurfaceContract(sidecar), undefined);
+  }
+  const expectedKeys = [
+    ...EXPECTED_KNOWN_UNIT_TYPES.filter((t) => !EXPECTED_CONTRACT_LESS_TYPES.includes(t)),
+    ...EXPECTED_CONTRACT_ONLY_TYPES,
+  ].sort();
+  assert.deepEqual([...contractKeys].sort(), expectedKeys);
+});
+
+test("scope-class Sets match the pre-registry hand-maintained Sets", () => {
+  assert.deepEqual([...EXECUTE_TASK_UNIT_TYPES].sort(), [...EXPECTED_EXECUTE_TASK_SET].sort());
+  assert.deepEqual([...SECTION_CLOSE_GATE_UNIT_TYPES].sort(), [...EXPECTED_SECTION_CLOSE_SET].sort());
+});
+
+test("phaseChainForUnit matches the pre-registry switch for every known input", () => {
+  for (const [unitType, expected] of Object.entries(EXPECTED_PHASE_CHAINS)) {
+    assert.deepEqual(
+      phaseChainForUnit(unitType),
+      expected,
+      `phase chain for ${unitType}`,
+    );
+  }
+});
+
+test("AUTO_UNIT_SCOPED_TOOLS mirrors each contract's allowed tools", () => {
+  for (const [unitType, contract] of Object.entries(UNIT_TOOL_CONTRACTS)) {
+    assert.deepEqual(AUTO_UNIT_SCOPED_TOOLS[unitType], contract.allowedGsdTools);
+  }
+  assert.deepEqual(
+    Object.keys(AUTO_UNIT_SCOPED_TOOLS).sort(),
+    Object.keys(UNIT_TOOL_CONTRACTS).sort(),
+  );
+});
+
+// ─── Registry-internal coherence ──────────────────────────────────────────
+
+test("every primary unit type has a manifest; manifests cover nothing else", () => {
+  const manifestKeys = Object.keys(UNIT_MANIFESTS).sort();
+  assert.deepEqual(manifestKeys, [...KNOWN_UNIT_TYPES].sort());
+});
+
+test("every registry row is reachable through the descriptor accessor", () => {
+  for (const unitType of Object.keys(UNIT_REGISTRY)) {
+    const descriptor = getUnitDescriptor(unitType);
+    assert.ok(descriptor, `descriptor for ${unitType}`);
+    assert.ok(["primary", "variant"].includes(descriptor.kind));
+    assert.ok(["execute-task", "section-close", "standard"].includes(descriptor.scopeClass));
+    assert.equal(getUnitPhaseChain(unitType), descriptor.phaseChain);
+  }
+  assert.equal(getUnitDescriptor("no-such-unit"), undefined);
+});

package/src/resources/extensions/gsd/tests/uok-audit-unified.test.ts

@@ -4,6 +4,7 @@ import { mkdtempSync, readFileSync, rmSync, existsSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { emitJournalEvent } from "../journal.ts";
+import { appendEvent } from "../workflow-events.ts";
 import { saveActivityLog } from "../activity-log.ts";
 import { initMetrics, resetMetrics, snapshotUnitMetrics } from "../metrics.ts";
 import { setLogBasePath, logWarning } from "../workflow-logger.ts";
@@ -38,6 +39,12 @@ test("unified audit plane bridges journal/activity/metrics/workflow logger into
       eventType: "iteration-start",
       data: { turnId: "turn-123", unitId: "M001/S01/T01" },
     });
+    appendEvent(basePath, {
+      cmd: "complete-task",
+      params: { milestoneId: "M001", sliceId: "S01", taskId: "T01" },
+      ts: new Date().toISOString(),
+      actor: "agent",
+    });
 
     const activityCtx = makeMockContext([
       { type: "message", message: { role: "assistant", content: [{ type: "text", text: "hello" }] } },
@@ -73,6 +80,7 @@ test("unified audit plane bridges journal/activity/metrics/workflow logger into
     const events = readAuditEvents(basePath);
     const types = new Set(events.map((event) => String(event.type ?? "")));
     assert.ok(types.has("journal-iteration-start"));
+    assert.ok(types.has("workflow-event-complete_task"));
     assert.ok(types.has("activity-log-saved"));
     assert.ok(types.has("unit-metrics-snapshot"));
     assert.ok(types.has("workflow-log-warn"));

package/src/resources/extensions/gsd/tests/uok-plan-v2-wiring.test.ts

@@ -22,7 +22,7 @@ import {
   _needsPlanV2GateForTest,
   _runPlanV2GateForTest,
 } from "../guided-flow.ts";
-import { shouldRunPlanV2Gate } from "../auto/phases.ts";
+import { shouldRunPlanV2Gate } from "../auto/phase-helpers.ts";
 import { resolveUokFlags } from "../uok/flags.ts";
 
 const MILESTONE_ID = "M001";

package/src/resources/extensions/gsd/tests/validate-milestone-stuck-guard.test.ts

@@ -12,6 +12,7 @@ import { clearPathCache } from "../paths.ts";
 import {
   openDatabase,
   closeDatabase,
+  insertAssessment,
   insertMilestone,
   insertSlice,
 } from "../gsd-db.ts";
@@ -222,6 +223,44 @@ describe("validate-milestone stuck-loop guard (#4094)", () => {
     assert.equal(s.pendingVerificationRetry, null);
   });
 
+  test("continues when DB pass overrides stale worktree needs-attention after /gsd verdict", async () => {
+    insertMilestone({ id: "M001" });
+    insertSlice({ id: "S01", milestoneId: "M001", title: "Slice 1", status: "complete" });
+    writeWorktreeValidationFile("needs-attention");
+
+    const worktreeValidationPath = join(
+      tempDir,
+      ".gsd",
+      "worktrees",
+      "M001",
+      ".gsd",
+      "milestones",
+      "M001",
+      "M001-VALIDATION.md",
+    );
+    insertAssessment({
+      path: worktreeValidationPath,
+      milestoneId: "M001",
+      sliceId: null,
+      taskId: null,
+      status: "pass",
+      scope: "milestone-validation",
+      fullContent: "---\nverdict: pass\n---\n\n# Validation\nManually overridden via /gsd verdict\n",
+    });
+    invalidateAllCaches();
+
+    const ctx = makeMockCtx();
+    const pi = makeMockPi();
+    const pauseAutoMock = mock.fn(async () => {});
+    const s = makeMockSession(tempDir, "validate-milestone", "M001");
+
+    const result = await runPostUnitVerification({ s, ctx, pi } as VerificationContext, pauseAutoMock);
+
+    assert.equal(result, "continue");
+    assert.equal(pauseAutoMock.mock.callCount(), 0);
+    assert.equal(ctx.ui.notify.mock.callCount(), 0);
+  });
+
   test("retries when no VALIDATION file exists yet", async () => {
     insertMilestone({ id: "M001" });
     insertSlice({ id: "S01", milestoneId: "M001", title: "Slice 1", status: "complete" });

package/src/resources/extensions/gsd/tests/verification-verdict.test.ts

@@ -24,6 +24,8 @@ test("execute-task fails closed when no host-owned checks are discovered", () =>
   assert.equal(verdict.reason, "no-host-checks");
   assert.equal(verdict.retryable, false);
   assert.match(verdict.failureContext, /No runnable host-owned verification command/);
+  assert.match(verdict.failureContext, /\.gsd\/PREFERENCES\.md/);
+  assert.match(verdict.failureContext, /\/gsd next/);
 });
 
 test("execute-task passes when non-runnable task-plan prose is the verification source", () => {