gsd-pi 2.82.0-dev.ed17d078d → 3.0.0-dev.04f5ccf82

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

@@ -29,7 +29,7 @@ import { verifyExpectedArtifact, diagnoseExpectedArtifact, buildLoopRemediationS
 import { writeUnitRuntimeRecord } from "../unit-runtime.js";
 import { withTimeout, FINALIZE_PRE_TIMEOUT_MS, FINALIZE_POST_TIMEOUT_MS } from "./finalize-timeout.js";
 import { getEligibleSlices } from "../slice-parallel-eligibility.js";
-import { startSliceParallel } from "../slice-parallel-orchestrator.js";
+import { isSliceParallelActive, startSliceParallel } from "../slice-parallel-orchestrator.js";
 import { isDbAvailable, getMilestoneSlices } from "../gsd-db.js";
 import { reconcileBeforeSpawn } from "../state-reconciliation.js";
 import { ensurePlanV2Graph, isEmptyPlanV2GraphResult, isMissingFinalizedContextResult } from "../uok/plan-v2.js";
@@ -44,6 +44,9 @@ import { resolveManifest } from "../unit-context-manifest.js";
 import { createWorktreeSafetyModule } from "../worktree-safety.js";
 import { isSuspiciousGhostCompletion } from "../auto-unit-closeout.js";
 import { decideVerificationRetry, verificationRetryKey } from "./verification-retry-policy.js";
+import { buildPhaseHandoffOutcome, setAutoOutcomeWidget } from "../auto-dashboard.js";
+import { getConsecutiveDispatchBlocker } from "../dispatch-guard.js";
+export const STUCK_WINDOW_SIZE = 6;
 // ─── Path Comparison Helper ───────────────────────────────────────────────
 /** Compare two paths for physical identity, tolerating trailing slashes and symlinks. */
 function isSamePathLocal(a, b) {
@@ -95,7 +98,12 @@ export function shouldDegradeEmptyWorktreeToProjectRoot(worktreeClassification,
         projectRootClassification.kind !== "invalid-repo");
 }
 function unitWritesSource(unitType) {
-    const manifest = resolveManifest(unitType);
+    // Backward compatibility: sidecar queues from older builds may persist
+    // prefixed unit types (e.g. "sidecar/quick-task").
+    const normalizedUnitType = unitType.startsWith("sidecar/")
+        ? unitType.slice("sidecar/".length)
+        : unitType;
+    const manifest = resolveManifest(normalizedUnitType);
     if (!manifest)
         return null;
     return manifest.tools.mode === "all" || manifest.tools.mode === "docs";
@@ -103,6 +111,12 @@ function unitWritesSource(unitType) {
 function formatWorktreeSafetyFailure(result) {
     return `Worktree Safety failed (${result.kind}): ${result.reason} ${result.remediation}`;
 }
+function formatWorktreeSafetyStopReason(result) {
+    if (result.kind === "empty-worktree-with-project-content") {
+        return `Worktree Safety failed (${result.kind}). Run /gsd doctor fix, then /gsd auto.`;
+    }
+    return `Worktree Safety failed (${result.kind}).`;
+}
 function resolveEmptyWorktreeWithProjectContent(unitRoot, projectRoot) {
     if (isSamePathLocal(unitRoot, projectRoot))
         return false;
@@ -143,7 +157,8 @@ async function validateSourceWriteWorktreeSafety(ic, unitType, unitId, milestone
     if (!writesSource)
         return null;
     const projectRoot = s.canonicalProjectRoot ?? resolveWorktreeProjectRoot(s.basePath, s.originalBasePath);
-    if (deps.getIsolationMode(projectRoot) !== "worktree")
+    const isolationMode = deps.getIsolationMode(projectRoot);
+    if (isolationMode !== "worktree")
         return null;
     const safety = createWorktreeSafetyModule();
     const result = safety.validateUnitRoot({
@@ -153,6 +168,7 @@ async function validateSourceWriteWorktreeSafety(ic, unitType, unitId, milestone
         projectRoot,
         unitRoot: s.basePath,
         milestoneId,
+        isolationMode,
         expectedBranch: milestoneId ? deps.autoWorktreeBranch(milestoneId) : null,
         emptyWorktreeWithProjectContent: resolveEmptyWorktreeWithProjectContent(s.basePath, projectRoot),
         lease: s.workerId
@@ -176,7 +192,7 @@ async function validateSourceWriteWorktreeSafety(ic, unitType, unitId, milestone
         projectRoot,
     });
     ctx.ui.notify(msg, "error");
-    await deps.stopAuto(ctx, pi, msg);
+    await deps.stopAuto(ctx, pi, formatWorktreeSafetyStopReason(result));
     return { action: "break", reason: result.kind };
 }
 // ─── Session timeout auto-resume state ────────────────────────────────────────
@@ -303,6 +319,18 @@ async function restorePreflightStashOrStop(ic, preflight, milestoneId) {
 export async function _runMilestoneMergeWithStashRestore(ic, milestoneId) {
     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"
+            ? `Pre-merge unresolved Git conflicts block milestone ${milestoneId}`
+            : `Pre-merge dirty working tree overlaps milestone ${milestoneId}`;
+        await deps.stopAuto(ctx, pi, reason);
+        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) {
@@ -383,6 +411,9 @@ export function _buildCancelledUnitStopReason(unitType, unitId, errorContext) {
         loopReason: "unit-aborted",
     };
 }
+export function _isPauseOriginCancelledResult(isPaused, errorContext) {
+    return isPaused && !errorContext;
+}
 async function failClosedOnFinalizeTimeout(ic, iterData, loopState, stage, startedAt) {
     const { ctx, pi, s, deps } = ic;
     const now = Date.now();
@@ -631,6 +662,12 @@ export async function runPreDispatch(ic, loopState) {
         !process.env.GSD_PARALLEL_WORKER &&
         isDbAvailable()) {
         try {
+            const projectRoot = _resolveDispatchGuardBasePath(s);
+            if (isSliceParallelActive(projectRoot)) {
+                ctx.ui.notify("Slice-parallel: workers are still running; waiting for completion before next dispatch.", "info");
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+                return { action: "continue" };
+            }
             const dbSlices = getMilestoneSlices(mid);
             if (dbSlices.length > 0) {
                 const doneIds = new Set(dbSlices.filter(sl => sl.status === "complete" || sl.status === "done").map(sl => sl.id));
@@ -650,19 +687,18 @@ export async function runPreDispatch(ic, loopState) {
                     ctx.ui.notify(`Slice-parallel: dispatching ${eligible.length} eligible slices for ${mid}.`, "info");
                     // ADR-017 #5707: reconcile before spawning so each worker doesn't
                     // independently race on the same drift. Failure aborts the spawn.
-                    const spawnGate = await reconcileBeforeSpawn(s.basePath);
+                    const spawnGate = await reconcileBeforeSpawn(projectRoot);
                     if (!spawnGate.ok) {
                         ctx.ui.notify(`Slice-parallel: aborting spawn — ${spawnGate.reason}`, "error");
                         return { action: "break", reason: `slice-parallel-reconciliation-failed: ${spawnGate.reason}` };
                     }
-                    const result = await startSliceParallel(s.basePath, mid, eligible, {
+                    const result = await startSliceParallel(projectRoot, mid, eligible, {
                         maxWorkers: prefs.slice_parallel.max_workers ?? 2,
                         useExecutionGraph: uokFlags.executionGraph,
                     });
                     if (result.started.length > 0) {
                         ctx.ui.notify(`Slice-parallel: started ${result.started.length} worker(s): ${result.started.join(", ")}.`, "info");
-                        await deps.stopAuto(ctx, pi, `Slice-parallel dispatched for ${mid}`);
-                        return { action: "break", reason: "slice-parallel-dispatched" };
+                        return { action: "continue" };
                     }
                     // Fall through to sequential if no workers started
                 }
@@ -888,7 +924,6 @@ export async function runPreDispatch(ic, loopState) {
 export async function runDispatch(ic, preData, loopState) {
     const { ctx, pi, s, deps, prefs } = ic;
     const { state, mid, midTitle } = preData;
-    const STUCK_WINDOW_SIZE = 6;
     const provider = ctx.model?.provider;
     const authMode = provider && typeof ctx.modelRegistry?.getProviderAuthMode === "function"
         ? ctx.modelRegistry.getProviderAuthMode(provider)
@@ -968,12 +1003,25 @@ export async function runDispatch(ic, preData, loopState) {
         prompt = preDispatchResult.prompt;
     }
     const guardBasePath = _resolveDispatchGuardBasePath(s);
-    const priorSliceBlocker = deps.getPriorSliceCompletionBlocker(guardBasePath, deps.getMainBranch(guardBasePath), unitType, unitId);
+    let mainBranch = "main";
+    try {
+        mainBranch = deps.getMainBranch(guardBasePath);
+    }
+    catch (err) {
+        debugLog("autoLoop", { phase: "getMainBranch-failed", error: String(err) });
+    }
+    const priorSliceBlocker = deps.getPriorSliceCompletionBlocker(guardBasePath, mainBranch, unitType, unitId);
     if (priorSliceBlocker) {
         await deps.stopAuto(ctx, pi, priorSliceBlocker);
         debugLog("autoLoop", { phase: "exit", reason: "prior-slice-blocker" });
         return { action: "break", reason: "prior-slice-blocker" };
     }
+    const consecutiveDispatchBlocker = getConsecutiveDispatchBlocker(loopState, state.phase, unitType, unitId);
+    if (consecutiveDispatchBlocker) {
+        await deps.stopAuto(ctx, pi, consecutiveDispatchBlocker);
+        debugLog("autoLoop", { phase: "exit", reason: "consecutive-dispatch-blocker" });
+        return { action: "break", reason: "consecutive-dispatch-blocker" };
+    }
     const worktreeSafetyBlock = await validateSourceWriteWorktreeSafety(ic, unitType, unitId, mid, "pre-dispatch");
     if (worktreeSafetyBlock)
         return worktreeSafetyBlock;
@@ -983,9 +1031,13 @@ export async function runDispatch(ic, preData, loopState) {
     // Rules 1/3/4 can catch retry loops with repeated failure content (#5719).
     // Rules 2/2b suppress legitimate retry backoff through the dispatch ledger.
     loopState.recentUnits.push({ key: derivedKey });
-    if (loopState.recentUnits.length > STUCK_WINDOW_SIZE)
+    while (loopState.recentUnits.length > STUCK_WINDOW_SIZE) {
         loopState.recentUnits.shift();
-    const stuckSignal = detectStuck(loopState.recentUnits);
+    }
+    const stuckSignal = detectStuck(loopState.recentUnits, {
+        pendingRetry: !!s.pendingVerificationRetry,
+        retryAttempt: s.pendingVerificationRetry?.attempt,
+    });
     if (stuckSignal) {
         debugLog("autoLoop", {
             phase: "stuck-check",
@@ -1030,7 +1082,6 @@ export async function runDispatch(ic, preData, loopState) {
                 ctx.ui.notify(`Stuck recovery: artifact for ${unitType} ${unitId} found on disk. Invalidating caches.`, "info");
                 deps.invalidateAllCaches();
                 loopState.recentUnits.length = 0;
-                loopState.stuckRecoveryAttempts = 0;
                 return { action: "continue" };
             }
             ctx.ui.notify(`Stuck on ${unitType} ${unitId} (${stuckSignal.reason}). Invalidating caches and retrying.`, "warning");
@@ -1324,35 +1375,8 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         s.currentUnit.type === unitType &&
         s.currentUnit.id === unitId);
     const previousTier = s.currentUnitRouting?.tier;
-    // Scope workflow-logger buffer to this unit so post-finalize drains are
-    // per-unit. Without this, the module-level _buffer accumulates across every
-    // unit in the same Node process (see workflow-logger.ts module header).
-    _resetLogs();
     const dispatchKey = `${unitType}/${unitId}`;
-    s.unitDispatchCount.set(dispatchKey, (s.unitDispatchCount.get(dispatchKey) ?? 0) + 1);
-    s.currentUnit = { type: unitType, id: unitId, startedAt: Date.now() };
-    s.lastGitActionFailure = null;
-    s.lastGitActionStatus = null;
-    s.lastUnitAgentEndMessages = null;
-    setCurrentPhase(unitType, {
-        basePath: s.basePath,
-        traceId: ic.flowId,
-        turnId: `iter-${ic.iteration}`,
-        causedBy: "unit-start",
-    });
-    s.lastToolInvocationError = null; // #2883: clear stale error from previous unit
-    const unitStartSeq = ic.nextSeq();
-    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: unitStartSeq, eventType: "unit-start", data: { unitType, unitId } });
-    deps.captureAvailableSkills();
-    writeUnitRuntimeRecord(s.basePath, unitType, unitId, s.currentUnit.startedAt, {
-        phase: "dispatched",
-        wrapupWarningSent: false,
-        timeoutAt: null,
-        lastProgressAt: s.currentUnit.startedAt,
-        progressCount: 0,
-        lastProgressKind: "dispatch",
-        recoveryAttempts: 0, // Reset so re-dispatched units get full recovery budget (#2322)
-    });
+    const nextDispatchCount = (s.unitDispatchCount.get(dispatchKey) ?? 0) + 1;
     // Status bar (widget + preconditions deferred until after model selection — see #2899)
     ctx.ui.setStatus("gsd-auto", "auto");
     if (mid)
@@ -1406,14 +1430,17 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         finalPrompt = `${capped}\n\n---\n\n${finalPrompt}`;
         s.pendingCrashRecovery = null;
     }
-    else if ((s.unitDispatchCount.get(dispatchKey) ?? 0) > 1) {
+    else if (nextDispatchCount > 1) {
         const diagnostic = deps.getDeepDiagnostic(s.basePath);
         if (diagnostic) {
             const cappedDiag = diagnostic.length > MAX_RECOVERY_CHARS
                 ? diagnostic.slice(0, MAX_RECOVERY_CHARS) +
                     "\n\n[...diagnostic truncated to prevent memory exhaustion]"
                 : diagnostic;
-            finalPrompt = `**RETRY — your previous attempt did not produce the required artifact.**\n\nDiagnostic from previous attempt:\n${cappedDiag}\n\nFix whatever went wrong and make sure you write the required file this time.\n\n---\n\n${finalPrompt}`;
+            const retryInstruction = unitType === "execute-task"
+                ? "The required artifact is `T##-SUMMARY.md`. Do NOT manually write this file. Call `gsd_task_complete` with `milestoneId`, `sliceId`, `taskId`, and the required completion fields. Do not re-run implementation work — call the tool."
+                : "Fix whatever went wrong and make sure you write the required file this time.";
+            finalPrompt = `**RETRY — your previous attempt did not produce the required artifact.**\n\nDiagnostic from previous attempt:\n${cappedDiag}\n\n${retryInstruction}\n\n---\n\n${finalPrompt}`;
         }
     }
     // Prompt char measurement
@@ -1445,6 +1472,11 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         logWarning("engine", "Prompt reorder failed", { error: msg });
     }
     // Select and apply model (with tier escalation on retry — normal units only)
+    const prevUnitRouting = s.currentUnitRouting;
+    const prevUnitModel = s.currentUnitModel;
+    const prevDispatchedModelId = s.currentDispatchedModelId;
+    const prevSessionModel = ctx.model;
+    const prevSessionThinkingLevel = pi.getThinkingLevel();
     const modelResult = await deps.selectAndApplyModel(ctx, pi, unitType, unitId, s.basePath, prefs, s.verbose, s.autoModeStartModel, sidecarItem ? undefined : { isRetry, previousTier }, undefined, s.manualSessionModelOverride, s.autoModeStartThinkingLevel);
     s.currentUnitRouting =
         modelResult.routing;
@@ -1488,12 +1520,58 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
                 ? ctx.modelRegistry.getProviderAuthMode(ctx.model.provider)
                 : undefined,
         baseUrl: s.currentUnitModel?.baseUrl ?? ctx.model?.baseUrl,
+        activeTools: typeof pi.getActiveTools === "function" ? pi.getActiveTools() : [],
     });
     if (compatibilityError) {
+        s.currentUnitRouting = prevUnitRouting;
+        s.currentUnitModel = prevUnitModel;
+        s.currentDispatchedModelId = prevDispatchedModelId;
+        if (s.checkpointSha) {
+            cleanupCheckpoint(s.basePath, unitId);
+            s.checkpointSha = null;
+        }
+        if (prevSessionModel) {
+            const ok = await pi.setModel(prevSessionModel, { persist: false });
+            if (!ok) {
+                ctx.ui.notify("Failed to restore previous session model after compatibility check failure.", "warning");
+            }
+            if (prevSessionThinkingLevel) {
+                pi.setThinkingLevel(prevSessionThinkingLevel);
+            }
+        }
         ctx.ui.notify(compatibilityError, "error");
         await deps.stopAuto(ctx, pi, compatibilityError);
         return { action: "break", reason: "workflow-capability" };
     }
+    // Scope workflow-logger buffer to this unit so post-finalize drains are
+    // per-unit. Without this, the module-level _buffer accumulates across every
+    // unit in the same Node process (see workflow-logger.ts module header).
+    _resetLogs();
+    const unitStartedAt = Date.now();
+    s.unitDispatchCount.set(dispatchKey, nextDispatchCount);
+    s.currentUnit = { type: unitType, id: unitId, startedAt: unitStartedAt };
+    s.lastGitActionFailure = null;
+    s.lastGitActionStatus = null;
+    s.lastUnitAgentEndMessages = null;
+    setCurrentPhase(unitType, {
+        basePath: s.basePath,
+        traceId: ic.flowId,
+        turnId: `iter-${ic.iteration}`,
+        causedBy: "unit-start",
+    });
+    s.lastToolInvocationError = null; // #2883: clear stale error from previous unit
+    const unitStartSeq = ic.nextSeq();
+    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: unitStartSeq, eventType: "unit-start", data: { unitType, unitId } });
+    deps.captureAvailableSkills();
+    writeUnitRuntimeRecord(s.basePath, unitType, unitId, unitStartedAt, {
+        phase: "dispatched",
+        wrapupWarningSent: false,
+        timeoutAt: null,
+        lastProgressAt: unitStartedAt,
+        progressCount: 0,
+        lastProgressKind: "dispatch",
+        recoveryAttempts: 0, // Reset so re-dispatched units get full recovery budget (#2322)
+    });
     // Progress widget + preconditions — deferred to after model selection so the
     // widget's first render tick shows the correct model (#2899).
     deps.updateProgressWidget(ctx, unitType, unitId, state);
@@ -1579,6 +1657,10 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
         }
     }
     if (unitResult.status === "cancelled") {
+        if (_isPauseOriginCancelledResult(s.paused, unitResult.errorContext)) {
+            debugLog("autoLoop", { phase: "cancelled-after-pause", unitType, unitId });
+            return { action: "break", reason: "paused" };
+        }
         const errorCategory = unitResult.errorContext?.category;
         // Provider-error pause: agent_end recovery normally pauses before this
         // branch. Provider readiness failures happen before dispatch, so pause here
@@ -1720,12 +1802,12 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
             }
         }
     }
-    if (s.currentUnitRouting) {
-        deps.recordOutcome(unitType, s.currentUnitRouting.tier, true);
-    }
     const skipArtifactVerification = unitType.startsWith("hook/") || unitType === "custom-step";
     const artifactVerified = skipArtifactVerification ||
         verifyExpectedArtifact(unitType, unitId, s.basePath);
+    if (s.currentUnitRouting) {
+        deps.recordOutcome(unitType, s.currentUnitRouting.tier, artifactVerified);
+    }
     if (artifactVerified) {
         s.unitDispatchCount.delete(dispatchKey);
         s.unitRecoveryCount.delete(`${unitType}/${unitId}`);
@@ -1749,7 +1831,10 @@ export async function runUnitPhase(ic, iterData, loopState, sidecarItem) {
             logWarning("engine", `phase anchor failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
-    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "unit-end", data: { unitType, unitId, status: unitResult.status, artifactVerified, ...(unitResult.errorContext ? { errorContext: unitResult.errorContext } : {}) }, causedBy: { flowId: ic.flowId, seq: unitStartSeq } });
+    const unitEndStatus = !artifactVerified && unitResult.status === "completed"
+        ? "no-artifact"
+        : unitResult.status;
+    deps.emitJournalEvent({ ts: new Date().toISOString(), flowId: ic.flowId, seq: ic.nextSeq(), eventType: "unit-end", data: { unitType, unitId, status: unitEndStatus, artifactVerified, ...(unitResult.errorContext ? { errorContext: unitResult.errorContext } : {}) }, causedBy: { flowId: ic.flowId, seq: unitStartSeq } });
     // ── Safety harness: checkpoint cleanup or rollback ──
     if (s.checkpointSha) {
         if (unitResult.status === "error" && safetyConfig.auto_rollback) {
@@ -1810,6 +1895,8 @@ export async function runFinalize(ic, iterData, loopState, sidecarItem) {
     const preUnitSnapshot = s.currentUnit
         ? { type: s.currentUnit.type, id: s.currentUnit.id, startedAt: s.currentUnit.startedAt }
         : null;
+    s.currentUnit = null;
+    clearCurrentPhase();
     const preResultGuard = await withTimeout(deps.postUnitPreVerification(postUnitCtx, preVerificationOpts), FINALIZE_PRE_TIMEOUT_MS, "postUnitPreVerification");
     if (preResultGuard.timedOut) {
         return failClosedOnFinalizeTimeout(ic, iterData, loopState, "pre", preUnitSnapshot?.startedAt ?? Date.now());
@@ -1923,9 +2010,19 @@ export async function runFinalize(ic, iterData, loopState, sidecarItem) {
             lastProgressAt: Date.now(),
             lastProgressKind: "finalize-success",
         });
+        if (!preUnitSnapshot.type.startsWith("hook/") &&
+            preUnitSnapshot.type !== "custom-step" &&
+            preUnitSnapshot.type !== "complete-milestone") {
+            setAutoOutcomeWidget(ctx, {
+                ...buildPhaseHandoffOutcome({
+                    unitType: preUnitSnapshot.type,
+                    unitId: preUnitSnapshot.id,
+                    agentEndMessages: s.lastUnitAgentEndMessages,
+                }),
+                startedAt: s.autoStartTime,
+            });
+        }
     }
-    s.currentUnit = null;
-    clearCurrentPhase();
     // Surface accumulated workflow-logger issues for this unit to the user.
     // Warnings/errors logged during the unit are buffered in the logger and
     // drained here so the user sees a single consolidated post-unit alert.

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

@@ -1,3 +1,5 @@
+// Project/App: GSD-2
+// File Purpose: Mutable auto-mode session state container.
 /**
  * AutoSession — encapsulates all mutable auto-mode state into a single instance.
  *
@@ -26,6 +28,7 @@ export class AutoSession {
     active = false;
     paused = false;
     completionStopInProgress = false;
+    preserveStepSurfaceAfterLoopExit = false;
     stepMode = false;
     verbose = false;
     activeEngineId = null;
@@ -159,6 +162,7 @@ export class AutoSession {
     commandPollingCleanup = null;
     // ── Orchestration seam ───────────────────────────────────────────────────
     orchestration = null;
+    pendingOrchestrationDispatch = null;
     // ── Loop promise state ──────────────────────────────────────────────────
     // Per-unit resolve function and session-switch guard live at module level
     // in auto-loop.ts (_currentResolve, _sessionSwitchInFlight).
@@ -210,6 +214,7 @@ export class AutoSession {
         this.active = false;
         this.paused = false;
         this.completionStopInProgress = false;
+        this.preserveStepSurfaceAfterLoopExit = false;
         this.stepMode = false;
         this.verbose = false;
         this.activeEngineId = null;
@@ -284,6 +289,7 @@ export class AutoSession {
         this.commandPollingCleanup = null;
         // Orchestration seam
         this.orchestration = null;
+        this.pendingOrchestrationDispatch = null;
         // Loop promise state lives in auto-loop.ts module scope
     }
     resetAfterStop(options = {}) {

package/dist/resources/extensions/gsd/auto/unit-runner-events.js

@@ -3,5 +3,11 @@ export function isInternalSessionTransitionAbortEvent(event) {
     return event.abortOrigin === "session-transition";
 }
 export function shouldIgnoreAgentEndForActiveUnit(event) {
-    return isInternalSessionTransitionAbortEvent(event);
+    if (!isInternalSessionTransitionAbortEvent(event))
+        return false;
+    const lastMsg = event.messages[event.messages.length - 1];
+    if (!lastMsg || typeof lastMsg !== "object")
+        return true;
+    const stopReason = lastMsg.stopReason;
+    return stopReason === "aborted" || stopReason === "error";
 }

package/dist/resources/extensions/gsd/auto/workflow-kernel.js

@@ -66,6 +66,9 @@ export function decideEngineDispatch(input) {
 export function decideFinalizeResult(input) {
     if (input.action === "break") {
         const reason = input.reason ?? "unknown";
+        if (reason === "step-wizard") {
+            return { action: "complete-and-break" };
+        }
         return {
             action: "stop",
             failureClass: reason === "git-closeout-failure" ? "git" : "closeout",

package/dist/resources/extensions/gsd/auto/workflow-memory-pressure.js

@@ -4,6 +4,18 @@ import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
 const DEFAULT_MEMORY_PRESSURE_THRESHOLD = 0.85;
 const DEFAULT_HEAP_LIMIT_MB = 4096;
+/**
+ * Returns true on auto-mode startup, then every configured interval.
+ *
+ * Iteration 1 is checked explicitly so early session memory pressure cannot
+ * bypass the periodic interval guard.
+ */
+export function shouldCheckMemoryPressure(iteration, interval) {
+    if (!Number.isInteger(interval) || interval <= 0) {
+        throw new Error("Memory pressure check interval must be a positive integer");
+    }
+    return iteration === 1 || iteration % interval === 0;
+}
 function defaultHeapLimitBytes() {
     const v8 = require("node:v8");
     const limit = v8.getHeapStatistics?.().heap_size_limit;

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

@@ -28,3 +28,12 @@ export function getBudgetEnforcementAction(enforcement, budgetPct) {
         return "pause";
     return "warn";
 }
+export function getUnitCostSpikeAction(unitCostUsd, rollingAvgUsd, multiplier = 3.0) {
+    if (!Number.isFinite(unitCostUsd) || unitCostUsd < 0)
+        return "none";
+    if (!Number.isFinite(rollingAvgUsd) || rollingAvgUsd <= 0)
+        return "none";
+    if (!Number.isFinite(multiplier) || multiplier <= 0)
+        return "none";
+    return unitCostUsd >= (rollingAvgUsd * multiplier) ? "pause" : "none";
+}

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

@@ -9,7 +9,7 @@ import { execFileSync } from "node:child_process";
 import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
 import { makeUI } from "../shared/tui.js";
 import { GLYPH, INDENT } from "../shared/mod.js";
-import { padRightVisible, renderFrame, renderProgressBar, rightAlign, wrapVisibleText } from "./tui/render-kit.js";
+import { padRightVisible, renderPanel, renderProgressBar, rightAlign, wrapVisibleText } from "./tui/render-kit.js";
 import { computeProgressScore } from "./progress-score.js";
 import { getGlobalGSDPreferencesPath, getProjectGSDPreferencesPath, parsePreferencesMarkdown, } from "./preferences.js";
 import { parseUnitId } from "./unit-id.js";
@@ -27,6 +27,19 @@ export function extractUatSliceId(unitId) {
         return slice;
     return null;
 }
+export function buildPhaseHandoffOutcome(input) {
+    const phase = unitPhaseLabel(input.unitType);
+    const detail = extractLastAssistantSummary(input.agentEndMessages) ??
+        `Completed ${unitVerb(input.unitType)} ${input.unitId}.`;
+    return {
+        status: "complete",
+        title: `${phase} complete`,
+        detail,
+        unitLabel: `${unitVerb(input.unitType)} ${input.unitId}`,
+        nextAction: "Preparing the next phase. Review this handoff while the next session starts.",
+        commands: ["/gsd status for overview", "/gsd visualize to inspect", "/gsd notifications for history"],
+    };
+}
 // ─── Unit Description Helpers ─────────────────────────────────────────────────
 export function unitVerb(unitType) {
     if (unitType.startsWith("hook/"))
@@ -464,7 +477,6 @@ export function _resetWidgetModeForTests() {
 export function updateProgressWidget(ctx, unitType, unitId, state, accessors, tierBadge) {
     if (!ctx.hasUI)
         return;
-    ctx.ui.setWidget("gsd-outcome", undefined);
     // Welcome header is a startup-only banner — permanently suppress it once
     // auto-mode activates. The dashboard widget owns all status from here.
     // Note: setHeader(undefined) restores the built-in header (logo +
@@ -884,12 +896,14 @@ export function setAutoOutcomeWidget(ctx, snapshot) {
                     : snapshot.status === "blocked" ? "!"
                         : snapshot.status === "paused" ? "||"
                             : "●";
-            const innerWidth = Math.max(8, width - 4);
+            // renderPanel indents body lines by 2; mirror that for wrap width.
+            const innerWidth = Math.max(8, width - 2);
             const maxLines = 7;
             const lines = [];
             const elapsed = snapshot.startedAt ? formatAutoElapsed(snapshot.startedAt) : "";
             const heading = `${theme.fg(color, icon)} ${theme.fg("accent", theme.bold("GSD"))} ${theme.fg("text", snapshot.title)}`;
-            lines.push(rightAlign(heading, elapsed ? theme.fg("dim", elapsed) : "", innerWidth));
+            // Elapsed rides inline after the title on the header rule.
+            const title = elapsed ? `${heading}  ${theme.fg("dim", elapsed)}` : heading;
             const commands = snapshot.commands?.filter(Boolean) ?? [];
             const commandLine = commands.length > 0 ? theme.fg("dim", commands.join("  ·  ")) : null;
             const addWrapped = (text, prefix = "") => {
@@ -912,7 +926,7 @@ export function setAutoOutcomeWidget(ctx, snapshot) {
             if (commandLine && lines.length < maxLines) {
                 lines.push(commandLine);
             }
-            return renderFrame(theme, lines, width, { borderColor: color, paddingX: 1 });
+            return renderPanel(theme, title, lines, width, { ruleColor: color });
         },
         invalidate() { },
         dispose() { },
@@ -927,3 +941,56 @@ function normalizeRollupText(value) {
         return null;
     return clean;
 }
+function isAssistantMessage(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const record = value;
+    if (record.role === "assistant")
+        return true;
+    const message = record.message;
+    if (message && typeof message === "object") {
+        return message.role === "assistant";
+    }
+    return false;
+}
+function extractLastAssistantSummary(messages) {
+    if (!messages || messages.length === 0)
+        return null;
+    for (let i = messages.length - 1; i >= 0; i--) {
+        if (!isAssistantMessage(messages[i]))
+            continue;
+        const text = extractMessageText(messages[i]);
+        const clean = normalizeRollupText(text);
+        if (clean)
+            return truncateToWidth(clean, 220, "…");
+    }
+    return null;
+}
+function extractMessageText(value) {
+    if (typeof value === "string")
+        return value;
+    if (!value || typeof value !== "object")
+        return null;
+    const record = value;
+    if (typeof record.content === "string")
+        return record.content;
+    const message = record.message;
+    if (message && typeof message === "object") {
+        return extractMessageText(message);
+    }
+    const content = record.content;
+    if (Array.isArray(content)) {
+        const parts = content
+            .map((part) => {
+            if (typeof part === "string")
+                return part;
+            if (!part || typeof part !== "object")
+                return "";
+            const partRecord = part;
+            return typeof partRecord.text === "string" ? partRecord.text : "";
+        })
+            .filter(Boolean);
+        return parts.length > 0 ? parts.join(" ") : null;
+    }
+    return null;
+}

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

@@ -224,6 +224,7 @@ export async function dispatchDirectPhase(ctx, pi, phase, base) {
         unitType,
         authMode: ctx.model?.provider ? ctx.modelRegistry.getProviderAuthMode(ctx.model.provider) : undefined,
         baseUrl: ctx.model?.baseUrl,
+        activeTools: typeof pi.getActiveTools === "function" ? pi.getActiveTools() : [],
     });
     if (compatibilityError) {
         ctx.ui.notify(compatibilityError, "error");