@opengsd/gsd-pi 1.9.0 → 1.10.0

package/dist/resources/extensions/gsd/preferences.js

@@ -635,6 +635,7 @@ function mergePreferences(base, override) {
             : undefined,
         post_unit_hooks: mergePostUnitHooks(base.post_unit_hooks, override.post_unit_hooks),
         pre_dispatch_hooks: mergePreDispatchHooks(base.pre_dispatch_hooks, override.pre_dispatch_hooks),
+        planning_subagents: mergePlanningSubagents(base.planning_subagents, override.planning_subagents),
         dynamic_routing: (base.dynamic_routing || override.dynamic_routing)
             ? { ...(base.dynamic_routing ?? {}), ...(override.dynamic_routing ?? {}) }
             : undefined,
@@ -752,6 +753,22 @@ function mergePreDispatchHooks(base, override) {
     }
     return merged.length > 0 ? merged : undefined;
 }
+function mergePlanningSubagents(base, override) {
+    if (!base && !override)
+        return undefined;
+    const merged = {};
+    const unitTypes = new Set([
+        ...Object.keys(base ?? {}),
+        ...Object.keys(override ?? {}),
+    ]);
+    for (const unitType of unitTypes) {
+        const allowed = mergeStringLists(base?.[unitType]?.allowed, override?.[unitType]?.allowed);
+        if (allowed?.length) {
+            merged[unitType] = { allowed };
+        }
+    }
+    return Object.keys(merged).length > 0 ? merged : undefined;
+}
 // ─── System Prompt Rendering ──────────────────────────────────────────────────
 export function renderPreferencesForSystemPrompt(preferences, resolutions, options) {
     const validated = validatePreferences(preferences);

package/dist/resources/extensions/gsd/prompts/validate-milestone.md

@@ -24,18 +24,18 @@ Roadmap, slice summaries, assessments, requirements, decisions, and project cont
 
 ### Step 1 - Dispatch Parallel Reviewers
 
-The Inlined Context above already preloads the evidence reviewers need — the roadmap, per-slice SUMMARY/ASSESSMENT excerpts, requirements, and verification classes. **Embed the relevant preloaded evidence directly into each reviewer's task prompt** so reviewers work from it instead of re-reading the same artifacts from disk. Each reviewer should read a full file only when its excerpt is missing, truncated, or internally inconsistent — never as a routine first step. This avoids three reviewers independently re-surveying artifacts the orchestrator already holds.
+The Inlined Context above already preloads the evidence reviewers need — the roadmap, per-slice SUMMARY/ASSESSMENT excerpts, requirements, and verification classes. **Embed the relevant preloaded evidence directly into each reviewer's task prompt** so reviewers work from it instead of re-reading the same artifacts from disk. Each reviewer should read a full file only when its excerpt is missing, truncated, or internally inconsistent — never as a routine first step. When a reviewer needs a full artifact, use only explicit file paths from the On-demand Validation Artifacts / On-demand Milestone Context blocks or discover files with `find .gsd -type f`; never pass a phase, slice, `tasks/`, or `slices/` directory to `read` or `readFileSync`. This avoids three reviewers independently re-surveying artifacts the orchestrator already holds.
 
 Call `subagent` with `tasks: [...]` containing ALL THREE reviewers simultaneously:
 
 **Reviewer A - Requirements Coverage**
-Prompt: "Review milestone {{milestoneId}} requirements coverage. Working directory: {{workingDirectory}}. Use the preloaded requirements and slice SUMMARY evidence embedded in this task — do not re-read them from disk. For each requirement, mark COVERED, PARTIAL, or MISSING against that evidence. Read a full SUMMARY under `.gsd/milestones/{{milestoneId}}/slices/` only if its preloaded excerpt is missing, truncated, or inconsistent. Output table: Requirement | Status | Evidence. End with one-line verdict: PASS if all covered, NEEDS-ATTENTION if partials exist, FAIL if any missing."
+Prompt: "Review milestone {{milestoneId}} requirements coverage. Working directory: {{workingDirectory}}. Use the preloaded requirements and slice SUMMARY evidence embedded in this task — do not re-read them from disk. For each requirement, mark COVERED, PARTIAL, or MISSING against that evidence. Read a full SUMMARY only from an explicit file path in the On-demand Validation Artifacts list, or discover candidates with `find .gsd -type f -name '*-SUMMARY.md'`; never read a directory path. Output table: Requirement | Status | Evidence. End with one-line verdict: PASS if all covered, NEEDS-ATTENTION if partials exist, FAIL if any missing."
 
 **Reviewer B - Cross-Slice Integration**
-Prompt: "Review milestone {{milestoneId}} cross-slice integration. Working directory: {{workingDirectory}}. Use the preloaded roadmap and slice SUMMARY evidence embedded in this task — do not re-read them from disk. Find the boundary map (produces/consumes contracts) in the roadmap. For each boundary, confirm producer SUMMARY produced the artifact and consumer SUMMARY consumed it. Read `{{roadmapPath}}` or a full SUMMARY only if the preloaded evidence is missing, truncated, or inconsistent. Output table: Boundary | Producer Summary | Consumer Summary | Status. End with one-line verdict: PASS if all boundaries honored, NEEDS-ATTENTION if any gaps."
+Prompt: "Review milestone {{milestoneId}} cross-slice integration. Working directory: {{workingDirectory}}. Use the preloaded roadmap and slice SUMMARY evidence embedded in this task — do not re-read them from disk. Find the boundary map (produces/consumes contracts) in the roadmap. For each boundary, confirm producer SUMMARY produced the artifact and consumer SUMMARY consumed it. Read `{{roadmapPath}}` or a full SUMMARY from the On-demand Validation Artifacts list only if the preloaded evidence is missing, truncated, or inconsistent; never read a directory path. Output table: Boundary | Producer Summary | Consumer Summary | Status. End with one-line verdict: PASS if all boundaries honored, NEEDS-ATTENTION if any gaps."
 
 **Reviewer C - Assessment & Acceptance Criteria**
-Prompt: "Review milestone {{milestoneId}} assessment evidence and acceptance criteria. Working directory: {{workingDirectory}}. Use the preloaded milestone context, slice SUMMARY, and ASSESSMENT evidence embedded in this task — do not re-read them from disk. Read `.gsd/milestones/{{milestoneId}}/{{milestoneId}}-CONTEXT.md`, a full SUMMARY, or a full ASSESSMENT only if the preloaded excerpt is missing, truncated, or inconsistent. UAT files are specs, not evidence. Verify each criterion maps to passing evidence. Then review the inlined `Verification Classes (from planning)` table. For every planned row in that table, output a `Verification Classes` table with columns `Class | Planned Check | Evidence | Verdict`. Preserve every planned non-empty class row; do not summarize, rename, combine, or omit planned classes. The first cell of each row must be exactly `Contract`, `Integration`, `Operational`, or `UAT` when that class is present in planning. If a planned class lacks evidence, still include its canonical row and mark the verdict NEEDS-ATTENTION or FAIL. If a planned browser/UAT class has no ASSESSMENT with browser/runtime actions and assertions, return NEEDS-ATTENTION. If no verification classes were planned, say that explicitly. Output sections `Acceptance Criteria` with checklist `[ ] Criterion | Evidence`, and `Verification Classes` with the table. End with one-line verdict: PASS if all criteria and classes are covered by evidence, NEEDS-ATTENTION if gaps exist."
+Prompt: "Review milestone {{milestoneId}} assessment evidence and acceptance criteria. Working directory: {{workingDirectory}}. Use the preloaded milestone context, slice SUMMARY, and ASSESSMENT evidence embedded in this task — do not re-read them from disk. Read the milestone context from the On-demand Milestone Context file path, and read full SUMMARY or ASSESSMENT files only from explicit paths in the On-demand Validation Artifacts list, if the preloaded excerpt is missing, truncated, or inconsistent. UAT files are specs, not evidence. Verify each criterion maps to passing evidence. Then review the inlined `Verification Classes (from planning)` table. For every planned row in that table, output a `Verification Classes` table with columns `Class | Planned Check | Evidence | Verdict`. Preserve every planned non-empty class row; do not summarize, rename, combine, or omit planned classes. The first cell of each row must be exactly `Contract`, `Integration`, `Operational`, or `UAT` when that class is present in planning. If a planned class lacks evidence, still include its canonical row and mark the verdict NEEDS-ATTENTION or FAIL. If a planned browser/UAT class has no ASSESSMENT with browser/runtime actions and assertions, return NEEDS-ATTENTION. If no verification classes were planned, say that explicitly. Output sections `Acceptance Criteria` with checklist `[ ] Criterion | Evidence`, and `Verification Classes` with the table. End with one-line verdict: PASS if all criteria and classes are covered by evidence, NEEDS-ATTENTION if gaps exist."
 
 ### Step 2 - Synthesize Findings
 
@@ -85,6 +85,6 @@ If verdict is `needs-remediation`:
 
 **You MUST call `gsd_validate_milestone` before finishing. Do not manually write `{{validationPath}}`.**
 
-**File system safety:** When scanning milestone directories, use `ls` or `find` first. Never pass a directory path such as `tasks/` or `slices/` directly to `read`; it only accepts files.
+**File system safety:** When scanning milestone directories, use `find .gsd -type f` first and read only files. In flat-phase projects, `.gsd/phases/<NN>-<slug>/` is a directory, not an artifact. Never pass a directory path such as a phase directory, `tasks/`, or `slices/` directly to `read`, `readFile`, or `readFileSync`.
 
 When done, say: "Milestone {{milestoneId}} validation complete — verdict: <verdict>." Say this exactly once — if you already said it in a prior message, do not repeat it.

package/dist/resources/extensions/gsd/provider-payload-policy.js

@@ -2,12 +2,14 @@
  * Provider Payload Policy - ordered shaping of provider request payloads.
  *
  * The order is intentional:
- * 1. observation budgeting masks old tool results in auto-mode,
- * 2. display truncation caps tool-result text for every mode,
- * 3. the protected Source Context Block is appended after truncation,
- * 4. supported models receive the configured service tier.
+ * 1. superseded GSD context injections (memory/guided/forensics) are removed,
+ *    keeping only the latest, for every mode,
+ * 2. observation budgeting masks old tool results in auto-mode,
+ * 3. display truncation caps tool-result text for every mode,
+ * 4. the protected Source Context Block is appended after truncation,
+ * 5. supported models receive the configured service tier.
  */
-import { createObservationMask, createResponsesInputObservationMask, truncateContextResultMessages, truncateResponsesInputResultItems, } from "./context-masker.js";
+import { createObservationMask, createResponsesInputObservationMask, filterSupersededContextInjections, filterSupersededResponsesContextInjections, truncateContextResultMessages, truncateResponsesInputResultItems, } from "./context-masker.js";
 import { getSourceObservationStore, isAutoActive } from "./auto-runtime-state.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { getEffectiveServiceTier, supportsServiceTier } from "./service-tier.js";
@@ -42,9 +44,18 @@ export function applyProviderPayloadPolicy({ payload, modelId, deps: overrides,
 }
 function applyContextManagement(payload, deps) {
     const config = deps.loadContextManagementConfig();
+    applyContextInjectionFilter(payload);
     applyObservationBudget(payload, config, deps.isAutoActive());
     applyDisplayTruncation(payload, config);
 }
+function applyContextInjectionFilter(payload) {
+    if (Array.isArray(payload.messages)) {
+        payload.messages = filterSupersededContextInjections(payload.messages);
+    }
+    if (Array.isArray(payload.input)) {
+        payload.input = filterSupersededResponsesContextInjections(payload.input);
+    }
+}
 function applyObservationBudget(payload, config, autoActive) {
     if (!autoActive || config?.observation_masking === false)
         return;

package/dist/resources/extensions/gsd/safety/destructive-guard.js

@@ -6,7 +6,7 @@
  * Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
  */
 const DESTRUCTIVE_PATTERNS = [
-    { pattern: /\brm\s+(-[^\s]*[rfRF][^\s]*\s+|.*\s+-[^\s]*[rfRF])/, label: "recursive delete" },
+    { pattern: /\brm\s+((?:-(?!-)[^\s]*[rR][^\s]*|--recursive)\s+|.*\s+(?:-(?!-)[^\s]*[rR][^\s]*|--recursive)(?:\s|$))/, label: "recursive delete" },
     { pattern: /\bgit\s+push\s+.*--force/, label: "force push" },
     { pattern: /\bgit\s+push\s+-f\b/, label: "force push" },
     { pattern: /\bgit\s+reset\s+--hard/, label: "hard reset" },

package/dist/resources/extensions/gsd/skill-activation.js

@@ -104,11 +104,24 @@ function resolvePreferredSkillNames(prefs, visibleSkills, contextTokens, base) {
 /** Skill names must be lowercase alphanumeric with hyphens — reject anything else
  *  to prevent prompt injection via crafted directory names. */
 const SAFE_SKILL_NAME = /^[a-z0-9][a-z0-9-]*$/;
-function formatSkillActivationBlock(skillNames) {
+function escapeXml(str) {
+    return str
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;")
+        .replace(/'/g, "&apos;");
+}
+function formatSkillActivationBlock(skillNames, skillPaths) {
     const safe = skillNames.filter(name => SAFE_SKILL_NAME.test(name));
     if (safe.length === 0)
         return "";
-    const reads = safe.map(name => `Read the installed '${name}' skill file from <available_skills>`).join(". ");
+    const reads = safe.map(name => {
+        const path = skillPaths.get(name);
+        if (path)
+            return `Read the skill file at \`${escapeXml(path)}\``;
+        return `Find '${name}' in <available_skills>, copy its <location> value, and pass that exact path to read`;
+    }).join(". ");
     return `<skill_activation>${reads}.</skill_activation>`;
 }
 /**
@@ -149,6 +162,7 @@ export function buildSkillActivationBlock(params) {
     const visibleSkills = loaded;
     const manifestScopedSkills = filterSkillsByManifest(visibleSkills, params.unitType);
     const installedNames = new Set(visibleSkills.map(skill => normalizeSkillReference(skill.name)));
+    const installedSkillPaths = new Map(visibleSkills.map(skill => [normalizeSkillReference(skill.name), skill.filePath]));
     warnIfManifestHasMissingSkills(params.unitType, installedNames);
     const avoided = new Set(resolvePreferenceSkillNames(prefs?.avoid_skills ?? [], params.base));
     const matched = new Set();
@@ -196,7 +210,7 @@ export function buildSkillActivationBlock(params) {
     const ordered = [...matched]
         .filter(name => installedNames.has(name) && !avoided.has(name))
         .sort();
-    const activationBlock = formatSkillActivationBlock(ordered);
+    const activationBlock = formatSkillActivationBlock(ordered, installedSkillPaths);
     // Omit recommendations when the system catalog is manifest-scoped for this
     // unit — skill names are already listed in <available_skills>.
     let recommendationsBlock = "";

package/dist/resources/extensions/gsd/state-reconciliation/drift/external-markdown-edit.js

@@ -8,9 +8,81 @@
 // renderAllFromDb pass re-projects; the write-time invalidation hook then
 // refreshes the marker entry, closing the loop.
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 import { computeProjectionSha, readCompatMarker, writeCompatMarker, } from "../../compat/compat-marker.js";
+import { _getAdapter } from "../../gsd-db.js";
 import { logWarning } from "../../workflow-logger.js";
+function deepestProjectionScope(entities) {
+    let best = null;
+    for (const entity of entities) {
+        const parts = entity.split("/").filter(Boolean);
+        if (parts.length === 0)
+            continue;
+        if (!best || parts.length > best.length)
+            best = parts;
+    }
+    if (!best)
+        return null;
+    return {
+        milestoneId: best[0],
+        sliceId: best[1] ?? null,
+        taskId: best[2] ?? null,
+    };
+}
+function artifactTypeFromProjectionPath(projectionPath) {
+    const name = basename(projectionPath);
+    const match = name.match(/^(?:[A-Za-z]\d+|\d+(?:-\d+)?)-(.+)\.md$/);
+    return match?.[1]?.toUpperCase() ?? null;
+}
+function dbProjectionMatches(projectionPath, entry, actualSha) {
+    const adapter = _getAdapter();
+    if (!adapter)
+        return false;
+    try {
+        const rows = adapter
+            .prepare("SELECT full_content FROM artifacts WHERE path = :path")
+            .all({ ":path": projectionPath });
+        const scope = deepestProjectionScope(entry.entities);
+        const artifactType = artifactTypeFromProjectionPath(projectionPath);
+        if (scope?.taskId) {
+            rows.push(...adapter
+                .prepare(`SELECT full_content
+             FROM artifacts
+             WHERE milestone_id = :mid AND slice_id = :sid AND task_id = :tid
+               AND (:type IS NULL OR artifact_type = :type)`)
+                .all({
+                ":mid": scope.milestoneId,
+                ":sid": scope.sliceId,
+                ":tid": scope.taskId,
+                ":type": artifactType,
+            }));
+        }
+        else if (scope?.sliceId) {
+            rows.push(...adapter
+                .prepare(`SELECT full_content
+             FROM artifacts
+             WHERE milestone_id = :mid AND slice_id = :sid AND task_id IS NULL
+               AND (:type IS NULL OR artifact_type = :type)`)
+                .all({
+                ":mid": scope.milestoneId,
+                ":sid": scope.sliceId,
+                ":type": artifactType,
+            }));
+        }
+        else if (scope) {
+            rows.push(...adapter
+                .prepare(`SELECT full_content
+             FROM artifacts
+             WHERE milestone_id = :mid AND slice_id IS NULL AND task_id IS NULL
+               AND (:type IS NULL OR artifact_type = :type)`)
+                .all({ ":mid": scope.milestoneId, ":type": artifactType }));
+        }
+        return rows.some((row) => computeProjectionSha(row.full_content) === actualSha);
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Detect sha drift between the marker baseline and current file contents.
  *
@@ -21,11 +93,15 @@ import { logWarning } from "../../workflow-logger.js";
  * - Sha mismatch → one record per drifted file, scoped to its recorded entities.
  */
 function detectExternalMarkdownEdit(_state, ctx) {
-    const marker = readCompatMarker(ctx.basePath);
+    const marker = readCompatMarker(ctx.basePath, {
+        healInvalidKeys: !ctx.dryRun,
+        quarantineInvalid: !ctx.dryRun,
+    });
     const entries = Object.entries(marker.projections);
     if (entries.length === 0)
         return [];
     const records = [];
+    let markerChanged = false;
     for (const [projectionPath, entry] of entries) {
         const abs = join(ctx.basePath, ".gsd", projectionPath);
         if (!existsSync(abs))
@@ -33,6 +109,21 @@ function detectExternalMarkdownEdit(_state, ctx) {
         const actual = computeProjectionSha(readFileSync(abs, "utf-8"));
         if (actual === entry.sha)
             continue;
+        if (dbProjectionMatches(projectionPath, entry, actual)) {
+            if (!ctx.dryRun) {
+                marker.projections[projectionPath] = {
+                    sha: actual,
+                    entities: entry.entities,
+                };
+                markerChanged = true;
+                logWarning("reconcile", `external-markdown-edit: refreshed stale compat marker for ${projectionPath} (expectedSha=${entry.sha}, actualSha=${actual})`);
+            }
+            else {
+                logWarning("reconcile", `external-markdown-edit: stale compat marker for ${projectionPath} (expectedSha=${entry.sha}, actualSha=${actual})`);
+            }
+            continue;
+        }
+        logWarning("reconcile", `external-markdown-edit drift for ${projectionPath} (expectedSha=${entry.sha}, actualSha=${actual})`);
         records.push({
             kind: "external-markdown-edit",
             projectionPath,
@@ -41,6 +132,11 @@ function detectExternalMarkdownEdit(_state, ctx) {
             entities: entry.entities,
         });
     }
+    if (markerChanged) {
+        marker.lastWriter = "gsd-pi";
+        marker.lastProjectedAt = new Date().toISOString();
+        writeCompatMarker(ctx.basePath, marker);
+    }
     return records;
 }
 /**

package/dist/resources/extensions/gsd/state-reconciliation/drift/external-planning-edit.js

@@ -55,7 +55,10 @@ function detectUnseededPlanningFiles(ctx, projections, passthrough) {
     return records;
 }
 async function detectExternalPlanningEdit(_state, ctx) {
-    const marker = readCompatMarker(ctx.basePath);
+    const marker = readCompatMarker(ctx.basePath, {
+        healInvalidKeys: !ctx.dryRun,
+        quarantineInvalid: !ctx.dryRun,
+    });
     if (!marker.planning?.active) {
         // Not yet activated. Activation (layout parse + DB import) is owned by
         // capturePlanningCompatIfNeeded, called from reconcileBeforeDispatch when

package/dist/resources/extensions/gsd/state-reconciliation/drift/roadmap.js

@@ -9,7 +9,7 @@ import { renderRoadmapFromDb } from "../../markdown-renderer.js";
 import { findMilestoneIds } from "../../milestone-ids.js";
 import { parseRoadmap } from "../../parsers-legacy.js";
 import { resolveMilestoneFile } from "../../paths.js";
-import { isClosedStatus } from "../../status-guards.js";
+import { isClosedStatus, isSkippedForDispatch } from "../../status-guards.js";
 function arraysEqual(a, b) {
     if (a.length !== b.length)
         return false;
@@ -76,7 +76,10 @@ export function detectRoadmapDivergenceDrift(_state, ctx) {
     for (const milestoneId of findMilestoneIds(ctx.basePath)) {
         // Skip milestones that don't yet have a DB row — that's the
         // unregistered-milestone drift handler's responsibility.
-        if (!getMilestone(milestoneId))
+        const milestone = getMilestone(milestoneId);
+        if (!milestone)
+            continue;
+        if (isSkippedForDispatch(milestone.status))
             continue;
         if (milestoneHasDivergence(ctx.basePath, milestoneId)) {
             drifts.push({ kind: "roadmap-divergence", milestoneId });

package/dist/resources/extensions/gsd/stop-notice.js

@@ -22,6 +22,12 @@ export function formatStopNoticePrefix(reason) {
     const prefix = stopNoticeKind(reason) === "blocked" ? "Auto-mode blocked" : "Auto-mode stopped";
     return displayReason ? `${prefix} — ${displayReason}` : prefix;
 }
+export function formatVerdictRecordedNotice(message) {
+    return `Verdict recorded: ${message}`;
+}
+export function formatVerdictRejectedNotice(message) {
+    return `Verdict rejected: ${message}`;
+}
 // ─── Classification (headless host side) ────────────────────────────────
 // The canonical lowercase prefixes the headless event loop recognizes in
 // notify messages. Emitters above and ad-hoc emitters elsewhere must start
@@ -33,6 +39,8 @@ export const TERMINAL_NOTICE_PREFIXES = [
     "auto-mode complete",
     "no active milestone",
     "auto-mode idle",
+    "verdict recorded",
+    "verdict rejected",
 ];
 /** Manual-resolution notices emitted before auto-mode can formally pause/stop. */
 export function isManualResolutionNotice(message) {
@@ -65,6 +73,7 @@ export function isInteractiveMenuUnavailableNotice(message) {
 }
 export function isBlockedNoticeMessage(message) {
     return (message.includes("blocked:") ||
+        message.startsWith("verdict rejected") ||
         (isPauseNotice(message) && !isNonBlockingPauseNotice(message)) ||
         isManualResolutionNotice(message) ||
         isInteractiveMenuUnavailableNotice(message));

package/dist/resources/extensions/gsd/templates/PREFERENCES.md

@@ -92,6 +92,11 @@ remote_questions:
 uat_dispatch:
 post_unit_hooks: []
 pre_dispatch_hooks: []
+# planning_subagents:
+#   plan-milestone:
+#     allowed: [scout, planner, security]
+#   plan-slice:
+#     allowed: [scout, planner, reviewer, security]
 # language:
 # experimental:
 #   rtk: false

package/dist/resources/extensions/gsd/tools/complete-task.js

@@ -15,7 +15,7 @@ import { isClosedStatus } from "../status-guards.js";
 import { transaction, insertMilestone, insertSlice, insertTask, insertVerificationEvidence, getMilestone, getSlice, getTask, updateTaskStatus, deleteVerificationEvidence, saveGateResult, getPendingGatesForTurn, getUnresolvedBlockingReworkFindingsForTask, getBlockingReworkFindingsForTask, applyReworkResolutions, } from "../gsd-db.js";
 import { getWorkflowDatabasePath, ensureWorkflowDbAtPath } from "../db-workspace.js";
 import { getGatesForTurn } from "../gate-registry.js";
-import { gsdProjectionRoot, clearPathCache, resolveMilestonePath, resolveSlicePath } from "../paths.js";
+import { buildFlatTaskFileName, buildTaskFileName, gsdProjectionRoot, clearPathCache, legacyMilestonesDir, resolveMilestonePath, resolveSlicePath, } from "../paths.js";
 import { resolveCanonicalMilestoneRoot } from "../worktree-manager.js";
 import { checkOwnership, taskUnitKey } from "../unit-ownership.js";
 import { saveFile, clearParseCache } from "../files.js";
@@ -34,13 +34,20 @@ function taskSummaryPath(basePath, milestoneId, sliceId, taskId) {
     // a legacy layout and breaks all subsequent path resolution for the session.
     const slicePath = resolveSlicePath(basePath, milestoneId, sliceId);
     const phaseDir = resolveMilestonePath(basePath, milestoneId);
-    if (slicePath && phaseDir && slicePath !== phaseDir) {
-        // Legacy layout: the slice has its own slices/SID/ subdir → tasks/ subdir
-        return join(slicePath, "tasks", `${taskId}-SUMMARY.md`);
+    const legacyBase = legacyMilestonesDir(basePath);
+    const isLegacy = phaseDir
+        ? phaseDir.startsWith(legacyBase + "/") || phaseDir.startsWith(legacyBase + "\\")
+        : false;
+    if (isLegacy && phaseDir) {
+        // Legacy layout: the slice has its own slices/SID/ subdir → tasks/ subdir.
+        const legacySlicePath = slicePath && slicePath !== phaseDir
+            ? slicePath
+            : join(phaseDir, "slices", sliceId);
+        return join(legacySlicePath, "tasks", buildTaskFileName(taskId, "SUMMARY"));
     }
     if (phaseDir) {
         // Flat-phase: task summaries go in the phase dir (no tasks/ subdir)
-        return join(phaseDir, `${taskId}-SUMMARY.md`);
+        return join(phaseDir, buildFlatTaskFileName(sliceId, taskId, "SUMMARY"));
     }
     // Fallback: legacy hardcoded path (milestone/slice dir not on disk yet)
     return join(gsdProjectionRoot(basePath), "milestones", milestoneId, "slices", sliceId, "tasks", `${taskId}-SUMMARY.md`);

package/dist/resources/extensions/gsd/tools/reopen-milestone.js

@@ -16,7 +16,7 @@ import { logWarning } from "../workflow-logger.js";
 import { debugLog } from "../debug-logger.js";
 import { existsSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
-import { resolveMilestonePath, resolveSlicePath, resolveTasksDir, clearPathCache } from "../paths.js";
+import { buildFlatTaskFileName, buildTaskFileName, legacyMilestonesDir, resolveMilestonePath, resolveSlicePath, resolveTasksDir, clearPathCache, } from "../paths.js";
 export async function handleReopenMilestone(params, basePath) {
     // ── Validate required fields ────────────────────────────────────────────
     if (!params.milestoneId || typeof params.milestoneId !== "string" || params.milestoneId.trim() === "") {
@@ -41,6 +41,8 @@ export async function handleReopenMilestone(params, basePath) {
     // auto-corrects entities back to "complete", making reopen a no-op (#3161).
     try {
         const milestoneDir = resolveMilestonePath(basePath, params.milestoneId);
+        const legacyBase = legacyMilestonesDir(basePath);
+        const isLegacy = !!milestoneDir && (milestoneDir.startsWith(legacyBase + "/") || milestoneDir.startsWith(legacyBase + "\\"));
         if (milestoneDir) {
             const milestoneSummary = join(milestoneDir, `${params.milestoneId}-SUMMARY.md`);
             if (existsSync(milestoneSummary))
@@ -58,10 +60,17 @@ export async function handleReopenMilestone(params, basePath) {
                     unlinkSync(sliceUat);
             }
             const tasksDir = resolveTasksDir(basePath, params.milestoneId, slice.id);
-            if (tasksDir) {
-                const tasks = getSliceTasks(params.milestoneId, slice.id);
-                for (const task of tasks) {
-                    const taskSummary = join(tasksDir, `${task.id}-SUMMARY.md`);
+            const tasks = getSliceTasks(params.milestoneId, slice.id);
+            for (const task of tasks) {
+                const taskSummaries = isLegacy
+                    ? (tasksDir ? [join(tasksDir, buildTaskFileName(task.id, "SUMMARY"))] : [])
+                    : milestoneDir
+                        ? [
+                            join(milestoneDir, buildFlatTaskFileName(slice.id, task.id, "SUMMARY")),
+                            join(milestoneDir, buildTaskFileName(task.id, "SUMMARY")),
+                        ]
+                        : [];
+                for (const taskSummary of taskSummaries) {
                     if (existsSync(taskSummary))
                         unlinkSync(taskSummary);
                 }

package/dist/resources/extensions/gsd/tools/reopen-slice.js

@@ -22,7 +22,7 @@ import { appendEvent } from "../workflow-events.js";
 import { logWarning } from "../workflow-logger.js";
 import { existsSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
-import { resolveTasksDir, resolveSlicePath, clearPathCache } from "../paths.js";
+import { buildFlatTaskFileName, buildTaskFileName, legacyMilestonesDir, resolveMilestonePath, resolveTasksDir, resolveSlicePath, clearPathCache, } from "../paths.js";
 export async function handleReopenSlice(params, basePath) {
     // ── Validate required fields ────────────────────────────────────────────
     if (!params.sliceId || typeof params.sliceId !== "string" || params.sliceId.trim() === "") {
@@ -52,11 +52,21 @@ export async function handleReopenSlice(params, basePath) {
     // Without this, the DB-filesystem reconciler sees SUMMARY.md files and
     // auto-corrects tasks back to "complete", making reopen a no-op (#3161).
     try {
+        const milestoneDir = resolveMilestonePath(basePath, params.milestoneId);
+        const legacyBase = legacyMilestonesDir(basePath);
+        const isLegacy = !!milestoneDir && (milestoneDir.startsWith(legacyBase + "/") || milestoneDir.startsWith(legacyBase + "\\"));
         const tasksDir = resolveTasksDir(basePath, params.milestoneId, params.sliceId);
-        if (tasksDir) {
-            const tasks = getSliceTasks(params.milestoneId, params.sliceId);
-            for (const task of tasks) {
-                const summaryPath = join(tasksDir, `${task.id}-SUMMARY.md`);
+        const tasks = getSliceTasks(params.milestoneId, params.sliceId);
+        for (const task of tasks) {
+            const summaryPaths = isLegacy
+                ? (tasksDir ? [join(tasksDir, buildTaskFileName(task.id, "SUMMARY"))] : [])
+                : milestoneDir
+                    ? [
+                        join(milestoneDir, buildFlatTaskFileName(params.sliceId, task.id, "SUMMARY")),
+                        join(milestoneDir, buildTaskFileName(task.id, "SUMMARY")),
+                    ]
+                    : [];
+            for (const summaryPath of summaryPaths) {
                 if (existsSync(summaryPath))
                     unlinkSync(summaryPath);
             }

package/dist/resources/extensions/gsd/tools/reopen-task.js

@@ -17,8 +17,8 @@ import { appendEvent } from "../workflow-events.js";
 import { logWarning } from "../workflow-logger.js";
 import { writeReopenReason } from "../reopen-reason.js";
 import { existsSync, unlinkSync } from "node:fs";
-import { join, basename, dirname } from "node:path";
-import { resolveTasksDir, resolveSlicePath, clearPathCache } from "../paths.js";
+import { join } from "node:path";
+import { buildFlatTaskFileName, buildTaskFileName, legacyMilestonesDir, resolveMilestonePath, resolveTasksDir, resolveSlicePath, clearPathCache, } from "../paths.js";
 export async function handleReopenTask(params, basePath) {
     // ── Validate required fields ────────────────────────────────────────────
     if (!params.taskId || typeof params.taskId !== "string" || params.taskId.trim() === "") {
@@ -76,14 +76,20 @@ export async function handleReopenTask(params, basePath) {
     // summary cleanup into tasks/ (#1208).
     try {
         const slicePath = resolveSlicePath(basePath, params.milestoneId, params.sliceId);
-        if (slicePath) {
-            const isLegacySlice = basename(dirname(slicePath)) === "slices";
-            const summaryDir = isLegacySlice
-                ? (resolveTasksDir(basePath, params.milestoneId, params.sliceId) ?? slicePath)
-                : slicePath;
-            const summaryPath = join(summaryDir, `${params.taskId}-SUMMARY.md`);
-            if (existsSync(summaryPath))
-                unlinkSync(summaryPath);
+        const milestonePath = resolveMilestonePath(basePath, params.milestoneId);
+        if (milestonePath) {
+            const legacyBase = legacyMilestonesDir(basePath);
+            const isLegacy = milestonePath.startsWith(legacyBase + "/") || milestonePath.startsWith(legacyBase + "\\");
+            const summaryPaths = isLegacy
+                ? [join(resolveTasksDir(basePath, params.milestoneId, params.sliceId) ?? slicePath ?? join(milestonePath, "slices", params.sliceId, "tasks"), buildTaskFileName(params.taskId, "SUMMARY"))]
+                : [
+                    join(milestonePath, buildFlatTaskFileName(params.sliceId, params.taskId, "SUMMARY")),
+                    join(milestonePath, buildTaskFileName(params.taskId, "SUMMARY")),
+                ];
+            for (const summaryPath of summaryPaths) {
+                if (existsSync(summaryPath))
+                    unlinkSync(summaryPath);
+            }
         }
     }
     catch (cleanupErr) {

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 { resolveEffectivePlanningToolsPolicy } from "./planning-subagent-policy.js";
 import { getUnitToolSurfaceContract } from "./unit-tool-contracts.js";
 /**
  * Produce the inlined-context portion of a unit's system prompt by
@@ -148,11 +149,32 @@ const TOOL_SURFACE_GUIDANCE_BY_UNIT = {
     "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 formatAllowedAgents(agents) {
+    return agents.map((agent) => `**${agent}**`).join(", ");
+}
+function guidanceForUnitToolsPolicy(unitType, policy) {
+    if (unitType === "plan-slice") {
+        const dispatch = policy.mode === "planning-dispatch"
+            ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)} for reconnaissance — not implementation agents.`
+            : " Do not dispatch subagents.";
+        return `Persist planning through \`gsd_plan_slice\` only.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+    }
+    if (unitType === "refine-slice") {
+        const dispatch = policy.mode === "planning-dispatch"
+            ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)}.`
+            : " Do not dispatch subagents.";
+        return `Persist refinements through \`gsd_plan_slice\` only.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+    }
+    if (unitType === "plan-milestone") {
+        const dispatch = policy.mode === "planning-dispatch"
+            ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)}.`
+            : "";
+        return `Persist milestone planning through \`gsd_plan_milestone\` / \`gsd_plan_slice\`.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+    }
+    return undefined;
+}
 function guidanceForToolsPolicy(policy) {
     switch (policy.mode) {
         case "planning":
@@ -191,8 +213,9 @@ 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 effectiveTools = resolveEffectivePlanningToolsPolicy(unitType, manifest.tools, opts.basePath) ?? manifest.tools;
+    const unitGuidance = guidanceForUnitToolsPolicy(unitType, effectiveTools) ?? TOOL_SURFACE_GUIDANCE_BY_UNIT[unitType];
+    const policyGuidance = unitGuidance ? null : guidanceForToolsPolicy(effectiveTools);
     const forbiddenLine = formatForbiddenWorkflowToolsLine(unitType, unitGuidance);
     const parts = [unitGuidance, policyGuidance, forbiddenLine].filter((part) => typeof part === "string" && part.length > 0);
     if (parts.length === 0)

package/dist/resources/extensions/gsd/workflow-projections.js

@@ -13,7 +13,7 @@ import { isClosedStatus } from "./status-guards.js";
 import { deriveState } from "./state.js";
 import { renderPlanFromDb, renderRoadmapFromDb } from "./markdown-renderer.js";
 import { readManifest } from "./workflow-manifest.js";
-import { gsdRoot, resolveMilestoneFile, resolveSliceFile, resolveTaskFile, relTaskFile } from "./paths.js";
+import { gsdRoot, resolveMilestoneFile, resolveSliceFile, resolveTaskFile, targetTaskFile } from "./paths.js";
 // ─── Helpers ─────────────────────────────────────────────────────────────
 /**
  * Strip a leading ID prefix (e.g. "M001: " or "S04: ") from a title
@@ -276,8 +276,7 @@ export function renderSummaryProjection(basePath, milestoneId, sliceId, taskId)
         return;
     const evidenceRows = getVerificationEvidence(milestoneId, sliceId, taskId);
     const content = renderSummaryContent(taskRow, sliceId, milestoneId, evidenceRows);
-    const summaryPath = resolveTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY")
-        ?? join(basePath, relTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY", getMilestone(milestoneId)?.title));
+    const summaryPath = targetTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY", getMilestone(milestoneId)?.title);
     mkdirSync(dirname(summaryPath), { recursive: true });
     atomicWriteSync(summaryPath, content);
 }

package/dist/resources/extensions/gsd/workspace.js

@@ -2,6 +2,7 @@
 import { dirname, join, resolve } from "node:path";
 import { resolveGsdPathContract, resolveMilestoneFile, resolveMilestonePath, targetMilestoneFile, normalizeRealPath, } from "./paths.js";
 import { isGsdWorktreePath, resolveWorktreeProjectRoot } from "./worktree-root.js";
+import { milestoneMetaPath } from "./git-service.js";
 function tryRealpath(p) {
     return normalizeRealPath(p);
 }
@@ -63,7 +64,7 @@ export function scopeMilestone(workspace, milestoneId) {
         stateFile: () => join(gsd, "STATE.md"),
         dbPath: () => contract.projectDb,
         milestoneDir: () => scopeMilestoneDir(basePath, milestoneId),
-        metaJson: () => join(gsd, `${milestoneId}-META.json`),
+        metaJson: () => milestoneMetaPath(basePath, milestoneId),
     });
     return scope;
 }