gsd-pi 2.81.0 → 2.82.0-dev.ed17d078d

package/dist/resources/extensions/gsd/auto/run-unit.js

@@ -6,6 +6,31 @@ import { debugLog } from "../debug-logger.js";
 import { logWarning } from "../workflow-logger.js";
 import { resolveAutoSupervisorConfig } from "../preferences.js";
 import { formatAutoUnitWorkingMessage } from "../working-output-messages.js";
+import { readUnitRuntimeRecord } from "../unit-runtime.js";
+const UNIT_FAILSAFE_BUFFER_MS = 30_000;
+const UNIT_FAILSAFE_RECHECK_MS = 30_000;
+export function shouldDeferUnitFailsafeTimeout(runtime, opts) {
+    if (!runtime)
+        return false;
+    if (opts.currentUnitStartedAt === undefined)
+        return false;
+    if (runtime.startedAt !== opts.currentUnitStartedAt)
+        return false;
+    if (runtime.lastProgressAt <= 0)
+        return false;
+    const progressAgeMs = opts.nowMs - runtime.lastProgressAt;
+    if (progressAgeMs < 0)
+        return false;
+    if (progressAgeMs > opts.freshProgressMs)
+        return false;
+    if (runtime.phase === "recovered")
+        return true;
+    if (runtime.lastProgressKind.includes("recovery"))
+        return true;
+    if (runtime.recoveryAttempts && runtime.recoveryAttempts > 0)
+        return true;
+    return progressAgeMs >= 0 && progressAgeMs <= opts.freshProgressMs;
+}
 // Tracks the latest session-switch attempt so a late timeout settlement from an
 // older runUnit() call cannot clear the guard for a newer one.
 let sessionSwitchGeneration = 0;
