gsd-pi 2.79.0 → 2.80.0-dev.4ea7d80e7

package/dist/resources/extensions/gsd/auto-dispatch.js

@@ -93,6 +93,16 @@ export function hasPendingDeepStage(prefs, basePath) {
     const gate = getDeepStageGate(prefs, basePath);
     return gate.status === "pending" || gate.status === "blocked";
 }
+export function shouldRunDeepProjectSetup(state, prefs, basePath, options = {}) {
+    if (options.hasSurvivorBranch === true)
+        return false;
+    if (state.phase !== "pre-planning" &&
+        state.phase !== "needs-discussion" &&
+        state.phase !== "planning") {
+        return false;
+    }
+    return hasPendingDeepStage(prefs, basePath);
+}
 function missingSliceStop(mid, phase) {
     return {
         action: "stop",
@@ -559,6 +569,8 @@ export const DISPATCH_RULES = [
             const hasContext = !!(contextFile && (await loadFile(contextFile)));
             if (hasContext)
                 return null; // fall through to next rule
+            if (prefs?.planning_depth === "deep")
+                return null;
             // H6 fix (#4973): keep the non-deep auto-mode bypass, but do not
             // pre-verify deep planning's user-facing milestone approval gate.
             if (shouldBypassMilestoneDepthGateInAuto(prefs)) {

package/dist/resources/extensions/gsd/auto-prompts.js

@@ -10,6 +10,7 @@ import { hasVerdict, getUatType } from "./verdict-parser.js";
 import { loadPrompt, inlineTemplate } from "./prompt-loader.js";
 import { resolveMilestoneFile, resolveSliceFile, resolveSlicePath, resolveTasksDir, resolveTaskFiles, resolveTaskFile, relMilestoneFile, relSliceFile, relSlicePath, relMilestonePath, resolveGsdRootFile, relGsdRootFile, resolveRuntimeFile, } from "./paths.js";
 import { resolveSkillDiscoveryMode, resolveInlineLevel, loadEffectiveGSDPreferences, resolveAllSkillReferences } from "./preferences.js";
+import { isContextModeEnabled } from "./preferences-types.js";
 import { parseRoadmap } from "./parsers-legacy.js";
 import { getLoadedSkills } from "@gsd/pi-coding-agent";
 import { join, basename } from "node:path";
@@ -19,7 +20,7 @@ import { getPendingGatesForTurn } from "./gsd-db.js";
 import { assertGateCoverage, getGatesForTurn, } from "./gate-registry.js";
 import { formatDecisionsCompact, formatRequirementsCompact } from "./structured-data-formatter.js";
 import { readPhaseAnchor, formatAnchorForPrompt } from "./phase-anchor.js";
-import { composeInlinedContext } from "./unit-context-composer.js";
+import { composeContextModeInstructions, composeInlinedContext } from "./unit-context-composer.js";
 import { logWarning } from "./workflow-logger.js";
 import { inlineGraphSubgraph } from "./graph-context.js";
 import { buildExtractionStepsBlock } from "./commands-extract-learnings.js";
@@ -71,6 +72,21 @@ function capPreamble(preamble) {
         return preamble;
     return truncateAtSectionBoundary(preamble, budget).content;
 }
+function renderContextModeForPrompt(unitType, base, renderMode = "standalone") {
+    const effectivePrefs = loadEffectiveGSDPreferences(base)?.preferences;
+    return composeContextModeInstructions(unitType, {
+        enabled: isContextModeEnabled(effectivePrefs),
+        renderMode,
+    });
+}
+function prependContextModeToBlock(unitType, base, block, renderMode = "standalone") {
+    const contextMode = renderContextModeForPrompt(unitType, base, renderMode);
+    if (!contextMode)
+        return block;
+    if (!block.trim())
+        return contextMode;
+    return `${contextMode}\n\n${block}`;
+}
 // ─── Executor Constraints ─────────────────────────────────────────────────────
 /**
  * Format executor context constraints for injection into the plan-slice prompt.
@@ -203,6 +219,169 @@ export async function inlineFileSmart(absPath, relPath, label, query, threshold
     const truncated = truncateAtSectionBoundary(content, threshold).content;
     return `### ${label}\nSource: \`${relPath}\`\n\n${truncated}`;
 }
+function inlineCompactTemplate(name, label) {
+    const compact = {
+        plan: [
+            "# {{sliceId}}: {{sliceTitle}}",
+            "",
+            "**Goal:** {{goal}}",
+            "**Demo:** {{demo}}",
+            "",
+            "## Must-Haves",
+            "- {{mustHave}}",
+            "",
+            "## Threat Surface",
+            "- Abuse: {{abuseScenarios}}",
+            "- Data exposure: {{sensitiveDataAccessible}}",
+            "- Input trust: {{untrustedInput}}",
+            "",
+            "## Requirement Impact",
+            "- Requirements touched: {{requirementIds}}",
+            "- Re-verify: {{whatMustBeRetested}}",
+            "- Decisions revisited: {{decisionIds}}",
+            "",
+            "## Proof Level",
+            "- This slice proves: {{contract | integration | operational | final-assembly}}",
+            "- Real runtime required: {{yes/no}}",
+            "- Human/UAT required: {{yes/no}}",
+            "",
+            "## Verification",
+            "- {{testFileOrCommand}}",
+            "",
+            "## Observability / Diagnostics",
+            "- Runtime signals: {{signalOrNone}}",
+            "- Inspection surfaces: {{surfaceOrNone}}",
+            "- Failure visibility: {{failureSignalOrNone}}",
+            "- Redaction constraints: {{secretOrPiiBoundaryOrNone}}",
+            "",
+            "## Integration Closure",
+            "- Upstream surfaces consumed: {{filesModulesContracts}}",
+            "- New wiring introduced: {{entrypointOrNone}}",
+            "- Remaining end-to-end work: {{listOrNothing}}",
+            "",
+            "## Tasks",
+            "- [ ] **T01: {{taskTitle}}** `est:{{estimate}}`",
+            "  - Why: {{whyThisTaskExists}}",
+            "  - Files: `{{filePath}}`",
+            "  - Do: {{specificImplementationStepsAndConstraints}}",
+            "  - Verify: {{testCommandOrRuntimeCheck}}",
+            "  - Done when: {{measurableAcceptanceCondition}}",
+            "",
+            "## Files Likely Touched",
+            "- `{{filePath}}`",
+        ].join("\n"),
+        "task-summary": [
+            "---",
+            "id: {{taskId}}",
+            "parent: {{sliceId}}",
+            "milestone: {{milestoneId}}",
+            "provides: [{{whatThisTaskProvides}}]",
+            "key_files: [{{filePath}}]",
+            "key_decisions: [{{decision}}]",
+            "patterns_established: [{{pattern}}]",
+            "observability_surfaces: [{{diagnosticOrNone}}]",
+            "duration: {{duration}}",
+            "verification_result: passed",
+            "completed_at: {{date}}",
+            "blocker_discovered: false",
+            "---",
+            "",
+            "# {{taskId}}: {{taskTitle}}",
+            "**{{oneLiner}}**",
+            "",
+            "## What Happened",
+            "{{narrative}}",
+            "",
+            "## Verification",
+            "{{whatWasVerifiedAndHow}}",
+            "",
+            "## Verification Evidence",
+            "| # | Command | Exit Code | Verdict | Duration |",
+            "|---|---------|-----------|---------|----------|",
+            "| {{row}} | {{command}} | {{exitCode}} | {{verdict}} | {{duration}} |",
+            "",
+            "## Diagnostics",
+            "{{diagnosticsOrNone}}",
+            "",
+            "## Deviations",
+            "{{deviationsFromPlan_OR_none}}",
+            "",
+            "## Known Issues",
+            "{{issuesDiscoveredButNotFixed_OR_none}}",
+            "",
+            "## Files Created/Modified",
+            "- `{{filePath}}` - {{description}}",
+        ].join("\n"),
+        "slice-summary": [
+            "---",
+            "id: {{sliceId}}",
+            "parent: {{milestoneId}}",
+            "milestone: {{milestoneId}}",
+            "provides: [{{whatThisSliceProvides}}]",
+            "requires: []",
+            "affects: []",
+            "key_files: [{{filePath}}]",
+            "key_decisions: [{{decision}}]",
+            "patterns_established: [{{pattern}}]",
+            "observability_surfaces: [{{diagnosticOrNone}}]",
+            "drill_down_paths: [{{pathToTaskSummary}}]",
+            "duration: {{duration}}",
+            "verification_result: passed",
+            "completed_at: {{date}}",
+            "---",
+            "",
+            "# {{sliceId}}: {{sliceTitle}}",
+            "**{{oneLiner}}**",
+            "",
+            "## What Happened",
+            "{{narrative}}",
+            "",
+            "## Verification",
+            "{{whatWasVerifiedAcrossAllTasks}}",
+            "",
+            "## Requirements Advanced",
+            "- {{requirementId}} - {{howThisSliceAdvancedIt}}",
+            "",
+            "## Requirements Validated",
+            "- {{requirementId}} - {{whatProofNowMakesItValidated}}",
+            "",
+            "## New Requirements Surfaced",
+            "- {{newRequirementOr_none}}",
+            "",
+            "## Requirements Invalidated or Re-scoped",
+            "- {{requirementIdOr_none}} - {{whatChanged}}",
+            "",
+            "## Operational Readiness",
+            "- Health signal: {{healthSignalOrNA}}",
+            "- Failure signal: {{failureSignalOrNA}}",
+            "- Recovery: {{recoveryOrNA}}",
+            "- Monitoring gaps: {{gapsOrNone}}",
+            "",
+            "## Deviations",
+            "{{deviationsFromPlan_OR_none}}",
+            "",
+            "## Known Limitations",
+            "{{whatDoesntWorkYet_OR_whatWasDeferredToLaterSlices}}",
+            "",
+            "## Follow-ups",
+            "{{workDeferredOrDiscoveredDuringExecution_OR_none}}",
+            "",
+            "## Files Created/Modified",
+            "- `{{filePath}}` - {{description}}",
+            "",
+            "## Forward Intelligence",
+            "### What the next slice should know",
+            "- {{insightThatWouldHelpDownstreamWork}}",
+            "### What's fragile",
+            "- {{fragileAreaOrThinImplementation}} - {{whyItMatters}}",
+            "### Authoritative diagnostics",
+            "- {{whereAFutureAgentShouldLookFirst}} - {{whyThisSignalIsTrustworthy}}",
+            "### What assumptions changed",
+            "- {{originalAssumption}} - {{whatActuallyHappened}}",
+        ].join("\n"),
+    };
+    return `${compact[name]}\n\n### Output Template: ${label}\nSource: \`templates/${name}.md\``;
+}
 /**
  * Compact slice-summary excerpt for milestone-level closers (#4780).
  *
@@ -1119,6 +1298,7 @@ export async function checkNeedsRunUat(base, mid, state, prefs) {
  */
 export async function buildDiscussMilestonePrompt(mid, midTitle, base, structuredQuestionsAvailable = "false") {
     const discussTemplates = inlineTemplate("context", "Context");
+    const contextModeInstructions = renderContextModeForPrompt("discuss-milestone", base);
     const basePrompt = loadPrompt("guided-discuss-milestone", {
         workingDirectory: base,
         milestoneId: mid,
@@ -1128,13 +1308,14 @@ export async function buildDiscussMilestonePrompt(mid, midTitle, base, structure
         commitInstruction: "Do not commit planning artifacts — .gsd/ is managed externally.",
         fastPathInstruction: "",
     });
+    const promptWithContextMode = prependContextModeToBlock("discuss-milestone", base, basePrompt);
     // If a CONTEXT-DRAFT.md exists, append it as seed material
     const draftPath = resolveMilestoneFile(base, mid, "CONTEXT-DRAFT");
     const draftContent = draftPath ? await loadFile(draftPath) : null;
     if (draftContent) {
-        return `${basePrompt}\n\n## Prior Discussion (Draft Seed)\n\nThe following draft was captured from a prior multi-milestone discussion. Use it as seed material — the user has already provided this context. Start with a brief reflection on what the draft covers, then probe for any gaps or open questions before writing the full CONTEXT.md.\n\n${draftContent}`;
+        return `${promptWithContextMode}\n\n## Prior Discussion (Draft Seed)\n\nThe following draft was captured from a prior multi-milestone discussion. Use it as seed material — the user has already provided this context. Start with a brief reflection on what the draft covers, then probe for any gaps or open questions before writing the full CONTEXT.md.\n\n${draftContent}`;
     }
-    return basePrompt;
+    return contextModeInstructions ? promptWithContextMode : basePrompt;
 }
 /**
  * Build a prompt for the workflow-preferences unit type (deep mode).
@@ -1143,10 +1324,10 @@ export async function buildDiscussMilestonePrompt(mid, midTitle, base, structure
  * in deep-mode bootstrap before discuss-project.
  */
 export async function buildWorkflowPreferencesPrompt(base, structuredQuestionsAvailable = "false") {
-    return loadPrompt("guided-workflow-preferences", {
+    return prependContextModeToBlock("workflow-preferences", base, loadPrompt("guided-workflow-preferences", {
         workingDirectory: base,
         structuredQuestionsAvailable,
-    });
+    }));
 }
 /**
  * Build a prompt for the research-project (parallel) unit type (deep mode).
@@ -1156,10 +1337,10 @@ export async function buildWorkflowPreferencesPrompt(base, structuredQuestionsAv
  * are missing. Skipped entirely if user picked "skip".
  */
 export async function buildResearchProjectPrompt(base, structuredQuestionsAvailable = "false") {
-    return loadPrompt("guided-research-project", {
+    return prependContextModeToBlock("research-project", base, loadPrompt("guided-research-project", {
         workingDirectory: base,
         structuredQuestionsAvailable,
-    });
+    }));
 }
 /**
  * Build a prompt for the research-decision unit type (deep mode).
@@ -1168,10 +1349,10 @@ export async function buildResearchProjectPrompt(base, structuredQuestionsAvaila
  * and before research-project-parallel.
  */
 export async function buildResearchDecisionPrompt(base, structuredQuestionsAvailable = "false") {
-    return loadPrompt("guided-research-decision", {
+    return prependContextModeToBlock("research-decision", base, loadPrompt("guided-research-decision", {
         workingDirectory: base,
         structuredQuestionsAvailable,
-    });
+    }));
 }
 /**
  * Build a prompt for the discuss-project unit type (deep mode).
@@ -1181,12 +1362,12 @@ export async function buildResearchDecisionPrompt(base, structuredQuestionsAvail
  */
 export async function buildDiscussProjectPrompt(base, structuredQuestionsAvailable = "false") {
     const inlinedTemplates = inlineTemplate("project", "Project");
-    return loadPrompt("guided-discuss-project", {
+    return prependContextModeToBlock("discuss-project", base, loadPrompt("guided-discuss-project", {
         workingDirectory: base,
         inlinedTemplates,
         structuredQuestionsAvailable,
         commitInstruction: "Do not commit planning artifacts — .gsd/ is managed externally.",
-    });
+    }));
 }
 /**
  * Build a prompt for the discuss-requirements unit type (deep mode).
@@ -1196,12 +1377,12 @@ export async function buildDiscussProjectPrompt(base, structuredQuestionsAvailab
  */
 export async function buildDiscussRequirementsPrompt(base, structuredQuestionsAvailable = "false") {
     const inlinedTemplates = inlineTemplate("requirements", "Requirements");
-    return loadPrompt("guided-discuss-requirements", {
+    return prependContextModeToBlock("discuss-requirements", base, loadPrompt("guided-discuss-requirements", {
         workingDirectory: base,
         inlinedTemplates,
         structuredQuestionsAvailable,
         commitInstruction: "Do not commit planning artifacts — .gsd/ is managed externally.",
-    });
+    }));
 }
 export async function buildResearchMilestonePrompt(mid, midTitle, base) {
     // #4782 phase 3: research-milestone migrated through the composer.
@@ -1254,7 +1435,7 @@ export async function buildResearchMilestonePrompt(mid, midTitle, base) {
         if (knowledgeInlineRM)
             parts.push(knowledgeInlineRM);
     }
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${parts.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("research-milestone", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${parts.join("\n\n---\n\n")}`));
     const outputRelPath = relMilestoneFile(base, mid, "RESEARCH");
     return loadPrompt("research-milestone", {
         workingDirectory: base,
@@ -1324,7 +1505,7 @@ export async function buildPlanMilestonePrompt(mid, midTitle, base, level) {
         inlined.push(inlineTemplate("plan", "Slice Plan"));
         inlined.push(inlineTemplate("task-plan", "Task Plan"));
     }
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("plan-milestone", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`));
     const outputRelPath = relMilestoneFile(base, mid, "ROADMAP");
     const researchOutputPath = join(base, relMilestoneFile(base, mid, "RESEARCH"));
     const secretsOutputPath = join(base, relMilestoneFile(base, mid, "SECRETS"));
@@ -1349,7 +1530,7 @@ export async function buildPlanMilestonePrompt(mid, midTitle, base, level) {
         ...buildSkillDiscoveryVars(),
     });
 }
-export async function buildResearchSlicePrompt(mid, _midTitle, sid, sTitle, base) {
+export async function buildResearchSlicePrompt(mid, _midTitle, sid, sTitle, base, options) {
     const roadmapPath = resolveMilestoneFile(base, mid, "ROADMAP");
     const roadmapRel = relMilestoneFile(base, mid, "ROADMAP");
     const contextPath = resolveMilestoneFile(base, mid, "CONTEXT");
@@ -1400,7 +1581,7 @@ export async function buildResearchSlicePrompt(mid, _midTitle, sid, sTitle, base
     const overridesInline = formatOverridesSection(activeOverrides);
     if (overridesInline)
         inlined.unshift(overridesInline);
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("research-slice", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`), options?.contextModeRenderMode);
     const outputRelPath = relSliceFile(base, mid, sid, "RESEARCH");
     return loadPrompt("research-slice", {
         workingDirectory: base,
@@ -1475,7 +1656,7 @@ async function renderSlicePrompt(options) {
     const graphBlock = await inlineGraphSubgraph(base, `${sid} ${sTitle}`, { budget: 3000 });
     if (graphBlock)
         inlined.push(graphBlock);
-    inlined.push(inlineTemplate("plan", "Slice Plan"));
+    inlined.push(level === "minimal" ? inlineCompactTemplate("plan", "Slice Plan") : inlineTemplate("plan", "Slice Plan"));
     if (level === "full") {
         inlined.push(inlineTemplate("task-plan", "Task Plan"));
     }
@@ -1483,7 +1664,7 @@ async function renderSlicePrompt(options) {
     const overridesInline = formatOverridesSection(await loadActiveOverrides(base));
     if (overridesInline)
         inlined.unshift(overridesInline);
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock(promptTemplate, base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`), options.contextModeRenderMode);
     const executorContextConstraints = formatExecutorConstraints(sessionContextWindow, modelRegistry, sessionProvider);
     const outputRelPath = relSliceFile(base, mid, sid, "PLAN");
     const commitInstruction = "Do not commit — .gsd/ planning docs are managed externally and not tracked in git.";
@@ -1630,7 +1811,7 @@ export async function buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base
     // Knowledge graph: tight subgraph for this task (graceful — skipped if no graph.json)
     const graphBlockET = await inlineGraphSubgraph(base, `${tid} ${tTitle}`, { budget: 2000 });
     const inlinedTemplates = inlineLevel === "minimal"
-        ? inlineTemplate("task-summary", "Task Summary")
+        ? inlineCompactTemplate("task-summary", "Task Summary")
         : [
             inlineTemplate("task-summary", "Task Summary"),
             inlineTemplate("decisions", "Decisions"),
@@ -1686,6 +1867,7 @@ export async function buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base
     const etPending = getPendingGatesForTurn(mid, sid, "execute-task", tid);
     assertGateCoverage(etPending, "execute-task", { requireAll: false });
     const gatesToClose = renderGatesToCloseBlock(getGatesForTurn("execute-task"), { pending: new Set(etPending.map((g) => g.gate_id)), allowOmit: true });
+    phaseAnchorSection = prependContextModeToBlock("execute-task", base, phaseAnchorSection, opts.contextModeRenderMode);
     return loadPrompt("execute-task", {
         overridesSection,
         runtimeContext,
@@ -1713,6 +1895,7 @@ export async function buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base
             taskTitle: tTitle,
             taskPlanContent,
             extraContext: [taskPlanInline, slicePlanExcerpt, finalCarryForward, resumeSection],
+            unitType: "execute-task",
         }),
     });
 }
@@ -1762,7 +1945,9 @@ export async function buildCompleteSlicePrompt(mid, midTitle, sid, sTitle, base,
                 return blocks.length > 0 ? blocks.join("\n\n---\n\n") : null;
             }
             case "templates": {
-                const parts = [inlineTemplate("slice-summary", "Slice Summary")];
+                const parts = [inlineLevel === "minimal"
+                        ? inlineCompactTemplate("slice-summary", "Slice Summary")
+                        : inlineTemplate("slice-summary", "Slice Summary")];
                 if (inlineLevel !== "minimal") {
                     parts.push(inlineTemplate("uat", "UAT"));
                 }
@@ -1803,7 +1988,7 @@ export async function buildCompleteSlicePrompt(mid, midTitle, sid, sTitle, base,
     const finalBody = completeOverridesInline
         ? `${completeOverridesInline}\n\n---\n\n${body}`
         : body;
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${finalBody}`);
+    const inlinedContext = prependContextModeToBlock("complete-slice", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${finalBody}`));
     const roadmapRel = relMilestoneFile(base, mid, "ROADMAP");
     const sliceRel = relSlicePath(base, mid, sid);
     const sliceSummaryPath = join(base, `${sliceRel}/${sid}-SUMMARY.md`);
@@ -1894,7 +2079,7 @@ export async function buildCompleteMilestonePrompt(mid, midTitle, base, level) {
     if (contextInline)
         inlined.push(contextInline);
     inlined.push(inlineTemplate("milestone-summary", "Milestone Summary"));
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("complete-milestone", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`));
     const milestoneSummaryPath = join(base, `${relMilestonePath(base, mid)}/${mid}-SUMMARY.md`);
     const learningsRelPath = join(relMilestonePath(base, mid), `${mid}-LEARNINGS.md`);
     const learningsAbsPath = join(base, learningsRelPath);
@@ -2034,7 +2219,7 @@ export async function buildValidateMilestonePrompt(mid, midTitle, base, level) {
     const contextInline = await inlineFileOptional(contextPath, contextRel, "Milestone Context");
     if (contextInline)
         inlined.push(contextInline);
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("validate-milestone", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`));
     const validationOutputPath = join(base, `${relMilestonePath(base, mid)}/${mid}-VALIDATION.md`);
     const roadmapOutputPath = `${relMilestonePath(base, mid)}/${mid}-ROADMAP.md`;
     // Every milestone validation turn owns MV01–MV04 unconditionally: the
@@ -2104,7 +2289,7 @@ export async function buildReplanSlicePrompt(mid, midTitle, sid, sTitle, base) {
     const replanOverridesInline = formatOverridesSection(replanActiveOverrides);
     if (replanOverridesInline)
         inlined.unshift(replanOverridesInline);
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("replan-slice", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`));
     const replanPath = join(base, `${relSlicePath(base, mid, sid)}/${sid}-REPLAN.md`);
     // Build capture context for replan prompt (captures that triggered this replan)
     let captureContext = "(none)";
@@ -2171,7 +2356,7 @@ export async function buildRunUatPrompt(mid, sliceId, uatPath, uatContent, base)
         }
     };
     const composed = await composeInlinedContext("run-uat", resolveArtifact);
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${composed}`);
+    const inlinedContext = prependContextModeToBlock("run-uat", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${composed}`));
     const uatResultPath = join(base, relSliceFile(base, mid, sliceId, "ASSESSMENT"));
     const uatType = getUatType(uatContent);
     return loadPrompt("run-uat", {
@@ -2242,7 +2427,7 @@ export async function buildReassessRoadmapPrompt(mid, midTitle, completedSliceId
     const knowledgeInlineRA = await inlineKnowledgeBudgeted(base, extractKeywords(midTitle));
     if (knowledgeInlineRA)
         parts.push(knowledgeInlineRA);
-    const inlinedContext = capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${parts.join("\n\n---\n\n")}`);
+    const inlinedContext = prependContextModeToBlock("reassess-roadmap", base, capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${parts.join("\n\n---\n\n")}`));
     const assessmentPath = join(base, relSliceFile(base, mid, completedSliceId, "ASSESSMENT"));
     // Build deferred captures context for reassess prompt
     let deferredCaptures = "(none)";
@@ -2313,6 +2498,7 @@ export async function buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, rea
             sessionContextWindow: opts?.sessionContextWindow,
             modelRegistry: opts?.modelRegistry,
             sessionProvider: opts?.sessionProvider,
+            contextModeRenderMode: "nested",
         });
         const modelSuffix = subagentModel ? ` with model: "${subagentModel}"` : "";
         subagentSections.push([
@@ -2332,7 +2518,7 @@ export async function buildReactiveExecutePrompt(mid, midTitle, sid, sTitle, rea
         milestoneTitle: midTitle,
         sliceId: sid,
         sliceTitle: sTitle,
-        graphContext,
+        graphContext: prependContextModeToBlock("reactive-execute", base, graphContext),
         readyTaskCount: String(readyTaskIds.length),
         readyTaskList: readyTaskListLines.join("\n"),
         subagentPrompts: subagentSections.join("\n\n---\n\n"),
@@ -2382,7 +2568,7 @@ export async function buildParallelResearchSlicesPrompt(mid, midTitle, slices, b
     const subagentSections = [];
     const modelSuffix = subagentModel ? ` with model: "${subagentModel}"` : "";
     for (const slice of slices) {
-        const slicePrompt = await buildResearchSlicePrompt(mid, midTitle, slice.id, slice.title, basePath);
+        const slicePrompt = await buildResearchSlicePrompt(mid, midTitle, slice.id, slice.title, basePath, { contextModeRenderMode: "nested" });
         subagentSections.push([
             `### ${slice.id}: ${slice.title}`,
             "",
@@ -2426,6 +2612,8 @@ export async function buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, base,
     for (const def of gateDefs) {
         gateListLines.push(`- **${def.id}**: ${def.question}`);
         const subPrompt = [
+            renderContextModeForPrompt("gate-evaluate", base, "nested"),
+            "",
             `You are evaluating quality gate **${def.id}** for slice ${sid} (${sTitle}).`,
             "",
             `**Working directory:** \`${normalizedBase}\`. All file reads, writes, and shell commands MUST operate relative to this directory. Do NOT \`cd\` to any other directory.`,
@@ -2466,7 +2654,7 @@ export async function buildGateEvaluatePrompt(mid, midTitle, sid, sTitle, base,
         milestoneTitle: midTitle,
         sliceId: sid,
         sliceTitle: sTitle,
-        slicePlanContent: planContent,
+        slicePlanContent: prependContextModeToBlock("gate-evaluate", base, planContent),
         gateCount: String(pending.length),
         gateList: gateListLines.join("\n"),
         subagentPrompts: subagentSections.join("\n\n---\n\n"),
@@ -2536,7 +2724,7 @@ export async function buildRewriteDocsPrompt(mid, midTitle, activeSlice, base, o
         `**During:** ${o.appliedAt}`,
     ].join("\n")).join("\n\n");
     const documentList = docList.length > 0 ? docList.join("\n") : "- No active plan documents found.";
-    return loadPrompt("rewrite-docs", {
+    return prependContextModeToBlock("rewrite-docs", base, loadPrompt("rewrite-docs", {
         workingDirectory: base,
         milestoneId: mid,
         milestoneTitle: midTitle,
@@ -2545,5 +2733,5 @@ export async function buildRewriteDocsPrompt(mid, midTitle, activeSlice, base, o
         overrideContent,
         documentList,
         overridesPath: relGsdRootFile("OVERRIDES"),
-    });
+    }));
 }