@wrongstack/cli 0.5.7 → 0.6.1

package/dist/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import * as path21 from 'path';
+import * as path23 from 'path';
 import { join } from 'path';
 import * as fsp2 from 'fs/promises';
 import { readdir, readFile } from 'fs/promises';
-import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, FleetManager, makeDirectorSessionFactory, Director, makeAgentSubagentRunner, NULL_FLEET_BUS, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, InputBuilder, projectHash, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, DefaultPluginAPI } from '@wrongstack/core';
+import { color, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, SlashCommandRegistry, createDelegateTool, FLEET_ROSTER, createMcpControlTool, EternalAutonomyEngine, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeAgentSubagentRunner, NULL_FLEET_BUS, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, DefaultPluginAPI, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, loadGoal, goalFilePath, summarizeUsage, emptyGoal, saveGoal, buildGoalPreamble, formatGoal, InputBuilder, projectHash, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, allServers as allServers$1 } from '@wrongstack/core';
 import { createRequire } from 'module';
 import * as os6 from 'os';
 import os6__default from 'os';
@@ -11,7 +11,6 @@ import * as crypto from 'crypto';
 import { randomUUID } from 'crypto';
 import { DefaultSecretVault as DefaultSecretVault$1, encryptConfigSecrets, decryptConfigSecrets as decryptConfigSecrets$1 } from '@wrongstack/core/security';
 import { WebSocketServer, WebSocket } from 'ws';
-import { writeFileSync } from 'fs';
 import { MCPRegistry } from '@wrongstack/mcp';
 import { buildProviderFactoriesFromRegistry, makeProviderFromConfig, capabilitiesFor } from '@wrongstack/providers';
 import { createDefaultContainer, routeImagesForModel, readClipboardImage } from '@wrongstack/runtime';
@@ -19,7 +18,10 @@ import { builtinToolsPack, rememberTool, forgetTool } from '@wrongstack/tools';
 import * as readline from 'readline';
 import { spawn } from 'child_process';
 import { SkillInstaller } from '@wrongstack/core/skills';
+import { allServers } from '@wrongstack/core/infrastructure';
 import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
