@opengsd/gsd-pi 1.2.0-dev.955e4da0 → 1.2.0-dev.fb12b103

package/dist/resources/extensions/gsd/unit-context-composer.js

@@ -36,6 +36,7 @@
 // owned by the unit, not in the composer. Reviews must enforce this — it
 // is the difference between an orchestrator and a runaway DSL.
 import { resolveManifest, } from "./unit-context-manifest.js";
+import { getUnitToolSurfaceContract } from "./unit-tool-contracts.js";
 /**
  * Produce the inlined-context portion of a unit's system prompt by
  * walking the manifest's `artifacts.inline` list in order and calling
@@ -91,6 +92,14 @@ const CONTEXT_MODE_GUIDANCE_BY_LANE = {
     orchestration: "Use `gsd_resume` before resuming orchestration, `gsd_exec_search` to reuse prior runs, and `gsd_exec` for noisy coordination checks.",
     docs: "Use `gsd_resume` for prior context, `gsd_exec_search` for saved evidence, and `gsd_exec` for noisy doc validation commands.",
 };
+// Per-unit overrides win over the lane default. run-uat's tool contract
+// forbids `gsd_exec`/`gsd_exec_search` (acceptance evidence must flow through
+// `gsd_uat_exec`) and Claude Code dispatch strips the tools entirely, so the
+// shared verification-lane guidance would steer the agent into calling an
+// unavailable tool.
+const CONTEXT_MODE_GUIDANCE_BY_UNIT = {
+    "run-uat": "Use `gsd_uat_exec` for acceptance checks so evidence is typed as UAT-owned, and `gsd_resume` after compaction or resume.",
+};
 /**
  * Render the Context Mode instruction lane for a unit type. Unknown unit
  * types, disabled config, and explicit `contextMode: "none"` all omit the
@@ -103,7 +112,7 @@ export function composeContextModeInstructions(unitType, opts) {
     if (!manifest || manifest.contextMode === "none")
         return "";
     const lane = CONTEXT_MODE_LANE_LABELS[manifest.contextMode];
-    const guidance = CONTEXT_MODE_GUIDANCE_BY_LANE[manifest.contextMode];
+    const guidance = CONTEXT_MODE_GUIDANCE_BY_UNIT[unitType] ?? CONTEXT_MODE_GUIDANCE_BY_LANE[manifest.contextMode];
     if (opts.renderMode === "nested") {
         return `Context Mode (${lane} lane): ${guidance}`;
     }
@@ -114,6 +123,70 @@ export function composeContextModeInstructions(unitType, opts) {
         guidance,
     ].join("\n");
 }
+const TOOL_SURFACE_GUIDANCE_BY_UNIT = {
+    "run-uat": "Do not call `gsd_exec`, `Bash`, `Write`, or `Edit` — they are unavailable in this unit. Run every automated check through `gsd_uat_exec` with the appropriate `intent`. For browser UAT modes, use `browser_*` tools when presented; if browser automation fails, record the failure honestly and use `gsd_uat_exec` for the best objective substitute.",
+    "complete-slice": "Run slice-level verification through `gsd_exec` (or MCP-scoped `mcp__…__gsd_exec`), not direct `bash`. Do not call `gsd_uat_result_save` — run-uat owns persisted UAT assessment. On verification failure, do not edit user source files in this unit.",
+    "gate-evaluate": "Dispatch only **tester** subagents via `subagent`. Persist each gate with `gsd_save_gate_result`. Do not use `ToolSearch` — it is not available.",
+    "reactive-execute": "Dispatch only **worker** subagents via `subagent`. Do not call `gsd_task_complete` from this parent batch — each worker owns its task completion. If a failed task left no summary, call `gsd_summary_save` with `blocker_discovered: true`.",
+    "execute-task": "Complete only this task via `gsd_task_complete`. Do not call `gsd_slice_complete`, `gsd_validate_milestone`, or `gsd_complete_milestone` — the orchestrator owns phase transitions.",
+    "validate-milestone": "Dispatch reviewer subagents in parallel, then persist the verdict via `gsd_validate_milestone`. Do not query `.gsd/gsd.db` directly — use `gsd_milestone_status` and inlined context.",
+    "complete-milestone": "Persist completion only through `gsd_complete_milestone` after verification passes. Do not query `.gsd/gsd.db` directly. Do not write `.gsd/PROJECT.md` or `.gsd/REQUIREMENTS.md` by hand — use `gsd_summary_save` and `gsd_requirement_update`.",
+    "replan-slice": "Persist replans through `gsd_replan_slice` only. Do not edit `PLAN.md` or task plans directly.",
+    "plan-slice": "Persist planning through `gsd_plan_slice` only. Dispatch subagents only to **scout** or **planner** for reconnaissance — not implementation agents. Do not edit user source files outside `.gsd/**`.",
+    "refine-slice": "Persist refinements through `gsd_plan_slice` only. Dispatch subagents only to **scout** or **planner**. Do not edit user source files outside `.gsd/**`.",
+    "plan-milestone": "Persist milestone planning through `gsd_plan_milestone` / `gsd_plan_slice`. Do not edit user source files outside `.gsd/**`.",
+    "research-slice": "Dispatch subagents only to **scout** or **planner** for reconnaissance. Do not edit user source files outside `.gsd/**`.",
+};
+function guidanceForToolsPolicy(policy) {
+    switch (policy.mode) {
+        case "planning":
+            return "Writes are restricted to `.gsd/**` under the working directory — do not edit user source files. `bash` is limited to read-only investigation commands. Do not dispatch subagents. For human elicitation, use workflow MCP `ask_user_questions` when available — not native `AskUserQuestion`.";
+        case "planning-dispatch": {
+            const agents = policy.allowedSubagents.map((agent) => `**${agent}**`).join(", ");
+            return `Writes are restricted to \`.gsd/**\`. Dispatch subagents only to: ${agents}. Do not edit user source files.`;
+        }
+        case "docs":
+            return "Writes are restricted to `.gsd/**` and project documentation paths (`docs/`, `README*`, `CHANGELOG.md`, root `*.md`). Do not edit application source.";
+        case "verification": {
+            const subagentLine = policy.allowedSubagents?.length
+                ? ` Dispatch subagents only to: ${policy.allowedSubagents.map((agent) => `**${agent}**`).join(", ")}.`
+                : " Do not dispatch subagents.";
+            return `\`bash\` is limited to build/test verification commands. Writes restricted to \`.gsd/**\`.${subagentLine}`;
+        }
+        default:
+            return null;
+    }
+}
+function formatForbiddenWorkflowToolsLine(unitType, unitGuidance) {
+    const forbidden = getUnitToolSurfaceContract(unitType)?.forbiddenGsdTools;
+    if (!forbidden)
+        return null;
+    const names = Object.keys(forbidden).filter((name) => !unitGuidance?.includes(`\`${name}\``));
+    if (names.length === 0)
+        return null;
+    return `Do not call ${names.map((name) => `\`${name}\``).join(", ")} in this unit.`;
+}
+/**
+ * Render upfront tool-surface guidance for a unit type. Unknown units and
+ * unrestricted (`tools.mode: "all"`) units omit the block unless they have
+ * unit-specific closeout guidance registered above.
+ */
+export function composeToolSurfaceInstructions(unitType, opts) {
+    const manifest = resolveManifest(unitType);
+    if (!manifest)
+        return "";
+    const unitGuidance = TOOL_SURFACE_GUIDANCE_BY_UNIT[unitType];
+    const policyGuidance = unitGuidance ? null : guidanceForToolsPolicy(manifest.tools);
+    const forbiddenLine = formatForbiddenWorkflowToolsLine(unitType, unitGuidance);
+    const parts = [unitGuidance, policyGuidance, forbiddenLine].filter((part) => typeof part === "string" && part.length > 0);
+    if (parts.length === 0)
+        return "";
+    const body = parts.join(" ");
+    if (opts.renderMode === "nested") {
+        return `Tool surface: ${body}`;
+    }
+    return ["## Tool Surface", "", body].join("\n");
+}
 const SECTION_SEPARATOR = "\n\n---\n\n";
 /**
  * Compose all manifest-declared context for a unit type using the v2

package/dist/resources/extensions/gsd/unit-context-manifest.js

@@ -118,33 +118,10 @@ const TOOLS_DOCS = {
  * enumerates these against `UNIT_MANIFESTS` to catch manifest drift when
  * a new unit type lands.
  */
