gsd-pi 2.79.0 → 2.80.0

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.
@@ -1119,6 +1135,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 +1145,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 +1161,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 +1174,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 +1186,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 +1199,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 +1214,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 +1272,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 +1342,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 +1367,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 +1418,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,
@@ -1483,7 +1501,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.";
@@ -1686,6 +1704,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 +1732,7 @@ export async function buildExecuteTaskPrompt(mid, sid, sTitle, tid, tTitle, base
             taskTitle: tTitle,
             taskPlanContent,
             extraContext: [taskPlanInline, slicePlanExcerpt, finalCarryForward, resumeSection],
+            unitType: "execute-task",
         }),
     });
 }
@@ -1803,7 +1823,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 +1914,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 +2054,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 +2124,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 +2191,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 +2262,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 +2333,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 +2353,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 +2403,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 +2447,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 +2489,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 +2559,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 +2568,5 @@ export async function buildRewriteDocsPrompt(mid, midTitle, activeSlice, base, o
         overrideContent,
         documentList,
         overridesPath: relGsdRootFile("OVERRIDES"),
-    });
+    }));
 }

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

@@ -12,7 +12,7 @@ import { appendEvent } from "./workflow-events.js";
 import { atomicWriteSync } from "./atomic-write.js";
 import { clearParseCache } from "./files.js";
 import { parseRoadmap as parseLegacyRoadmap, parsePlan as parseLegacyPlan } from "./parsers-legacy.js";
-import { isDbAvailable, getTask, getSlice, getSliceTasks, getPendingGates, updateTaskStatus, updateSliceStatus, insertSlice, getMilestone } from "./gsd-db.js";
+import { isDbAvailable, getTask, getSlice, getSliceTasks, getPendingGates, updateTaskStatus, updateSliceStatus, insertSlice, getMilestone, refreshOpenDatabaseFromDisk } from "./gsd-db.js";
 import { isValidationTerminal } from "./state.js";
 import { getErrorMessage } from "./error-utils.js";
 import { logWarning, logError } from "./workflow-logger.js";