@@ -145,16 +170,54 @@ export async function runUnit(ctx, pi, s, unitType, unitId, prompt) {
     // If supervision fails to resolve unitPromise within 30s, treat as cancelled.
     // Without this, a crashed agent that never emits agent_end hangs the loop (#3161).
     const supervisor = resolveAutoSupervisorConfig();
-    const UNIT_HARD_TIMEOUT_MS = Math.max(30_000, ((supervisor.hard_timeout_minutes ?? 30) * 60 * 1000) + 30_000);
+    const UNIT_HARD_TIMEOUT_MS = Math.max(UNIT_FAILSAFE_BUFFER_MS, ((supervisor.hard_timeout_minutes ?? 30) * 60 * 1000) + UNIT_FAILSAFE_BUFFER_MS);
+    const freshProgressMs = Math.max(UNIT_FAILSAFE_BUFFER_MS, ((supervisor.idle_timeout_minutes ?? 10) * 60 * 1000) + UNIT_FAILSAFE_BUFFER_MS);
     let unitTimeoutHandle;
     let result;
     try {
         pi.sendMessage({ customType: "gsd-auto", content: prompt, display: s.verbose }, { triggerTurn: true });
         debugLog("runUnit", { phase: "awaiting-agent-end", unitType, unitId });
         const timeoutResult = new Promise((resolve) => {
-            unitTimeoutHandle = setTimeout(() => {
+            const settleOrDefer = () => {
+                let runtime;
+                try {
+                    runtime = readUnitRuntimeRecord(s.basePath, unitType, unitId);
+                }
+                catch (error) {
+                    debugLog("runUnit", {
+                        phase: "unit-failsafe-runtime-read-failed",
+                        unitType,
+                        unitId,
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                    resolve({
+                        status: "cancelled",
+                        errorContext: {
+                            message: "Unit hard timeout — supervision may have failed; runtime progress could not be read",
+                            category: "timeout",
+                            isTransient: true,
+                        },
+                    });
+                    return;
+                }
+                if (shouldDeferUnitFailsafeTimeout(runtime, {
+                    nowMs: Date.now(),
+                    currentUnitStartedAt: s.currentUnit?.startedAt,
+                    freshProgressMs,
+                })) {
+                    debugLog("runUnit", {
+                        phase: "unit-failsafe-deferred",
+                        unitType,
+                        unitId,
+                        runtimePhase: runtime?.phase,
+                        lastProgressKind: runtime?.lastProgressKind,
+                    });
+                    unitTimeoutHandle = setTimeout(settleOrDefer, UNIT_FAILSAFE_RECHECK_MS);
+                    return;
+                }
                 resolve({ status: "cancelled", errorContext: { message: "Unit hard timeout — supervision may have failed", category: "timeout", isTransient: true } });
-            }, UNIT_HARD_TIMEOUT_MS);
+            };
+            unitTimeoutHandle = setTimeout(settleOrDefer, UNIT_HARD_TIMEOUT_MS);
         });
         result = await runWithTurnGeneration(capturedTurnGen, () => Promise.race([unitPromise, timeoutResult]));
     }

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

@@ -25,6 +25,7 @@ export class AutoSession {
     // ── Lifecycle ────────────────────────────────────────────────────────────
     active = false;
     paused = false;
+    completionStopInProgress = false;
     stepMode = false;
     verbose = false;
     activeEngineId = null;
@@ -88,6 +89,7 @@ export class AutoSession {
     pendingCrashRecovery = null;
     pendingVerificationRetry = null;
     verificationRetryCount = new Map();
+    verificationRetryFailureHashes = new Map();
     pausedSessionFile = null;
     pausedUnitType = null;
     pausedUnitId = null;
@@ -207,6 +209,7 @@ export class AutoSession {
         // Lifecycle
         this.active = false;
         this.paused = false;
+        this.completionStopInProgress = false;
         this.stepMode = false;
         this.verbose = false;
         this.activeEngineId = null;
@@ -250,6 +253,7 @@ export class AutoSession {
         this.pendingCrashRecovery = null;
         this.pendingVerificationRetry = null;
         this.verificationRetryCount.clear();
+        this.verificationRetryFailureHashes.clear();
         this.pausedSessionFile = null;
         this.pausedUnitType = null;
         this.pausedUnitId = null;
@@ -282,6 +286,11 @@ export class AutoSession {
         this.orchestration = null;
         // Loop promise state lives in auto-loop.ts module scope
     }
+    resetAfterStop(options = {}) {
+        const completionStopInProgress = options.preserveCompletionSurface ? this.completionStopInProgress : false;
+        this.reset();
+        this.completionStopInProgress = completionStopInProgress;
+    }
     toJSON() {
         const orchestrationStatus = this.orchestration?.getStatus();
         return {

package/dist/resources/extensions/gsd/auto/verification-retry-policy.js

@@ -0,0 +1,43 @@
+// Project/App: GSD-2
+// File Purpose: Central retry policy for auto-mode verification redispatches.
+import { createHash } from "node:crypto";
+export const VERIFICATION_RETRY_BASE_DELAY_MS = 2_000;
+export const VERIFICATION_RETRY_MAX_DELAY_MS = 30_000;
+export const VERIFICATION_RETRY_JITTER_RATIO = 0.1;
+export function verificationRetryKey(unitType, unitId) {
+    return `${unitType}:${unitId}`;
+}
+export function hashVerificationFailureContext(failureContext) {
+    const normalized = failureContext.replace(/\r\n/g, "\n").trim();
+    return createHash("sha256").update(normalized).digest("hex");
+}
+export function verificationRetryDelayMs(attempt, random = Math.random) {
+    const safeAttempt = Math.max(1, Math.floor(attempt));
+    const baseDelayMs = Math.min(VERIFICATION_RETRY_MAX_DELAY_MS, VERIFICATION_RETRY_BASE_DELAY_MS * 2 ** (safeAttempt - 1));
+    const jitterSpanMs = Math.round(baseDelayMs * VERIFICATION_RETRY_JITTER_RATIO);
+    const jitterMs = Math.round((random() - 0.5) * 2 * jitterSpanMs);
+    const delayMs = Math.min(VERIFICATION_RETRY_MAX_DELAY_MS, Math.max(0, baseDelayMs + jitterMs));
+    return { delayMs, baseDelayMs };
+}
+export function decideVerificationRetry(input) {
+    const { retryInfo, unitType } = input;
+    if (!retryInfo || !unitType) {
+        return { action: "pause", reason: "missing-retry-context" };
+    }
+    const key = verificationRetryKey(unitType, retryInfo.unitId);
+    const failureHash = hashVerificationFailureContext(retryInfo.failureContext);
+    if (input.previousFailureHash === failureHash) {
+        return {
+            action: "pause",
+            reason: "duplicate-failure-context",
+            key,
+            failureHash,
+        };
+    }
+    return {
+        action: "delay",
+        key,
+        failureHash,
+        ...verificationRetryDelayMs(retryInfo.attempt, input.random),
+    };
+}

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

@@ -1,7 +1,6 @@
 // GSD-2 + src/resources/extensions/gsd/auto-dashboard.ts - Auto-mode progress widget rendering and dashboard helpers.
-import { getCurrentBranch } from "./worktree.js";
 import { getActiveHook } from "./post-unit-hooks.js";
-import { getLedger, getProjectTotals } from "./metrics.js";
+import { getLedger } from "./metrics.js";
 import { getErrorMessage } from "./error-utils.js";
 import { nativeIsRepo } from "./native-git-bridge.js";
 import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "./gsd-db.js";
@@ -10,15 +9,12 @@ 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 { computeProgressScore } from "./progress-score.js";
-import { getActiveWorktreeName } from "./worktree-command.js";
 import { getGlobalGSDPreferencesPath, getProjectGSDPreferencesPath, parsePreferencesMarkdown, } from "./preferences.js";
-import { resolveServiceTierIcon, getEffectiveServiceTier } from "./service-tier.js";
 import { parseUnitId } from "./unit-id.js";
-import { formatRtkSavingsLabel, getRtkSessionSavings, } from "../shared/rtk-session-stats.js";
 import { logWarning } from "./workflow-logger.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
-import { homedir } from "node:os";
 import { readUnitRuntimeRecord } from "./unit-runtime.js";
 // ─── UAT Slice Extraction ─────────────────────────────────────────────────────
 /**
@@ -468,6 +464,7 @@ 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 +
@@ -497,53 +494,11 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
     if (mid) {
         updateSliceProgressCache(accessors.getBasePath(), mid.id, slice?.id);
     }
-    // Cache git branch at widget creation time (not per render)
-    let cachedBranch = null;
-    try {
-        cachedBranch = getCurrentBranch(accessors.getBasePath());
-    }
-    catch (err) { /* not in git repo */
-        logWarning("dashboard", `git branch detection failed: ${err instanceof Error ? err.message : String(err)}`);
-    }
-    // Cache short pwd (last 2 path segments only) + worktree/branch info
-    let widgetPwd;
-    {
-        let fullPwd = process.cwd();
-        const widgetHome = homedir();
-        if (widgetHome && (fullPwd === widgetHome || fullPwd.startsWith(widgetHome + "/") || fullPwd.startsWith(widgetHome + "\\"))) {
-            fullPwd = `~${fullPwd.slice(widgetHome.length)}`;
-        }
-        const parts = fullPwd.split("/");
-        widgetPwd = parts.length > 2 ? parts.slice(-2).join("/") : fullPwd;
-    }
-    const worktreeName = getActiveWorktreeName();
-    if (worktreeName && cachedBranch) {
-        widgetPwd = `${widgetPwd} (\u2387 ${cachedBranch})`;
-    }
-    else if (cachedBranch) {
-        widgetPwd = `${widgetPwd} (${cachedBranch})`;
-    }
-    // Pre-fetch last commit for display
-    refreshLastCommit(accessors.getBasePath());
-    // Cache the effective service tier at widget creation time (reads preferences)
-    const effectiveServiceTier = getEffectiveServiceTier();
     ctx.ui.setWidget("gsd-progress", (tui, theme) => {
         let pulseBright = true;
         let cachedLines;
         let cachedWidth;
-        let cachedRtkLabel;
         let cachedRuntimeRecord = null;
-        const refreshRtkLabel = () => {
-            try {
-                const sessionId = ctx.sessionManager.getSessionId();
-                const savings = sessionId ? getRtkSessionSavings(accessors.getBasePath(), sessionId) : null;
-                cachedRtkLabel = formatRtkSavingsLabel(savings);
-            }
-            catch (err) {
-                logWarning("dashboard", `RTK savings lookup failed: ${err instanceof Error ? err.message : String(err)}`);
-                cachedRtkLabel = null;
-            }
-        };
         const refreshRuntimeRecord = () => {
             try {
                 cachedRuntimeRecord = readUnitRuntimeRecord(accessors.getBasePath(), unitType, unitId);
@@ -552,7 +507,6 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 cachedRuntimeRecord = null;
             }
         };
-        refreshRtkLabel();
         refreshRuntimeRecord();
         const pulseTimer = setInterval(() => {
             pulseBright = !pulseBright;
@@ -568,7 +522,6 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 if (mid) {
                     updateSliceProgressCache(accessors.getBasePath(), mid.id, slice?.id);
                 }
-                refreshRtkLabel();
                 refreshRuntimeRecord();
                 cachedLines = undefined;
             }
@@ -635,44 +588,6 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                         lines.push(`${pad}  ${signalStr}`);
                     }
                 }
-                // ── Gather stats (needed by multiple modes) ─────────────────────
-                const cmdCtx = accessors.getCmdCtx();
-                let totalInput = 0;
-                let totalCacheRead = 0;
-                if (cmdCtx) {
-                    for (const entry of cmdCtx.sessionManager.getEntries()) {
-                        if (entry.type === "message") {
-                            const msgEntry = entry;
-                            if (msgEntry.message?.role === "assistant") {
-                                const u = msgEntry.message.usage;
-                                if (u) {
-                                    totalInput += u.input || 0;
-                                    totalCacheRead += u.cacheRead || 0;
-                                }
-                            }
-                        }
-                    }
-                }
-                const mLedger = getLedger();
-                const autoTotals = mLedger ? getProjectTotals(mLedger.units) : null;
-                const cumulativeCost = autoTotals?.cost ?? 0;
-                const cxUsage = cmdCtx?.getContextUsage?.();
-                const cxWindow = cxUsage?.contextWindow ?? cmdCtx?.model?.contextWindow ?? 0;
-                const cxPctVal = cxUsage?.percent ?? 0;
-                const cxPct = cxUsage?.percent !== null ? cxPctVal.toFixed(1) : "?";
-                // Model display — prefer dispatched model ID (set after selectAndApplyModel
-                // + hook overrides) over cmdCtx?.model which can be stale (#2899).
-                const dispatchedModelId = accessors.getCurrentDispatchedModelId();
-                const modelId = dispatchedModelId
-                    ? dispatchedModelId.split("/").slice(1).join("/") || dispatchedModelId
-                    : (cmdCtx?.model?.id ?? "");
-                const modelProvider = dispatchedModelId
-                    ? dispatchedModelId.split("/")[0] || ""
-                    : (cmdCtx?.model?.provider ?? "");
-                const tierIcon = resolveServiceTierIcon(effectiveServiceTier, modelId);
-                const modelDisplay = (modelProvider && modelId
-                    ? `${modelProvider}/${modelId}`
-                    : modelId) + (tierIcon ? ` ${tierIcon}` : "");
                 // ── Mode: off — return empty ──────────────────────────────────
                 if (widgetMode === "off") {
                     cachedLines = [];
@@ -686,7 +601,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                     cachedWidth = width;
                     return lines;
                 }
-                // ── Mode: small — header + progress bar + compact stats ───────
+                // ── Mode: small — header + active work progress ───────────────
                 if (widgetMode === "small") {
                     lines.push("");
                     // Action line
@@ -698,10 +613,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                     if (shouldRenderRoadmapProgress(roadmapSlices)) {
                         const { done, total, activeSliceTasks } = roadmapSlices;
                         const barWidth = Math.max(6, Math.min(18, Math.floor(width * 0.25)));
-                        const pct = total > 0 ? done / total : 0;
-                        const filled = Math.round(pct * barWidth);
-                        const bar = theme.fg("success", "━".repeat(filled))
-                            + theme.fg("dim", "─".repeat(barWidth - filled));
+                        const bar = renderProgressBar(theme, done, total, barWidth);
                         let meta = `${theme.fg("text", `${done}`)}${theme.fg("dim", `/${total} slices`)}`;
                         if (activeSliceTasks && activeSliceTasks.total > 0) {
                             const tn = Math.min(activeSliceTasks.done + 1, activeSliceTasks.total);
@@ -709,20 +621,6 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                         }
                         lines.push(`${pad}${bar} ${meta}`);
                     }
-                    // Compact stats: cost + context only
-                    const smallStats = [];
-                    if (cumulativeCost)
-                        smallStats.push(theme.fg("warning", `$${cumulativeCost.toFixed(2)}`));
-                    const cxDisplay = `${cxPct}%ctx`;
-                    if (cxPctVal > 90)
-                        smallStats.push(theme.fg("error", cxDisplay));
-                    else if (cxPctVal > 70)
-                        smallStats.push(theme.fg("warning", cxDisplay));
-                    else
-                        smallStats.push(theme.fg("dim", cxDisplay));
-                    if (smallStats.length > 0) {
-                        lines.push(rightAlign("", smallStats.join(theme.fg("dim", "  ")), width));
-                    }
                     lines.push(...ui.bar());
                     cachedLines = lines;
                     cachedWidth = width;
@@ -730,11 +628,10 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 }
                 // ── Mode: full — complete two-column layout ───────────────────
                 lines.push("");
-                // Context section: milestone + slice + model
+                // Context section: milestone + slice. Footer owns model/cost/context.
                 const hasContext = !!(mid || (slice && unitType !== "research-milestone" && unitType !== "plan-milestone"));
                 if (mid) {
-                    const modelTag = modelDisplay ? theme.fg("muted", `  ${modelDisplay}`) : "";
-                    lines.push(truncateToWidth(`${pad}${theme.fg("dim", mid.title)}${modelTag}`, width, "…"));
+                    lines.push(truncateToWidth(`${pad}${theme.fg("dim", mid.title)}`, width, "…"));
                 }
                 if (slice && unitType !== "research-milestone" && unitType !== "plan-milestone") {
                     lines.push(truncateToWidth(`${pad}${theme.fg("text", theme.bold(`${slice.id}: ${slice.title}`))}`, width, "…"));
@@ -759,10 +656,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 if (shouldRenderRoadmapProgress(roadmapSlices)) {
                     const { done, total, activeSliceTasks } = roadmapSlices;
                     const barWidth = Math.max(6, Math.min(18, Math.floor(leftColWidth * 0.4)));
-                    const pct = total > 0 ? done / total : 0;
-                    const filled = Math.round(pct * barWidth);
-                    const bar = theme.fg("success", "━".repeat(filled))
-                        + theme.fg("dim", "─".repeat(barWidth - filled));
+                    const bar = renderProgressBar(theme, done, total, barWidth);
                     let meta = `${theme.fg("text", `${done}`)}${theme.fg("dim", `/${total} slices`)}`;
                     if (activeSliceTasks && activeSliceTasks.total > 0) {
                         const taskNum = isHook
@@ -818,7 +712,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                     if (maxRows > 0) {
                         lines.push("");
                         for (let i = 0; i < maxRows; i++) {
-                            const left = padToWidth(truncateToWidth(leftLines[i] ?? "", leftColWidth, "…"), leftColWidth);
+                            const left = padRightVisible(truncateToWidth(leftLines[i] ?? "", leftColWidth, "…"), leftColWidth);
                             const right = rightLines[i] ?? "";
                             lines.push(`${left}${right}`);
                         }
@@ -831,46 +725,8 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                             lines.push(truncateToWidth(l, width, "…"));
                     }
                 }
-                // ── Footer: simplified stats + pwd + last commit + hints ────────
+                // ── Auto controls. Footer owns cwd/branch/model/cost/context. ───
                 lines.push("");
-                {
-                    const sp = [];
-                    if (totalCacheRead + totalInput > 0) {
-                        const hitRate = Math.round((totalCacheRead / (totalCacheRead + totalInput)) * 100);
-                        const hitColor = hitRate >= 70 ? "success" : hitRate >= 40 ? "warning" : "error";
-                        sp.push(theme.fg(hitColor, `${hitRate}%hit`));
-                    }
-                    if (cumulativeCost)
-                        sp.push(theme.fg("warning", `$${cumulativeCost.toFixed(2)}`));
-                    const CX_BAR_WIDTH = 8;
-                    const cxBarFilled = Math.min(CX_BAR_WIDTH, Math.max(0, Math.round((cxPctVal / 100) * CX_BAR_WIDTH)));
-                    const cxBarColor = cxPctVal > 90 ? "error" : cxPctVal > 70 ? "warning" : "success";
-                    const cxBar = theme.fg(cxBarColor, "━".repeat(cxBarFilled)) +
-                        theme.fg("dim", "─".repeat(CX_BAR_WIDTH - cxBarFilled));
-                    const cxPctText = `${cxPct}%/${formatWidgetTokens(cxWindow)}`;
-                    const cxColorized = cxPctVal > 90
-                        ? theme.fg("error", cxPctText)
-                        : cxPctVal > 70
-                            ? theme.fg("warning", cxPctText)
-                            : cxPctText;
-                    sp.push(`${cxBar} ${cxColorized}`);
-                    const statsLine = sp.map(p => p.includes("\x1b[") ? p : theme.fg("dim", p))
-                        .join(theme.fg("dim", "  "));
-                    if (statsLine) {
-                        lines.push(rightAlign("", statsLine, width));
-                    }
-                    if (cachedRtkLabel) {
-                        lines.push(rightAlign("", theme.fg("dim", cachedRtkLabel), width));
-                    }
-                }
-                // Last commit info
-                const lastCommit = getLastCommit(accessors.getBasePath());
-                const maxCommitLen = 65;
-                const commitMsg = lastCommit
-                    ? lastCommit.message.length > maxCommitLen
-                        ? lastCommit.message.slice(0, maxCommitLen - 1) + "…"
-                        : lastCommit.message
-                    : "";
                 // Step-mode guidance — shown above keyboard hints when auto is paused
                 if (accessors.isStepMode()) {
                     lines.push(`${pad}${theme.fg("accent", "→")} ${theme.fg("dim", "Ctrl+N to advance to next step  ·  /gsd status for overview")}`);
@@ -881,16 +737,7 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
                 hintParts.push(`${formattedShortcutPair("dashboard")} dashboard`);
                 hintParts.push(`${formattedShortcutPair("parallel")} parallel`);
                 const hintStr = theme.fg("dim", hintParts.join(" | "));
-                const commitStr = lastCommit
-                    ? theme.fg("dim", `${lastCommit.timeAgo} ago: ${commitMsg}`)
-                    : "";
-                const locationStr = theme.fg("dim", widgetPwd);
-                if (commitStr) {
-                    lines.push(rightAlign(`${pad}${locationStr} · ${commitStr}`, hintStr, width));
-                }
-                else {
-                    lines.push(rightAlign(`${pad}${locationStr}`, hintStr, width));
-                }
+                lines.push(rightAlign("", hintStr, width));
                 lines.push(...ui.bar());
                 cachedLines = lines;
                 cachedWidth = width;
@@ -908,18 +755,175 @@ export function updateProgressWidget(ctx, unitType, unitId, state, accessors, ti
         };
     });
 }
-// ─── Right-align Helper ───────────────────────────────────────────────────────
-/** Right-align helper: build a line with left content and right content. */
-function rightAlign(left, right, width) {
-    const leftVis = visibleWidth(left);
-    const rightVis = visibleWidth(right);
-    const gap = Math.max(1, width - leftVis - rightVis);
-    return truncateToWidth(left + " ".repeat(gap) + right, width, "…");
-}
-/** Pad a string with trailing spaces to fill exactly `colWidth` (ANSI-aware). */
-function padToWidth(s, colWidth) {
-    const vis = visibleWidth(s);
-    if (vis >= colWidth)
-        return truncateToWidth(s, colWidth, "…");
-    return s + " ".repeat(colWidth - vis);
+export function setCompletionProgressWidget(ctx, snapshot) {
+    if (!ctx.hasUI)
+        return;
+    ctx.ui.setWidget("gsd-outcome", undefined);
+    if (typeof ctx.ui?.setHeader === "function") {
+        ctx.ui.setHeader(() => ({
+            render() { return []; },
+            invalidate() { },
+        }));
+    }
+    if (typeof ctx.ui?.setStatus === "function") {
+        ctx.ui.setStatus("gsd-step", undefined);
+    }
+    ctx.ui.setWidget("gsd-progress", (_tui, theme) => ({
+        render(width) {
+            const ui = makeUI(theme, width);
+            const pad = INDENT.base;
+            const lines = [];
+            const contentWidth = Math.max(20, width - visibleWidth(pad));
+            const add = (line = "") => {
+                lines.push(line ? truncateToWidth(`${pad}${line}`, width, "…") : "");
+            };
+            const addSection = (label, value, indent = "") => {
+                const clean = normalizeRollupText(value);
+                if (!clean)
+                    return;
+                add(`${indent}${theme.fg("accent", label)} ${theme.fg("text", truncateToWidth(clean, contentWidth - indent.length - label.length - 1, "…"))}`);
+            };
+            const addList = (label, values, limit, indent = "") => {
+                const clean = (values ?? []).map(normalizeRollupText).filter((v) => !!v);
+                if (clean.length === 0)
+                    return;
+                const shown = clean.slice(0, limit);
+                const more = clean.length > shown.length ? ` (+${clean.length - shown.length} more)` : "";
+                add(`${indent}${theme.fg("accent", label)} ${theme.fg("text", truncateToWidth(shown.join("; ") + more, contentWidth - indent.length - label.length - 1, "…"))}`);
+            };
+            lines.push(...ui.bar());
+            const elapsed = formatAutoElapsed(snapshot.startedAt);
+            const heading = snapshot.allMilestonesComplete
+                ? "All milestones complete"
+                : snapshot.milestoneId
+                    ? `Milestone ${snapshot.milestoneId} roll-up`
+                    : "Milestone roll-up";
+            lines.push(rightAlign(`${pad}${theme.fg("accent", theme.bold(heading))}`, elapsed ? theme.fg("dim", elapsed) : "", width));
+            if (snapshot.milestoneTitle) {
+                add(theme.fg("text", snapshot.milestoneTitle));
+            }
+            lines.push("");
+            add(theme.fg("accent", "Outcome"));
+            addSection("", snapshot.oneLiner, "  ");
+            const changed = [
+                ...(snapshot.successCriteriaResults ? [snapshot.successCriteriaResults] : []),
+                ...(snapshot.requirementOutcomes ? [snapshot.requirementOutcomes] : []),
+                ...(snapshot.keyDecisions ?? []),
+            ].map(normalizeRollupText).filter((v) => !!v).slice(0, 4);
+            if (changed.length > 0) {
+                lines.push("");
+                add(theme.fg("accent", "What changed"));
+                for (const item of changed)
+                    add(`  - ${theme.fg("text", item)}`);
+            }
+            const verification = [
+                snapshot.definitionOfDoneResults,
+                snapshot.deviations ? `Deviations: ${snapshot.deviations}` : null,
+                snapshot.followUps ? `Follow-ups: ${snapshot.followUps}` : null,
+            ].map(normalizeRollupText).filter((v) => !!v);
+            if (verification.length > 0 || (snapshot.keyFiles?.length ?? 0) > 0) {
+                lines.push("");
+                add(theme.fg("accent", "Verification"));
+                for (const item of verification.slice(0, 3))
+                    add(`  - ${theme.fg("text", item)}`);
+                addList("Files:", snapshot.keyFiles, 4, "  ");
+            }
+            if ((snapshot.lessonsLearned?.length ?? 0) > 0) {
+                lines.push("");
+                addList("Lessons:", snapshot.lessonsLearned, 2);
+            }
+            const hasSliceTotals = typeof snapshot.completedSlices === "number" && typeof snapshot.totalSlices === "number" && snapshot.totalSlices > 0;
+            lines.push("");
+            const stats = [];
+            if (hasSliceTotals)
+                stats.push(theme.fg("success", `${snapshot.completedSlices}/${snapshot.totalSlices} slices`));
+            if (snapshot.unitCount > 0)
+                stats.push(theme.fg("dim", `${snapshot.unitCount} units`));
+            if (snapshot.totalTokens > 0)
+                stats.push(theme.fg("dim", `${formatWidgetTokens(snapshot.totalTokens)} tokens`));
+            if (snapshot.totalCost > 0)
+                stats.push(theme.fg("warning", `$${snapshot.totalCost.toFixed(2)}`));
+            if (typeof snapshot.cacheHitRate === "number") {
+                const hitColor = snapshot.cacheHitRate >= 70 ? "success" : snapshot.cacheHitRate >= 40 ? "warning" : "error";
+                stats.push(theme.fg(hitColor, `${Math.round(snapshot.cacheHitRate)}% cache hit`));
+            }
+            if (stats.length > 0) {
+                add(`${theme.fg("accent", "Run totals")} ${stats.join(theme.fg("dim", " · "))}`);
+            }
+            lines.push("");
+            const nextAction = snapshot.allMilestonesComplete
+                ? "Review the roll-up, then start a new milestone when ready."
+                : "Review the roll-up, inspect status, or continue to the next milestone.";
+            const commands = snapshot.allMilestonesComplete
+                ? ["/gsd status for overview", "/gsd visualize to inspect", "/gsd notifications for history", "/gsd start for new work"]
+                : ["/gsd status for overview", "/gsd visualize to inspect", "/gsd notifications for history", "/gsd auto for next milestone"];
+            add(`${theme.fg("success", "Next")} ${theme.fg("text", nextAction)}`);
+            add(theme.fg("dim", commands.join("  ·  ")));
+            const location = snapshot.basePath ? theme.fg("dim", snapshot.basePath) : "";
+            const reason = theme.fg("dim", snapshot.reason);
+            lines.push(rightAlign(`${pad}${truncateToWidth(location, Math.max(0, width - 32), "…")}`, reason, width));
+            lines.push(...ui.bar());
+            return lines;
+        },
+        invalidate() { },
+        dispose() { },
+    }));
+}
+export function setAutoOutcomeWidget(ctx, snapshot) {
+    if (!ctx.hasUI)
+        return;
+    ctx.ui.setWidget("gsd-outcome", (_tui, theme) => ({
+        render(width) {
+            const color = snapshot.status === "failed" || snapshot.status === "blocked"
+                ? "warning"
+                : snapshot.status === "complete"
+                    ? "success"
+                    : "borderAccent";
+            const icon = snapshot.status === "complete" ? "✓"
+                : snapshot.status === "failed" ? "x"
+                    : snapshot.status === "blocked" ? "!"
+                        : snapshot.status === "paused" ? "||"
+                            : "●";
+            const innerWidth = Math.max(8, width - 4);
+            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));
+            const commands = snapshot.commands?.filter(Boolean) ?? [];
+            const commandLine = commands.length > 0 ? theme.fg("dim", commands.join("  ·  ")) : null;
+            const addWrapped = (text, prefix = "") => {
+                const reserve = commandLine ? 1 : 0;
+                const remaining = Math.max(0, maxLines - reserve - lines.length);
+                if (remaining === 0)
+                    return;
+                const available = Math.max(8, innerWidth - visibleWidth(prefix));
+                for (const [idx, line] of wrapVisibleText(text, available).slice(0, remaining).entries()) {
+                    lines.push(`${idx === 0 ? prefix : " ".repeat(visibleWidth(prefix))}${line}`);
+                }
+            };
+            if (snapshot.detail) {
+                addWrapped(snapshot.detail, `${theme.fg("dim", "Reason")} `);
+            }
+            if (snapshot.unitLabel) {
+                addWrapped(snapshot.unitLabel, `${theme.fg("dim", "Last")}   `);
+            }
+            addWrapped(snapshot.nextAction, `${theme.fg("success", "Next")}   `);
+            if (commandLine && lines.length < maxLines) {
+                lines.push(commandLine);
+            }
+            return renderFrame(theme, lines, width, { borderColor: color, paddingX: 1 });
+        },
+        invalidate() { },
+        dispose() { },
+    }));
+}
+function normalizeRollupText(value) {
+    const clean = value
+        ?.replace(/\s+/g, " ")
+        .replace(/^[-*]\s+/, "")
+        .trim();
+    if (!clean || clean === "(none)" || clean === "None." || clean === "Not provided.")
+        return null;
+    return clean;
 }