-export const 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",
-    // Sidecar units (triage, quick-task)
-    "triage-captures",
-    "quick-task",
-    // Deep planning mode (project-level) units
-    "workflow-preferences",
-    "discuss-project",
-    "discuss-requirements",
-    "research-decision",
-    "research-project",
-];
+// Unit-type vocabulary is owned by the Unit Registry (ADR-033); re-exported
+// here so established import paths keep working.
+import { KNOWN_UNIT_TYPES } from "./unit-registry.js";
+export { KNOWN_UNIT_TYPES };
 export const UNIT_MANIFESTS = {
     // ─── Milestone-scoped ────────────────────────────────────────────────
     "research-milestone": {

package/dist/resources/extensions/gsd/unit-registry.js

@@ -0,0 +1,337 @@
+// Project/App: gsd-pi
+// File Purpose: Unit Registry — the single declaration point for what a Unit type is (ADR-033).
+//
+// One Unit Descriptor per Unit type. The previously independent tables —
+// `KNOWN_UNIT_TYPES`/`UnitType` (unit-context-manifest.ts), `UNIT_TOOL_CONTRACTS`
+// (unit-tool-contracts.ts), the scope-class Sets (auto-unit-tool-scope.ts), and
+// the unit→phase switch (preferences-models.ts) — are derived views over this
+// registry. Import paths stay stable: each former home re-exports its view
+// (the `gsd-db.ts` barrel discipline).
+//
+// Behaviour-neutral by construction. The registry preserves the asymmetries the
+// old tables had drifted into, explicitly instead of accidentally:
+//   - `discuss-slice` and `execute-task-simple` had tool contracts and scope-Set
+//     membership but were absent from `KNOWN_UNIT_TYPES` → declared here as
+//     `kind: "variant"` (excluded from the derived `KNOWN_UNIT_TYPES`/`UnitType`).
+//   - `triage-captures` and `quick-task` had manifests but no tool contract and
+//     no phase routing → `toolContract: null`, `phaseChain: null`.
+// The parity test (tests/unit-registry.test.ts) pins every derived view to the
+// pre-registry values.
+//
+// Not yet declared here (remaining ADR-033 steps): the manifest data
+// (`UNIT_MANIFESTS` stays in unit-context-manifest.ts, already type-enforced
+// against the registry's `UnitType`) and prompt-template association (still
+// implicit in auto-prompts.ts builders).
+import { BROWSER_CONTRACT_TOOL_NAMES } from "../shared/browser-contract.js";
+// ─── Shared tool-name constants (used by registry rows) ──────────────────
+export const RUN_UAT_WORKFLOW_TOOL_NAMES = [
+    "gsd_uat_exec",
+    "gsd_uat_result_save",
+    "gsd_resume",
+    "gsd_milestone_status",
+    "gsd_journal_query",
+];
+export const RUN_UAT_READ_ONLY_TOOL_NAMES = [
+    "find",
+    "glob",
+    "grep",
+    "ls",
+    "read",
+];
+/**
+ * Browser tools presented to run-uat. A derived view of the Browser Automation
+ * Contract vocabulary (shared/browser-contract.ts) — the contract module is the
+ * only place browser tool names are declared.
+ */
+export const RUN_UAT_BROWSER_TOOL_NAMES = BROWSER_CONTRACT_TOOL_NAMES;
+// ─── The registry ─────────────────────────────────────────────────────────
+export const UNIT_REGISTRY = {
+    "research-milestone": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["research"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_summary_save"],
+        },
+    },
+    "plan-milestone": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["planning"],
+        toolContract: {
+            allowedGsdTools: [
+                "gsd_milestone_status",
+                "gsd_plan_milestone",
+                "gsd_plan_slice",
+                "gsd_decision_save",
+                "gsd_requirement_update",
+            ],
+            requiredWorkflowTools: ["gsd_milestone_status", "gsd_plan_milestone", "gsd_plan_slice"],
+        },
+    },
+    "discuss-milestone": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["discuss", "planning"],
+        toolContract: {
+            allowedGsdTools: [
+                "gsd_summary_save",
+                "gsd_decision_save",
+                "gsd_requirement_save",
+                "gsd_requirement_update",
+                "gsd_plan_milestone",
+                "gsd_milestone_generate_id",
+            ],
+            requiredWorkflowTools: [
+                "ask_user_questions",
+                "gsd_summary_save",
+                "gsd_requirement_save",
+                "gsd_requirement_update",
+                "gsd_plan_milestone",
+                "gsd_milestone_generate_id",
+            ],
+        },
+    },
+    "discuss-slice": {
+        kind: "variant",
+        scopeClass: "standard",
+        phaseChain: ["discuss", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            requiredWorkflowTools: ["ask_user_questions", "gsd_summary_save"],
+        },
+    },
+    "validate-milestone": {
+        kind: "primary",
+        scopeClass: "section-close",
+        phaseChain: ["validation", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_milestone_status", "gsd_validate_milestone", "gsd_reassess_roadmap", "subagent"],
+            requiredWorkflowTools: ["gsd_milestone_status", "gsd_validate_milestone", "gsd_reassess_roadmap"],
+        },
+    },
+    "complete-milestone": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["completion"],
+        toolContract: {
+            allowedGsdTools: [
+                "gsd_milestone_status",
+                "gsd_requirement_update",
+                "gsd_summary_save",
+                "gsd_complete_milestone",
+                "subagent",
+            ],
+            requiredWorkflowTools: [
+                "gsd_milestone_status",
+                "gsd_requirement_update",
+                "gsd_summary_save",
+                "gsd_complete_milestone",
+            ],
+        },
+    },
+    "research-slice": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["research"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_summary_save"],
+        },
+    },
+    "plan-slice": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_plan_slice", "gsd_reassess_roadmap", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_plan_slice", "gsd_reassess_roadmap"],
+        },
+    },
+    "refine-slice": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_plan_slice", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_plan_slice"],
+        },
+    },
+    "replan-slice": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_replan_slice", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_replan_slice"],
+        },
+    },
+    "complete-slice": {
+        kind: "primary",
+        scopeClass: "section-close",
+        phaseChain: ["completion"],
+        toolContract: {
+            allowedGsdTools: [
+                "gsd_slice_complete",
+                "gsd_task_reopen",
+                "gsd_replan_slice",
+                "gsd_decision_save",
+                "gsd_requirement_update",
+                "gsd_summary_save",
+                "subagent",
+            ],
+            requiredWorkflowTools: [
+                "gsd_slice_complete",
+                "gsd_task_reopen",
+                "gsd_replan_slice",
+                "gsd_requirement_update",
+                "gsd_summary_save",
+            ],
+            forbiddenGsdTools: {
+                gsd_uat_result_save: "Run UAT owns persisted UAT Assessment.",
+            },
+        },
+    },
+    "reassess-roadmap": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["validation", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_milestone_status", "gsd_reassess_roadmap"],
+            requiredWorkflowTools: ["gsd_milestone_status", "gsd_reassess_roadmap"],
+        },
+    },
+    "execute-task": {
+        kind: "primary",
+        scopeClass: "execute-task",
+        phaseChain: ["execution"],
+        toolContract: {
+            allowedGsdTools: ["gsd_task_complete", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_task_complete"],
+        },
+    },
+    "execute-task-simple": {
+        kind: "variant",
+        scopeClass: "execute-task",
+        phaseChain: ["execution_simple", "execution"],
+        toolContract: {
+            allowedGsdTools: ["gsd_task_complete", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_task_complete"],
+        },
+    },
+    "reactive-execute": {
+        kind: "primary",
+        scopeClass: "execute-task",
+        phaseChain: ["execution"],
+        toolContract: {
+            allowedGsdTools: ["gsd_task_complete", "gsd_summary_save", "gsd_decision_save"],
+            requiredWorkflowTools: ["gsd_task_complete", "gsd_summary_save"],
+        },
+    },
+    "run-uat": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["uat", "completion"],
+        toolContract: {
+            allowedGsdTools: [...RUN_UAT_WORKFLOW_TOOL_NAMES, "subagent"],
+            requiredWorkflowTools: [...RUN_UAT_WORKFLOW_TOOL_NAMES],
+            forbiddenGsdTools: {
+                gsd_exec: "Use gsd_uat_exec so acceptance evidence is typed as UAT-owned.",
+                gsd_save_gate_result: "gsd_uat_result_save owns the aggregate UAT gate.",
+                gsd_summary_save: "gsd_uat_result_save owns persisted UAT Assessment writes.",
+            },
+        },
+    },
+    "gate-evaluate": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["validation", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_save_gate_result"],
+            requiredWorkflowTools: ["gsd_save_gate_result"],
+        },
+    },
+    "rewrite-docs": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["validation", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            requiredWorkflowTools: [],
+        },
+    },
+    // Sidecar units (triage, quick-task) — manifests exist, but no scoped tool
+    // contract and no phase routing (today's behaviour, preserved explicitly).
+    "triage-captures": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: null,
+        toolContract: null,
+    },
+    "quick-task": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: null,
+        toolContract: null,
+    },
+    // Deep planning mode (project-level) units
+    "workflow-preferences": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["discuss", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save"],
+            requiredWorkflowTools: [],
+        },
+    },
+    "discuss-project": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["discuss", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save", "gsd_requirement_save"],
+            requiredWorkflowTools: ["ask_user_questions", "gsd_summary_save"],
+        },
+    },
+    "discuss-requirements": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["discuss", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_requirement_save", "gsd_summary_save"],
+            requiredWorkflowTools: ["ask_user_questions", "gsd_requirement_save", "gsd_summary_save"],
+        },
+    },
+    "research-decision": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["discuss", "planning"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save"],
+            requiredWorkflowTools: ["ask_user_questions"],
+        },
+    },
+    "research-project": {
+        kind: "primary",
+        scopeClass: "standard",
+        phaseChain: ["research"],
+        toolContract: {
+            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            requiredWorkflowTools: [],
+        },
+    },
+};
+const ALL_UNIT_KEYS = Object.keys(UNIT_REGISTRY);
+export const KNOWN_UNIT_TYPES = Object.freeze(ALL_UNIT_KEYS.filter((t) => UNIT_REGISTRY[t].kind === "primary"));
+export const EXECUTE_TASK_UNIT_TYPES = new Set(ALL_UNIT_KEYS.filter((t) => UNIT_REGISTRY[t].scopeClass === "execute-task"));
+// Execute-task units close gates via summary sections too, so the section-close
+// gate Set is every non-"standard" scope class.
+export const SECTION_CLOSE_GATE_UNIT_TYPES = new Set(ALL_UNIT_KEYS.filter((t) => UNIT_REGISTRY[t].scopeClass !== "standard"));
+export function getUnitDescriptor(unitType) {
+    return UNIT_REGISTRY[unitType];
+}
+/** Phase-bucket fallback chain for a unit type, or null when the registry has no routing for it. */
+export function getUnitPhaseChain(unitType) {
+    return getUnitDescriptor(unitType)?.phaseChain ?? null;
+}