+import { ToolExecutor } from '@wrongstack/core/execution';
+import { writeFileSync } from 'fs';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -261,8 +263,8 @@ function buildSddCommand(opts) {
     async run(args) {
       const ctx = opts.context;
       const projectRoot = ctx?.projectRoot ?? process.cwd();
-      const specsDir = path21.join(projectRoot, ".wrongstack", "specs");
-      const graphsDir = path21.join(projectRoot, ".wrongstack", "task-graphs");
+      const specsDir = path23.join(projectRoot, ".wrongstack", "specs");
+      const graphsDir = path23.join(projectRoot, ".wrongstack", "task-graphs");
       const specStore = new SpecStore({ baseDir: specsDir });
       new TaskGraphStore({ baseDir: graphsDir });
       const versioning = new SpecVersioning();
@@ -278,7 +280,7 @@ function buildSddCommand(opts) {
           const forceFlag = rest.includes("--force") || rest.includes("-f");
           const title = rest.filter((a) => !a.startsWith("-")).join(" ").trim() || "Untitled Feature";
           if (!sddState.getBuilder() && !forceFlag) {
-            const sessionPath = path21.join(projectRoot, ".wrongstack", "sdd-session.json");
+            const sessionPath = path23.join(projectRoot, ".wrongstack", "sdd-session.json");
             try {
               await fsp2.access(sessionPath);
               const projectContext2 = await gatherProjectContext(projectRoot);
@@ -313,7 +315,7 @@ function buildSddCommand(opts) {
             projectContext,
             minQuestions: 2,
             maxQuestions: 10,
-            sessionPath: path21.join(projectRoot, ".wrongstack", "sdd-session.json")
+            sessionPath: path23.join(projectRoot, ".wrongstack", "sdd-session.json")
           }));
           const builder = sddState.getBuilder();
           builder.startSession(title);
@@ -581,7 +583,7 @@ Start executing the tasks one by one.`
           };
         }
         case "cancel": {
-          const sessionPath = path21.join(projectRoot, ".wrongstack", "sdd-session.json");
+          const sessionPath = path23.join(projectRoot, ".wrongstack", "sdd-session.json");
           let deletedFromDisk = false;
           try {
             await fsp2.unlink(sessionPath);
@@ -605,7 +607,7 @@ Start executing the tasks one by one.`
           if (sddState.getBuilder()) {
             return { message: "An SDD session is already active. Use /sdd cancel first." };
           }
-          const sessionPath = path21.join(projectRoot, ".wrongstack", "sdd-session.json");
+          const sessionPath = path23.join(projectRoot, ".wrongstack", "sdd-session.json");
           const projectContext = await gatherProjectContext(projectRoot);
           sddState.setBuilder(new AISpecBuilder({
             store: specStore,
@@ -831,7 +833,7 @@ function sddHelp() {
 async function gatherProjectContext(projectRoot) {
   const parts = [];
   try {
-    const pkgPath = path21.join(projectRoot, "package.json");
+    const pkgPath = path23.join(projectRoot, "package.json");
     const pkgRaw = await fsp2.readFile(pkgPath, "utf8");
     const pkg = JSON.parse(pkgRaw);
     parts.push(`Project: ${String(pkg.name ?? "unknown")}`);
@@ -847,13 +849,13 @@ async function gatherProjectContext(projectRoot) {
   } catch {
   }
   try {
-    const tsconfigPath = path21.join(projectRoot, "tsconfig.json");
+    const tsconfigPath = path23.join(projectRoot, "tsconfig.json");
     await fsp2.access(tsconfigPath);
     parts.push("Language: TypeScript");
   } catch {
   }
   try {
-    const srcDir = path21.join(projectRoot, "src");
+    const srcDir = path23.join(projectRoot, "src");
     const entries = await fsp2.readdir(srcDir, { withFileTypes: true });
     const dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name);
     if (dirs.length > 0) {
@@ -976,7 +978,7 @@ __export(update_check_exports, {
   getUpdateNotification: () => getUpdateNotification
 });
 function cachePath(homeFn = defaultHomeDir2) {
-  return path21.join(homeFn(), ".wrongstack", "update-cache.json");
+  return path23.join(homeFn(), ".wrongstack", "update-cache.json");
 }
 function currentVersion() {
   const req2 = createRequire(import.meta.url);
@@ -1013,7 +1015,7 @@ async function readCache(homeFn = defaultHomeDir2) {
 }
 async function writeCache(entry, homeFn = defaultHomeDir2) {
   try {
-    const dir = path21.dirname(cachePath(homeFn));
+    const dir = path23.dirname(cachePath(homeFn));
     await fsp2.mkdir(dir, { recursive: true });
     await fsp2.writeFile(cachePath(homeFn), JSON.stringify(entry, null, 2), "utf8");
   } catch {
@@ -1102,7 +1104,7 @@ async function runWebUI(opts) {
   let abortController = null;
   const authToken = crypto.randomBytes(16).toString("hex");
   const wss = new WebSocketServer({ port, host: "127.0.0.1", maxPayload: 1 * 1024 * 1024 });
-  console.log(`[WebUI] WebSocket server starting on ws://localhost:${port}`);
+  console.log(`[WebUI] WebSocket server starting on ws://127.0.0.1:${port}`);
   const eventUnsubscribers = [];
   function setupEvents() {
     for (const unsub of eventUnsubscribers) unsub();
@@ -1196,10 +1198,29 @@ async function runWebUI(opts) {
         });
       })
     );
+    if (opts.subscribeEternalIteration) {
+      eventUnsubscribers.push(
+        opts.subscribeEternalIteration((entry) => {
+          broadcast({
+            type: "eternal.iteration",
+            payload: {
+              iteration: entry.iteration,
+              at: entry.at,
+              source: entry.source,
+              task: entry.task,
+              status: entry.status,
+              note: entry.note,
+              tokens: entry.tokens,
+              costUsd: entry.costUsd
+            }
+          });
+        })
+      );
+    }
   }
   return new Promise((resolve4) => {
     wss.on("listening", () => {
-      console.log(`[WebUI] WebSocket server running on ws://localhost:${port}`);
+      console.log(`[WebUI] WebSocket server running on ws://127.0.0.1:${port}`);
       setupEvents();
     });
     wss.on("connection", (ws, req2) => {
@@ -1584,26 +1605,40 @@ async function runWebUI(opts) {
       return {};
     }
     if (!parsed.providers) return {};
-    const keyFile = path21.join(path21.dirname(opts.globalConfigPath), ".key");
+    const keyFile = path23.join(path23.dirname(opts.globalConfigPath), ".key");
     const vault = new DefaultSecretVault$1({ keyFile });
     return decryptConfigSecrets$1(parsed.providers, vault);
   }
   async function saveProviders(providers) {
     if (!opts.globalConfigPath) return;
     let raw;
+    let fileExists = true;
     try {
       raw = await fsp2.readFile(opts.globalConfigPath, "utf8");
-    } catch {
+    } catch (err) {
+      if (err.code !== "ENOENT") {
+        throw new Error(
+          `Refusing to mutate ${opts.globalConfigPath}: ${err.message}`,
+          { cause: err }
+        );
+      }
+      fileExists = false;
       raw = "{}";
     }
     let parsed;
     try {
       parsed = JSON.parse(raw);
-    } catch {
+    } catch (err) {
+      if (fileExists) {
+        throw new Error(
+          `Refusing to overwrite corrupt config at ${opts.globalConfigPath} (${err.message}). Fix or move the file aside before retrying.`,
+          { cause: err }
+        );
+      }
       parsed = {};
     }
     parsed.providers = providers;
-    const keyFile = path21.join(path21.dirname(opts.globalConfigPath), ".key");
+    const keyFile = path23.join(path23.dirname(opts.globalConfigPath), ".key");
     const vault = new DefaultSecretVault$1({ keyFile });
     const encrypted = encryptConfigSecrets(parsed, vault);
     await atomicWrite(opts.globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
@@ -1618,19 +1653,6 @@ var init_webui_server = __esm({
   }
 });
 
-// src/plugin-api-factory.ts
-var plugin_api_factory_exports = {};
-__export(plugin_api_factory_exports, {
-  default: () => createApi
-});
-function createApi(ownerName, base) {
-  return new DefaultPluginAPI({ ownerName, ...base });
-}
-var init_plugin_api_factory = __esm({
-  "src/plugin-api-factory.ts"() {
-  }
-});
-
 // src/slash-commands/commit-llm.ts
 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";
@@ -1788,7 +1810,7 @@ function parseSpawnFlags(input) {
   return { description: rest.trim(), opts };
 }
 async function bootConfig(flags) {
-  const cwd = typeof flags["cwd"] === "string" ? path21.resolve(flags["cwd"]) : process.cwd();
+  const cwd = typeof flags["cwd"] === "string" ? path23.resolve(flags["cwd"]) : process.cwd();
   const pathResolver = new DefaultPathResolver(cwd);
   const projectRoot = pathResolver.projectRoot;
   const userHome = os6.homedir();
@@ -1855,7 +1877,7 @@ var ReadlineInputReader = class {
   history = [];
   pending = false;
   constructor(opts = {}) {
-    this.historyFile = opts.historyFile ?? path21.join(os6.homedir(), ".wrongstack", "history");
+    this.historyFile = opts.historyFile ?? path23.join(os6.homedir(), ".wrongstack", "history");
   }
   async loadHistory() {
     try {
@@ -1867,7 +1889,7 @@ var ReadlineInputReader = class {
   }
   async saveHistory() {
     try {
-      await fsp2.mkdir(path21.dirname(this.historyFile), { recursive: true });
+      await fsp2.mkdir(path23.dirname(this.historyFile), { recursive: true });
       await fsp2.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
     } catch {
     }
@@ -2094,20 +2116,20 @@ function assertSafeToDelete(filename, parentDir) {
   if (PROTECTED_BASENAMES.has(filename)) {
     throw new Error(`Refusing to delete protected file: ${filename}`);
   }
-  if (filename !== path21.basename(filename)) {
+  if (filename !== path23.basename(filename)) {
     throw new Error(`Refusing to delete path with traversal: ${filename}`);
   }
   if (!filename.startsWith("config.json.") || !filename.endsWith(".bak")) {
     throw new Error(`Refusing to delete unknown file: ${filename}`);
   }
-  const resolvedParent = path21.resolve(parentDir);
+  const resolvedParent = path23.resolve(parentDir);
   if (!resolvedParent.endsWith(".wrongstack")) {
     throw new Error(`Unexpected parent directory for bak prune: ${resolvedParent}`);
   }
 }
 async function safeDelete(filePath) {
-  const dir = path21.dirname(filePath);
-  const filename = path21.basename(filePath);
+  const dir = path23.dirname(filePath);
+  const filename = path23.basename(filePath);
   try {
     assertSafeToDelete(filename, dir);
     await fsp2.unlink(filePath);
@@ -2152,16 +2174,16 @@ function diffSummary(oldCfg, newCfg) {
 }
 var defaultHomeDir = () => os6__default.homedir();
 function historyDir(homeFn = defaultHomeDir) {
-  return path21.join(homeFn(), ".wrongstack", "config.history", "entries");
+  return path23.join(homeFn(), ".wrongstack", "config.history", "entries");
 }
 function historyIndexPath(homeFn = defaultHomeDir) {
-  return path21.join(homeFn(), ".wrongstack", "config.history", "index.json");
+  return path23.join(homeFn(), ".wrongstack", "config.history", "index.json");
 }
 function configPath(homeFn = defaultHomeDir) {
-  return path21.join(homeFn(), ".wrongstack", "config.json");
+  return path23.join(homeFn(), ".wrongstack", "config.json");
 }
 function backupLastPath(homeFn = defaultHomeDir) {
-  return path21.join(homeFn(), ".wrongstack", "config.json.last");
+  return path23.join(homeFn(), ".wrongstack", "config.json.last");
 }
 function entryId(ts) {
   return ts.replace(/[:.]/g, "-").slice(0, 19);
@@ -2179,7 +2201,7 @@ async function readIndex(homeFn = defaultHomeDir) {
 }
 async function writeIndex(idx, homeFn = defaultHomeDir) {
   await ensureHistoryDir(homeFn);
-  await fsp2.writeFile(historyIndexPath(homeFn), JSON.stringify(idx, null, 2), "utf8");
+  await atomicWrite(historyIndexPath(homeFn), JSON.stringify(idx, null, 2));
 }
 async function backupCurrent(homeFn = defaultHomeDir) {
   const cfg = configPath(homeFn);
@@ -2198,17 +2220,17 @@ async function backupCurrent(homeFn = defaultHomeDir) {
   }
   if (content !== void 0) {
     try {
-      const bakPath = path21.join(homeFn(), ".wrongstack", `config.json.${ts}.bak`);
+      const bakPath = path23.join(homeFn(), ".wrongstack", `config.json.${ts}.bak`);
       await atomicWrite(bakPath, content);
     } catch {
     }
   }
   try {
-    const dir = path21.join(homeFn(), ".wrongstack");
+    const dir = path23.join(homeFn(), ".wrongstack");
     const files = await fsp2.readdir(dir);
     const baks = files.filter((f) => f.startsWith("config.json.") && f.endsWith(".bak")).sort().reverse();
     for (const f of baks.slice(10)) {
-      await safeDelete(path21.join(dir, f));
+      await safeDelete(path23.join(dir, f));
     }
   } catch {
   }
@@ -2225,7 +2247,7 @@ async function appendHistory(oldCfg, newCfg, description, homeFn = defaultHomeDi
     diffSummary: diffSummary(oldCfg, newCfg)
   };
   await fsp2.writeFile(
-    path21.join(historyDir(homeFn), `${id}.json`),
+    path23.join(historyDir(homeFn), `${id}.json`),
     JSON.stringify(entry, null, 2),
     "utf8"
   );
@@ -2240,7 +2262,7 @@ async function listHistory(homeFn = defaultHomeDir) {
 }
 async function getHistoryEntry(id, homeFn = defaultHomeDir) {
   try {
-    const raw = await fsp2.readFile(path21.join(historyDir(homeFn), `${id}.json`), "utf8");
+    const raw = await fsp2.readFile(path23.join(historyDir(homeFn), `${id}.json`), "utf8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -2299,11 +2321,11 @@ async function restoreLast(homeFn = defaultHomeDir) {
 var theme = { primary: color.amber };
 async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => process.env.HOME ?? __require("os").homedir()) {
   try {
-    const { atomicWrite: atomicWrite7 } = await import('@wrongstack/core');
-    const fs17 = await import('fs/promises');
+    const { atomicWrite: atomicWrite8 } = await import('@wrongstack/core');
+    const fs20 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs17.readFile(configPath2, "utf8");
+      const raw = await fs20.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -2311,7 +2333,7 @@ async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => p
     existing.provider = provider;
     existing.model = model;
     await backupCurrent(homeFn);
-    await atomicWrite7(configPath2, JSON.stringify(existing, null, 2));
+    await atomicWrite8(configPath2, JSON.stringify(existing, null, 2));
     try {
       await appendHistory(
         oldCfg,
@@ -2440,8 +2462,12 @@ ${color.bold(theme.primary("WrongStack") + color.dim(" \u2014 Provider & Model S
   const defaultHint = defaultIdx !== void 0 && defaultProvider ? ` ${color.dim(`[Enter = ${defaultProvider}]`)}` : "";
   const providerAnswer = (await reader.readLine(
     `
-${color.amber("?")} Select provider (1-${ordered.length})${defaultHint}: `
+${color.amber("?")} Select provider (1-${ordered.length})${defaultHint} ${color.dim("[q to quit]")}: `
   )).trim();
+  if (providerAnswer.toLowerCase() === "q") {
+    renderer.write(color.dim("Cancelled.\n"));
+    return void 0;
+  }
   if (!providerAnswer) {
     if (defaultIdx !== void 0) {
       const def = ordered[defaultIdx - 1];
@@ -2503,15 +2529,23 @@ async function pickModel(provider, registry, renderer, reader, defaultModel) {
     if (offset < models.length) {
       const more = (await reader.readLine(
         `
-${color.amber("?")} Showing ${Math.min(offset, models.length)}/${models.length} \u2014 Enter number or ${color.dim("Enter")} for more: `
+${color.amber("?")} Showing ${Math.min(offset, models.length)}/${models.length} \u2014 Enter number, ${color.dim("Enter")} for more, or ${color.dim("q")} to quit: `
       )).trim();
+      if (more.toLowerCase() === "q") {
+        renderer.write(color.dim("Cancelled.\n"));
+        return void 0;
+      }
       if (!more) continue;
       return resolveModelSelection(more, models, provider, registry, renderer);
     }
   }
   const defaultHint = defaultIdxInModels >= 0 && defaultModel ? ` ${color.dim(`[Enter = ${defaultModel}]`)}` : "";
   const answer = (await reader.readLine(`
-${color.amber("?")} Select model (1-${models.length})${defaultHint}: `)).trim();
+${color.amber("?")} Select model (1-${models.length})${defaultHint} ${color.dim("[q to quit]")}: `)).trim();
+  if (answer.toLowerCase() === "q") {
+    renderer.write(color.dim("Cancelled.\n"));
+    return void 0;
+  }
   if (!answer) {
     if (defaultIdxInModels >= 0 && defaultModel) {
       renderer.write(
@@ -2569,10 +2603,10 @@ async function detectPackageManager(root, declared) {
     const name = declared.split("@")[0];
     if (name) return name;
   }
-  if (await pathExists(path21.join(root, "pnpm-lock.yaml"))) return "pnpm";
-  if (await pathExists(path21.join(root, "bun.lockb"))) return "bun";
-  if (await pathExists(path21.join(root, "bun.lock"))) return "bun";
-  if (await pathExists(path21.join(root, "yarn.lock"))) return "yarn";
+  if (await pathExists(path23.join(root, "pnpm-lock.yaml"))) return "pnpm";
+  if (await pathExists(path23.join(root, "bun.lockb"))) return "bun";
+  if (await pathExists(path23.join(root, "bun.lock"))) return "bun";
+  if (await pathExists(path23.join(root, "yarn.lock"))) return "yarn";
   return "npm";
 }
 function hasUsableScript(scripts, name) {
@@ -2593,7 +2627,7 @@ function parseMakeTargets(makefile) {
 async function detectProjectFacts(root) {
   const facts = { hints: [] };
   try {
-    const pkg = JSON.parse(await fsp2.readFile(path21.join(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(await fsp2.readFile(path23.join(root, "package.json"), "utf8"));
     const scripts = pkg.scripts ?? {};
     const pm = await detectPackageManager(root, pkg.packageManager);
     if (hasUsableScript(scripts, "build")) facts.build = `${pm} run build`;
@@ -2607,14 +2641,14 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path21.join(root, "pyproject.toml"))) throw new Error("not python");
+    if (!await pathExists(path23.join(root, "pyproject.toml"))) throw new Error("not python");
     facts.test ??= "pytest";
     facts.lint ??= "ruff check .";
     facts.hints.push("pyproject.toml");
   } catch {
   }
   try {
-    if (!await pathExists(path21.join(root, "go.mod"))) throw new Error("not go");
+    if (!await pathExists(path23.join(root, "go.mod"))) throw new Error("not go");
     facts.build ??= "go build ./...";
     facts.test ??= "go test ./...";
     facts.run ??= "go run .";
@@ -2622,7 +2656,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path21.join(root, "Cargo.toml"))) throw new Error("not rust");
+    if (!await pathExists(path23.join(root, "Cargo.toml"))) throw new Error("not rust");
     facts.build ??= "cargo build";
     facts.test ??= "cargo test";
     facts.lint ??= "cargo clippy";
@@ -2631,7 +2665,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    const makefile = await fsp2.readFile(path21.join(root, "Makefile"), "utf8");
+    const makefile = await fsp2.readFile(path23.join(root, "Makefile"), "utf8");
     const targets = parseMakeTargets(makefile);
     facts.build ??= targets.has("build") ? "make build" : "make";
     if (targets.has("test")) facts.test ??= "make test";
@@ -2645,52 +2679,79 @@ async function detectProjectFacts(root) {
 }
 function renderAgentsTemplate(f) {
   const cmd = (s) => s ? `\`${s}\`` : "_TODO_";
+  const hints = f.hints.length > 0 ? `
+
+> Auto-detected: ${f.hints.join(", ")}` : "";
   return `# AGENTS.md
 
-This file is loaded into WrongStack's system prompt as project context.
-Keep it concise, factual, and durable: write the information future agents
-need before they touch this codebase.
+> **DO NOT DELETE THIS FILE.** It is loaded into WrongStack's system prompt as
+> persistent project context. Previous content here may contain decisions,
+> architecture notes, domain knowledge, or verification history that should be
+> preserved. Merge additions rather than replacing.
 
 ## Project brief
 
-- **Purpose:** _What does this project do, and why does it exist?_
+- **Purpose:** _What does this project do and why does it exist?_
 - **Primary users:** _Who uses it: developers, operators, customers, internal systems?_
-- **Runtime/deployment:** _Where does it run: CLI, server, browser, worker, library, package?_
-- **Main entry points:** _Which files or commands should an agent inspect first?_
+- **Runtime / deployment:** _CLI, server, browser, worker, library, package?_${hints}
 
 ## How to work safely
 
 - _Project-specific rules the agent should always follow._
 - _Files, generated artifacts, migrations, or config the agent should not edit without asking._
-- _Preferred style or architecture choices that are not obvious from the code._
+- _Preferred style or architecture choices not obvious from the code._
+- _Known fragile areas or historical bugs that deserve extra caution._
 
 ## Commands
 
-- **Build:** ${cmd(f.build)}
-- **Test:** ${cmd(f.test)}
-- **Lint:** ${cmd(f.lint)}
-- **Run locally:** ${cmd(f.run)}
+| Command | Script |
+|---------|--------|
+| Build | ${cmd(f.build)} |
+| Test | ${cmd(f.test)} |
+| Lint | ${cmd(f.lint)} |
+| Run locally | ${cmd(f.run)} |
+
+## Key files and entry points
+
+| File / directory | Role |
+|---|---|
+| _src/_ | _Main source entry point(s)_ |
+| _tests/_ | _Test root or convention_ |
+| _docs/_ | _Architecture, runbooks, design notes_ |
+| _scripts/_ | _Automation scripts (CI, release, install, etc.)_ |
 
 ## Architecture notes
 
 _Summarize the important modules, data flow, boundaries, and ownership rules.
-Mention anything a newcomer might misread._
+Mention anything a newcomer might misread or that looks unusual but is intentional._
+
+### Dependency layers
+
+_Describe the key dependency direction or layered structure, e.g.: "core has no
+runtime deps; cli assembles everything above it."_
+
+### Extension points
+
+_Plugin, MCP, extension hooks, custom tools \u2014 what's wired up and how._
 
 ## Domain knowledge
 
 _Business rules, acronyms, invariants, external services, and notes where the
-code looks unusual but is intentional._
+code looks unusual but is intentional. E.g.: "IDs are ULIDs, not UUIDs", "the
+\`draft\` flag means uncommitted billing metadata", "MCP servers are restarted
+on disconnect with exponential backoff, up to 3 attempts"._
 
 ## Verification checklist
 
 - _What should be run after code changes?_
 - _What manual smoke test proves the common path still works?_
 - _What failure modes deserve extra attention?_
+- _Any known flaky tests or environment-dependent behavior?_
 
 ## Useful pointers
 
-- _Docs, dashboards, runbooks, issue trackers, design notes, or owner contacts._
-`;
+- _Docs, dashboards, runbooks, issue trackers, design notes, owner contacts._
+- _Related projects or repositories._`;
 }
 function countTurnPairs(messages) {
   let count = 0;
@@ -3094,7 +3155,7 @@ function buildStatsCommand(opts) {
 function buildFleetCommand(opts) {
   return {
     name: "fleet",
-    description: "Inspect or control the subagent fleet: /fleet [status|usage|kill <id>|manifest|retry [taskId]|log <id>|stream on|off|help]",
+    description: "Inspect or control the subagent fleet: /fleet [status|usage|kill <id>|manifest|concurrency [N]|retry [taskId]|log <id>|stream on|off|help]",
     help: [
       "Usage:",
       "  /fleet                  Show fleet status (alias for /fleet status).",
@@ -3102,6 +3163,8 @@ function buildFleetCommand(opts) {
       "  /fleet usage            Per-subagent runtime cost.",
       "  /fleet kill <id>        Terminate a running subagent.",
       "  /fleet manifest         Print the director manifest.",
+      "  /fleet concurrency      Show the current concurrent-subagent ceiling.",
+      "  /fleet concurrency N    Set the ceiling to N (>= 1). Lowering does not preempt running tasks.",
       "  /fleet retry            List interrupted tasks from the last run.",
       "  /fleet retry <taskId>   Re-spawn the matching subagent and re-assign the task.",
       "  /fleet retry all        Re-assign every interrupted task at once.",
@@ -3127,6 +3190,9 @@ function buildFleetCommand(opts) {
           if (!target) return { message: "Usage: /fleet kill <subagent-id>" };
           return { message: await opts.onFleet("kill", target) };
         }
+        case "concurrency": {
+          return { message: await opts.onFleet("concurrency", target) };
+        }
         case "retry": {
           if (!opts.onFleetRetry) {
             return { message: "Retry is only available when director mode is active." };
@@ -3264,20 +3330,10 @@ function buildHelpCommand(opts) {
 function buildInitCommand(opts) {
   return {
     name: "init",
-    description: "Create .wrongstack/AGENTS.md project context for the system prompt.",
-    async run(args, ctx) {
-      const force = args.trim() === "--force";
-      const dir = path21.join(ctx.projectRoot, ".wrongstack");
-      const file = path21.join(dir, "AGENTS.md");
-      try {
-        await fsp2.access(file);
-        if (!force) {
-          const msg2 = `AGENTS.md already exists at ${file}. Use "/init --force" to overwrite.`;
-          opts.renderer.writeWarning(msg2);
-          return { message: msg2 };
-        }
-      } catch {
-      }
+    description: "Create or update .wrongstack/AGENTS.md project context for the system prompt.",
+    async run(_args, ctx) {
+      const dir = path23.join(ctx.projectRoot, ".wrongstack");
+      const file = path23.join(dir, "AGENTS.md");
       const detected = await detectProjectFacts(ctx.projectRoot);
       const body = renderAgentsTemplate(detected);
       await fsp2.mkdir(dir, { recursive: true });
@@ -3298,6 +3354,223 @@ No project type auto-detected. Edit the file with project context and instructio
     }
   };
 }
+function parseMcpArgs(args) {
+  const trimmed = args.trim();
+  if (!trimmed || trimmed === "list") return { action: "list", name: "" };
+  const parts = trimmed.split(/\s+/);
+  const action = parts[0];
+  const name = parts[1] ?? "";
+  const enable = parts.includes("--enable") || parts.includes("-e");
+  switch (action) {
+    case "add":
+      return name ? { action: "add", name, enable } : null;
+    case "remove":
+      return name ? { action: "remove", name } : null;
+    case "enable":
+      return name ? { action: "enable", name } : null;
+    case "disable":
+      return name ? { action: "disable", name } : null;
+    case "restart":
+      return name ? { action: "restart", name } : null;
+    default:
+      return null;
+  }
+}
+async function runMcpManagementCommand(parsed, deps) {
+  const { config, configPath: configPath2, mcpRegistry, allServerPresets } = deps;
+  const configured = config.mcpServers ?? {};
+  switch (parsed.action) {
+    case "list":
+      return renderList(configured, mcpRegistry, allServerPresets);
+    case "add":
+      return runAdd(parsed.name, parsed.enable ?? false, configured, configPath2, allServerPresets);
+    case "remove":
+      return runRemove(parsed.name, configured, configPath2, mcpRegistry);
+    case "enable":
+      return runEnable(parsed.name, configured, configPath2, mcpRegistry);
+    case "disable":
+      return runDisable(parsed.name, configured, configPath2, mcpRegistry);
+    case "restart":
+      return runRestart(parsed.name, mcpRegistry);
+  }
+}
+function renderList(configured, mcpRegistry, all) {
+  const lines = [];
+  const liveStatus = mcpRegistry.list();
+  const liveMap = new Map(liveStatus.map((s) => [s.name, s]));
+  const configuredNames = new Set(Object.keys(configured));
+  if (configuredNames.size > 0) {
+    lines.push(color.bold("Configured servers:"));
+    for (const [name, cfg] of Object.entries(configured)) {
+      const live = liveMap.get(name);
+      const toolCount = live ? color.dim(` (${live.toolCount} tools)`) : "";
+      const enabled = cfg.enabled === false ? `${color.dim("disabled")}  ` : `${color.green("\u25CF enabled")}  `;
+      const stateStr = live ? stateBadge(live.state) : color.dim("\u25CB not running");
+      lines.push(`  ${color.bold(name)}  ${enabled}${stateStr}${toolCount}`);
+      if (cfg.description) lines.push(`    ${color.dim(cfg.description)}`);
+    }
+    lines.push("");
+  }
+  const unconfigured = Object.entries(all).filter(([n]) => !configuredNames.has(n));
+  lines.push(color.bold("Available presets (run `/mcp add <name> --enable` to enable):"));
+  if (unconfigured.length === 0) {
+    lines.push(`  ${color.dim("All presets are already configured.")}`);
+  } else {
+    for (const [name, cfg] of unconfigured) {
+      const warn = cfg.permission === "deny" ? color.red(" \u26A0") : "";
+      lines.push(`  ${color.bold(name)}  ${cfg.description ?? cfg.transport}${warn}`);
+    }
+  }
+  lines.push("");
+  lines.push(color.dim("  /mcp add <name> [--enable]   /mcp remove <name>"));
+  lines.push(color.dim("  /mcp enable <name>            /mcp disable <name>"));
+  lines.push(color.dim("  /mcp restart <name>           (runtime restart)"));
+  return lines.join("\n");
+}
+async function runAdd(name, enable, configured, configPath2, all) {
+  const preset = all[name];
+  if (!preset) {
+    const known = Object.keys(all).join(", ");
+    return `Unknown server "${name}". Available: ${known}`;
+  }
+  if (configured[name]) {
+    const full2 = await readConfig(configPath2);
+    full2.mcpServers = {
+      ...full2.mcpServers ?? {},
+      [name]: { ...preset, ...configured[name], enabled: enable }
+    };
+    await writeConfig(configPath2, full2);
+    return `${color.green("Updated")} "${name}" (${enable ? "enabled" : "disabled"}). Config written.`;
+  }
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {}, [name]: { ...preset, enabled: enable } };
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  const verb = enable ? "Enabled" : "Added (disabled \u2014 /mcp enable to start)";
+  return `${color.green(verb)} "${name}" (${preset.transport}). Config written to ${configPath2}.`;
+}
+async function runRemove(name, configured, configPath2, mcpRegistry) {
+  if (!configured[name]) return `Server "${name}" is not in config.`;
+  await mcpRegistry.stop(name).catch(() => {
+  });
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {} };
+  delete mcpServers[name];
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  return `${color.yellow("Removed")} "${name}" from config.`;
+}
+async function runEnable(name, configured, configPath2, mcpRegistry) {
+  const cfg = configured[name];
+  if (!cfg) return `Server "${name}" is not in config. Run \`/mcp add ${name} --enable\` first.`;
+  if (cfg.enabled !== false) {
+    try {
+      await mcpRegistry.restart(name);
+      return `${color.green("\u25CF")} "${name}" is already enabled and running.`;
+    } catch {
+      await mcpRegistry.start({ ...cfg, enabled: true });
+      return `${color.green("Enabled")} "${name}" and started.`;
+    }
+  }
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {} };
+  mcpServers[name] = { ...mcpServers[name], enabled: true };
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  try {
+    await mcpRegistry.restart(name);
+  } catch {
+    await mcpRegistry.start({ ...cfg, enabled: true });
+  }
+  return `${color.green("Enabled")} "${name}" and started.`;
+}
+async function runDisable(name, configured, configPath2, mcpRegistry) {
+  const cfg = configured[name];
+  if (!cfg) return `Server "${name}" is not in config.`;
+  await mcpRegistry.stop(name).catch(() => {
+  });
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {} };
+  mcpServers[name] = { ...mcpServers[name], enabled: false };
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  return `${color.yellow("Disabled")} "${name}" and stopped.`;
+}
+async function runRestart(name, mcpRegistry) {
+  const live = mcpRegistry.list();
+  if (!live.find((s) => s.name === name)) {
+    return `Server "${name}" is not currently running. Add it with \`/mcp add ${name} --enable\`.`;
+  }
+  try {
+    await mcpRegistry.restart(name);
+    return `${color.green("\u2713")} Restarted "${name}".`;
+  } catch (err) {
+    return `${color.red("\u2717")} Failed to restart "${name}": ${err instanceof Error ? err.message : String(err)}`;
+  }
+}
+function stateBadge(state) {
+  switch (state) {
+    case "connected":
+      return color.green("\u25CF connected");
+    case "connecting":
+      return color.cyan("\u25D0 connecting");
+    case "reconnecting":
+      return color.cyan("\u25D1 reconnecting");
+    case "disconnected":
+      return color.dim("\u25CB disconnected");
+    case "failed":
+      return color.red("\u2717 failed");
+    default:
+      return color.dim(state);
+  }
+}
+async function readConfig(path24) {
+  try {
+    return JSON.parse(await fsp2.readFile(path24, "utf8"));
+  } catch {
+    return {};
+  }
+}
+async function writeConfig(path24, cfg) {
+  const raw = JSON.stringify(cfg, null, 2);
+  const tmp = path24 + ".tmp";
+  await fsp2.writeFile(tmp, raw, "utf8");
+  await fsp2.rename(tmp, path24);
+}
+
+// src/slash-commands/mcp.ts
+function buildMcpSlashCommand(opts) {
+  return {
+    name: "mcp",
+    description: "Manage MCP servers: /mcp [list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
+    aliases: ["mcp-servers"],
+    argsHint: "[list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
+    help: [
+      "Usage:",
+      "  /mcp                      List available and configured servers.",
+      "  /mcp list                 Same.",
+      "  /mcp add <name>           Add server preset to config (disabled).",
+      "  /mcp add <name> --enable  Add and immediately enable.",
+      "  /mcp remove <name>        Remove server from config.",
+      "  /mcp enable <name>        Enable server in config + start it.",
+      "  /mcp disable <name>       Disable server in config + stop it.",
+      "  /mcp restart <name>       Stop and restart a running server (REPL only).",
+      "",
+      "Examples:",
+      "  /mcp",
+      "  /mcp add filesystem --enable",
+      "  /mcp enable github",
+      "  /mcp restart brave-search"
+    ].join("\n"),
+    async run(args) {
+      if (!opts.onMcp) {
+        return { message: "MCP management is not available in this session." };
+      }
+      const result = await opts.onMcp(args.trim());
+      return { message: result };
+    }
+  };
+}
 
 // src/slash-commands/memory.ts
 function buildMemoryCommand(opts) {
@@ -3769,21 +4042,24 @@ function buildAutonomyCommand(opts) {
     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 toggle    Cycle: off \u2192 suggest \u2192 auto \u2192 off",
+      "  /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    Sittin-sene mode \u2014 runs forever against /goal",
+      "  /autonomy stop       Stop eternal mode (no-op for other modes)",
+      "  /autonomy toggle     Cycle: off \u2192 suggest \u2192 auto \u2192 eternal \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 YOLO. Runs until /autonomy stop or Ctrl+C twice.",
       "",
-      "In auto mode the agent works autonomously. Press Esc to redirect,",
-      "Ctrl+C to stop. The agent suggests context-aware next steps based on",
-      "the conversation history."
+      "In auto/eternal 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 arg = args.trim().toLowerCase();
@@ -3792,14 +4068,64 @@ function buildAutonomyCommand(opts) {
         opts.renderer.writeWarning(msg2);
         return { message: msg2 };
       }
-      if (!arg) {
+      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)")}`
+          auto: `${color.yellow("AUTO")} ${color.dim("(self-driving \u2014 Esc to redirect, Ctrl+C to stop)")}`,
+          eternal: `${color.red("ETERNAL")} ${color.dim("(sittin-sene \u2014 goal-driven, YOLO, until /autonomy stop)")}`
         };
-        const msg2 = `Autonomy mode: ${labels2[current]}`;
+        const lines = [`Autonomy mode: ${labels2[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.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 mode stop requested.")} The current iteration will finish, then the loop exits.${summaryLine}`;
         opts.renderer.write(msg2);
         return { message: msg2 };
       }
@@ -3810,20 +4136,47 @@ function buildAutonomyCommand(opts) {
         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 === "toggle" || arg === "cycle") {
         const current = opts.onAutonomy() ?? "off";
-        const cycle = ["off", "suggest", "auto"];
+        const cycle = ["off", "suggest", "auto", "eternal"];
         newMode = cycle[(cycle.indexOf(current) + 1) % cycle.length] ?? "off";
       } else {
-        const msg2 = `Unknown argument: ${arg}. Use /autonomy on, /autonomy off, /autonomy suggest, or /autonomy toggle.`;
+        const msg2 = `Unknown argument: ${arg}. Use /autonomy on, off, suggest, eternal, stop, or toggle.`;
         opts.renderer.writeWarning(msg2);
         return { message: msg2 };
       }
+      if (newMode === "eternal") {
+        const goal = await loadGoal(goalFilePath(opts.projectRoot));
+        if (!goal) {
+          const msg3 = `${color.red("Eternal mode requires a goal.")} Run \`/goal set <mission>\` first.`;
+          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();
+        const msg2 = `${color.red("Autonomy mode: ETERNAL")} \u2014 engine launching against goal: ${color.bold(goal.goal)}
+${color.dim("YOLO forced ON. Use /autonomy stop to end. Journal at /goal journal.")}`;
+        opts.renderer.write(msg2);
+        return { message: msg2 };
+      }
+      const previous = opts.onAutonomy();
+      if (previous === "eternal" && 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`
+        auto: `${color.yellow("AUTO")} \u2014 self-driving, agent continues automatically`,
+        eternal: `${color.red("ETERNAL")} \u2014 goal-driven sittin-sene loop`
       };
       const msg = `Autonomy mode: ${labels[newMode]}`;
       opts.renderer.write(msg);
@@ -3831,6 +4184,124 @@ function buildAutonomyCommand(opts) {
     }
   };
 }
+var KNOWN_VERBS = /* @__PURE__ */ new Set([
+  "",
+  "show",
+  "status",
+  "set",
+  "new",
+  "clear",
+  "reset",
+  "journal",
+  "log"
+]);
+function buildGoalCommand(opts) {
+  return {
+    name: "goal",
+    description: "Set, inspect, or clear the long-running autonomous mission used by /autonomy eternal.",
+    help: [
+      "Usage:",
+      "  /goal                     Show current goal + recent journal",
+      "  /goal set <text>          Set a new goal (overwrites previous)",
+      "  /goal clear               Clear the goal (stops eternal mode if running)",
+      "  /goal status              Same as /goal (alias)",
+      "  /goal journal [N]         Show last N journal entries (default 25)",
+      "",
+      "Goals live in <projectRoot>/.wrongstack/goal.json and persist across sessions.",
+      "A goal is the prerequisite for /autonomy eternal \u2014 the engine consults it on",
+      "every iteration to decide what to do next."
+    ].join("\n"),
+    async run(args) {
+      const trimmed = args.trim();
+      const [verbRaw, ...rest] = trimmed.split(/\s+/);
+      const verb = (verbRaw ?? "").toLowerCase();
+      const restJoined = rest.join(" ").trim();
+      const goalPath = goalFilePath(opts.projectRoot);
+      const verbForDispatch = verb && !KNOWN_VERBS.has(verb) ? "set" : verb;
+      const setText = verbForDispatch === "set" && !KNOWN_VERBS.has(verb) ? trimmed : restJoined;
+      switch (verbForDispatch) {
+        case "":
+        case "show":
+        case "status": {
+          const current = await loadGoal(goalPath);
+          if (!current) {
+            const msg2 = "No goal set. Use `/goal set <mission text>` to create one.";
+            opts.renderer.write(msg2);
+            return { message: msg2 };
+          }
+          const msg = formatGoal(current);
+          opts.renderer.write(msg);
+          return { message: msg };
+        }
+        case "set":
+        case "new": {
+          if (!setText) {
+            const msg2 = "Usage: /goal set <mission text>";
+            opts.renderer.writeWarning(msg2);
+            return { message: msg2 };
+          }
+          const existing = await loadGoal(goalPath);
+          const next = existing ? { ...existing, goal: setText, setAt: (/* @__PURE__ */ new Date()).toISOString(), lastActivityAt: (/* @__PURE__ */ new Date()).toISOString() } : emptyGoal(setText);
+          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.`)}`;
+          opts.renderer.write(msg);
+          return { message: msg, runText: buildGoalPreamble(setText) };
+        }
+        case "clear":
+        case "reset": {
+          const existing = await loadGoal(goalPath);
+          if (!existing) {
+            const msg2 = "No goal to clear.";
+            opts.renderer.write(msg2);
+            return { message: msg2 };
+          }
+          const { unlink: unlink4 } = await import('fs/promises');
+          try {
+            await unlink4(goalPath);
+          } catch {
+          }
+          if (opts.onEternalStop) opts.onEternalStop();
+          const msg = `${color.amber("Goal cleared.")} Eternal mode will stop on next cycle.`;
+          opts.renderer.write(msg);
+          return { message: msg };
+        }
+        case "journal":
+        case "log": {
+          const current = await loadGoal(goalPath);
+          if (!current) {
+            const msg2 = "No goal set.";
+            opts.renderer.write(msg2);
+            return { message: msg2 };
+          }
+          const n = restJoined ? Math.max(1, Number.parseInt(restJoined, 10) || 25) : 25;
+          if (current.journal.length === 0) {
+            const msg2 = "Journal is empty.";
+            opts.renderer.write(msg2);
+            return { message: msg2 };
+          }
+          const tail = current.journal.slice(-n);
+          const lines = tail.map((e) => {
+            const mark = e.status === "success" ? color.green("\u2713") : e.status === "failure" ? color.red("\u2717") : e.status === "aborted" ? color.amber("\u2298") : color.dim("\xB7");
+            const note = e.note ? color.dim(` \u2014 ${e.note}`) : "";
+            return `${color.dim(`#${e.iteration}`)} ${mark} ${color.dim(`[${e.source}]`)} ${e.task}${note}`;
+          });
+          const header = `Journal (last ${tail.length} of ${current.journal.length}):`;
+          const msg = `${header}
+${lines.join("\n")}`;
+          opts.renderer.write(msg);
+          return { message: msg };
+        }
+        default: {
+          const msg = `Unknown subcommand "${verb}". Try: show | set <text> | clear | journal [N]`;
+          opts.renderer.writeWarning(msg);
+          return { message: msg };
+        }
+      }
+    }
+  };
+}
 
 // src/slash-commands/mode.ts
 function buildModeCommand(opts) {
@@ -3940,6 +4411,15 @@ ${lines.join("\n\n")}
     }
   };
 }
+function getProviderFromContext(ctx, opts) {
+  if (opts.llmProvider && typeof opts.llmProvider.complete === "function") {
+    return { provider: opts.llmProvider, model: opts.llmModel };
+  }
+  if (ctx.provider && typeof ctx.provider.complete === "function") {
+    return { provider: ctx.provider, model: ctx.model };
+  }
+  return null;
+}
 function buildSecurityCommand(opts) {
   return {
     name: "security",
@@ -3991,11 +4471,11 @@ async function handleScan(args, ctx, opts) {
   const options = parseArgs2(args);
   const projectRoot = ctx.projectRoot || opts.projectRoot;
   try {
-    const orchestratorContext = ctx.provider ? ctx : { provider: opts.llmProvider, model: opts.llmModel };
-    if (!orchestratorContext.provider) {
+    const providerInfo = getProviderFromContext(ctx, opts);
+    if (!providerInfo) {
       return { message: "\u274C Security scan requires an active LLM provider. No provider configured." };
     }
-    const result = await defaultOrchestrator.run(orchestratorContext, {
+    const result = await defaultOrchestrator.run(providerInfo, {
       projectRoot,
       scanOptions: {
         depth: options.depth || "standard",
@@ -4044,11 +4524,11 @@ async function handleScan(args, ctx, opts) {
 async function handleAudit(ctx, opts) {
   const projectRoot = ctx.projectRoot || opts.projectRoot;
   try {
-    const orchestratorContext = ctx.provider ? ctx : { provider: opts.llmProvider, model: opts.llmModel };
-    if (!orchestratorContext.provider) {
+    const providerInfo = getProviderFromContext(ctx, opts);
+    if (!providerInfo) {
       return { message: "\u274C Security audit requires an active LLM provider. No provider configured." };
     }
-    const result = await defaultOrchestrator.run(orchestratorContext, {
+    const result = await defaultOrchestrator.run(providerInfo, {
       projectRoot,
       reportOptions: { format: "markdown" }
     });
@@ -4159,12 +4639,111 @@ function getHelpMessage() {
 
 Run \`/security scan\` to start.`;
 }
+var CONFIG_ENV = "WRONGSTACK_STATUSLINE_CONFIG";
+var DEFAULTS = {
+  todos: true,
+  plan: true,
+  fleet: true,
+  git: true,
+  elapsed: true,
+  context: true,
+  cost: true
+};
+function resolveConfigPath() {
+  return process.env[CONFIG_ENV] ?? path23.join(process.env.HOME ?? "", ".wrongstack", "statusline.json");
+}
+async function loadStatuslineConfig() {
+  const p = resolveConfigPath();
+  try {
+    const raw = await fsp2.readFile(p, "utf8");
+    return { ...DEFAULTS, ...JSON.parse(raw) };
+  } catch {
+    return { ...DEFAULTS };
+  }
+}
+async function saveStatuslineConfig(cfg) {
+  const p = resolveConfigPath();
+  await fsp2.mkdir(path23.dirname(p), { recursive: true });
+  await atomicWrite(p, JSON.stringify(cfg, null, 2));
+}
+function buildStatuslineCommand(deps) {
+  return {
+    name: "statusline",
+    aliases: ["sl"],
+    description: "Customize status bar chips: /statusline [item] [on|off] or /statusline reset",
+    help: [
+      "Usage: /statusline [item] [on|off]",
+      "       /statusline            \u2014 show current config",
+      "       /statusline <item> on  \u2014 enable a chip",
+      "       /statusline <item> off \u2014 disable a chip",
+      "       /statusline reset      \u2014 restore defaults",
+      "",
+      "Available items: todos, plan, fleet, git, elapsed, context, cost",
+      "Persistent across sessions (saved to ~/.wrongstack/statusline.json)."
+    ].join("\n"),
+    async run(args) {
+      const cfg = await deps.getConfig();
+      const trimmed = args.trim();
+      const parts = trimmed.split(/\s+/);
+      const [item, action] = parts;
+      if (!item) {
+        const lines = ["StatusBar chips:"];
+        const items = [
+          "todos",
+          "plan",
+          "fleet",
+          "git",
+          "elapsed",
+          "context",
+          "cost"
+        ];
+        for (const k of items) {
+          const val = cfg[k];
+          if (val === void 0) continue;
+          lines.push(`  ${val ? "\u25CF" : "\u25CB"} ${k}`);
+        }
+        return { message: lines.join("\n") };
+      }
+      if (item === "reset") {
+        await deps.setConfig({ ...DEFAULTS });
+        deps.setHiddenItems([]);
+        return { message: "StatusBar config reset to defaults." };
+      }
+      const validItems = [
+        "todos",
+        "plan",
+        "fleet",
+        "git",
+        "elapsed",
+        "context",
+        "cost"
+      ];
+      if (!validItems.includes(item)) {
+        return {
+          message: `Unknown item "${item}". Available: ${validItems.join(", ")}. Usage: /statusline <item> on|off`
+        };
+      }
+      const onOff = action?.toLowerCase();
+      if (!onOff || onOff !== "on" && onOff !== "off") {
+        return { message: `Usage: /statusline ${item} on|off` };
+      }
+      const next = { ...cfg, [item]: onOff === "on" };
+      await deps.setConfig(next);
+      if (onOff === "off") {
+        deps.setHiddenItems([...deps.hiddenItems, item]);
+      } else {
+        deps.setHiddenItems(deps.hiddenItems.filter((i) => i !== item));
+      }
+      return { message: `statusline ${item}: ${onOff}` };
+    }
+  };
+}
 function makeInstaller(opts, projectRoot, global) {
-  const globalRoot = path21.join(os6.homedir(), ".wrongstack");
+  const globalRoot = path23.join(os6.homedir(), ".wrongstack");
   return new SkillInstaller({
-    manifestPath: path21.join(globalRoot, "installed-skills.json"),
-    projectSkillsDir: path21.join(projectRoot, ".wrongstack", "skills"),
-    globalSkillsDir: path21.join(globalRoot, "skills"),
+    manifestPath: path23.join(globalRoot, "installed-skills.json"),
+    projectSkillsDir: path23.join(projectRoot, ".wrongstack", "skills"),
+    globalSkillsDir: path23.join(globalRoot, "skills"),
     projectHash: projectHash(projectRoot),
     skillLoader: opts.skillLoader
   });
@@ -4336,6 +4915,7 @@ function buildBuiltinSlashCommands(opts) {
     buildSkillUpdateCommand(opts),
     buildSkillUninstallCommand(opts),
     buildPluginCommand(opts),
+    buildMcpSlashCommand(opts),
     buildDiagCommand(opts),
     buildStatsCommand(opts),
     buildSpawnCommand(opts),
@@ -4352,12 +4932,22 @@ function buildBuiltinSlashCommands(opts) {
     buildLoadCommand(opts),
     buildYoloCommand(opts),
     buildAutonomyCommand(opts),
+    buildGoalCommand(opts),
     buildModeCommand(opts),
     buildExitCommand(opts),
     buildCommitCommand(),
     buildGitcheckCommand(),
     buildPushCommand(),
-    buildSecurityCommand(opts)
+    buildSecurityCommand(opts),
+    buildStatuslineCommand({
+      cwd: opts.cwd,
+      hiddenItems: opts.statuslineHiddenItems ?? [],
+      setHiddenItems: opts.setStatuslineHiddenItems ?? (() => {
+      }),
+      getConfig: opts.statuslineConfig?.get ?? (async () => ({})),
+      setConfig: opts.statuslineConfig?.set ?? (async () => {
+      })
+    })
   ];
 }
 
@@ -4376,13 +4966,13 @@ var MANIFESTS = [
 ];
 async function detectProjectKind(projectRoot) {
   try {
-    await fsp2.access(path21.join(projectRoot, ".wrongstack", "AGENTS.md"));
+    await fsp2.access(path23.join(projectRoot, ".wrongstack", "AGENTS.md"));
     return "initialized";
   } catch {
   }
   for (const m of MANIFESTS) {
     try {
-      await fsp2.access(path21.join(projectRoot, m));
+      await fsp2.access(path23.join(projectRoot, m));
       return "project";
     } catch {
     }
@@ -4390,8 +4980,8 @@ async function detectProjectKind(projectRoot) {
   return "empty";
 }
 async function scaffoldAgentsMd(projectRoot) {
-  const dir = path21.join(projectRoot, ".wrongstack");
-  const file = path21.join(dir, "AGENTS.md");
+  const dir = path23.join(projectRoot, ".wrongstack");
+  const file = path23.join(dir, "AGENTS.md");
   const facts = await detectProjectFacts(projectRoot);
   const body = renderAgentsTemplate(facts);
   await fsp2.mkdir(dir, { recursive: true });
@@ -4404,7 +4994,7 @@ async function runProjectCheck(opts) {
   if (kind === "initialized") {
     renderer.write(
       `
-  ${color.green("\u2713")} Project initialized ${color.dim(`(${path21.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
+  ${color.green("\u2713")} Project initialized ${color.dim(`(${path23.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
 `
     );
     return true;
@@ -4416,8 +5006,12 @@ async function runProjectCheck(opts) {
 `
     );
     const answer2 = (await reader.readLine(
-      `  ${color.amber("?")} Scaffold ${color.bold("AGENTS.md")} now? ${color.dim("[y/N]")} `
+      `  ${color.amber("?")} Scaffold ${color.bold("AGENTS.md")} now? ${color.dim("[y/N/q]")} `
     )).trim().toLowerCase();
+    if (answer2 === "q") {
+      renderer.write(color.dim("  Cancelled.\n"));
+      return false;
+    }
     if (answer2 === "y" || answer2 === "yes") {
       try {
         const file = await scaffoldAgentsMd(projectRoot);
@@ -4431,7 +5025,7 @@ async function runProjectCheck(opts) {
     }
     return true;
   }
-  const gitDir = path21.join(projectRoot, ".git");
+  const gitDir = path23.join(projectRoot, ".git");
   let hasGit = false;
   try {
     await fsp2.access(gitDir);
@@ -4445,8 +5039,12 @@ async function runProjectCheck(opts) {
 `
     );
     const answer2 = (await reader.readLine(
-      `  ${color.amber("?")} No git repo found. ${color.bold("Initialize git?")} ${color.dim("[y/N]")} `
+      `  ${color.amber("?")} No git repo found. ${color.bold("Initialize git?")} ${color.dim("[y/N/q]")} `
     )).trim().toLowerCase();
+    if (answer2 === "q") {
+      renderer.write(color.dim("  Cancelled.\n"));
+      return false;
+    }
     if (answer2 === "y" || answer2 === "yes") {
       try {
         const { spawn: spawn3 } = await import('child_process');
@@ -4468,8 +5066,8 @@ async function runProjectCheck(opts) {
 `
     );
   }
-  const answer = (await reader.readLine(`  ${color.amber("?")} Continue anyway? ${color.dim("[Y/n]")} `)).trim().toLowerCase();
-  if (answer === "n" || answer === "no") {
+  const answer = (await reader.readLine(`  ${color.amber("?")} Continue anyway? ${color.dim("[Y/n/q]")} `)).trim().toLowerCase();
+  if (answer === "q" || answer === "n" || answer === "no") {
     renderer.write(color.dim("  Cancelled.\n"));
     return false;
   }
@@ -4483,8 +5081,12 @@ async function runLaunchPrompts(opts) {
   } else {
     const answer = (await reader.readLine(
       `
-  ${color.amber("?")} Interactive mode: ${color.bold("T")}UI / ${color.bold("R")}EPL ${color.dim("[T/r]")} `
+  ${color.amber("?")} Interactive mode: ${color.bold("T")}UI / ${color.bold("R")}EPL ${color.dim("[T/r/q]")} `
     )).trim().toLowerCase();
+    if (answer === "q") {
+      renderer.write(color.dim("  Goodbye!\n"));
+      process.exit(0);
+    }
     mode = answer === "r" || answer === "repl" ? "repl" : "tui";
   }
   let yolo;
@@ -4492,8 +5094,12 @@ async function runLaunchPrompts(opts) {
     yolo = yoloPinned;
   } else {
     const answer = (await reader.readLine(
-      `  ${color.amber("?")} YOLO mode ${color.dim("(auto-approve every tool call)")} ${color.dim("[Y/n]")} `
+      `  ${color.amber("?")} YOLO mode ${color.dim("(auto-approve every tool call)")} ${color.dim("[Y/n/q]")} `
     )).trim().toLowerCase();
+    if (answer === "q") {
+      renderer.write(color.dim("  Goodbye!\n"));
+      process.exit(0);
+    }
     yolo = answer !== "n" && answer !== "no";
   }
   renderer.write(
@@ -4732,14 +5338,14 @@ function summarize(value, name) {
   if (typeof v === "object" && v !== null) {
     const o = v;
     if (name === "edit") {
-      const path22 = typeof o["path"] === "string" ? o["path"] : "";
+      const path24 = typeof o["path"] === "string" ? o["path"] : "";
       const reps = typeof o["replacements"] === "number" ? o["replacements"] : 0;
-      return `${path22}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
+      return `${path24}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
     }
     if (name === "write") {
-      const path22 = typeof o["path"] === "string" ? o["path"] : "";
+      const path24 = typeof o["path"] === "string" ? o["path"] : "";
       const bytes = typeof o["bytes"] === "number" ? o["bytes"] : void 0;
-      return bytes !== void 0 ? `${path22}  ${bytes}B` : path22;
+      return bytes !== void 0 ? `${path24}  ${bytes}B` : path24;
     }
     if (typeof o["count"] === "number") {
       return `${o["count"]} match${o["count"] === 1 ? "" : "es"}`;
@@ -4889,10 +5495,12 @@ ${color.bold(providerId)} ${cfg.family ? color.dim(`[${cfg.family}]`) : color.am
     deps.renderer.write(`    ${color.bold("x")}        Remove this provider entirely
 `);
     deps.renderer.write(`    ${color.bold("b")}        Back
+`);
+    deps.renderer.write(`    ${color.bold("q")}        Quit
 `);
     const raw = (await deps.reader.readLine(`
 ${color.amber("?")} ${providerId} > `)).trim();
-    if (!raw || raw === "b" || raw === "back") return;
+    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") {
@@ -4901,8 +5509,9 @@ ${color.amber("?")} ${providerId} > `)).trim();
     }
     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]")} `
+        `  ${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];
@@ -4940,8 +5549,9 @@ ${color.amber("?")} ${providerId} > `)).trim();
       }
       const target = keys[arg - 1];
       const confirm = (await deps.reader.readLine(
-        `  ${color.amber("?")} Delete key "${target.label}" (${maskedKey(target.apiKey)})? ${color.dim("[y/N]")} `
+        `  ${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];
@@ -5038,8 +5648,8 @@ async function addForNewProvider(deps) {
     deps.renderer.writeWarning("Catalog unavailable \u2014 falling back to manual entry.");
   }
   if (catalog.length === 0) {
-    const pid = (await deps.reader.readLine(`  ${color.amber("?")} Provider id: `)).trim();
-    if (!pid) return;
+    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();
@@ -5059,8 +5669,9 @@ async function addForNewProvider(deps) {
     )
   );
   const filterRaw = (await deps.reader.readLine(
-    `  ${color.amber("?")} Filter ${color.dim('(substring of id/name, "s" for unsaved-only, empty = all)')}: `
+    `  ${color.amber("?")} Filter ${color.dim('(substring, "s" for unsaved-only, q to quit)')}: `
   )).trim();
+  if (filterRaw === "q") return;
   const filterLc = filterRaw.toLowerCase();
   const showUnsavedOnly = filterLc === "s" || filterLc === "unsaved";
   const matches = (p) => {
@@ -5114,9 +5725,9 @@ async function addForNewProvider(deps) {
 `);
   const answer = (await deps.reader.readLine(
     `
-${color.amber("?")} Pick (1-${ordered.length}) or type provider id: `
+${color.amber("?")} Pick (1-${ordered.length}) or type provider id ${color.dim("[q to quit]")}: `
   )).trim();
-  if (!answer) return;
+  if (!answer || answer === "q") return;
   let chosen;
   const num = Number.parseInt(answer, 10);
   if (!Number.isNaN(num) && num >= 1 && num <= ordered.length) {
@@ -5133,7 +5744,8 @@ ${color.amber("?")} Pick (1-${ordered.length}) or type provider id: `
   Defaults from models.dev \u2014 press Enter to keep, or type a new value.
 `)
   );
-  const famRaw = (await deps.reader.readLine(`  ${color.amber("?")} Family ${color.dim(`[${chosen.family}]`)}: `)).trim();
+  const famRaw = (await deps.reader.readLine(`  ${color.amber("?")} Family ${color.dim(`[${chosen.family}]`)} ${color.dim("(q to quit)")}: `)).trim();
+  if (famRaw === "q") return;
   let family = chosen.family;
   if (famRaw) {
     if (!["anthropic", "openai", "openai-compatible", "google"].includes(famRaw)) {
@@ -5145,8 +5757,9 @@ ${color.amber("?")} Pick (1-${ordered.length}) or type provider id: `
     family = famRaw;
   }
   const baseRaw = (await deps.reader.readLine(
-    `  ${color.amber("?")} Base URL ${color.dim(`[${chosen.apiBase ?? "unset"}]`)}: `
+    `  ${color.amber("?")} Base URL ${color.dim(`[${chosen.apiBase ?? "unset"}]`)} ${color.dim("(q to quit)")}: `
   )).trim();
+  if (baseRaw === "q") return;
   const baseUrl = baseRaw || chosen.apiBase;
   const providersNow = await loadProviders(deps);
   let suggestedAlias = chosen.id;
@@ -5191,17 +5804,18 @@ ${color.bold("Custom provider")} ${color.dim("\u2014 for local models or proxies
 `
   );
   const type = (await deps.reader.readLine(
-    `  ${color.amber("?")} Provider id ${color.dim('(e.g. "local-llama", "my-proxy")')}: `
+    `  ${color.amber("?")} Provider id ${color.dim('(e.g. "local-llama", "my-proxy", q to quit)')}: `
   )).trim();
-  if (!type) return;
+  if (!type || type === "q") return;
   const existing = (await loadProviders(deps))[type];
   if (existing) {
     deps.renderer.writeWarning(`"${type}" already exists. Pick it from the main menu to edit.`);
     return;
   }
   const familyRaw = (await deps.reader.readLine(
-    `  ${color.amber("?")} Wire family ${color.dim("(anthropic | openai | openai-compatible | google)")}: `
+    `  ${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)) {
     deps.renderer.writeError(`Invalid family: "${familyRaw}"`);
     return;
@@ -5336,13 +5950,21 @@ async function loadProviders(deps) {
   let raw;
   try {
     raw = await fsp2.readFile(deps.globalConfigPath, "utf8");
-  } catch {
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      deps.renderer.writeWarning(
+        `Could not read ${deps.globalConfigPath}: ${err.message}. Treating as empty.`
+      );
+    }
     return {};
   }
   let parsed = {};
   try {
     parsed = JSON.parse(raw);
-  } catch {
+  } catch (err) {
+    deps.renderer.writeWarning(
+      `Config at ${deps.globalConfigPath} is not valid JSON: ${err.message}`
+    );
     return {};
   }
   const decrypted = decryptConfigSecrets(parsed, deps.vault);
@@ -5350,15 +5972,29 @@ async function loadProviders(deps) {
 }
 async function mutateProviders(deps, mutator) {
   let raw;
+  let fileExists = true;
   try {
     raw = await fsp2.readFile(deps.globalConfigPath, "utf8");
-  } catch {
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      throw new Error(
+        `Refusing to mutate ${deps.globalConfigPath}: ${err.message}`,
+        { cause: err }
+      );
+    }
+    fileExists = false;
     raw = "{}";
   }
   let parsed;
   try {
     parsed = JSON.parse(raw);
-  } catch {
+  } catch (err) {
+    if (fileExists) {
+      throw new Error(
+        `Refusing to overwrite corrupt config at ${deps.globalConfigPath} (${err.message}). Fix or move the file aside before retrying.`,
+        { cause: err }
+      );
+    }
     parsed = {};
   }
   const decrypted = decryptConfigSecrets(parsed, deps.vault);
@@ -5562,7 +6198,7 @@ var doctorCmd = async (_args, deps) => {
   }
   try {
     await fsp2.mkdir(deps.paths.projectSessions, { recursive: true });
-    const probe = path21.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
+    const probe = path23.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
     await fsp2.writeFile(probe, "");
     await fsp2.unlink(probe);
     checks.push({ name: "sessions writable", status: "ok", detail: deps.paths.projectSessions });
@@ -5665,8 +6301,8 @@ var exportCmd = async (args, deps) => {
     return 1;
   }
   if (output) {
-    await fsp2.mkdir(path21.dirname(path21.resolve(deps.cwd, output)), { recursive: true });
-    await fsp2.writeFile(path21.resolve(deps.cwd, output), rendered, "utf8");
+    await fsp2.mkdir(path23.dirname(path23.resolve(deps.cwd, output)), { recursive: true });
+    await fsp2.writeFile(path23.resolve(deps.cwd, output), rendered, "utf8");
     deps.renderer.write(`Wrote ${rendered.length} bytes to ${output}
 `);
   } else {
@@ -5695,7 +6331,12 @@ var initCmd = async (_args, deps) => {
 `
     );
   const defaultId = ranked[0]?.id ?? "anthropic";
-  const providerId = (await deps.reader.readLine(`Provider [${defaultId}]: `)).trim() || defaultId;
+  const providerAnswer = (await deps.reader.readLine(`Provider [${defaultId}]: `)).trim();
+  if (providerAnswer === "q") {
+    deps.renderer.write(color.dim("Cancelled.\n"));
+    return 0;
+  }
+  const providerId = providerAnswer || defaultId;
   const provider = await deps.modelsRegistry.getProvider(providerId);
   if (!provider) {
     deps.renderer.writeError(`Provider "${providerId}" not found in models.dev catalog.`);
@@ -5709,7 +6350,12 @@ var initCmd = async (_args, deps) => {
   }
   const suggestedModel = await deps.modelsRegistry.suggestModel(providerId) ?? "";
   const modelHint = suggestedModel ? ` [${suggestedModel}]` : "";
-  const modelId = (await deps.reader.readLine(`Model${modelHint}: `)).trim() || suggestedModel;
+  const modelAnswer = (await deps.reader.readLine(`Model${modelHint}: `)).trim();
+  if (modelAnswer === "q") {
+    deps.renderer.write(color.dim("Cancelled.\n"));
+    return 0;
+  }
+  const modelId = modelAnswer || suggestedModel;
   if (!modelId) {
     deps.renderer.writeError("No model selected. Aborting.");
     return 1;
@@ -5726,18 +6372,14 @@ var initCmd = async (_args, deps) => {
   await fsp2.mkdir(deps.paths.globalRoot, { recursive: true });
   const config = { version: 1, provider: providerId, model: modelId };
   if (apiKey) config.apiKey = apiKey;
-  const keyFile = path21.join(path21.dirname(deps.paths.globalConfig), ".key");
+  const keyFile = path23.join(path23.dirname(deps.paths.globalConfig), ".key");
   const vault = new DefaultSecretVault$1({ keyFile });
   const encrypted = encryptConfigSecrets(config, vault);
   await atomicWrite(deps.paths.globalConfig, JSON.stringify(encrypted, null, 2));
-  await fsp2.mkdir(path21.join(deps.projectRoot, ".wrongstack"), { recursive: true });
-  const agentsFile = path21.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
-  try {
-    await fsp2.access(agentsFile);
-  } catch {
-    const detected2 = await detectProjectFacts(deps.projectRoot);
-    await atomicWrite(agentsFile, renderAgentsTemplate(detected2));
-  }
+  await fsp2.mkdir(path23.join(deps.projectRoot, ".wrongstack"), { recursive: true });
+  const agentsFile = path23.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
+  const projectFacts = await detectProjectFacts(deps.projectRoot);
+  await atomicWrite(agentsFile, renderAgentsTemplate(projectFacts));
   deps.renderer.writeInfo(`Wrote ${deps.paths.globalConfig}`);
   deps.renderer.writeInfo(`Project state lives in ${deps.paths.projectDir}`);
   deps.renderer.writeInfo('Try: wstack "<task>"  or  wstack');
@@ -5773,7 +6415,7 @@ var mcpCmd = async (args, deps) => {
     return removeMcpServer(name, deps);
   }
   if (sub === "restart") {
-    deps.renderer.writeWarning("mcp restart is only available in REPL mode.");
+    deps.renderer.writeWarning("mcp restart is only available in REPL mode. Use /mcp restart instead.");
     return 0;
   }
   deps.renderer.writeError(`Unknown mcp subcommand: ${sub}`);
@@ -5948,7 +6590,7 @@ function renderConfiguredPlugins(config) {
     return `  ${`${name}${suffix}`.padEnd(44)} ${enabled}`;
   }).join("\n");
 }
-async function readConfig(file) {
+async function readConfig2(file) {
   try {
     return JSON.parse(await fsp2.readFile(file, "utf8"));
   } catch {
@@ -5967,7 +6609,7 @@ function officialPluginState(config, spec) {
   return typeof match === "object" && match.enabled === false ? "disabled" : "enabled";
 }
 async function upsertPlugin(spec, opts, deps, verb) {
-  const existing = await readConfig(deps.configPath);
+  const existing = await readConfig2(deps.configPath);
   const plugins = Array.isArray(existing.plugins) ? existing.plugins : [];
   const idx = plugins.findIndex((p) => pluginName(p) === spec);
   const nextEntry = pluginEntry(spec, opts.enabled);
@@ -5990,7 +6632,7 @@ async function upsertPlugin(spec, opts, deps, verb) {
   };
 }
 async function removePlugin(spec, deps) {
-  const existing = await readConfig(deps.configPath);
+  const existing = await readConfig2(deps.configPath);
   const plugins = Array.isArray(existing.plugins) ? existing.plugins : [];
   const next = plugins.filter((p) => pluginName(p) !== spec);
   if (next.length === plugins.length) {
@@ -6041,7 +6683,7 @@ var usageCmd = async (_args, deps) => {
   return 0;
 };
 var projectsCmd = async (_args, deps) => {
-  const projectsRoot = path21.join(deps.paths.globalRoot, "projects");
+  const projectsRoot = path23.join(deps.paths.globalRoot, "projects");
   try {
     const entries = await fsp2.readdir(projectsRoot);
     if (entries.length === 0) {
@@ -6051,7 +6693,7 @@ var projectsCmd = async (_args, deps) => {
     for (const hash of entries) {
       try {
         const meta = JSON.parse(
-          await fsp2.readFile(path21.join(projectsRoot, hash, "meta.json"), "utf8")
+          await fsp2.readFile(path23.join(projectsRoot, hash, "meta.json"), "utf8")
         );
         deps.renderer.write(
           `  ${color.dim(hash)}  ${color.dim(meta.lastSeen ?? "")}  ${meta.root ?? "?"}
@@ -6212,7 +6854,7 @@ async function listFleetRuns(deps) {
   }
   const runs = [];
   for (const id of entries) {
-    const runDir = path21.join(deps.paths.projectSessions, id);
+    const runDir = path23.join(deps.paths.projectSessions, id);
     let stat3;
     try {
       stat3 = await fsp2.stat(runDir);
@@ -6225,17 +6867,17 @@ async function listFleetRuns(deps) {
     let subagentCount = 0;
     let subagentsDir;
     try {
-      await fsp2.access(path21.join(runDir, "fleet.json"));
+      await fsp2.access(path23.join(runDir, "fleet.json"));
       manifest = true;
     } catch {
     }
     try {
-      await fsp2.access(path21.join(runDir, "checkpoint.json"));
+      await fsp2.access(path23.join(runDir, "checkpoint.json"));
       checkpoint = true;
     } catch {
     }
     try {
-      subagentsDir = path21.join(runDir, "subagents");
+      subagentsDir = path23.join(runDir, "subagents");
       const files = await fsp2.readdir(subagentsDir);
       subagentCount = files.filter((f) => f.endsWith(".jsonl")).length;
     } catch {
@@ -6264,7 +6906,7 @@ async function listFleetRuns(deps) {
   return 0;
 }
 async function showFleetRun(runId, deps) {
-  const runDir = path21.join(deps.paths.projectSessions, runId);
+  const runDir = path23.join(deps.paths.projectSessions, runId);
   let stat3;
   try {
     stat3 = await fsp2.stat(runDir);
@@ -6281,7 +6923,7 @@ async function showFleetRun(runId, deps) {
   deps.renderer.write(color.bold(`
 Fleet Run: ${runId}
 `) + "\n");
-  const manifestPath = path21.join(runDir, "fleet.json");
+  const manifestPath = path23.join(runDir, "fleet.json");
   let manifestData = null;
   try {
     manifestData = await fsp2.readFile(manifestPath, "utf8");
@@ -6297,7 +6939,7 @@ Fleet Run: ${runId}
     deps.renderer.write(`  ${color.dim("\u25CB")} fleet.json \u2014 not found
 `);
   }
-  const checkpointPath = path21.join(runDir, "checkpoint.json");
+  const checkpointPath = path23.join(runDir, "checkpoint.json");
   let checkpointData = null;
   try {
     checkpointData = await fsp2.readFile(checkpointPath, "utf8");
@@ -6344,7 +6986,7 @@ Fleet Run: ${runId}
     } catch {
     }
   }
-  const subagentsDir = path21.join(runDir, "subagents");
+  const subagentsDir = path23.join(runDir, "subagents");
   let subagentFiles = [];
   try {
     subagentFiles = await fsp2.readdir(subagentsDir);
@@ -6356,7 +6998,7 @@ Fleet Run: ${runId}
   Subagent transcripts (${subagentFiles.length}):
 `);
     for (const f of subagentFiles.sort()) {
-      const filePath = path21.join(subagentsDir, f);
+      const filePath = path23.join(subagentsDir, f);
       let size;
       try {
         const s = await fsp2.stat(filePath);
@@ -6373,7 +7015,7 @@ Fleet Run: ${runId}
   ${color.dim("\u25CB")} No subagent transcripts
 `);
   }
-  const sharedDir = path21.join(runDir, "shared");
+  const sharedDir = path23.join(runDir, "shared");
   try {
     const files = await fsp2.readdir(sharedDir);
     deps.renderer.write(`
@@ -6526,12 +7168,23 @@ function parseRewindFlags(args) {
   }
   return flags;
 }
+function findSessionId(args) {
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--last" || a === "--to") {
+      i++;
+      continue;
+    }
+    if (!a.startsWith("--")) return a;
+  }
+  return void 0;
+}
 var rewindCmd = async (args, deps) => {
   const flags = parseRewindFlags(args);
   const wpaths = resolveWstackPaths({ projectRoot: deps.projectRoot });
-  const sessionsDir = path21.join(wpaths.globalRoot, "sessions");
+  const sessionsDir = path23.join(wpaths.globalRoot, "sessions");
   const rewind = new DefaultSessionRewinder(sessionsDir);
-  let sessionId = args.find((a) => !a.startsWith("--"));
+  let sessionId = findSessionId(args);
   if (!sessionId) {
     if (!deps.sessionStore) {
       deps.renderer.writeError("No session store available.");
@@ -6672,6 +7325,7 @@ var helpCmd = async (_args, deps) => {
     "",
     "  wstack                       Start REPL",
     '  wstack "<task>"              Run task and exit',
+    '  wstack --eternal "<mission>" Launch eternal-autonomy loop against a goal \u2014 Ctrl+C to stop',
     "  wstack resume [<id>]         Resume a session",
     "  wstack sessions              List recent sessions",
     "  wstack init                  Pick provider + model from models.dev",
@@ -6739,22 +7393,22 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color33) {
+function fmtTaskResultLine(r, color35) {
   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 ? color33.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color33.dim(errTail)}` : "";
+  const errKindChip = errKind ? color35.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color35.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color33.green("\u2713"), stats, tail: "" };
+      return { mark: color35.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color33.yellow("\u23F1"), stats: `${color33.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color35.yellow("\u23F1"), stats: `${color35.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color33.dim("\u2298"), stats: `${color33.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color35.dim("\u2298"), stats: `${color35.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color33.red("\u2717"), stats: `${color33.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color35.red("\u2717"), stats: `${color35.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 
@@ -6764,7 +7418,7 @@ function resolveBundledSkillsDir() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path21.join(path21.dirname(corePkg), "skills");
+    return path23.join(path23.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -6917,6 +7571,7 @@ async function boot(argv) {
 init_sdd();
 async function runRepl(opts) {
   if (opts.banner !== false) printBanner(opts.renderer, opts.projectName);
+  await renderGoalBanner(opts);
   let activeCtrl;
   let interrupts = 0;
   const onSigint = () => {
@@ -6925,6 +7580,12 @@ async function runRepl(opts) {
       opts.renderer.writeWarning("Exiting.");
       process.exit(130);
     }
+    const engine = opts.getEternalEngine?.();
+    if (engine && opts.getAutonomy?.() === "eternal") {
+      engine.stop();
+      opts.renderer.writeWarning("Eternal mode stop requested. Press Ctrl+C again to exit.");
+      return;
+    }
     if (activeCtrl) {
       activeCtrl.abort();
       opts.renderer.writeWarning("Iteration cancelled. Press Ctrl+C again to exit.");
@@ -6936,6 +7597,42 @@ async function runRepl(opts) {
   const builder = new InputBuilder({ store: opts.attachments });
   try {
     for (; ; ) {
+      if (opts.getAutonomy?.() === "eternal") {
+        const engine = opts.getEternalEngine?.();
+        if (!engine) {
+          opts.renderer.writeWarning("Eternal mode set but no engine wired \u2014 falling back to off.");
+        } else {
+          const beforeGoal = await loadGoalSafe(opts);
+          const beforeIter = beforeGoal?.iterations ?? 0;
+          opts.renderer.write(
+            color.dim(`
+  \u21B3 [eternal #${beforeIter + 1}] running iteration\u2026
+`)
+          );
+          interrupts = 0;
+          try {
+            const ok = await engine.runOneIteration();
+            const afterGoal = await loadGoalSafe(opts);
+            const last = afterGoal?.journal[afterGoal.journal.length - 1];
+            if (!ok && !last) {
+              opts.renderer.write(color.dim("  \u21B3 [eternal] iteration produced no progress.\n"));
+            } else if (last) {
+              const mark = last.status === "success" ? color.green("\u2713") : last.status === "failure" ? color.red("\u2717") : color.amber("\u2298");
+              const tail = last.note ? color.dim(` \u2014 ${last.note.slice(0, 80)}`) : "";
+              opts.renderer.write(
+                `  ${mark} ${color.dim(`#${last.iteration}`)} ${color.dim(`[${last.source}]`)} ${last.task}${tail}
+`
+              );
+            }
+          } catch (err) {
+            opts.renderer.writeError(
+              `[eternal] ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
+          await new Promise((resolve4) => setTimeout(resolve4, 250));
+          continue;
+        }
+      }
       let raw;
       try {
         raw = await readPossiblyMultiline(opts);
@@ -6948,6 +7645,10 @@ async function runRepl(opts) {
         continue;
       }
       interrupts = 0;
+      if (trimmed === "q") {
+        opts.renderer.write(color.dim("  Goodbye!\n"));
+        break;
+      }
       if (trimmed === "/image" || trimmed === "/paste-image" || raw === "\x1Bv") {
         await pasteClipboardImage(builder, opts);
         continue;
@@ -7219,6 +7920,48 @@ async function pasteClipboardImage(builder, opts) {
     );
   }
 }
+async function loadGoalSafe(opts) {
+  if (!opts.projectRoot) return null;
+  try {
+    return await loadGoal(goalFilePath(opts.projectRoot));
+  } catch {
+    return null;
+  }
+}
+async function renderGoalBanner(opts) {
+  const goal = await loadGoalSafe(opts);
+  if (!goal) return;
+  const summary = goal.goal.length > 80 ? `${goal.goal.slice(0, 77)}\u2026` : goal.goal;
+  opts.renderer.write(
+    color.dim("Goal: ") + color.bold(summary) + color.dim(`  (iter ${goal.iterations})`) + "\n"
+  );
+  if (goal.engineState === "running") {
+    opts.renderer.write(
+      color.amber("  \u21BA Eternal engine was running when last session ended.") + "\n"
+    );
+    try {
+      const answer = (await opts.reader.readLine(color.dim("  Resume eternal mode? [y/N] "))).trim().toLowerCase();
+      if (answer === "y" || answer === "yes") {
+        try {
+          await opts.slashRegistry.dispatch("/autonomy eternal", opts.agent.ctx);
+        } catch (err) {
+          opts.renderer.writeError(
+            `Auto-resume failed: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      } else {
+        opts.renderer.write(
+          color.dim("  Not resuming. Use `/autonomy eternal` later to continue.") + "\n"
+        );
+      }
+    } catch {
+      opts.renderer.write(
+        color.dim("  Use `/autonomy eternal` to resume.") + "\n"
+      );
+    }
+  }
+  opts.renderer.write("\n");
+}
 async function readPossiblyMultiline(opts) {
   const firstPrompt = theme2.primary("\u203A ");
   const contPrompt = color.dim("\xB7 ");
@@ -7266,7 +8009,7 @@ function printBanner(renderer, projectName) {
   if (projectName && projectName.length > 0) {
     lines.push(color.dim("Project: ") + theme2.bold(projectName));
   }
-  lines.push(color.dim("Type /help for commands, /exit to quit."), "");
+  lines.push(color.dim("Type /help for commands, /exit or q to quit."), "");
   renderer.write(`${lines.join("\n")}
 `);
 }
@@ -7302,8 +8045,12 @@ async function execute(deps) {
     director,
     fleetRoster,
     fleetStreamController,
+    statuslineHiddenItems,
+    setStatuslineHiddenItems,
     getYolo,
     getAutonomy,
+    getEternalEngine,
+    subscribeEternalIteration,
     skillLoader
   } = deps;
   let code = 0;
@@ -7411,6 +8158,9 @@ async function execute(deps) {
           queueStore,
           yolo: !!config.yolo,
           getYolo,
+          getAutonomy,
+          getEternalEngine,
+          subscribeEternalIteration,
           appVersion: CLI_VERSION,
           provider: config.provider,
           family: banneredFamily,
@@ -7436,6 +8186,8 @@ async function execute(deps) {
             dispatch({ type: "resetContextChip" });
           },
           fleetStreamController,
+          statuslineHiddenItems,
+          setStatuslineHiddenItems,
           initialGoal: goalFlag,
           initialAsk: askFlag,
           getSDDContext: () => {
@@ -7479,7 +8231,8 @@ async function execute(deps) {
         session,
         port: Number.parseInt(String(flags.port ?? "3457"), 10),
         modelsRegistry,
-        globalConfigPath: wpaths.globalConfig
+        globalConfigPath: wpaths.globalConfig,
+        subscribeEternalIteration
       });
       try {
         code = await runRepl({
@@ -7492,8 +8245,10 @@ async function execute(deps) {
           supportsVision,
           attachments,
           effectiveMaxContext,
-          projectName: path21.basename(projectRoot) || void 0,
+          projectName: path23.basename(projectRoot) || void 0,
+          projectRoot,
           getAutonomy,
+          getEternalEngine,
           skillLoader
         });
       } finally {
@@ -7510,7 +8265,7 @@ async function execute(deps) {
         supportsVision,
         attachments,
         effectiveMaxContext,
-        projectName: path21.basename(projectRoot) || void 0,
+        projectName: path23.basename(projectRoot) || void 0,
         getAutonomy,
         skillLoader
       });
@@ -7599,9 +8354,9 @@ var MultiAgentHost = class {
     const coordinatorConfig = {
       coordinatorId: randomUUID(),
       doneCondition: { type: "all_tasks_done" },
-      maxConcurrent: 8
+      maxConcurrent: this.opts.maxConcurrent ?? 4
     };
-    const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path21.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
+    const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path23.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
     this.director = new Director({
       config: coordinatorConfig,
       manifestPath: this.opts.manifestPath,
@@ -7687,6 +8442,16 @@ var MultiAgentHost = class {
         model: subCfg.model ?? config.model,
         tools: this.filterTools(subCfg.tools)
       });
+      const toolExecutor = new ToolExecutor(this.subagentToolRegistry(subCfg.tools), {
+        permissionPolicy: new AutoApprovePermissionPolicy(),
+        secretScrubber: this.deps.secretScrubber,
+        renderer: this.deps.renderer,
+        events,
+        confirmAwaiter: void 0,
+        iterationTimeoutMs: config.tools?.iterationTimeoutMs ?? 12e4,
+        perIterationOutputCapBytes: config.tools?.perIterationOutputCapBytes ?? 1e5,
+        tracer: void 0
+      });
       const agent = new Agent({
         container: this.deps.container,
         tools: this.subagentToolRegistry(subCfg.tools),
@@ -7698,7 +8463,8 @@ var MultiAgentHost = class {
         // run under a director, not the user. Auto-approve everything
         // (except tool-level hard denies); the user already authorized
         // the work when they invoked the leader.
-        permissionPolicy: new AutoApprovePermissionPolicy()
+        permissionPolicy: new AutoApprovePermissionPolicy(),
+        toolExecutor
       });
       const hostEvents = this.deps.events;
       const offToolBridge = events.on("tool.executed", (e) => {
@@ -7774,7 +8540,7 @@ var MultiAgentHost = class {
       model: opts?.model,
       tools: opts?.tools
     };
-    const transcriptPath = this.sessionFactory ? path21.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
+    const transcriptPath = this.sessionFactory ? path23.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
     const { subagentId, taskId } = await this._spawnAndAssign(subagentConfig);
     this.fleetManager?.addPendingTask(taskId, subagentId, description);
     this.deps.events.emit("subagent.spawned", {
@@ -7917,16 +8683,16 @@ var MultiAgentHost = class {
     if (this.director) return this.director;
     this.opts.directorMode = true;
     if (this.opts.fleetRoot && !this.opts.manifestPath) {
-      this.opts.manifestPath = path21.join(this.opts.fleetRoot, "fleet.json");
+      this.opts.manifestPath = path23.join(this.opts.fleetRoot, "fleet.json");
     }
     if (this.opts.fleetRoot && !this.opts.sharedScratchpadPath) {
-      this.opts.sharedScratchpadPath = path21.join(this.opts.fleetRoot, "shared");
+      this.opts.sharedScratchpadPath = path23.join(this.opts.fleetRoot, "shared");
     }
     if (this.opts.fleetRoot && !this.opts.sessionsRoot) {
-      this.opts.sessionsRoot = path21.join(this.opts.fleetRoot, "subagents");
+      this.opts.sessionsRoot = path23.join(this.opts.fleetRoot, "subagents");
     }
     if (this.opts.fleetRoot && !this.opts.stateCheckpointPath) {
-      this.opts.stateCheckpointPath = path21.join(this.opts.fleetRoot, "director-state.json");
+      this.opts.stateCheckpointPath = path23.join(this.opts.fleetRoot, "director-state.json");
     }
     await this.ensureDirector();
     return this.director ?? null;
@@ -7965,6 +8731,37 @@ var MultiAgentHost = class {
       await this.getCoordinator().stopAll();
     }
   }
+  /**
+   * Current effective concurrent-subagent ceiling. Reads the live
+   * coordinator config when the director is built; otherwise falls back
+   * to the constructor option (or the default of 4 that buildDirector
+   * will apply on first /spawn).
+   */
+  getMaxConcurrent() {
+    if (this.director) {
+      return this.getCoordinator().config.maxConcurrent ?? 4;
+    }
+    return this.opts.maxConcurrent ?? 4;
+  }
+  /**
+   * Change the concurrent-subagent ceiling at runtime. Updates the
+   * constructor option (so lazy-built director picks it up) and, if the
+   * coordinator already exists, mutates its live config + triggers a
+   * dispatch pass so newly-allowed slots fill immediately.
+   *
+   * Throws on non-positive values; the caller is expected to validate
+   * user input first.
+   */
+  setMaxConcurrent(n) {
+    if (!Number.isFinite(n) || n < 1) {
+      throw new Error(`maxConcurrent must be a finite integer >= 1, got ${n}`);
+    }
+    const v = Math.floor(n);
+    this.opts.maxConcurrent = v;
+    if (this.director) {
+      this.getCoordinator().setMaxConcurrent(v);
+    }
+  }
 };
 function makePromptDelegate(reader) {
   return async (tool, input, suggestedPattern) => {
@@ -8047,11 +8844,11 @@ var SessionStats = class {
       if (e.name === "bash") this.bashCommands++;
       else if (e.name === "fetch") this.fetches++;
       if (!e.ok) return;
-      const path22 = typeof input?.path === "string" ? input.path : void 0;
-      if (e.name === "read" && path22) this.readPaths.add(path22);
-      else if (e.name === "edit" && path22) this.editedPaths.add(path22);
-      else if (e.name === "write" && path22) {
-        this.writtenPaths.add(path22);
+      const path24 = typeof input?.path === "string" ? input.path : void 0;
+      if (e.name === "read" && path24) this.readPaths.add(path24);
+      else if (e.name === "edit" && path24) this.editedPaths.add(path24);
+      else if (e.name === "write" && path24) {
+        this.writtenPaths.add(path24);
         const content = typeof input?.content === "string" ? input.content : "";
         this.bytesWritten += Buffer.byteLength(content, "utf8");
       }
@@ -8277,6 +9074,19 @@ async function setupCompaction(params) {
   return { effectiveMaxContext, autoCompactor };
 }
 function createAgent(params) {
+  const secretScrubber = params.container.resolve(TOKENS.SecretScrubber);
+  const renderer = params.container.has(TOKENS.Renderer) ? params.container.resolve(TOKENS.Renderer) : void 0;
+  params.container.resolve(TOKENS.Logger);
+  const toolExecutor = new ToolExecutor(params.tools, {
+    permissionPolicy: params.permissionPolicy ?? params.container.resolve(TOKENS.PermissionPolicy),
+    secretScrubber,
+    renderer,
+    events: params.events,
+    confirmAwaiter: params.confirmAwaiter,
+    iterationTimeoutMs: params.config.tools.iterationTimeoutMs,
+    perIterationOutputCapBytes: params.config.tools.perIterationOutputCapBytes,
+    tracer: params.tracer
+  });
   return new Agent({
     container: params.container,
     tools: params.tools,
@@ -8288,9 +9098,144 @@ function createAgent(params) {
     iterationTimeoutMs: params.config.tools.iterationTimeoutMs,
     executionStrategy: params.config.tools.defaultExecutionStrategy,
     perIterationOutputCapBytes: params.config.tools.perIterationOutputCapBytes,
-    confirmAwaiter: params.confirmAwaiter
+    confirmAwaiter: params.confirmAwaiter,
+    toolExecutor,
+    tracer: params.tracer
   });
 }
+function setupMetrics(params) {
+  const { flags, wpaths, events, logger, config } = params;
+  let metricsSink;
+  let healthRegistry;
+  let metricsServerHandle;
+  const metricsPortFlag = flags["metrics-port"];
+  const metricsPort = typeof metricsPortFlag === "string" && metricsPortFlag.length > 0 ? Number.parseInt(metricsPortFlag, 10) : void 0;
+  if (metricsPort !== void 0 && !flags.metrics) flags.metrics = true;
+  if (!flags.metrics) return { metricsSink, healthRegistry, metricsServerHandle };
+  metricsSink = new InMemoryMetricsSink();
+  wireMetricsToEvents(events, metricsSink);
+  healthRegistry = new DefaultHealthRegistry();
+  healthRegistry.register({
+    name: "session-store",
+    check: async () => {
+      try {
+        await fsp2.access(wpaths.projectSessions);
+        return { status: "healthy" };
+      } catch (e) {
+        return { status: "unhealthy", detail: e instanceof Error ? e.message : "access denied" };
+      }
+    }
+  });
+  healthRegistry.register({
+    name: "provider",
+    check: async () => ({
+      status: "healthy",
+      data: { id: config.provider, model: config.model }
+    })
+  });
+  const dumpMetrics = () => {
+    if (!metricsSink) return;
+    try {
+      const out = path23.join(wpaths.projectSessions, "metrics.json");
+      const snap = metricsSink.snapshot();
+      writeFileSync(out, JSON.stringify(snap, null, 2));
+    } catch {
+    }
+  };
+  process.on("exit", dumpMetrics);
+  if (metricsPort !== void 0 && Number.isFinite(metricsPort)) {
+    try {
+      metricsServerHandle = startMetricsServer({
+        port: metricsPort,
+        host: process.env["METRICS_HOST"] ?? "127.0.0.1",
+        sink: metricsSink,
+        healthRegistry
+      });
+      logger.info(
+        `metrics endpoint listening on ${metricsServerHandle.url} (healthz on same port)`
+      );
+      process.on("exit", () => {
+        void metricsServerHandle?.close().catch(() => {
+        });
+      });
+    } catch (err) {
+      logger.warn(
+        `metrics endpoint failed to start: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  return { metricsSink, healthRegistry, metricsServerHandle };
+}
+function createApi(ownerName, base) {
+  return new DefaultPluginAPI({ ownerName, ...base });
+}
+
+// src/wiring/plugins.ts
+async function setupPlugins(params) {
+  const {
+    config,
+    container,
+    events,
+    toolRegistry,
+    providerRegistry,
+    slashCommandRegistry,
+    mcpRegistry,
+    log,
+    agent,
+    sessionWriter,
+    metricsSink,
+    configStore,
+    pipelines
+  } = params;
+  if (!config.features.plugins || !config.plugins || config.plugins.length === 0) return;
+  const resolvedPlugins = [];
+  for (const p of config.plugins) {
+    if (typeof p === "object" && p.enabled === false) continue;
+    const spec = typeof p === "string" ? p : p.name;
+    try {
+      const mod = await import(spec);
+      if (mod.default) resolvedPlugins.push(mod.default);
+    } catch (err) {
+      log.warn(`Plugin "${spec}" failed to load`, err);
+    }
+  }
+  if (resolvedPlugins.length === 0) return;
+  const pluginOptions = buildPluginOptions(config);
+  const pluginConfig = Object.keys(pluginOptions).length > 0 ? patchConfig(config, { extensions: pluginOptions }) : config;
+  await loadPlugins(resolvedPlugins, {
+    log,
+    pluginOptions,
+    apiFactory: (plugin) => createApi(plugin.name, {
+      container,
+      events,
+      pipelines,
+      toolRegistry,
+      providerRegistry,
+      slashCommandRegistry,
+      mcpRegistry,
+      config: pluginConfig,
+      log,
+      extensions: agent.extensions,
+      sessionWriter: {
+        transcriptPath: sessionWriter.transcriptPath,
+        append: (e) => sessionWriter.append(e)
+      },
+      metricsSink,
+      configStore
+    })
+  });
+}
+function buildPluginOptions(config) {
+  const options = {};
+  for (const entry of config.plugins ?? []) {
+    if (typeof entry !== "object") continue;
+    if (entry.options) options[entry.name] = { ...entry.options };
+  }
+  for (const [name, value] of Object.entries(config.extensions ?? {})) {
+    options[name] = { ...options[name] ?? {}, ...value };
+  }
+  return options;
+}
 async function setupProvider(params) {
   const { config, modelsRegistry, logger } = params;
   const savedProviderCfg = config.providers?.[config.provider];
@@ -8382,12 +9327,12 @@ async function setupSession(params) {
   }
   const sessionRef = { current: session };
   await recoveryLock.write(session.id).catch(() => void 0);
-  const attachments = new DefaultAttachmentStore({ spoolDir: path21.join(wpaths.projectSessions, session.id, "attachments") });
-  const queueStore = new QueueStore({ dir: path21.join(wpaths.projectSessions, session.id) });
+  const attachments = new DefaultAttachmentStore({ spoolDir: path23.join(wpaths.projectSessions, session.id, "attachments") });
+  const queueStore = new QueueStore({ dir: path23.join(wpaths.projectSessions, session.id) });
   const ctxSignal = new AbortController().signal;
   const context = new Context({ systemPrompt, provider, session, signal: ctxSignal, tokenCounter, cwd, projectRoot, model: config.model });
   if (restoredMessages.length > 0) context.state.replaceMessages(restoredMessages);
-  const todosCheckpointPath = path21.join(wpaths.projectSessions, `${session.id}.todos.json`);
+  const todosCheckpointPath = path23.join(wpaths.projectSessions, `${session.id}.todos.json`);
   if (resumeId) {
     try {
       const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
@@ -8399,13 +9344,13 @@ async function setupSession(params) {
     }
   }
   const detachTodosCheckpoint = attachTodosCheckpoint(context.state, todosCheckpointPath, session.id);
-  const planPath = path21.join(wpaths.projectSessions, `${session.id}.plan.json`);
+  const planPath = path23.join(wpaths.projectSessions, `${session.id}.plan.json`);
   context.state.setMeta("plan.path", planPath);
   let dirState;
   if (resumeId) {
     try {
-      const fleetRoot = path21.join(wpaths.projectSessions, session.id);
-      dirState = await loadDirectorState(path21.join(fleetRoot, "director-state.json"));
+      const fleetRoot = path23.join(wpaths.projectSessions, session.id);
+      dirState = await loadDirectorState(path23.join(fleetRoot, "director-state.json"));
       if (dirState) {
         const tCounts = {};
         for (const t of dirState.tasks) tCounts[t.status] = (tCounts[t.status] ?? 0) + 1;
@@ -8432,22 +9377,11 @@ function resolveBundledSkillsDir2() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path21.join(path21.dirname(corePkg), "skills");
+    return path23.join(path23.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
 }
-function buildPluginOptions(config) {
-  const options = {};
-  for (const entry of config.plugins ?? []) {
-    if (typeof entry !== "object") continue;
-    if (entry.options) options[entry.name] = { ...entry.options };
-  }
-  for (const [name, value] of Object.entries(config.extensions ?? {})) {
-    options[name] = { ...options[name] ?? {}, ...value };
-  }
-  return options;
-}
 async function main(argv) {
   const ctx = await boot(argv);
   if (typeof ctx === "number") return ctx;
@@ -8530,6 +9464,8 @@ async function main(argv) {
   const memoryStore = container.resolve(TOKENS.MemoryStore);
   const skillLoader = container.resolve(TOKENS.SkillLoader);
   const sessionRef = {};
+  const autonomyModeRef = { current: "off" };
+  const goalPathForPrompt = path23.join(projectRoot, ".wrongstack", "goal.json");
   container.bind(
     TOKENS.SystemPromptBuilder,
     () => new DefaultSystemPromptBuilder({
@@ -8539,7 +9475,17 @@ async function main(argv) {
       modeId,
       modePrompt,
       modelCapabilities,
-      planPath: () => sessionRef.current ? path21.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
+      planPath: () => sessionRef.current ? path23.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0,
+      contributors: [
+        // Injects the ETERNAL AUTONOMY block when the user has activated
+        // `/autonomy eternal`. Without this, the per-iteration directive
+        // is the only place the model sees the rules — compaction can
+        // drop it and the model forgets it's in autonomy mode.
+        makeAutonomyPromptContributor({
+          goalPath: goalPathForPrompt,
+          enabled: () => autonomyModeRef.current === "eternal"
+        })
+      ]
     })
   );
   const toolRegistry = new ToolRegistry();
@@ -8553,72 +9499,10 @@ async function main(argv) {
   }
   const events = new EventBus();
   events.setLogger(logger);
-  let metricsSink;
-  let healthRegistry;
-  let metricsServerHandle;
-  const metricsPortFlag = flags["metrics-port"];
-  const metricsPort = typeof metricsPortFlag === "string" && metricsPortFlag.length > 0 ? Number.parseInt(metricsPortFlag, 10) : void 0;
-  if (metricsPort !== void 0 && !flags.metrics) flags.metrics = true;
-  if (flags.metrics) {
-    metricsSink = new InMemoryMetricsSink();
-    wireMetricsToEvents(events, metricsSink);
-    healthRegistry = new DefaultHealthRegistry();
-    healthRegistry.register({
-      name: "session-store",
-      check: async () => {
-        try {
-          await fsp2.access(wpaths.projectSessions);
-          return { status: "healthy" };
-        } catch (e) {
-          return { status: "unhealthy", detail: e instanceof Error ? e.message : "access denied" };
-        }
-      }
-    });
-    healthRegistry.register({
-      name: "provider",
-      check: async () => ({
-        status: "healthy",
-        data: { id: config.provider, model: config.model }
-      })
-    });
-    const dumpMetrics = () => {
-      if (!metricsSink) return;
-      try {
-        const out = path21.join(wpaths.projectSessions, "metrics.json");
-        const snap = metricsSink.snapshot();
-        writeFileSync(out, JSON.stringify(snap, null, 2));
-      } catch {
-      }
-    };
-    process.on("exit", dumpMetrics);
-    process.on("SIGINT", () => {
-      dumpMetrics();
-      process.exit(130);
-    });
-    if (metricsPort !== void 0 && Number.isFinite(metricsPort)) {
-      try {
-        metricsServerHandle = await startMetricsServer({
-          port: metricsPort,
-          host: process.env.METRICS_HOST ?? "127.0.0.1",
-          sink: metricsSink,
-          // V2-C: mount /healthz on the same listener so k8s probes can
-          // hit one endpoint per pod for both observability and liveness.
-          healthRegistry
-        });
-        logger.info(
-          `metrics endpoint listening on ${metricsServerHandle.url} (healthz on same port)`
-        );
-        process.on("exit", () => {
-          void metricsServerHandle?.close().catch(() => {
-          });
-        });
-      } catch (err) {
-        logger.warn(
-          `metrics endpoint failed to start: ${err instanceof Error ? err.message : String(err)}`
-        );
-      }
-    }
-  }
+  const { metricsSink, healthRegistry, metricsServerHandle } = (() => {
+    const ms = setupMetrics({ flags, wpaths, events, logger, config: { provider: config.provider, model: config.model } });
+    return ms;
+  })();
   const spinner = new Spinner();
   let lastInputTokens = 0;
   events.on("provider.response", (e) => {
@@ -8737,49 +9621,21 @@ async function main(argv) {
     }
   }
   const slashRegistry = new SlashCommandRegistry();
-  if (config.features.plugins && config.plugins && config.plugins.length > 0) {
-    const resolvedPlugins = [];
-    for (const p of config.plugins) {
-      if (typeof p === "object" && p.enabled === false) continue;
-      const spec = typeof p === "string" ? p : p.name;
-      try {
-        const mod = await import(spec);
-        if (mod.default) resolvedPlugins.push(mod.default);
-      } catch (err) {
-        logger.warn(`Plugin "${spec}" failed to load`, err);
-      }
-    }
-    if (resolvedPlugins.length > 0) {
-      const { default: createApi2 } = await Promise.resolve().then(() => (init_plugin_api_factory(), plugin_api_factory_exports));
-      const pluginOptions = buildPluginOptions(config);
-      const pluginConfig = Object.keys(pluginOptions).length > 0 ? patchConfig(config, { extensions: pluginOptions }) : config;
-      await loadPlugins(resolvedPlugins, {
-        log: logger,
-        // Each plugin's `configSchema` is validated against merged
-        // options from `plugins[].options` and `extensions[name]`.
-        // The merged view is also exposed as `api.config.extensions`.
-        pluginOptions,
-        apiFactory: (plugin) => createApi2(plugin.name, {
-          container,
-          events,
-          pipelines,
-          toolRegistry,
-          providerRegistry,
-          slashCommandRegistry: slashRegistry,
-          mcpRegistry,
-          config: pluginConfig,
-          log: logger,
-          extensions: agent.extensions,
-          sessionWriter: {
-            transcriptPath: context.session.transcriptPath,
-            append: (e) => context.session.append(e)
-          },
-          metricsSink,
-          configStore
-        })
-      });
-    }
-  }
+  await setupPlugins({
+    config,
+    container,
+    events,
+    pipelines,
+    toolRegistry,
+    providerRegistry,
+    slashCommandRegistry: slashRegistry,
+    mcpRegistry,
+    log: logger,
+    agent,
+    sessionWriter: context.session,
+    metricsSink,
+    configStore
+  });
   const switchProviderAndModel = (providerId, modelId) => {
     try {
       const savedCfg = config.providers?.[providerId];
@@ -8802,14 +9658,27 @@ async function main(argv) {
     }
   };
   const directorMode = flags["director"] === true || typeof flags["resume"] === "string";
+  const maxConcurrentFromFlag = typeof flags["max-concurrent"] === "string" ? Number.parseInt(flags["max-concurrent"], 10) : void 0;
+  const maxConcurrentFromEnv = typeof process.env["WRONGSTACK_MAX_CONCURRENT"] === "string" ? Number.parseInt(process.env["WRONGSTACK_MAX_CONCURRENT"], 10) : void 0;
+  const maxConcurrent = Number.isFinite(maxConcurrentFromFlag) && maxConcurrentFromFlag > 0 ? maxConcurrentFromFlag : Number.isFinite(maxConcurrentFromEnv) && maxConcurrentFromEnv > 0 ? maxConcurrentFromEnv : void 0;
   let director = null;
   let autonomyMode = "off";
-  const fleetRoot = directorMode ? path21.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path21.join(fleetRoot, "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path21.join(fleetRoot, "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path21.join(fleetRoot, "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path21.join(fleetRoot, "director-state.json") : void 0;
-  const fleetRootForPromotion = path21.join(wpaths.projectSessions, session.id);
+  let eternalEngine = null;
+  const eternalListeners = /* @__PURE__ */ new Set();
+  const broadcastEternalIteration = (entry) => {
+    for (const fn of eternalListeners) {
+      try {
+        fn(entry);
+      } catch {
+      }
+    }
+  };
+  const fleetRoot = directorMode ? path23.join(wpaths.projectSessions, session.id) : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path23.join(fleetRoot, "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path23.join(fleetRoot, "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path23.join(fleetRoot, "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path23.join(fleetRoot, "director-state.json") : void 0;
+  const fleetRootForPromotion = path23.join(wpaths.projectSessions, session.id);
   const multiAgentHost = new MultiAgentHost(
     {
       container,
@@ -8821,7 +9690,8 @@ async function main(argv) {
       session,
       tokenCounter,
       projectRoot,
-      cwd
+      cwd,
+      secretScrubber: container.resolve(TOKENS.SecretScrubber)
     },
     {
       directorMode,
@@ -8831,7 +9701,8 @@ async function main(argv) {
       directorRunId: session.id,
       fleetRoot: fleetRootForPromotion,
       stateCheckpointPath,
-      sessionWriter: session
+      sessionWriter: session,
+      maxConcurrent
     }
   );
   toolRegistry.register(
@@ -8846,6 +9717,13 @@ async function main(argv) {
       directorRunId: session.id
     })
   );
+  toolRegistry.register(
+    createMcpControlTool({
+      getConfig: () => configStore.get(),
+      configPath: wpaths.globalConfig,
+      registry: mcpRegistry
+    })
+  );
   if (directorMode) {
     director = await multiAgentHost.ensureDirector();
     if (director) {
@@ -8868,6 +9746,20 @@ async function main(argv) {
       this.enabled = enabled;
     }
   };
+  const statuslineConfigDeps = {
+    get: () => loadStatuslineConfig(),
+    set: (cfg) => saveStatuslineConfig(cfg)
+  };
+  const hiddenItemsFromConfig = await loadStatuslineConfig();
+  const hiddenItemsList = [];
+  const ALL_ITEMS = ["todos", "plan", "fleet", "git", "elapsed", "context", "cost"];
+  for (const k of ALL_ITEMS) {
+    if (!hiddenItemsFromConfig[k]) hiddenItemsList.push(k);
+  }
+  const statuslineHiddenItems = hiddenItemsList;
+  [...statuslineHiddenItems];
+  const setStatuslineHiddenItems = (items) => {
+  };
   const slashCmds = buildBuiltinSlashCommands({
     registry: slashRegistry,
     toolRegistry,
@@ -8887,6 +9779,7 @@ async function main(argv) {
     fleetStreamController,
     llmProvider: provider,
     llmModel: config.model,
+    statuslineConfig: statuslineConfigDeps,
     onSpawn: async (description, spawnOpts) => {
       const { subagentId, taskId } = await multiAgentHost.spawn(description, spawnOpts);
       const tags = [];
@@ -8990,10 +9883,26 @@ async function main(argv) {
         }
         return `Manifest written \u2192 ${p}`;
       }
+      if (action === "concurrency") {
+        const current = multiAgentHost.getMaxConcurrent();
+        if (!target) {
+          return `Concurrent-subagent ceiling: ${current}`;
+        }
+        const n = Number.parseInt(target, 10);
+        if (!Number.isFinite(n) || n < 1) {
+          return `Invalid value "${target}". Concurrency must be an integer >= 1.`;
+        }
+        try {
+          multiAgentHost.setMaxConcurrent(n);
+        } catch (err) {
+          return err instanceof Error ? err.message : String(err);
+        }
+        return `Concurrent-subagent ceiling: ${current} \u2192 ${n}`;
+      }
       return `Unknown fleet action: ${action}`;
     },
     onFleetLog: async (subagentId, mode) => {
-      const subagentsRoot = path21.join(fleetRootForPromotion, "subagents");
+      const subagentsRoot = path23.join(fleetRootForPromotion, "subagents");
       let runDirs;
       try {
         runDirs = await fsp2.readdir(subagentsRoot);
@@ -9002,7 +9911,7 @@ async function main(argv) {
       }
       const found = [];
       for (const runId of runDirs) {
-        const runDir = path21.join(subagentsRoot, runId);
+        const runDir = path23.join(subagentsRoot, runId);
         let files;
         try {
           files = await fsp2.readdir(runDir);
@@ -9011,7 +9920,7 @@ async function main(argv) {
         }
         for (const f of files) {
           if (!f.endsWith(".jsonl")) continue;
-          const full = path21.join(runDir, f);
+          const full = path23.join(runDir, f);
           try {
             const stat3 = await fsp2.stat(full);
             found.push({
@@ -9108,7 +10017,7 @@ async function main(argv) {
       }
       const dir = await multiAgentHost.ensureDirector();
       if (!dir) return "Director is not available.";
-      const dirStatePath = path21.join(fleetRootForPromotion, "director-state.json");
+      const dirStatePath = path23.join(fleetRootForPromotion, "director-state.json");
       const prior = await loadDirectorState(dirStatePath);
       if (!prior) {
         return "No prior director-state.json found \u2014 nothing to retry.";
@@ -9179,9 +10088,9 @@ async function main(argv) {
       for (const tool of director2.tools(FLEET_ROSTER)) {
         toolRegistry.register(tool);
       }
-      const mp = path21.join(fleetRootForPromotion, "fleet.json");
-      const sp = path21.join(fleetRootForPromotion, "shared");
-      const ss = path21.join(fleetRootForPromotion, "subagents");
+      const mp = path23.join(fleetRootForPromotion, "fleet.json");
+      const sp = path23.join(fleetRootForPromotion, "shared");
+      const ss = path23.join(fleetRootForPromotion, "subagents");
       const lines = [
         `${color.green("\u2713")} Promoted to director mode.`,
         `  Roster: ${Object.keys(FLEET_ROSTER).join(", ")}`,
@@ -9208,6 +10117,21 @@ Restart WrongStack to load or unload plugin code in this session.`;
       }
       return result.message;
     },
+    onMcp: async (args) => {
+      const parsed = parseMcpArgs(args);
+      if (!parsed) {
+        return [
+          "Usage: /mcp [list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
+          "Run `/mcp` without args to see available servers."
+        ].join("\n");
+      }
+      return runMcpManagementCommand(parsed, {
+        config,
+        configPath: wpaths.globalConfig,
+        mcpRegistry,
+        allServerPresets: allServers$1()
+      });
+    },
     onYolo: (setTo) => {
       const policy = container.resolve(TOKENS.PermissionPolicy);
       if (setTo !== void 0) {
@@ -9220,10 +10144,31 @@ Restart WrongStack to load or unload plugin code in this session.`;
     onAutonomy: (setTo) => {
       if (setTo !== void 0) {
         autonomyMode = setTo;
+        autonomyModeRef.current = setTo;
         return setTo;
       }
       return autonomyMode;
     },
+    onEternalStart: () => {
+      if (!eternalEngine) {
+        eternalEngine = new EternalAutonomyEngine({
+          agent,
+          projectRoot,
+          // Wire the same compactor the manual /compact command uses so
+          // multi-day eternal loops don't overflow the provider's context.
+          // effectiveMaxContext is set up earlier with a model-specific
+          // value; pass it through so aggressive-mode compact triggers
+          // before the next iteration would actually overflow.
+          compactor: container.resolve(TOKENS.Compactor),
+          maxContextTokens: effectiveMaxContext > 0 ? effectiveMaxContext : void 0,
+          onIteration: broadcastEternalIteration
+        });
+      }
+      void eternalEngine.prime();
+    },
+    onEternalStop: () => {
+      eternalEngine?.stop();
+    },
     onExit: () => {
       void mcpRegistry.stopAll();
     },
@@ -9281,6 +10226,30 @@ Restart WrongStack to load or unload plugin code in this session.`;
     }
   });
   for (const cmd of slashCmds) slashRegistry.register(cmd);
+  const eternalFlag = typeof flags["eternal"] === "string" ? flags["eternal"].trim() : "";
+  if (eternalFlag.length > 0) {
+    const { saveGoal: saveGoal2, emptyGoal: emptyGoal2, goalFilePath: goalFilePath4, loadGoal: loadGoal4 } = await import('@wrongstack/core');
+    const goalPath = goalFilePath4(projectRoot);
+    const prior = await loadGoal4(goalPath);
+    const next = prior ? { ...prior, goal: eternalFlag, setAt: (/* @__PURE__ */ new Date()).toISOString(), lastActivityAt: (/* @__PURE__ */ new Date()).toISOString() } : emptyGoal2(eternalFlag);
+    await saveGoal2(goalPath, next);
+    const policy = container.resolve(TOKENS.PermissionPolicy);
+    policy.setYolo(true);
+    config = patchConfig(config, { yolo: true });
+    eternalEngine = new EternalAutonomyEngine({
+      agent,
+      projectRoot,
+      compactor: container.resolve(TOKENS.Compactor),
+      maxContextTokens: effectiveMaxContext > 0 ? effectiveMaxContext : void 0,
+      onIteration: broadcastEternalIteration
+    });
+    await eternalEngine.prime();
+    autonomyMode = "eternal";
+    autonomyModeRef.current = "eternal";
+    renderer.write(
+      color.red("Eternal mode launching from --eternal flag.") + color.dim(` Goal: ${eternalFlag.slice(0, 80)}${eternalFlag.length > 80 ? "\u2026" : ""}`) + "\n"
+    );
+  }
   const savedProviderCfg = config.providers?.[config.provider];
   return execute({
     agent,
@@ -9311,11 +10280,18 @@ Restart WrongStack to load or unload plugin code in this session.`;
     director: director ?? null,
     fleetRoster: FLEET_ROSTER,
     fleetStreamController,
+    statuslineHiddenItems,
+    setStatuslineHiddenItems,
     getYolo: () => {
       const policy = container.resolve(TOKENS.PermissionPolicy);
       return policy.getYolo();
     },
     getAutonomy: () => autonomyMode,
+    getEternalEngine: () => eternalEngine,
+    subscribeEternalIteration: (fn) => {
+      eternalListeners.add(fn);
+      return () => eternalListeners.delete(fn);
+    },
     skillLoader: config.features.skills ? skillLoader : void 0
   });
 }