@opengsd/gsd-pi 1.1.1-dev.3ea310e → 1.1.1-dev.74e8dd1

package/src/resources/extensions/gsd/tests/register-hooks-depth-verification.test.ts

@@ -10,6 +10,7 @@ import {
   resetWriteGateState,
   shouldBlockContextArtifactSave,
 } from "../bootstrap/write-gate.ts";
+import { classifyCommand } from "../safety/destructive-guard.ts";
 import { toRoundResultResponse } from "../../remote-questions/manager.ts";
 
 function makeTempDir(prefix: string): string {
@@ -35,6 +36,40 @@ async function armDepthGate(
   }
 }
 
+test("destructive guard classifies infrastructure mutation commands", () => {
+  assert.deepEqual(classifyCommand("terraform destroy -auto-approve").labels, ["IaC apply/destroy"]);
+  assert.deepEqual(classifyCommand("terragrunt apply").labels, ["IaC apply/destroy"]);
+  assert.deepEqual(classifyCommand("aws s3 delete-bucket --bucket example").labels, ["AWS mutation"]);
+  assert.deepEqual(classifyCommand("kubectl delete namespace prod").labels, ["kubectl mutation"]);
+});
+
+test("register-hooks hard-blocks destructive bash commands outside auto-mode", async () => {
+  const handlers = new Map<string, Array<(event: any, ctx?: any) => Promise<any> | any>>();
+  const pi = {
+    on(event: string, handler: (event: any, ctx?: any) => Promise<any> | any) {
+      const existing = handlers.get(event) ?? [];
+      existing.push(handler);
+      handlers.set(event, existing);
+    },
+  } as any;
+
+  registerHooks(pi, []);
+
+  let block: any;
+  for (const handler of handlers.get("tool_call") ?? []) {
+    const result = await handler({
+      toolCallId: "call-1",
+      toolName: "bash",
+      input: { command: "terraform apply -auto-approve" },
+    });
+    if (result?.block) block = result;
+  }
+
+  assert.equal(block?.block, true);
+  assert.match(block?.reason ?? "", /HARD BLOCK: destructive Bash command requires explicit human confirmation/);
+  assert.match(block?.reason ?? "", /IaC apply\/destroy/);
+});
+
 test("register-hooks unlocks milestone depth verification from question id without guided-flow state (#4047)", async (t) => {
   const dir = makeTempDir("manual");
   const originalCwd = process.cwd();

package/src/resources/extensions/gsd/tests/restore-tools-after-discuss.test.ts

@@ -51,7 +51,7 @@ test("discuss workflow scopes tools for the queued turn and restores the full to
     // discuss allowlist: gsd_summary_save and gsd_plan_milestone (the latter
     // is needed for the discuss.md output phase — see DISCUSS_TOOLS_ALLOWLIST).
     // gsd_task_complete and the broad shell_exec tool are scoped out.
-    assert.deepEqual(sentTools, ["gsd_summary_save", "gsd_plan_milestone", "ToolSearch"]);
+    assert.deepEqual(sentTools, ["gsd_plan_milestone", "gsd_summary_save", "ToolSearch"]);
     assert.deepEqual(activeTools, originalTools);
     assert.equal(triggerTurn, true);
   } finally {

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

@@ -5,6 +5,7 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { loadSkills } from "@gsd/pi-coding-agent";
 import {
+  buildCompleteSlicePrompt,
   buildPlanMilestonePrompt,
   buildResearchMilestonePrompt,
   buildSkillActivationBlock,
@@ -143,6 +144,29 @@ test("buildSkillActivationBlock includes skill_rules matches and task-plan skill
   }
 });
 
+test("buildSkillActivationBlock matches skill_rules against exact unit type context", () => {
+  const base = makeTempBase();
+  try {
+    writeSkill(base, "complete-slice-policies", "Use for complete-slice closeout policy checks.");
+    writeSkill(base, "slice-broad", "Use for broad slice work.");
+    loadOnlyTestSkills(base);
+
+    const result = buildBlock(base, {
+      unitType: "complete-slice",
+    }, {
+      skill_rules: [
+        { when: "complete-slice", use: ["complete-slice-policies"] },
+        { when: "slice", use: ["slice-broad"] },
+      ],
+    });
+
+    assert.match(result, /Call Skill\(\{ skill: 'complete-slice-policies' \}\)/);
+    assert.doesNotMatch(result, /slice-broad/);
+  } finally {
+    cleanup(base);
+  }
+});
+
 test("buildSkillActivationBlock honors avoid_skills against always_use_skills", () => {
   const base = makeTempBase();
   try {
@@ -328,6 +352,37 @@ test("milestone prompt builders propagate always_use_skills through buildSkillAc
   }
 });
 
+test("complete-slice prompt propagates always_use_skills through buildSkillActivationBlock", async () => {
+  const base = makeTempBase();
+  try {
+    writeSkill(base, "write-docs", "Use when writing docs or RFCs.");
+    writeProjectPreferences(base, "always_use_skills:\n  - write-docs\n");
+    loadOnlyTestSkills(base);
+
+    const milestoneDir = join(base, ".gsd", "milestones", "M001");
+    const sliceDir = join(milestoneDir, "slices", "S01");
+    mkdirSync(sliceDir, { recursive: true });
+    writeFileSync(
+      join(milestoneDir, "M001-ROADMAP.md"),
+      [
+        "# M001: Test",
+        "",
+        "## Slices",
+        "",
+        "- [ ] **S01: Slice** `risk:low` `depends:[]`",
+        "",
+      ].join("\n"),
+    );
+    writeFileSync(join(sliceDir, "S01-PLAN.md"), "# S01: Slice\n\n## Tasks\n\n- [x] **T01: Done**\n");
+
+    const prompt = await buildCompleteSlicePrompt("M001", "Test", "S01", "Slice", base);
+
+    assert.match(prompt, /Call Skill\(\{ skill: 'write-docs' \}\)/);
+  } finally {
+    cleanup(base);
+  }
+});
+
 test("skill manifest strict warnings require GSD_SKILL_MANIFEST_STRICT=1", (t) => {
   const previousStrict = process.env.GSD_SKILL_MANIFEST_STRICT;
   const previousStderr = setStderrLoggingEnabled(false);

package/src/resources/extensions/gsd/tests/state-reconciliation-drift.test.ts

@@ -906,6 +906,51 @@ test("ADR-017 (#5704): registered milestone (DB row present) → no drift", asyn
 
 // ─── #5705: roadmap-divergence drift ─────────────────────────────────────────
 
+test("ADR-017 (#391): roadmap-divergence skips slices before task planning completes", async (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-adr017-roadmap-unplanned-"));
+  const milestoneDir = join(base, ".gsd", "milestones", "M001");
+  const roadmapPath = join(milestoneDir, "M001-ROADMAP.md");
+  mkdirSync(milestoneDir, { recursive: true });
+  const originalRoadmap = [
+    "# M001: Test",
+    "",
+    "**Vision:** Verify transient milestone planning state",
+    "",
+    "## Slices",
+    "",
+    "- [ ] **S01: Foundation** `risk:medium` `depends:[]`",
+    "- [ ] **S02: Feature** `risk:medium` `depends:[S01]`",
+    "",
+  ].join("\n");
+  writeFileSync(roadmapPath, originalRoadmap);
+  t.after(() => {
+    try { closeDatabase(); } catch { /* noop */ }
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  insertMilestone({ id: "M001", title: "Test", status: "active" });
+  insertSlice({ id: "S01", milestoneId: "M001", title: "Foundation", status: "pending", risk: "medium", depends: [], demo: "", sequence: 1 });
+  insertSlice({ id: "S02", milestoneId: "M001", title: "Feature", status: "pending", risk: "medium", depends: [], demo: "", sequence: 2 });
+
+  assert.equal(getSliceTasks("M001", "S01").length, 0, "pre: S01 has not been planned");
+  assert.equal(getSliceTasks("M001", "S02").length, 0, "pre: S02 has not been planned");
+
+  const result = await reconcileBeforeDispatch(base, {
+    invalidateStateCache: () => {},
+    deriveState: async () => makeState(),
+  });
+
+  assert.equal(result.ok, true);
+  assert.equal(
+    result.repaired.some((d) => d.kind === "roadmap-divergence"),
+    false,
+    "unplanned slices should not trigger roadmap-divergence repair",
+  );
+  assert.equal(readFileSync(roadmapPath, "utf-8"), originalRoadmap);
+  assert.deepEqual(getSlice("M001", "S02")?.depends, [], "DB remains unchanged");
+});
+
 test("ADR-017 (#5705): roadmap-divergence re-renders projection without syncing depends into DB", async (t) => {
   const base = mkdtempSync(join(tmpdir(), "gsd-adr017-roadmap-"));
   const milestoneDir = join(base, ".gsd", "milestones", "M001");
@@ -936,6 +981,8 @@ test("ADR-017 (#5705): roadmap-divergence re-renders projection without syncing
   // Seed DB with S02 depending on []  — diverges from ROADMAP.md
   insertSlice({ id: "S01", milestoneId: "M001", title: "Foundation", status: "pending", risk: "medium", depends: [], demo: "", sequence: 1 });
   insertSlice({ id: "S02", milestoneId: "M001", title: "Feature", status: "pending", risk: "medium", depends: [], demo: "", sequence: 2 });
+  insertTask({ id: "T01", sliceId: "S01", milestoneId: "M001", title: "Plan S01", status: "pending" });
+  insertTask({ id: "T01", sliceId: "S02", milestoneId: "M001", title: "Plan S02", status: "pending" });
 
   assert.deepEqual(getSlice("M001", "S02")?.depends, [], "pre: DB has S02.depends = []");
 
@@ -987,6 +1034,7 @@ test("ADR-017 (#5705): ROADMAP-only slice is removed from projection and not ins
   insertMilestone({ id: "M001", title: "Test", status: "active" });
   // Only insert S01 — S02 is intentionally absent from the DB.
   insertSlice({ id: "S01", milestoneId: "M001", title: "Foundation", status: "pending", risk: "medium", depends: [], demo: "", sequence: 1 });
+  insertTask({ id: "T01", sliceId: "S01", milestoneId: "M001", title: "Plan S01", status: "pending" });
 
   assert.equal(getSlice("M001", "S02"), null, "pre: S02 has no DB row");
 
@@ -1035,6 +1083,8 @@ test("ADR-017 (#5705): ROADMAP sequence drift re-renders from DB order without m
   insertMilestone({ id: "M001", title: "Test", status: "active" });
   insertSlice({ id: "S01", milestoneId: "M001", title: "Foundation", status: "pending", risk: "medium", depends: [], demo: "", sequence: 1 });
   insertSlice({ id: "S02", milestoneId: "M001", title: "Feature", status: "pending", risk: "medium", depends: [], demo: "", sequence: 2 });
+  insertTask({ id: "T01", sliceId: "S01", milestoneId: "M001", title: "Plan S01", status: "pending" });
+  insertTask({ id: "T01", sliceId: "S02", milestoneId: "M001", title: "Plan S02", status: "pending" });
 
   const result = await reconcileBeforeDispatch(base, {
     invalidateStateCache: () => {},
@@ -1078,6 +1128,7 @@ test("ADR-017 (#5705): ROADMAP checkbox drift re-renders from DB status without
   openDatabase(join(base, ".gsd", "gsd.db"));
   insertMilestone({ id: "M001", title: "Test", status: "active" });
   insertSlice({ id: "S01", milestoneId: "M001", title: "Foundation", status: "pending", risk: "medium", depends: [], demo: "", sequence: 1 });
+  insertTask({ id: "T01", sliceId: "S01", milestoneId: "M001", title: "Plan S01", status: "pending" });
 
   const result = await reconcileBeforeDispatch(base, {
     invalidateStateCache: () => {},
@@ -1119,6 +1170,7 @@ test("ADR-017 (#5705): in-sync ROADMAP and DB → no roadmap-divergence drift",
   openDatabase(join(base, ".gsd", "gsd.db"));
   insertMilestone({ id: "M001", title: "Test", status: "active" });
   insertSlice({ id: "S01", milestoneId: "M001", title: "Foundation", status: "pending", risk: "low", depends: [], demo: "", sequence: 1 });
+  insertTask({ id: "T01", sliceId: "S01", milestoneId: "M001", title: "Plan S01", status: "pending" });
 
   const result = await reconcileBeforeDispatch(base, {
     invalidateStateCache: () => {},

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

@@ -4,8 +4,11 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
+import { registerToolCompatibility } from "@gsd/pi-coding-agent";
+
 import { DISCUSS_TOOLS_ALLOWLIST } from "../constants.ts";
 import { buildMinimalAutoGsdToolSet, buildMinimalGsdToolSet, buildMinimalGsdWorkflowToolSet, buildRequestScopedGsdToolSet, MINIMAL_AUTO_BASE_TOOL_NAMES, MINIMAL_GSD_TOOL_NAMES, requestHasGsdCustomType, restoreGsdWorkflowTools, scopeGsdWorkflowToolsForDispatch } from "../bootstrap/register-hooks.ts";
+import { filterToolsForProvider } from "../model-router.ts";
 import { applyUnitSkillVisibility } from "../skill-scope.ts";
 
 test("buildMinimalGsdToolSet preserves non-GSD tools and replaces broad GSD surface", () => {
@@ -31,7 +34,7 @@ test("buildMinimalGsdToolSet preserves non-GSD tools and replaces broad GSD surf
   for (const toolName of MINIMAL_GSD_TOOL_NAMES) {
     assert.ok(result.includes(toolName), `expected ${toolName}`);
   }
-  assert.ok(!result.includes("gsd_plan_milestone"));
+  assert.ok(result.includes("gsd_plan_milestone"));
   assert.ok(!result.includes("gsd_task_complete"));
   assert.ok(!result.includes("gsd_graph"));
 });
@@ -98,22 +101,39 @@ test("buildMinimalAutoGsdToolSet keeps unit-specific completion tools without al
   assert.ok(!result.includes("gsd_complete_slice"));
 });
 
-test("buildMinimalAutoGsdToolSet re-resolves run-uat browser tools from the registry when dropped from the active set", () => {
-  // B2 drops the browser surface from the advertised interactive set, but the
-  // tools stay registered. run-uat must still get them: resolution reads the
-  // full registry, not just the (browser-stripped) active set.
-  const active = ["ask_user_questions", "bash", "read", "gsd_summary_save"];
+test("buildMinimalAutoGsdToolSet scopes run-uat to UAT-specific tools", () => {
+  const active = ["ask_user_questions", "bash", "read", "edit", "write", "gsd_summary_save"];
   const registered = [
     ...active,
+    "gsd_uat_exec",
+    "gsd_uat_result_save",
+    "gsd_resume",
+    "gsd_milestone_status",
+    "gsd_journal_query",
+    "gsd_exec",
+    "gsd_save_gate_result",
+    "search-the-web",
     "browser_navigate",
     "browser_click",
     "browser_snapshot_refs",
-    "gsd_exec",
   ];
   const result = buildMinimalAutoGsdToolSet(active, "run-uat", registered);
+  assert.ok(result.includes("gsd_uat_exec"));
+  assert.ok(result.includes("gsd_uat_result_save"));
+  assert.ok(result.includes("gsd_resume"));
+  assert.ok(result.includes("gsd_milestone_status"));
+  assert.ok(result.includes("gsd_journal_query"));
   assert.ok(result.includes("browser_navigate"), "run-uat needs browser_navigate");
   assert.ok(result.includes("browser_click"), "run-uat needs browser_click");
-  assert.ok(result.includes("gsd_summary_save"));
+  assert.ok(!result.includes("ToolSearch"));
+  assert.ok(!result.includes("bash"));
+  assert.ok(!result.includes("read"));
+  assert.ok(!result.includes("edit"));
+  assert.ok(!result.includes("write"));
+  assert.ok(!result.includes("gsd_exec"));
+  assert.ok(!result.includes("gsd_summary_save"));
+  assert.ok(!result.includes("gsd_save_gate_result"));
+  assert.ok(!result.includes("search-the-web"));
 });
 
 test("buildMinimalAutoGsdToolSet keeps only the auto base non-GSD tools", () => {
@@ -175,17 +195,27 @@ test("buildMinimalAutoGsdToolSet re-injects registered base tools filtered from
   assert.ok(result.includes("search-the-web"));
 });
 
-test("buildMinimalAutoGsdToolSet preserves browser tools for run-uat", () => {
+test("buildMinimalAutoGsdToolSet preserves compatible browser add-ons for run-uat", () => {
   const result = buildMinimalAutoGsdToolSet([
     "bash",
     "read",
+    "edit",
+    "write",
     "browser_navigate",
     "browser_click",
     "browser_type",
     "browser_assert",
     "browser_screenshot",
     "browser_wait_for",
+    "gsd_uat_exec",
+    "gsd_uat_result_save",
+    "gsd_resume",
+    "gsd_milestone_status",
+    "gsd_journal_query",
+    "subagent",
     "gsd_summary_save",
+    "gsd_exec",
+    "gsd_save_gate_result",
     "gsd_task_complete",
     "memory_query",
     "capture_thought",
@@ -197,7 +227,17 @@ test("buildMinimalAutoGsdToolSet preserves browser tools for run-uat", () => {
   assert.ok(result.includes("browser_assert"));
   assert.ok(result.includes("browser_screenshot"));
   assert.ok(result.includes("browser_wait_for"));
-  assert.ok(result.includes("gsd_summary_save"));
+  assert.ok(result.includes("gsd_uat_exec"));
+  assert.ok(result.includes("gsd_uat_result_save"));
+  assert.ok(result.includes("subagent"));
+  assert.ok(!result.includes("ToolSearch"));
+  assert.ok(!result.includes("bash"));
+  assert.ok(!result.includes("read"));
+  assert.ok(!result.includes("edit"));
+  assert.ok(!result.includes("write"));
+  assert.ok(!result.includes("gsd_exec"));
+  assert.ok(!result.includes("gsd_summary_save"));
+  assert.ok(!result.includes("gsd_save_gate_result"));
   assert.ok(!result.includes("gsd_task_complete"));
 });
 
@@ -218,6 +258,40 @@ test("buildMinimalAutoGsdToolSet prefers MCP browser tools for run-uat when avai
   assert.ok(!result.includes("browser_click"));
 });
 
+test("buildMinimalAutoGsdToolSet honors provider-compatible registered tools for run-uat", () => {
+  registerToolCompatibility("browser_screenshot", { producesImages: true });
+  const registered = [
+    "bash",
+    "read",
+    "ToolSearch",
+    "browser_navigate",
+    "browser_click",
+    "browser_screenshot",
+    "gsd_uat_exec",
+    "gsd_uat_result_save",
+    "gsd_resume",
+    "gsd_milestone_status",
+    "gsd_journal_query",
+    "gsd_exec",
+    "gsd_summary_save",
+    "gsd_save_gate_result",
+  ];
+  const providerCompatible = filterToolsForProvider(registered, "openai-responses").compatible;
+  const result = buildMinimalAutoGsdToolSet(["gsd_uat_exec"], "run-uat", providerCompatible);
+
+  assert.ok(result.includes("gsd_uat_exec"));
+  assert.ok(result.includes("gsd_uat_result_save"));
+  assert.ok(result.includes("browser_navigate"));
+  assert.ok(result.includes("browser_click"));
+  assert.ok(!result.includes("browser_screenshot"), "provider-filtered screenshot tool must stay filtered");
+  assert.ok(!result.includes("ToolSearch"));
+  assert.ok(!result.includes("bash"));
+  assert.ok(!result.includes("read"));
+  assert.ok(!result.includes("gsd_exec"));
+  assert.ok(!result.includes("gsd_summary_save"));
+  assert.ok(!result.includes("gsd_save_gate_result"));
+});
+
 test("buildMinimalAutoGsdToolSet includes discuss-slice persistence tools", () => {
   const result = buildMinimalAutoGsdToolSet([
     "bash",

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

@@ -39,6 +39,12 @@ const RENAME_MAP: Array<{ canonical: string; alias: string }> = [
   { canonical: "gsd_milestone_reopen", alias: "gsd_reopen_milestone" },
 ];
 
+const STANDALONE_TOOLS = [
+  "gsd_save_gate_result",
+  "gsd_skip_slice",
+  "gsd_uat_result_save",
+];
+
 // ─── Registration count ──────────────────────────────────────────────────────
 
 console.log('\n── Tool naming: registration count ──');
@@ -48,10 +54,14 @@ registerDbTools(pi);
 
 assert.deepStrictEqual(
   pi.tools.length,
-  RENAME_MAP.length * 2 + 2,
-  'Should register canonical/alias tool pairs plus 1 gate tool and 1 gsd_skip_slice',
+  RENAME_MAP.length * 2 + STANDALONE_TOOLS.length,
+  'Should register canonical/alias tool pairs plus standalone DB tools',
 );
 
+for (const name of STANDALONE_TOOLS) {
+  assert.ok(pi.tools.some((t: any) => t.name === name), `Standalone tool "${name}" should be registered`);
+}
+
 // ─── Both names exist for each pair ──────────────────────────────────────────
 
 console.log('\n── Tool naming: canonical and alias names exist ──');

package/src/resources/extensions/gsd/tests/tui-header-lifecycle.test.ts

@@ -7,12 +7,17 @@
 
 import test from "node:test";
 import assert from "node:assert/strict";
-import { mkdirSync, rmSync } from "node:fs";
+import { mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { visibleWidth } from "@gsd/pi-tui";
 
-import { setCompletionProgressWidget, updateProgressWidget } from "../auto-dashboard.ts";
+import {
+  _resetWidgetModeForTests,
+  setCompletionProgressWidget,
+  setWidgetMode,
+  updateProgressWidget,
+} from "../auto-dashboard.ts";
 import type { GSDState } from "../types.ts";
 
 interface CapturedSetHeader {
@@ -143,10 +148,18 @@ test("updateProgressWidget gracefully no-ops when ctx.ui lacks setHeader/setStat
 
 // ── NEXT-mode footer guidance ───────────────────────────────────────────
 
-test("auto-dashboard widget render output includes /gsd next guidance when isStepMode is true", (t) => {
+test("auto-dashboard full widget render output includes /gsd next guidance when isStepMode is true", (t) => {
   const dir = makeTempDir("step-hint");
   mkdirSync(join(dir, ".gsd"), { recursive: true });
-  t.after(() => cleanup(dir));
+  const projectPrefsPath = join(dir, ".gsd", "preferences.md");
+  const globalPrefsPath = join(dir, ".gsd", "global-preferences.md");
+  writeFileSync(projectPrefsPath, "---\nversion: 1\n---\n", "utf-8");
+  _resetWidgetModeForTests();
+  setWidgetMode("full", projectPrefsPath, globalPrefsPath);
+  t.after(() => {
+    _resetWidgetModeForTests();
+    cleanup(dir);
+  });
 
   let widgetFactory: ((tui: unknown, theme: unknown) => any) | undefined;
 
@@ -173,6 +186,7 @@ test("auto-dashboard widget render output includes /gsd next guidance when isSte
     bold: (text: string) => text,
   };
   const component = widgetFactory!(fakeTui, fakeTheme);
+  t.after(() => component.dispose?.());
   const lines = component.render(120);
 
   const hasStepHint = lines.some((line: string) => line.includes("/gsd next to advance one step"));
@@ -181,10 +195,18 @@ test("auto-dashboard widget render output includes /gsd next guidance when isSte
   if (component.dispose) component.dispose();
 });
 
-test("auto-dashboard widget render output omits /gsd next guidance when isStepMode is false", (t) => {
+test("auto-dashboard full widget render output omits /gsd next guidance when isStepMode is false", (t) => {
   const dir = makeTempDir("no-step-hint");
   mkdirSync(join(dir, ".gsd"), { recursive: true });
-  t.after(() => cleanup(dir));
+  const projectPrefsPath = join(dir, ".gsd", "preferences.md");
+  const globalPrefsPath = join(dir, ".gsd", "global-preferences.md");
+  writeFileSync(projectPrefsPath, "---\nversion: 1\n---\n", "utf-8");
+  _resetWidgetModeForTests();
+  setWidgetMode("full", projectPrefsPath, globalPrefsPath);
+  t.after(() => {
+    _resetWidgetModeForTests();
+    cleanup(dir);
+  });
 
   let widgetFactory: ((tui: unknown, theme: unknown) => any) | undefined;
 
@@ -211,6 +233,7 @@ test("auto-dashboard widget render output omits /gsd next guidance when isStepMo
     bold: (text: string) => text,
   };
   const component = widgetFactory!(fakeTui, fakeTheme);
+  t.after(() => component.dispose?.());
   const lines = component.render(120);
 
   const hasStepHint = lines.some((line: string) => line.includes("/gsd next to advance one step"));

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

@@ -344,6 +344,7 @@ test("#5843: run-uat uses verification tools policy so build/test commands can r
   const manifest = UNIT_MANIFESTS["run-uat"];
 
   assert.strictEqual(manifest.tools.mode, "verification");
+  assert.deepEqual(manifest.tools.allowedSubagents, ["mnemo", "scout", "reviewer", "tester"]);
 
   const buildResult = shouldBlockPlanningUnit(
     "bash",
@@ -367,6 +368,20 @@ test("#5843: run-uat uses verification tools policy so build/test commands can r
   );
   assert.strictEqual(sourceWriteResult.block, true);
   assert.match(sourceWriteResult.reason!, /tools-policy "verification"/);
+
+  const subagentResult = shouldBlockPlanningUnit(
+    "subagent",
+    "",
+    process.cwd(),
+    "run-uat",
+    manifest.tools,
+    ["mnemo"],
+  );
+  assert.strictEqual(
+    subagentResult.block,
+    false,
+    `run-uat must allow listed verification subagents: ${subagentResult.reason}`,
+  );
 });
 
 test("planning-dispatch hard block message omits internal tracker references", () => {
@@ -420,6 +435,11 @@ test('Unit Tool Contract exposes subagent dispatch permissions', () => {
     allowedSubagents: ["reviewer", "security", "tester"],
     toolsMode: "planning-dispatch",
   });
+  assert.deepEqual(resolveSubagentPermissionContract("run-uat"), {
+    allowed: true,
+    allowedSubagents: ["mnemo", "scout", "reviewer", "tester"],
+    toolsMode: "verification",
+  });
   assert.deepEqual(resolveSubagentPermissionContract("discuss-milestone"), {
     allowed: false,
     allowedSubagents: [],
@@ -427,21 +447,24 @@ test('Unit Tool Contract exposes subagent dispatch permissions', () => {
   });
 });
 
-test('planning-dispatch manifests declare non-empty allowedSubagents lists', () => {
+test('dispatch-capable manifests declare globally allowed subagents', () => {
   for (const [unitType, manifest] of Object.entries(UNIT_MANIFESTS)) {
-    if (manifest.tools.mode !== "planning-dispatch") continue;
+    const allowedSubagents = "allowedSubagents" in manifest.tools
+      ? manifest.tools.allowedSubagents
+      : undefined;
+    if (!allowedSubagents) continue;
     assert.ok(
-      Array.isArray(manifest.tools.allowedSubagents) && manifest.tools.allowedSubagents.length > 0,
-      `manifest "${unitType}" has planning-dispatch policy but no allowedSubagents — explicit allowlist is required for runtime dispatch gating`,
+      Array.isArray(allowedSubagents) && allowedSubagents.length > 0,
+      `manifest "${unitType}" enables subagent dispatch but has no allowedSubagents — explicit allowlist is required for runtime dispatch gating`,
     );
-    for (const agent of manifest.tools.allowedSubagents) {
+    for (const agent of allowedSubagents) {
       assert.ok(
         typeof agent === "string" && agent.length > 0,
         `manifest "${unitType}" has empty/invalid allowedSubagents entry: ${JSON.stringify(agent)}`,
       );
       assert.ok(
         ALLOWED_PLANNING_DISPATCH_AGENTS.has(agent),
-        `manifest "${unitType}" allows "${agent}", but the runtime planning-dispatch registry will hard-block it`,
+        `manifest "${unitType}" allows "${agent}", but the runtime controlled-dispatch registry will hard-block it`,
       );
     }
   }

package/src/resources/extensions/gsd/tests/validation-block-guard.test.ts

@@ -54,6 +54,8 @@ test("validation block allows recovery, diagnostics, and unrelated commands", ()
     "status",
     "verdict pass --rationale ok",
     "validate-milestone",
+    "dispatch reassess",
+    "dispatch reassess-roadmap",
     "dispatch validate",
     "dispatch validate-milestone",
     "park M006",
@@ -122,3 +124,22 @@ test("validation block message includes attempted command and recovery options",
   assert.match(message, /\/gsd verdict pass --rationale/);
   assert.match(message, /\/gsd park M006/);
 });
+
+test("validation block message can guide remediation through dispatch reassess", () => {
+  const message = formatValidationBlockedMessage({
+    ...blockedState(),
+    blockers: [
+      [
+        "Milestone M006 is blocked because milestone validation returned needs-remediation, but all slices are complete.",
+        "Fix options:",
+        "1. Run `/gsd dispatch reassess` to add remediation slices, then run `/gsd auto`",
+        "2. If the finding is acceptable, override it: `/gsd verdict pass --rationale \"why this is okay\"`",
+        "3. If this should wait, defer it explicitly: `/gsd park M006`",
+      ].join("\n"),
+    ],
+  }, "auto");
+
+  assert.ok(message);
+  assert.match(message, /\/gsd dispatch reassess/);
+  assert.doesNotMatch(message, /gsd_reassess_roadmap/);
+});

package/src/resources/extensions/gsd/tests/workflow-mcp-auto-prep.test.ts

@@ -54,7 +54,7 @@ test("prepareWorkflowMcpForProject uses the selected unit model when session pro
 
   assert.equal(result?.status, "created");
   assert.equal(existsSync(join(projectRoot, ".mcp.json")), true);
-  assert.match(notifications.map((entry) => entry.message).join("\n"), /Claude Code MCP prepared/);
+  assert.match(notifications.map((entry) => entry.message).join("\n"), /GSD MCP Server Prepared/);
 });
 
 test("shouldAutoPrepareWorkflowMcp stays disabled for non-Claude active provider even when claude-code is ready", () => {
@@ -178,7 +178,7 @@ test("before_agent_start auto-prepares project workflow MCP for Claude Code CLI"
     GSD_WORKFLOW_MCP_SERVER_NAME,
     GSD_BROWSER_MCP_SERVER_NAME,
   ]);
-  assert.match(notifications.join("\n"), /Claude Code MCP prepared/);
+  assert.match(notifications.join("\n"), /GSD MCP Server Prepared/);
 });
 
 test("before_agent_start returns discovered skill fallback without project .gsd", async (t) => {