@wrongstack/cli 0.89.1 → 0.104.0

package/dist/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-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, DEFAULT_SESSION_PRUNE_DAYS, 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 { color, writeErr, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, expectDefined, DefaultTaskStore, TaskTracker, renderTaskGraph, DefaultSecretScrubber, DefaultPathResolver, EventBus, TOKENS, mergeCustomModelDefs, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, SessionMemoryConsolidator, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, SpecVersioning, atomicWrite, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, DEFAULT_SESSION_PRUNE_DAYS, 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, loadTasks, emptyTaskFile, saveTasks, formatTaskProgress, formatTaskList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, formatGoal, emptyGoal, buildGoalPreamble, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, phaseForRole, onResize, ERROR_CODES, InputBuilder, FsError } from '@wrongstack/core';
 import * as fsp4 from 'fs/promises';
 import { DefaultSecretVault, decryptConfigSecrets, encryptConfigSecrets, isSecretField } from '@wrongstack/core/security';
+import * as path8 from 'path';
+import { join } from 'path';
 import { createRequire } from 'module';
 import * as os2 from 'os';
 import os2__default from 'os';
@@ -15,10 +15,10 @@ import { spawn } from 'child_process';
 import { MCPRegistry, MCPServer, serveHttp, serveStdio } from '@wrongstack/mcp';
 import { capabilitiesFor, buildProviderFactoriesFromRegistry, makeProviderFromConfig } from '@wrongstack/providers';
 import { createDefaultContainer, routeImagesForModel, readClipboardImage } from '@wrongstack/runtime';
-import { builtinToolsPack, rememberTool, forgetTool, runStartupIndex, isIndexableFile, enqueueReindex, cancelPendingReindexes } from '@wrongstack/tools';
+import { builtinToolsPack, rememberTool, forgetTool, searchMemoryTool, relatedMemoryTool, runStartupIndex, isIndexableFile, enqueueReindex, cancelPendingReindexes } from '@wrongstack/tools';
 import { fileURLToPath } from 'url';
 import * as readline from 'readline';
-import * as fs12 from 'fs';
+import * as fs13 from 'fs';
 import { writeFileSync, existsSync, readFileSync } from 'fs';
 import { WrongStackACPServer } from '@wrongstack/acp/agent';
 import { ACP_AGENT_COMMANDS, makeACPSubagentRunner, makeACPSubagentRunnerWithStop } from '@wrongstack/acp';
@@ -28,9 +28,7 @@ import { ToolExecutor } from '@wrongstack/core/execution';
 import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -38,15 +36,102 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+function normalizeKeys(cfg) {
+  if (Array.isArray(cfg.apiKeys) && cfg.apiKeys.length > 0) {
+    return cfg.apiKeys.map((k) => ({ ...k }));
   }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+  if (typeof cfg.apiKey === "string" && cfg.apiKey.length > 0) {
+    return [{ label: "default", apiKey: cfg.apiKey, createdAt: "" }];
+  }
+  return [];
+}
+function writeKeysBack(cfg, keys) {
+  if (keys.length === 0) {
+    delete cfg.apiKeys;
+    delete cfg.apiKey;
+    delete cfg.activeKey;
+    return;
+  }
+  cfg.apiKeys = keys;
+  const active = keys.find((k) => k.label === cfg.activeKey) ?? expectDefined(keys[0]);
+  cfg.apiKey = active.apiKey;
+  if (!cfg.activeKey || !keys.some((k) => k.label === cfg.activeKey)) {
+    cfg.activeKey = active.label;
+  }
+}
+function activeLabel(cfg, keys) {
+  if (cfg.activeKey && keys.some((k) => k.label === cfg.activeKey)) return cfg.activeKey;
+  return keys[0]?.label;
+}
+function maskedKey(key) {
+  if (!key) return color.dim("\u2014");
+  if (key.length <= 8) return color.dim("\u2022".repeat(key.length));
+  const head = key.slice(0, 4);
+  const tail = key.slice(-4);
+  return `${color.dim(head + "\u2026")}${tail}`;
+}
+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"() {
+  }
+});
 function getSessionState(ctx) {
   if (!ctx) return sddState;
   let state = ctx.meta[SDD_META_KEY];
@@ -132,12 +217,6 @@ 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);
@@ -201,7 +280,7 @@ function getCurrentTask() {
   if (!tracker) return null;
   const nodes = tracker.getAllNodes({ status: ["in_progress"] });
   if (nodes.length === 0) return null;
-  const n = expectDefined3(nodes[0]);
+  const n = expectDefined(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() {
@@ -240,7 +319,7 @@ function renderTaskListWithProgress() {
     return (order[a.status] ?? 6) - (order[b.status] ?? 6);
   });
   for (let i = 0; i < sorted.length; i++) {
-    const n = expectDefined3(sorted[i]);
+    const n = expectDefined(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 = "";
@@ -254,7 +333,7 @@ function getCurrentExecutingContext() {
   if (!tracker) return null;
   const nodes = tracker.getAllNodes({ status: ["in_progress"] });
   if (nodes.length === 0) return null;
-  const n = expectDefined3(nodes[0]);
+  const n = expectDefined(nodes[0]);
   const elapsed = n.startedAt ? ` \xB7 elapsed: ${formatElapsed(Date.now() - n.startedAt)}` : "";
   const progress = tracker.getProgress();
   return [
@@ -562,12 +641,6 @@ __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();
 }
@@ -633,7 +706,7 @@ function buildSddCommand(opts) {
           }));
           sddState.setSessionStartTime(Date.now());
           sddState.setPhaseStartTime(Date.now());
-          const builder = expectDefined4(sddState.getBuilder());
+          const builder = expectDefined(sddState.getBuilder());
           builder.startSession(title);
           const aiPrompt = builder.getAIPrompt();
           return {
@@ -875,7 +948,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 = expectDefined4(sorted[i]);
+            const n = expectDefined(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);
@@ -883,7 +956,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 = expectDefined4(n.description.split("\n")[0]);
+              const first = expectDefined(n.description.split("\n")[0]);
               const truncated = first.length > 42 ? first.slice(0, 41) + "\u2026" : first;
               lines.push(`        \u21B3 ${truncated}`);
             }
@@ -1050,7 +1123,7 @@ Start executing the tasks one by one.`
           if (completed.length === 0) {
             return { message: "No completed tasks to undo." };
           }
-          const last = expectDefined4(completed[completed.length - 1]);
+          const last = expectDefined(completed[completed.length - 1]);
           undoTracker.updateNodeStatus(last.id, "pending");
           const progress = undoTracker.getProgress();
           return {
@@ -1100,7 +1173,7 @@ Start executing the tasks one by one.`
             `  \u{1F504} ${next.title}`
           ];
           if (next.description) {
-            const first = expectDefined4(next.description.split("\n")[0]);
+            const first = expectDefined(next.description.split("\n")[0]);
             lines.push(`     \u21B3 ${first}`);
           }
           const taskElapsed = next.startedAt ? ` \u23F1 ${formatElapsed(Date.now() - next.startedAt)}` : "";
@@ -1212,7 +1285,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 = expectDefined4(sorted2[i]);
+              const n = expectDefined(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}`);
             }
@@ -1237,7 +1310,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 = expectDefined4(sorted[i]);
+            const n = expectDefined(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}`);
           }
@@ -1285,7 +1358,7 @@ Start executing the tasks one by one.`
             maxQuestions: 10,
             sessionPath
           }));
-          const resumeBuilder = expectDefined4(sddState.getBuilder());
+          const resumeBuilder = expectDefined(sddState.getBuilder());
           const loaded = await resumeBuilder.loadSession();
           if (!loaded) {
             sddState.setBuilder(null);
@@ -1519,108 +1592,6 @@ 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 }));
-  }
-  if (typeof cfg.apiKey === "string" && cfg.apiKey.length > 0) {
-    return [{ label: "default", apiKey: cfg.apiKey, createdAt: "" }];
-  }
-  return [];
-}
-function writeKeysBack(cfg, keys) {
-  if (keys.length === 0) {
-    delete cfg.apiKeys;
-    delete cfg.apiKey;
-    delete cfg.activeKey;
-    return;
-  }
-  cfg.apiKeys = keys;
-  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;
-  }
-}
-function activeLabel(cfg, keys) {
-  if (cfg.activeKey && keys.some((k) => k.label === cfg.activeKey)) return cfg.activeKey;
-  return keys[0]?.label;
-}
-function maskedKey(key) {
-  if (!key) return color.dim("\u2014");
-  if (key.length <= 8) return color.dim("\u2022".repeat(key.length));
-  const head = key.slice(0, 4);
-  const tail = key.slice(-4);
-  return `${color.dim(head + "\u2026")}${tail}`;
-}
-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"() {
-  }
-});
 
 // src/update-check.ts
 var update_check_exports = {};
@@ -2337,7 +2308,7 @@ async function runWebUI(opts) {
       const keys = normalizeKeys(existing);
       const existingIdx = keys.findIndex((k) => k.label === label);
       if (existingIdx >= 0) {
-        keys[existingIdx] = { ...expectDefined7(keys[existingIdx]), apiKey, createdAt: nowIso() };
+        keys[existingIdx] = { ...expectDefined(keys[existingIdx]), apiKey, createdAt: nowIso() };
       } else {
         keys.push({ label, apiKey, createdAt: nowIso() });
       }
@@ -2471,14 +2442,6 @@ try {
   if (corePkg.wrongstackApiVersion) API_VERSION = corePkg.wrongstackApiVersion;
 } catch {
 }
-
-// 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:
@@ -2925,212 +2888,147 @@ function estimateTokens(messages) {
   }
   return total;
 }
-function buildAutonomyCommand(opts) {
+
+// src/slash-commands/auth.ts
+init_provider_config_utils();
+function buildAuthCommand(opts) {
+  const help = [
+    "Usage:",
+    "  /auth                      Show saved providers and key status",
+    "  /auth status <provider>    Show detail for one provider",
+    "  /auth open                 Show how to launch the interactive menu",
+    "",
+    "Run `wstack auth` for the full interactive key manager (add, edit, delete)."
+  ].join("\n");
   return {
-    name: "autonomy",
-    category: "Agent",
-    description: "Toggle or query autonomy mode (self-driving agent).",
-    help: [
-      "Usage:",
-      "  /autonomy            Show current autonomy status",
-      "  /autonomy off        Disabled \u2014 agent stops after each turn (default)",
-      "  /autonomy suggest    Show next-step suggestions after each turn",
-      "  /autonomy on         Auto-continue \u2014 agent picks next step and proceeds",
-      "  /autonomy eternal    Goal-driven loop \u2014 runs forever against /goal",
-      "                       (prompts to confirm an existing goal; `--keep` to skip prompt)",
-      "  /autonomy parallel   Parallel mode \u2014 4-8 agents per tick, fan-out parallelism",
-      "                       (prompts to confirm an existing goal; `--keep` to skip prompt)",
-      "  /autonomy stop       Stop eternal mode (no-op for other modes)",
-      "  /autonomy toggle     Cycle: off \u2192 suggest \u2192 auto \u2192 eternal \u2192 parallel \u2192 off",
-      "",
-      "Modes:",
-      "  off      \u2014 Normal interactive mode. Agent stops and waits.",
-      "  suggest  \u2014 After each turn, agent suggests next steps. You pick.",
-      "  auto     \u2014 After each turn, agent picks the best next step and continues.",
-      "             Runs indefinitely until you press Esc or Ctrl+C.",
-      "  eternal  \u2014 Goal-driven sense/decide/execute/reflect loop. Requires /goal.",
-      "             Force-enables regular YOLO; destructive-gated calls still use",
-      "             the permission flow. Runs until /autonomy stop or Ctrl+C twice.",
-      "  parallel \u2014 Fan-out 4\u20138 subagents per tick. Each tick decomposes the goal,",
-      "             spawns N agents, awaits results, aggregates. Requires /goal.",
-      "             Force-enables regular YOLO; destructive-gated calls still use",
-      "             the permission flow. Runs until /autonomy stop or Ctrl+C twice.",
-      "",
-      "Eternal stage flow: decide \u2192 execute \u2192 reflect \u2192 sleep | paused | stopped",
-      "Stage shown in real-time. Use /goal pause to pause, /goal resume to continue.",
-      "",
-      "In auto/eternal/parallel modes the agent works autonomously. Press Esc to redirect,",
-      "Ctrl+C to stop the active iteration. /autonomy stop ends the eternal loop."
-    ].join("\n"),
+    name: "auth",
+    category: "Config",
+    description: "View API key status. Run wstack auth for the full interactive key manager.",
+    help,
     async run(args) {
-      const parts = args.trim().toLowerCase().split(/\s+/).filter(Boolean);
-      const arg = parts[0] ?? "";
-      const modifiers = parts.slice(1);
-      if (!opts.onAutonomy) {
-        const msg2 = "Autonomy mode is not available in this session.";
-        opts.renderer.writeWarning(msg2);
-        return { message: msg2 };
-      }
-      if (!arg || arg === "status") {
-        const current = opts.onAutonomy();
-        const labels2 = {
-          off: `${color.green("OFF")} ${color.dim("(agent stops after each turn)")}`,
-          suggest: `${color.cyan("SUGGEST")} ${color.dim("(shows next-step suggestions)")}`,
-          auto: `${color.yellow("AUTO")} ${color.dim("(self-driving \u2014 Esc to redirect, Ctrl+C to stop)")}`,
-          eternal: `${color.red("ETERNAL")} ${color.dim("(goal-driven loop \u2014 YOLO, until /autonomy stop)")}`,
-          "eternal-parallel": `${color.magenta("PARALLEL")} ${color.dim("(4-8 subagents per tick \u2014 fan-out, until /autonomy stop)")}`
+      const parts = args.trim().split(/\s+/).filter(Boolean);
+      const sub = (parts[0] ?? "").toLowerCase();
+      if (sub === "help" || sub === "--help") {
+        return { message: this.help ?? "" };
+      }
+      if (!opts.paths?.globalConfig) {
+        return { message: `${color.red("Error")} auth not available \u2014 config path missing.` };
+      }
+      if (sub === "open") {
+        return {
+          message: [
+            `${color.bold("API Key Manager")}`,
+            "",
+            `  Run ${color.bold("wstack auth")} in a separate terminal to manage API keys interactively:`,
+            "",
+            `    ${color.cyan("wstack auth")}                 Interactive menu`,
+            `    ${color.cyan("wstack auth <provider>")}      Add a key for <provider>`,
+            `    ${color.cyan("wstack auth <p> --label <l>")}  Add with custom label`,
+            "",
+            color.dim("  The interactive menu requires standard input (readline) which is not"),
+            color.dim("  available inside the WrongStack session REPL.")
+          ].join("\n")
         };
-        const lines = [`Autonomy mode: ${labels2[current] ?? current}`];
-        try {
-          const goal = await loadGoal(goalFilePath(opts.projectRoot));
-          if (goal) {
-            const u = summarizeUsage(goal);
-            lines.push(
-              color.dim(
-                `  Goal: ${goal.goal.length > 80 ? `${goal.goal.slice(0, 77)}\u2026` : goal.goal}`
-              )
-            );
-            lines.push(
-              color.dim(
-                `  Engine state: ${goal.engineState}  \xB7  iterations: ${goal.iterations}  \xB7  journal: ${goal.journal.length}`
-              )
-            );
-            if (u.iterationsWithUsage > 0) {
-              lines.push(
-                color.dim(
-                  `  Spent: $${u.totalCostUsd.toFixed(4)}  \xB7  ${u.totalInputTokens} in / ${u.totalOutputTokens} out tokens`
-                )
-              );
-            }
-            const recent = goal.journal.slice(-10);
-            const failed = recent.filter((e) => e.status === "failure").length;
-            if (failed > 0) {
-              lines.push(
-                color.amber(`  Recent failures: ${failed} of last ${recent.length} iterations`)
-              );
-            }
+      }
+      let providers;
+      try {
+        providers = await loadConfigProviders(
+          opts.paths.globalConfig,
+          // We don't have a full vault reference in slash commands;
+          // use a simple passthrough vault since keys won't decrypt anyway
+          // in this read-only view and the config may not have encrypted fields.
+          {
+            encrypt: (v) => v,
+            decrypt: (v) => v,
+            isEncrypted: () => false
           }
-        } catch {
-        }
-        const msg2 = lines.join("\n");
-        opts.renderer.write(msg2);
-        return { message: msg2 };
+        );
+      } catch {
+        return { message: `${color.red("Error")} could not read config file.` };
       }
-      if (arg === "stop" || arg === "halt" || arg === "kill") {
-        if (!opts.onEternalStop) {
-          const msg3 = "No eternal-mode controller wired in this session.";
-          opts.renderer.writeWarning(msg3);
-          return { message: msg3 };
+      if (sub === "status") {
+        const pid = parts[1];
+        if (!pid) {
+          return { message: `${color.amber("Usage:")} /auth status <provider>` };
         }
-        opts.getEternalEngine?.()?.stop();
-        opts.getParallelEngine?.()?.stop();
-        opts.onEternalStop();
-        opts.onAutonomy("off");
-        let summaryLine = "";
-        try {
-          const goal = await loadGoal(goalFilePath(opts.projectRoot));
-          if (goal) {
-            const u = summarizeUsage(goal);
-            if (u.iterationsWithUsage > 0) {
-              summaryLine = "\n" + color.dim(
-                `  Spent so far: $${u.totalCostUsd.toFixed(4)} \xB7 ${u.totalInputTokens} in / ${u.totalOutputTokens} out tokens \xB7 ${goal.iterations} total iterations.`
-              );
-            } else if (goal.iterations > 0) {
-              summaryLine = "\n" + color.dim(`  Total iterations: ${goal.iterations}.`);
-            }
-          }
-        } catch {
+        const cfg = providers[pid];
+        if (!cfg) {
+          return { message: `${color.yellow("Provider")} "${pid}" not found in saved config.` };
         }
-        const msg2 = `${color.amber("Eternal/parallel mode stop requested.")} In-flight eternal work is cancelled; parallel fan-out stops after the current tick cleans up.${summaryLine}`;
-        opts.renderer.write(msg2);
-        return { message: msg2 };
-      }
-      let newMode;
-      if (arg === "on" || arg === "enable" || arg === "true" || arg === "auto") {
-        newMode = "auto";
-      } else if (arg === "off" || arg === "disable" || arg === "false") {
-        newMode = "off";
-      } else if (arg === "suggest" || arg === "suggestions") {
-        newMode = "suggest";
-      } else if (arg === "eternal" || arg === "forever" || arg === "infinite" || arg === "sittinsene") {
-        newMode = "eternal";
-      } else if (arg === "parallel" || arg === "eternal-parallel" || arg === "fanout") {
-        newMode = "eternal-parallel";
-      } else if (arg === "toggle" || arg === "cycle") {
-        const current = opts.onAutonomy() ?? "off";
-        const cycle = ["off", "suggest", "auto", "eternal", "eternal-parallel"];
-        newMode = cycle[(cycle.indexOf(current) + 1) % cycle.length] ?? "off";
-      } else {
-        const msg2 = `Unknown argument: ${arg}. Use /autonomy on, off, suggest, eternal, parallel, stop, or toggle.`;
-        opts.renderer.writeWarning(msg2);
-        return { message: msg2 };
-      }
-      if (newMode === "eternal" || newMode === "eternal-parallel") {
-        const wantKeep = modifiers.includes("--keep") || modifiers.includes("keep");
-        const wantNew = modifiers.includes("--new") || modifiers.includes("new");
-        const goal = await loadGoal(goalFilePath(opts.projectRoot));
-        if (!goal) {
-          const msg3 = `${color.red("Eternal/parallel mode requires a goal.")} Run \`/goal set <mission>\` first.`;
-          opts.renderer.writeWarning(msg3);
-          return { message: msg3 };
+        const keys = cfg.apiKeys ?? [];
+        const active = keys.find(
+          (k) => cfg && cfg.activeKey === k.label
+        ) ?? keys[0];
+        const lines2 = [
+          `${color.bold(pid)} ${cfg.family ? color.dim(`[${cfg.family}]`) : color.amber("[no family]")}`,
+          "",
+          `  type:    ${color.cyan(cfg.type ?? pid)}`,
+          `  family:  ${cfg.family ? color.cyan(cfg.family) : color.dim("unset")}`,
+          `  baseUrl: ${cfg.baseUrl ? color.cyan(cfg.baseUrl) : color.dim("unset")}`
+        ];
+        if (cfg.models?.length) {
+          lines2.push(`  models:  ${color.cyan(cfg.models.join(", "))}`);
         }
