gsd-pi 2.71.0-dev.06b86c6 → 2.71.0-dev.246c32d

package/dist/resources/extensions/gsd/bootstrap/register-shortcuts.js

@@ -4,61 +4,73 @@ import { Key } from "@gsd/pi-tui";
 import { GSDDashboardOverlay } from "../dashboard-overlay.js";
 import { GSDNotificationOverlay } from "../notification-overlay.js";
 import { ParallelMonitorOverlay } from "../parallel-monitor-overlay.js";
+import { GSD_SHORTCUTS } from "../shortcut-defs.js";
 import { projectRoot } from "../commands/context.js";
 import { shortcutDesc } from "../../shared/mod.js";
 export function registerShortcuts(pi) {
-    pi.registerShortcut(Key.ctrlAlt("g"), {
-        description: shortcutDesc("Open GSD dashboard", "/gsd status"),
-        handler: async (ctx) => {
-            const basePath = projectRoot();
-            if (!existsSync(join(basePath, ".gsd"))) {
-                ctx.ui.notify("No .gsd/ directory found. Run /gsd to start.", "info");
-                return;
-            }
-            await ctx.ui.custom((tui, theme, _kb, done) => new GSDDashboardOverlay(tui, theme, () => done(true)), {
-                overlay: true,
-                overlayOptions: {
-                    width: "90%",
-                    minWidth: 80,
-                    maxHeight: "92%",
-                    anchor: "center",
-                },
-            });
-        },
+    const overlayOptions = {
+        width: "90%",
+        minWidth: 80,
+        maxHeight: "92%",
+        anchor: "center",
+    };
+    const openDashboardOverlay = async (ctx) => {
+        const basePath = projectRoot();
+        if (!existsSync(join(basePath, ".gsd"))) {
+            ctx.ui.notify("No .gsd/ directory found. Run /gsd to start.", "info");
+            return;
+        }
+        await ctx.ui.custom((tui, theme, _kb, done) => new GSDDashboardOverlay(tui, theme, () => done(true)), {
+            overlay: true,
+            overlayOptions,
+        });
+    };
+    const openNotificationsOverlay = async (ctx) => {
+        await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done(true)), {
+            overlay: true,
+            overlayOptions: {
+                width: "80%",
+                minWidth: 60,
+                maxHeight: "88%",
+                anchor: "center",
+                backdrop: true,
+            },
+        });
+    };
+    const openParallelOverlay = async (ctx) => {
+        const basePath = projectRoot();
+        const parallelDir = join(basePath, ".gsd", "parallel");
+        if (!existsSync(parallelDir)) {
+            ctx.ui.notify("No parallel workers found. Run /gsd parallel start first.", "info");
+            return;
+        }
+        await ctx.ui.custom((tui, theme, _kb, done) => new ParallelMonitorOverlay(tui, theme, () => done(true), basePath), {
+            overlay: true,
+            overlayOptions,
+        });
+    };
+    pi.registerShortcut(Key.ctrlAlt(GSD_SHORTCUTS.dashboard.key), {
+        description: shortcutDesc(GSD_SHORTCUTS.dashboard.action, GSD_SHORTCUTS.dashboard.command),
+        handler: openDashboardOverlay,
     });
-    pi.registerShortcut(Key.ctrlAlt("n"), {
-        description: shortcutDesc("Open notification history", "/gsd notifications"),
-        handler: async (ctx) => {
-            await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done(true)), {
-                overlay: true,
-                overlayOptions: {
-                    width: "80%",
-                    minWidth: 60,
-                    maxHeight: "88%",
-                    anchor: "center",
-                    backdrop: true,
-                },
-            });
-        },
+    // Fallback for terminals where Ctrl+Alt letter chords are not forwarded reliably.
+    pi.registerShortcut(Key.ctrlShift(GSD_SHORTCUTS.dashboard.key), {
+        description: shortcutDesc(`${GSD_SHORTCUTS.dashboard.action} (fallback)`, GSD_SHORTCUTS.dashboard.command),
+        handler: openDashboardOverlay,
     });
-    pi.registerShortcut(Key.ctrlAlt("p"), {
-        description: shortcutDesc("Open parallel worker monitor", "/gsd parallel watch"),
-        handler: async (ctx) => {
-            const basePath = projectRoot();
-            const parallelDir = join(basePath, ".gsd", "parallel");
-            if (!existsSync(parallelDir)) {
-                ctx.ui.notify("No parallel workers found. Run /gsd parallel start first.", "info");
-                return;
-            }
-            await ctx.ui.custom((tui, theme, _kb, done) => new ParallelMonitorOverlay(tui, theme, () => done(true)), {
-                overlay: true,
-                overlayOptions: {
-                    width: "90%",
-                    minWidth: 80,
-                    maxHeight: "92%",
-                    anchor: "center",
-                },
-            });
-        },
+    pi.registerShortcut(Key.ctrlAlt(GSD_SHORTCUTS.notifications.key), {
+        description: shortcutDesc(GSD_SHORTCUTS.notifications.action, GSD_SHORTCUTS.notifications.command),
+        handler: openNotificationsOverlay,
     });
+    // Fallback for terminals where Ctrl+Alt letter chords are not forwarded reliably.
+    pi.registerShortcut(Key.ctrlShift(GSD_SHORTCUTS.notifications.key), {
+        description: shortcutDesc(`${GSD_SHORTCUTS.notifications.action} (fallback)`, GSD_SHORTCUTS.notifications.command),
+        handler: openNotificationsOverlay,
+    });
+    pi.registerShortcut(Key.ctrlAlt(GSD_SHORTCUTS.parallel.key), {
+        description: shortcutDesc(GSD_SHORTCUTS.parallel.action, GSD_SHORTCUTS.parallel.command),
+        handler: openParallelOverlay,
+    });
+    // No Ctrl+Shift+P fallback — conflicts with cycleModelBackward (shift+ctrl+p).
+    // Use Ctrl+Alt+P or /gsd parallel watch instead.
 }

package/dist/resources/extensions/gsd/commands/handlers/auto.js

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { enableDebug } from "../../debug-logger.js";
-import { isAutoActive, isAutoPaused, pauseAuto, startAuto, stopAuto, stopAutoRemote } from "../../auto.js";
+import { isAutoActive, isAutoPaused, pauseAuto, startAutoDetached, stopAuto, stopAutoRemote } from "../../auto.js";
 import { handleRate } from "../../commands-rate.js";
 import { guardRemoteSession, projectRoot } from "../context.js";
 import { findMilestoneIds } from "../../milestone-id-utils.js";
@@ -36,27 +36,6 @@ export function parseMilestoneTarget(input) {
     const rest = input.replace(match[0], "").replace(/\s+/g, " ").trim();
     return { milestoneId: match[1], rest };
 }
-/**
- * Set GSD_MILESTONE_LOCK to target a specific milestone, then run `fn`.
- * Clears the env var when `fn` resolves or rejects, so the lock does not
- * leak into subsequent commands in the same process.
- */
-async function withMilestoneLock(milestoneId, fn) {
-    const previous = process.env.GSD_MILESTONE_LOCK;
-    process.env.GSD_MILESTONE_LOCK = milestoneId;
-    try {
-        await fn();
-    }
-    finally {
-        // Restore previous value (undefined → delete, else restore).
-        if (previous === undefined) {
-            delete process.env.GSD_MILESTONE_LOCK;
-        }
-        else {
-            process.env.GSD_MILESTONE_LOCK = previous;
-        }
-    }
-}
 export async function handleAutoCommand(trimmed, ctx, pi) {
     if (trimmed === "next" || trimmed.startsWith("next ")) {
         if (trimmed.includes("--dry-run")) {
@@ -79,12 +58,10 @@ export async function handleAutoCommand(trimmed, ctx, pi) {
                 return true;
             }
         }
-        if (milestoneId) {
-            await withMilestoneLock(milestoneId, () => startAuto(ctx, pi, projectRoot(), verboseMode, { step: true }));
-        }
-        else {
-            await startAuto(ctx, pi, projectRoot(), verboseMode, { step: true });
-        }
+        startAutoDetached(ctx, pi, projectRoot(), verboseMode, {
+            step: true,
+            milestoneLock: milestoneId,
+        });
         return true;
     }
     if (trimmed === "auto" || trimmed.startsWith("auto ")) {
@@ -122,12 +99,12 @@ export async function handleAutoCommand(trimmed, ctx, pi) {
             await showHeadlessMilestoneCreation(ctx, pi, projectRoot(), seedContent);
         }
         else if (milestoneId) {
-            // Target a specific milestone — use GSD_MILESTONE_LOCK so state
-            // derivation only sees this milestone (#2521).
-            await withMilestoneLock(milestoneId, () => startAuto(ctx, pi, projectRoot(), verboseMode));
+            startAutoDetached(ctx, pi, projectRoot(), verboseMode, {
+                milestoneLock: milestoneId,
+            });
         }
         else {
-            await startAuto(ctx, pi, projectRoot(), verboseMode);
+            startAutoDetached(ctx, pi, projectRoot(), verboseMode);
         }
         return true;
     }
@@ -168,7 +145,7 @@ export async function handleAutoCommand(trimmed, ctx, pi) {
     if (trimmed === "") {
         if (!(await guardRemoteSession(ctx, pi)))
             return true;
-        await startAuto(ctx, pi, projectRoot(), false, { step: true });
+        startAutoDetached(ctx, pi, projectRoot(), false, { step: true });
         return true;
     }
     return false;

package/dist/resources/extensions/gsd/commands/handlers/core.js

@@ -4,10 +4,43 @@ import { ensurePreferencesFile, handlePrefs, handlePrefsMode, handlePrefsWizard
 import { runEnvironmentChecks } from "../../doctor-environment.js";
 import { deriveState } from "../../state.js";
 import { handleCmux } from "../../commands-cmux.js";
+import { setSessionModelOverride } from "../../session-model-override.js";
 import { projectRoot } from "../context.js";
-import { formatShortcut } from "../../files.js";
-export function showHelp(ctx) {
-    const lines = [
+import { formattedShortcutPair } from "../../shortcut-defs.js";
+export function showHelp(ctx, args = "") {
+    const summaryLines = [
+        "GSD — Get Shit Done\n",
+        "QUICK START",
+        "  /gsd start <tpl>   Start a workflow template",
+        "  /gsd               Run next unit (same as /gsd next)",
+        "  /gsd auto          Run all queued units continuously",
+        "  /gsd pause         Pause auto-mode",
+        "  /gsd stop          Stop auto-mode gracefully",
+        "",
+        "VISIBILITY",
+        `  /gsd status         Dashboard  (${formattedShortcutPair("dashboard")})`,
+        `  /gsd parallel watch Parallel monitor  (${formattedShortcutPair("parallel")})`,
+        `  /gsd notifications  Notification history  (${formattedShortcutPair("notifications")})`,
+        "  /gsd visualize      Interactive 10-tab TUI",
+        "  /gsd queue          Show queued/dispatched units",
+        "",
+        "COURSE CORRECTION",
+        "  /gsd steer <desc>   Apply user override to active work",
+        "  /gsd capture <text> Quick-capture a thought to CAPTURES.md",
+        "  /gsd triage         Classify and route pending captures",
+        "  /gsd undo           Revert last completed unit  [--force]",
+        "  /gsd rethink        Conversational project reorganization",
+        "",
+        "SETUP",
+        "  /gsd init           Project init wizard",
+        "  /gsd setup          Global setup status  [llm|search|remote|keys|prefs]",
+        "  /gsd model          Switch active session model",
+        "  /gsd prefs          Manage preferences",
+        "  /gsd doctor         Diagnose and repair .gsd/ state",
+        "",
+        "Use /gsd help full for the complete command reference.",
+    ];
+    const fullLines = [
         "GSD — Get Shit Done\n",
         "WORKFLOW",
         "  /gsd start <tpl>   Start a workflow template (bugfix, spike, feature, hotfix, etc.)",
@@ -21,12 +54,13 @@ export function showHelp(ctx) {
         "  /gsd new-milestone  Create milestone from headless context (used by gsd headless)",
         "",
         "VISIBILITY",
-        `  /gsd status         Show progress dashboard  (${formatShortcut("Ctrl+Alt+G")})`,
+        `  /gsd status         Show progress dashboard  (${formattedShortcutPair("dashboard")})`,
+        `  /gsd parallel watch Open parallel worker monitor  (${formattedShortcutPair("parallel")})`,
         "  /gsd visualize      Interactive 10-tab TUI (progress, timeline, deps, metrics, health, agent, changes, knowledge, captures, export)",
         "  /gsd queue          Show queued/dispatched units and execution order",
         "  /gsd history        View execution history  [--cost] [--phase] [--model] [N]",
         "  /gsd changelog      Show categorized release notes  [version]",
-        `  /gsd notifications  View persistent notification history  [clear|tail|filter]  (${formatShortcut("Ctrl+Alt+N")})`,
+        `  /gsd notifications  View persistent notification history  [clear|tail|filter]  (${formattedShortcutPair("notifications")})`,
         "",
         "COURSE CORRECTION",
         "  /gsd steer <desc>   Apply user override to active work",
@@ -66,7 +100,8 @@ export function showHelp(ctx) {
         "  /gsd inspect        Show SQLite DB diagnostics (schema, row counts, recent entries)",
         "  /gsd update         Update GSD to the latest version via npm",
     ];
-    ctx.ui.notify(lines.join("\n"), "info");
+    const full = ["full", "--full", "all"].includes(args.trim().toLowerCase());
+    ctx.ui.notify((full ? fullLines : summaryLines).join("\n"), "info");
 }
 export async function handleStatus(ctx) {
     const basePath = projectRoot();
@@ -82,9 +117,9 @@ export async function handleStatus(ctx) {
     const result = await ctx.ui.custom((tui, theme, _kb, done) => new GSDDashboardOverlay(tui, theme, () => done(true)), {
         overlay: true,
         overlayOptions: {
-            width: "70%",
-            minWidth: 60,
-            maxHeight: "90%",
+            width: "90%",
+            minWidth: 80,
+            maxHeight: "92%",
             anchor: "center",
         },
     });
@@ -251,11 +286,21 @@ async function handleModel(trimmedArgs, ctx, pi) {
         ctx.ui.notify(`No API key for ${targetModel.provider}/${targetModel.id}`, "warning");
         return;
     }
+    // /gsd model is an explicit per-session pin for GSD dispatches.
+    // This is captured at auto bootstrap so it survives internal session
+    // switches during /gsd auto and /gsd next runs.
+    const sessionId = ctx.sessionManager?.getSessionId?.();
+    if (sessionId) {
+        setSessionModelOverride(sessionId, {
+            provider: targetModel.provider,
+            id: targetModel.id,
+        });
+    }
     ctx.ui.notify(`Model: ${targetModel.provider}/${targetModel.id}`, "info");
 }
 export async function handleCoreCommand(trimmed, ctx, pi) {
-    if (trimmed === "help" || trimmed === "h" || trimmed === "?") {
-        showHelp(ctx);
+    if (trimmed === "help" || trimmed === "h" || trimmed === "?" || trimmed.startsWith("help ")) {
+        showHelp(ctx, trimmed.startsWith("help ") ? trimmed.slice(5).trim() : "");
         return true;
     }
     if (trimmed === "status") {

package/dist/resources/extensions/gsd/commands/handlers/notifications-handler.js

@@ -2,6 +2,7 @@
 // View, filter, and clear the persistent notification history.
 import { readNotifications, clearNotifications, getUnreadCount, suppressPersistence, unsuppressPersistence, } from "../../notification-store.js";
 import { GSDNotificationOverlay } from "../../notification-overlay.js";
+const MAX_INLINE_ENTRIES = 40;
 function severityIcon(severity) {
     switch (severity) {
         case "error": return "✗";
@@ -38,14 +39,18 @@ export async function handleNotificationsCommand(args, ctx, pi) {
     if (args === "tail" || args.startsWith("tail ")) {
         const countStr = args.replace(/^tail\s*/, "").trim();
         const count = countStr ? parseInt(countStr, 10) : 20;
-        const n = isNaN(count) || count < 1 ? 20 : Math.min(count, 100);
-        const entries = readNotifications().slice(0, n);
+        const all = readNotifications();
+        const n = isNaN(count) || count < 1 ? 20 : Math.min(count, MAX_INLINE_ENTRIES);
+        const entries = all.slice(0, n);
         if (entries.length === 0) {
             ctx.ui.notify("No notifications.", "info");
             return true;
         }
         const lines = entries.map((e) => `${severityIcon(e.severity)} [${formatTimestamp(e.ts)}] ${e.message}`);
-        ctx.ui.notify(`Last ${entries.length} notification(s):\n${lines.join("\n")}`, "info");
+        const suffix = all.length > entries.length
+            ? `\n... and ${all.length - entries.length} more (open /gsd notifications to browse all)`
+            : "";
+        ctx.ui.notify(`Last ${entries.length} notification(s):\n${lines.join("\n")}${suffix}`, "info");
         return true;
     }
     // /gsd notifications filter <severity>
@@ -61,7 +66,9 @@ export async function handleNotificationsCommand(args, ctx, pi) {
             return true;
         }
         const lines = entries.slice(0, 20).map((e) => `${severityIcon(e.severity)} [${formatTimestamp(e.ts)}] ${e.message}`);
-        const suffix = entries.length > 20 ? `\n... and ${entries.length - 20} more` : "";
+        const suffix = entries.length > 20
+            ? `\n... and ${entries.length - 20} more (open /gsd notifications to browse all)`
+            : "";
         ctx.ui.notify(`${severity} notifications (${entries.length}):\n${lines.join("\n")}${suffix}`, "info");
         return true;
     }
@@ -70,7 +77,7 @@ export async function handleNotificationsCommand(args, ctx, pi) {
         // Try overlay first (TUI mode)
         if (ctx.hasUI) {
             try {
-                await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done()), {
+                const result = await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done(true)), {
                     overlay: true,
                     overlayOptions: {
                         width: "80%",
@@ -80,7 +87,9 @@ export async function handleNotificationsCommand(args, ctx, pi) {
                         backdrop: true,
                     },
                 });
-                return true;
+                if (result !== undefined) {
+                    return true;
+                }
             }
             catch {
                 // Fall through to text output if overlay fails

package/dist/resources/extensions/gsd/commands/handlers/workflow.js

@@ -12,7 +12,7 @@ import { nextMilestoneId } from "../../milestone-ids.js";
 import { findMilestoneIds } from "../../guided-flow.js";
 import { projectRoot } from "../context.js";
 import { createRun, listRuns } from "../../run-manager.js";
-import { setActiveEngineId, setActiveRunDir, startAuto, pauseAuto, isAutoActive, getActiveEngineId, } from "../../auto.js";
+import { setActiveEngineId, setActiveRunDir, startAutoDetached, pauseAuto, isAutoActive, getActiveEngineId, } from "../../auto.js";
 import { validateDefinition } from "../../definition-loader.js";
 // ─── Custom Workflow Subcommands ─────────────────────────────────────────
 const WORKFLOW_USAGE = [
@@ -58,7 +58,7 @@ async function handleCustomWorkflow(sub, ctx, pi) {
             setActiveEngineId("custom");
             setActiveRunDir(runDir);
             ctx.ui.notify(`Created workflow run: ${defName}\nRun dir: ${runDir}`, "info");
-            await startAuto(ctx, pi, base, false);
+            startAutoDetached(ctx, pi, base, false);
         }
         catch (err) {
             // Clean up engine state so a failed workflow run doesn't pollute the next /gsd auto
@@ -137,14 +137,8 @@ async function handleCustomWorkflow(sub, ctx, pi) {
             ctx.ui.notify("No custom workflow to resume. Use /gsd auto for dev workflow.", "warning");
             return true;
         }
-        try {
-            await startAuto(ctx, pi, projectRoot(), false);
-            ctx.ui.notify("Custom workflow resumed.", "info");
-        }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            ctx.ui.notify(`Failed to resume workflow: ${msg}`, "error");
-        }
+        startAutoDetached(ctx, pi, projectRoot(), false);
+        ctx.ui.notify("Custom workflow resumed.", "info");
         return true;
     }
     // Unknown subcommand — show usage

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

@@ -3,7 +3,8 @@
  *
  * Full-screen overlay showing auto-mode progress: milestone/slice/task
  * breakdown, current unit, completed units, timing, and activity log.
- * Toggled with Ctrl+Alt+G (⌃⌥G on macOS) or opened from /gsd status.
+ * Toggled with Ctrl+Alt+G (⌃⌥G on macOS), Ctrl+Shift+G fallback,
+ * or opened from /gsd status.
  */
 import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { deriveState } from "./state.js";
@@ -19,6 +20,7 @@ import { formatDuration, padRight, joinColumns, centerLine, fitColumns, STATUS_G
 import { estimateTimeRemaining } from "./auto-dashboard.js";
 import { computeProgressScore } from "./progress-score.js";
 import { runEnvironmentChecks } from "./doctor-environment.js";
+import { formattedShortcutPair } from "./shortcut-defs.js";
 function unitLabel(type) {
     switch (type) {
         case "discuss-milestone":
@@ -174,7 +176,10 @@ export class GSDDashboardOverlay {
         }
     }
     handleInput(data) {
-        if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c")) || matchesKey(data, Key.ctrlAlt("g"))) {
+        if (matchesKey(data, Key.escape) ||
+            matchesKey(data, Key.ctrl("c")) ||
+            matchesKey(data, Key.ctrlAlt("g")) ||
+            matchesKey(data, Key.ctrlShift("g"))) {
             this.dispose();
             this.onClose();
             return;
@@ -507,7 +512,7 @@ export class GSDDashboardOverlay {
         }
         lines.push(blank());
         lines.push(hr());
-        lines.push(centered(th.fg("dim", "↑↓ scroll · g/G top/end · esc close")));
+        lines.push(centered(th.fg("dim", `↑↓ scroll · g/G top/end · Esc/${formattedShortcutPair("dashboard")} close`)));
         return lines;
     }
     renderProgressRow(label, done, total, color, width) {

package/dist/resources/extensions/gsd/doctor-providers.js

@@ -147,10 +147,33 @@ const PROVIDER_ROUTES = {
     openai: ["github-copilot", "openai-codex"],
     google: ["google-gemini-cli"],
 };
+/**
+ * Providers that use external CLI authentication (not API keys).
+ * These are always considered "ok" — the host CLI handles auth.
+ */
+const CLI_AUTH_PROVIDERS = new Set([
+    "claude-code",
+    "openai-codex",
+    "google-gemini-cli",
+    "google-antigravity",
+]);
 function checkLlmProviders() {
     const required = collectConfiguredModelProviders();
     const results = [];
     for (const providerId of required) {
+        // CLI-authenticated providers don't need API keys — skip key check
+        if (CLI_AUTH_PROVIDERS.has(providerId)) {
+            const info = PROVIDER_REGISTRY.find(p => p.id === providerId);
+            results.push({
+                name: providerId,
+                label: info?.label ?? providerId,
+                category: "llm",
+                status: "ok",
+                message: `${info?.label ?? providerId} — CLI auth (no key needed)`,
+                required: true,
+            });
+            continue;
+        }
         const info = PROVIDER_REGISTRY.find(p => p.id === providerId);
         const label = providerId === "anthropic-vertex"
             ? "Anthropic Vertex"

package/dist/resources/extensions/gsd/error-classifier.js

@@ -20,6 +20,9 @@ export function resetRetryState(state) {
 // ── Classification ──────────────────────────────────────────────────────────
 const PERMANENT_RE = /auth|unauthorized|forbidden|invalid.*key|invalid.*api|billing|quota exceeded|account/i;
 const RATE_LIMIT_RE = /rate.?limit|too many requests|429/i;
+// OpenRouter affordability-style quota errors should be treated as transient
+// so core retry logic can lower maxTokens and continue in-session.
+const AFFORDABILITY_RE = /requires more credits|can only afford|insufficient credits|not enough credits|fewer max_tokens/i;
 const NETWORK_RE = /network|ECONNRESET|ETIMEDOUT|ECONNREFUSED|socket hang up|fetch failed|connection.*reset|dns/i;
 const SERVER_RE = /internal server error|500|502|503|overloaded|server_error|api_error|service.?unavailable/i;
 // ECONNRESET/ECONNREFUSED are in NETWORK_RE (same-model retry first).
@@ -42,7 +45,7 @@ const RESET_DELAY_RE = /reset in (\d+)s/i;
  */
 export function classifyError(errorMsg, retryAfterMs) {
     const isPermanent = PERMANENT_RE.test(errorMsg);
-    const isRateLimit = RATE_LIMIT_RE.test(errorMsg);
+    const isRateLimit = RATE_LIMIT_RE.test(errorMsg) || AFFORDABILITY_RE.test(errorMsg);
     // 1. Permanent — but rate limit takes precedence
     if (isPermanent && !isRateLimit) {
         return { kind: "permanent" };

package/dist/resources/extensions/gsd/forensics.js

@@ -508,19 +508,30 @@ function getDbCompletionCounts() {
  * Exported for testability.
  */
 export function detectStuckLoops(units, anomalies) {
-    // First, collect unique startedAt values per type/id key
+    // First, collect unique startedAt values per type/id key, bucketed by
+    // autoSessionKey when available so cross-session recovery does not look
+    // like a within-session stuck loop.
     const dispatchMap = new Map();
     for (const u of units) {
         const key = `${u.type}/${u.id}`;
-        let starts = dispatchMap.get(key);
+        let sessionBuckets = dispatchMap.get(key);
+        if (!sessionBuckets) {
+            sessionBuckets = new Map();
+            dispatchMap.set(key, sessionBuckets);
+        }
+        const sessionKey = u.autoSessionKey ?? "__legacy__";
+        let starts = sessionBuckets.get(sessionKey);
         if (!starts) {
             starts = new Set();
-            dispatchMap.set(key, starts);
+            sessionBuckets.set(sessionKey, starts);
         }
         starts.add(u.startedAt);
     }
-    for (const [key, starts] of dispatchMap) {
-        const count = starts.size;
+    for (const [key, sessionBuckets] of dispatchMap) {
+        const hasSessionAwareData = Array.from(sessionBuckets.keys()).some((sessionKey) => sessionKey !== "__legacy__");
+        const count = hasSessionAwareData
+            ? Math.max(...Array.from(sessionBuckets.values(), (starts) => starts.size))
+            : (sessionBuckets.get("__legacy__")?.size ?? 0);
         if (count > 1) {
             const [unitType, ...idParts] = key.split("/");
             anomalies.push({
@@ -529,7 +540,9 @@ export function detectStuckLoops(units, anomalies) {
                 unitType,
                 unitId: idParts.join("/"),
                 summary: `Unit ${key} was dispatched ${count} times`,
-                details: `Repeated dispatch suggests the unit completed but its artifacts weren't verified, or the state machine kept returning it.`,
+                details: hasSessionAwareData
+                    ? `Repeated dispatch within the same auto session suggests the unit completed but its artifacts were not verified, or the state machine kept returning it. Cross-session recovery runs are ignored.`
+                    : `Repeated dispatch suggests the unit completed but its artifacts weren't verified, or the state machine kept returning it.`,
             });
         }
     }