@opengsd/gsd-pi 1.1.1-dev.b2556262 → 1.2.0-dev.0b870afa

package/src/resources/extensions/gsd/tests/transport-gate-double-complete.test.ts

@@ -0,0 +1,139 @@
+// gsd-pi — Regression tests for the centralized transport gate and
+// milestone double-complete guard (auto-dispatch.ts + phases.ts).
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+
+import { resolveDispatch } from "../auto-dispatch.ts";
+import { openDatabase, closeDatabase, insertMilestone, getMilestone } from "../gsd-db.ts";
+import { isClosedStatus } from "../status-guards.ts";
+import { getWorkflowTransportSupportError } from "../workflow-mcp.ts";
+
+// ── transport gate: getWorkflowTransportSupportError blocks missing tools ────
+
+test("getWorkflowTransportSupportError blocks when required non-surface tools are missing", () => {
+  const err = getWorkflowTransportSupportError(
+    "claude-code",
+    ["custom_non_surface_tool"],
+    {
+      projectRoot: process.cwd(),
+      surface: "auto-mode",
+      unitType: "execute-task",
+      authMode: "externalCli",
+      baseUrl: "local://claude-code",
+      activeTools: ["some_other_tool"],
+    },
+  );
+  assert.ok(err, "should return an error when required non-surface tools are missing from activeTools");
+  assert.match(err, /cannot run/i);
+});
+
+test("getWorkflowTransportSupportError passes for non-MCP transport", () => {
+  const err = getWorkflowTransportSupportError(
+    "claude-code",
+    ["custom_non_surface_tool"],
+    {
+      projectRoot: process.cwd(),
+      surface: "auto-mode",
+      unitType: "execute-task",
+      authMode: "apiKey",
+      baseUrl: "https://api.anthropic.com",
+      activeTools: [],
+    },
+  );
+  assert.equal(err, null, "non-MCP transport should not be blocked");
+});
+
+test("resolveDispatch allows dispatch when MCP tools are available", async (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-transport-pass-"));
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  t.after(() => {
+    closeDatabase();
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  insertMilestone({ id: "M001", title: "Test", status: "active" });
+
+  const action = await resolveDispatch({
+    basePath: base,
+    mid: "M001",
+    midTitle: "Test",
+    state: {
+      phase: "executing",
+      activeMilestone: { id: "M001", title: "Test", status: "active" },
+      activeSlice: { id: "S01", title: "Slice" },
+      activeTask: { id: "M001/S01/T01", title: "Task", status: "pending" },
+      registry: [],
+      blockers: [],
+    } as any,
+    prefs: undefined,
+    // No transport gate deps → no MCP check → dispatch should go through
+  });
+
+  assert.equal(action.action, "dispatch");
+});
+
+// ── double-complete guard: isClosedStatus prevents duplicate closeout ────────
+
+test("isClosedStatus detects complete milestone status", () => {
+  assert.equal(isClosedStatus("complete"), true);
+  assert.equal(isClosedStatus("done"), true);
+  assert.equal(isClosedStatus("skipped"), true);
+  assert.equal(isClosedStatus("closed"), true);
+  assert.equal(isClosedStatus("active"), false);
+  assert.equal(isClosedStatus("pending"), false);
+  assert.equal(isClosedStatus(""), false);
+});
+
+test("getMilestone + isClosedStatus guards against double-complete dispatch", (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-double-complete-"));
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  t.after(() => {
+    closeDatabase();
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  insertMilestone({ id: "M001", title: "Test", status: "complete" });
+
+  // resolveDispatch itself checks for closed milestones at the top
+  // (before any dispatch rule fires), which is the same guard used
+  // by the phases.ts double-complete check.
+  const milestone = getMilestone("M001");
+  assert.ok(milestone, "milestone should exist in DB");
+  assert.equal(isClosedStatus(milestone.status), true, "closed milestone must be detected");
+});
+
+test("resolveDispatch stops on closed milestone before dispatching", async (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-closed-milestone-"));
+  mkdirSync(join(base, ".gsd"), { recursive: true });
+  openDatabase(join(base, ".gsd", "gsd.db"));
+  t.after(() => {
+    closeDatabase();
+    rmSync(base, { recursive: true, force: true });
+  });
+
+  insertMilestone({ id: "M001", title: "Test", status: "complete" });
+
+  const action = await resolveDispatch({
+    basePath: base,
+    mid: "M001",
+    midTitle: "Test",
+    state: {
+      phase: "complete",
+      activeMilestone: { id: "M001", title: "Test", status: "complete" },
+      activeSlice: null,
+      activeTask: null,
+      registry: [],
+      blockers: [],
+    } as any,
+    prefs: undefined,
+  });
+
+  assert.equal(action.action, "stop");
+  assert.match(action.reason ?? "", /closed/i);
+});

package/src/resources/extensions/gsd/tests/uat-policy.test.ts

@@ -3,9 +3,9 @@ import assert from "node:assert/strict";
 
 import {
   classifyUatContent,
+  classifyUatContentForRun,
   getDeclaredUatType,
   getUatBrowserToolSupportError,
-  hasUatBrowserToolSurface,
   isPartialEligibleUatType,
   resolveEffectiveUatType,
   shouldDispatchUatForContent,
@@ -13,12 +13,104 @@ import {
   uatTypeIncludesBrowser,
   validateUatModePolicy,
 } from "../uat-policy.ts";
+import {
+  assertBrowserAutomationContractAvailable,
+  assertBrowserAutomationContractMissing,
+  assertBrowserBackedUatCanDispatch,
+  BROWSER_AUTOMATION_CONTRACT_TOOLS,
+} from "./browser-automation-contract-fixture.ts";
 
 describe("uat-policy", () => {
   it("defaults missing UAT mode to artifact-driven", () => {
     assert.equal(getDeclaredUatType("# UAT\n\nCheck generated files."), "artifact-driven");
   });
 
+  it("parses a bare keyword under ## UAT Type (M006/S01 agent format drift)", () => {
+    const content = [
+      "# S01 UAT",
+      "",
+      "## UAT Type",
+      "browser-executable",
+      "",
+      "## Preconditions",
+      "- Run `node tests/browser/search-uat.mjs` (it starts its own server on an ephemeral port; do not start serve-static separately).",
+    ].join("\n");
+    assert.equal(getDeclaredUatType(content), "browser-executable");
+    assert.equal(shouldEscalateArtifactUatToBrowser(content), false);
+  });
+
+  it("promotes browser-executable UAT when slice context names test:uat but UAT only documents test:server (M007/S01)", () => {
+    const uatFile = [
+      "# S01 UAT",
+      "",
+      "## UAT Type",
+      "- UAT mode: browser-executable",
+      "",
+      "## Preconditions",
+      "- Start the dev/local verification server with `npm run test:server`.",
+      "- Open the app at the localhost URL printed by the server.",
+    ].join("\n");
+    const sliceContext = [
+      "Fresh slice-level verification ran via `gsd_exec` with `npm run test:uat` and passed.",
+      "The run produced PASS with browser diagnostics consoleErrors=0.",
+    ].join("\n");
+
+    assert.equal(classifyUatContentForRun(uatFile, sliceContext).effectiveType, "runtime-executable");
+    assert.equal(classifyUatContentForRun(uatFile).effectiveType, "browser-executable");
+  });
+
+  it("promotes browser-executable UAT to runtime-executable when a self-contained harness is named (M006/S01)", () => {
+    const content = [
+      "# S01 UAT",
+      "",
+      "## UAT Type",
+      "- UAT mode: browser-executable",
+      "",
+      "## Preconditions",
+      "- Start the local app server with `npm run start`.",
+      "- Open the app at `http://127.0.0.1:4173`.",
+      "",
+      "## Evidence",
+      "- Fresh closeout verification command: `node --check app.js && node --check tests/browser/search-uat.mjs && npm run test:uat`",
+    ].join("\n");
+
+    assert.equal(resolveEffectiveUatType(content), "runtime-executable");
+    assert.deepEqual(classifyUatContent(content), {
+      declaredType: "browser-executable",
+      modeDeclared: true,
+      effectiveType: "runtime-executable",
+      browserRequired: false,
+      shouldDispatchByDefault: true,
+    });
+  });
+
+  it("parses a UAT mode line case-insensitively with bold markers", () => {
+    const content = [
+      "## UAT Type",
+      "- **UAT Mode:** Runtime-Executable (npx playwright test)",
+    ].join("\n");
+    assert.equal(getDeclaredUatType(content), "runtime-executable");
+  });
+
+  it("does not parse prose in the section as a mode declaration", () => {
+    const content = [
+      "## UAT Type",
+      "- Why this mode is sufficient: static checks cover the schema.",
+    ].join("\n");
+    assert.equal(getDeclaredUatType(content), "artifact-driven");
+  });
+
+  it("treats an explicit UAT mode line with an unrecognised value as undeclared", () => {
+    const content = [
+      "## UAT Type",
+      "- UAT mode: manual-spot-check",
+      "- browser-executable would also work",
+    ].join("\n");
+    // The explicit declaration wins (and fails to parse) — the stray keyword
+    // bullet below it must not be promoted to the declared mode.
+    assert.equal(getDeclaredUatType(content), "artifact-driven");
+  });
+
   it("escalates artifact-driven UAT to browser-executable when the spec requires browser work", () => {
     const content = [
       "## UAT Type",
@@ -33,6 +125,7 @@ describe("uat-policy", () => {
     assert.equal(shouldDispatchUatForContent(content, undefined), true);
     assert.deepEqual(classifyUatContent(content), {
       declaredType: "artifact-driven",
+      modeDeclared: true,
       effectiveType: "browser-executable",
       browserRequired: true,
       shouldDispatchByDefault: true,
@@ -63,11 +156,14 @@ describe("uat-policy", () => {
     }
   });
 
-  it("detects direct and MCP-shaped browser tool surfaces", () => {
-    assert.equal(hasUatBrowserToolSurface(["read", "browser_navigate"]), true);
-    assert.equal(hasUatBrowserToolSurface(["read", "mcp__gsd-browser__browser_navigate"]), true);
-    assert.equal(hasUatBrowserToolSurface(["read", "gsd_uat_exec"]), false);
-    assert.equal(hasUatBrowserToolSurface(undefined), false);
+  it("detects Browser Automation Contract capability across adapters", () => {
+    assertBrowserAutomationContractAvailable(BROWSER_AUTOMATION_CONTRACT_TOOLS.piProvider);
+    assertBrowserAutomationContractAvailable(BROWSER_AUTOMATION_CONTRACT_TOOLS.externalMcpClient);
+    assertBrowserAutomationContractAvailable(BROWSER_AUTOMATION_CONTRACT_TOOLS.externalMcpWildcard);
+    assertBrowserAutomationContractAvailable(BROWSER_AUTOMATION_CONTRACT_TOOLS.otherBrowserMcp);
+    assertBrowserAutomationContractMissing(BROWSER_AUTOMATION_CONTRACT_TOOLS.workflowOnly);
+    assertBrowserAutomationContractMissing(BROWSER_AUTOMATION_CONTRACT_TOOLS.withoutBrowser);
+    assertBrowserAutomationContractMissing(undefined);
   });
 
   it("reports missing browser tools only for browser-backed UAT with a known tool snapshot", () => {
@@ -89,6 +185,16 @@ describe("uat-policy", () => {
       }),
       null,
     );
+    assertBrowserBackedUatCanDispatch({
+      uatType: "human-experience",
+      activeTools: BROWSER_AUTOMATION_CONTRACT_TOOLS.withoutBrowser,
+      registeredTools: BROWSER_AUTOMATION_CONTRACT_TOOLS.piProvider,
+    });
+    assertBrowserBackedUatCanDispatch({
+      uatType: "human-experience",
+      activeTools: BROWSER_AUTOMATION_CONTRACT_TOOLS.withoutBrowser,
+      registeredTools: BROWSER_AUTOMATION_CONTRACT_TOOLS.externalMcpWildcard,
+    });
 
     const error = getUatBrowserToolSupportError({
       uatType: "browser-executable",

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, "");