-        if (wantNew) {
-          const msg3 = `${color.amber("New mission requested.")} Clear the current goal first: ${color.bold("/goal clear")}, then ${color.bold("/goal set <mission>")}, then re-run ${color.bold(`/autonomy ${newMode}`)}.`;
-          opts.renderer.writeWarning(msg3);
-          return { message: msg3 };
+        if (cfg.envVars?.length) {
+          lines2.push(`  envVars: ${color.cyan(cfg.envVars.join(", "))}`);
         }
-        const isStale = goal.iterations > 0 || goal.engineState === "running";
-        if (!wantKeep) {
-          if (opts.confirm) {
-            const goalPreview = goal.goal.length > 80 ? `${goal.goal.slice(0, 77)}\u2026` : goal.goal;
-            const detail = isStale ? `${color.amber("Stale goal")} (${goal.iterations} iterations, engineState: ${goal.engineState}): "${goalPreview}". Continue with this mission?` : `Existing goal: "${goalPreview}". Use this mission?`;
-            const defaultYes = !isStale;
-            const answer = await opts.confirm(detail, defaultYes);
-            if (answer === null) {
-              const msg3 = `${color.dim("Cancelled.")} Autonomy mode unchanged.`;
-              opts.renderer.write(msg3);
-              return { message: msg3 };
-            }
-            if (!answer) {
-              const msg3 = `${color.amber("Skipped.")} To start a new mission: ${color.bold("/goal clear")} \u2192 ${color.bold("/goal set <mission>")} \u2192 ${color.bold(`/autonomy ${newMode}`)}. To force the existing one: ${color.bold(`/autonomy ${newMode} --keep`)}.`;
-              opts.renderer.write(msg3);
-              return { message: msg3 };
-            }
-          } else if (isStale) {
-            const msg3 = `${color.amber("Stale goal detected.")} Previous mission has ${goal.iterations} iterations (engineState: ${goal.engineState}). Clear it first: ${color.bold("/goal clear")}, then set a new one: ${color.bold("/goal set <mission>")}.`;
-            opts.renderer.writeWarning(msg3);
-            return { message: msg3 };
+        lines2.push("");
+        if (keys.length === 0) {
+          lines2.push(color.dim("  (no keys saved)"));
+        } else {
+          lines2.push(`  ${color.dim("Keys:")}`);
+          for (const k of keys) {
+            const marker = k.label === active?.label ? color.green("\u25CF") : color.dim("\u25CB");
+            const masked = k.label === active?.label ? color.dim("(active \u2014 masked)") : color.dim("(masked)");
+            lines2.push(
+              `    ${marker} ${color.bold(k.label.padEnd(18))} ${masked}  ${color.dim(k.createdAt)}`
+            );
           }
         }
-        if (!opts.onEternalStart) {
-          const msg3 = "Eternal mode controller is not wired in this session.";
-          opts.renderer.writeWarning(msg3);
-          return { message: msg3 };
-        }
-        if (opts.onYolo) opts.onYolo(true);
-        opts.onAutonomy(newMode);
-        opts.onEternalStart(newMode);
-        const modeLabel = newMode === "eternal-parallel" ? `${color.magenta("PARALLEL")} mode` : `${color.red("ETERNAL")} mode`;
-        const msg2 = `Autonomy mode: ${modeLabel} \u2014 engine launching against goal: ${color.bold(goal.goal)}
-${color.dim("Regular YOLO enabled; destructive-gated calls still use the permission flow. Use /autonomy stop to end. Journal at /goal journal.")}`;
-        opts.renderer.write(msg2);
-        return { message: msg2 };
+        lines2.push("", color.dim(`  Manage: wstack auth \u2192 pick ${pid}`));
+        return { message: lines2.join("\n") };
       }
-      const previous = opts.onAutonomy();
-      if ((previous === "eternal" || previous === "eternal-parallel") && opts.onEternalStop) {
-        opts.onEternalStop();
+      const ids = Object.keys(providers).sort();
+      if (ids.length === 0) {
+        return {
+          message: [
+            `${color.bold("API Keys")} ${color.dim("\u2014 No providers configured")}`,
+            "",
+            color.dim("  Run `wstack auth` to add a provider with an API key."),
+            "",
+            color.dim("  Quick start:"),
+            `    ${color.cyan("wstack auth")}              Interactive menu`,
+            `    ${color.cyan("wstack auth anthropic")}    Direct add`,
+            "",
+            color.dim("  Or /auth help for more commands.")
+          ].join("\n")
+        };
       }
-      opts.onAutonomy(newMode);
-      const labels = {
-        off: `${color.green("OFF")} \u2014 agent stops after each turn`,
-        suggest: `${color.cyan("SUGGEST")} \u2014 shows next-step suggestions after each turn`,
-        auto: `${color.yellow("AUTO")} \u2014 self-driving, agent continues automatically`,
-        eternal: `${color.red("ETERNAL")} \u2014 goal-driven sittin-sene loop`,
-        "eternal-parallel": `${color.magenta("PARALLEL")} \u2014 fan-out 4-8 subagents per tick`
-      };
-      const msg = `Autonomy mode: ${labels[newMode]}`;
-      opts.renderer.write(msg);
-      return { message: msg };
+      const lines = [
+        `${color.bold("API Keys")} ${color.dim(`\u2014 ${ids.length} provider${ids.length === 1 ? "" : "s"}`)}`,
+        ""
+      ];
+      for (const id of ids) {
+        const cfg = providers[id];
+        if (!cfg) continue;
+        const keys = cfg.apiKeys ?? [];
+        const famTag = cfg.family ? color.dim(`[${cfg.family}]`) : "";
+        const aliasTag = cfg.type && cfg.type !== id ? color.dim(`\u2192 ${cfg.type}`) : "";
+        let status;
+        if (keys.length === 0) {
+          status = color.amber("no keys");
+        } else if (keys.length === 1) {
+          status = color.green(`1 key`);
+        } else {
+          status = color.green(`${keys.length} keys`);
+        }
+        lines.push(
+          `  ${color.bold(id.padEnd(22))} ${famTag} ${aliasTag} ${status}`
+        );
+      }
+      lines.push("");
+      lines.push(color.dim("  /auth status <id>  Detail    /auth open  Full menu"));
+      return { message: lines.join("\n") };
     }
   };
 }
@@ -3292,6 +3190,215 @@ function buildAutoPhaseCommand(opts) {
     }
   };
 }
+function buildAutonomyCommand(opts) {
+  return {
+    name: "autonomy",
+    category: "Agent",
+    description: "Toggle or query autonomy mode (self-driving agent).",
+    help: [
+      "Usage:",
+      "  /autonomy            Show current autonomy status",
+      "  /autonomy off        Disabled \u2014 agent stops after each turn (default)",
+      "  /autonomy suggest    Show next-step suggestions after each turn",
+      "  /autonomy on         Auto-continue \u2014 agent picks next step and proceeds",
+      "  /autonomy eternal    Goal-driven loop \u2014 runs forever against /goal",
+      "                       (prompts to confirm an existing goal; `--keep` to skip prompt)",
+      "  /autonomy parallel   Parallel mode \u2014 4-8 agents per tick, fan-out parallelism",
+      "                       (prompts to confirm an existing goal; `--keep` to skip prompt)",
+      "  /autonomy stop       Stop eternal mode (no-op for other modes)",
+      "  /autonomy toggle     Cycle: off \u2192 suggest \u2192 auto \u2192 eternal \u2192 parallel \u2192 off",
+      "",
+      "Modes:",
+      "  off      \u2014 Normal interactive mode. Agent stops and waits.",
+      "  suggest  \u2014 After each turn, agent suggests next steps. You pick.",
+      "  auto     \u2014 After each turn, agent picks the best next step and continues.",
+      "             Runs indefinitely until you press Esc or Ctrl+C.",
+      "  eternal  \u2014 Goal-driven sense/decide/execute/reflect loop. Requires /goal.",
+      "             Force-enables regular YOLO; destructive-gated calls still use",
+      "             the permission flow. Runs until /autonomy stop or Ctrl+C twice.",
+      "  parallel \u2014 Fan-out 4\u20138 subagents per tick. Each tick decomposes the goal,",
+      "             spawns N agents, awaits results, aggregates. Requires /goal.",
+      "             Force-enables regular YOLO; destructive-gated calls still use",
+      "             the permission flow. Runs until /autonomy stop or Ctrl+C twice.",
+      "",
+      "Eternal stage flow: decide \u2192 execute \u2192 reflect \u2192 sleep | paused | stopped",
+      "Stage shown in real-time. Use /goal pause to pause, /goal resume to continue.",
+      "",
+      "In auto/eternal/parallel modes the agent works autonomously. Press Esc to redirect,",
+      "Ctrl+C to stop the active iteration. /autonomy stop ends the eternal loop."
+    ].join("\n"),
+    async run(args) {
+      const parts = args.trim().toLowerCase().split(/\s+/).filter(Boolean);
+      const arg = parts[0] ?? "";
+      const modifiers = parts.slice(1);
+      if (!opts.onAutonomy) {
+        const msg2 = "Autonomy mode is not available in this session.";
+        opts.renderer.writeWarning(msg2);
+        return { message: msg2 };
+      }
+      if (!arg || arg === "status") {
+        const current = opts.onAutonomy();
+        const labels2 = {
+          off: `${color.green("OFF")} ${color.dim("(agent stops after each turn)")}`,
+          suggest: `${color.cyan("SUGGEST")} ${color.dim("(shows next-step suggestions)")}`,
+          auto: `${color.yellow("AUTO")} ${color.dim("(self-driving \u2014 Esc to redirect, Ctrl+C to stop)")}`,
+          eternal: `${color.red("ETERNAL")} ${color.dim("(goal-driven loop \u2014 YOLO, until /autonomy stop)")}`,
+          "eternal-parallel": `${color.magenta("PARALLEL")} ${color.dim("(4-8 subagents per tick \u2014 fan-out, until /autonomy stop)")}`
+        };
+        const lines = [`Autonomy mode: ${labels2[current] ?? current}`];
+        try {
+          const goal = await loadGoal(goalFilePath(opts.projectRoot));
+          if (goal) {
+            const u = summarizeUsage(goal);
+            lines.push(
+              color.dim(
+                `  Goal: ${goal.goal.length > 80 ? `${goal.goal.slice(0, 77)}\u2026` : goal.goal}`
+              )
+            );
+            lines.push(
+              color.dim(
+                `  Engine state: ${goal.engineState}  \xB7  iterations: ${goal.iterations}  \xB7  journal: ${goal.journal.length}`
+              )
+            );
+            if (u.iterationsWithUsage > 0) {
+              lines.push(
+                color.dim(
+                  `  Spent: $${u.totalCostUsd.toFixed(4)}  \xB7  ${u.totalInputTokens} in / ${u.totalOutputTokens} out tokens`
+                )
+              );
+            }
+            const recent = goal.journal.slice(-10);
+            const failed = recent.filter((e) => e.status === "failure").length;
+            if (failed > 0) {
+              lines.push(
+                color.amber(`  Recent failures: ${failed} of last ${recent.length} iterations`)
+              );
+            }
+          }
+        } catch {
+        }
+        const msg2 = lines.join("\n");
+        opts.renderer.write(msg2);
+        return { message: msg2 };
+      }
+      if (arg === "stop" || arg === "halt" || arg === "kill") {
+        if (!opts.onEternalStop) {
+          const msg3 = "No eternal-mode controller wired in this session.";
+          opts.renderer.writeWarning(msg3);
+          return { message: msg3 };
+        }
+        opts.getEternalEngine?.()?.stop();
+        opts.getParallelEngine?.()?.stop();
+        opts.onEternalStop();
+        opts.onAutonomy("off");
+        let summaryLine = "";
+        try {
+          const goal = await loadGoal(goalFilePath(opts.projectRoot));
+          if (goal) {
+            const u = summarizeUsage(goal);
+            if (u.iterationsWithUsage > 0) {
+              summaryLine = "\n" + color.dim(
+                `  Spent so far: $${u.totalCostUsd.toFixed(4)} \xB7 ${u.totalInputTokens} in / ${u.totalOutputTokens} out tokens \xB7 ${goal.iterations} total iterations.`
+              );
+            } else if (goal.iterations > 0) {
+              summaryLine = "\n" + color.dim(`  Total iterations: ${goal.iterations}.`);
+            }
+          }
+        } catch {
+        }
+        const msg2 = `${color.amber("Eternal/parallel mode stop requested.")} In-flight eternal work is cancelled; parallel fan-out stops after the current tick cleans up.${summaryLine}`;
+        opts.renderer.write(msg2);
+        return { message: msg2 };
+      }
+      let newMode;
+      if (arg === "on" || arg === "enable" || arg === "true" || arg === "auto") {
+        newMode = "auto";
+      } else if (arg === "off" || arg === "disable" || arg === "false") {
+        newMode = "off";
+      } else if (arg === "suggest" || arg === "suggestions") {
+        newMode = "suggest";
+      } else if (arg === "eternal" || arg === "forever" || arg === "infinite" || arg === "sittinsene") {
+        newMode = "eternal";
+      } else if (arg === "parallel" || arg === "eternal-parallel" || arg === "fanout") {
+        newMode = "eternal-parallel";
+      } else if (arg === "toggle" || arg === "cycle") {
+        const current = opts.onAutonomy() ?? "off";
+        const cycle = ["off", "suggest", "auto", "eternal", "eternal-parallel"];
+        newMode = cycle[(cycle.indexOf(current) + 1) % cycle.length] ?? "off";
+      } else {
+        const msg2 = `Unknown argument: ${arg}. Use /autonomy on, off, suggest, eternal, parallel, stop, or toggle.`;
+        opts.renderer.writeWarning(msg2);
+        return { message: msg2 };
+      }
+      if (newMode === "eternal" || newMode === "eternal-parallel") {
+        const wantKeep = modifiers.includes("--keep") || modifiers.includes("keep");
+        const wantNew = modifiers.includes("--new") || modifiers.includes("new");
+        const goal = await loadGoal(goalFilePath(opts.projectRoot));
+        if (!goal) {
+          const msg3 = `${color.red("Eternal/parallel mode requires a goal.")} Run \`/goal set <mission>\` first.`;
+          opts.renderer.writeWarning(msg3);
+          return { message: msg3 };
+        }
+        if (wantNew) {
+          const msg3 = `${color.amber("New mission requested.")} Clear the current goal first: ${color.bold("/goal clear")}, then ${color.bold("/goal set <mission>")}, then re-run ${color.bold(`/autonomy ${newMode}`)}.`;
+          opts.renderer.writeWarning(msg3);
+          return { message: msg3 };
+        }
+        const isStale = goal.iterations > 0 || goal.engineState === "running";
+        if (!wantKeep) {
+          if (opts.confirm) {
+            const goalPreview = goal.goal.length > 80 ? `${goal.goal.slice(0, 77)}\u2026` : goal.goal;
+            const detail = isStale ? `${color.amber("Stale goal")} (${goal.iterations} iterations, engineState: ${goal.engineState}): "${goalPreview}". Continue with this mission?` : `Existing goal: "${goalPreview}". Use this mission?`;
+            const defaultYes = !isStale;
+            const answer = await opts.confirm(detail, defaultYes);
+            if (answer === null) {
+              const msg3 = `${color.dim("Cancelled.")} Autonomy mode unchanged.`;
+              opts.renderer.write(msg3);
+              return { message: msg3 };
+            }
+            if (!answer) {
+              const msg3 = `${color.amber("Skipped.")} To start a new mission: ${color.bold("/goal clear")} \u2192 ${color.bold("/goal set <mission>")} \u2192 ${color.bold(`/autonomy ${newMode}`)}. To force the existing one: ${color.bold(`/autonomy ${newMode} --keep`)}.`;
+              opts.renderer.write(msg3);
+              return { message: msg3 };
+            }
+          } else if (isStale) {
+            const msg3 = `${color.amber("Stale goal detected.")} Previous mission has ${goal.iterations} iterations (engineState: ${goal.engineState}). Clear it first: ${color.bold("/goal clear")}, then set a new one: ${color.bold("/goal set <mission>")}.`;
+            opts.renderer.writeWarning(msg3);
+            return { message: msg3 };
+          }
+        }
+        if (!opts.onEternalStart) {
+          const msg3 = "Eternal mode controller is not wired in this session.";
+          opts.renderer.writeWarning(msg3);
+          return { message: msg3 };
+        }
+        if (opts.onYolo) opts.onYolo(true);
+        opts.onAutonomy(newMode);
+        opts.onEternalStart(newMode);
+        const modeLabel = newMode === "eternal-parallel" ? `${color.magenta("PARALLEL")} mode` : `${color.red("ETERNAL")} mode`;
+        const msg2 = `Autonomy mode: ${modeLabel} \u2014 engine launching against goal: ${color.bold(goal.goal)}
+${color.dim("Regular YOLO enabled; destructive-gated calls still use the permission flow. Use /autonomy stop to end. Journal at /goal journal.")}`;
+        opts.renderer.write(msg2);
+        return { message: msg2 };
+      }
+      const previous = opts.onAutonomy();
+      if ((previous === "eternal" || previous === "eternal-parallel") && opts.onEternalStop) {
+        opts.onEternalStop();
+      }
+      opts.onAutonomy(newMode);
+      const labels = {
+        off: `${color.green("OFF")} \u2014 agent stops after each turn`,
+        suggest: `${color.cyan("SUGGEST")} \u2014 shows next-step suggestions after each turn`,
+        auto: `${color.yellow("AUTO")} \u2014 self-driving, agent continues automatically`,
+        eternal: `${color.red("ETERNAL")} \u2014 goal-driven sittin-sene loop`,
+        "eternal-parallel": `${color.magenta("PARALLEL")} \u2014 fan-out 4-8 subagents per tick`
+      };
+      const msg = `Autonomy mode: ${labels[newMode]}`;
+      opts.renderer.write(msg);
+      return { message: msg };
+    }
+  };
+}
 function buildBtwCommand(opts) {
   return {
     name: "btw",
@@ -5168,6 +5275,112 @@ function buildFleetCommand(opts) {
     }
   };
 }