package/dist/resources/extensions/gsd/unit-tool-contracts.js

@@ -1,187 +1,14 @@
 // Project/App: gsd-pi
-// File Purpose: Central Unit-to-tool contracts for phase-aware GSD tool surfaces.
-export const RUN_UAT_WORKFLOW_TOOL_NAMES = [
-    "gsd_uat_exec",
-    "gsd_uat_result_save",
-    "gsd_resume",
-    "gsd_milestone_status",
-    "gsd_journal_query",
-];
-export const RUN_UAT_READ_ONLY_TOOL_NAMES = [
-    "find",
-    "glob",
-    "grep",
-    "ls",
-    "read",
-];
-export const RUN_UAT_BROWSER_TOOL_NAMES = [
-    "browser_navigate",
-    "browser_click",
-    "browser_type",
-    "browser_fill_form",
-    "browser_click_ref",
-    "browser_fill_ref",
-    "browser_wait_for",
-    "browser_assert",
-    "browser_verify",
-    "browser_screenshot",
-    "browser_snapshot_refs",
-    "browser_find",
-    "browser_get_console_logs",
-    "browser_get_network_logs",
-    "browser_evaluate",
-    "browser_reload",
-    "browser_batch",
-    "browser_act",
-];
+// File Purpose: Unit-to-tool contract views derived from the Unit Registry (ADR-033).
+//
+// The contract data lives in unit-registry.ts (one Unit Descriptor per unit
+// type). This file keeps the established import surface: the derived
+// `UNIT_TOOL_CONTRACTS` table and its accessor functions are unchanged for
+// consumers.
+import { UNIT_REGISTRY, } from "./unit-registry.js";
+export { RUN_UAT_WORKFLOW_TOOL_NAMES, RUN_UAT_READ_ONLY_TOOL_NAMES, RUN_UAT_BROWSER_TOOL_NAMES, } from "./unit-registry.js";
 export const RUN_UAT_TOOL_PRESENTATION_PLAN_ID = "run-uat/default-v1";
