@wrongstack/cli 0.77.0 → 0.84.1

package/dist/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
-import { color, writeErr, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, renderTaskGraph, DefaultSecretScrubber, atomicWrite, DefaultPathResolver, TOKENS, mergeCustomModelDefs, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, SpecVersioning, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, resolveContextWindowPolicy, resolveAuditLevel, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, DEFAULT_SUBAGENT_BASELINE, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, decryptConfigSecrets as decryptConfigSecrets$1, encryptConfigSecrets as encryptConfigSecrets$1, bootConfig as bootConfig$1, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionRewinder, DefaultSessionStore, DefaultPluginAPI, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, onResize, ERROR_CODES, InputBuilder, FsError } from '@wrongstack/core';
+import { color, writeErr, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, renderTaskGraph, DefaultSecretScrubber, DefaultPathResolver, TOKENS, mergeCustomModelDefs, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, SpecVersioning, atomicWrite, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, resolveContextWindowPolicy, resolveAuditLevel, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, DEFAULT_SUBAGENT_BASELINE, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, decryptConfigSecrets as decryptConfigSecrets$1, encryptConfigSecrets as encryptConfigSecrets$1, bootConfig as bootConfig$1, setOutputLineGuard, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionRewinder, DefaultSessionStore, DefaultPluginAPI, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, onResize, ERROR_CODES, InputBuilder, FsError } from '@wrongstack/core';
 import * as path8 from 'path';
 import { join } from 'path';
 import * as fsp4 from 'fs/promises';
+import { DefaultSecretVault, decryptConfigSecrets, encryptConfigSecrets, isSecretField } from '@wrongstack/core/security';
 import { createRequire } from 'module';
 import * as os2 from 'os';
 import os2__default from 'os';
 import * as crypto2 from 'crypto';
 import { randomUUID } from 'crypto';
 import { findFreePort, createHttpServer, openBrowser, registerInstance, unregisterInstance } from '@wrongstack/webui/server';
-import { DefaultSecretVault, decryptConfigSecrets, encryptConfigSecrets, isSecretField } from '@wrongstack/core/security';
 import { WebSocketServer, WebSocket } from 'ws';
 import { MCPRegistry, MCPServer, serveHttp, serveStdio } from '@wrongstack/mcp';
 import { capabilitiesFor, buildProviderFactoriesFromRegistry, makeProviderFromConfig } from '@wrongstack/providers';
@@ -132,6 +132,12 @@ var init_state = __esm({
     sddState = new SDDState();
   }
 });