+
+// src/slash-commands/goal-refiner.ts
+async function refineGoal(rawGoal, provider, model) {
+  const prompt = buildRefinementPrompt(rawGoal);
+  try {
+    const signal = AbortSignal.timeout(3e4);
+    const response = await provider.complete({
+      model,
+      system: [{ type: "text", text: prompt }],
+      messages: [{ role: "user", content: "Produce the refined goal." }],
+      maxTokens: 1e3
+    }, { signal });
+    const text = extractText(response);
+    if (!text) return null;
+    return parseRefinement(text, rawGoal);
+  } catch {
+    return null;
+  }
+}
+function buildRefinementPrompt(rawGoal) {
+  return [
+    "You are a goal refinement assistant. Your job is to take a user's raw",
+    "goal description and turn it into a clear, unambiguous, actionable mission",
+    "with concrete, verifiable deliverables.",
+    "",
+    "Rules:",
+    "- The refined goal must be self-contained \u2014 someone reading only the",
+    "  refined goal should understand exactly what to do without seeing the",
+    "  original.",
+    "- Each deliverable must be a single, checkable item. Prefer concrete",
+    '  artifacts: "file X exists at path Y", "test Z passes", "function A',
+    '  is refactored into module B". Avoid vague items like "improve code".',
+    "- Include acceptance criteria where helpful.",
+    "- If the goal is already clear and concrete, refine it minimally \u2014 do",
+    "  not add fluff.",
+    "",
+    "Output format (exact \u2014 use these markers):",
+    "",
+    "REFINED_GOAL:",
+    "<the refined goal text, 1-3 sentences>",
+    "",
+    "DELIVERABLES:",
+    "- <deliverable 1>",
+    "- <deliverable 2>",
+    "- ...",
+    "",
+    "---",
+    "",
+    `RAW GOAL: ${rawGoal}`,
+    "",
+    "---",
+    "",
+    "Now produce the refined version:"
+  ].join("\n");
+}
+function extractText(result) {
+  if (!result || typeof result !== "object") return null;
+  const r = result;
+  if (Array.isArray(r.content)) {
+    const texts = r.content.filter((b) => b.type === "text").map((b) => b.text ?? "");
+    return texts.join("") || null;
+  }
+  if (Array.isArray(r.choices)) {
+    const choice = r.choices[0];
+    return choice?.message?.content ?? null;
+  }
+  if (typeof r.text === "string") return r.text;
+  return null;
+}
+function parseRefinement(text, fallbackGoal) {
+  const refinedMatch = text.match(/REFINED_GOAL:\s*\n?([\s\S]*?)(?=\nDELIVERABLES:|$)/i);
+  const refinedGoal = refinedMatch?.[1]?.trim() || fallbackGoal;
+  const deliverablesMatch = text.match(/DELIVERABLES:\s*\n([\s\S]*?)$/i);
+  const deliverablesRaw = deliverablesMatch?.[1] ?? "";
+  const deliverables = deliverablesRaw.split("\n").map((line) => line.replace(/^[\s-]*[-*]\s*/, "").trim()).filter((line) => line.length > 0 && !line.startsWith("REFINED_GOAL"));
+  return {
+    refinedGoal,
+    deliverables: deliverables.length > 0 ? deliverables : []
+  };
+}
+function refineGoalHeuristic(rawGoal) {
+  const trimmed = rawGoal.trim();
+  return {
+    refinedGoal: trimmed,
+    deliverables: extractHeuristicDeliverables(trimmed)
+  };
+}
+function extractHeuristicDeliverables(goal) {
+  const deliverables = [];
+  const lines = goal.split(/[.;]\s*/);
+  for (const line of lines) {
+    const cleaned = line.trim();
+    if (!cleaned) continue;
+    if (/\b(add|build|create|fix|implement|refactor|write|remove|update|migrate|set up|configure|deploy|test|document)\b/i.test(
+      cleaned
+    )) {
+      deliverables.push(cleaned);
+    }
+  }
+  if (deliverables.length === 0) {
+    deliverables.push(goal.trim());
+  }
+  return deliverables;
+}
+
+// src/slash-commands/goal.ts
 var KNOWN_VERBS = /* @__PURE__ */ new Set([
   "",
   "show",
@@ -5179,25 +5392,31 @@ var KNOWN_VERBS = /* @__PURE__ */ new Set([
   "journal",
   "log",
   "pause",
-  "resume"
+  "resume",
+  "refine"
 ]);
 function buildGoalCommand(opts) {
   return {
     name: "goal",
     category: "Agent",
-    description: "Set, inspect, or clear the long-running autonomous mission used by /autonomy eternal.",
+    description: "Set, inspect, or clear the long-running autonomous mission. Auto-refines goals for clarity.",
     help: [
       "Usage:",
-      "  /goal                     Show current goal + recent journal",
-      "  /goal set <text>          Set a new goal (overwrites previous)",
+      "  /goal                     Show current goal + progress + recent journal",
+      "  /goal set <text>          Set a new goal (auto-refined for clarity)",
+      "  /goal refine              Re-refine the current goal",
       "  /goal clear               Clear the goal (stops eternal mode if running)",
-      "  /goal pause               Pause at end of current iteration (no-op if already paused)",
-      "  /goal resume              Resume a paused goal (no-op if not paused)",
-      "  /goal status              Same as /goal (alias)",
+      "  /goal pause               Pause at end of current iteration",
+      "  /goal resume              Resume a paused goal",
       "  /goal journal [N]         Show last N journal entries (default 25)",
       "",
+      "When a goal is set, WrongStack auto-refines it using the LLM to:",
+      "  \u2022 Make it unambiguous and concrete",
+      "  \u2022 Extract verifiable deliverables with acceptance criteria",
+      "  \u2022 Estimate completion progress (shown as a progress bar)",
+      "",
       "Stage flow: decide \u2192 execute \u2192 reflect \u2192 sleep | paused | stopped",
-      "Pausing stops after current iteration completes. Resume continues from next iteration.",
+      "The engine updates progress after each iteration toward the deliverable list.",
       "",
       "Goals live in ~/.wrongstack/projects/<hash>/goal.json and persist across sessions.",
       "A goal is the prerequisite for /autonomy eternal \u2014 the engine consults it on",
@@ -5233,24 +5452,93 @@ function buildGoalCommand(opts) {
             opts.renderer.writeWarning(msg2);
             return { message: msg2 };
           }
+          let refined = null;
+          if (opts.llmProvider && opts.llmModel) {
+            opts.renderer.write(color.dim("Refining goal with LLM\u2026"));
+            refined = await refineGoal(setText, opts.llmProvider, opts.llmModel);
+          }
+          if (!refined) {
+            refined = refineGoalHeuristic(setText);
+          }
           const existing = await loadGoal(goalPath);
-          const next = existing ? { ...existing, goal: setText, setAt: (/* @__PURE__ */ new Date()).toISOString(), lastActivityAt: (/* @__PURE__ */ new Date()).toISOString() } : emptyGoal(setText);
+          const now = (/* @__PURE__ */ new Date()).toISOString();
+          const next = existing ? {
+            ...existing,
+            goal: setText,
+            refinedGoal: refined.refinedGoal,
+            deliverables: refined.deliverables,
+            setAt: now,
+            lastActivityAt: now,
+            progress: void 0,
+            // reset progress
+            progressNote: void 0
+          } : {
+            ...emptyGoal(setText),
+            refinedGoal: refined.refinedGoal,
+            deliverables: refined.deliverables
+          };
           await saveGoal(goalPath, next);
-          const shortGoal = setText.length > 80 ? `${setText.slice(0, 80)}\u2026` : setText;
-          const msg = `\u{1F3AF} ${color.green("Goal locked:")} ${shortGoal}
-${color.dim(`Stored in ${goalPath} \u2014 Esc / /steer to redirect, Ctrl+C to stop.`)}`;
+          const lines = [];
+          lines.push(
+            `\u{1F3AF} ${color.green("Goal locked:")} ${color.bold(refined.refinedGoal)}`
+          );
+          if (refined.refinedGoal !== setText) {
+            lines.push(color.dim(`  (original: "${setText.length > 60 ? setText.slice(0, 60) + "\u2026" : setText}")`));
+          }
+          if (refined.deliverables.length > 0) {
+            lines.push("");
+            lines.push(`${color.bold("Deliverables")} (${refined.deliverables.length}):`);
+            for (const d of refined.deliverables) {
+              lines.push(`  ${color.dim("\u25CB")} ${d}`);
+            }
+          }
+          lines.push("");
+          lines.push(
+            color.dim(`Stored in ${goalPath} \u2014 progress tracked automatically.`)
+          );
+          const msg = lines.join("\n");
+          opts.renderer.write(msg);
+          return {
+            message: msg,
+            runText: buildGoalPreamble(refined.refinedGoal, refined.deliverables)
+          };
+        }
+        case "refine": {
+          const current = await loadGoal(goalPath);
+          if (!current) {
+            const msg2 = "No goal set to refine. Use /goal set <text> first.";
+            opts.renderer.writeWarning(msg2);
+            return { message: msg2 };
+          }
+          let refined = null;
+          if (opts.llmProvider && opts.llmModel) {
+            opts.renderer.write(color.dim("Re-refining goal with LLM\u2026"));
+            refined = await refineGoal(current.goal, opts.llmProvider, opts.llmModel);
+          }
+          if (!refined) {
+            refined = refineGoalHeuristic(current.goal);
+          }
+          const updated = {
+            ...current,
+            refinedGoal: refined.refinedGoal,
+            deliverables: refined.deliverables
+          };
+          await saveGoal(goalPath, updated);
+          const msg = `${color.green("\u2713")} Goal re-refined with ${refined.deliverables.length} deliverables.`;
           opts.renderer.write(msg);
-          return { message: msg, runText: buildGoalPreamble(setText) };
+          return { message: `${msg}
+
+${formatGoal(updated)}` };
         }
         case "clear":
         case "reset": {
-          const existing = await loadGoal(goalPath);
-          if (!existing) {
+          const current = await loadGoal(goalPath);
+          if (!current) {
             const msg2 = "No goal to clear.";
             opts.renderer.write(msg2);
             return { message: msg2 };
           }
-          const abandoned = { ...existing, goalState: "abandoned" };
+          const abandoned = { ...current, goalState: "abandoned" };
           await saveGoal(goalPath, abandoned);
           const { unlink: unlink4 } = await import('fs/promises');
           try {
@@ -5325,7 +5613,7 @@ ${lines.join("\n")}`;
           return { message: msg };
         }
         default: {
-          const msg = `Unknown subcommand "${verb}". Try: show | set <text> | clear | journal [N]`;
+          const msg = `Unknown subcommand "${verb}". Try: show | set <text> | refine | clear | journal [N]`;
           opts.renderer.writeWarning(msg);
           return { message: msg };
         }
@@ -5424,17 +5712,11 @@ 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 = expectDefined2(parts[0]);
+  const action = expectDefined(parts[0]);
   const name = parts[1] ?? "";
   const enable = parts.includes("--enable") || parts.includes("-e");
   switch (action) {
@@ -5681,7 +5963,7 @@ function buildMemoryCommand(opts) {
   return {
     name: "memory",
     category: "Inspect",
-    description: "Inspect or edit persistent memory: /memory [show|remember <text>|forget <query>|clear]",
+    description: "Inspect or edit persistent memory: /memory [show|remember <text>|forget <query>|clear|compact|stats]",
     async run(args) {
       const store = opts.memoryStore;
       if (!store) return { message: "No memory store configured." };
@@ -5714,14 +5996,350 @@ function buildMemoryCommand(opts) {
           await store.clear();
           return { message: "Cleared all memory scopes." };
         }
+        case "compact": {
+          return runCompact(opts);
+        }
+        case "stats": {
+          return runStats(opts);
+        }
         default:
           return {
-            message: `Unknown subcommand "${verb}". Try: show | remember <text> | forget <query> | clear`
+            message: `Unknown subcommand "${verb}". Try: show | remember <text> | forget <query> | clear | compact | stats`
           };
       }
     }
   };
 }
+function buildCompactPrompt(entries) {
+  const entriesBlock = entries.map(
+    (e, i) => `${i + 1}. [${e.ts.slice(0, 10)}] ${e.id}
+   ${e.text}${e.tags ? `
+   tags: ${e.tags.join(", ")}` : ""}${e.type ? `
+   type: ${e.type}` : ""}${e.priority ? `
+   priority: ${e.priority}` : ""}`
+  ).join("\n\n");
+  return `You are a memory curator. Your task is to review, deduplicate, and improve a set of long-term memory entries.
+
+These entries are injected into the context of an AI coding agent. Every token counts. The memory must be concise, accurate, and free of noise.
+
+## Current Memory Entries
+
+${entriesBlock}
+
+## Your Task
+
+Review each entry and return a JSON object with an "operations" array. Each operation targets one or more entries:
+
+### Actions
+
+- **"keep"** \u2014 The entry is valuable as-is. Include it in the operations so I know you reviewed it.
+- **"rewrite"** \u2014 The entry has value but needs better wording. Provide improved "newText". Target a single entry.
+- **"merge"** \u2014 Two or more entries say essentially the same thing. Combine them into one concise entry. The "targets" should list all entries being merged. Provide the combined "newText".
+- **"delete"** \u2014 The entry is obsolete, redundant, too vague, or not useful for future sessions. Target one or more entries.
+
+### Rules
+
+1. **Be ruthless about noise.** If an entry won't help a future AI agent do its job better, delete it.
+2. **Deduplicate aggressively.** Similar entries should be merged. Identical entries MUST be merged.
+3. **Keep entries concise.** Each entry should be one clear sentence. Remove filler words.
+4. **Preserve factual accuracy.** Don't change the meaning of entries unless they're wrong.
+5. **Handle every entry.** Every entry must appear in at least one operation (keep, rewrite, merge, or delete).
+6. **Prefer quality over quantity.** 10 excellent entries > 30 mediocre ones.
+7. **Tag entries appropriately.** If an entry mentions a technology or concept that could be tagged, suggest tags in the newText using #hashtag syntax.
+
+### Response Format
+
+Return ONLY valid JSON with this structure:
+
+{
+  "operations": [
+    { "action": "keep",    "targets": ["mem_1234_abcd"], "reason": "Clear and useful" },
+    { "action": "rewrite", "targets": ["mem_5678_ef01"], "newText": "Project uses pnpm v9 with ESM-only modules #pnpm #esm", "reason": "Added version and ESM detail" },
+    { "action": "merge",   "targets": ["mem_aaaa_1111", "mem_bbbb_2222"], "newText": "All packages use TypeScript strict mode with noUncheckedIndexedAccess #typescript", "reason": "Two entries about TS config, merged" },
+    { "action": "delete",  "targets": ["mem_cccc_3333"], "reason": "Obsolete \u2014 was a temporary debug note" }
+  ],
+  "summary": "Merged 2 TS entries, rewrote 1 for clarity, deleted 1 obsolete note. 12 entries \u2192 10 entries."
+}
+
+Use the EXACT entry IDs from the list above for "targets". No markdown, no explanation outside the JSON.`;
+}
+async function runCompact(opts) {
+  const store = opts.memoryStore;
+  if (!store) return { message: "No memory store configured." };
+  const entries = await store.list("project-memory");
+  if (entries.length === 0) {
+    return { message: "Memory is empty \u2014 nothing to compact." };
+  }
+  const raw = await store.read("project-memory");
+  const compactEntries = parseCompactEntries(raw);
+  if (compactEntries.length === 0) {
+    return { message: "No parseable entries found." };
+  }
+  const provider = opts.llmProvider;
+  if (!provider || !provider.complete) {
+    return { message: "No LLM provider available. /memory compact requires an active session with a configured provider." };
+  }
+  const prompt = buildCompactPrompt(compactEntries);
+  let responseText;
+  try {
+    const signal = AbortSignal.timeout(3e4);
+    const response = await provider.complete(
+      {
+        model: opts.llmModel ?? "",
+        system: [{ type: "text", text: prompt }],
+        messages: [
+          {
+            role: "user",
+            content: `Review the ${compactEntries.length} memory entries above and return operations as JSON.`
+          }
+        ],
+        maxTokens: 2e3,
+        temperature: 0.1
+        // low temperature for deterministic curation
+      },
+      { signal }
+    );
+    responseText = response.content.filter((b) => b.type === "text").map((b) => b.text).join("").trim();
+  } catch (err) {
+    return {
+      message: `LLM call failed: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+  if (!responseText) {
+    return { message: "LLM returned empty response." };
+  }
+  let parsed;
+  try {
+    const jsonMatch = responseText.match(/\{[\s\S]*\}/);
+    if (!jsonMatch) {
+      return { message: `LLM response is not valid JSON:
+${responseText.slice(0, 500)}` };
+    }
+    parsed = JSON.parse(jsonMatch[0]);
+  } catch (err) {
+    return {
+      message: `Failed to parse LLM response: ${err instanceof Error ? err.message : String(err)}
+
+Raw response:
+${responseText.slice(0, 500)}`
+    };
+  }
+  if (!Array.isArray(parsed.operations) || parsed.operations.length === 0) {
+    return { message: "LLM returned no operations." };
+  }
+  let kept = 0;
+  let rewritten = 0;
+  let merged = 0;
+  let deleted = 0;
+  const errors = [];
+  for (const op of parsed.operations) {
+    try {
+      switch (op.action) {
+        case "keep": {
+          kept += op.targets.length;
+          break;
+        }
+        case "rewrite": {
+          if (!op.newText) {
+            errors.push(`rewrite missing newText for targets: ${op.targets.join(", ")}`);
+            continue;
+          }
+          for (const target of op.targets) {
+            await store.forget(target);
+          }
+          await store.remember(op.newText);
+          rewritten++;
+          break;
+        }
+        case "merge": {
+          if (!op.newText) {
+            errors.push(`merge missing newText for targets: ${op.targets.join(", ")}`);
+            continue;
+          }
+          for (const target of op.targets) {
+            await store.forget(target);
+          }
+          await store.remember(op.newText);
+          merged++;
+          break;
+        }
+        case "delete": {
+          for (const target of op.targets) {
+            await store.forget(target);
+          }
+          deleted += op.targets.length;
+          break;
+        }
+        default: {
+          errors.push(`unknown action "${op.action}"`);
+        }
+      }
+    } catch (err) {
+      errors.push(
+        `${op.action} failed for ${op.targets.join(", ")}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  const lines = ["## Memory Compact \u2014 Complete"];
+  const stats = [];
+  if (kept > 0) stats.push(`${kept} kept`);
+  if (rewritten > 0) stats.push(`${rewritten} rewritten`);
+  if (merged > 0) stats.push(`${merged} merged`);
+  if (deleted > 0) stats.push(`${deleted} deleted`);
+  lines.push(`**Result:** ${stats.join(", ")}`);
+  lines.push(`**Before:** ${compactEntries.length} entries \u2192 **After:** ${kept + rewritten + merged} entries`);
+  if (parsed.summary) {
+    lines.push("");
+    lines.push(parsed.summary);
+  }
+  lines.push("");
+  lines.push("### Operations");
+  for (const op of parsed.operations) {
+    const icon = op.action === "keep" ? "\u2713" : op.action === "rewrite" ? "\u270F\uFE0F" : op.action === "merge" ? "\u{1F500}" : op.action === "delete" ? "\u2717" : "?";
+    const detail = op.newText ? ` \u2192 "${op.newText}"` : "";
+    lines.push(`- ${icon} **${op.action}** ${op.targets.join(", ")}${detail}`);
+    if (op.reason) lines.push(`  _${op.reason}_`);
+  }
+  if (errors.length > 0) {
+    lines.push("");
+    lines.push("### Errors");
+    for (const err of errors) {
+      lines.push(`- \u26A0\uFE0F ${err}`);
+    }
+  }
+  return { message: lines.join("\n") };
+}
+function parseCompactEntries(raw) {
+  const entries = [];
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith("- [")) continue;
+    const idMatch = trimmed.match(/mem_(\d+_\w+)/);
+    if (!idMatch) continue;
+    const id = idMatch[0] ?? "";
+    const afterId = trimmed.slice((idMatch.index ?? 0) + id.length).trim();
+    const tsMatch = trimmed.match(/^-\s*\[([^\]]+)\]/);
+    const ts = tsMatch?.[1] ?? "";
+    const tags = [];
+    const tagRe = /#([\w-]+)/g;
+    let tm;
+    while ((tm = tagRe.exec(afterId)) !== null) {
+      tags.push(tm[1] ?? "");
+    }
+    const text = afterId.replace(tagRe, "").replace(/\s{2,}/g, " ").trim();
+    if (!text) continue;
+    entries.push({ id, text, ts, tags: tags.length > 0 ? tags : void 0 });
+  }
+  return entries;
+}
+async function runStats(opts) {
+  const store = opts.memoryStore;
+  if (!store) return { message: "No memory store configured." };
+  const entries = await store.list("project-memory");
+  if (entries.length === 0) {
+    return { message: "\u{1F4CA} Memory is empty. Start adding entries with `/memory remember <text>`." };
+  }
+  const now = Date.now();
+  const lines = ["## \u{1F4CA} Memory Stats"];
+  const raw = await store.read("project-memory");
+  const byteSize = Buffer.byteLength(raw, "utf8");
+  const kbSize = (byteSize / 1024).toFixed(1);
+  const maxKb = (32e3 / 1024).toFixed(1);
+  const pctFull = (byteSize / 32e3 * 100).toFixed(0);
+  lines.push(`**Total:** ${entries.length} entries \xB7 ${kbSize} KB / ${maxKb} KB (${pctFull}%)`);
+  const byType = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    const t = e.type ?? "untyped";
+    byType.set(t, (byType.get(t) ?? 0) + 1);
+  }
+  if (byType.size > 0) {
+    lines.push("");
+    lines.push("### By Type");
+    const typeOrder = ["convention", "decision", "fact", "preference", "reference", "anti_pattern", "untyped"];
+    for (const t of typeOrder) {
+      const count = byType.get(t);
+      if (count) {
+        const bar = "\u2588".repeat(Math.min(count, 20));
+        lines.push(`- \`${t}\` ${bar} ${count}`);
+      }
+    }
+  }
+  const byPriority = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    const p = e.priority ?? "unset";
+    byPriority.set(p, (byPriority.get(p) ?? 0) + 1);
+  }
+  if (byPriority.size > 0) {
+    lines.push("");
+    lines.push("### By Priority");
+    const icon = { critical: "\u26A1", high: "\u25B2", medium: "\u25CF", low: "\u25CB", unset: "\xB7" };
+    for (const [p, count] of [...byPriority.entries()].sort((a, b) => b[1] - a[1])) {
+      lines.push(`- ${icon[p] ?? "\xB7"} \`${p}\`: ${count}`);
+    }
+  }
+  const ages = entries.map((e) => {
+    const ageDays = (now - new Date(e.ts).getTime()) / (1e3 * 60 * 60 * 24);
+    if (ageDays < 1) return "<1d";
+    if (ageDays < 7) return "<7d";
+    if (ageDays < 30) return "<30d";
+    return ">30d";
+  });
+  const byAge = /* @__PURE__ */ new Map();
+  for (const a of ages) byAge.set(a, (byAge.get(a) ?? 0) + 1);
+  lines.push("");
+  lines.push("### By Age");
+  for (const age of ["<1d", "<7d", "<30d", ">30d"]) {
+    const actual = byAge.get(age) ?? 0;
+    if (actual > 0 || age === "<7d") {
+      lines.push(`- ${age}: ${actual}`);
+    }
+  }
+  const tagCounts = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    for (const t of e.tags ?? []) {
+      tagCounts.set(t, (tagCounts.get(t) ?? 0) + 1);
+    }
+  }
+  if (tagCounts.size > 0) {
+    lines.push("");
+    lines.push("### Top Tags");
+    const sorted = [...tagCounts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 10);
+    for (const [tag, count] of sorted) {
+      lines.push(`- \`#${tag}\`: ${count}`);
+    }
+  }
+  lines.push("");
+  lines.push("### Health");
+  const untyped = byType.get("untyped") ?? 0;
+  const unsetPriority = byPriority.get("unset") ?? 0;
+  const old = byAge.get(">30d") ?? 0;
+  if (untyped > entries.length * 0.5) {
+    lines.push(`- \u26A0\uFE0F ${untyped}/${entries.length} entries have no type \u2014 run \`/memory compact\` to categorize`);
+  } else if (untyped > 0) {
+    lines.push(`- \u2139\uFE0F ${untyped} entries untyped \u2014 consider categorizing`);
+  } else {
+    lines.push("- \u2705 All entries have types");
+  }
+  if (unsetPriority > entries.length * 0.5) {
+    lines.push(`- \u26A0\uFE0F ${unsetPriority}/${entries.length} entries have no priority`);
+  } else if (unsetPriority > 0) {
+    lines.push(`- \u2139\uFE0F ${unsetPriority} entries have no priority set`);
+  } else {
+    lines.push("- \u2705 All entries have priorities");
+  }
+  if (old > 5) {
+    lines.push(`- \u26A0\uFE0F ${old} entries older than 30 days \u2014 run \`/memory compact\` to review`);
+  }
+  const pct2 = Number.parseInt(pctFull);
+  if (pct2 > 80) {
+    lines.push(`- \u26A0\uFE0F Storage ${pct2}% full \u2014 run \`/memory compact\` to free space`);
+  } else {
+    lines.push(`- \u2705 Storage ${pct2}% full \u2014 healthy`);
+  }
+  lines.push("");
+  lines.push("**Commands:** `/memory show` \xB7 `/memory compact` \xB7 `/memory remember <text>`");
+  return { message: lines.join("\n") };
+}
 async function runModePicker(modeStore, reader) {
   const modes = await modeStore.listModes();
   const active = await modeStore.getActiveMode();
@@ -6397,12 +7015,6 @@ 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,
@@ -6464,12 +7076,14 @@ async function patchGlobalConfig2(globalConfigPath, mutate) {
 function buildSetModelCommand(opts) {
   const help = [
     "Usage:",
-    "  /setmodel                              Show leader model + the task\u2192model matrix",
+    "  /setmodel                              Show leader model + matrix + resolution summary",
     "  /setmodel list                         List keyed providers, their models, and valid keys",
-    "  /setmodel leader <provider> <model>    Set the main (leader) model",
+    "  /setmodel leader <provider> <model>    Set the main (leader / brain) model",
     "  /setmodel set <key> <provider>/<model> Pin a role/phase/* to a model",
     "  /setmodel set <key> <model>            Pin to a model on the leader provider",
     "  /setmodel clear <key>                  Remove a matrix entry",
+    "  /setmodel resolve <role>              Walk the resolution chain for one role",
+    "  /setmodel doctor                       Validate matrix entries (orphans, typos, missing keys)",
     "",
     "Keys: a catalog role (e.g. security-scanner), a phase (" + MATRIX_PHASE_KEYS.join(", ") + "),",
     "or * for the fleet-wide default. Precedence at spawn: role \u2192 phase \u2192 * \u2192 leader.",
@@ -6483,24 +7097,57 @@ function buildSetModelCommand(opts) {
     const lines = [
       `${color.bold("WrongStack")} ${color.dim("\u2014 Models")}`,
       "",
-      `  leader: ${color.cyan(`${config.provider}/${config.model}`)}   ${color.dim("change: /setmodel leader <provider> <model>")}`,
-      "",
-      `  ${color.bold("task \u2192 model matrix")} ${color.dim("(role \u2192 phase \u2192 * \u2192 leader)")}`
+      `  ${color.bold("leader")}  ${color.cyan(`${config.provider}/${config.model}`)}   ${color.dim("/setmodel leader <provider> <model>")}`,
+      ""
     ];
     if (keys.length === 0) {
       lines.push(
-        `    ${color.dim("(empty)  set one: /setmodel set <role|phase|*> <provider>/<model>")}`
+        `  ${color.bold("matrix")} ${color.dim("(empty)")}`,
+        `    ${color.dim("pin a role: /setmodel set <role> <provider>/<model>")}`,
+        `    ${color.dim("set default: /setmodel set * <provider>/<model>")}`
       );
     } else {
+      lines.push(`  ${color.bold("matrix")} ${color.dim("(role \u2192 phase \u2192 * \u2192 leader)")}`);
       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(expectDefined5(matrix[k]))}   ${tag}`);
+        lines.push(`    ${color.amber(k.padEnd(22))} \u2192 ${fmtEntry(expectDefined(matrix[k]))}   ${tag}`);
+      }
+    }
+    const summaryRoles = getSummaryRoles();
+    if (summaryRoles.length > 0) {
+      lines.push("");
+      lines.push(`  ${color.bold("resolution")} ${color.dim("(selected roles)")}`);
+      for (const role of summaryRoles) {
+        const entry = resolveModelMatrix(matrix, role);
+        const provider = entry?.provider ?? config.provider;
+        const model = entry?.model ?? config.model;
+        const source = resolutionSource(matrix, role);
+        lines.push(`    ${color.dim(role.padEnd(22))} \u2192 ${color.cyan(`${provider}/${model}`)}  ${color.dim(source)}`);
       }
     }
-    lines.push("", color.dim("  /setmodel list for valid keys \xB7 /setmodel help for usage"));
+    lines.push("", color.dim("  /setmodel list \xB7 resolve <role> \xB7 doctor \xB7 help"));
     return lines.join("\n");
   }
+  function getSummaryRoles() {
+    const picks = [];
+    for (const phase of MATRIX_PHASE_KEYS) {
+      const agents = AGENTS_BY_PHASE[phase];
+      if (agents && agents.length > 0) {
+        picks.push(agents[0].config.role);
+      }
+    }
+    picks.push("security-scanner", "bug-hunter");
+    return [...new Set(picks)].sort();
+  }
+  function resolutionSource(matrix, role) {
+    if (!matrix) return "leader";
+    if (matrix[role]) return "role";
+    const phase = phaseForRole(role);
+    if (phase && matrix[phase]) return `phase (${phase})`;
+    if (matrix["*"]) return "default (*)";
+    return "leader";
+  }
   return {
     name: "setmodel",
     category: "Config",
@@ -6517,6 +7164,7 @@ function buildSetModelCommand(opts) {
       const config = opts.configStore.get();
       const keyed = keyedProviderIds(config);
       const globalConfigPath = opts.paths.globalConfig;
+      const matrix = config.modelMatrix ?? {};
       if (sub === "list") {
         const provLines = keyed.map((id) => {
           const models = config.providers?.[id]?.models ?? [];
@@ -6537,6 +7185,119 @@ function buildSetModelCommand(opts) {
           ].join("\n")
         };
       }
+      if (sub === "resolve") {
+        const role = parts[1];
+        if (!role) {
+          return { message: `${color.amber("Usage:")} /setmodel resolve <role>` };
+        }
+        const kind = matrixKeyKind(role);
+        if (kind === "unknown" && role !== "*") {
+          return {
+            message: `${color.red("Unknown role")}: "${role}". Use ${color.dim("/setmodel list")} to see valid roles.`
+          };
+        }
+        const lines = [
+          `${color.bold("Resolution chain")} for ${color.amber(role)}`,
+          ""
+        ];
+        const phase = phaseForRole(role);
+        const resolved = resolveModelMatrix(matrix, role);
+        if (matrix[role]) {
+          lines.push(`  1. matrix["${role}"] \u2192 ${fmtEntry(expectDefined(matrix[role]))}  ${color.green("\u2713 exact role")}`);
+        } else {
+          lines.push(`  1. matrix["${role}"] \u2192 ${color.dim("not set")}`);
+        }
+        if (phase) {
+          if (matrix[phase]) {
+            lines.push(`  2. matrix["${phase}"] \u2192 ${fmtEntry(expectDefined(matrix[phase]))}  ${matrix[role] ? color.dim("(skipped \u2014 role matched)") : color.green("\u2713 phase match")}`);
+          } else {
+            lines.push(`  2. matrix["${phase}"] \u2192 ${color.dim("not set")}`);
+          }
+        }
+        if (matrix["*"]) {
+          const skipped = matrix[role] || phase && matrix[phase];
+          lines.push(`  3. matrix["*"] \u2192 ${fmtEntry(expectDefined(matrix["*"]))}  ${skipped ? color.dim("(skipped)") : color.green("\u2713 default")}`);
+        } else {
+          lines.push(`  3. matrix["*"] \u2192 ${color.dim("not set")}`);
+        }
+        const leaderSkipped = matrix[role] || phase && matrix[phase] || matrix["*"];
+        lines.push(`  4. ${color.dim("leader fallback")} \u2192 ${color.cyan(`${config.provider}/${config.model}`)}  ${leaderSkipped ? color.dim("(skipped)") : color.green("\u2713 used")}`);
+        lines.push("");
+        if (resolved) {
+          const rp = resolved.provider ?? config.provider;
+          lines.push(`${color.green("\u2713 Resolved")}: ${color.cyan(`${rp}/${resolved.model}`)}`);
+        } else {
+          lines.push(`${color.green("\u2713 Resolved")}: ${color.cyan(`${config.provider}/${config.model}`)} ${color.dim("(leader)")}`);
+        }
+        return { message: lines.join("\n") };
+      }
+      if (sub === "doctor") {
+        const issues = [];
+        const warnings = [];
+        for (const [key, entry] of Object.entries(matrix)) {
+          const kind = matrixKeyKind(key);
+          if (kind === "unknown") {
+            issues.push(
+              `${color.red("\u2717")} ${color.amber(key)}: not a valid role, phase, or * \u2014 ${color.dim("typo or stale entry?")}`
+            );
+          }
+          if (entry.provider) {
+            const provCfg2 = config.providers?.[entry.provider];
+            if (!provCfg2) {
+              issues.push(
+                `${color.red("\u2717")} ${color.amber(key)}: provider "${entry.provider}" is not configured`
+              );
+            } else if (!providerHasKey(provCfg2)) {
+              warnings.push(
+                `${color.amber("\u26A0")} ${color.amber(key)}: provider "${entry.provider}" has no API key`
+              );
+            }
+          }
+          const effectiveProvider = entry.provider ?? config.provider;
+          const provCfg = config.providers?.[effectiveProvider];
+          if (provCfg?.models && provCfg.models.length > 0) {
+            if (!provCfg.models.includes(entry.model)) {
+              warnings.push(
+                `${color.amber("\u26A0")} ${color.amber(key)}: model "${entry.model}" not in ${effectiveProvider}'s model list (${provCfg.models.join(", ")})`
+              );
+            }
+          }
+        }
+        if (Object.keys(matrix).length > 0 && !matrix["*"]) {
+          const covered = /* @__PURE__ */ new Set();
+          for (const [key] of Object.entries(matrix)) {
+            covered.add(key);
+          }
+          const phasesCovered = new Set(Object.keys(matrix).filter((k) => matrixKeyKind(k) === "phase"));
+          const unprotected = [];
+          for (const role of Object.keys(AGENT_CATALOG)) {
+            if (covered.has(role)) continue;
+            const ph = phaseForRole(role);
+            if (ph && phasesCovered.has(ph)) continue;
+            unprotected.push(role);
+          }
+          if (unprotected.length > 0) {
+            const sample = unprotected.slice(0, 10);
+            const suffix = unprotected.length > 10 ? ` +${unprotected.length - 10} more` : "";
+            warnings.push(
+              `${color.amber("\u26A0")} ${unprotected.length} role(s) have no matrix coverage and no * default: ${sample.join(", ")}${suffix}`
+            );
+          }
+        }
+        const header = [
+          `${color.bold("Matrix Doctor")} ${color.dim("\u2014 " + Object.keys(matrix).length + " entries")}`,
+          ""
+        ];
+        if (issues.length === 0 && warnings.length === 0) {
+          header.push(`${color.green("\u2713")} All matrix entries are valid. No issues found.`);
+        }
+        const allLines = [
+          ...header,
+          ...issues.length ? ["", `${color.bold("Issues")}:`, ...issues] : [],
+          ...warnings.length ? ["", `${color.bold("Warnings")}:`, ...warnings] : []
+        ];
+        return { message: allLines.join("\n") };
+      }
       try {
         if (sub === "leader") {
           const provider = parts[1];
@@ -6581,9 +7342,9 @@ function buildSetModelCommand(opts) {
             };
           }
           const decrypted = await patchGlobalConfig2(globalConfigPath, (cfg) => {
-            const matrix = { ...cfg.modelMatrix ?? {} };
-            matrix[key] = parsed.provider ? { provider: parsed.provider, model: parsed.model } : { model: parsed.model };
-            cfg.modelMatrix = matrix;
+            const matrix2 = { ...cfg.modelMatrix ?? {} };
+            matrix2[key] = parsed.provider ? { provider: parsed.provider, model: parsed.model } : { model: parsed.model };
+            cfg.modelMatrix = matrix2;
           });
           opts.configStore.update({
             modelMatrix: decrypted.modelMatrix
@@ -6598,9 +7359,9 @@ function buildSetModelCommand(opts) {
             return { message: `${color.amber("No matrix entry")} for "${key}".` };
           }
           const decrypted = await patchGlobalConfig2(globalConfigPath, (cfg) => {
-            const matrix = { ...cfg.modelMatrix ?? {} };
-            delete matrix[key];
-            cfg.modelMatrix = matrix;
+            const matrix2 = { ...cfg.modelMatrix ?? {} };
+            delete matrix2[key];
+            cfg.modelMatrix = matrix2;
           });
           opts.configStore.update({
             modelMatrix: decrypted.modelMatrix
@@ -7169,6 +7930,198 @@ function buildTodosCommand(opts) {
     }
   };
 }
+function findTask(tasks, query) {
+  const asIndex = Number.parseInt(query, 10);
+  if (!Number.isNaN(asIndex)) {
+    const idx = asIndex - 1;
+    const item = tasks[idx];
+    if (item) return { idx, item };
+  }
+  const byId = tasks.findIndex((t) => t.id === query);
+  if (byId >= 0) {
+    const item = tasks[byId];
+    if (item) return { idx: byId, item };
+  }
+  const q = query.toLowerCase();
+  const byTitle = tasks.findIndex((t) => t.title.toLowerCase().includes(q));
+  if (byTitle >= 0) {
+    const item = tasks[byTitle];
+    if (item) return { idx: byTitle, item };
+  }
+  return null;
+}
+function validateType(s) {
+  const valid = ["feature", "bugfix", "refactor", "docs", "test", "chore"];
+  return valid.includes(s) ? s : null;
+}
+function validatePriority(s) {
+  const valid = ["critical", "high", "medium", "low"];
+  return valid.includes(s) ? s : null;
+}
+function validateStatus(s) {
+  const valid = ["pending", "in_progress", "blocked", "failed", "review", "completed"];
+  return valid.includes(s) ? s : null;
+}
+function buildTasksCommand(_opts) {
+  return {
+    name: "tasks",
+    category: "Inspect",
+    description: "Manage structured tasks with dependencies, types, and priorities: /tasks [show|add <title>|start|done|fail|status <id> <status>|promote <id>|clear]",
+    help: [
+      "Usage:",
+      "  /tasks                            Show task progress + list",
+      "  /tasks show                       Same as no args",
+      "  /tasks add <title> [type] [prio]  Add a task",
+      "  /tasks start <id|index>           Mark task in-progress",
+      "  /tasks done <id|index>            Mark task completed",
+      "  /tasks fail <id|index>            Mark task failed",
+      "  /tasks status <id> <status>       Set exact status (pending|in_progress|blocked|review|completed|failed)",
+      "  /tasks depends <id> <depId...>    Set dependencies for a task",
+      "  /tasks assign <id> <agent>        Assign task to an agent/subagent",
+      "  /tasks promote <id>               Promote task to todo items",
+      "  /tasks clear                      Remove all tasks",
+      "",
+      "Types: feature, bugfix, refactor, docs, test, chore",
+      "Priorities: critical, high, medium, low"
+    ].join("\n"),
+    async run(args, ctx) {
+      const taskPath = ctx.meta?.["task.path"];
+      if (typeof taskPath !== "string" || !taskPath) {
+        return { message: "Task storage is not configured for this session." };
+      }
+      const sessionId = ctx.session?.id ?? "unknown";
+      const file = await loadTasks(taskPath) ?? emptyTaskFile(sessionId);
+      const [verb, ...rest] = args.trim().split(/\s+/);
+      const restJoined = rest.join(" ").trim();
+      switch (verb) {
+        case "":
+        case "show":
+        case "list":
+          return { message: formatTaskList(file.tasks) };
+        case "progress":
+        case "statusline":
+          return { message: formatTaskProgress(file.tasks) };
+        case "add": {
+          if (!restJoined) return { message: "Usage: /tasks add <title> [type] [priority]" };
+          const parts = restJoined.split(/\s+/);
+          const title = parts[0] ?? "";
+          const type = validateType(parts[1] ?? "") ?? "feature";
+          const priority = validatePriority(parts[2] ?? "") ?? "medium";
+          const now = (/* @__PURE__ */ new Date()).toISOString();
+          const task = {
+            id: `task_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+            title,
+            type,
+            priority,
+            status: "pending",
+            createdAt: now,
+            updatedAt: now
+          };
+          file.tasks.push(task);
+          await saveTasks(taskPath, file);
+          return { message: `Added: ${task.title}
+
+${formatTaskProgress(file.tasks)}` };
+        }
+        case "start":
+        case "done":
+        case "fail": {
+          if (!restJoined) return { message: `Usage: /tasks ${verb} <id|index>` };
+          const found = findTask(file.tasks, restJoined);
+          if (!found) return { message: `No task matched "${restJoined}".` };
+          const statusMap = {
+            start: "in_progress",
+            done: "completed",
+            fail: "failed"
+          };
+          found.item.status = statusMap[verb] ?? "pending";
+          found.item.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await saveTasks(taskPath, file);
+          return { message: `Marked ${verb}: ${found.item.title}
+
+${formatTaskProgress(file.tasks)}` };
+        }
+        case "status": {
+          if (rest.length < 2) return { message: "Usage: /tasks status <id> <pending|in_progress|blocked|review|completed|failed>" };
+          const targetId = rest[0] ?? "";
+          const newStatus = validateStatus(rest[1] ?? "");
+          if (!newStatus) return { message: `Invalid status "${rest[1]}". Use: pending, in_progress, blocked, review, completed, failed.` };
+          const found = findTask(file.tasks, targetId);
+          if (!found) return { message: `No task matched "${targetId}".` };
+          found.item.status = newStatus;
+          found.item.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await saveTasks(taskPath, file);
+          return { message: `Status \u2192 ${newStatus}: ${found.item.title}
+
+${formatTaskProgress(file.tasks)}` };
+        }
+        case "depends":
+        case "deps": {
+          if (rest.length < 2) return { message: "Usage: /tasks depends <id> <depId1> [depId2 ...]" };
+          const targetId = rest[0] ?? "";
+          const depIds = rest.slice(1);
+          const found = findTask(file.tasks, targetId);
+          if (!found) return { message: `No task matched "${targetId}".` };
+          found.item.dependsOn = depIds;
+          found.item.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await saveTasks(taskPath, file);
+          return { message: `Dependencies set for "${found.item.title}": ${depIds.join(", ")}` };
+        }
+        case "assign": {
+          if (rest.length < 2) return { message: "Usage: /tasks assign <id> <agent>" };
+          const targetId = rest[0] ?? "";
+          const agent = rest.slice(1).join(" ");
+          const found = findTask(file.tasks, targetId);
+          if (!found) return { message: `No task matched "${targetId}".` };
+          found.item.assignee = agent;
+          found.item.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await saveTasks(taskPath, file);
+          return { message: `Assigned to ${agent}: "${found.item.title}"` };
+        }
+        case "promote": {
+          if (!restJoined) return { message: "Usage: /tasks promote <id|index>" };
+          const found = findTask(file.tasks, restJoined);
+          if (!found) return { message: `No task matched "${restJoined}".` };
+          found.item.status = "in_progress";
+          found.item.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          const todos = [
+            {
+              id: `todo_${Date.now()}_task`,
+              content: found.item.title,
+              status: "in_progress",
+              activeForm: found.item.title
+            }
+          ];
+          if (found.item.description) {
+            todos.push({
+              id: `todo_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+              content: found.item.description.slice(0, 200),
+              status: "pending"
+            });
+          }
+          ctx.state.replaceTodos(todos);
+          await saveTasks(taskPath, file);
+          return {
+            message: `Promoted to ${todos.length} todo(s): "${found.item.title}"
+
+${formatTaskProgress(file.tasks)}`
+          };
+        }
+        case "clear": {
+          const n = file.tasks.length;
+          if (n === 0) return { message: "Tasks were already empty." };
+          file.tasks = [];
+          await saveTasks(taskPath, file);
+          return { message: `Cleared ${n} task${n === 1 ? "" : "s"}.` };
+        }
+        default:
+          return {
+            message: `Unknown subcommand "${verb}". Try: show | add <title> | start <id> | done <id> | fail <id> | status <id> <s> | depends <id> <deps> | assign <id> <agent> | promote <id> | clear`
+          };
+      }
+    }
+  };
+}
 function buildToolsCommand(opts) {
   return {
     name: "tools",
@@ -7296,6 +8249,7 @@ function buildBuiltinSlashCommands(opts) {
     buildPluginCommand(opts),
     buildPruneCommand(opts),
     buildMcpSlashCommand(opts),
+    buildAuthCommand(opts),
     buildDiagCommand(opts),
     buildStatsCommand(opts),
     buildSpawnCommand(opts),
@@ -7305,6 +8259,7 @@ function buildBuiltinSlashCommands(opts) {
     buildEnhanceCommand(opts),
     buildMemoryCommand(opts),
     buildTodosCommand(opts),
+    buildTasksCommand(),
     buildSddCommand(opts),
     buildSaveCommand(opts),
     buildLoadCommand(opts),
@@ -7433,7 +8388,7 @@ async function runProjectCheck(opts) {
       try {
         const { spawn: spawn4 } = await import('child_process');
         await new Promise((resolve5, reject) => {
-          const child = spawn4("git", ["init"], { cwd });
+          const child = spawn4("git", ["init"], { cwd, signal: AbortSignal.timeout(1e4) });
           child.on("error", reject);
           child.on("close", (code) => code === 0 ? resolve5() : reject(new Error(`git init failed with ${code}`)));
         });
@@ -8139,20 +9094,14 @@ 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: atomicWrite14 } = await import('@wrongstack/core');
-    const fs26 = await import('fs/promises');
+    const fs27 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs26.readFile(configPath2, "utf8");
+      const raw = await fs27.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -8340,7 +9289,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 = expectDefined6(page[i]);
+      const m = expectDefined(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 ?? "?"}` : "";
@@ -8488,12 +9437,12 @@ function pickGroupIndex(opts) {
     try {
       let current = 0;
       try {
-        const parsed = Number.parseInt(fs12.readFileSync(opts.cursorFile, "utf8").trim(), 10);
+        const parsed = Number.parseInt(fs13.readFileSync(opts.cursorFile, "utf8").trim(), 10);
         if (Number.isFinite(parsed)) current = wrap(parsed);
       } catch {
       }
-      fs12.mkdirSync(path8.dirname(opts.cursorFile), { recursive: true });
-      fs12.writeFileSync(opts.cursorFile, String(wrap(current + 1)));
+      fs13.mkdirSync(path8.dirname(opts.cursorFile), { recursive: true });
+      fs13.writeFileSync(opts.cursorFile, String(wrap(current + 1)));
       return current;
     } catch {
     }
@@ -9001,333 +9950,201 @@ async function spawnACPAgent(args, deps) {
   }
 }
 
-// src/auth-menu.ts
+// src/auth-menu/add-provider.ts
 init_provider_config_utils();
-async function runAuthMenu(deps) {
-  for (; ; ) {
-    const providers = await loadProviders(deps);
-    renderTopMenu(deps.renderer, providers);
-    const ids = Object.keys(providers).sort();
-    const choice = (await deps.reader.readLine(`
-${color.amber("?")} Pick: `)).trim().toLowerCase();
-    if (!choice || choice === "q" || choice === "quit" || choice === "exit") {
-      deps.renderer.write(color.dim("Done.\n"));
-      return 0;
-    }
-    if (choice === "a" || choice === "add") {
-      await addForNewProvider(deps);
-      continue;
-    }
-    if (choice === "c" || choice === "custom") {
-      await addCustomProvider(deps);
-      continue;
-    }
-    const idx = Number.parseInt(choice, 10);
-    if (!Number.isNaN(idx) && idx >= 1 && idx <= ids.length) {
-      const pid = expectDefined7(ids[idx - 1]);
-      await manageProvider(pid, deps);
-      continue;
-    }
-    const byId = ids.find((id) => id.toLowerCase() === choice);
-    if (byId) {
-      await manageProvider(byId, deps);
-      continue;
-    }
-    deps.renderer.writeError(`Unknown selection: "${choice}"`);
-  }
+
+// src/auth-menu/helpers.ts
+init_provider_config_utils();
+async function loadProviders(deps) {
+  return loadConfigProviders(deps.globalConfigPath, deps.vault, {
+    warn: (msg) => deps.renderer.writeWarning(msg)
+  });
 }
-function renderTopMenu(renderer, providers) {
-  renderer.write(`
-${color.bold("WrongStack")} ${color.dim("\u2014 API keys")}
 
-`);
-  const ids = Object.keys(providers).sort();
-  if (ids.length === 0) {
-    renderer.write(color.dim("  No providers configured yet.\n"));
+// src/auth-menu/shared.ts
+init_provider_config_utils();
+function renderProviderLine(renderer, id, cfg, idx) {
+  const keys = normalizeKeys(cfg);
+  const active = activeLabel(cfg, keys);
+  const firstKey = keys[0];
+  let summary;
+  if (keys.length === 0) {
+    summary = color.dim("(no keys)");
+  } else if (keys.length === 1) {
+    summary = maskedKey(firstKey?.apiKey ?? "");
   } else {
-    renderer.write(`  ${color.dim("Saved providers:")}
-`);
-    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 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(
-        `    ${color.dim(`${idx}.`.padStart(4))} ${id.padEnd(22)} ${fam} ${aliasHint} ${summary}
-`
-      );
-      idx++;
-    }
-  }
-  renderer.write(`
-  ${color.dim("Actions:")}
-`);
-  renderer.write(`    ${color.bold("a")}  Add key for a new provider (from catalog)
-`);
-  renderer.write(`    ${color.bold("c")}  Add custom provider (type + family + baseUrl)
-`);
-  renderer.write(`    ${color.bold("q")}  Quit
-`);
-  if (ids.length > 0) {
-    renderer.write(color.dim(`
-  Pick a number to manage that provider's keys.
-`));
+    const activeKeyObj = active != null ? keys.find((k) => k.label === active) : void 0;
+    summary = `${color.dim(`${keys.length} keys`)} ${color.dim("active:")} ${color.bold(active ?? "?")} ` + maskedKey(activeKeyObj?.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(
+    `    ${color.dim(`${idx}.`.padStart(4))} ${id.padEnd(22)} ${fam} ${aliasHint} ${summary}
+`
+  );
 }
-async function manageProvider(providerId, deps) {
-  for (; ; ) {
-    const providers = await loadProviders(deps);
-    const cfg = providers[providerId];
-    if (!cfg) {
-      deps.renderer.writeError(`Provider "${providerId}" no longer in config.`);
-      return;
-    }
-    const keys = normalizeKeys(cfg);
-    const active = activeLabel(cfg, keys);
-    deps.renderer.write(
-      `
+function renderProviderHeader(renderer, providerId, cfg) {
+  const keys = normalizeKeys(cfg);
+  const active = activeLabel(cfg, keys);
+  renderer.write(
+    `
 ${color.bold(providerId)} ${cfg.family ? color.dim(`[${cfg.family}]`) : color.amber("[no family]")}
 `
-    );
-    deps.renderer.write(
-      color.dim(`  type:    ${cfg.type ?? providerId}
-`) + color.dim(
-        `  family:  ${cfg.family ?? "(unset \u2192 resolved from models.dev when type matches)"}
-`
-      ) + color.dim(`  baseUrl: ${cfg.baseUrl ?? "(unset \u2192 catalog default)"}
-`)
-    );
-    if (cfg.envVars && cfg.envVars.length > 0) {
-      deps.renderer.write(color.dim(`  envVars: ${cfg.envVars.join(", ")}
-`));
-    }
-    if (cfg.models && cfg.models.length > 0) {
-      deps.renderer.write(color.dim(`  models:  ${cfg.models.join(", ")}
-`));
+  );
+  const details = [
+    color.dim(`  type:    ${cfg.type ?? providerId}`),
+    color.dim(
+      `  family:  ${cfg.family ?? "(unset \u2192 resolved from models.dev when type matches)"}`
+    ),
+    color.dim(`  baseUrl: ${cfg.baseUrl ?? "(unset \u2192 catalog default)"}`)
+  ];
+  if (cfg.envVars && cfg.envVars.length > 0) {
+    details.push(color.dim(`  envVars: ${cfg.envVars.join(", ")}`));
+  }
+  if (cfg.models && cfg.models.length > 0) {
+    details.push(color.dim(`  models:  ${cfg.models.join(", ")}`));
+  }
+  renderer.write(details.join("\n") + "\n");
+  if (keys.length === 0) {
+    renderer.write(color.dim("  (no keys saved)\n"));
+  } else {
+    for (let i = 0; i < keys.length; i++) {
+      renderKeyLine(renderer, keys[i], i + 1, active);
     }
-    if (keys.length === 0) {
-      deps.renderer.write(color.dim("  (no keys saved)\n"));
-    } else {
-      for (let i = 0; i < keys.length; 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)}
+  }
+}
+function renderKeyLine(renderer, key, idx, active) {
+  const marker = key.label === active ? color.green("\u25CF") : color.dim("\u25CB");
+  renderer.write(
+    `  ${color.dim(`${idx}.`.padStart(4))} ${marker} ${key.label.padEnd(20)} ${maskedKey(key.apiKey)}  ${color.dim(key.createdAt)}
 `
-        );
-      }
-    }
-    deps.renderer.write(`
+  );
+}
+function renderActions(renderer, keysLength) {
+  renderer.write(`
   ${color.dim("Actions:")}
 `);
-    deps.renderer.write(`    ${color.bold("a")}        Add another key
+  renderer.write(`    ${color.bold("a")}        Add another key
 `);
-    if (keys.length > 0) {
-      deps.renderer.write(`    ${color.bold("u")} <n>    Update key <n>
+  if (keysLength > 0) {
+    renderer.write(`    ${color.bold("u")} <n>    Update key <n>
 `);
-      deps.renderer.write(`    ${color.bold("d")} <n>    Delete key <n>
+    renderer.write(`    ${color.bold("d")} <n>    Delete key <n>
 `);
-      deps.renderer.write(`    ${color.bold("s")} <n>    Set key <n> as active
+    renderer.write(`    ${color.bold("s")} <n>    Set key <n> as active
 `);
-    }
-    deps.renderer.write(`    ${color.bold("f")}        Edit family
+  }
+  renderer.write(`    ${color.bold("f")}        Edit family
 `);
-    deps.renderer.write(`    ${color.bold("B")}        Edit baseUrl
+  renderer.write(`    ${color.bold("B")}        Edit baseUrl
 `);
-    deps.renderer.write(`    ${color.bold("m")}        Edit visible model list
+  renderer.write(`    ${color.bold("m")}        Edit visible model list
 `);
-    deps.renderer.write(`    ${color.bold("x")}        Remove this provider entirely
+  renderer.write(`    ${color.bold("x")}        Remove this provider entirely
 `);
-    deps.renderer.write(`    ${color.bold("b")}        Back
+  renderer.write(`    ${color.bold("b")}        Back
 `);
-    deps.renderer.write(`    ${color.bold("q")}        Quit
+  renderer.write(`    ${color.bold("q")}        Quit
 `);
-    const raw = (await deps.reader.readLine(`
-${color.amber("?")} ${providerId} > `)).trim();
-    if (!raw || raw === "b" || raw === "back" || raw === "q" || raw === "quit") return;
-    const [verb, argRaw] = raw.split(/\s+/, 2);
-    const arg = argRaw ? Number.parseInt(argRaw, 10) : Number.NaN;
-    if (verb === "a" || verb === "add") {
-      await addKeyForProvider(providerId, deps, cfg);
-      continue;
-    }
-    if (verb === "x" || verb === "remove") {
-      const confirm = (await deps.reader.readLine(
-        `  ${color.amber("?")} Remove provider "${providerId}" and ${keys.length} key(s)? ${color.dim("[y/N/q]")} `
-      )).trim().toLowerCase();
-      if (confirm === "q") continue;
-      if (confirm === "y" || confirm === "yes") {
-        await mutateProviders(deps, (all) => {
-          delete all[providerId];
-        });
-        deps.renderer.write(`  ${color.green("\u2713")} Removed ${providerId}.
+}
+function renderTopMenu(renderer, providers) {
+  renderer.write(
+    `
+${color.bold("WrongStack")} ${color.dim("\u2014 API key manager")}
+
+`
+  );
+  const ids = Object.keys(providers).sort();
+  if (ids.length === 0) {
+    renderer.write(color.dim("  No providers configured yet.\n"));
+    renderer.write(color.dim("  Use (a) to add one from the models.dev catalog, or (c) for a custom provider.\n"));
+  } else {
+    renderer.write(`  ${color.dim("Saved providers:")}
 `);
-        return;
-      }
-      continue;
+    let idx = 1;
+    for (const id of ids) {
+      const cfg = providers[id];
+      if (!cfg) continue;
+      renderProviderLine(renderer, id, cfg, idx);
+      idx++;
     }
-    if (verb === "u" || verb === "update") {
-      if (!Number.isFinite(arg) || arg < 1 || arg > keys.length) {
-        deps.renderer.writeError(`Usage: u <1-${keys.length}>`);
-        continue;
-      }
-      const target = expectDefined7(keys[arg - 1]);
-      const newKey = await readKeyInput(deps, `Updated key for ${target.label}`);
-      if (!newKey) continue;
-      await mutateProviders(deps, (all) => {
-        const p = all[providerId];
-        if (!p) return;
-        const list = normalizeKeys(p).map(
-          (k) => k.label === target.label ? { ...k, apiKey: newKey, createdAt: nowIso() } : k
-        );
-        writeKeysBack(p, list);
-      });
-      deps.renderer.write(`  ${color.green("\u2713")} Updated ${providerId}/${target.label}.
+  }
+  renderer.write(`
+  ${color.dim("Actions:")}
 `);
-      continue;
-    }
-    if (verb === "d" || verb === "delete" || verb === "rm") {
-      if (!Number.isFinite(arg) || arg < 1 || arg > keys.length) {
-        deps.renderer.writeError(`Usage: d <1-${keys.length}>`);
-        continue;
-      }
-      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();
-      if (confirm === "q") continue;
-      if (confirm !== "y" && confirm !== "yes") continue;
-      await mutateProviders(deps, (all) => {
-        const p = all[providerId];
-        if (!p) return;
-        const list = normalizeKeys(p).filter((k) => k.label !== target.label);
-        writeKeysBack(p, list);
-        if (p.activeKey === target.label) {
-          p.activeKey = list[0]?.label;
-        }
-      });
-      deps.renderer.write(`  ${color.green("\u2713")} Deleted ${providerId}/${target.label}.
+  renderer.write(`    ${color.bold("a")}  Add a provider (from catalog)
 `);
-      continue;
-    }
-    if (verb === "f" || verb === "family") {
-      const current = cfg.family ?? "";
-      const ans = (await deps.reader.readLine(
-        `  ${color.amber("?")} Family ${color.dim(`(anthropic | openai | openai-compatible | google, empty = unset, current: ${current || "unset"})`)}: `
-      )).trim();
-      if (ans !== "" && !["anthropic", "openai", "openai-compatible", "google"].includes(ans)) {
-        deps.renderer.writeError(`Invalid family: "${ans}"`);
-        continue;
-      }
-      await mutateProviders(deps, (all) => {
-        const p = all[providerId];
-        if (!p) return;
-        if (ans === "") delete p.family;
-        else p.family = ans;
-      });
-      deps.renderer.write(`  ${color.green("\u2713")} family \u2192 ${ans || "(unset)"}
+  renderer.write(`    ${color.bold("c")}  Add a custom provider
 `);
-      continue;
-    }
-    if (verb === "B" || verb === "baseurl" || verb === "base-url") {
-      const current = cfg.baseUrl ?? "";
-      const ans = (await deps.reader.readLine(
-        `  ${color.amber("?")} Base URL ${color.dim(`(empty = unset, current: ${current || "unset"})`)}: `
-      )).trim();
-      await mutateProviders(deps, (all) => {
-        const p = all[providerId];
-        if (!p) return;
-        if (ans === "") delete p.baseUrl;
-        else p.baseUrl = ans;
-      });
-      deps.renderer.write(`  ${color.green("\u2713")} baseUrl \u2192 ${ans || "(unset)"}
+  if (ids.length > 0) {
+    renderer.write(`    ${color.dim("1-")}${color.dim(String(ids.length))}  ${color.bold("Manage a provider")}
 `);
-      continue;
-    }
-    if (verb === "m" || verb === "models") {
-      const current = (cfg.models ?? []).join(", ");
-      const ans = (await deps.reader.readLine(
-        `  ${color.amber("?")} Model ids ${color.dim(`(comma-separated, empty = catalog default, current: ${current || "none"})`)}: `
-      )).trim();
-      const list = ans ? ans.split(",").map((s) => s.trim()).filter(Boolean) : [];
-      await mutateProviders(deps, (all) => {
-        const p = all[providerId];
-        if (!p) return;
-        if (list.length === 0) delete p.models;
-        else p.models = list;
-      });
-      deps.renderer.write(
-        `  ${color.green("\u2713")} models \u2192 ${list.length === 0 ? "(catalog default)" : list.join(", ")}
-`
-      );
-      continue;
-    }
-    if (verb === "s" || verb === "set" || verb === "active") {
-      if (!Number.isFinite(arg) || arg < 1 || arg > keys.length) {
-        deps.renderer.writeError(`Usage: s <1-${keys.length}>`);
-        continue;
-      }
-      const target = expectDefined7(keys[arg - 1]);
-      await mutateProviders(deps, (all) => {
-        const p = all[providerId];
-        if (!p) return;
-        const list = normalizeKeys(p);
-        writeKeysBack(p, list);
-        p.activeKey = target.label;
-      });
-      deps.renderer.write(
-        `  ${color.green("\u2713")} Active key for ${providerId} \u2192 ${color.bold(target.label)}.
-`
-      );
-      continue;
-    }
-    deps.renderer.writeError(`Unknown action: "${raw}"`);
   }
+  renderer.write(`    ${color.bold("q")}  Quit
+`);
+}
+async function readKeyInput(deps, intent) {
+  const key = (await deps.reader.readSecret(
+    `  ${color.amber("?")} ${intent} ${color.dim("(hidden, paste OK)")}: `
+  )).trim();
+  if (!key) {
+    deps.renderer.writeError("No key entered.");
+    return void 0;
+  }
+  return key;
+}
+async function confirm(deps, question) {
+  const answer = (await deps.reader.readLine(
+    `  ${color.amber("?")} ${question} ${color.dim("[y/N/q]")} `
+  )).trim().toLowerCase();
+  if (answer === "q" || answer === "quit") return null;
+  return answer === "y" || answer === "yes";
+}
+function suggestLabel(usedLabels) {
+  let candidate = "default";
+  if (!usedLabels.has(candidate)) return candidate;
+  let n = 2;
+  while (usedLabels.has(`key${n}`)) n++;
+  return `key${n}`;
+}
+function validateFamily(raw) {
+  const valid = ["anthropic", "openai", "openai-compatible", "google"];
+  return valid.includes(raw) ? raw : null;
 }
-async function addForNewProvider(deps) {
+
+// src/auth-menu/add-provider.ts
+async function addFromCatalog(deps) {
   let catalog = [];
   try {
-    catalog = (await deps.modelsRegistry.listProviders()).filter((p) => p.family !== "unsupported");
+    catalog = (await deps.modelsRegistry.listProviders()).filter(
+      (p) => p.family !== "unsupported"
+    );
   } catch {
-    deps.renderer.writeWarning("Catalog unavailable \u2014 falling back to manual entry.");
+    deps.renderer.writeWarning(
+      "Catalog unavailable \u2014 falling back to manual entry.\n"
+    );
   }
   if (catalog.length === 0) {
-    const pid = (await deps.reader.readLine(`  ${color.amber("?")} Provider id ${color.dim("[q to quit]")}: `)).trim();
-    if (!pid || pid === "q") return;
-    const fam = (await deps.reader.readLine(
-      `  ${color.amber("?")} Family (anthropic/openai/openai-compatible/google): `
-    )).trim();
-    const baseUrl2 = (await deps.reader.readLine(`  ${color.amber("?")} Base URL ${color.dim("(optional)")}: `)).trim();
-    await addKeyForProvider(pid, deps, {
-      type: pid,
-      family: fam || void 0,
-      ...baseUrl2 ? { baseUrl: baseUrl2 } : {}
-    });
-    return;
+    return addManualEntry(deps);
   }
   const saved = new Set(Object.keys(await loadProviders(deps)));
   deps.renderer.write(
     color.dim(
-      `  Catalog has ${catalog.length} providers. Filter by name to narrow, or "s" for unsaved-only.
+      `  Catalog: ${catalog.length} providers. Filter to narrow, "s" for unsaved-only, or enter to show all.
 `
     )
   );
   const filterRaw = (await deps.reader.readLine(
-    `  ${color.amber("?")} Filter ${color.dim('(substring, "s" for unsaved-only, q to quit)')}: `
+    `  ${color.amber("?")} Filter ${color.dim('(substring / "s" / q to quit)')}: `
   )).trim();
-  if (filterRaw === "q") return;
+  if (filterRaw === "q") return false;
   const filterLc = filterRaw.toLowerCase();
   const showUnsavedOnly = filterLc === "s" || filterLc === "unsaved";
-  const matches = (p) => {
+  function matches(p) {
     if (showUnsavedOnly) return !saved.has(p.id);
     if (!filterLc) return true;
     return p.id.toLowerCase().includes(filterLc) || p.name.toLowerCase().includes(filterLc);
-  };
+  }
   const byFamily = /* @__PURE__ */ new Map();
   let filteredCount = 0;
   for (const p of catalog) {
@@ -9339,18 +10156,25 @@ async function addForNewProvider(deps) {
   }
   if (filteredCount === 0) {
     deps.renderer.writeError(
-      `No providers match "${filterRaw}". Try a shorter substring or check \`wstack providers\` for valid ids.`
+      `No providers match "${filterRaw}". Try a shorter substring or check \`wstack providers\`.`
     );
-    return;
+    return false;
   }
   if (filterRaw && !showUnsavedOnly) {
     deps.renderer.write(
-      color.dim(`  ${filteredCount} match${filteredCount === 1 ? "" : "es"} for "${filterRaw}".
-`)
+      color.dim(
+        `  ${filteredCount} match${filteredCount === 1 ? "" : "es"} for "${filterRaw}".
+`
+      )
     );
   }
   const ordered = [];
-  const familyOrder = ["anthropic", "openai", "google", "openai-compatible"];
+  const familyOrder = [
+    "anthropic",
+    "openai",
+    "google",
+    "openai-compatible"
+  ];
   let idx = 1;
   deps.renderer.write("\n");
   for (const fam of familyOrder) {
@@ -9376,7 +10200,7 @@ async function addForNewProvider(deps) {
     `
 ${color.amber("?")} Pick (1-${ordered.length}) or type provider id ${color.dim("[q to quit]")}: `
   )).trim();
-  if (!answer || answer === "q") return;
+  if (!answer || answer === "q") return false;
   let chosen;
   const num = Number.parseInt(answer, 10);
   if (!Number.isNaN(num) && num >= 1 && num <= ordered.length) {
@@ -9386,29 +10210,35 @@ ${color.amber("?")} Pick (1-${ordered.length}) or type provider id ${color.dim("
   }
   if (!chosen) {
     deps.renderer.writeError(`No such provider: "${answer}"`);
-    return;
+    return false;
   }
+  return addKeyForCatalogProvider(deps, chosen);
+}
+async function addKeyForCatalogProvider(deps, chosen) {
   deps.renderer.write(
     color.dim(`
-  Defaults from models.dev \u2014 press Enter to keep, or type a new value.
+  Defaults from models.dev \u2014 press Enter to keep, or type overrides.
 `)
   );
-  const famRaw = (await deps.reader.readLine(`  ${color.amber("?")} Family ${color.dim(`[${chosen.family}]`)} ${color.dim("(q to quit)")}: `)).trim();
-  if (famRaw === "q") return;
+  const famRaw = (await deps.reader.readLine(
+    `  ${color.amber("?")} Family ${color.dim(`[${chosen.family}]`)} ${color.dim("(q to quit)")}: `
+  )).trim();
+  if (famRaw === "q") return false;
   let family = chosen.family;
   if (famRaw) {
-    if (!["anthropic", "openai", "openai-compatible", "google"].includes(famRaw)) {
+    const validated = validateFamily(famRaw);
+    if (!validated) {
       deps.renderer.writeError(
-        `Invalid family: "${famRaw}" (must be anthropic | openai | openai-compatible | google).`
+        `Invalid family: "${famRaw}" (must be: anthropic, openai, openai-compatible, google).`
       );
-      return;
+      return false;
     }
-    family = famRaw;
+    family = validated;
   }
   const baseRaw = (await deps.reader.readLine(
     `  ${color.amber("?")} Base URL ${color.dim(`[${chosen.apiBase ?? "unset"}]`)} ${color.dim("(q to quit)")}: `
   )).trim();
-  if (baseRaw === "q") return;
+  if (baseRaw === "q") return false;
   const baseUrl = baseRaw || chosen.apiBase;
   const providersNow = await loadProviders(deps);
   let suggestedAlias = chosen.id;
@@ -9422,7 +10252,7 @@ ${color.amber("?")} Pick (1-${ordered.length}) or type provider id ${color.dim("
     suggestedAlias = candidate;
   }
   const aliasRaw = (await deps.reader.readLine(
-    `  ${color.amber("?")} Save under alias ${color.dim(`[${suggestedAlias}]`)} ${color.dim("(used as `--provider <alias>`)")}: `
+    `  ${color.amber("?")} Save as alias ${color.dim(`[${suggestedAlias}]`)} ${color.dim("(used with --provider <alias>)")}: `
   )).trim();
   const alias = aliasRaw || suggestedAlias;
   const existing = providersNow[alias];
@@ -9436,10 +10266,10 @@ ${color.amber("?")} Pick (1-${ordered.length}) or type provider id ${color.dim("
   New:      family=${family}, baseUrl=${baseUrl ?? "(unset)"}
   Pick a different alias to keep them separate.`
       );
-      return;
+      return false;
     }
   }
-  await addKeyForProvider(alias, deps, {
+  return addKeyForProvider(alias, deps, {
     type: chosen.id,
     family,
     baseUrl,
@@ -9449,39 +10279,41 @@ ${color.amber("?")} Pick (1-${ordered.length}) or type provider id ${color.dim("
 async function addCustomProvider(deps) {
   deps.renderer.write(
     `
-${color.bold("Custom provider")} ${color.dim("\u2014 for local models or proxies not in the models.dev catalog.")}
+${color.bold("Custom provider")} ${color.dim("\u2014 for local models or proxies not in the catalog.")}
 `
   );
   const type = (await deps.reader.readLine(
     `  ${color.amber("?")} Provider id ${color.dim('(e.g. "local-llama", "my-proxy", q to quit)')}: `
   )).trim();
-  if (!type || type === "q") return;
+  if (!type || type === "q") return false;
   const existing = (await loadProviders(deps))[type];
   if (existing) {
-    deps.renderer.writeWarning(`"${type}" already exists. Pick it from the main menu to edit.`);
-    return;
+    deps.renderer.writeWarning(
+      `"${type}" already exists. Pick it from the main menu to edit.`
+    );
+    return false;
   }
   const familyRaw = (await deps.reader.readLine(
     `  ${color.amber("?")} Wire family ${color.dim("(anthropic | openai | openai-compatible | google)")} ${color.dim("(q to quit)")}: `
   )).trim();
-  if (familyRaw === "q") return;
-  if (!["anthropic", "openai", "openai-compatible", "google"].includes(familyRaw)) {
+  if (familyRaw === "q") return false;
+  const family = validateFamily(familyRaw);
+  if (!family) {
     deps.renderer.writeError(`Invalid family: "${familyRaw}"`);
-    return;
+    return false;
   }
-  const family = familyRaw;
   const baseUrl = (await deps.reader.readLine(
-    `  ${color.amber("?")} Base URL ${color.dim("(e.g. http://localhost:11434/v1, leave empty if not needed)")}: `
+    `  ${color.amber("?")} Base URL ${color.dim("(e.g. http://localhost:11434/v1, optional)")}: `
   )).trim();
   const modelsRaw = (await deps.reader.readLine(
     `  ${color.amber("?")} Model ids ${color.dim("(comma-separated, optional)")}: `
   )).trim();
   const models = modelsRaw ? modelsRaw.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
   const envVarsRaw = (await deps.reader.readLine(
-    `  ${color.amber("?")} Env var names ${color.dim("(comma-separated, optional fallback for the key)")}: `
+    `  ${color.amber("?")} Env var names ${color.dim("(comma-separated, optional)")}: `
   )).trim();
   const envVars = envVarsRaw ? envVarsRaw.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
-  await addKeyForProvider(type, deps, {
+  return addKeyForProvider(type, deps, {
     type,
     family,
     ...baseUrl ? { baseUrl } : {},
@@ -9489,49 +10321,295 @@ ${color.bold("Custom provider")} ${color.dim("\u2014 for local models or proxies
     ...envVars ? { envVars } : {}
   });
 }
+async function addManualEntry(deps) {
+  const pid = (await deps.reader.readLine(
+    `  ${color.amber("?")} Provider id ${color.dim("[q to quit]")}: `
+  )).trim();
+  if (!pid || pid === "q") return false;
+  const famRaw = (await deps.reader.readLine(
+    `  ${color.amber("?")} Family ${color.dim("(anthropic/openai/openai-compatible/google)")}: `
+  )).trim();
+  const family = validateFamily(famRaw);
+  if (!family) {
+    deps.renderer.writeError(`Invalid family: "${famRaw}"`);
+    return false;
+  }
+  const baseUrl = (await deps.reader.readLine(
+    `  ${color.amber("?")} Base URL ${color.dim("(optional)")}: `
+  )).trim();
+  return addKeyForProvider(pid, deps, {
+    type: pid,
+    family,
+    ...baseUrl ? { baseUrl } : {}
+  });
+}
 async function addKeyForProvider(providerId, deps, template) {
   const providers = await loadProviders(deps);
   const existing = providers[providerId];
   const existingKeys = existing ? normalizeKeys(existing) : [];
   const usedLabels = new Set(existingKeys.map((k) => k.label));
-  let defaultLabel = "default";
-  if (usedLabels.has(defaultLabel)) {
-    let n = 2;
-    while (usedLabels.has(`key${n}`)) n++;
-    defaultLabel = `key${n}`;
-  }
+  const label = await promptForLabel(deps, usedLabels);
+  if (!label) return false;
+  const apiKey = await readKeyInput(deps, `API key for ${providerId}/${label}`);
+  if (!apiKey) return false;
+  await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+    const existingProv = all[providerId] ?? {
+      type: providerId,
+      ...template
+    };
+    if (!existingProv.type) existingProv.type = providerId;
+    if (!existingProv.family && template.family) {
+      existingProv.family = template.family;
+    }
+    if (!existingProv.baseUrl && template.baseUrl) {
+      existingProv.baseUrl = template.baseUrl;
+    }
+    if (!existingProv.envVars && template.envVars) {
+      existingProv.envVars = template.envVars;
+    }
+    const list = normalizeKeys(existingProv);
+    list.push({ label, apiKey, createdAt: nowIso() });
+    writeKeysBack(existingProv, list);
+    if (!existingProv.activeKey) existingProv.activeKey = label;
+    all[providerId] = existingProv;
+  });
+  deps.renderer.write(
+    `  ${color.green("\u2713")} Saved ${color.bold(providerId)}/${color.bold(label)}.
+`
+  );
+  deps.renderer.write(
+    color.dim(
+      `  Launch: wstack --provider ${providerId} "<task>"
+`
+    )
+  );
+  return true;
+}
+async function promptForLabel(deps, usedLabels) {
+  const defaultLabel = suggestLabel(usedLabels);
   const labelRaw = (await deps.reader.readLine(
     `  ${color.amber("?")} Label for this key ${color.dim(`[${defaultLabel}]`)}: `
   )).trim();
   const label = labelRaw || defaultLabel;
   if (usedLabels.has(label)) {
     deps.renderer.writeError(
-      `Label "${label}" already used for ${providerId}. Use update (u) instead.`
+      `Label "${label}" is already used. Use update (u) instead.`
+    );
+    return null;
+  }
+  return label;
+}
+
+// src/auth-menu/provider-menu.ts
+init_provider_config_utils();
+async function manageProvider(providerId, deps) {
+  for (; ; ) {
+    const providers = await loadProviders(deps);
+    const cfg = providers[providerId];
+    if (!cfg) {
+      deps.renderer.writeError(`Provider "${providerId}" no longer in config.`);
+      return;
+    }
+    const keys = normalizeKeys(cfg);
+    renderProviderHeader(deps.renderer, providerId, cfg);
+    renderActions(deps.renderer, keys.length);
+    const raw = (await deps.reader.readLine(
+      `
+${color.amber("?")} ${providerId} > `
+    )).trim();
+    if (!raw || raw === "b" || raw === "back" || raw === "q" || raw === "quit") {
+      return;
+    }
+    const [verb, argRaw] = raw.split(/\s+/, 2);
+    const arg = argRaw ? Number.parseInt(argRaw, 10) : Number.NaN;
+    const handled = await dispatchAction(verb, arg, providerId, keys, cfg, deps);
+    if (handled === "exit") return;
+    if (handled === "continue") continue;
+  }
+}
+async function dispatchAction(verb, arg, providerId, keys, cfg, deps) {
+  if (verb === "a" || verb === "add") {
+    await addKeyForProvider(providerId, deps, cfg);
+    return "continue";
+  }
+  if (verb === "x" || verb === "remove") {
+    const answer = await confirm(deps, `Remove provider "${providerId}" and ${keys.length} key(s)?`);
+    if (answer === null) return "continue";
+    if (answer) {
+      await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+        delete all[providerId];
+      });
+      deps.renderer.write(`  ${color.green("\u2713")} Removed ${providerId}.
+`);
+      return "exit";
+    }
+    return "continue";
+  }
+  if (verb === "u" || verb === "update") {
+    if (!validKeyIndex(arg, keys.length, deps, "u")) return "continue";
+    const target = expectDefined(keys[arg - 1]);
+    const newKey = await readKeyInput(deps, `New key for ${target.label}`);
+    if (!newKey) return "continue";
+    await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+      const p = all[providerId];
+      if (!p) return;
+      const list = normalizeKeys(p).map(
+        (k) => k.label === target.label ? { ...k, apiKey: newKey, createdAt: nowIso() } : k
+      );
+      writeKeysBack(p, list);
+    });
+    deps.renderer.write(`  ${color.green("\u2713")} Updated ${providerId}/${target.label}.
+`);
+    return "continue";
+  }
+  if (verb === "d" || verb === "delete" || verb === "rm") {
+    if (!validKeyIndex(arg, keys.length, deps, "d")) return "continue";
+    const target = expectDefined(keys[arg - 1]);
+    const answer = await confirm(
+      deps,
+      `Delete key "${target.label}" (${maskedKey(target.apiKey)})?`
     );
-    return;
+    if (answer === null) return "continue";
+    if (!answer) return "continue";
+    await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+      const p = all[providerId];
+      if (!p) return;
+      const list = normalizeKeys(p).filter((k) => k.label !== target.label);
+      writeKeysBack(p, list);
+      if (p.activeKey === target.label) {
+        p.activeKey = list[0]?.label;
+      }
+    });
+    deps.renderer.write(`  ${color.green("\u2713")} Deleted ${providerId}/${target.label}.
+`);
+    return "continue";
+  }
+  if (verb === "s" || verb === "set" || verb === "active") {
+    if (!validKeyIndex(arg, keys.length, deps, "s")) return "continue";
+    const target = expectDefined(keys[arg - 1]);
+    await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+      const p = all[providerId];
+      if (!p) return;
+      const list = normalizeKeys(p);
+      writeKeysBack(p, list);
+      p.activeKey = target.label;
+    });
+    deps.renderer.write(
+      `  ${color.green("\u2713")} Active key \u2192 ${color.bold(target.label)}.
+`
+    );
+    return "continue";
   }
-  const apiKey = await readKeyInput(deps, `API key for ${providerId}/${label}`);
-  if (!apiKey) {
-    deps.renderer.writeError("No key entered. Nothing saved.");
-    return;
+  if (verb === "f" || verb === "family") {
+    const current = cfg.family ?? "";
+    const ans = (await deps.reader.readLine(
+      `  ${color.amber("?")} Family ${color.dim(`(anthropic | openai | openai-compatible | google, empty = unset, current: ${current || "unset"})`)}: `
+    )).trim();
+    if (ans !== "") {
+      const validated = validateFamily(ans);
+      if (!validated) {
+        deps.renderer.writeError(`Invalid family: "${ans}". Must be one of: anthropic, openai, openai-compatible, google.`);
+        return "continue";
+      }
+      await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+        const p = all[providerId];
+        if (!p) return;
+        p.family = validated;
+      });
+      deps.renderer.write(`  ${color.green("\u2713")} family \u2192 ${validated}
+`);
+    } else {
+      await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+        const p = all[providerId];
+        if (!p) return;
+        delete p.family;
+      });
+      deps.renderer.write(`  ${color.green("\u2713")} family \u2192 (unset)
+`);
+    }
+    return "continue";
   }
-  await mutateProviders(deps, (all) => {
-    const existingProv = all[providerId] ?? { type: providerId, ...template };
-    if (!existingProv.type) existingProv.type = providerId;
-    if (!existingProv.family && template.family) existingProv.family = template.family;
-    if (!existingProv.baseUrl && template.baseUrl) existingProv.baseUrl = template.baseUrl;
-    if (!existingProv.envVars && template.envVars) existingProv.envVars = template.envVars;
-    const list = normalizeKeys(existingProv);
-    list.push({ label, apiKey, createdAt: nowIso() });
-    writeKeysBack(existingProv, list);
-    if (!existingProv.activeKey) existingProv.activeKey = label;
-    all[providerId] = existingProv;
-  });
-  deps.renderer.write(
-    `  ${color.green("\u2713")} Saved ${color.bold(providerId)}/${color.bold(label)}. ${color.dim("Use `wstack --provider " + providerId + ' "<task>"` to launch.')}
+  if (verb === "B" || verb === "baseurl" || verb === "base-url") {
+    const current = cfg.baseUrl ?? "";
+    const ans = (await deps.reader.readLine(
+      `  ${color.amber("?")} Base URL ${color.dim(`(empty = unset, current: ${current || "unset"})`)}: `
+    )).trim();
+    await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+      const p = all[providerId];
+      if (!p) return;
+      if (ans === "") delete p.baseUrl;
+      else p.baseUrl = ans;
+    });
+    deps.renderer.write(`  ${color.green("\u2713")} baseUrl \u2192 ${ans || "(unset)"}
+`);
+    return "continue";
+  }
+  if (verb === "m" || verb === "models") {
+    const current = (cfg.models ?? []).join(", ");
+    const ans = (await deps.reader.readLine(
+      `  ${color.amber("?")} Model ids ${color.dim(`(comma-separated, empty = catalog default, current: ${current || "none"})`)}: `
+    )).trim();
+    const list = ans ? ans.split(",").map((s) => s.trim()).filter(Boolean) : [];
+    await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+      const p = all[providerId];
+      if (!p) return;
+      if (list.length === 0) delete p.models;
+      else p.models = list;
+    });
+    deps.renderer.write(
+      `  ${color.green("\u2713")} models \u2192 ${list.length === 0 ? "(catalog default)" : list.join(", ")}
 `
-  );
+    );
+    return "continue";
+  }
+  deps.renderer.writeError(`Unknown action: "${verb}". Type b for back or q to quit.`);
+  return "unknown";
+}
+function validKeyIndex(arg, max, deps, verb) {
+  if (!Number.isFinite(arg) || arg < 1 || arg > max) {
+    deps.renderer.writeError(`Usage: ${verb} <1-${max}>`);
+    return false;
+  }
+  return true;
+}
+
+// src/auth-menu/top-menu.ts
+async function runTopMenu(deps) {
+  for (; ; ) {
+    const providers = await loadProviders(deps);
+    renderTopMenu(deps.renderer, providers);
+    const ids = Object.keys(providers).sort();
+    const choice = (await deps.reader.readLine(`
+${color.amber("?")} Pick: `)).trim().toLowerCase();
+    if (!choice || choice === "q" || choice === "quit" || choice === "exit") {
+      deps.renderer.write(color.dim("Done.\n"));
+      return 0;
+    }
+    if (choice === "a" || choice === "add") {
+      await addFromCatalog(deps);
+      continue;
+    }
+    if (choice === "c" || choice === "custom") {
+      await addCustomProvider(deps);
+      continue;
+    }
+    const idx = Number.parseInt(choice, 10);
+    if (!Number.isNaN(idx) && idx >= 1 && idx <= ids.length) {
+      const pid = ids[idx - 1];
+      await manageProvider(pid, deps);
+      continue;
+    }
+    const byId = ids.find((id) => id.toLowerCase() === choice);
+    if (byId) {
+      await manageProvider(byId, deps);
+      continue;
+    }
+    deps.renderer.writeError(`Unknown selection: "${choice}"`);
+  }
 }
+
+// src/auth-menu/direct.ts
+init_provider_config_utils();
 async function runAuthDirect(deps, opts) {
   const { providerId } = opts;
   const providers = await loadProviders(deps);
@@ -9559,7 +10637,9 @@ async function runAuthDirect(deps, opts) {
     opts.baseUrl ??= knownBase;
     opts.envVars ??= knownEnv;
   }
-  const usedLabels = new Set(existing ? normalizeKeys(existing).map((k) => k.label) : []);
+  const usedLabels = new Set(
+    existing ? normalizeKeys(existing).map((k) => k.label) : []
+  );
   let label = opts.label ?? "default";
   if (usedLabels.has(label)) {
     let n = 2;
@@ -9569,7 +10649,7 @@ async function runAuthDirect(deps, opts) {
   }
   const apiKey = await readKeyInput(deps, `API key for ${providerId}/${label}`);
   if (!apiKey) return 1;
-  await mutateProviders(deps, (all) => {
+  await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
     const p = all[providerId] ?? { type: providerId };
     if (!p.type) p.type = providerId;
     if (!p.family && opts.family) p.family = opts.family;
@@ -9585,32 +10665,9 @@ async function runAuthDirect(deps, opts) {
   deps.renderer.writeInfo(`Use: wstack --provider ${providerId} "<task>"`);
   return 0;
 }
-async function readKeyInput(deps, intent) {
-  const key = (await deps.reader.readSecret(
-    `  ${color.amber("?")} ${intent} ${color.dim("(hidden, paste OK)")}: `
-  )).trim();
-  if (!key) {
-    deps.renderer.writeError("No key entered.");
-    return void 0;
-  }
-  return key;
-}
-function loadProviders(deps) {
-  return loadConfigProviders(deps.globalConfigPath, deps.vault, {
-    warn: (msg) => deps.renderer.writeWarning(msg)
-  });
-}
-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;
-}
+init_provider_config_utils();
 var authCmd = async (args, deps) => {
   const flags = parseAuthFlags(args);
   const menuDeps = {
@@ -9620,15 +10677,175 @@ var authCmd = async (args, deps) => {
     vault: deps.vault,
     globalConfigPath: deps.paths.globalConfig
   };
-  if (flags.positional.length === 0) return runAuthMenu(menuDeps);
+  if (flags.positional.length === 0) {
+    return runTopMenu(menuDeps);
+  }
+  const first = flags.positional[0];
+  if (first === "list" || first === "ls") {
+    return runAuthList(menuDeps);
+  }
+  if (first === "status") {
+    const pid = flags.positional[1];
+    if (!pid) {
+      deps.renderer.writeError("Usage: wstack auth status <provider>");
+      return 1;
+    }
+    return runAuthStatus(menuDeps, pid);
+  }
+  if (first === "remove" || first === "rm") {
+    const pid = flags.positional[1];
+    if (!pid) {
+      deps.renderer.writeError("Usage: wstack auth remove <provider> [--force]");
+      return 1;
+    }
+    return runAuthRemove(menuDeps, pid);
+  }
   return runAuthDirect(menuDeps, {
-    providerId: expectDefined8(flags.positional[0]),
+    providerId: first,
     label: flags.label,
     family: flags.family,
     baseUrl: flags.baseUrl,
     envVars: flags.envVars
   });
 };
+async function runAuthList(deps) {
+  let providers;
+  try {
+    providers = await loadConfigProviders(deps.globalConfigPath, deps.vault);
+  } catch (err) {
+    deps.renderer.writeError(`Could not read config: ${err.message}`);
+    return 1;
+  }
+  const ids = Object.keys(providers).sort();
+  if (ids.length === 0) {
+    deps.renderer.write(
+      `${color.dim("No providers configured.")}
+${color.dim("Run")} ${color.bold("wstack auth")} ${color.dim("to add one.")}
+`
+    );
+    return 0;
+  }
+  deps.renderer.write(`
+${color.bold("Saved providers")} ${color.dim(`(${ids.length})`)}
+
+`);
+  for (const id of ids) {
+    const cfg = providers[id];
+    if (!cfg) continue;
+    const keys = normalizeKeys(cfg);
+    const active = cfg.activeKey ?? keys[0]?.label;
+    const famTag = cfg.family ? `${cfg.family}` : color.amber("no-family");
+    const aliasHint = cfg.type && cfg.type !== id ? color.dim(` (\u2192 ${cfg.type})`) : "";
+    const modelHint = cfg.models && cfg.models.length > 0 ? color.dim(` [${cfg.models.length} models]`) : "";
+    deps.renderer.write(`  ${color.bold(id)}${aliasHint}
+`);
+    deps.renderer.write(
+      `    family:  ${famTag}  baseUrl: ${cfg.baseUrl ?? color.dim("unset")}${modelHint}
+`
+    );
+    if (keys.length === 0) {
+      deps.renderer.write(`    ${color.amber("no keys")}
+`);
+    } else {
+      deps.renderer.write(`    ${color.dim(`${keys.length} key${keys.length === 1 ? "" : "s"}:`)}
+`);
+      for (const k of keys) {
+        const marker = k.label === active ? color.green("\u25CF") : color.dim("\u25CB");
+        deps.renderer.write(
+          `      ${marker} ${k.label.padEnd(18)} ${maskedKey(k.apiKey)}  ${color.dim(k.createdAt)}
+`
+        );
+      }
+    }
+    deps.renderer.write("\n");
+  }
+  deps.renderer.write(
+    color.dim(`Manage: wstack auth   Add key: wstack auth <provider>
+`)
+  );
+  return 0;
+}
+async function runAuthStatus(deps, providerId) {
+  let providers;
+  try {
+    providers = await loadConfigProviders(deps.globalConfigPath, deps.vault);
+  } catch (err) {
+    deps.renderer.writeError(`Could not read config: ${err.message}`);
+    return 1;
+  }
+  const cfg = providers[providerId];
+  if (!cfg) {
+    deps.renderer.writeError(`Provider "${providerId}" not found in config.`);
+    deps.renderer.write(
+      color.dim(`Run ${color.bold("wstack auth list")} to see saved providers.
+`)
+    );
+    return 1;
+  }
+  const keys = normalizeKeys(cfg);
+  const active = cfg.activeKey ?? keys[0]?.label;
+  const lines = [
+    `
+${color.bold(providerId)} ${cfg.family ? color.dim(`[${cfg.family}]`) : color.amber("[no family]")}`,
+    "",
+    `  type:    ${color.cyan(cfg.type ?? providerId)}`,
+    `  family:  ${cfg.family ? color.cyan(cfg.family) : color.dim("unset")}`,
+    `  baseUrl: ${cfg.baseUrl ? color.cyan(cfg.baseUrl) : color.dim("unset")}`
+  ];
+  if (cfg.models?.length) {
+    lines.push(`  models:  ${color.cyan(cfg.models.join(", "))}`);
+  }
+  if (cfg.envVars?.length) {
+    lines.push(`  envVars: ${color.cyan(cfg.envVars.join(", "))}`);
+  }
+  lines.push("");
+  if (keys.length === 0) {
+    lines.push(color.amber("  (no keys saved)"));
+  } else {
+    lines.push(`  ${color.dim("Keys:")}`);
+    for (const k of keys) {
+      const marker = k.label === active ? color.green("\u25CF") : color.dim("\u25CB");
+      lines.push(
+        `    ${marker} ${color.bold(k.label.padEnd(18))} ${maskedKey(k.apiKey)}  ${color.dim(k.createdAt)}`
+      );
+    }
+  }
+  lines.push("");
+  lines.push(color.dim(`Manage: wstack auth \u2192 pick ${providerId}`));
+  deps.renderer.write(lines.join("\n") + "\n");
+  return 0;
+}
+async function runAuthRemove(deps, providerId) {
+  const providers = await loadConfigProviders(deps.globalConfigPath, deps.vault);
+  if (!providers[providerId]) {
+    deps.renderer.writeError(`Provider "${providerId}" not found.`);
+    return 1;
+  }
+  deps.renderer.write(
+    `${color.amber("!")} This will remove "${providerId}" and all its saved keys.
+`
+  );
+  const answer = (await deps.reader.readLine(
+    `  ${color.amber("?")} Confirm removal? ${color.dim("[y/N]")} `
+  )).trim().toLowerCase();
+  if (answer !== "y" && answer !== "yes") {
+    deps.renderer.write(color.dim("Cancelled.\n"));
+    return 0;
+  }
+  try {
+    await mutateConfigProviders(deps.globalConfigPath, deps.vault, (all) => {
+      delete all[providerId];
+    });
+    deps.renderer.write(
+      `  ${color.green("\u2713")} Removed ${color.bold(providerId)}.
+`
+    );
+    return 0;
+  } catch (err) {
+    deps.renderer.writeError(`Failed to remove: ${err.message}`);
+    return 1;
+  }
+}
 
 // src/subcommands/handlers/update.ts
 init_update_check();
@@ -9658,7 +10875,8 @@ var updateCmd = async (args, deps) => {
       const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
       const child = spawn(npmCommand, ["install", "-g", "wrongstack@latest"], {
         cwd,
-        stdio: "pipe"
+        stdio: "pipe",
+        signal: AbortSignal.timeout(12e4)
       });
       let _stderr = "";
       child.stderr?.on("data", (d) => {
@@ -9845,12 +11063,6 @@ 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.");
@@ -9862,7 +11074,7 @@ var exportCmd = async (args, deps) => {
   let includeDiagnostics = true;
   let sessionId;
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined9(args[i]);
+    const a = expectDefined(args[i]);
     if (a === "--format" || a === "-f") {
       const v = args[++i];
       if (v !== "markdown" && v !== "json" && v !== "text") {
@@ -10124,12 +11336,6 @@ 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];
@@ -10180,7 +11386,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 = expectDefined10(BUILT_IN_MCP[k]);
+        const s = expectDefined(BUILT_IN_MCP[k]);
         deps.renderer.write(`  ${k.padEnd(20)} ${s.description}
 `);
       }
@@ -10458,12 +11664,6 @@ 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");
@@ -10511,7 +11711,7 @@ ${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 = expectDefined11(args[i]);
+    const a = expectDefined(args[i]);
     if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       if (eq !== -1) {
@@ -10531,7 +11731,7 @@ function parseFlags2(args) {
 function positionals(args) {
   const out = [];
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined11(args[i]);
+    const a = expectDefined(args[i]);
     if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       if (eq === -1) {
@@ -10686,7 +11886,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(expectDefined11(match[1]));
+  const num = Number.parseFloat(expectDefined(match[1]));
   const unit = match[2];
   if (unit === "b") return Math.round(num * 1e9);
   if (unit === "m") return Math.round(num * 1e6);
@@ -11007,12 +12207,6 @@ 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") {
@@ -11058,7 +12252,7 @@ var configCmd = async (args, deps) => {
 };
 function extractArg(args, key) {
   const idx = args.indexOf(key);
-  if (idx !== -1 && args[idx + 1] !== void 0) return expectDefined12(args[idx + 1]);
+  if (idx !== -1 && args[idx + 1] !== void 0) return expectDefined(args[idx + 1]);
   const eq = key.startsWith("--") ? args.find((a) => a.startsWith(`${key}=`)) : null;
   if (eq) return eq.slice(eq.indexOf("=") + 1);
   return null;
@@ -11134,12 +12328,6 @@ 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++) {
@@ -11154,7 +12342,7 @@ function parseRewindFlags(args) {
 }
 function findSessionId(args) {
   for (let i = 0; i < args.length; i++) {
-    const a = expectDefined13(args[i]);
+    const a = expectDefined(args[i]);
     if (a === "--last" || a === "--to") {
       i++;
       continue;
@@ -11406,10 +12594,10 @@ var auditCmd = async (args, deps) => {
   return verify.ok ? 0 : 1;
 };
 async function listAudits(log, dir, deps) {
-  const fs26 = await import('fs/promises');
+  const fs27 = await import('fs/promises');
   let entries;
   try {
-    entries = await fs26.readdir(dir);
+    entries = await fs27.readdir(dir);
   } catch {
     deps.renderer.write(
       color.dim(`No sessions dir found at ${dir}. Run a session first.`) + "\n"
@@ -11480,6 +12668,10 @@ var helpCmd = async (_args, deps) => {
     "  wstack sessions              List recent sessions",
     "  wstack init                  Pick provider + model from models.dev",
     "  wstack auth                  Interactive key manager (list/add/update/delete)",
+    "  wstack auth list             Quick listing of saved providers and keys",
+    "  wstack auth status <id>      Detailed view of one provider",
+    "  wstack auth remove <id>      Delete a provider (asks for confirmation)",
+    "  wstack auth <provider>       Add a key for a provider (--label, --family, \u2026)",
     "  wstack config [show|edit]    Show or edit effective config",
     "  wstack tools                 List registered tools",
     "  wstack skills                List discovered skills",
@@ -11560,22 +12752,22 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color52) {
+function fmtTaskResultLine(r, color56) {
   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 ? color52.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color52.dim(errTail)}` : "";
+  const errKindChip = errKind ? color56.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color56.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color52.green("\u2713"), stats, tail: "" };
+      return { mark: color56.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color52.yellow("\u23F1"), stats: `${color52.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color56.yellow("\u23F1"), stats: `${color56.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color52.dim("\u2298"), stats: `${color52.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color56.dim("\u2298"), stats: `${color56.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color52.red("\u2717"), stats: `${color52.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color56.red("\u2717"), stats: `${color56.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 
@@ -11697,6 +12889,7 @@ async function boot(argv) {
   const isSingleShot = positional.length > 0 || typeof flags["prompt"] === "string";
   const isInteractiveTTY = isStdinTTY() && !isSingleShot;
   if (isInteractiveTTY) {
+    await checkGitInCwd({ cwd, renderer, reader });
     const cont = await runProjectCheck({ projectRoot, cwd, renderer, reader });
     if (!cont) {
       await reader.close();
@@ -11860,6 +13053,61 @@ async function boot(argv) {
     updateInfo
   };
 }
+async function checkGitInCwd(opts) {
+  const { cwd, renderer, reader } = opts;
+  const cwdGit = path8.join(cwd, ".git");
+  let hasCwdGit = false;
+  try {
+    await fsp4.access(cwdGit);
+    hasCwdGit = true;
+  } catch {
+  }
+  if (!hasCwdGit) {
+    renderer.write(
+      `
+  ${color.amber("\u25CB")} This folder has no ${color.bold(".git")} repository.
+`
+    );
+    const answer = (await reader.readLine(
+      `  ${color.amber("?")} Initialize one here? ${color.dim("[y/N]")} `
+    )).trim().toLowerCase();
+    if (answer === "y" || answer === "yes") {
+      try {
+        const { spawn: spawn4 } = await import('child_process');
+        await new Promise((resolve5, reject) => {
+          const child = spawn4("git", ["init"], {
+            cwd,
+            signal: AbortSignal.timeout(1e4)
+          });
+          child.on("error", reject);
+          child.on(
+            "close",
+            (code) => code === 0 ? resolve5() : reject(new Error(`git init failed with ${code}`))
+          );
+        });
+        renderer.write(`  ${color.green("\u2713")} Git repository initialized
+`);
+        hasCwdGit = true;
+      } catch (err) {
+        renderer.writeError(
+          `git init failed: ${err instanceof Error ? err.message : String(err)}
+`
+        );
+      }
+    }
+  }
+  const parentDir = path8.dirname(cwd);
+  if (parentDir !== cwd) {
+    try {
+      await fsp4.access(path8.join(parentDir, ".git"));
+      renderer.write(
+        `  ${color.dim("\u2139")} A ${color.bold(".git")} repo exists in the parent directory: ${color.dim(parentDir)}
+`
+      );
+    } catch {
+    }
+  }
+}
 var CONTEXT_OVERFLOW_RE = /context window|exceeds the context|too many tokens|context.*tokens/i;
 function contextOverflowHint(err) {
   const structured = err.code === ERROR_CODES.PROVIDER_CONTEXT_OVERFLOW || err.code === ERROR_CODES.AGENT_CONTEXT_OVERFLOW;
@@ -12128,7 +13376,7 @@ function parsePredictions(raw, max = 3) {
   }
   return out;
 }
-function extractText(content) {
+function extractText2(content) {
   if (Array.isArray(content)) {
     return content[0]?.text ?? "";
   }
@@ -12159,7 +13407,7 @@ async function predictNextTasks(input, opts) {
       },
       { signal: internal.signal }
     );
-    return parsePredictions(extractText(resp.content), max);
+    return parsePredictions(extractText2(resp.content), max);
   } catch {
     return [];
   } finally {
@@ -12168,12 +13416,6 @@ 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);
@@ -12689,7 +13931,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 = expectDefined14(goal.journal[goal.journal.length - 1]);
+    const lastEntry = expectDefined(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"
@@ -13159,8 +14401,8 @@ async function execute(deps) {
           initialGoal: goalFlag,
           initialAsk: askFlag,
           projectRoot,
-          getSDDContext: () => {
-            const { getActiveSDDContext: getActiveSDDContext2 } = (init_sdd(), __toCommonJS(sdd_exports));
+          getSDDContext: async () => {
+            const { getActiveSDDContext: getActiveSDDContext2 } = await Promise.resolve().then(() => (init_sdd(), sdd_exports));
             return getActiveSDDContext2();
           },
           onSDDOutput: async (output) => {
@@ -13171,7 +14413,7 @@ async function execute(deps) {
               autoDetectTaskCompletion: autoDetectTaskCompletion2,
               getTaskProgress: getTaskProgress2,
               getActiveSDDPhase: getActiveSDDPhase2
-            } = (init_sdd(), __toCommonJS(sdd_exports));
+            } = await Promise.resolve().then(() => (init_sdd(), sdd_exports));
             const messages = [];
             const specSaved = await trySaveSpecFromAIOutput2(output);
             if (specSaved)
@@ -13291,12 +14533,6 @@ 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),
@@ -13305,7 +14541,7 @@ function buildRoutingRunner(config, host) {
   return async (task, ctx) => {
     const subCfg = ctx.config;
     if (subCfg.provider === "acp") {
-      const cacheKey = subCfg.role ?? subCfg.name ?? expectDefined15(subCfg.id);
+      const cacheKey = subCfg.role ?? subCfg.name ?? expectDefined(subCfg.id);
       return host.buildACPRunner(cacheKey).then((r) => r(task, ctx));
     }
     return standardRunner(task, ctx);
@@ -14163,7 +15399,8 @@ function gitText(args, cwd) {
     const child = spawn("git", args, {
       cwd,
       env: buildChildEnv(),
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      signal: AbortSignal.timeout(1e4)
     });
     child.stdout?.on("data", (c) => {
       out += c.toString();
@@ -14186,7 +15423,8 @@ function runCmd(cmd, args, cwd, shell = false) {
       cwd,
       env: buildChildEnv(),
       stdio: ["ignore", "pipe", "pipe"],
-      shell: shell || process.platform === "win32"
+      shell: shell || process.platform === "win32",
+      signal: AbortSignal.timeout(3e4)
     });
     child.stdout?.on("data", (c) => {
       out += c.toString();
@@ -14922,10 +16160,9 @@ async function setupCodebaseIndexing(deps) {
   const onError = (err) => logger.debug(`codebase auto-index failed: ${err instanceof Error ? err.message : String(err)}`);
   if (idx.onSessionStart) {
     void runStartupIndex({ projectRoot }).then((r) => {
-      const summary = `${color.green("\u2713")} codebase index ready ${color.dim(`\u2014 ${r.symbolsIndexed} symbols \xB7 ${r.filesIndexed} files \xB7 ${r.durationMs}ms`)}`;
-      process.stderr.write(`
-${summary}
-`);
+      logger.info(
+        `codebase index ready: ${r.symbolsIndexed} symbols \xB7 ${r.filesIndexed} files \xB7 ${r.durationMs}ms`
+      );
     }).catch((err) => {
       logger.warn(
         `codebase index (startup) failed: ${err instanceof Error ? err.message : String(err)}`
@@ -14959,7 +16196,7 @@ ${summary}
   let watcher;
   if (idx.watchExternal) {
     try {
-      watcher = fs12.watch(projectRoot, { recursive: true }, (_event, filename) => {
+      watcher = fs13.watch(projectRoot, { recursive: true }, (_event, filename) => {
         if (!filename) return;
         const rel = filename.toString();
         if (isIgnored(rel)) return;
@@ -15194,12 +16431,6 @@ 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,
@@ -15265,7 +16496,7 @@ async function setupSession(params) {
   const context = new Context({
     systemPrompt,
     provider,
-    session: expectDefined16(session),
+    session: expectDefined(session),
     signal: ctxSignal,
     tokenCounter,
     cwd,
@@ -15293,6 +16524,8 @@ async function setupSession(params) {
   );
   const planPath = path8.join(wpaths.projectSessions, `${session?.id}.plan.json`);
   context.state.setMeta("plan.path", planPath);
+  const taskPath = path8.join(wpaths.projectSessions, `${session?.id}.tasks.json`);
+  context.state.setMeta("task.path", taskPath);
   let dirState;
   if (resumeId) {
     try {
@@ -15321,7 +16554,7 @@ async function setupSession(params) {
     }
   }
   return {
-    session: expectDefined16(session),
+    session: expectDefined(session),
     sessionRef,
     context,
     restoredMessages,
@@ -15430,12 +16663,6 @@ 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;
@@ -15455,11 +16682,14 @@ async function main(argv) {
   } = ctx;
   updateInfo = await printUpdateNotice(updateInfo);
   const pathResolver = new DefaultPathResolver(cwd);
+  const events = new EventBus();
+  events.setLogger(logger);
   const container = createDefaultContainer({
     config,
     wpaths,
     logger,
     modelsRegistry,
+    events,
     permission: {
       yolo: config.yolo,
       yoloDestructive: flags["yolo-destructive"] === true || flags["force-all-yolo"] === true,
@@ -15558,9 +16788,9 @@ async function main(argv) {
   if (config.features.memory) {
     toolRegistry.register(rememberTool(memoryStore));
     toolRegistry.register(forgetTool(memoryStore));
+    toolRegistry.register(searchMemoryTool(memoryStore));
+    toolRegistry.register(relatedMemoryTool(memoryStore));
   }
-  const events = new EventBus();
-  events.setLogger(logger);
   const { metricsSink, healthRegistry } = (() => {
     const ms = setupMetrics({
       flags,
@@ -15574,35 +16804,40 @@ async function main(argv) {
   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) => {
+  const teardownHandlers = [];
+  const evOn = (event, handler) => {
+    events.on(event, handler);
+    teardownHandlers.push(() => events.off(event, handler));
+  };
+  evOn("provider.response", (e) => {
     lastInputTokens = e.usage?.input ?? 0;
     updateSpinnerContext();
   });
-  events.on("iteration.started", () => {
+  evOn("iteration.started", () => {
     updateSpinnerContext();
     spinner.start(color.dim(`${config.provider}/${config.model} thinking\u2026`));
   });
-  events.on("provider.response", () => {
+  evOn("provider.response", () => {
     spinner.stop();
   });
-  events.on("error", () => {
+  evOn("error", () => {
     spinner.stop();
   });
   let streamingActive = false;
-  events.on("provider.text_delta", (p) => {
+  evOn("provider.text_delta", (p) => {
     if (!streamingActive) {
       spinner.stop();
       streamingActive = true;
     }
     renderer.write(p.text);
   });
-  events.on("iteration.completed", () => {
+  evOn("iteration.completed", () => {
     if (streamingActive) {
       renderer.write("\n");
       streamingActive = false;
     }
   });
-  events.on("provider.retry", (p) => {
+  evOn("provider.retry", (p) => {
     spinner.stop();
     if (streamingActive) {
       renderer.write("\n");
@@ -15613,7 +16848,7 @@ async function main(argv) {
 `));
     spinner.start(color.dim(`${config.provider}/${config.model} thinking\u2026`));
   });
-  events.on("provider.error", (p) => {
+  evOn("provider.error", (p) => {
     spinner.stop();
     if (streamingActive) {
       renderer.write("\n");
@@ -15666,7 +16901,7 @@ async function main(argv) {
   );
   const stats = new SessionStats(events, tokenCounter);
   const errorRing = [];
-  events.on("error", (e) => {
+  evOn("error", (e) => {
     const err = e.err;
     const code = err && typeof err === "object" && "code" in err && typeof err.code === "string" ? err.code : "UNKNOWN";
     const message = e.err instanceof Error ? e.err.message : String(e.err);
@@ -15681,7 +16916,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("tool.started", (e) => {
+  evOn("tool.started", (e) => {
     sessionBridge.append({
       type: "tool_call_start",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15691,7 +16926,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("tool.executed", (e) => {
+  evOn("tool.executed", (e) => {
     sessionBridge.append({
       type: "tool_call_end",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15707,16 +16942,16 @@ async function main(argv) {
     });
   });
   if (!tuiOwnsScreen) {
-    events.on("delegate.started", (e) => {
+    evOn("delegate.started", (e) => {
       const task = e.task.length > 100 ? `${e.task.slice(0, 99)}\u2026` : e.task;
       renderer.writeInfo(`\u{1F91D} Delegating \u2192 ${e.target}: ${task}`);
     });
-    events.on("delegate.completed", (e) => {
+    evOn("delegate.completed", (e) => {
       const cost = e.costUsd && e.costUsd > 0 ? ` \xB7 $${e.costUsd.toFixed(4)}` : "";
       renderer.writeInfo(`${e.ok ? "\u2705" : "\u274C"} ${e.summary}${cost}`);
     });
   }
-  events.on("tool.progress", (e) => {
+  evOn("tool.progress", (e) => {
     sessionBridge.append({
       type: "tool_progress",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15726,7 +16961,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("provider.retry", (e) => {
+  evOn("provider.retry", (e) => {
     sessionBridge.append({
       type: "provider_retry",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15738,7 +16973,7 @@ async function main(argv) {
     }).catch(() => {
     });
   });
-  events.on("provider.error", (e) => {
+  evOn("provider.error", (e) => {
     sessionBridge.append({
       type: "provider_error",
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -15870,6 +17105,13 @@ async function main(argv) {
     logger
   });
   if (fallbackExtension) agent.extensions.register(fallbackExtension);
+  if (config.features.memory && config.features.memoryConsolidation !== false) {
+    agent.extensions.register(
+      new SessionMemoryConsolidator({
+        memoryStore
+      })
+    );
+  }
   const switchProviderAndModel = (providerId, modelId) => {
     try {
       context.provider = buildProviderForId(providerId);
@@ -15916,10 +17158,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(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 manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path8.join(expectDefined(fleetRoot), "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path8.join(expectDefined(fleetRoot), "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path8.join(expectDefined(fleetRoot), "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path8.join(expectDefined(fleetRoot), "director-state.json") : void 0;
   const fleetRootForPromotion = path8.join(wpaths.projectSessions, session.id);
   const brainQueue = new BrainDecisionQueue(events);
   const brain = new ObservableBrainArbiter(
@@ -16338,7 +17580,7 @@ async function main(argv) {
           ...matches.map((m) => `  ${m.subagentId}  (${m.runId})`)
         ].join("\n");
       }
-      const t = expectDefined17(matches[0]);
+      const t = expectDefined(matches[0]);
       const raw = await fsp4.readFile(t.file, "utf8");
       if (mode === "raw") return raw;
       const lines = raw.split("\n").filter((l) => l.trim());
@@ -16588,6 +17830,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
       parallelEngine?.stop();
     },
     onExit: () => {
+      for (const teardown of teardownHandlers) teardown();
+      teardownHandlers.length = 0;
       brainQueue.dispose();
       void mcpRegistry.stopAll();
     },
@@ -16597,7 +17841,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
         (resolve5, reject) => {
           const child = spawn("git", ["status", "--porcelain"], {
             cwd: cwd2,
-            stdio: ["ignore", "pipe", "pipe"]
+            stdio: ["ignore", "pipe", "pipe"],
+            signal: AbortSignal.timeout(5e3)
           });
           let stdout = "";
           child.stdout?.on("data", (d) => {