@@ -257,7 +257,7 @@ function scanGsdTaggedCommits(basePath, milestoneId, gitArgs) {
             if (!commitMessageHasGsdTrailer(message))
                 continue;
             const commitFiles = getChangedFilesForCommit(basePath, hash);
-            if (!commitMatchesMilestone(message, milestoneId, commitFiles))
+            if (!commitMatchesMilestone(basePath, message, milestoneId, commitFiles))
                 continue;
             matched = true;
             for (const file of commitFiles) {
@@ -278,22 +278,37 @@ function getChangedFilesForCommit(basePath, hash) {
 function commitMessageHasGsdTrailer(message) {
     return /^GSD-(?:Task|Unit):\s*\S+/m.test(message);
 }
-function commitMatchesMilestone(message, milestoneId, files) {
+function commitMatchesMilestone(basePath, message, milestoneId, files) {
     if (commitTrailerStartsWithMilestone(message, milestoneId))
         return true;
     // Meaningful execute-task commits currently store task scope as Sxx/Tyy
     // rather than Mxx/Sxx/Tyy. Bind those commits back to the milestone when
     // either the commit touched this milestone's artifacts, or — for projects
     // where .gsd/ is gitignored/external (#5033) — the message explicitly
-    // names the milestone.
+    // names the milestone or local GSD state proves the task belongs here.
     if (/^GSD-Task:\s*S[^/\s]+\/T\S+/m.test(message)) {
         if (files.some((file) => isMilestoneArtifactPath(file, milestoneId)))
             return true;
         if (commitMessageMentionsMilestone(message, milestoneId))
             return true;
+        if (commitTaskTrailerBelongsToMilestone(basePath, message, milestoneId))
+            return true;
     }
     return false;
 }
+function commitTaskTrailerBelongsToMilestone(basePath, message, milestoneId) {
+    const match = message.match(/^GSD-Task:\s*(S[^/\s]+)\/(T[^\s]+)/m);
+    if (!match)
+        return false;
+    const [, sliceId, taskId] = match;
+    if (getTask(milestoneId, sliceId, taskId))
+        return true;
+    const tasksDir = resolveTasksDir(basePath, milestoneId, sliceId);
+    if (!tasksDir)
+        return false;
+    return existsSync(join(tasksDir, `${taskId}-PLAN.md`))
+        || existsSync(join(tasksDir, `${taskId}-SUMMARY.md`));
+}
 function commitMessageMentionsMilestone(message, milestoneId) {
     if (!MILESTONE_ID_RE.test(milestoneId))
         return false;
@@ -495,66 +510,32 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
             return false;
         }
     }
-    // plan-slice must produce a plan with actual task entries, not just a scaffold.
-    // The plan file may exist from a prior discussion/context step with only headings
-    // but no tasks. Without this check the artifact is considered "complete" and the
-    // unit gets skipped — but deriveState still returns phase:"planning" because the
-    // plan has no tasks, creating an infinite skip loop (#699).
-    if (unitType === "plan-slice") {
-        const planContent = readFileSync(absPath, "utf-8");
-        // Accept checkbox-style (- [x] **T01: ...) or heading-style (### T01 -- / ### T01: / ### T01 —)
-        const hasCheckboxTask = /^- \[[xX ]\] \*\*T\d+:/m.test(planContent);
-        const hasHeadingTask = /^#{2,4}\s+T\d+\s*(?:--|—|:)/m.test(planContent);
-        if (!hasCheckboxTask && !hasHeadingTask) {
-            logWarning("recovery", `verify-fail ${unitType} ${unitId}: plan has no task checkbox/heading (len=${planContent.length}) at ${absPath}`);
-            return false;
-        }
-    }
-    // execute-task: DB status is authoritative. Fall back to checked-checkbox
-    // detection when the DB is unavailable (unmigrated projects), or when the
-    // disk artifacts already reflect completion but the DB replay is one beat
-    // behind the completion write.
-    if (unitType === "execute-task") {
-        const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
-        if (mid && sid && tid) {
-            const dbTask = getTask(mid, sid, tid);
-            if (dbTask) {
-                if (dbTask.status !== "complete" && dbTask.status !== "done" && !hasCheckedTaskCompletionOnDisk(base, mid, sid, tid)) {
-                    return false;
-                }
-            }
-            else if (!isDbAvailable()) {
-                // LEGACY: Pre-migration fallback for projects without DB.
-                // Require a CHECKED checkbox — a bare heading or unchecked checkbox
-                // does not prove gsd_complete_task ran. Summary file on disk alone
-                // is not sufficient evidence (could be a rogue write) (#3607).
-                if (!hasCheckedTaskCompletionOnDisk(base, mid, sid, tid))
-                    return false;
-            }
-            else {
-                // DB available but task row not found — completion tool never ran (#3607)
-                return false;
-            }
-        }
-    }
-    // plan-slice must also produce individual task plan files for every task listed
-    // in the slice plan. Without this check, a plan-slice that wrote S{sid}-PLAN.md
-    // but omitted T{tid}-PLAN.md files would be marked complete, causing execute-task
-    // to dispatch with a missing task plan (see issue #739).
+    // plan-slice verification is DB-primary. The slice plan is a projection, so
+    // DB task rows prove the slice was planned even if the rendered markdown no
+    // longer uses legacy checkbox/heading syntax.
     if (unitType === "plan-slice") {
         const { milestone: mid, slice: sid } = parseUnitId(unitId);
         if (mid && sid) {
             try {
-                // DB primary path — get task IDs to verify task plan files exist
                 let taskIds = null;
                 if (isDbAvailable()) {
-                    const tasks = getSliceTasks(mid, sid);
-                    if (tasks.length > 0)
-                        taskIds = tasks.map(t => t.id);
+                    const refreshed = refreshOpenDatabaseFromDisk();
+                    if (refreshed) {
+                        const tasks = getSliceTasks(mid, sid);
+                        if (tasks.length > 0)
+                            taskIds = tasks.map(t => t.id);
+                    }
                 }
                 if (!taskIds) {
-                    // LEGACY: DB unavailable or no tasks in DB — parse plan file for task IDs
+                    // LEGACY: DB unavailable or no tasks in DB. Require actual task
+                    // entries so an empty scaffold cannot advance the pipeline (#699).
                     const planContent = readFileSync(absPath, "utf-8");
+                    const hasCheckboxTask = /^\s*- \[[xX ]\] \*\*T\d+:/m.test(planContent);
+                    const hasHeadingTask = /^\s*#{2,4}\s+T\d+\s*(?:--|—|:)/m.test(planContent);
+                    if (!hasCheckboxTask && !hasHeadingTask) {
+                        logWarning("recovery", `verify-fail ${unitType} ${unitId}: plan has no task checkbox/heading (len=${planContent.length}) at ${absPath}`);
+                        return false;
+                    }
                     const plan = parseLegacyPlan(planContent);
                     if (plan.tasks.length > 0)
                         taskIds = plan.tasks.map((t) => t.id);
@@ -580,6 +561,33 @@ export function verifyExpectedArtifact(unitType, unitId, base) {
             }
         }
     }
+    // execute-task: DB status is authoritative. Fall back to checked-checkbox
+    // detection when the DB is unavailable (unmigrated projects), or when the
+    // disk artifacts already reflect completion but the DB replay is one beat
+    // behind the completion write.
+    if (unitType === "execute-task") {
+        const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+        if (mid && sid && tid) {
+            const dbTask = getTask(mid, sid, tid);
+            if (dbTask) {
+                if (dbTask.status !== "complete" && dbTask.status !== "done" && !hasCheckedTaskCompletionOnDisk(base, mid, sid, tid)) {
+                    return false;
+                }
+            }
+            else if (!isDbAvailable()) {
+                // LEGACY: Pre-migration fallback for projects without DB.
+                // Require a CHECKED checkbox — a bare heading or unchecked checkbox
+                // does not prove gsd_complete_task ran. Summary file on disk alone
+                // is not sufficient evidence (could be a rogue write) (#3607).
+                if (!hasCheckedTaskCompletionOnDisk(base, mid, sid, tid))
+                    return false;
+            }
+            else {
+                // DB available but task row not found — completion tool never ran (#3607)
+                return false;
+            }
+        }
+    }
     // complete-slice: DB status is authoritative for whether the slice is done.
     // Fall back to file-based check (roadmap [x]) when DB is unavailable.
     if (unitType === "complete-slice") {

package/dist/resources/extensions/gsd/auto-runtime-state.js

@@ -3,11 +3,15 @@ import { AutoSession } from "./auto/session.js";
 import { isDeterministicPolicyError, isQueuedUserMessageSkip, isToolInvocationError, markToolEnd as markTrackedToolEnd, markToolStart as markTrackedToolStart, } from "./auto-tool-tracking.js";
 export const autoSession = new AutoSession();
 export function getAutoRuntimeSnapshot() {
+    const orchestrationStatus = autoSession.orchestration?.getStatus();
     return {
         active: autoSession.active,
         paused: autoSession.paused,
         currentUnit: autoSession.currentUnit ? { ...autoSession.currentUnit } : null,
         basePath: autoSession.basePath,
+        orchestrationPhase: orchestrationStatus?.phase,
+        orchestrationTransitionCount: orchestrationStatus?.transitionCount,
+        orchestrationLastTransitionAt: orchestrationStatus?.lastTransitionAt,
     };
 }
 export function isAutoActive() {

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

@@ -486,8 +486,9 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             // Clear survivor flag — finalization is done
             hasSurvivorBranch = false;
         }
+        const effectivePrefs = loadEffectiveGSDPreferences(base)?.preferences;
         const deepProjectStagePending = !hasSurvivorBranch
-            ? (await import("./auto-dispatch.js")).hasPendingDeepStage(loadEffectiveGSDPreferences(base)?.preferences, base)
+            ? (await import("./auto-dispatch.js")).hasPendingDeepStage(effectivePrefs, base)
             : false;
         if (deepProjectStagePending) {
             // Deep project-level setup runs before the first milestone exists. Let
@@ -526,7 +527,7 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
                 const mid = state.activeMilestone.id;
                 const contextFile = resolveMilestoneFile(base, mid, "CONTEXT");
                 const hasContext = !!(contextFile && (await loadFile(contextFile)));
-                if (!hasContext) {
+                if (!hasContext && effectivePrefs?.planning_depth !== "deep") {
                     const { showSmartEntry } = await import("./guided-flow.js");
                     await showSmartEntry(ctx, pi, base, { step: requestedStepMode });
                     // showSmartEntry dispatches via pi.sendMessage() which is fire-and-forget: