@opengsd/gsd-pi 1.3.0 → 1.4.0

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

@@ -0,0 +1,427 @@
+// 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);
+}
+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 {
+            const roadmap = parseRoadmapForRecovery(readFileSync(absPath, "utf-8"));
+            if (roadmap.slices.length === 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;
+                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 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);
+                }
+                if (taskIds && taskIds.length > 0) {
+                    const tasksDir = join(dirname(absPath), "tasks");
+                    if (existsSync(tasksDir)) {
+                        for (const tid of taskIds) {
+                            const taskPlanFile = join(tasksDir, `${tid}-PLAN.md`);
+                            if (!existsSync(taskPlanFile)) {
+                                logWarning("recovery", `verify-fail ${unitType} ${unitId}: task plan missing ${taskPlanFile}`);
+                                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/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/loop.js

@@ -123,6 +123,7 @@ function resolveCompletionStopFromOutcome(outcome, stateSnapshot) {
 // tolerates — same behavior as a fresh session.
 const STUCK_RECOVERY_ATTEMPTS_KEY = "stuck_recovery_attempts";
 const MAX_CONSECUTIVE_ALREADY_ACTIVE_SKIPS = 3;
+const MAX_CONSECUTIVE_ORCHESTRATION_SKIPS = 3;
 const ORCHESTRATION_MISSING_REASON = "Auto Orchestration Module is not wired; cannot dispatch built-in GSD Unit.";
 function stableStuckStateScopeId(s) {
     return normalizeRealPath(s.scope?.workspace.projectRoot ?? (s.originalBasePath || s.basePath));
@@ -132,7 +133,19 @@ function loadStuckState(s) {
     if (!scopeId)
         return { recentUnits: [], stuckRecoveryAttempts: 0 };
     try {
-        const recentUnits = getRecentUnitKeysForProjectRoot(scopeId, STUCK_WINDOW_SIZE);
+        // Scope the stuck window to the CURRENT session (trace_id) so stale
+        // finalize-retry entries from previous sessions don't fire detectStuck
+        // Rule 1 on the first iteration — killing auto-mode before any new
+        // dispatch runs (#852). A prior session's two consecutive finalize-retry
+        // failures would otherwise permanently block every new session.
+        //
+        // s.currentTraceId is only set inside the first loop iteration (line ~443),
+        // so at this call-site it is always null for a fresh session. Return []
+        // directly in that case — no prior dispatch has occurred in this session,
+        // so the stuck window is trivially empty and the DB query is skipped.
+        const recentUnits = s.currentTraceId != null
+            ? getRecentUnitKeysForProjectRoot(scopeId, STUCK_WINDOW_SIZE, s.currentTraceId)
+            : [];
         const stuckRecoveryAttempts = getRuntimeKv("global", scopeId, STUCK_RECOVERY_ATTEMPTS_KEY) ?? 0;
         return { recentUnits, stuckRecoveryAttempts };
     }
@@ -295,6 +308,8 @@ export async function autoLoop(ctx, pi, s, deps, options) {
     let consecutiveErrors = 0;
     let consecutiveCooldowns = 0;
     let consecutiveAlreadyActiveSkips = 0;
+    let consecutiveOrchestrationSkips = 0;
+    let lastOrchestrationSkipKey = null;
     const recentErrorMessages = [];
     while (s.active) {
         iteration++;
@@ -777,11 +792,51 @@ export async function autoLoop(ctx, pi, s, deps, options) {
                     }
                     if (orchestrationResult.kind === "skipped") {
                         s.pendingOrchestrationDispatch = null;
+                        // Idempotent re-poll skips are benign (an active unit is still running).
+                        // The orchestrator's own stuck-window detection handles the truly-stuck case.
+                        // Do not count these toward the consecutive-skip streak.
+                        if (orchestrationResult.reason === "idempotent advance: unit already active") {
+                            emitIterationEnd({ skipped: true });
+                            completeIteration();
+                            finishTurn("skipped");
+                            continue;
+                        }
+                        const skipState = orchestrationResult.stateSnapshot;
+                        const skipKey = [
+                            orchestrationResult.reason,
+                            skipState?.phase,
+                            skipState?.activeMilestone?.id,
+                            skipState?.activeSlice?.id,
+                            skipState?.activeTask?.id,
+                        ].join("|");
+                        consecutiveOrchestrationSkips = skipKey === lastOrchestrationSkipKey
+                            ? consecutiveOrchestrationSkips + 1
+                            : 1;
+                        lastOrchestrationSkipKey = skipKey;
+                        if (consecutiveOrchestrationSkips >= MAX_CONSECUTIVE_ORCHESTRATION_SKIPS) {
+                            const msg = `Orchestration skipped ${consecutiveOrchestrationSkips} consecutive attempts without progress. Pausing auto-mode for manual recovery.`;
+                            ctx.ui.notify(msg, "error");
+                            await deps.pauseAuto(ctx, pi, {
+                                message: msg,
+                                category: "unknown",
+                            }, {
+                                expectedCurrentUnit: null,
+                            });
+                            finishTurn("paused", "manual-attention", orchestrationResult.reason ?? "orchestration-skipped");
+                            finishIncompleteIteration({
+                                status: "paused",
+                                reason: orchestrationResult.reason ?? "orchestration-skipped",
+                                failureClass: "manual-attention",
+                            });
+                            break;
+                        }
                         emitIterationEnd({ skipped: true });
                         completeIteration();
                         finishTurn("skipped");
                         continue;
                     }
+                    consecutiveOrchestrationSkips = 0;
+                    lastOrchestrationSkipKey = null;
                     if (orchestrationResult.kind === "paused") {
                         s.pendingOrchestrationDispatch = null;
                         finishIncompleteIteration({
@@ -1148,7 +1203,17 @@ export async function autoLoop(ctx, pi, s, deps, options) {
             const finalizeDecision = decideFinalizeResult(finalizeResult.action === "break"
                 ? { action: "break", reason: finalizeResult.reason }
                 : finalizeResult.action === "continue"
-                    ? { action: "continue" }
+                    ? {
+                        action: "continue",
+                        // Surface the specific verification failure (e.g. "roadmap has
+                        // zero slices") in the ledger/stuck-loop reason instead of the
+                        // opaque bare "finalize-retry" token. The retry paths in
+                        // runFinalize set s.pendingVerificationRetry.failureContext
+                        // from describeArtifactVerificationFailure before returning
+                        // continue; it is cleared on the next dispatch, so reading it
+                        // here captures the reason for THIS finalize (#852 follow-up).
+                        failureDetail: s.pendingVerificationRetry?.failureContext,
+                    }
                     : { action: "next" });
             if (finalizeDecision.action === "stop") {
                 dispatchSettled = settleDispatchFailed(dispatchId, finalizeDecision.ledgerErrorSummary, {

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

@@ -124,7 +124,9 @@ export async function decideOrchestratorDispatch(ctx, pi, dispatchBasePath, sess
     const active = state.activeMilestone;
     const activeSession = input.session ?? session;
     const activeDispatchBasePath = activeSession?.basePath || dispatchBasePath;
-    const prefs = loadEffectiveGSDPreferencesWithRegistry(ctx.modelRegistry, activeDispatchBasePath, resolveProfileAnchorProvider(ctx.model?.provider, session?.autoModeStartModel?.provider))?.preferences;
+    const prefs = loadEffectiveGSDPreferencesWithRegistry(ctx.modelRegistry, activeDispatchBasePath, resolveProfileAnchorProvider(ctx.model?.provider, session?.autoModeStartModel?.provider), activeSession?.autoModeStartModel
+        ? `${activeSession.autoModeStartModel.provider}/${activeSession.autoModeStartModel.id}`
+        : undefined)?.preferences;
     if (!active) {
         if (state.phase !== "pre-planning")
             return null;
@@ -394,12 +396,17 @@ export class AutoOrchestrator {
         }
     }
     // ── UokGateAdapter (folded) ──────────────────────────────────────────────
-    async emitUokGate(input) {
+    resolveUokGateContext() {
         const activeBasePath = this.getLiveDispatchBasePath();
-        const prefs = loadEffectiveGSDPreferencesWithRegistry(this.ctx.modelRegistry, activeBasePath, resolveProfileAnchorProvider(this.ctx.model?.provider, this.s.autoModeStartModel?.provider))?.preferences;
-        const uokFlags = resolveUokFlags(prefs);
-        if (!uokFlags.gates)
+        const prefs = loadEffectiveGSDPreferencesWithRegistry(this.ctx.modelRegistry, activeBasePath, resolveProfileAnchorProvider(this.ctx.model?.provider, this.s.autoModeStartModel?.provider), this.s.autoModeStartModel
+            ? `${this.s.autoModeStartModel.provider}/${this.s.autoModeStartModel.id}`
+            : undefined)?.preferences;
+        return { activeBasePath, uokFlags: resolveUokFlags(prefs) };
+    }
+    async emitUokGate(input) {
+        if (!input.uokFlags.gates)
             return;
+        const activeBasePath = input.activeBasePath;
         const milestoneId = input.milestoneId ?? this.s.currentMilestoneId ?? undefined;
         try {
             const { UokGateRunner } = await import("../uok/gate-runner.js");
@@ -732,12 +739,17 @@ export class AutoOrchestrator {
     async start(_sessionContext) {
         this.lastAdvanceKey = null;
         this.lastFinalizedUnitKey = null;
-        // #482: the DB dispatch ledger is the source of truth across sessions.
-        // Discard any in-memory window and rebuild it from the ledger so a unit
-        // that was re-dispatched in previous sessions is detected as stuck here
-        // instead of silently re-dispatching forever.
+        // #852: a fresh user-triggered session must start with a clean stuck window.
+        // Cross-session rehydration at start() was removed because it caused false
+        // stuck-loop verdicts when prior sessions left consecutive finalize-retry
+        // entries in unit_dispatches — the new session would be killed before its
+        // first dispatch ran. Within-session stuck detection (accumulated through
+        // recordDispatch() calls during advance()) remains fully active and catches
+        // genuine stuck patterns after STUCK_WINDOW_SIZE dispatches.
+        //
+        // resume() retains cross-session rehydration: an interrupted session resuming
+        // after a crash should see the dispatch history it had been accumulating.
         this.dispatchHistory.clearOnRecovery();
-        this.dispatchHistory.rehydrate();
         this.lastStuckRecoveryKey = null;
         this.lastDerivedPhase = null;
         this.status.phase = "running";
@@ -751,9 +763,11 @@ export class AutoOrchestrator {
         const stopAdvanceTimer = debugTime("orchestrator-advance");
         try {
             this.ensureLockOwnership();
+            const uokGateContext = this.resolveUokGateContext();
             const staleMsg = this.checkResourcesStale();
             if (staleMsg) {
                 await this.emitUokGate({
+                    ...uokGateContext,
                     gateId: "resource-version-guard",
                     gateType: "policy",
                     outcome: "fail",
@@ -767,6 +781,7 @@ export class AutoOrchestrator {
                 return blocked;
             }
             await this.emitUokGate({
+                ...uokGateContext,
                 gateId: "resource-version-guard",
                 gateType: "policy",
                 outcome: "pass",
@@ -776,6 +791,7 @@ export class AutoOrchestrator {
             const gate = await this.preAdvanceGate();
             if (gate.kind === "fail") {
                 await this.emitUokGate({
+                    ...uokGateContext,
                     gateId: "pre-dispatch-health-gate",
                     gateType: "execution",
                     outcome: "manual-attention",
@@ -794,6 +810,7 @@ export class AutoOrchestrator {
             }
             if (gate.kind === "threw") {
                 await this.emitUokGate({
+                    ...uokGateContext,
                     gateId: "pre-dispatch-health-gate",
                     gateType: "execution",
                     outcome: "manual-attention",
@@ -805,6 +822,7 @@ export class AutoOrchestrator {
             }
             else {
                 await this.emitUokGate({
+                    ...uokGateContext,
                     gateId: "pre-dispatch-health-gate",
                     gateType: "execution",
                     outcome: "pass",