@opengsd/gsd-pi 1.3.0 → 1.4.0-dev.c18009cd

package/dist/resources/extensions/gsd/artifact-verification.js

@@ -0,0 +1,443 @@
+// Project/App: gsd-pi
+// File Purpose: Auto-mode artifact verification and worktree path fallbacks.
+import { parseUnitId } from "./unit-id.js";
+import { MILESTONE_ID_RE } from "./milestone-ids.js";
+import { clearParseCache } from "./files.js";
+import { parseRoadmap as parseLegacyRoadmap, parsePlan as parseLegacyPlan } from "./parsers-legacy.js";
+import { isDbAvailable, getTask, getSlice, getSliceTasks, getPendingGatesForTurn, } from "./gsd-db.js";
+import { refreshWorkflowDatabaseFromDisk } from "./db-workspace.js";
+import { isValidationTerminal } from "./state.js";
+import { getErrorMessage } from "./error-utils.js";
+import { logWarning, logError } from "./workflow-logger.js";
+import { resolveSlicePath, resolveSliceFile, resolveTasksDir, resolveTaskFiles, relSliceFile, resolveMilestoneFile, clearPathCache, resolveGsdRootFile, } from "./paths.js";
+import { existsSync, readFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { LAYOUT_SEGMENTS } from "./layout-policy.js";
+import { dirname, join, resolve } from "node:path";
+import { resolveExpectedArtifactPath, resolveExistingSliceResearchPath, } from "./auto-artifact-paths.js";
+import { classifyMilestoneSummaryContent } from "./milestone-summary-classifier.js";
+import { hasVerdict } from "./verdict-parser.js";
+import { validateArtifact } from "./schemas/validate.js";
+import { getProjectResearchStatus } from "./project-research-policy.js";
+import { isGsdWorktreePath } from "./worktree-root.js";
+import { resolveCanonicalMilestoneRoot } from "./worktree-manager.js";
+import { resolveWorktreeProjectRoot } from "./worktree-root.js";
+import { hasImplementationArtifacts } from "./milestone-implementation-evidence.js";
+import { loadAllCaptures, loadPendingCaptures } from "./captures.js";
+import { proveMilestoneCloseout } from "./milestone-closeout-proof.js";
+/**
+ * Optional override for the legacy roadmap parser used by verifyExpectedArtifact.
+ * Production leaves this null so the real parseLegacyRoadmap runs; tests inject
+ * a throwing function to deterministically exercise the parse-failure catches.
+ * @internal
+ */
+let _roadmapParserFn = null;
+/**
+ * Inject an override for the legacy roadmap parser, returning a function that
+ * restores the default (real parser) behavior. No production caller.
+ * @internal
+ */
+export function _setRoadmapParserFnForTests(fn) {
+    const previous = _roadmapParserFn;
+    _roadmapParserFn = fn;
+    return () => { _roadmapParserFn = previous; };
+}
+function parseRoadmapForRecovery(content) {
+    if (_roadmapParserFn)
+        return _roadmapParserFn(content);
+    return parseLegacyRoadmap(content);
+}
+/** Slice count for plan-milestone verification; shared by scoped and legacy paths. */
+export function countPlanMilestoneRoadmapSlices(content) {
+    return parseRoadmapForRecovery(content).slices.length;
+}
+export function diagnoseWorktreeIntegrityFailure(basePath) {
+    if (!isGsdWorktreePath(basePath))
+        return null;
+    if (!existsSync(basePath)) {
+        return `Worktree integrity failure: ${basePath} does not exist. Repair or recreate the worktree before retrying.`;
+    }
+    const gitPath = join(basePath, ".git");
+    if (!existsSync(gitPath)) {
+        return `Worktree integrity failure: ${basePath} is not a valid git worktree (.git missing). Repair or recreate the worktree before retrying.`;
+    }
+    try {
+        execFileSync("git", ["rev-parse", "--git-dir"], {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+        });
+        return null;
+    }
+    catch (err) {
+        return `Worktree integrity failure: ${basePath} is not a valid git worktree (git rev-parse failed: ${getErrorMessage(err).split("\n")[0]}). Repair or recreate the worktree before retrying.`;
+    }
+}
+export function resolveArtifactVerificationBase(unitId, base) {
+    const { milestone } = parseUnitId(unitId);
+    if (!MILESTONE_ID_RE.test(milestone))
+        return base;
+    return resolveCanonicalMilestoneRoot(base, milestone);
+}
+function hasCapturedWorkflowPrefs(base) {
+    const prefsPath = resolveExpectedArtifactPath("workflow-preferences", "WORKFLOW-PREFS", base);
+    if (!prefsPath || !existsSync(prefsPath))
+        return false;
+    const content = readFileSync(prefsPath, "utf-8");
+    const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+    return !!match && /^workflow_prefs_captured:\s*true\s*$/m.test(match[1]);
+}
+function hasValidResearchDecision(base) {
+    const decisionPath = resolveExpectedArtifactPath("research-decision", "RESEARCH-DECISION", base);
+    if (!decisionPath || !existsSync(decisionPath))
+        return false;
+    try {
+        const cfg = JSON.parse(readFileSync(decisionPath, "utf-8"));
+        return cfg.decision === "research" || cfg.decision === "skip";
+    }
+    catch {
+        return false;
+    }
+}
+function hasCompleteProjectResearch(base) {
+    return getProjectResearchStatus(base).complete;
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function hasCheckedTaskCompletionOnDisk(base, mid, sid, tid) {
+    const slicePath = resolveSlicePath(base, mid, sid);
+    if (!slicePath)
+        return false;
+    const planAbs = resolveSliceFile(base, mid, sid, "PLAN");
+    if (!planAbs || !existsSync(planAbs))
+        return false;
+    const planContent = readFileSync(planAbs, "utf-8");
+    const cbRe = new RegExp(`^\\s*-\\s+\\[[xX]\\]\\s+\\*\\*${escapeRegExp(tid)}(?:\\*\\*)?:`, "m");
+    return cbRe.test(planContent);
+}
+/**
+ * Check whether the expected artifact(s) for a unit exist on disk.
+ * Returns true if all required artifacts exist, or if the unit type has no
+ * single verifiable artifact (e.g., replan-slice).
+ */
+export function verifyExpectedArtifact(unitType, unitId, base) {
+    if (unitType.startsWith("hook/"))
+        return true;
+    clearPathCache();
+    clearParseCache();
+    if (unitType === "rewrite-docs") {
+        const overridesPath = resolveGsdRootFile(base, "OVERRIDES");
+        if (!existsSync(overridesPath))
+            return true;
+        const content = readFileSync(overridesPath, "utf-8");
+        return !content.includes("**Scope:** active");
+    }
+    if (unitType === "workflow-preferences") {
+        return hasCapturedWorkflowPrefs(base);
+    }
+    if (unitType === "triage-captures") {
+        const pending = loadPendingCaptures(base);
+        if (pending.length === 0)
+            return true;
+        logWarning("recovery", `verify-fail triage-captures ${unitId}: ${pending.length} pending capture(s) remain in CAPTURES.md`);
+        return false;
+    }
+    if (unitType === "quick-task") {
+        const { slice: captureId } = parseUnitId(unitId);
+        const capture = captureId ? loadAllCaptures(base).find((entry) => entry.id === captureId) : undefined;
+        if (capture?.executed === true)
+            return true;
+        logWarning("recovery", `verify-fail quick-task ${unitId}: capture ${captureId ?? "(missing capture id)"} not found or not marked executed`);
+        return false;
+    }
+    if (unitType === "discuss-project") {
+        const projectPath = resolveExpectedArtifactPath(unitType, unitId, base);
+        return !!projectPath && existsSync(projectPath) && validateArtifact(projectPath, "project").ok;
+    }
+    if (unitType === "discuss-requirements") {
+        const requirementsPath = resolveExpectedArtifactPath(unitType, unitId, base);
+        return !!requirementsPath && existsSync(requirementsPath) && validateArtifact(requirementsPath, "requirements").ok;
+    }
+    if (unitType === "research-decision") {
+        return hasValidResearchDecision(base);
+    }
+    if (unitType === "research-project") {
+        return hasCompleteProjectResearch(base);
+    }
+    if (unitType === "reactive-execute") {
+        const { milestone: mid, slice: sid, task: batchPart } = parseUnitId(unitId);
+        if (!mid || !sid || !batchPart)
+            return false;
+        const blockerPath = resolveExpectedArtifactPath(unitType, unitId, base);
+        if (blockerPath && existsSync(blockerPath)) {
+            return true;
+        }
+        const slicePath = resolveSlicePath(base, mid, sid);
+        if (!slicePath)
+            return false;
+        const plusIdx = batchPart.indexOf("+");
+        if (plusIdx === -1) {
+            const tDir = resolveTasksDir(base, mid, sid) ?? slicePath;
+            const summaryFiles = resolveTaskFiles(tDir, "SUMMARY");
+            return summaryFiles.length > 0;
+        }
+        const batchIds = batchPart.slice(plusIdx + 1).split(",").filter(Boolean);
+        if (batchIds.length === 0)
+            return false;
+        const tDir = resolveTasksDir(base, mid, sid) ?? slicePath;
+        const existingSummaries = new Set(resolveTaskFiles(tDir, "SUMMARY").map((f) => f.replace(/-SUMMARY\.md$/i, "").toUpperCase()));
+        for (const tid of batchIds) {
+            if (!existingSummaries.has(tid.toUpperCase()))
+                return false;
+        }
+        return true;
+    }
+    if (unitType === "gate-evaluate") {
+        const { milestone: mid, slice: sid, task: batchPart } = parseUnitId(unitId);
+        if (!mid || !sid || !batchPart)
+            return false;
+        const plusIdx = batchPart.indexOf("+");
+        if (plusIdx === -1)
+            return true;
+        const gateIds = batchPart.slice(plusIdx + 1).split(",").filter(Boolean);
+        if (gateIds.length === 0)
+            return true;
+        try {
+            if (!isDbAvailable())
+                return false;
+            const pending = getPendingGatesForTurn(mid, sid, "gate-evaluate");
+            const pendingIds = new Set(pending.map((g) => g.gate_id));
+            for (const gid of gateIds) {
+                if (pendingIds.has(gid))
+                    return false;
+            }
+        }
+        catch (err) {
+            logWarning("recovery", `gate-evaluate DB check failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        return true;
+    }
+    if (unitType === "research-slice" && unitId.endsWith("/parallel-research")) {
+        const { milestone: mid } = parseUnitId(unitId);
+        if (!mid)
+            return false;
+        const blockerPath = resolveExpectedArtifactPath(unitType, unitId, base);
+        if (blockerPath && existsSync(blockerPath)) {
+            return true;
+        }
+        const roadmapFile = resolveExpectedArtifactPath("plan-milestone", mid, base);
+        if (!roadmapFile || !existsSync(roadmapFile)) {
+            logWarning("recovery", `verify-fail ${unitType} ${unitId}: roadmap missing`);
+            return false;
+        }
+        try {
+            const roadmap = parseRoadmapForRecovery(readFileSync(roadmapFile, "utf-8"));
+            const milestoneResearchFile = resolveExpectedArtifactPath("research-milestone", mid, base);
+            const hasMilestoneResearch = !!milestoneResearchFile && existsSync(milestoneResearchFile);
+            for (const slice of roadmap.slices) {
+                if (slice.done)
+                    continue;
+                if (hasMilestoneResearch && slice.id === "S01")
+                    continue;
+                const depsComplete = (slice.depends ?? []).every((depId) => {
+                    const summaryPath = resolveExpectedArtifactPath("complete-slice", `${mid}/${depId}`, base);
+                    return !!summaryPath && existsSync(summaryPath);
+                });
+                if (!depsComplete)
+                    continue;
+                if (!resolveExistingSliceResearchPath(base, mid, slice.id)) {
+                    logWarning("recovery", `verify-fail ${unitType} ${unitId}: slice ${slice.id} missing RESEARCH`);
+                    return false;
+                }
+            }
+            return true;
+        }
+        catch (err) {
+            logWarning("recovery", `parallel-research verification failed: ${err instanceof Error ? err.message : String(err)}`);
+            return false;
+        }
+    }
+    const artifactBase = resolveArtifactVerificationBase(unitId, base);
+    let absPath = resolveExpectedArtifactPath(unitType, unitId, artifactBase);
+    if (!absPath || !existsSync(absPath)) {
+        const projectRoot = resolve(resolveWorktreeProjectRoot(artifactBase));
+        if (projectRoot && projectRoot !== artifactBase) {
+            const projectPath = resolveExpectedArtifactPath(unitType, unitId, projectRoot);
+            if (projectPath && existsSync(projectPath)) {
+                absPath = projectPath;
+            }
+        }
+    }
+    if (!absPath) {
+        logWarning("recovery", `verify-fail ${unitType} ${unitId}: resolveExpectedArtifactPath returned null (no artifact contract registered for this unit type)`);
+        return false;
+    }
+    if (!existsSync(absPath)) {
+        const worktreeFailure = diagnoseWorktreeIntegrityFailure(artifactBase);
+        if (worktreeFailure) {
+            logError("recovery", `${worktreeFailure} Unit: ${unitType} ${unitId}.`);
+            return false;
+        }
+        logWarning("recovery", `verify-fail ${unitType} ${unitId}: existsSync false for ${absPath}`);
+        return false;
+    }
+    if (unitType === "validate-milestone") {
+        const validationContent = readFileSync(absPath, "utf-8");
+        if (!isValidationTerminal(validationContent)) {
+            logWarning("recovery", `verify-fail ${unitType} ${unitId}: validation not terminal (len=${validationContent.length}) at ${absPath}`);
+            return false;
+        }
+    }
+    if (unitType === "run-uat") {
+        const assessmentContent = readFileSync(absPath, "utf-8");
+        if (!hasVerdict(assessmentContent)) {
+            logWarning("recovery", `verify-fail ${unitType} ${unitId}: assessment missing verdict at ${absPath}`);
+            return false;
+        }
+    }
+    if (unitType === "plan-milestone") {
+        try {
+            if (countPlanMilestoneRoadmapSlices(readFileSync(absPath, "utf-8")) === 0) {
+                logWarning("recovery", `verify-fail ${unitType} ${unitId}: roadmap has zero slices at ${absPath}`);
+                return false;
+            }
+        }
+        catch (err) {
+            logWarning("recovery", `plan-milestone roadmap verification failed: ${err instanceof Error ? err.message : String(err)}`);
+            return false;
+        }
+    }
+    if (unitType === "plan-slice") {
+        const { milestone: mid, slice: sid } = parseUnitId(unitId);
+        if (mid && sid) {
+            try {
+                let taskIds = null;
+                let dbPrimary = false;
+                const planContent = readFileSync(absPath, "utf-8");
+                let parsedTaskIds = null;
+                const getParsedTaskIds = () => {
+                    if (parsedTaskIds)
+                        return parsedTaskIds;
+                    parsedTaskIds = parseLegacyPlan(planContent).tasks.map((t) => t.id);
+                    return parsedTaskIds;
+                };
+                const tasksBlockMatch = planContent.match(/<tasks>([\s\S]*?)<\/tasks>/i);
+                const tasksBlock = tasksBlockMatch?.[1] ?? "";
+                const hasEmbeddedTaskEntries = tasksBlock.length > 0 &&
+                    (/^\s*- \[[xX ]\] \*\*T\d+/m.test(tasksBlock) ||
+                        /^\s*#{2,4}\s+T\d+\s*(?:--|—|:)/m.test(tasksBlock));
+                if (isDbAvailable()) {
+                    const refreshed = refreshWorkflowDatabaseFromDisk();
+                    if (refreshed) {
+                        const tasks = getSliceTasks(mid, sid);
+                        if (tasks.length > 0) {
+                            taskIds = tasks.map(t => t.id);
+                            dbPrimary = true;
+                        }
+                    }
+                }
+                if (!taskIds) {
+                    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 parsedIds = getParsedTaskIds();
+                    if (parsedIds.length > 0)
+                        taskIds = parsedIds;
+                }
+                if (taskIds && taskIds.length > 0 && !hasEmbeddedTaskEntries) {
+                    const tasksDir = join(dirname(absPath), "tasks");
+                    if (existsSync(tasksDir)) {
+                        for (const tid of taskIds) {
+                            const taskPlanFile = join(tasksDir, `${tid}-PLAN.md`);
+                            const taskSummaryFile = join(tasksDir, `${tid}-SUMMARY.md`);
+                            if (!existsSync(taskPlanFile) && !existsSync(taskSummaryFile)) {
+                                logWarning("recovery", `verify-fail ${unitType} ${unitId}: task artifact missing for ${tid}`);
+                                return false;
+                            }
+                        }
+                    }
+                    else if (!dbPrimary && !absPath.replace(/\\/g, "/").includes(`.gsd/${LAYOUT_SEGMENTS.level1}`)) {
+                        logWarning("recovery", `verify-fail ${unitType} ${unitId}: tasks dir missing at ${tasksDir}`);
+                        return false;
+                    }
+                }
+            }
+            catch (err) {
+                logWarning("recovery", `plan-slice task plan verification failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+    }
+    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()) {
+                if (!hasCheckedTaskCompletionOnDisk(base, mid, sid, tid))
+                    return false;
+            }
+            else {
+                return false;
+            }
+        }
+    }
+    if (unitType === "complete-slice") {
+        const { milestone: mid, slice: sid } = parseUnitId(unitId);
+        if (mid && sid) {
+            const uatPath = resolveSliceFile(base, mid, sid, "UAT")
+                ?? join(base, relSliceFile(base, mid, sid, "UAT"));
+            if (!existsSync(uatPath))
+                return false;
+            const dbSlice = getSlice(mid, sid);
+            if (dbSlice) {
+                if (dbSlice.status !== "complete")
+                    return false;
+            }
+            else if (!isDbAvailable()) {
+                const roadmapFile = resolveMilestoneFile(base, mid, "ROADMAP");
+                if (roadmapFile && existsSync(roadmapFile)) {
+                    try {
+                        const roadmapContent = readFileSync(roadmapFile, "utf-8");
+                        const roadmap = parseRoadmapForRecovery(roadmapContent);
+                        const slice = roadmap.slices.find((s) => s.id === sid);
+                        if (slice && !slice.done)
+                            return false;
+                    }
+                    catch (e) {
+                        logWarning("recovery", `roadmap parse failed: ${e.message}`);
+                        return false;
+                    }
+                }
+            }
+        }
+    }
+    if (unitType === "complete-milestone") {
+        const { milestone: mid } = parseUnitId(unitId);
+        if (!mid)
+            return false;
+        const closeoutProof = proveMilestoneCloseout(mid, {
+            refreshFromDisk: true,
+            summaryArtifactBasePath: artifactBase,
+            implementationEvidence: {
+                basePath: base,
+                requirement: "not-absent",
+            },
+        });
+        if (!closeoutProof.ok) {
+            if (!isDbAvailable() && closeoutProof.reason === "db-unavailable") {
+                const summaryOutcome = classifyMilestoneSummaryContent(readFileSync(absPath, "utf-8"));
+                return summaryOutcome !== "failure" && hasImplementationArtifacts(base, mid) !== "absent";
+            }
+            return false;
+        }
+    }
+    return true;
+}

package/dist/resources/extensions/gsd/auto/closeout.js

@@ -37,62 +37,51 @@ export async function restorePreflightStashOrStop(ic, preflight, milestoneId) {
     return stopOnPostflightRecoveryNeeded(ic, result, milestoneId);
 }
 /**
- * Run a milestone merge surrounded by preflight stash + always-on postflight
- * pop. The previous code popped the stash only after a successful merge, which
- * leaked `gsd-preflight-stash:M00x:*` entries whenever `mergeAndExit` threw —
- * leaving the user's pre-merge working tree silently stashed away after a
- * merge-conflict or other merge error. This helper restores the stash on
- * every exit path, then surfaces the merge or stash failure (in priority
- * order) as the loop's stop reason.
+ * Run a milestone merge through Worktree Lifecycle's guarded merge option,
+ * which surrounds the inner merge with preflight stash + always-on postflight
+ * pop. The previous closeout code popped the stash only after a successful
+ * merge, which leaked `gsd-preflight-stash:M00x:*` entries whenever
+ * `mergeAndExit` threw — leaving the user's pre-merge working tree silently
+ * stashed away after a merge-conflict or other merge error. Lifecycle now
+ * restores the stash on every attempted merge path, then this adapter surfaces
+ * the merge or stash failure (in priority order) as the loop's stop reason.
  *
  * Returns a `break` action when auto-mode must stop, or `null` when the merge
  * succeeded and the stash (if any) was restored cleanly.
  */
 export async function _runMilestoneMergeWithStashRestore(ic, milestoneId, options = {}) {
     const { ctx, pi, s, deps } = ic;
-    const preflight = deps.preflightCleanRoot(s.originalBasePath || s.basePath, milestoneId, ctx.ui.notify.bind(ctx.ui));
-    if (preflight.blocked) {
-        const reason = preflight.blockedReason === "unmerged-conflicts"
+    const projectRoot = s.originalBasePath || s.basePath;
+    const mergeResult = deps.lifecycle.exitMilestone(milestoneId, {
+        merge: true,
+        guardedMerge: {
+            projectRoot,
+            preflightCleanRoot: deps.preflightCleanRoot,
+            postflightPopStash: deps.postflightPopStash,
+        },
+    }, ctx.ui);
+    if (mergeResult.ok) {
+        await markMilestoneMergedAndRebuild(s);
+        return null;
+    }
+    if (mergeResult.reason === "postflight-stash-restore-failed") {
+        await markMilestoneMergedAndRebuild(s);
+    }
+    if (mergeResult.reason === "preflight-dirty-overlap" || mergeResult.reason === "preflight-unmerged-conflicts") {
+        const reason = mergeResult.reason === "preflight-unmerged-conflicts"
             ? `Pre-merge unresolved Git conflicts block milestone ${milestoneId}`
             : `Pre-merge dirty working tree overlaps milestone ${milestoneId}`;
         await deps.stopAuto(ctx, pi, reason, {
             preserveCompletedMilestoneBranch: true,
             preserveCloseoutTranscript: options.preserveCloseoutTranscript,
         });
-        return {
-            action: "break",
-            reason: preflight.blockedReason === "unmerged-conflicts"
-                ? "preflight-unmerged-conflicts"
-                : "preflight-dirty-overlap",
-        };
-    }
-    let mergeError = null;
-    const exitResult = deps.lifecycle.exitMilestone(milestoneId, { merge: true }, ctx.ui);
-    if (exitResult.ok) {
-        s.milestoneMergedInPhases = true;
-        try {
-            const projectRoot = s.originalBasePath || s.canonicalProjectRoot || s.basePath;
-            const { rebuildMarkdownProjectionsFromDb } = await import("../commands-maintenance.js");
-            await rebuildMarkdownProjectionsFromDb(projectRoot);
-        }
-        catch (err) {
-            logWarning("engine", `markdown projection rebuild after milestone merge failed: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    }
-    else {
-        mergeError = exitResult.cause ?? new Error(`exit ${exitResult.reason}`);
-    }
-    // Always attempt to restore the stashed working tree, even on merge error.
-    // postflightPopStash itself does not throw; failures surface via the
-    // PostflightResult.needsManualRecovery flag.
-    let stashResult = null;
-    if (preflight.stashPushed) {
-        stashResult = deps.postflightPopStash(s.originalBasePath || s.basePath, milestoneId, preflight.stashMarker, ctx.ui.notify.bind(ctx.ui));
+        return { action: "break", reason: mergeResult.reason };
     }
     // Merge failure takes priority over stash recovery — the merge is the
     // authoritative gate. If the stash also needed manual recovery, the user
     // already saw the postflightPopStash notify above.
-    if (mergeError) {
+    if (mergeResult.reason === "merge-conflict") {
+        const mergeError = mergeResult.cause;
         if (mergeError instanceof MergeConflictError) {
             // A merge conflict is a recoverable human checkpoint, not an
             // infrastructure failure — the user resolves the conflict and runs
@@ -109,6 +98,9 @@ export async function _runMilestoneMergeWithStashRestore(ic, milestoneId, option
             });
             return { action: "break", reason: "merge-conflict" };
         }
+    }
+    if (mergeResult.reason === "merge-failed" || mergeResult.reason === "merge-conflict") {
+        const mergeError = mergeResult.cause;
         logError("engine", "Milestone merge failed with non-conflict error", {
             milestone: milestoneId,
             error: String(mergeError),
@@ -125,11 +117,22 @@ export async function _runMilestoneMergeWithStashRestore(ic, milestoneId, option
         });
         return { action: "break", reason: "merge-failed" };
     }
-    if (stashResult) {
-        return stopOnPostflightRecoveryNeeded(ic, stashResult, milestoneId);
+    if (mergeResult.postflight) {
+        return stopOnPostflightRecoveryNeeded(ic, mergeResult.postflight, milestoneId);
     }
     return null;
 }
+async function markMilestoneMergedAndRebuild(s) {
+    s.milestoneMergedInPhases = true;
+    try {
+        const rebuildBasePath = s.originalBasePath || s.canonicalProjectRoot || s.basePath;
+        const { rebuildMarkdownProjectionsFromDb } = await import("../commands-maintenance.js");
+        await rebuildMarkdownProjectionsFromDb(rebuildBasePath);
+    }
+    catch (err) {
+        logWarning("engine", `markdown projection rebuild after milestone merge failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
 export async function _runMilestoneMergeOnceWithStashRestore(ic, milestoneId, options = {}) {
     if (ic.s.milestoneMergedInPhases) {
         debugLog("autoLoop", {

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

@@ -88,7 +88,12 @@ export function createDispatchHistory(options) {
             if (!scopeId)
                 return 0;
             try {
-                const persisted = getRecentUnitKeysForProjectRoot(scopeId, windowSize);
+                // Scope to the current session's trace_id when available (#852):
+                // a fresh session UUID that has never been written to unit_dispatches
+                // returns 0 rows so prior-session failures don't pre-populate the
+                // stuck window and immediately block the new session.
+                const traceId = options.resolveTraceId?.() ?? undefined;
+                const persisted = getRecentUnitKeysForProjectRoot(scopeId, windowSize, traceId);
                 if (persisted.length === 0)
                     return 0;
                 const rebuilt = [];

package/dist/resources/extensions/gsd/auto/finalize.js

@@ -280,6 +280,15 @@ export async function runFinalize(ic, iterData, loopState, sidecarItem) {
                 files: leak.files.map((file) => ({ path: file.path, status: file.status })),
             });
             ctx.ui.notify(message, "error");
+            try {
+                deps.checkpointWorkflowDatabase?.();
+            }
+            catch (err) {
+                debugLog("autoLoop", {
+                    phase: "root-write-leak-checkpoint-failed",
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            }
             await deps.stopAuto(ctx, pi, "Root-write leak during isolated auto-mode", {
                 preserveCompletedMilestoneBranch: true,
             });