+function expectDefined3(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function formatElapsed(ms) {
   if (ms < 1e3) return `${ms}ms`;
   const s = Math.floor(ms / 1e3);
@@ -195,7 +201,7 @@ function getCurrentTask() {
   if (!tracker) return null;
   const nodes = tracker.getAllNodes({ status: ["in_progress"] });
   if (nodes.length === 0) return null;
-  const n = nodes[0];
+  const n = expectDefined3(nodes[0]);
   return { id: n.id, title: n.title, description: n.description, priority: n.priority, estimateHours: n.estimateHours ?? 0, tags: n.tags ?? [], startedAt: n.startedAt };
 }
 function advanceToNextTask() {
@@ -234,7 +240,7 @@ function renderTaskListWithProgress() {
     return (order[a.status] ?? 6) - (order[b.status] ?? 6);
   });
   for (let i = 0; i < sorted.length; i++) {
-    const n = sorted[i];
+    const n = expectDefined3(sorted[i]);
     const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
     const title = n.title.length > 50 ? n.title.slice(0, 49) + "\u2026" : n.title;
     let elapsed = "";
@@ -248,7 +254,7 @@ function getCurrentExecutingContext() {
   if (!tracker) return null;
   const nodes = tracker.getAllNodes({ status: ["in_progress"] });
   if (nodes.length === 0) return null;
-  const n = nodes[0];
+  const n = expectDefined3(nodes[0]);
   const elapsed = n.startedAt ? ` \xB7 elapsed: ${formatElapsed(Date.now() - n.startedAt)}` : "";
   const progress = tracker.getProgress();
   return [
@@ -556,6 +562,12 @@ __export(sdd_exports, {
   trySaveSpecFromAIOutput: () => trySaveSpecFromAIOutput,
   trySaveTasksFromAIOutput: () => trySaveTasksFromAIOutput
 });
+function expectDefined4(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function getTaskTracker() {
   return getTaskTrackerExport();
 }
@@ -563,6 +575,7 @@ function buildSddCommand(opts) {
   const sessionState = getSessionState(opts.context);
   return {
     name: "sdd",
+    category: "Agent",
     description: "AI-driven SDD: /sdd [new|approve|execute|cancel|status|list|show|templates]",
     async run(args) {
       if (!opts.paths) return { message: "SDD not available \u2014 paths not configured." };
@@ -620,7 +633,7 @@ function buildSddCommand(opts) {
           }));
           sddState.setSessionStartTime(Date.now());
           sddState.setPhaseStartTime(Date.now());
-          const builder = sddState.getBuilder();
+          const builder = expectDefined4(sddState.getBuilder());
           builder.startSession(title);
           const aiPrompt = builder.getAIPrompt();
           return {
@@ -862,7 +875,7 @@ Start executing the tasks one by one.`
             return (order[a.status] ?? 6) - (order[b.status] ?? 6);
           });
           for (let i = 0; i < sorted.length; i++) {
-            const n = sorted[i];
+            const n = expectDefined4(sorted[i]);
             const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
             const num = `${i + 1}`.padStart(3);
             const prio = n.priority.slice(0, 4).padEnd(5);
@@ -870,7 +883,7 @@ Start executing the tasks one by one.`
             const elapsed = n.status === "in_progress" && n.startedAt ? ` (${formatElapsed(Date.now() - n.startedAt)})` : "";
             lines.push(`  ${num}  ${status}     ${prio}   ${title}${elapsed}`);
             if (n.description && n.status !== "completed") {
-              const first = n.description.split("\n")[0];
+              const first = expectDefined4(n.description.split("\n")[0]);
               const truncated = first.length > 42 ? first.slice(0, 41) + "\u2026" : first;
               lines.push(`        \u21B3 ${truncated}`);
             }
@@ -1037,7 +1050,7 @@ Start executing the tasks one by one.`
           if (completed.length === 0) {
             return { message: "No completed tasks to undo." };
           }
-          const last = completed[completed.length - 1];
+          const last = expectDefined4(completed[completed.length - 1]);
           undoTracker.updateNodeStatus(last.id, "pending");
           const progress = undoTracker.getProgress();
           return {
@@ -1087,7 +1100,7 @@ Start executing the tasks one by one.`
             `  \u{1F504} ${next.title}`
           ];
           if (next.description) {
-            const first = next.description.split("\n")[0];
+            const first = expectDefined4(next.description.split("\n")[0]);
             lines.push(`     \u21B3 ${first}`);
           }
           const taskElapsed = next.startedAt ? ` \u23F1 ${formatElapsed(Date.now() - next.startedAt)}` : "";
@@ -1199,7 +1212,7 @@ Start executing the tasks one by one.`
               return (order[a.status] ?? 6) - (order[b.status] ?? 6);
             });
             for (let i = 0; i < sorted2.length; i++) {
-              const n = sorted2[i];
+              const n = expectDefined4(sorted2[i]);
               const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
               lines2.push(`${i + 1}. ${status} [${n.priority}] ${n.title}`);
             }
@@ -1224,7 +1237,7 @@ Start executing the tasks one by one.`
             return (order[a.status] ?? 6) - (order[b.status] ?? 6);
           });
           for (let i = 0; i < sorted.length; i++) {
-            const n = sorted[i];
+            const n = expectDefined4(sorted[i]);
             const status = n.status === "completed" ? "\u2705" : n.status === "in_progress" ? "\u{1F504}" : n.status === "failed" ? "\u274C" : n.status === "blocked" ? "\u{1F6AB}" : n.status === "review" ? "\u{1F441}" : "\u23F3";
             lines.push(`${i + 1}. ${status} [${n.priority}] ${n.title}`);
           }
@@ -1272,7 +1285,7 @@ Start executing the tasks one by one.`
             maxQuestions: 10,
             sessionPath
           }));
-          const resumeBuilder = sddState.getBuilder();
+          const resumeBuilder = expectDefined4(sddState.getBuilder());
           const loaded = await resumeBuilder.loadSession();
           if (!loaded) {
             sddState.setBuilder(null);
@@ -1506,6 +1519,12 @@ var init_sdd = __esm({
     init_rendering();
   }
 });
+function expectDefined7(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function normalizeKeys(cfg) {
   if (Array.isArray(cfg.apiKeys) && cfg.apiKeys.length > 0) {
     return cfg.apiKeys.map((k) => ({ ...k }));
@@ -1523,7 +1542,7 @@ function writeKeysBack(cfg, keys) {
     return;
   }
   cfg.apiKeys = keys;
-  const active = keys.find((k) => k.label === cfg.activeKey) ?? keys[0];
+  const active = keys.find((k) => k.label === cfg.activeKey) ?? expectDefined7(keys[0]);
   cfg.apiKey = active.apiKey;
   if (!cfg.activeKey || !keys.some((k) => k.label === cfg.activeKey)) {
     cfg.activeKey = active.label;
@@ -1543,6 +1562,61 @@ function maskedKey(key) {
 function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
+async function loadConfigProviders(configPath2, vault, opts) {
+  const warn = opts?.warn;
+  let raw;
+  try {
+    raw = await fsp4.readFile(configPath2, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      warn?.(`Could not read ${configPath2}: ${err.message}. Treating as empty.`);
+    }
+    return {};
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    warn?.(`Config at ${configPath2} is not valid JSON: ${err.message}`);
+    return {};
+  }
+  const decrypted = decryptConfigSecrets(parsed, vault);
+  return decrypted.providers ?? {};
+}
+async function mutateConfigProviders(configPath2, vault, mutator) {
+  let raw;
+  let fileExists = true;
+  try {
+    raw = await fsp4.readFile(configPath2, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      throw new Error(
+        `Refusing to mutate ${configPath2}: ${err.message}`,
+        { cause: err }
+      );
+    }
+    fileExists = false;
+    raw = "{}";
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    if (fileExists) {
+      throw new Error(
+        `Refusing to overwrite corrupt config at ${configPath2} (${err.message}). Fix or move the file aside before retrying.`,
+        { cause: err }
+      );
+    }
+    parsed = {};
+  }
+  const decrypted = decryptConfigSecrets(parsed, vault);
+  const providers = decrypted.providers ?? {};
+  mutator(providers);
+  decrypted.providers = providers;
+  const encrypted = encryptConfigSecrets(decrypted, vault);
+  await atomicWrite(configPath2, JSON.stringify(encrypted, null, 2), { mode: 384 });
+}
 var init_provider_config_utils = __esm({
   "src/provider-config-utils.ts"() {
   }
@@ -2263,7 +2337,7 @@ async function runWebUI(opts) {
       const keys = normalizeKeys(existing);
       const existingIdx = keys.findIndex((k) => k.label === label);
       if (existingIdx >= 0) {
-        keys[existingIdx] = { ...keys[existingIdx], apiKey, createdAt: nowIso() };
+        keys[existingIdx] = { ...expectDefined7(keys[existingIdx]), apiKey, createdAt: nowIso() };
       } else {
         keys.push({ label, apiKey, createdAt: nowIso() });
       }
@@ -2290,7 +2364,7 @@ async function runWebUI(opts) {
       } else {
         writeKeysBack(existing, keys);
         if (existing.activeKey === label) {
-          existing.activeKey = keys[0].label;
+          existing.activeKey = keys[0]?.label;
         }
         providers[providerId] = existing;
       }
@@ -2354,58 +2428,20 @@ async function runWebUI(opts) {
       sendResult(ws, false, err instanceof Error ? err.message : String(err));
     }
   }
+  function getVault() {
+    const keyFile = path8.join(path8.dirname(opts.globalConfigPath ?? ""), ".key");
+    return new DefaultSecretVault({ keyFile });
+  }
   async function loadSavedProviders() {
     if (!opts.globalConfigPath) return {};
-    let raw;
-    try {
-      raw = await fsp4.readFile(opts.globalConfigPath, "utf8");
-    } catch {
-      return {};
-    }
-    let parsed = {};
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      return {};
-    }
-    if (!parsed.providers) return {};
-    const keyFile = path8.join(path8.dirname(opts.globalConfigPath), ".key");
-    const vault = new DefaultSecretVault({ keyFile });
-    return decryptConfigSecrets(parsed.providers, vault);
+    return loadConfigProviders(opts.globalConfigPath, getVault());
   }
   async function saveProviders(providers) {
     if (!opts.globalConfigPath) return;
-    let raw;
-    let fileExists = true;
-    try {
-      raw = await fsp4.readFile(opts.globalConfigPath, "utf8");
-    } catch (err) {
-      if (err.code !== "ENOENT") {
-        throw new Error(
-          `Refusing to mutate ${opts.globalConfigPath}: ${err.message}`,
-          { cause: err }
-        );
-      }
-      fileExists = false;
-      raw = "{}";
-    }
-    let parsed;
-    try {
-      parsed = JSON.parse(raw);
-    } catch (err) {
-      if (fileExists) {
-        throw new Error(
-          `Refusing to overwrite corrupt config at ${opts.globalConfigPath} (${err.message}). Fix or move the file aside before retrying.`,
-          { cause: err }
-        );
-      }
-      parsed = {};
-    }
-    parsed.providers = providers;
-    const keyFile = path8.join(path8.dirname(opts.globalConfigPath), ".key");
-    const vault = new DefaultSecretVault({ keyFile });
-    const encrypted = encryptConfigSecrets(parsed, vault);
-    await atomicWrite(opts.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
+    await mutateConfigProviders(opts.globalConfigPath, getVault(), (existing) => {
+      for (const key of Object.keys(existing)) delete existing[key];
+      Object.assign(existing, providers);
+    });
   }
   function sendResult(ws, success, message) {
     send(ws, { type: "key.operation_result", payload: { success, message } });
@@ -2437,6 +2473,12 @@ try {
 }
 
 // src/slash-commands/commit-llm.ts
+function expectDefined(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 async function generateCommitMessageWithLLM(diff, opts) {
   const systemPrompt = "You are a helpful assistant that generates concise, conventional-commit-formatted git commit messages. Analyze the provided diff and output ONLY the commit message (no explanation, no quotes). Format: <type>(<scope>): <short description> \u2014 <type> is one of: feat, fix, docs, style, refactor, test, chore, perf, ci, build, temp. If the diff contains multiple unrelated changes, pick the most important one. Keep the description under 72 characters. Example: feat(cli): add /commit LLM integration";
   const userPrompt = `Here is the git diff:
@@ -2458,7 +2500,7 @@ ${diff}`;
     clearTimeout(timeout);
     const rawContent = resp.content;
     const text = Array.isArray(rawContent) ? rawContent[0]?.text ?? "" : typeof rawContent === "object" && rawContent !== null ? rawContent.text ?? "" : String(rawContent);
-    const message = text.trim().split("\n")[0];
+    const message = expectDefined(text.trim().split("\n")[0]);
     if (message.length > 0 && message.length < 200) {
       return message;
     }
@@ -2564,8 +2606,6 @@ var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
   "no-tui",
   "no-recovery",
   "recover",
-  "no-alt-screen",
-  "alt-screen",
   "output-json",
   "prompt",
   "metrics",
@@ -2665,7 +2705,7 @@ function parseSpawnFlags(input) {
         else {
           m = consume(/^--tools=(\S+)\s*/);
           if (m)
-            opts.tools = m[1].split(",").map((t) => t.trim()).filter(Boolean);
+            opts.tools = m[1]?.split(",").map((t) => t.trim()).filter(Boolean);
           else {
             m = consume(/^-p\s+(\S+)\s*/);
             if (m) opts.provider = m[1];
@@ -2888,6 +2928,7 @@ function estimateTokens(messages) {
 function buildAutonomyCommand(opts) {
   return {
     name: "autonomy",
+    category: "Agent",
     description: "Toggle or query autonomy mode (self-driving agent).",
     help: [
       "Usage:",
@@ -3146,6 +3187,7 @@ async function gatherProjectContext(projectRoot) {
 function buildAutoPhaseCommand(opts) {
   return {
     name: "autophase",
+    category: "Agent",
     description: "Autonomous phase-based workflow \u2014 plans a project into phases of todos and builds it with the LLM.",
     help: [
       "Usage:",
@@ -3253,6 +3295,7 @@ function buildAutoPhaseCommand(opts) {
 function buildBtwCommand(opts) {
   return {
     name: "btw",
+    category: "Agent",
     description: 'Drop a "by the way" note for the running agent without interrupting it \u2014 delivered at the next step',
     argsHint: "<note>",
     help: [
@@ -3287,6 +3330,7 @@ function buildBtwCommand(opts) {
 function buildClearCommand(opts) {
   return {
     name: "clear",
+    category: "Session",
     description: "Reset the session and start a new one.",
     help: [
       "Usage:",
@@ -3323,6 +3367,7 @@ function buildClearCommand(opts) {
 function buildCodebaseReindexCommand(opts) {
   return {
     name: "codebase-reindex",
+    category: "Inspect",
     aliases: ["reindex"],
     description: "Rebuild the codebase symbol index used by codebase-search.",
     argsHint: "[force]",
@@ -3354,6 +3399,7 @@ ${color.yellow(`  ${r.errors.length} file(s) had errors`)}` : "");
 function buildCollabCommand(opts) {
   return {
     name: "collab",
+    category: "Agent",
     description: "Live collaboration helpers (status / invite / history).",
     async run(args, ctx) {
       const parts = args.split(/\s+/).filter(Boolean);
@@ -3545,6 +3591,7 @@ function helpCommand() {
 function buildCompactCommand(opts) {
   return {
     name: "compact",
+    category: "Session",
     description: "Compact the context window.",
     help: [
       "Usage:",
@@ -3572,6 +3619,7 @@ function buildCompactCommand(opts) {
 function buildContextCommand(opts) {
   return {
     name: "context",
+    category: "Inspect",
     aliases: ["ctx"],
     description: "Show context window summary.",
     help: [
@@ -3818,6 +3866,7 @@ function pct(n) {
 function buildDiagCommand(opts) {
   return {
     name: "diag",
+    category: "Inspect",
     description: "Show runtime diagnostics (provider, tokens, tools, MCP).",
     async run() {
       if (!opts.onDiag) return { message: "Diag not available in this context." };
@@ -3828,6 +3877,7 @@ function buildDiagCommand(opts) {
 function buildStatsCommand(opts) {
   return {
     name: "stats",
+    category: "Inspect",
     description: "Show session report: tokens, requests, tools, files, cost.",
     async run() {
       if (!opts.onStats) return { message: "Stats not available in this context." };
@@ -3865,6 +3915,33 @@ async function persistAutonomySetting(deps, mutator) {
   await atomicWrite(deps.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
   deps.configStore.update({ autonomy: decrypted.autonomy });
 }
+async function persistConfigSetting(deps, mutator) {
+  let raw;
+  let fileExists = true;
+  try {
+    raw = await fsp4.readFile(deps.globalConfigPath, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      throw new Error(`Could not read ${deps.globalConfigPath}: ${err.message}`);
+    }
+    fileExists = false;
+    raw = "{}";
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    if (fileExists) {
+      throw new Error(`Config at ${deps.globalConfigPath} is not valid JSON: ${err.message}`);
+    }
+    parsed = {};
+  }
+  const decrypted = decryptConfigSecrets$1(parsed, deps.vault);
+  mutator(decrypted);
+  const encrypted = encryptConfigSecrets$1(decrypted, deps.vault);
+  await atomicWrite(deps.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
+  deps.configStore.update(decrypted);
+}
 async function persistTelegramConfig(deps, mutator) {
   let raw;
   let fileExists = true;
@@ -3907,6 +3984,7 @@ function buildEnhanceCommand(opts) {
   const controller = opts.enhanceController;
   return {
     name: "enhance",
+    category: "Config",
     description: 'Toggle prompt refinement ("did you mean this?") before sending.',
     help: [
       "Usage:",
@@ -4635,6 +4713,7 @@ function categoryLabel(cli) {
 function buildFixCommand(opts) {
   return {
     name: "fix",
+    category: "Agent",
     description: "Classify a bug/error (any language), activate the right skill, and fix it \u2014 inline or via subagent.",
     argsHint: "<error message or problem description>",
     help: `
@@ -4800,6 +4879,7 @@ var PHASE_ORDER = [
 function buildFleetCommand(opts) {
   return {
     name: "fleet",
+    category: "Agent",
     description: "Inspect and control the agent fleet (subagents, parallel slots).",
     help: [
       "Usage:",
@@ -5104,6 +5184,7 @@ var KNOWN_VERBS = /* @__PURE__ */ new Set([
 function buildGoalCommand(opts) {
   return {
     name: "goal",
+    category: "Agent",
     description: "Set, inspect, or clear the long-running autonomous mission used by /autonomy eternal.",
     help: [
       "Usage:",
@@ -5257,6 +5338,7 @@ ${lines.join("\n")}`;
 function buildHelpCommand(opts) {
   return {
     name: "help",
+    category: "App",
     description: "Show available slash commands. Pass a name for detailed help.",
     help: [
       "Usage:",
@@ -5317,6 +5399,7 @@ function buildHelpCommand(opts) {
 function buildInitCommand(opts) {
   return {
     name: "init",
+    category: "Config",
     description: "Create or update .wrongstack/AGENTS.md project context for the system prompt.",
     async run(_args, ctx) {
       const dir = path8.join(ctx.projectRoot, ".wrongstack");
@@ -5341,11 +5424,17 @@ No project type auto-detected. Edit the file with project context and instructio
     }
   };
 }
+function expectDefined2(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function parseMcpArgs(args) {
   const trimmed = args.trim();
   if (!trimmed || trimmed === "list") return { action: "list", name: "" };
   const parts = trimmed.split(/\s+/);
-  const action = parts[0];
+  const action = expectDefined2(parts[0]);
   const name = parts[1] ?? "";
   const enable = parts.includes("--enable") || parts.includes("-e");
   switch (action) {
@@ -5483,7 +5572,7 @@ async function runEnable(name, configured, configPath2, mcpRegistry) {
   const mcpServers = {
     ...full.mcpServers ?? {}
   };
-  mcpServers[name] = { ...mcpServers[name], enabled: true };
+  mcpServers[name] = { ...cfg, ...mcpServers[name] ?? {}, enabled: true };
   full.mcpServers = mcpServers;
   await writeConfig(configPath2, full);
   try {
@@ -5502,7 +5591,7 @@ async function runDisable(name, configured, configPath2, mcpRegistry) {
   const mcpServers = {
     ...full.mcpServers ?? {}
   };
-  mcpServers[name] = { ...mcpServers[name], enabled: false };
+  mcpServers[name] = { ...cfg, ...mcpServers[name] ?? {}, enabled: false };
   full.mcpServers = mcpServers;
   await writeConfig(configPath2, full);
   return `${color.yellow("Disabled")} "${name}" and stopped.`;
@@ -5556,6 +5645,7 @@ async function writeConfig(path26, cfg) {
 function buildMcpSlashCommand(opts) {
   return {
     name: "mcp",
+    category: "Config",
     description: "Manage MCP servers: /mcp [list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
     aliases: ["mcp-servers"],
     argsHint: "[list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
@@ -5590,6 +5680,7 @@ function buildMcpSlashCommand(opts) {
 function buildMemoryCommand(opts) {
   return {
     name: "memory",
+    category: "Inspect",
     description: "Inspect or edit persistent memory: /memory [show|remember <text>|forget <query>|clear]",
     async run(args) {
       const store = opts.memoryStore;
@@ -5643,8 +5734,7 @@ ${color.bold(color.amber("WrongStack") + color.dim(" \u2014 Mode Selection"))}
 `);
     lines.push(color.dim("  \u2191\u2193 navigate   Enter select   q quit\n"));
     lines.push("");
-    for (let i = 0; i < modes.length; i++) {
-      const m = modes[i];
+    for (const [i, m] of modes.entries()) {
       const mark = m.id === active?.id ? color.green(" [active]") : "";
       const prefix = i === currentCursor ? color.bold("\u276F ") : "  ";
       const name = i === currentCursor ? color.bold(m.name) : m.name;
@@ -5676,6 +5766,7 @@ ${color.bold(color.amber("WrongStack") + color.dim(" \u2014 Mode Selection"))}
 function buildModeCommand(opts) {
   return {
     name: "mode",
+    category: "Config",
     description: "Switch or view the current mode",
     help: [
       "Usage:",
@@ -5794,7 +5885,7 @@ function parseFlags(tokens) {
   let maxOutput;
   let i = 0;
   while (i < tokens.length) {
-    const t = tokens[i];
+    const t = tokens[i] ?? "";
     if (t.startsWith("--")) {
       const key = t.slice(2);
       switch (key) {
@@ -5864,6 +5955,7 @@ function buildModelsCommand(opts) {
   ].join("\n");
   return {
     name: "models",
+    category: "Config",
     description: "Manage custom model definitions.",
     help,
     async run(args) {
@@ -5890,7 +5982,10 @@ function buildModelsCommand(opts) {
         return {
           message: [
             `${color.bold("Custom Models")} ${color.dim(`(${ids.length})`)}`,
-            ...ids.sort().map((id) => fmtModel(id, models[id]))
+            ...ids.sort().map((id) => {
+              const def = models[id];
+              return def ? fmtModel(id, def) : void 0;
+            }).filter((line) => line !== void 0)
           ].join("\n")
         };
       }
@@ -5955,6 +6050,7 @@ function buildModelsCommand(opts) {
 function buildNextCommand(opts) {
   return {
     name: "next",
+    category: "Config",
     description: "Toggle next-task prediction \u2014 show likely next steps after each turn.",
     argsHint: "[on|off|toggle]",
     help: [
@@ -6006,6 +6102,7 @@ function buildNextCommand(opts) {
 function buildPluginCommand(opts) {
   return {
     name: "plugin",
+    category: "Config",
     aliases: ["plugins"],
     description: "Manage plugins: /plugin [list|status|official|install <alias>|enable <name>|disable <name>|remove <name>]",
     argsHint: "[list|status|official|install <alias>|enable <name>|disable <name>|remove <name>]",
@@ -6033,12 +6130,86 @@ function buildPluginCommand(opts) {
     }
   };
 }
+function buildPruneCommand(opts) {
+  return {
+    name: "prune",
+    category: "Session",
+    description: "Delete old sessions. /prune (default 30d), /prune 7, /prune --rebuild-index.",
+    help: "Usage:\n  /prune               Delete sessions older than 30 days.\n  /prune 14            Delete sessions older than 14 days.\n  /prune --dry-run     Show what would be deleted without deleting.\n  /prune --rebuild-index  Rebuild the session index from disk.",
+    async run(args) {
+      const parts = args.split(/\s+/).filter(Boolean);
+      const rebuildIndex = parts.includes("--rebuild-index") || parts.includes("--rebuild");
+      const dryRun = parts.includes("--dry-run");
+      if (rebuildIndex) {
+        if (!opts.sessionStore?.rebuildIndex) {
+          return {
+            message: color.yellow(
+              "Session store does not support index rebuild."
+            )
+          };
+        }
+        const count = await opts.sessionStore.rebuildIndex();
+        return {
+          message: count === 0 ? color.dim("No sessions found to index.") : `Session index rebuilt: ${color.green(String(count))} session${count === 1 ? "" : "s"} indexed.`
+        };
+      }
+      let maxAgeDays = 30;
+      const numPart = parts.find((p) => /^\d+$/.test(p));
+      if (numPart) {
+        maxAgeDays = Math.max(1, Math.min(365, Number.parseInt(numPart, 10)));
+      }
+      if (dryRun) {
+        if (!opts.sessionStore) {
+          return { message: color.yellow("No session store configured.") };
+        }
+        const cutoff = Date.now() - maxAgeDays * 864e5;
+        const list = await opts.sessionStore.list(1e3);
+        const stale = list.filter((s) => new Date(s.startedAt).getTime() < cutoff);
+        if (stale.length === 0) {
+          return {
+            message: color.dim(
+              `No sessions older than ${maxAgeDays} day${maxAgeDays === 1 ? "" : "s"}.`
+            )
+          };
+        }
+        const lines = stale.map(
+          (s) => `  ${color.dim(s.id)}  ${color.dim(s.startedAt.slice(0, 10))}  ${s.title}`
+        );
+        return {
+          message: [
+            color.bold(
+              `Would delete ${stale.length} session${stale.length === 1 ? "" : "s"} (dry run, maxAge=${maxAgeDays}d):`
+            ),
+            ...lines,
+            "",
+            color.dim("Run /prune without --dry-run to actually delete.")
+          ].join("\n")
+        };
+      }
+      if (!opts.sessionStore) {
+        return { message: color.yellow("No session store configured.") };
+      }
+      const deleted = await opts.sessionStore.prune(maxAgeDays);
+      if (deleted === 0) {
+        return {
+          message: color.dim(
+            `No sessions older than ${maxAgeDays} day${maxAgeDays === 1 ? "" : "s"}.`
+          )
+        };
+      }
+      return {
+        message: `Pruned ${color.green(String(deleted))} session${deleted === 1 ? "" : "s"} older than ${color.cyan(String(maxAgeDays))} day${maxAgeDays === 1 ? "" : "s"}.`
+      };
+    }
+  };
+}
 
 // src/slash-commands/index.ts
 init_sdd();
 function buildSaveCommand(opts) {
   return {
     name: "save",
+    category: "Session",
     description: "Save current session (auto by default; this forces flush).",
     async run(_args, ctx) {
       await ctx.session.append({
@@ -6053,6 +6224,7 @@ function buildSaveCommand(opts) {
 function buildLoadCommand(opts) {
   return {
     name: "resume",
+    category: "Session",
     aliases: ["load", "sessions"],
     description: "List recent sessions, show incomplete ones (--incomplete), or plan a recovery (--recover <id>).",
     async run(args) {
@@ -6136,15 +6308,30 @@ function buildLoadCommand(opts) {
       if (!opts.sessionStore) return { message: "No session store configured." };
       const list = await opts.sessionStore.list(10);
       if (list.length === 0) return { message: "No saved sessions." };
-      const lines = list.map(
-        (s) => `  ${s.id}  ${color.dim(s.startedAt)}  ${color.dim(`${s.tokenTotal} tok`)}  ${s.title}`
-      );
-      const msg = `Recent sessions:
-${lines.join("\n")}
-
-${color.dim(`Resume one with: wstack resume ${list[0]?.id ?? "<id>"}
-`)}
-${color.dim("Tip: /resume --incomplete \u2014 list sessions that crashed mid-iteration")}`;
+      const lines = list.map((s) => {
+        const parts2 = [];
+        parts2.push(color.dim(`${s.tokenTotal.toLocaleString()} tok`));
+        if (s.toolCallCount) {
+          const toolStr = `${s.toolCallCount} call${s.toolCallCount === 1 ? "" : "s"}`;
+          parts2.push(s.toolErrorCount ? color.yellow(toolStr) : color.cyan(toolStr));
+        }
+        if (s.iterationCount) parts2.push(color.dim(`${s.iterationCount} iter`));
+        if (s.outcome) {
+          const badge = s.outcome === "completed" ? color.green("\u2713") : s.outcome === "aborted" ? color.yellow("\u26A0") : s.outcome === "error" ? color.red("\u2717") : color.dim("?");
+          parts2.push(badge);
+        }
+        const stat4 = parts2.join(" ");
+        const date = color.dim(s.startedAt.slice(0, 16).replace("T", " "));
+        return `  ${s.id.padEnd(42)} ${date}  ${stat4}
+    ${color.dim(s.title)}`;
+      });
+      const msg = [
+        color.bold(`Recent sessions (${list.length}):`),
+        ...lines,
+        "",
+        color.dim(`Resume: wstack resume ${list[0]?.id ?? "<id>"}`),
+        color.dim("Tip: /resume --incomplete \u2014 list crashed sessions")
+      ].join("\n");
       opts.renderer.write(msg);
       return { message: msg };
     }
@@ -6153,6 +6340,7 @@ ${color.dim("Tip: /resume --incomplete \u2014 list sessions that crashed mid-ite
 function buildExitCommand(opts) {
   return {
     name: "exit",
+    category: "App",
     aliases: ["quit", "q"],
     description: "Exit the REPL.",
     async run() {
@@ -6209,6 +6397,12 @@ function summariseEvent(ev) {
       return color.dim("\u2026");
   }
 }
+function expectDefined5(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var noOpVault3 = {
   encrypt: (v) => v,
   decrypt: (v) => v,
@@ -6301,7 +6495,7 @@ function buildSetModelCommand(opts) {
       for (const k of keys.sort()) {
         const kind = matrixKeyKind(k);
         const tag = kind === "unknown" ? color.red("?") : color.dim(kind);
-        lines.push(`    ${color.amber(k.padEnd(22))} \u2192 ${fmtEntry(matrix[k])}   ${tag}`);
+        lines.push(`    ${color.amber(k.padEnd(22))} \u2192 ${fmtEntry(expectDefined5(matrix[k]))}   ${tag}`);
       }
     }
     lines.push("", color.dim("  /setmodel list for valid keys \xB7 /setmodel help for usage"));
@@ -6309,6 +6503,7 @@ function buildSetModelCommand(opts) {
   }
   return {
     name: "setmodel",
+    category: "Config",
     description: "View or change the leader model and the per-task model matrix.",
     help,
     async run(args) {
@@ -6439,6 +6634,7 @@ function buildSettingsCommand(opts) {
     "  /settings                     Show current settings",
     "  /settings delay <seconds>     Auto-proceed delay in auto mode (0 disables)",
     "  /settings mode <off|suggest|auto>   Default autonomy mode at startup",
+    "  /settings hints on|off        Show or suppress rotating launch hints",
     "  /settings defaults            Show built-in default values",
     "",
     "Settings are persisted to ~/.wrongstack/config.json."
@@ -6447,18 +6643,21 @@ function buildSettingsCommand(opts) {
     const autonomy = opts.configStore.get().autonomy;
     const delay = autonomy?.autoProceedDelayMs ?? 45e3;
     const mode = autonomy?.defaultMode ?? "off";
+    const hints = opts.configStore.get().hints !== false;
     return [
       `${color.bold("WrongStack")} ${color.dim("\u2014 Settings")}`,
       "",
       `  auto-proceed delay:    ${color.cyan(formatDelay(delay))}   ${color.dim("change: /settings delay <seconds>")}`,
       `  default autonomy mode: ${color.cyan(mode)}   ${color.dim("change: /settings mode off|suggest|auto")}`,
+      `  launch hints:          ${hints ? color.cyan("on") : color.dim("off")}   ${color.dim("change: /settings hints on|off")}`,
       "",
       color.dim("  Persisted to ~/.wrongstack/config.json \xB7 /settings help for more")
     ].join("\n");
   }
   return {
     name: "settings",
-    description: "View or change settings (auto-proceed delay, default autonomy mode).",
+    category: "Config",
+    description: "View or change settings (auto-proceed delay, default autonomy mode, launch hints).",
     help,
     async run(args) {
       const parts = args.trim().split(/\s+/).filter(Boolean);
@@ -6479,6 +6678,7 @@ function buildSettingsCommand(opts) {
             "",
             `  auto-proceed delay:    ${color.cyan("45s")} ${color.dim("(WRONGSTACK_AUTO_PROCEED_DELAY_MS env)")}`,
             `  default autonomy mode: ${color.cyan("off")}`,
+            `  launch hints:          ${color.cyan("on")}`,
             `  iteration timeout:     ${color.cyan("5 min")}`,
             `  session timeout:       ${color.cyan("30 min")}`,
             `  max iterations:        ${color.cyan("100")}`
@@ -6521,8 +6721,19 @@ function buildSettingsCommand(opts) {
           });
           return { message: `${color.green("\u2713")} default autonomy \u2192 ${color.bold(raw)}` };
         }
+        if (sub === "hints") {
+          const raw = (parts[1] ?? "").toLowerCase();
+          if (!["on", "off"].includes(raw)) {
+            return { message: `${color.amber("Usage:")} /settings hints on|off` };
+          }
+          const on = raw === "on";
+          await persistConfigSetting(persistDeps, (cfg) => {
+            cfg.hints = on;
+          });
+          return { message: `${color.green("\u2713")} launch hints \u2192 ${on ? color.cyan("on") : color.dim("off")}` };
+        }
         return {
-          message: `${color.red("Unknown setting")} "${sub}". Try ${color.dim("/settings")}, ${color.dim("/settings delay <s>")}, or ${color.dim("/settings mode <m>")}.`
+          message: `${color.red("Unknown setting")} "${sub}". Try ${color.dim("/settings")}, ${color.dim("/settings delay <s>")}, ${color.dim("/settings mode <m>")}, or ${color.dim("/settings hints on|off")}.`
         };
       } catch (err) {
         return {
@@ -6556,6 +6767,7 @@ var HELP = [
 function buildTelegramSetupCommand(opts) {
   return {
     name: "telegram-setup",
+    category: "Config",
     aliases: ["tg-setup"],
     description: "Configure Telegram bot token and default chat. /telegram-setup <token> [chatId]",
     argsHint: "[botToken] [chatId]",
@@ -6594,7 +6806,7 @@ function buildTelegramSetupCommand(opts) {
         );
         return { message: lines.join("\n") };
       }
-      const botToken = parts[0];
+      const botToken = parts[0] ?? "";
       const chatId = parts[1];
       if (!/^\d+:[A-Za-z0-9_-]+$/.test(botToken)) {
         return {
@@ -6688,6 +6900,7 @@ ${color.dim("No default chat set. You can add it later: /telegram-setup <token>
 function buildSpawnCommand(opts) {
   return {
     name: "spawn",
+    category: "Agent",
     description: "Spawn an isolated subagent to handle a task.",
     async run(args) {
       const { description, opts: parsed } = parseSpawnFlags(args.trim());
@@ -6708,6 +6921,7 @@ function buildSpawnCommand(opts) {
 function buildAgentsCommand(opts) {
   return {
     name: "agents",
+    category: "Agent",
     description: "Show status of spawned subagents. /agents monitor opens the agents monitor overlay. /agents on|off toggles the overlay.",
     help: [
       "Usage: /agents [monitor|on|off|stream on|stream off]",
@@ -6745,6 +6959,7 @@ function buildAgentsCommand(opts) {
 function buildDirectorCommand(opts) {
   return {
     name: "director",
+    category: "Agent",
     description: "Promote this session to director mode, enabling fleet orchestration tools. Only works before any subagents are spawned.",
     async run() {
       if (!opts.onDirector) return { message: "Director promotion is not available in this session." };
@@ -6797,6 +7012,7 @@ async function saveStatuslineConfig(cfg) {
 function buildStatuslineCommand(deps) {
   return {
     name: "statusline",
+    category: "Config",
     aliases: ["sl"],
     description: "Customize status bar chips: /statusline [item] [on|off] or /statusline reset",
     help: [
@@ -6874,15 +7090,22 @@ function findTodo(todos, query) {
     if (item) return { idx, item };
   }
   const byId = todos.findIndex((t) => t.id === query);
-  if (byId >= 0) return { idx: byId, item: todos[byId] };
+  if (byId >= 0) {
+    const item = todos[byId];
+    if (item) return { idx: byId, item };
+  }
   const q = query.toLowerCase();
   const byContent = todos.findIndex((t) => t.content.toLowerCase().includes(q));
-  if (byContent >= 0) return { idx: byContent, item: todos[byContent] };
+  if (byContent >= 0) {
+    const item = todos[byContent];
+    if (item) return { idx: byContent, item };
+  }
   return null;
 }
 function buildTodosCommand(opts) {
   return {
     name: "todos",
+    category: "Inspect",
     description: "Inspect or edit the live todo list: /todos [show|clear|add|done|remove|rm <id|index>]",
     async run(args) {
       const ctx = opts.context;
@@ -6949,6 +7172,7 @@ function buildTodosCommand(opts) {
 function buildToolsCommand(opts) {
   return {
     name: "tools",
+    category: "Inspect",
     description: "List registered tools.",
     async run() {
       const all = opts.toolRegistry.listWithOwner();
@@ -6968,6 +7192,7 @@ ${lines.join("\n")}
 function buildWorktreeCommand(opts) {
   return {
     name: "worktree",
+    category: "Config",
     aliases: ["wt"],
     description: "Inspect/manage git worktrees used for AutoPhase per-phase isolation.",
     argsHint: "[list | merge <branch> | prune | clean]",
@@ -7011,6 +7236,7 @@ function buildWorktreeCommand(opts) {
 function buildYoloCommand(opts) {
   return {
     name: "yolo",
+    category: "Config",
     description: "Toggle or query YOLO (auto-approve) mode.",
     help: [
       "Usage:",
@@ -7068,6 +7294,7 @@ function buildBuiltinSlashCommands(opts) {
     buildCodebaseReindexCommand(opts),
     buildToolsCommand(opts),
     buildPluginCommand(opts),
+    buildPruneCommand(opts),
     buildMcpSlashCommand(opts),
     buildDiagCommand(opts),
     buildStatsCommand(opts),
@@ -7424,15 +7651,20 @@ var ReadlineInputReader = class {
         });
       }
       const fresh = this.ensure();
+      this.installPromptGuard(fresh);
       return new Promise((resolve5) => {
+        const settle = (line) => {
+          setOutputLineGuard(null);
+          resolve5(line);
+        };
         fresh.question(prompt ?? "> ", (line) => {
           if (line.trim()) {
             this.history.push(line);
             void this.saveHistory();
           }
-          resolve5(line);
+          settle(line);
         });
-        fresh.once("close", () => resolve5(""));
+        fresh.once("close", () => settle(""));
       }).then((result) => {
         this.rl?.close();
         return result;
@@ -7441,7 +7673,38 @@ var ReadlineInputReader = class {
       this.pending = false;
     }
   }
+  /**
+   * Install the out-of-band write guard for the active prompt. When a log
+   * line or other async output lands while the user is mid-type, the guard
+   * clears the draft row, lets the message print, then repaints the prompt
+   * and the in-progress draft (cursor preserved) via readline's own
+   * refresh. Without it, each async write leaves the half-typed line
+   * stranded as a fresh scrollback row.
+   *
+   * No-op on non-TTY output (piped/redirected) — there's no draft to
+   * protect and the ANSI clear/repaint would be noise in a file.
+   */
+  installPromptGuard(rl) {
+    const out = process.stdout;
+    if (!out.isTTY) {
+      setOutputLineGuard(null);
+      return;
+    }
+    setOutputLineGuard({
+      suspend() {
+        readline.cursorTo(out, 0);
+        readline.clearLine(out, 0);
+      },
+      resume() {
+        try {
+          rl.prompt(true);
+        } catch {
+        }
+      }
+    });
+  }
   async readKey(prompt, options) {
+    setOutputLineGuard(null);
     writeOut(prompt);
     return new Promise((resolve5) => {
       const stdin = process.stdin;
@@ -7494,6 +7757,7 @@ var ReadlineInputReader = class {
   async readSecret(prompt) {
     const stdin = process.stdin;
     if (!stdin.isTTY) return this.readLine(prompt);
+    setOutputLineGuard(null);
     this.rl?.close();
     this.rl = void 0;
     writeOut(prompt);
@@ -7556,6 +7820,7 @@ var ReadlineInputReader = class {
     });
   }
   async close() {
+    setOutputLineGuard(null);
     await this.saveHistory();
     this.rl?.close();
     this.rl = void 0;
@@ -7874,14 +8139,20 @@ async function restoreLast(homeFn = defaultHomeDir) {
 }
 
 // src/picker.ts
+function expectDefined6(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var theme = { primary: color.amber };
 async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => process.env.HOME ?? os2__default.homedir()) {
   try {
-    const { atomicWrite: atomicWrite15 } = await import('@wrongstack/core');
-    const fs27 = await import('fs/promises');
+    const { atomicWrite: atomicWrite14 } = await import('@wrongstack/core');
+    const fs26 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs27.readFile(configPath2, "utf8");
+      const raw = await fs26.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -7893,7 +8164,7 @@ async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => p
     } catch (err) {
       console.warn("[picker] backupCurrent failed:", err);
     }
-    await atomicWrite15(configPath2, JSON.stringify(existing, null, 2), { mode: 384 });
+    await atomicWrite14(configPath2, JSON.stringify(existing, null, 2), { mode: 384 });
     try {
       await appendHistory(
         oldCfg,
@@ -7995,7 +8266,7 @@ ${color.bold(theme.primary("WrongStack") + color.dim(" \u2014 Provider & Model S
     for (const p of list) {
       const envFound = p.envVars.some((v) => !!process.env[v]);
       const entry = config?.providers?.[p.id];
-      const configKey = typeof entry?.apiKey === "string" && entry.apiKey.length > 0 || Array.isArray(entry?.apiKeys) && entry.apiKeys.some((k) => k?.apiKey);
+      const configKey = typeof entry?.apiKey === "string" && entry.apiKey.length > 0 || Array.isArray(entry?.apiKeys) && entry?.apiKeys?.some((k) => k?.apiKey);
       const marker = envFound ? color.green("\u25CF") : configKey ? color.cyan("\u25C9") : color.dim("\u25CB");
       const isDefault = p.id === defaultProvider;
       if (isDefault) defaultIdx = idx;
@@ -8069,7 +8340,7 @@ async function pickModel(provider, registry, renderer, reader, defaultModel) {
   while (offset < models.length) {
     const page = models.slice(offset, offset + pageSize);
     for (let i = 0; i < page.length; i++) {
-      const m = page[i];
+      const m = expectDefined6(page[i]);
       const num = offset + i + 1;
       const ctx = m.limit?.context ? `${(m.limit.context / 1e3).toFixed(0)}k`.padStart(6) : "     ?";
       const cost = m.cost?.input !== void 0 ? `$${m.cost.input}/$${m.cost.output ?? "?"}` : "";
@@ -8126,7 +8397,7 @@ async function resolveModelSelection(answer, models, provider, _registry, render
   const idx = Number.parseInt(answer, 10);
   let modelId;
   if (!Number.isNaN(idx) && idx >= 1 && idx <= models.length) {
-    modelId = models[idx - 1].id;
+    modelId = models[idx - 1]?.id;
   } else {
     const lower = answer.toLowerCase();
     const match = models.find((m) => m.id.toLowerCase() === lower);
@@ -8135,7 +8406,7 @@ async function resolveModelSelection(answer, models, provider, _registry, render
     } else {
       const partial = models.filter((m) => m.id.toLowerCase().includes(lower));
       if (partial.length === 1) {
-        modelId = partial[0].id;
+        modelId = partial[0]?.id;
       } else if (partial.length > 1) {
         renderer.writeError(`"${answer}" matches multiple models. Be more specific.`);
         return void 0;
@@ -8460,6 +8731,7 @@ var TerminalRenderer = class {
     if (this.silent) return;
     if (result.delegateSummaries) {
       for (const { summary, ok } of result.delegateSummaries) {
+        if (!summary) continue;
         this.writeAgentSummary(summary, ok);
       }
       return;
@@ -8752,7 +9024,7 @@ ${color.amber("?")} Pick: `)).trim().toLowerCase();
     }
     const idx = Number.parseInt(choice, 10);
     if (!Number.isNaN(idx) && idx >= 1 && idx <= ids.length) {
-      const pid = ids[idx - 1];
+      const pid = expectDefined7(ids[idx - 1]);
       await manageProvider(pid, deps);
       continue;
     }
@@ -8778,9 +9050,11 @@ ${color.bold("WrongStack")} ${color.dim("\u2014 API keys")}
     let idx = 1;
     for (const id of ids) {
       const cfg = providers[id];
+      if (!cfg) continue;
       const keys = normalizeKeys(cfg);
       const active = activeLabel(cfg, keys);
-      const summary = keys.length === 0 ? color.dim("(no keys)") : keys.length === 1 ? maskedKey(keys[0].apiKey) : `${color.dim(`${keys.length} keys`)} ${color.dim("active:")} ${color.bold(active ?? "?")} ${maskedKey(keys.find((k) => k.label === active)?.apiKey ?? keys[0].apiKey)}`;
+      const firstKey = keys[0];
+      const summary = keys.length === 0 ? color.dim("(no keys)") : keys.length === 1 ? maskedKey(firstKey?.apiKey ?? "") : `${color.dim(`${keys.length} keys`)} ${color.dim("active:")} ${color.bold(active ?? "?")} ${maskedKey(keys.find((k) => k.label === active)?.apiKey ?? firstKey?.apiKey ?? "")}`;
       const fam = cfg.family ? color.dim(`[${cfg.family}]`) : "";
       const aliasHint = cfg.type && cfg.type !== id ? color.dim(`\u2192 ${cfg.type}`) : "";
       renderer.write(
@@ -8840,7 +9114,7 @@ ${color.bold(providerId)} ${cfg.family ? color.dim(`[${cfg.family}]`) : color.am
       deps.renderer.write(color.dim("  (no keys saved)\n"));
     } else {
       for (let i = 0; i < keys.length; i++) {
-        const k = keys[i];
+        const k = expectDefined7(keys[i]);
         const marker = k.label === active ? color.green("\u25CF") : color.dim("\u25CB");
         deps.renderer.write(
           `  ${color.dim(`${i + 1}.`.padStart(4))} ${marker} ${k.label.padEnd(20)} ${maskedKey(k.apiKey)}  ${color.dim(k.createdAt)}
@@ -8902,7 +9176,7 @@ ${color.amber("?")} ${providerId} > `)).trim();
         deps.renderer.writeError(`Usage: u <1-${keys.length}>`);
         continue;
       }
-      const target = keys[arg - 1];
+      const target = expectDefined7(keys[arg - 1]);
       const newKey = await readKeyInput(deps, `Updated key for ${target.label}`);
       if (!newKey) continue;
       await mutateProviders(deps, (all) => {
@@ -8922,7 +9196,7 @@ ${color.amber("?")} ${providerId} > `)).trim();
         deps.renderer.writeError(`Usage: d <1-${keys.length}>`);
         continue;
       }
-      const target = keys[arg - 1];
+      const target = expectDefined7(keys[arg - 1]);
       const confirm = (await deps.reader.readLine(
         `  ${color.amber("?")} Delete key "${target.label}" (${maskedKey(target.apiKey)})? ${color.dim("[y/N/q]")} `
       )).trim().toLowerCase();
@@ -8998,7 +9272,7 @@ ${color.amber("?")} ${providerId} > `)).trim();
         deps.renderer.writeError(`Usage: s <1-${keys.length}>`);
         continue;
       }
-      const target = keys[arg - 1];
+      const target = expectDefined7(keys[arg - 1]);
       await mutateProviders(deps, (all) => {
         const p = all[providerId];
         if (!p) return;
@@ -9321,66 +9595,22 @@ async function readKeyInput(deps, intent) {
   }
   return key;
 }
-async function loadProviders(deps) {
-  let raw;
-  try {
-    raw = await fsp4.readFile(deps.globalConfigPath, "utf8");
-  } catch (err) {
-    if (err.code !== "ENOENT") {
-      deps.renderer.writeWarning(
-        `Could not read ${deps.globalConfigPath}: ${err.message}. Treating as empty.`
-      );
-    }
-    return {};
-  }
-  let parsed = {};
-  try {
-    parsed = JSON.parse(raw);
-  } catch (err) {
-    deps.renderer.writeWarning(
-      `Config at ${deps.globalConfigPath} is not valid JSON: ${err.message}`
-    );
-    return {};
-  }
-  const decrypted = decryptConfigSecrets$1(parsed, deps.vault);
-  return decrypted.providers ?? {};
+function loadProviders(deps) {
+  return loadConfigProviders(deps.globalConfigPath, deps.vault, {
+    warn: (msg) => deps.renderer.writeWarning(msg)
+  });
 }
-async function mutateProviders(deps, mutator) {
-  let raw;
-  let fileExists = true;
-  try {
-    raw = await fsp4.readFile(deps.globalConfigPath, "utf8");
-  } catch (err) {
-    if (err.code !== "ENOENT") {
-      throw new Error(
-        `Refusing to mutate ${deps.globalConfigPath}: ${err.message}`,
-        { cause: err }
-      );
-    }
-    fileExists = false;
-    raw = "{}";
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (err) {
-    if (fileExists) {
-      throw new Error(
-        `Refusing to overwrite corrupt config at ${deps.globalConfigPath} (${err.message}). Fix or move the file aside before retrying.`,
-        { cause: err }
-      );
-    }
-    parsed = {};
-  }
-  const decrypted = decryptConfigSecrets$1(parsed, deps.vault);
-  const providers = decrypted.providers ?? {};
-  mutator(providers);
-  decrypted.providers = providers;
-  const encrypted = encryptConfigSecrets$1(decrypted, deps.vault);
-  await atomicWrite(deps.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
+function mutateProviders(deps, mutator) {
+  return mutateConfigProviders(deps.globalConfigPath, deps.vault, mutator);
 }
 
 // src/subcommands/handlers/auth.ts
+function expectDefined8(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var authCmd = async (args, deps) => {
   const flags = parseAuthFlags(args);
   const menuDeps = {
@@ -9392,7 +9622,7 @@ var authCmd = async (args, deps) => {
   };
   if (flags.positional.length === 0) return runAuthMenu(menuDeps);
   return runAuthDirect(menuDeps, {
-    providerId: flags.positional[0],
+    providerId: expectDefined8(flags.positional[0]),
     label: flags.label,
     family: flags.family,
     baseUrl: flags.baseUrl,
@@ -9615,6 +9845,12 @@ var doctorCmd = async (_args, deps) => {
   deps.renderer.write(color.green("All checks passed.\n"));
   return 0;
 };
+function expectDefined9(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var exportCmd = async (args, deps) => {
   if (!deps.sessionStore) {
     deps.renderer.writeError("No session store configured.");
@@ -9626,7 +9862,7 @@ var exportCmd = async (args, deps) => {
   let includeDiagnostics = true;
   let sessionId;
   for (let i = 0; i < args.length; i++) {
-    const a = args[i];
+    const a = expectDefined9(args[i]);
     if (a === "--format" || a === "-f") {
       const v = args[++i];
       if (v !== "markdown" && v !== "json" && v !== "text") {
@@ -9888,6 +10124,12 @@ async function serveMcpStdio(deps) {
 }
 
 // src/subcommands/handlers/mcp.ts
+function expectDefined10(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var BUILT_IN_MCP = allServers();
 var mcpCmd = async (args, deps) => {
   const sub = args[0];
@@ -9938,7 +10180,7 @@ async function addMcpServer(args, deps) {
 `);
     if (Object.keys(deps.config.mcpServers ?? {}).length === 0)
       for (const k of Object.keys(BUILT_IN_MCP)) {
-        const s = BUILT_IN_MCP[k];
+        const s = expectDefined10(BUILT_IN_MCP[k]);
         deps.renderer.write(`  ${k.padEnd(20)} ${s.description}
 `);
       }
@@ -10216,6 +10458,12 @@ var projectsCmd = async (_args, deps) => {
     return 0;
   }
 };
+function expectDefined11(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var providersCmd = async (args, deps) => {
   const showAll = args.includes("--all");
   const showUnsupported = args.includes("--unsupported");
@@ -10263,14 +10511,14 @@ ${color.dim(`Current: ${deps.config.provider ?? "<unset>"} / ${deps.config.model
 function parseFlags2(args) {
   const flags = {};
   for (let i = 0; i < args.length; i++) {
-    const a = args[i];
+    const a = expectDefined11(args[i]);
     if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       if (eq !== -1) {
         flags[a.slice(2, eq)] = a.slice(eq + 1);
       } else {
         const name = a.slice(2);
-        if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+        if (i + 1 < args.length && !args[i + 1]?.startsWith("--")) {
           flags[name] = args[++i] ?? "";
         } else {
           flags[name] = true;
@@ -10283,11 +10531,11 @@ function parseFlags2(args) {
 function positionals(args) {
   const out = [];
   for (let i = 0; i < args.length; i++) {
-    const a = args[i];
+    const a = expectDefined11(args[i]);
     if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       if (eq === -1) {
-        if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+        if (i + 1 < args.length && !args[i + 1]?.startsWith("--")) {
           i++;
         }
       }
@@ -10438,7 +10686,7 @@ function parseSizeFlag(raw) {
   const s = raw.trim().toLowerCase();
   const match = /^(\d+(?:\.\d+)?)\s*(k|m|b)?$/.exec(s);
   if (!match) return void 0;
-  const num = Number.parseFloat(match[1]);
+  const num = Number.parseFloat(expectDefined11(match[1]));
   const unit = match[2];
   if (unit === "b") return Math.round(num * 1e9);
   if (unit === "m") return Math.round(num * 1e6);
@@ -10759,6 +11007,12 @@ Fleet Run: ${runId}
 }
 
 // src/subcommands/handlers/sessions-config.ts
+function expectDefined12(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var sessionsCmd = async (args, deps) => {
   const sub = args[0];
   if (sub === "fleet") {
@@ -10804,7 +11058,7 @@ var configCmd = async (args, deps) => {
 };
 function extractArg(args, key) {
   const idx = args.indexOf(key);
-  if (idx !== -1 && args[idx + 1] !== void 0) return args[idx + 1];
+  if (idx !== -1 && args[idx + 1] !== void 0) return expectDefined12(args[idx + 1]);
   const eq = key.startsWith("--") ? args.find((a) => a.startsWith(`${key}=`)) : null;
   if (eq) return eq.slice(eq.indexOf("=") + 1);
   return null;
@@ -10855,7 +11109,7 @@ async function runHistory(args, deps) {
 }
 async function runRestore(args, deps) {
   const latest = args.includes("--latest") || args.includes("-l");
-  const id = extractArg(args, "--id") ?? (args[0] && !args[0].startsWith("-") ? args[0] : null);
+  const id = extractArg(args, "--id") ?? (args[0] && !args[0]?.startsWith("-") ? args[0] : null);
   if (latest) {
     const result2 = await restoreLast();
     if (!result2.ok) {
@@ -10880,6 +11134,12 @@ async function runRestore(args, deps) {
 `);
   return 0;
 }
+function expectDefined13(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function parseRewindFlags(args) {
   const flags = {};
   for (let i = 0; i < args.length; i++) {
@@ -10894,7 +11154,7 @@ function parseRewindFlags(args) {
 }
 function findSessionId(args) {
   for (let i = 0; i < args.length; i++) {
-    const a = args[i];
+    const a = expectDefined13(args[i]);
     if (a === "--last" || a === "--to") {
       i++;
       continue;
@@ -10919,13 +11179,18 @@ var rewindCmd = async (args, deps) => {
       deps.renderer.writeError("No sessions found.");
       return 1;
     }
-    sessionId = sessions[0].id;
+    sessionId = sessions[0]?.id;
+  }
+  if (!sessionId) {
+    deps.renderer.writeError("No sessions found.");
+    return 1;
   }
+  const targetSessionId = sessionId;
   if (flags.list) {
-    deps.renderer.write(`Session: ${color.bold(sessionId)}
+    deps.renderer.write(`Session: ${color.bold(targetSessionId)}
 
 `);
-    const checkpoints = await rewind.listCheckpoints(sessionId);
+    const checkpoints = await rewind.listCheckpoints(targetSessionId);
     if (checkpoints.length === 0) {
       deps.renderer.write("No checkpoints in this session.\n");
       return 0;
@@ -10942,7 +11207,7 @@ var rewindCmd = async (args, deps) => {
     let result;
     if (flags.all) {
       deps.renderer.write("Rewinding to session start...\n");
-      result = await rewind.rewindToStart(sessionId);
+      result = await rewind.rewindToStart(targetSessionId);
     } else if (flags.last) {
       const n = Number.parseInt(flags.last, 10);
       if (Number.isNaN(n) || n < 1) {
@@ -10951,7 +11216,7 @@ var rewindCmd = async (args, deps) => {
       }
       deps.renderer.write(`Rewinding last ${n} prompt(s)...
 `);
-      result = await rewind.rewindLastN(sessionId, n);
+      result = await rewind.rewindLastN(targetSessionId, n);
     } else if (flags.to) {
       const idx = Number.parseInt(flags.to, 10);
       if (Number.isNaN(idx) || idx < 0) {
@@ -10960,7 +11225,7 @@ var rewindCmd = async (args, deps) => {
       }
       deps.renderer.write(`Rewinding to checkpoint ${idx}...
 `);
-      result = await rewind.rewindToCheckpoint(sessionId, idx);
+      result = await rewind.rewindToCheckpoint(targetSessionId, idx);
     } else {
       deps.renderer.write("Usage: ws rewind --all | --last N | --to <index> [--list] [--resume]\n");
       deps.renderer.write("  --all      Rewind to session start\n");
@@ -10974,7 +11239,7 @@ var rewindCmd = async (args, deps) => {
       deps.renderer.write("No files to revert.\n");
       if (flags.resume) {
         const store = new DefaultSessionStore({ dir: sessionsDir });
-        const resumed = await store.resume(sessionId);
+        const resumed = await store.resume(targetSessionId);
         const toIdx = result.toPromptIndex;
         await resumed.writer.truncateToCheckpoint(toIdx);
         await resumed.writer.close();
@@ -10992,7 +11257,7 @@ Reverted ${result.revertedFiles.length} file(s):
     }
     if (flags.resume) {
       const store = new DefaultSessionStore({ dir: sessionsDir });
-      const resumed = await store.resume(sessionId);
+      const resumed = await store.resume(targetSessionId);
       const toIdx = result.toPromptIndex;
       const removed = await resumed.writer.truncateToCheckpoint(toIdx);
       await resumed.writer.close();
@@ -11141,10 +11406,10 @@ var auditCmd = async (args, deps) => {
   return verify.ok ? 0 : 1;
 };
 async function listAudits(log, dir, deps) {
-  const fs27 = await import('fs/promises');
+  const fs26 = await import('fs/promises');
   let entries;
   try {
-    entries = await fs27.readdir(dir);
+    entries = await fs26.readdir(dir);
   } catch {
     deps.renderer.write(
       color.dim(`No sessions dir found at ${dir}. Run a session first.`) + "\n"
@@ -11295,22 +11560,22 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color51) {
+function fmtTaskResultLine(r, color52) {
   const stats = `${r.iterations}it ${r.toolCalls}tc ${fmtDuration(r.durationMs)}`;
   const errMsg = typeof r.error === "string" ? r.error : r.error?.message;
   const errKind = typeof r.error === "object" ? r.error?.kind : void 0;
   const errTail = errMsg ? ` \u2014 ${errMsg.replace(/\s+/g, " ").slice(0, 80)}${errMsg.length > 80 ? "\u2026" : ""}` : "";
-  const errKindChip = errKind ? color51.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color51.dim(errTail)}` : "";
+  const errKindChip = errKind ? color52.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color52.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color51.green("\u2713"), stats, tail: "" };
+      return { mark: color52.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color51.yellow("\u23F1"), stats: `${color51.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color52.yellow("\u23F1"), stats: `${color52.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color51.dim("\u2298"), stats: `${color51.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color52.dim("\u2298"), stats: `${color52.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color51.red("\u2717"), stats: `${color51.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color52.red("\u2717"), stats: `${color52.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 
@@ -11359,8 +11624,8 @@ async function boot(argv) {
     file: wpaths.logFile,
     // Suppress stderr output in TUI mode: plugin/library log messages
     // (e.g. Telegram "getUpdates failed") write directly to stderr and
-    // bypass Ink, which breaks the Static/live boundary in non-altScreen
-    // mode. Logs still go to the disk file for post-hoc debugging.
+    // bypass Ink, which breaks the Static/live boundary.
+    // Logs still go to the disk file for post-hoc debugging.
     stderr: !flags.tui
   });
   const renderer = new TerminalRenderer();
@@ -11411,7 +11676,7 @@ async function boot(argv) {
       [...builtinToolsPack.tools ?? []],
       builtinToolsPack.name
     );
-    const code = await subcommands[first](positional.slice(1), {
+    const code = await subcommands[first]?.(positional.slice(1), {
       config,
       renderer,
       reader,
@@ -11903,6 +12168,12 @@ async function predictNextTasks(input, opts) {
   }
 }
 init_sdd();
+function expectDefined14(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 async function runRepl(opts) {
   if (opts.banner !== false) printBanner(opts.renderer, opts.projectName);
   await renderGoalBanner(opts);
@@ -12418,7 +12689,7 @@ async function renderGoalBanner(opts) {
     color.dim("Goal: ") + stateColor(summary) + color.dim(` [${goal.goalState}]  (iter ${goal.iterations})`) + "\n"
   );
   if (goal.journal.length > 0) {
-    const lastEntry = goal.journal[goal.journal.length - 1];
+    const lastEntry = expectDefined14(goal.journal[goal.journal.length - 1]);
     const statusIcon = lastEntry.status === "success" ? "\u2713" : lastEntry.status === "failure" ? "\u2717" : lastEntry.status === "aborted" ? "\u2298" : lastEntry.status === "skipped" ? "\u229D" : "\xB7";
     opts.renderer.write(
       color.dim(`  Last: ${statusIcon} ${lastEntry.task} (${lastEntry.status})`) + "\n"
@@ -12872,20 +13143,10 @@ async function execute(deps) {
           titleAnimation: config.autonomy?.["terminalTitleAnimation"] ?? true,
           // Completion chime: terminal bell when agent finishes.
           chime: config.autonomy?.["chime"] ?? false,
-          // Confirm before exit: show "confirm exit" prompt on Ctrl+C.
+          // Normal exit.
           confirmExit: config.autonomy?.["confirmExit"] ?? true,
-          // Default OFF so the terminal's native scrollback works for chat
-          // history out of the box. Users who hit resize/overlay-leak
-          // artifacts can opt back into alt-screen with `--alt-screen`.
-          // `--no-alt-screen` still wins when both are passed.
-          altScreen: flags["alt-screen"] === true && flags["no-alt-screen"] !== true,
           director,
           fleetRoster,
-          onAfterExit: () => {
-            writeOut(
-              color.dim(`Session saved: ${session.id} \u2014 resume with `) + color.cyan(`wstack resume ${session.id}`) + "\n"
-            );
-          },
           onClearHistory: (dispatch) => {
             dispatch({ type: "clearHistory" });
             dispatch({ type: "resetContextChip" });
@@ -13030,6 +13291,12 @@ async function execute(deps) {
   }
   return code;
 }
+function expectDefined15(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function buildRoutingRunner(config, host) {
   const standardRunner = makeAgentSubagentRunner({
     factory: host.makeSubagentFactory(config),
@@ -13038,7 +13305,7 @@ function buildRoutingRunner(config, host) {
   return async (task, ctx) => {
     const subCfg = ctx.config;
     if (subCfg.provider === "acp") {
-      const cacheKey = subCfg.role ?? subCfg.name ?? subCfg.id;
+      const cacheKey = subCfg.role ?? subCfg.name ?? expectDefined15(subCfg.id);
       return host.buildACPRunner(cacheKey).then((r) => r(task, ctx));
     }
     return standardRunner(task, ctx);
@@ -13481,6 +13748,7 @@ var MultiAgentHost = class {
    */
   async _spawnAndAssign(subagentConfig) {
     const taskId = randomUUID();
+    if (!this.director) throw new Error("Director is not initialized");
     const subagentId = await this.director.spawn(subagentConfig);
     await this.director.assign({ id: taskId, description: "", subagentId });
     return { subagentId, taskId };
@@ -14259,9 +14527,18 @@ var Spinner = class {
   context;
   out;
   enabled;
-  constructor(out = process.stderr) {
+  /**
+   * @param out    Stream the spinner writes to (default stderr).
+   * @param opts.enabled  Hard override. When `false`, every method becomes a
+   *   no-op regardless of TTY state — used to silence the spinner when the Ink
+   *   TUI owns the screen (the spinner writes to stderr on an 80ms timer, which
+   *   interleaves with Ink's stdout cursor math and corrupts the live region:
+   *   it leaks the input row into scrollback and paints a stray
+   *   "thinking… ctx" tracker at the very bottom). Defaults to TTY detection.
+   */
+  constructor(out = process.stderr, opts) {
     this.out = out;
-    this.enabled = Boolean(out.isTTY) && !process.env.NO_COLOR;
+    this.enabled = (opts?.enabled ?? Boolean(out.isTTY)) && !process.env.NO_COLOR;
   }
   start(label) {
     if (!this.enabled || this.active) return;
@@ -14917,8 +15194,17 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
   }
   return { resolvedProvider, provider, providerRegistry };
 }
+function expectDefined16(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 async function setupSession(params) {
   const { config, wpaths, projectRoot, cwd, sessionStore, systemPrompt, provider, tokenCounter, renderer, flags, onRecovery } = params;
+  sessionStore.prune(30).then((count) => {
+    if (count > 0) renderer.writeInfo(`Pruned ${count} old session${count === 1 ? "" : "s"}.`);
+  }).catch(() => void 0);
   let resumeId = typeof flags["resume"] === "string" ? flags["resume"] : void 0;
   const recoveryLock = new RecoveryLock({ dir: wpaths.projectSessions, sessionStore });
   if (!resumeId && !flags["no-recovery"]) {
@@ -14951,13 +15237,13 @@ async function setupSession(params) {
     session = await sessionStore.create({ id: "", title: "", model: config.model, provider: config.provider });
   }
   const sessionRef = { current: session };
-  await recoveryLock.write(session.id).catch(() => void 0);
-  const attachments = new DefaultAttachmentStore({ spoolDir: path8.join(wpaths.projectSessions, session.id, "attachments") });
-  const queueStore = new QueueStore({ dir: path8.join(wpaths.projectSessions, session.id) });
+  await recoveryLock.write(session?.id).catch(() => void 0);
+  const attachments = new DefaultAttachmentStore({ spoolDir: path8.join(wpaths.projectSessions, session?.id, "attachments") });
+  const queueStore = new QueueStore({ dir: path8.join(wpaths.projectSessions, session?.id) });
   const ctxSignal = new AbortController().signal;
-  const context = new Context({ systemPrompt, provider, session, signal: ctxSignal, tokenCounter, cwd, projectRoot, model: config.model });
+  const context = new Context({ systemPrompt, provider, session: expectDefined16(session), signal: ctxSignal, tokenCounter, cwd, projectRoot, model: config.model });
   if (restoredMessages.length > 0) context.state.replaceMessages(restoredMessages);
-  const todosCheckpointPath = path8.join(wpaths.projectSessions, `${session.id}.todos.json`);
+  const todosCheckpointPath = path8.join(wpaths.projectSessions, `${session?.id}.todos.json`);
   if (resumeId) {
     try {
       const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
@@ -14968,13 +15254,13 @@ async function setupSession(params) {
     } catch {
     }
   }
-  const detachTodosCheckpoint = attachTodosCheckpoint(context.state, todosCheckpointPath, session.id);
-  const planPath = path8.join(wpaths.projectSessions, `${session.id}.plan.json`);
+  const detachTodosCheckpoint = attachTodosCheckpoint(context.state, todosCheckpointPath, session?.id);
+  const planPath = path8.join(wpaths.projectSessions, `${session?.id}.plan.json`);
   context.state.setMeta("plan.path", planPath);
   let dirState;
   if (resumeId) {
     try {
-      const fleetRoot = path8.join(wpaths.projectSessions, session.id);
+      const fleetRoot = path8.join(wpaths.projectSessions, session?.id);
       dirState = await loadDirectorState(path8.join(fleetRoot, "director-state.json"));
       if (dirState) {
         const tCounts = {};
@@ -14994,7 +15280,7 @@ async function setupSession(params) {
     } catch {
     }
   }
-  return { session, sessionRef, context, restoredMessages, attachments, recoveryLock, queueStore, planPath, detachTodosCheckpoint, priorFleetState: dirState ?? void 0 };
+  return { session: expectDefined16(session), sessionRef, context, restoredMessages, attachments, recoveryLock, queueStore, planPath, detachTodosCheckpoint, priorFleetState: dirState ?? void 0 };
 }
 function resolveBundledSkillsDir2() {
   try {
@@ -15093,6 +15379,12 @@ async function launchEternalFromFlag(deps) {
 }
 
 // src/cli-main.ts
+function expectDefined17(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 async function main(argv) {
   const ctx = await boot(argv);
   if (typeof ctx === "number") return ctx;
@@ -15228,7 +15520,8 @@ async function main(argv) {
     });
     return ms;
   })();
-  const spinner = new Spinner();
+  const tuiOwnsScreen = flags.tui === true && flags["no-tui"] !== true;
+  const spinner = new Spinner(process.stderr, { enabled: !tuiOwnsScreen });
   let lastInputTokens = 0;
   events.on("provider.response", (e) => {
     lastInputTokens = e.usage?.input ?? 0;
@@ -15310,7 +15603,9 @@ async function main(argv) {
   const planPath = sessResult.planPath;
   const detachTodosCheckpoint = sessResult.detachTodosCheckpoint;
   const priorFleetState = sessResult.priorFleetState;
-  const sessionConfig = resolveSessionLoggingConfig(config);
+  const sessionConfig = resolveSessionLoggingConfig(
+    config
+  );
   const sessionBridge = createSessionEventBridge(
     session,
     sessionConfig.auditLevel,
@@ -15360,7 +15655,6 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  const tuiOwnsScreen = flags.tui === true && flags["no-tui"] !== true;
   if (!tuiOwnsScreen) {
     events.on("delegate.started", (e) => {
       const task = e.task.length > 100 ? `${e.task.slice(0, 99)}\u2026` : e.task;
@@ -15571,10 +15865,10 @@ async function main(argv) {
     }
   };
   const fleetRoot = directorMode ? path8.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path8.join(fleetRoot, "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path8.join(fleetRoot, "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path8.join(fleetRoot, "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path8.join(fleetRoot, "director-state.json") : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path8.join(expectDefined17(fleetRoot), "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path8.join(expectDefined17(fleetRoot), "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path8.join(expectDefined17(fleetRoot), "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path8.join(expectDefined17(fleetRoot), "director-state.json") : void 0;
   const fleetRootForPromotion = path8.join(wpaths.projectSessions, session.id);
   const brainQueue = new BrainDecisionQueue(events);
   const brain = new ObservableBrainArbiter(
@@ -15993,7 +16287,7 @@ async function main(argv) {
           ...matches.map((m) => `  ${m.subagentId}  (${m.runId})`)
         ].join("\n");
       }
-      const t = matches[0];
+      const t = expectDefined17(matches[0]);
       const raw = await fsp4.readFile(t.file, "utf8");
       if (mode === "raw") return raw;
       const lines = raw.split("\n").filter((l) => l.trim());