@opengsd/gsd-pi 1.0.2-dev.867e002 → 1.0.2-dev.cce3612

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

@@ -108,6 +108,34 @@ test("executeSummarySave persists artifact and returns computed path", async ()
   }
 });
 
+test("executeSummarySave mirrors milestone artifacts into the active worktree projection", async () => {
+  const base = makeTmpBase();
+  const worktree = join(base, ".gsd", "worktrees", "M001");
+  try {
+    mkdirSync(join(worktree, ".gsd"), { recursive: true });
+    writeFileSync(join(worktree, ".git"), "gitdir: ../../../.git/worktrees/M001\n");
+    openTestDb(base);
+
+    const result = await inProjectDir(worktree, () => executeSummarySave({
+      milestone_id: "M001",
+      slice_id: "S02",
+      artifact_type: "RESEARCH",
+      content: "# S02 Research\n\ncanonical and worktree",
+    }, worktree));
+
+    assert.equal(result.details.operation, "save_summary");
+    const relPath = "milestones/M001/slices/S02/S02-RESEARCH.md";
+    const projectPath = join(base, ".gsd", relPath);
+    const worktreePath = join(worktree, ".gsd", relPath);
+    assert.equal(existsSync(projectPath), true, "canonical artifact should be written");
+    assert.equal(existsSync(worktreePath), true, "active worktree projection should be mirrored");
+    assert.match(readFileSync(worktreePath, "utf-8"), /S02 Research/);
+  } finally {
+    closeDatabase();
+    cleanup(base);
+  }
+});
+
 test("executeTaskComplete coerces string verificationEvidence entries", async () => {
   const base = makeTmpBase();
   try {
@@ -148,6 +176,60 @@ test("executeTaskComplete coerces string verificationEvidence entries", async ()
   }
 });
 
+test("executeTaskComplete derives missing verification from evidence", async () => {
+  const base = makeTmpBase();
+  try {
+    openTestDb(base);
+    const planDir = join(base, ".gsd", "milestones", "M001", "slices", "S01");
+    mkdirSync(planDir, { recursive: true });
+    writeFileSync(join(planDir, "S01-PLAN.md"), "# S01\n\n- [ ] **T01: Demo** `est:5m`\n");
+
+    const result = await inProjectDir(base, () => executeTaskComplete({
+      milestoneId: "M001",
+      sliceId: "S01",
+      taskId: "T01",
+      oneLiner: "Completed task",
+      narrative: "Did the work",
+      verificationEvidence: [
+        { command: "npm test", exitCode: 0, verdict: "pass", durationMs: 1234 },
+      ],
+    }, base));
+
+    assert.equal(result.details.operation, "complete_task");
+    const db = _getAdapter();
+    assert.ok(db, "DB should be open");
+    const row = db!.prepare(
+      "SELECT verification_result FROM tasks WHERE milestone_id = ? AND slice_id = ? AND id = ?",
+    ).get("M001", "S01", "T01") as Record<string, unknown> | undefined;
+
+    assert.match(String(row?.verification_result), /Verification evidence recorded/);
+    assert.match(String(row?.verification_result), /`npm test` exited 0 \(pass\)/);
+  } finally {
+    closeDatabase();
+    cleanup(base);
+  }
+});
+
+test("executeTaskComplete returns a tool error when verification cannot be derived", async () => {
+  const base = makeTmpBase();
+  try {
+    openTestDb(base);
+    const result = await inProjectDir(base, () => executeTaskComplete({
+      milestoneId: "M001",
+      sliceId: "S01",
+      taskId: "T01",
+      oneLiner: "Completed task",
+      narrative: "Did the work",
+    }, base));
+
+    assert.equal(result.isError, true);
+    assert.match(String(result.content[0]?.text), /verification is required/);
+  } finally {
+    closeDatabase();
+    cleanup(base);
+  }
+});
+
 test("executeSliceComplete preserves omitted optional requirement arrays", async () => {
   const base = makeTmpBase();
   try {

package/src/resources/extensions/gsd/tests/workspace-git-preflight.test.ts

@@ -9,7 +9,7 @@ import { join } from "node:path";
 import { probeGitConflictState } from "../git-conflict-state.js";
 import { ensureWorkspaceGitReadyForPath } from "../workspace-git-preflight.js";
 import { isWorkspaceGitAllowedCommand } from "../workspace-git-guard.js";
-import { cleanup, git, makeTempRepo } from "./test-utils.ts";
+import { cleanup, git, makeTempDir, makeTempRepo } from "./test-utils.ts";
 
 function seedGsdConflict(base: string): void {
   mkdirSync(join(base, ".gsd"), { recursive: true });
@@ -60,6 +60,21 @@ test("probeGitConflictState reports clean repo", () => {
   }
 });
 
+test("ensureWorkspaceGitReadyForPath allows fresh non-git project setup folders", async () => {
+  const base = makeTempDir("gsd-ws-git-non-repo-");
+  try {
+    mkdirSync(join(base, ".gsd"), { recursive: true });
+
+    const probe = probeGitConflictState(base);
+    assert.equal(probe.status, "clean");
+
+    const ready = await ensureWorkspaceGitReadyForPath(base);
+    assert.equal(ready.ok, true);
+  } finally {
+    cleanup(base);
+  }
+});
+
 test("ensureWorkspaceGitReadyForPath auto-resolves .gsd/ conflicts", async () => {
   const base = makeTempRepo("gsd-ws-git-heal-");
   try {

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

@@ -212,6 +212,34 @@ test("enterMilestone returns ok:true mode:none when isolation disabled", () => {
   assert.equal(s.basePath, "/project");
 });
 
+test("adoptStrandedMilestone forces branch recovery even when normal preferences differ", (t) => {
+  const previousCwd = process.cwd();
+  const base = makeGitRepoBase({ isolation: "worktree" });
+  t.after(() => cleanupRepoBase(base, previousCwd));
+
+  const s = makeSession({ basePath: base, originalBasePath: base });
+  const deps = makeDeps();
+  const ctx = makeCtx();
+  const lifecycle = new WorktreeLifecycle(s, deps);
+
+  const result = lifecycle.adoptStrandedMilestone("M001", base, ctx, {
+    mode: "branch",
+  });
+
+  assert.equal(result.ok, true, `expected ok:true, got: ${JSON.stringify(result)}`);
+  if (result.ok) {
+    assert.equal(result.mode, "branch");
+    assert.equal(result.path, base);
+  }
+  assert.equal(s.basePath, base);
+  assert.equal(s.strandedRecoveryIsolationMode, "branch");
+  const currentBranch = execFileSync("git", ["branch", "--show-current"], {
+    cwd: base,
+    encoding: "utf-8",
+  }).trim();
+  assert.equal(currentBranch, "milestone/M001");
+});
+
 test("enterMilestone returns ok:false reason:isolation-degraded when session degraded", () => {
   const s = makeSession({ isolationDegraded: true });
   const deps = makeDeps({ getIsolationMode: () => "branch" });

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

@@ -14,7 +14,7 @@
 
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
+import { existsSync, mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 
@@ -79,3 +79,47 @@ test("#2942: injected existsFn — milestones/ alone is enough", () => {
     p === "/proj/.gsd" || p === "/proj/.gsd/milestones";
   assert.equal(hasGsdBootstrapArtifacts("/proj/.gsd", existsFn), true);
 });
+
+test("bare /gsd routes zombie .gsd folders to project init before closeout/db checks", async (t) => {
+  const base = mkdtempSync(join(tmpdir(), "gsd-zombie-bare-command-"));
+  t.after(() => rmSync(base, { recursive: true, force: true }));
+  mkdirSync(join(base, ".gsd", "runtime"), { recursive: true });
+
+  const previousCwd = process.cwd();
+  const previousGsdHome = process.env.GSD_HOME;
+  const previousProjectRoot = process.env.GSD_PROJECT_ROOT;
+  try {
+    process.chdir(base);
+    process.env.GSD_HOME = join(base, ".test-gsd-home");
+    delete process.env.GSD_PROJECT_ROOT;
+
+    const notifications: string[] = [];
+    const ctx = {
+      hasUI: false,
+      ui: {
+        notify: (content: unknown) => notifications.push(String(content)),
+        setStatus: () => {},
+        setWidget: () => {},
+      },
+    };
+    const { handleAutoCommand } = await import("../commands/handlers/auto.ts");
+
+    await handleAutoCommand("", ctx as any, {} as any);
+
+    assert.ok(
+      notifications.some((message) => message.includes("/gsd init did not start")),
+      "bare /gsd should route unbootstrapped zombie folders to the init wizard",
+    );
+    assert.equal(
+      existsSync(join(base, ".gsd", "gsd.db")),
+      false,
+      "bare /gsd should not create the project DB before init has bootstrapped .gsd/",
+    );
+  } finally {
+    process.chdir(previousCwd);
+    if (previousGsdHome === undefined) delete process.env.GSD_HOME;
+    else process.env.GSD_HOME = previousGsdHome;
+    if (previousProjectRoot === undefined) delete process.env.GSD_PROJECT_ROOT;
+    else process.env.GSD_PROJECT_ROOT = previousProjectRoot;
+  }
+});

package/src/resources/extensions/gsd/tools/complete-task.ts

@@ -173,6 +173,15 @@ export async function handleCompleteTask(
   if (!params.milestoneId || typeof params.milestoneId !== "string" || params.milestoneId.trim() === "") {
     return { error: "milestoneId is required and must be a non-empty string" };
   }
+  if (!params.oneLiner || typeof params.oneLiner !== "string" || params.oneLiner.trim() === "") {
+    return { error: "oneLiner is required and must be a non-empty string" };
+  }
+  if (!params.narrative || typeof params.narrative !== "string" || params.narrative.trim() === "") {
+    return { error: "narrative is required and must be a non-empty string" };
+  }
+  if (!params.verification || typeof params.verification !== "string" || params.verification.trim() === "") {
+    return { error: "verification is required and must be a non-empty string" };
+  }
 
   const artifactBasePath = resolveCanonicalMilestoneRoot(basePath, params.milestoneId);
 

package/src/resources/extensions/gsd/tools/workflow-tool-executors.ts

@@ -15,8 +15,10 @@ import {
 } from "../gsd-db.js";
 import { GATE_REGISTRY } from "../gate-registry.js";
 import { generateRequirementsMd, saveArtifactToDb } from "../db-writer.js";
-import { resolveMilestoneFile, resolveSliceFile } from "../paths.js";
+import { clearPathCache, resolveGsdPathContract, resolveMilestoneFile, resolveSliceFile } from "../paths.js";
+import { saveFile, clearParseCache } from "../files.js";
 import { unlinkSync } from "node:fs";
+import { join } from "node:path";
 import type { CompleteMilestoneParams } from "./complete-milestone.js";
 import { handleCompleteMilestone } from "./complete-milestone.js";
 import { handleCompleteTask } from "./complete-task.js";
@@ -96,6 +98,28 @@ function registerProjectMilestoneSequence(content: string): string[] {
   return registered;
 }
 
+async function mirrorArtifactToActiveWorktreeProjection(
+  basePath: string,
+  relativePath: string,
+  content: string,
+): Promise<void> {
+  const contract = resolveGsdPathContract(basePath);
+  if (!contract.worktreeGsd) return;
+  if (contract.worktreeGsd === contract.projectGsd) return;
+
+  const fullPath = join(contract.worktreeGsd, relativePath);
+  try {
+    await saveFile(fullPath, content);
+    clearPathCache();
+    clearParseCache();
+    invalidateStateCache();
+  } catch (err) {
+    logWarning("tool", `gsd_summary_save worktree projection mirror failed: ${(err as Error).message}`, {
+      path: relativePath,
+    });
+  }
+}
+
 export async function executeSummarySave(
   params: SummarySaveParams,
   basePath: string = process.cwd(),
@@ -197,6 +221,7 @@ export async function executeSummarySave(
       },
       basePath,
     );
+    await mirrorArtifactToActiveWorktreeProjection(basePath, relativePath, contentToSave);
 
     let registeredMilestones: string[] = [];
     if (params.artifact_type === "PROJECT") {
@@ -306,7 +331,7 @@ export interface TaskCompleteParams {
   milestoneId: string;
   oneLiner: string;
   narrative: string;
-  verification: string;
+  verification?: string;
   deviations?: string;
   knownIssues?: string;
   keyFiles?: string[];
@@ -315,6 +340,40 @@ export interface TaskCompleteParams {
   verificationEvidence?: VerificationEvidenceInput[];
 }
 
+type NormalizedVerificationEvidence = {
+  command: string;
+  exitCode: number;
+  verdict: string;
+  durationMs: number;
+};
+
+function normalizeVerificationEvidence(
+  evidence: VerificationEvidenceInput[] | undefined,
+): NormalizedVerificationEvidence[] {
+  return (evidence ?? []).map((entry) =>
+    typeof entry === "string"
+      ? { command: entry, exitCode: -1, verdict: "unknown (coerced from string)", durationMs: 0 }
+      : entry,
+  );
+}
+
+function deriveVerificationSummary(
+  evidence: NormalizedVerificationEvidence[],
+): string | null {
+  if (evidence.length === 0) return null;
+
+  const rendered = evidence.slice(0, 3).map((entry) => {
+    const command = entry.command.trim() || "(unspecified command)";
+    const verdict = entry.verdict.trim() || "recorded";
+    return `\`${command}\` exited ${entry.exitCode} (${verdict})`;
+  });
+  const suffix = evidence.length > rendered.length
+    ? `; ${evidence.length - rendered.length} more check(s) recorded`
+    : "";
+
+  return `Verification evidence recorded: ${rendered.join("; ")}${suffix}.`;
+}
+
 export type CompleteMilestoneExecutorParams = Partial<CompleteMilestoneParams> & Record<string, unknown>;
 export type SliceCompleteExecutorParams = CompleteSliceParams;
 export type PlanMilestoneExecutorParams = PlanMilestoneParams;
@@ -350,9 +409,27 @@ export async function executeTaskComplete(
   }
   try {
     const coerced = { ...params };
-    coerced.verificationEvidence = (params.verificationEvidence ?? []).map((v) =>
-      typeof v === "string" ? { command: v, exitCode: -1, verdict: "unknown (coerced from string)", durationMs: 0 } : v,
-    );
+    const verificationEvidence = normalizeVerificationEvidence(params.verificationEvidence);
+    coerced.verificationEvidence = verificationEvidence;
+
+    const verification = typeof params.verification === "string" ? params.verification.trim() : "";
+    if (verification.length === 0) {
+      const derived = deriveVerificationSummary(verificationEvidence);
+      if (derived) {
+        coerced.verification = derived;
+      } else if (params.blockerDiscovered === true) {
+        coerced.verification = "Not run: blocker discovered before verification.";
+      } else {
+        return {
+          content: [{
+            type: "text",
+            text: "Error completing task: verification is required unless verificationEvidence is provided or blockerDiscovered is true.",
+          }],
+          details: { operation: "complete_task", error: "verification_required" },
+          isError: true,
+        };
+      }
+    }
 
     const result = await handleCompleteTask(coerced as any, basePath);
     if ("error" in result) {

package/src/resources/extensions/gsd/tui/render-kit.ts

@@ -151,3 +151,85 @@ export function renderFrame(
   lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
   return lines.map((line) => safeLine(line, width, ""));
 }
+
+export interface DialogFrameOptions {
+  borderColor?: string;
+  paddingX?: number;
+  footer?: string | string[];
+  scroll?: {
+    offset: number;
+    visibleRows: number;
+    totalRows: number;
+    trackOffset?: number;
+    trackRows?: number;
+  };
+}
+
+function renderTitledTopBorder(
+  theme: ThemeLike,
+  title: string,
+  width: number,
+  border: (text: string) => string,
+): string {
+  const trimmedTitle = title.trim();
+  if (!trimmedTitle || width < 10) {
+    return border("╭" + "─".repeat(width - 2) + "╮");
+  }
+
+  const maxTitleWidth = Math.max(0, width - 7);
+  const safeTitle = safeLine(trimmedTitle, maxTitleWidth);
+  const fill = Math.max(0, width - visibleWidth(safeTitle) - 5);
+  return border("╭─ ") + theme.bold(theme.fg("accent", safeTitle)) + border(" " + "─".repeat(fill) + "╮");
+}
+
+export function renderDialogFrame(
+  theme: ThemeLike,
+  title: string,
+  inner: string[],
+  width: number,
+  options: DialogFrameOptions = {},
+): string[] {
+  if (width < 4) return inner.map((line) => safeLine(line, width));
+
+  const borderColor = options.borderColor ?? "borderAccent";
+  const paddingX = Math.max(0, options.paddingX ?? 1);
+  const contentWidth = Math.max(0, width - 2 - paddingX * 2);
+  const border = (text: string) => theme.fg(borderColor, text);
+  const pad = " ".repeat(paddingX);
+  const lines = [renderTitledTopBorder(theme, title, width, border)];
+
+  const scroll = options.scroll;
+  const bodyRows = inner.length;
+  const trackOffset = Math.max(0, Math.min(scroll?.trackOffset ?? 0, bodyRows));
+  const trackRows = Math.max(0, Math.min(scroll?.trackRows ?? bodyRows, bodyRows - trackOffset));
+  const scrollable = !!scroll && scroll.totalRows > scroll.visibleRows && trackRows > 0;
+  const thumbLen = scrollable
+    ? Math.max(1, Math.round((scroll.visibleRows / scroll.totalRows) * trackRows))
+    : 0;
+  const maxThumbStart = Math.max(0, trackRows - thumbLen);
+  const maxScrollOffset = scrollable ? Math.max(1, scroll.totalRows - scroll.visibleRows) : 1;
+  const thumbStart = scrollable
+    ? trackOffset + Math.min(maxThumbStart, Math.round((scroll.offset / maxScrollOffset) * maxThumbStart))
+    : -1;
+
+  for (let i = 0; i < inner.length; i++) {
+    const line = inner[i] ?? "";
+    const rightBorder = scrollable && i >= thumbStart && i < thumbStart + thumbLen ? "┃" : "│";
+    lines.push(border("│") + pad + padRightVisible(line, contentWidth) + pad + border(rightBorder));
+  }
+
+  const footer = Array.isArray(options.footer)
+    ? options.footer
+    : options.footer
+      ? [options.footer]
+      : [];
+  if (footer.length > 0) {
+    lines.push(border("├" + "─".repeat(width - 2) + "┤"));
+    for (const line of footer) {
+      lines.push(border("│") + pad + padRightVisible(line, contentWidth) + pad + border("│"));
+    }
+  }
+
+  lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
+  return lines.map((line) => safeLine(line, width, ""));
+}

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

@@ -13,6 +13,8 @@
 //
 // Phased rollout tracking:
 //   - Phase 1 (this PR): schema + manifests + coverage test.
+//   - Phase 1b (skill token savings): skills policy wired via skill-scope.ts
+//     and setVisibleSkills(); allowlists derived from skill-manifest.ts.
 //   - Phase 2: add composeSystemPromptForUnit(); migrate one low-risk
 //     unit type (e.g. reassess-roadmap) as the pilot.
 //   - Phase 3: migrate remaining unit types, tighten manifests per
@@ -277,11 +279,20 @@ export interface UnitContextManifest {
 
 // ─── Manifests ────────────────────────────────────────────────────────────
 
-// Phase 1 policy: every manifest encodes today's behavior. Skills = "all"
-// unless the unit type was already narrowed via the existing skill-manifest
-// resolver (#4779). Memory/knowledge policies reflect the defaults in
-// `bootstrap/system-context.ts`. Artifact classifications follow what
-// `auto-prompts.ts` inlines today for each unit type.
+// Phase 1 policy: skills policy is derived from skill-manifest.ts allowlists
+// via `skillPolicyForUnit()`; units without an allowlist keep mode "all".
+// Explicit mode "none" remains for lightweight config units.
+
+import { resolveSkillManifest } from "./skill-manifest.js";
+
+/** Derive skills policy from skill-manifest allowlists; default to full catalog. */
+function skillPolicyForUnit(unitType: string): SkillsPolicy {
+  const allowlist = resolveSkillManifest(unitType);
+  if (allowlist) {
+    return { mode: "allowlist", skills: allowlist };
+  }
+  return { mode: "all" };
+}
 
 const COMMON_BUDGET_LARGE = 1_500_000;  // ~400K tokens
 const COMMON_BUDGET_MEDIUM = 750_000;   // ~200K tokens
@@ -360,7 +371,7 @@ export type UnitType = typeof KNOWN_UNIT_TYPES[number];
 export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // ─── Milestone-scoped ────────────────────────────────────────────────
   "research-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("research-milestone"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -377,7 +388,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "plan-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("plan-milestone"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -392,7 +403,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "discuss-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("discuss-milestone"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -407,7 +418,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "validate-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("validate-milestone"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -424,7 +435,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "complete-milestone": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("complete-milestone"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -446,7 +457,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
 
   // ─── Slice-scoped ────────────────────────────────────────────────────
   "research-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("research-slice"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -463,7 +474,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "plan-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("plan-slice"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -481,7 +492,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "refine-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("refine-slice"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -499,7 +510,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "replan-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("replan-slice"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -514,7 +525,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "complete-slice": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("complete-slice"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -535,7 +546,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "reassess-roadmap": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("reassess-roadmap"),
     knowledge: "scoped",
     memory: "critical-only",
     codebaseMap: false,
@@ -552,7 +563,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
 
   // ─── Task-scoped ─────────────────────────────────────────────────────
   "execute-task": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("execute-task"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -567,7 +578,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_LARGE,
   },
   "reactive-execute": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("reactive-execute"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -584,7 +595,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
 
   // ─── Ancillary units ─────────────────────────────────────────────────
   "run-uat": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("run-uat"),
     knowledge: "critical-only",
     memory: "critical-only",
     codebaseMap: false,
@@ -599,7 +610,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_SMALL,
   },
   "gate-evaluate": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("gate-evaluate"),
     knowledge: "critical-only",
     memory: "critical-only",
     codebaseMap: false,
@@ -616,7 +627,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_SMALL,
   },
   "rewrite-docs": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("rewrite-docs"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -631,7 +642,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "triage-captures": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("triage-captures"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: false,
@@ -646,7 +657,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
     maxSystemPromptChars: COMMON_BUDGET_MEDIUM,
   },
   "quick-task": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("quick-task"),
     knowledge: "full",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -684,7 +695,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // discussion runs before any milestone exists, so milestone artifacts are
   // not loaded. Keeps templates available for PROJECT.md scaffolding.
   "discuss-project": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("discuss-project"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -701,7 +712,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // discuss-requirements: REQUIREMENTS.md interview. PROJECT.md is the
   // primary context input; templates carry the requirements format.
   "discuss-requirements": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("discuss-requirements"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,
@@ -737,7 +748,7 @@ export const UNIT_MANIFESTS: Record<UnitType, UnitContextManifest> = {
   // planning-dispatch policy to dispatch them. PROJECT.md + REQUIREMENTS.md
   // give the orchestrator the framing context.
   "research-project": {
-    skills: { mode: "all" },
+    skills: skillPolicyForUnit("research-project"),
     knowledge: "scoped",
     memory: "prompt-relevant",
     codebaseMap: true,