-export const UNIT_TOOL_CONTRACTS = {
-    "research-milestone": {
-        allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_summary_save"],
-    },
-    "plan-milestone": {
-        allowedGsdTools: [
-            "gsd_milestone_status",
-            "gsd_plan_milestone",
-            "gsd_plan_slice",
-            "gsd_decision_save",
-            "gsd_requirement_update",
-        ],
-        requiredWorkflowTools: ["gsd_milestone_status", "gsd_plan_milestone", "gsd_plan_slice"],
-    },
-    "discuss-milestone": {
-        allowedGsdTools: [
-            "gsd_summary_save",
-            "gsd_decision_save",
-            "gsd_requirement_save",
-            "gsd_requirement_update",
-            "gsd_plan_milestone",
-            "gsd_milestone_generate_id",
-        ],
-        requiredWorkflowTools: [
-            "ask_user_questions",
-            "gsd_summary_save",
-            "gsd_requirement_save",
-            "gsd_requirement_update",
-            "gsd_plan_milestone",
-            "gsd_milestone_generate_id",
-        ],
-    },
-    "discuss-slice": {
-        allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
-        requiredWorkflowTools: ["ask_user_questions", "gsd_summary_save"],
-    },
-    "validate-milestone": {
-        allowedGsdTools: ["gsd_milestone_status", "gsd_validate_milestone", "gsd_reassess_roadmap", "subagent"],
-        requiredWorkflowTools: ["gsd_milestone_status", "gsd_validate_milestone", "gsd_reassess_roadmap"],
-    },
-    "complete-milestone": {
-        allowedGsdTools: [
-            "gsd_milestone_status",
-            "gsd_requirement_update",
-            "gsd_summary_save",
-            "gsd_complete_milestone",
-            "subagent",
-        ],
-        requiredWorkflowTools: [
-            "gsd_milestone_status",
-            "gsd_requirement_update",
-            "gsd_summary_save",
-            "gsd_complete_milestone",
-        ],
-    },
-    "research-slice": {
-        allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_summary_save"],
-    },
-    "plan-slice": {
-        allowedGsdTools: ["gsd_plan_slice", "gsd_reassess_roadmap", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_plan_slice", "gsd_reassess_roadmap"],
-    },
-    "refine-slice": {
-        allowedGsdTools: ["gsd_plan_slice", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_plan_slice"],
-    },
-    "replan-slice": {
-        allowedGsdTools: ["gsd_replan_slice", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_replan_slice"],
-    },
-    "complete-slice": {
-        allowedGsdTools: [
-            "gsd_slice_complete",
-            "gsd_task_reopen",
-            "gsd_replan_slice",
-            "gsd_decision_save",
-            "gsd_requirement_update",
-            "gsd_summary_save",
-            "subagent",
-        ],
-        requiredWorkflowTools: [
-            "gsd_slice_complete",
-            "gsd_task_reopen",
-            "gsd_replan_slice",
-            "gsd_requirement_update",
-            "gsd_summary_save",
-        ],
-        forbiddenGsdTools: {
-            gsd_uat_result_save: "Run UAT owns persisted UAT Assessment.",
-        },
-    },
-    "reassess-roadmap": {
-        allowedGsdTools: ["gsd_milestone_status", "gsd_reassess_roadmap"],
-        requiredWorkflowTools: ["gsd_milestone_status", "gsd_reassess_roadmap"],
-    },
-    "execute-task": {
-        allowedGsdTools: ["gsd_task_complete", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_task_complete"],
-    },
-    "execute-task-simple": {
-        allowedGsdTools: ["gsd_task_complete", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_task_complete"],
-    },
-    "reactive-execute": {
-        allowedGsdTools: ["gsd_task_complete", "gsd_summary_save", "gsd_decision_save"],
-        requiredWorkflowTools: ["gsd_task_complete", "gsd_summary_save"],
-    },
-    "run-uat": {
-        allowedGsdTools: [...RUN_UAT_WORKFLOW_TOOL_NAMES, "subagent"],
-        requiredWorkflowTools: [...RUN_UAT_WORKFLOW_TOOL_NAMES],
-        forbiddenGsdTools: {
-            gsd_exec: "Use gsd_uat_exec so acceptance evidence is typed as UAT-owned.",
-            gsd_save_gate_result: "gsd_uat_result_save owns the aggregate UAT gate.",
-            gsd_summary_save: "gsd_uat_result_save owns persisted UAT Assessment writes.",
-        },
-    },
-    "gate-evaluate": {
-        allowedGsdTools: ["gsd_save_gate_result"],
-        requiredWorkflowTools: ["gsd_save_gate_result"],
-    },
-    "rewrite-docs": {
-        allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
-        requiredWorkflowTools: [],
-    },
-    "workflow-preferences": {
-        allowedGsdTools: ["gsd_summary_save"],
-        requiredWorkflowTools: [],
-    },
-    "discuss-project": {
-        allowedGsdTools: ["gsd_summary_save", "gsd_decision_save", "gsd_requirement_save"],
-        requiredWorkflowTools: ["ask_user_questions", "gsd_summary_save"],
-    },
-    "discuss-requirements": {
-        allowedGsdTools: ["gsd_requirement_save", "gsd_summary_save"],
-        requiredWorkflowTools: ["ask_user_questions", "gsd_requirement_save", "gsd_summary_save"],
-    },
-    "research-decision": {
-        allowedGsdTools: ["gsd_summary_save"],
-        requiredWorkflowTools: ["ask_user_questions"],
-    },
-    "research-project": {
-        allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
-        requiredWorkflowTools: [],
-    },
-};
+export const UNIT_TOOL_CONTRACTS = Object.fromEntries(Object.entries(UNIT_REGISTRY).flatMap(([unitType, descriptor]) => descriptor.toolContract ? [[unitType, descriptor.toolContract]] : []));
 export const AUTO_UNIT_SCOPED_TOOLS = Object.fromEntries(Object.entries(UNIT_TOOL_CONTRACTS).map(([unitType, contract]) => [unitType, contract.allowedGsdTools]));
 export function getUnitToolSurfaceContract(unitType) {
     return UNIT_TOOL_CONTRACTS[unitType];