@wrongstack/cli 0.51.3 → 0.63.4

package/dist/index.js

@@ -2,7 +2,7 @@
 import * as path8 from 'path';
 import { join } from 'path';
 import * as fsp3 from 'fs/promises';
-import { color, writeErr, DefaultTaskStore, TaskTracker, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, renderTaskGraph, SpecVersioning, atomicWrite, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, SlashCommandRegistry, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, bootConfig as bootConfig$1, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionRewinder, DefaultSessionStore, DefaultPluginAPI, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, onResize, decryptConfigSecrets as decryptConfigSecrets$1, encryptConfigSecrets as encryptConfigSecrets$1, InputBuilder, FsError, ERROR_CODES } from '@wrongstack/core';
+import { color, writeErr, DefaultTaskStore, TaskTracker, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, renderTaskGraph, SpecVersioning, DefaultSecretScrubber, atomicWrite, DefaultPathResolver, TOKENS, mergeCustomModelDefs, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, HookRegistry, HookRunner, SlashCommandRegistry, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, DefaultBrainArbiter, createDelegateTool, FLEET_ROSTER, createMcpControlTool, DefaultLogger, DefaultModelsRegistry, isStdinTTY, writeOut, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, resolveContextWindowPolicy, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, bootConfig as bootConfig$1, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionRewinder, DefaultSessionStore, DefaultPluginAPI, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, AGENTS_BY_PHASE, dispatchAgent, formatTodosList, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, emptyGoal, buildGoalPreamble, formatGoal, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, AGENT_CATALOG, matrixKeyKind, onResize, ERROR_CODES, decryptConfigSecrets as decryptConfigSecrets$1, encryptConfigSecrets as encryptConfigSecrets$1, InputBuilder, FsError } from '@wrongstack/core';
 import { createRequire } from 'module';
 import * as os2 from 'os';
 import os2__default from 'os';
@@ -10,21 +10,21 @@ import * as crypto2 from 'crypto';
 import { randomUUID } from 'crypto';
 import { DefaultSecretVault, decryptConfigSecrets, encryptConfigSecrets, isSecretField } from '@wrongstack/core/security';
 import { WebSocketServer, WebSocket } from 'ws';
-import { MCPRegistry } from '@wrongstack/mcp';
+import { MCPRegistry, MCPServer, serveHttp, serveStdio } from '@wrongstack/mcp';
 import { capabilitiesFor, buildProviderFactoriesFromRegistry, makeProviderFromConfig } from '@wrongstack/providers';
 import { createDefaultContainer, routeImagesForModel, readClipboardImage } from '@wrongstack/runtime';
 import { builtinToolsPack, rememberTool, forgetTool } from '@wrongstack/tools';
 import { fileURLToPath } from 'url';
 import * as readline from 'readline';
-import * as fs10 from 'fs';
+import * as fs12 from 'fs';
 import { writeFileSync, existsSync, readFileSync } from 'fs';
 import { WrongStackACPServer } from '@wrongstack/acp/agent';
 import { ACP_AGENT_COMMANDS, makeACPSubagentRunner, makeACPSubagentRunnerWithStop } from '@wrongstack/acp';
 import { ACP_AGENTS, SubagentBudget } from '@wrongstack/core/coordination';
 import { spawn } from 'child_process';
 import { allServers } from '@wrongstack/core/infrastructure';
-import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 import { ToolExecutor } from '@wrongstack/core/execution';
+import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1696,6 +1696,7 @@ __export(webui_server_exports, {
 async function runWebUI(opts) {
   const port = opts.port ?? 3457;
   const clients = /* @__PURE__ */ new Map();
+  const secretScrubber = new DefaultSecretScrubber();
   let abortController = null;
   const authToken = crypto2.randomBytes(16).toString("hex");
   const wss = new WebSocketServer({ port, host: "127.0.0.1", maxPayload: 1 * 1024 * 1024 });
@@ -1735,7 +1736,7 @@ async function runWebUI(opts) {
           payload: {
             id: e.id,
             name: e.name,
-            input: e.input,
+            input: secretScrubber.scrubObject(e.input),
             messageId: `tool_${e.id}`
           }
         });
@@ -1764,8 +1765,8 @@ async function runWebUI(opts) {
             name: e.name,
             durationMs: e.durationMs,
             ok: e.ok,
-            input: e.input,
-            output: e.output
+            input: secretScrubber.scrubObject(e.input),
+            output: secretScrubber.scrubObject(e.output)
           }
         });
       })
@@ -2344,19 +2345,43 @@ async function resolveRuntimeMaxContext(input) {
   const providerConfig = input.runtimeProviderConfig ?? input.config.providers?.[input.providerId];
   const providerOverride = positiveNumber(readConfiguredMaxContext(providerConfig));
   if (providerOverride) return providerOverride;
-  const topLevelBaseUrlApplies = input.providerId === input.config.provider;
-  const hasCustomBaseUrl = Boolean(
-    providerConfig?.baseUrl || topLevelBaseUrlApplies && input.config.baseUrl
-  );
-  if (input.modelsRegistry && !hasCustomBaseUrl) {
-    const caps = await capabilitiesFor(input.modelsRegistry, input.providerId, input.modelId).catch(
-      () => void 0
-    );
-    const catalogMax = positiveNumber(caps?.maxContext);
-    if (catalogMax) return catalogMax;
+  const catalogId = providerConfig?.type && providerConfig.type !== input.providerId ? providerConfig.type : input.providerId;
+  if (input.modelsRegistry) {
+    const topLevelBaseUrlApplies = input.providerId === input.config.provider;
+    const configuredBaseUrl = providerConfig?.baseUrl ?? (topLevelBaseUrlApplies ? input.config.baseUrl : void 0);
+    let divergesFromCatalog = false;
+    if (configuredBaseUrl) {
+      const resolved = await safeGetProvider(input.modelsRegistry, catalogId);
+      divergesFromCatalog = normalizeBaseUrl(configuredBaseUrl) !== normalizeBaseUrl(resolved?.apiBase);
+    }
+    if (!divergesFromCatalog) {
+      const mergedModels = mergeCustomModelDefs(providerConfig?.customModels, input.config.models);
+      const caps = await capabilitiesFor(
+        input.modelsRegistry,
+        catalogId,
+        input.modelId,
+        mergedModels
+      ).catch(() => void 0);
+      const catalogMax = positiveNumber(caps?.maxContext);
+      if (catalogMax) return catalogMax;
+      const directModel = await input.modelsRegistry.getModel(catalogId, input.modelId).catch(() => void 0);
+      const directMax = positiveNumber(directModel?.capabilities.maxContext);
+      if (directMax) return directMax;
+    }
   }
   return positiveNumber(input.provider.capabilities.maxContext) ?? 0;
 }
+async function safeGetProvider(registry, id) {
+  try {
+    return await registry.getProvider(id);
+  } catch {
+    return void 0;
+  }
+}
+function normalizeBaseUrl(url) {
+  if (!url) return "";
+  return url.trim().toLowerCase().replace(/\/+$/, "");
+}
 function readConfiguredMaxContext(providerConfig) {
   if (!providerConfig || typeof providerConfig !== "object") return void 0;
   const capabilities = providerConfig.capabilities;
@@ -2370,6 +2395,7 @@ function positiveNumber(value) {
 // src/arg-parser.ts
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
   "yolo",
+  "yolo-destructive",
   "force-all-yolo",
   "verbose",
   "trace",
@@ -2389,13 +2415,15 @@ var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
   "metrics",
   "webui",
   "no-check",
+  "no-models-refresh",
   "director",
   "no-director",
   "no-autonomy",
   "autonomy",
   "eternal",
   "no-hints",
-  "hints"
+  "hints",
+  "no-hooks"
 ]);
 function parseArgs(argv) {
   const flags = {};
@@ -2723,10 +2751,12 @@ function buildAutonomyCommand(opts) {
       "  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.",
+      "             Force-enables regular YOLO; destructive-gated calls still use",
+      "             the permission flow. Runs until /autonomy stop or Ctrl+C twice.",
       "  parallel \u2014 Fan-out 4\u20138 subagents per tick. Each tick decomposes the goal,",
       "             spawns N agents, awaits results, aggregates. Requires /goal.",
-      "             Force-enables YOLO. Runs until /autonomy stop or Ctrl+C twice.",
+      "             Force-enables regular YOLO; destructive-gated calls still use",
+      "             the permission flow. Runs until /autonomy stop or Ctrl+C twice.",
       "",
       "Eternal stage flow: decide \u2192 execute \u2192 reflect \u2192 sleep | paused | stopped",
       "Stage shown in real-time. Use /goal pause to pause, /goal resume to continue.",
@@ -2884,7 +2914,7 @@ function buildAutonomyCommand(opts) {
         opts.onEternalStart(newMode);
         const modeLabel = newMode === "eternal-parallel" ? `${color.magenta("PARALLEL")} mode` : `${color.red("ETERNAL")} mode`;
         const msg2 = `Autonomy mode: ${modeLabel} \u2014 engine launching against goal: ${color.bold(goal.goal)}
-${color.dim("YOLO forced ON. Use /autonomy stop to end. Journal at /goal journal.")}`;
+${color.dim("Regular YOLO enabled; destructive-gated calls still use the permission flow. Use /autonomy stop to end. Journal at /goal journal.")}`;
         opts.renderer.write(msg2);
         return { message: msg2 };
       }
@@ -3361,6 +3391,11 @@ function buildContextCommand(opts) {
       "  /context           Show counts: messages, est. tokens, tool calls, todos, read files.",
       "  /context detail    As above, plus model, cwd, projectRoot, and the file list.",
       "  /context repair    Repair orphan tool_use/tool_result blocks after manual compaction.",
+      "  /context limit     Show effective context window for this session.",
+      "  /context limit <tokens> Set effective context window for this session (e.g. 220k).",
+      "  /context limit <tokens> --persist Persist effective context window to config.",
+      "  /context thresholds <warn> <soft> <hard> Set compaction thresholds (percent or decimal).",
+      "  /context thresholds <warn> <soft> <hard> --persist Persist thresholds to config.",
       "  /context mode      List context-window modes.",
       "  /context mode <id> Switch context-window mode for this session."
     ].join("\n"),
@@ -3388,6 +3423,83 @@ ${formatContextWindowModeList(active)}`;
           `  empty msgs:   removed ${repaired.report.removedMessages}`
         ].join("\n") : "Context repair: no orphan tool_use/tool_result blocks found.";
         opts.renderer.write(`${msg2}
+`);
+        return { message: msg2 };
+      }
+      if (trimmed === "limit") {
+        const limit = readEffectiveLimit(ctx, opts);
+        const msg2 = limit > 0 ? `Effective context window: ${limit.toLocaleString()} tokens` : "Effective context window: unknown (auto-compaction may be disabled).";
+        opts.renderer.write(`${msg2}
+`);
+        return { message: msg2 };
+      }
+      if (trimmed.startsWith("limit ")) {
+        const persist = hasPersistFlag(trimmed);
+        const raw = stripPersistFlag(trimmed.slice("limit ".length)).trim();
+        const limit = parseTokenCount(raw);
+        if (!limit) {
+          const msg3 = `Invalid context limit "${raw}". Use a positive token count, e.g. 220k or 220000.`;
+          opts.renderer.write(`${color.red(msg3)}
+`);
+          return { message: msg3 };
+        }
+        ctx.meta["effectiveMaxContext"] = limit;
+        const effective = opts.onContextLimit?.(limit) ?? limit;
+        if (persist) {
+          const error = await persistContextConfig(opts, { effectiveMaxContext: limit });
+          if (error) {
+            opts.renderer.write(`${color.red(error)}
+`);
+            return { message: error };
+          }
+        }
+        const msg2 = `${color.green("Effective context window set:")} ${effective.toLocaleString()} tokens${persist ? " (persisted)" : ""}`;
+        opts.renderer.write(`${msg2}
+`);
+        return { message: msg2 };
+      }
+      if (trimmed.startsWith("thresholds ")) {
+        const persist = hasPersistFlag(trimmed);
+        const thresholdArgs = stripPersistFlag(trimmed.slice("thresholds ".length)).trim();
+        const parts = thresholdArgs.split(/\s+/).filter(Boolean);
+        if (parts.length !== 3) {
+          const msg3 = "Usage: /context thresholds <warn> <soft> <hard> (examples: 60% 75% 90% or 0.6 0.75 0.9)";
+          opts.renderer.write(`${color.red(msg3)}
+`);
+          return { message: msg3 };
+        }
+        const thresholds = parts.map(parseThreshold);
+        if (thresholds.some((v) => v === null)) {
+          const msg3 = "Invalid thresholds. Use percentages (60%) or decimals between 0 and 1.";
+          opts.renderer.write(`${color.red(msg3)}
+`);
+          return { message: msg3 };
+        }
+        const [warn, soft, hard] = thresholds;
+        if (!(warn < soft && soft < hard)) {
+          const msg3 = "Invalid thresholds: require warn < soft < hard.";
+          opts.renderer.write(`${color.red(msg3)}
+`);
+          return { message: msg3 };
+        }
+        const base = readPolicy(ctx) ?? resolveContextWindowPolicy({});
+        const policy2 = { ...base, thresholds: { warn, soft, hard } };
+        ctx.meta["contextWindowMode"] = policy2.id;
+        ctx.meta["contextWindowPolicy"] = policy2;
+        if (persist) {
+          const error = await persistContextConfig(opts, {
+            warnThreshold: warn,
+            softThreshold: soft,
+            hardThreshold: hard
+          });
+          if (error) {
+            opts.renderer.write(`${color.red(error)}
+`);
+            return { message: error };
+          }
+        }
+        const msg2 = `${color.green("Context thresholds set:")} warn ${pct(warn)}, soft ${pct(soft)}, hard ${pct(hard)}${persist ? " (persisted)" : ""}`;
+        opts.renderer.write(`${msg2}
 `);
         return { message: msg2 };
       }
@@ -3421,6 +3533,7 @@ ${formatContextWindowModeList(active)}`;
         `  messages:    ${messages.length} total (${countTurnPairs(messages)} user+assistant pairs)`,
         `  tokens (est): ${estimateTokens(messages).toLocaleString()} (chars / 4 estimate)`,
         `  mode:        ${policy ? `${policy.id} (${policy.name})` : "balanced"}`,
+        `  limit:       ${formatLimit(readEffectiveLimit(ctx, opts))}`,
         `  system prompt: ${ctx.systemPrompt.length} block${ctx.systemPrompt.length !== 1 ? "s" : ""}`,
         `  tools:       ${countToolUses(messages)} calls made, ${countToolResults(messages)} results in history`,
         `  read files:  ${ctx.readFiles.size} files`,
@@ -3447,6 +3560,68 @@ function readPolicy(ctx) {
   const policy = ctx.meta?.["contextWindowPolicy"];
   return policy && typeof policy === "object" ? policy : null;
 }
+function hasPersistFlag(input) {
+  return /(?:^|\s)--persist(?:\s|$)/.test(input);
+}
+function stripPersistFlag(input) {
+  return input.replace(/(?:^|\s)--persist(?:\s|$)/g, " ").trim();
+}
+async function persistContextConfig(opts, patch) {
+  if (!opts.configStore || !opts.paths) return "Cannot persist context settings: config store not available.";
+  let raw = "{}";
+  try {
+    raw = await fsp3.readFile(opts.paths.globalConfig, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") {
+      return `Could not read ${opts.paths.globalConfig}: ${err.message}`;
+    }
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    return `Config at ${opts.paths.globalConfig} is not valid JSON: ${err.message}`;
+  }
+  const current = opts.configStore.get();
+  const context = {
+    ...current.context,
+    ...parsed.context ?? {},
+    ...patch
+  };
+  parsed.context = context;
+  await atomicWrite(opts.paths.globalConfig, JSON.stringify(parsed, null, 2), { mode: 384 });
+  opts.configStore.update({ context });
+  return null;
+}
+function readEffectiveLimit(ctx, opts) {
+  const live = opts.onContextLimit?.();
+  if (typeof live === "number" && Number.isFinite(live) && live > 0) return live;
+  const metaLimit = ctx.meta?.["effectiveMaxContext"];
+  if (typeof metaLimit === "number" && Number.isFinite(metaLimit) && metaLimit > 0) return metaLimit;
+  const providerLimit = ctx.provider?.capabilities?.maxContext;
+  return typeof providerLimit === "number" && Number.isFinite(providerLimit) && providerLimit > 0 ? providerLimit : 0;
+}
+function parseTokenCount(raw) {
+  const normalized = raw.trim().toLowerCase().replace(/,/g, "").replace(/_/g, "");
+  const match = /^(\d+(?:\.\d+)?)([km])?$/.exec(normalized);
+  if (!match) return null;
+  const value = Number(match[1]);
+  const unit = match[2];
+  const scaled = unit === "m" ? value * 1e6 : unit === "k" ? value * 1e3 : value;
+  const rounded = Math.floor(scaled);
+  return Number.isFinite(rounded) && rounded > 0 ? rounded : null;
+}
+function parseThreshold(raw) {
+  const s = raw.trim();
+  const percent = s.endsWith("%");
+  const n = Number((percent ? s.slice(0, -1) : s).trim());
+  if (!Number.isFinite(n)) return null;
+  const value = percent ? n / 100 : n;
+  return value > 0 && value < 1 ? value : null;
+}
+function formatLimit(limit) {
+  return limit > 0 ? `${limit.toLocaleString()} tokens` : "unknown";
+}
 function pct(n) {
   return `${Math.round(n * 100)}%`;
 }
@@ -4855,12 +5030,20 @@ function parseMcpArgs(args) {
 }
 async function runMcpManagementCommand(parsed, deps) {
   const { config, configPath: configPath2, mcpRegistry, allServerPresets } = deps;
-  const configured = config.mcpServers ?? {};
+  const diskConfig = await readConfig(configPath2);
+  const configured = isMcpServerRecord(diskConfig.mcpServers) ? diskConfig.mcpServers : config.mcpServers ?? {};
   switch (parsed.action) {
     case "list":
       return renderList(configured, mcpRegistry, allServerPresets);
     case "add":
-      return runAdd(parsed.name, parsed.enable ?? false, configured, configPath2, allServerPresets);
+      return runAdd(
+        parsed.name,
+        parsed.enable ?? false,
+        configured,
+        configPath2,
+        mcpRegistry,
+        allServerPresets
+      );
     case "remove":
       return runRemove(parsed.name, configured, configPath2, mcpRegistry);
     case "enable":
@@ -4904,34 +5087,46 @@ function renderList(configured, mcpRegistry, all) {
   lines.push(color.dim("  /mcp restart <name>           (runtime restart)"));
   return lines.join("\n");
 }
-async function runAdd(name, enable, configured, configPath2, all) {
+async function runAdd(name, enable, configured, configPath2, mcpRegistry, 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 existing = configured[name];
+  const nextCfg = existing ? { ...preset, ...existing, enabled: enable } : { ...preset, enabled: enable };
   const full = await readConfig(configPath2);
-  const mcpServers = { ...full.mcpServers ?? {}, [name]: { ...preset, enabled: enable } };
+  const mcpServers = {
+    ...isMcpServerRecord(full.mcpServers) ? full.mcpServers : {},
+    [name]: nextCfg
+  };
   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}.`;
+  if (!enable) {
+    const verb = existing ? "Updated" : "Added (disabled \u2014 /mcp enable to start)";
+    return `${color.green(verb)} "${name}" (${nextCfg.transport}). Config written to ${configPath2}.`;
+  }
+  try {
+    if (mcpRegistry.list().some((server) => server.name === name)) {
+      await mcpRegistry.restart(name);
+    } else {
+      await mcpRegistry.start(nextCfg);
+    }
+    const verb = existing ? "Updated and started" : "Enabled and started";
+    return `${color.green(verb)} "${name}" (${nextCfg.transport}). Config written to ${configPath2}.`;
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return `${color.yellow("Enabled")} "${name}" in config, but failed to start: ${message}`;
+  }
 }
 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 ?? {} };
+  const mcpServers = {
+    ...full.mcpServers ?? {}
+  };
   delete mcpServers[name];
   full.mcpServers = mcpServers;
   await writeConfig(configPath2, full);
@@ -4950,7 +5145,9 @@ async function runEnable(name, configured, configPath2, mcpRegistry) {
     }
   }
   const full = await readConfig(configPath2);
-  const mcpServers = { ...full.mcpServers ?? {} };
+  const mcpServers = {
+    ...full.mcpServers ?? {}
+  };
   mcpServers[name] = { ...mcpServers[name], enabled: true };
   full.mcpServers = mcpServers;
   await writeConfig(configPath2, full);
@@ -4967,7 +5164,9 @@ async function runDisable(name, configured, configPath2, mcpRegistry) {
   await mcpRegistry.stop(name).catch(() => {
   });
   const full = await readConfig(configPath2);
-  const mcpServers = { ...full.mcpServers ?? {} };
+  const mcpServers = {
+    ...full.mcpServers ?? {}
+  };
   mcpServers[name] = { ...mcpServers[name], enabled: false };
   full.mcpServers = mcpServers;
   await writeConfig(configPath2, full);
@@ -5008,6 +5207,9 @@ async function readConfig(path25) {
     return {};
   }
 }
+function isMcpServerRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
 async function writeConfig(path25, cfg) {
   const raw = JSON.stringify(cfg, null, 2);
   const tmp = path25 + ".tmp";
@@ -5195,6 +5397,224 @@ ${targetMode.description}`
     }
   };
 }
+var noOpVault = {
+  encrypt: (v) => v,
+  decrypt: (v) => v,
+  isEncrypted: () => false
+};
+async function patchGlobalConfig(globalConfigPath, mutate) {
+  let raw = "{}";
+  let fileExists = true;
+  try {
+    raw = await fsp3.readFile(globalConfigPath, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") throw err;
+    fileExists = false;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    if (fileExists) {
+      throw new Error(`Config at ${globalConfigPath} is not valid JSON: ${err.message}`);
+    }
+    parsed = {};
+  }
+  const decrypted = decryptConfigSecrets$1(parsed, noOpVault);
+  mutate(decrypted);
+  const encrypted = encryptConfigSecrets$1(decrypted, noOpVault);
+  await atomicWrite(globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
+  return decrypted;
+}
+function fmtModel(id, def) {
+  const parts = [];
+  if (def.provider) parts.push(`${color.dim("provider:")} ${color.cyan(def.provider)}`);
+  if (def.name) parts.push(`${color.dim("name:")} ${def.name}`);
+  const caps = def.capabilities;
+  if (caps) {
+    if (caps.maxContext) parts.push(`${color.dim("maxContext:")} ${color.yellow(String(caps.maxContext))}`);
+    const flags = [];
+    if (caps.tools) flags.push("tools");
+    if (caps.vision) flags.push("vision");
+    if (caps.reasoning) flags.push("reasoning");
+    if (caps.streaming) flags.push("streaming");
+    if (caps.jsonMode) flags.push("json");
+    if (flags.length) parts.push(`${color.dim("caps:")} ${flags.join(", ")}`);
+  }
+  if (def.maxOutput) parts.push(`${color.dim("maxOutput:")} ${color.yellow(String(def.maxOutput))}`);
+  return `    ${color.amber(id)}  ${parts.join("  ")}`;
+}
+function safeAt(arr, idx) {
+  const v = arr[idx];
+  if (v === void 0) throw new Error(`Missing value at position ${idx}`);
+  return v;
+}
+function parseFlags(tokens) {
+  let modelId = "";
+  const caps = {};
+  let provider;
+  let name;
+  let maxOutput;
+  let i = 0;
+  while (i < tokens.length) {
+    const t = tokens[i];
+    if (t.startsWith("--")) {
+      const key = t.slice(2);
+      switch (key) {
+        case "provider":
+          provider = safeAt(tokens, ++i);
+          break;
+        case "name":
+          name = safeAt(tokens, ++i);
+          break;
+        case "max-context":
+          caps.maxContext = Number(safeAt(tokens, ++i));
+          break;
+        case "max-output":
+          maxOutput = Number(safeAt(tokens, ++i));
+          break;
+        case "tools":
+          caps.tools = true;
+          break;
+        case "vision":
+          caps.vision = true;
+          break;
+        case "streaming":
+          caps.streaming = true;
+          break;
+        case "reasoning":
+          caps.reasoning = true;
+          break;
+        case "json-mode":
+          caps.jsonMode = true;
+          break;
+        default:
+          return { modelId: "", error: `Unknown flag: --${key}` };
+      }
+    } else if (!t.startsWith("-") && !modelId) {
+      modelId = t;
+    }
+    i++;
+  }
+  if (!modelId) return { modelId: "", error: "missing model id" };
+  const hasCaps = Object.keys(caps).length > 0;
+  const def = {};
+  if (provider !== void 0) def.provider = provider;
+  if (name !== void 0) def.name = name;
+  if (maxOutput !== void 0) def.maxOutput = maxOutput;
+  if (hasCaps) def.capabilities = caps;
+  return { modelId, def: Object.keys(def).length ? def : void 0 };
+}
+function buildModelsCommand(opts) {
+  const help = [
+    "Usage:",
+    "  /models                              List custom model definitions",
+    "  /models add <id> [flags]             Add or update a custom model",
+    "  /models remove <id>                  Remove a custom model",
+    "",
+    "Flags for add:",
+    "  --provider <id>      Owning provider",
+    '  --name "Display"     Display name',
+    "  --max-context <N>    Context window override",
+    "  --max-output <N>     Max output tokens",
+    "  --tools              Tool-capable",
+    "  --vision             Vision-capable",
+    "  --streaming          Streaming support",
+    "  --reasoning          Reasoning support",
+    "  --json-mode          JSON mode support",
+    "",
+    "Persisted to ~/.wrongstack/config.json."
+  ].join("\n");
+  return {
+    name: "models",
+    description: "Manage custom model definitions.",
+    help,
+    async run(args) {
+      const parts = args.trim().split(/\s+/).filter(Boolean);
+      const sub = (parts[0] ?? "").toLowerCase();
+      if (sub === "help" || sub === "--help") return { message: help };
+      if (!opts.configStore || !opts.paths) {
+        return { message: `${color.red("Error")} config store not available.` };
+      }
+      const config = opts.configStore.get();
+      const globalConfigPath = opts.paths.globalConfig;
+      if (!sub) {
+        const models = config.models ?? {};
+        const ids = Object.keys(models);
+        if (ids.length === 0) {
+          return {
+            message: [
+              `${color.bold("Custom Models")} ${color.dim("(none defined)")}`,
+              "",
+              color.dim("  Add one: /models add <id> --max-context 128000 --tools")
+            ].join("\n")
+          };
+        }
+        return {
+          message: [
+            `${color.bold("Custom Models")} ${color.dim(`(${ids.length})`)}`,
+            ...ids.sort().map((id) => fmtModel(id, models[id]))
+          ].join("\n")
+        };
+      }
+      try {
+        if (sub === "add") {
+          const { modelId, def, error } = parseFlags(parts.slice(1));
+          if (error) {
+            return { message: `${color.red("Error")}: ${error}. ${color.dim("/models help")}` };
+          }
+          if (!def && !error) {
+            return { message: `${color.amber("Usage:")} /models add <id> [--max-context N] [--tools] ... ${color.dim("/models help")}` };
+          }
+          const existingModels = config.models ?? {};
+          const existed = modelId in existingModels;
+          const decrypted = await patchGlobalConfig(globalConfigPath, (cfg) => {
+            const models = { ...cfg.models ?? {} };
+            models[modelId] = {
+              ...models[modelId],
+              ...def,
+              capabilities: {
+                ...models[modelId]?.capabilities,
+                ...def?.capabilities
+              }
+            };
+            cfg.models = models;
+          });
+          opts.configStore.update({
+            models: decrypted.models
+          });
+          return { message: `${color.green("\u2713")} ${color.amber(modelId)} ${existed ? "updated" : "added"}.` };
+        }
+        if (sub === "remove" || sub === "rm") {
+          const modelId = parts[1];
+          if (!modelId) {
+            return { message: `${color.amber("Usage:")} /models remove <id>` };
+          }
+          const existing = config.models ?? {};
+          if (!(modelId in existing)) {
+            return { message: `${color.amber("Not found")}: custom model "${modelId}" is not defined.` };
+          }
+          const decrypted = await patchGlobalConfig(globalConfigPath, (cfg) => {
+            const models = { ...cfg.models ?? {} };
+            delete models[modelId];
+            cfg.models = models;
+          });
+          opts.configStore.update({
+            models: decrypted.models
+          });
+          return { message: `${color.green("\u2713")} removed ${color.amber(modelId)}` };
+        }
+        return {
+          message: `${color.red("Unknown subcommand")} "${sub}". Try ${color.dim("/models")}, ${color.dim("/models add")}, or ${color.dim("/models help")}.`
+        };
+      } catch (err) {
+        return {
+          message: `${color.red("models error")}: ${err instanceof Error ? err.message : String(err)}`
+        };
+      }
+    }
+  };
+}
 function buildNextCommand(opts) {
   return {
     name: "next",
@@ -5452,7 +5872,7 @@ function summariseEvent(ev) {
       return color.dim("\u2026");
   }
 }
-var noOpVault = {
+var noOpVault2 = {
   encrypt: (v) => v,
   decrypt: (v) => v,
   isEncrypted: () => false
@@ -5487,7 +5907,7 @@ function parseTarget(tokens) {
 function fmtEntry(e) {
   return e.provider ? `${e.provider}/${e.model}` : `${e.model} ${color.dim("(leader provider)")}`;
 }
-async function patchGlobalConfig(globalConfigPath, mutate) {
+async function patchGlobalConfig2(globalConfigPath, mutate) {
   let raw = "{}";
   let fileExists = true;
   try {
@@ -5504,9 +5924,9 @@ async function patchGlobalConfig(globalConfigPath, mutate) {
       throw new Error(`Config at ${globalConfigPath} is not valid JSON: ${err.message}`);
     parsed = {};
   }
-  const decrypted = decryptConfigSecrets$1(parsed, noOpVault);
+  const decrypted = decryptConfigSecrets$1(parsed, noOpVault2);
   mutate(decrypted);
-  const encrypted = encryptConfigSecrets$1(decrypted, noOpVault);
+  const encrypted = encryptConfigSecrets$1(decrypted, noOpVault2);
   await atomicWrite(globalConfigPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
   return decrypted;
 }
@@ -5597,7 +6017,7 @@ function buildSetModelCommand(opts) {
               message: `${color.red("Provider not available")}: "${provider}". Keyed: ${keyed.join(", ") || "(none)"}. ${color.dim("/setmodel list")}`
             };
           }
-          const decrypted = await patchGlobalConfig(globalConfigPath, (cfg) => {
+          const decrypted = await patchGlobalConfig2(globalConfigPath, (cfg) => {
             cfg.provider = provider;
             cfg.model = model;
           });
@@ -5628,7 +6048,7 @@ function buildSetModelCommand(opts) {
               message: `${color.red("Provider not available")}: "${parsed.provider}". Keyed: ${keyed.join(", ") || "(none)"}.`
             };
           }
-          const decrypted = await patchGlobalConfig(globalConfigPath, (cfg) => {
+          const decrypted = await patchGlobalConfig2(globalConfigPath, (cfg) => {
             const matrix = { ...cfg.modelMatrix ?? {} };
             matrix[key] = parsed.provider ? { provider: parsed.provider, model: parsed.model } : { model: parsed.model };
             cfg.modelMatrix = matrix;
@@ -5645,7 +6065,7 @@ function buildSetModelCommand(opts) {
           if (!(key in existing)) {
             return { message: `${color.amber("No matrix entry")} for "${key}".` };
           }
-          const decrypted = await patchGlobalConfig(globalConfigPath, (cfg) => {
+          const decrypted = await patchGlobalConfig2(globalConfigPath, (cfg) => {
             const matrix = { ...cfg.modelMatrix ?? {} };
             delete matrix[key];
             cfg.modelMatrix = matrix;
@@ -5697,7 +6117,7 @@ async function persistAutonomySetting(deps, mutator) {
 }
 
 // src/slash-commands/settings.ts
-var noOpVault2 = {
+var noOpVault3 = {
   encrypt: (v) => v,
   decrypt: (v) => v,
   isEncrypted: () => false
@@ -5762,7 +6182,7 @@ function buildSettingsCommand(opts) {
       const persistDeps = {
         configStore: opts.configStore,
         globalConfigPath: opts.paths.globalConfig,
-        vault: noOpVault2
+        vault: noOpVault3
       };
       try {
         if (sub === "delay") {
@@ -6110,12 +6530,12 @@ function buildYoloCommand(opts) {
     help: [
       "Usage:",
       "  /yolo          Show current YOLO status",
-      "  /yolo on       Enable YOLO mode (auto-approve every tool call)",
+      "  /yolo on       Enable YOLO mode (auto-approve normal project work)",
       "  /yolo off      Disable YOLO mode (restore permission prompts)",
       "  /yolo toggle   Toggle YOLO mode",
       "",
-      "YOLO mode skips all permission prompts and auto-approves every tool call.",
-      "Use with caution \u2014 the agent can execute any tool without asking."
+      "YOLO mode auto-approves normal in-project tool calls, including simple shell commands.",
+      "Clearly destructive calls may still ask unless --yolo-destructive is enabled."
     ].join("\n"),
     async run(args) {
       const arg = args.trim().toLowerCase();
@@ -6126,7 +6546,7 @@ function buildYoloCommand(opts) {
       }
       if (!arg) {
         const current = opts.onYolo();
-        const status = current ? `${color.yellow("ON")} ${color.dim("(auto-approving all tool calls)")}` : `${color.green("OFF")} ${color.dim("(permission prompts active)")}`;
+        const status = current ? `${color.yellow("ON")} ${color.dim("(auto-approving normal project work)")}` : `${color.green("OFF")} ${color.dim("(permission prompts active)")}`;
         const msg2 = `YOLO mode: ${status}`;
         opts.renderer.write(msg2);
         return { message: msg2 };
@@ -6144,7 +6564,7 @@ function buildYoloCommand(opts) {
         return { message: msg2 };
       }
       opts.onYolo(newState);
-      const label = newState ? `${color.yellow("ENABLED")} \u2014 all tool calls will be auto-approved` : `${color.green("DISABLED")} \u2014 permission prompts are active`;
+      const label = newState ? `${color.yellow("ENABLED")} \u2014 normal project tool calls will be auto-approved` : `${color.green("DISABLED")} \u2014 permission prompts are active`;
       const msg = `YOLO mode: ${label}`;
       opts.renderer.write(msg);
       return { message: msg };
@@ -6186,6 +6606,7 @@ function buildBuiltinSlashCommands(opts) {
     buildWorktreeCommand(opts),
     buildSettingsCommand(opts),
     buildSetModelCommand(opts),
+    buildModelsCommand(opts),
     buildCollabCommand(opts),
     buildStatuslineCommand({
       cwd: opts.cwd,
@@ -6350,7 +6771,7 @@ 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/q]")} `
+      `  ${color.amber("?")} YOLO mode ${color.dim("(auto-approve normal project work)")} ${color.dim("[Y/n/q]")} `
     )).trim().toLowerCase();
     if (answer === "q") {
       renderer.write(color.dim("  Goodbye!\n"));
@@ -6907,11 +7328,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: atomicWrite10 } = await import('@wrongstack/core');
-    const fs22 = await import('fs/promises');
+    const { atomicWrite: atomicWrite13 } = await import('@wrongstack/core');
+    const fs25 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs22.readFile(configPath2, "utf8");
+      const raw = await fs25.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -6919,7 +7340,7 @@ async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => p
     existing.provider = provider;
     existing.model = model;
     await backupCurrent(homeFn);
-    await atomicWrite10(configPath2, JSON.stringify(existing, null, 2), { mode: 384 });
+    await atomicWrite13(configPath2, JSON.stringify(existing, null, 2), { mode: 384 });
     try {
       await appendHistory(
         oldCfg,
@@ -7209,7 +7630,7 @@ var GROUPS = [
     items: [
       { key: "/mode", blurb: "switch persona: code-reviewer, debugger, architect, tester, devops, \u2026" },
       { key: "/model", blurb: "two-step provider \u2192 model picker, hot-swap at runtime" },
-      { key: "/yolo on|off|toggle", blurb: "auto-approve every tool call without restart" },
+      { key: "/yolo on|off|toggle", blurb: "auto-approve normal project work without restart" },
       { key: "/context mode frugal|balanced|deep|archival", blurb: "pick how aggressively history is trimmed" },
       { key: "/compact", blurb: "manually compact the in-flight context window" },
       { key: "/plan show|add|start|done", blurb: "strategic roadmap, survives /resume across sessions" }
@@ -7242,12 +7663,12 @@ function pickGroupIndex(opts) {
     try {
       let current = 0;
       try {
-        const parsed = Number.parseInt(fs10.readFileSync(opts.cursorFile, "utf8").trim(), 10);
+        const parsed = Number.parseInt(fs12.readFileSync(opts.cursorFile, "utf8").trim(), 10);
         if (Number.isFinite(parsed)) current = wrap(parsed);
       } catch {
       }
-      fs10.mkdirSync(path8.dirname(opts.cursorFile), { recursive: true });
-      fs10.writeFileSync(opts.cursorFile, String(wrap(current + 1)));
+      fs12.mkdirSync(path8.dirname(opts.cursorFile), { recursive: true });
+      fs12.writeFileSync(opts.cursorFile, String(wrap(current + 1)));
       return current;
     } catch {
     }
@@ -8785,9 +9206,160 @@ var initCmd = async (_args, deps) => {
   deps.renderer.writeInfo('Try: wstack "<task>"  or  wstack');
   return 0;
 };
+var AllowAllPermissionPolicy = class extends AutoApprovePermissionPolicy {
+  async evaluate() {
+    return { permission: "auto", source: "default" };
+  }
+};
+function parseToolsFlag(flags) {
+  const raw = flags["tools"];
+  if (typeof raw !== "string") return null;
+  const set = new Set(
+    raw.split(",").map((s) => s.trim()).filter(Boolean)
+  );
+  return set.size > 0 ? set : null;
+}
+function makeServeContext(cwd, projectRoot, signal) {
+  const provider = {
+    id: "mcp-serve",
+    capabilities: { maxContext: 0 },
+    complete: async () => {
+      throw new Error("no model provider in `mcp serve` mode");
+    },
+    stream: () => {
+      throw new Error("no model provider in `mcp serve` mode");
+    }
+  };
+  const session = { append: async () => {
+  } };
+  const tokenCounter = {
+    account: () => {
+    },
+    total: () => ({ input: 0, output: 0 }),
+    estimateCost: () => ({ total: 0 })
+  };
+  return new Context({
+    systemPrompt: [],
+    provider,
+    session,
+    signal,
+    tokenCounter,
+    cwd,
+    projectRoot,
+    model: "mcp-serve",
+    tools: []
+  });
+}
+async function selectExposedTools(registry, ctx, policy, whitelist) {
+  const allowed = [];
+  for (const tool of registry.list()) {
+    if (whitelist && !whitelist.has(tool.name)) continue;
+    const decision = await policy.evaluate(tool, {}, ctx);
+    if (decision.permission === "auto") allowed.push(tool);
+  }
+  return allowed;
+}
+async function serveMcpStdio(deps) {
+  const flags = deps.flags ?? {};
+  const yolo = flags["yolo"] === true || flags["allow-all"] === true;
+  const whitelist = parseToolsFlag(flags);
+  const log = (m) => process.stderr.write(`${m}
+`);
+  let registry = deps.toolRegistry;
+  if (!registry) {
+    registry = new ToolRegistry();
+    registry.registerAllOrThrow([...builtinToolsPack.tools ?? []], builtinToolsPack.name);
+  }
+  const controller = new AbortController();
+  const ctx = makeServeContext(deps.cwd, deps.projectRoot, controller.signal);
+  const permissionPolicy = yolo ? new AllowAllPermissionPolicy() : new AutoApprovePermissionPolicy();
+  const executor = new ToolExecutor(registry, {
+    permissionPolicy,
+    secretScrubber: new DefaultSecretScrubber(),
+    perIterationOutputCapBytes: 1e6
+  });
+  const allowed = await selectExposedTools(registry, ctx, permissionPolicy, whitelist);
+  const allowedNames = new Set(allowed.map((t) => t.name));
+  if (allowed.length === 0) {
+    log(
+      "wrongstack MCP server: no tools to expose (all withheld by policy or filtered out). Pass --yolo to expose write/exec tools, or --tools <names> to whitelist."
+    );
+  }
+  let counter = 0;
+  const host = {
+    listTools: () => allowed.map((t) => ({
+      name: t.name,
+      description: t.description,
+      inputSchema: t.inputSchema ?? { type: "object" }
+    })),
+    callTool: async (name, callArgs) => {
+      if (!allowedNames.has(name)) {
+        return { content: `Tool "${name}" is not exposed by this server`, isError: true };
+      }
+      const use = {
+        type: "tool_use",
+        id: `srv_${++counter}`,
+        name,
+        input: callArgs
+      };
+      const batch = await executor.executeBatch([use], ctx, "sequential");
+      const result = batch.outputs[0]?.result;
+      if (!result || result.type === "tool_confirm_pending") {
+        return {
+          content: `Tool "${name}" requires interactive confirmation, which is unavailable over MCP`,
+          isError: true
+        };
+      }
+      return { content: result.content, isError: Boolean(result.is_error) };
+    }
+  };
+  const server = new MCPServer({
+    host,
+    logger: { warn: (m) => log(`[mcp-serve] ${m}`) }
+  });
+  const mode = yolo ? "yolo: all tools" : "safe: read-only tools";
+  if (flags["http"] === true || typeof flags["http"] === "string" || flags["port"] || flags["host"]) {
+    const port = Number(flags["port"] ?? flags["http"] ?? 0) || 0;
+    const httpHost = typeof flags["host"] === "string" ? flags["host"] : "127.0.0.1";
+    const token = typeof flags["token"] === "string" ? flags["token"] : void 0;
+    let handle2;
+    try {
+      handle2 = await serveHttp(server, {
+        port,
+        host: httpHost,
+        token,
+        logger: { warn: (m) => log(`[mcp-serve] ${m}`) }
+      });
+    } catch (err) {
+      log(`wrongstack MCP server: ${err instanceof Error ? err.message : String(err)}`);
+      return 1;
+    }
+    log(
+      `wrongstack MCP server ready at ${handle2.url} \u2014 exposing ${allowed.length} tool(s) (${mode})${token ? " [token auth]" : ""}.`
+    );
+    await new Promise((resolve3) => {
+      const stop = () => resolve3();
+      process.once("SIGINT", stop);
+      process.once("SIGTERM", stop);
+    });
+    await handle2.close();
+    controller.abort();
+    return 0;
+  }
+  log(`wrongstack MCP server ready on stdio \u2014 exposing ${allowed.length} tool(s) (${mode}).`);
+  const handle = serveStdio(server);
+  await handle.done;
+  controller.abort();
+  return 0;
+}
+
+// src/subcommands/handlers/mcp.ts
 var BUILT_IN_MCP = allServers();
 var mcpCmd = async (args, deps) => {
   const sub = args[0];
+  if (sub === "serve") {
+    return serveMcpStdio(deps);
+  }
   if (!sub || sub === "list") {
     const servers = deps.config.mcpServers ?? {};
     if (Object.keys(servers).length === 0) {
@@ -9154,8 +9726,49 @@ ${color.dim(`Current: ${deps.config.provider ?? "<unset>"} / ${deps.config.model
     return 1;
   }
 };
+function parseFlags2(args) {
+  const flags = {};
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a.startsWith("--")) {
+      const eq = a.indexOf("=");
+      if (eq !== -1) {
+        flags[a.slice(2, eq)] = a.slice(eq + 1);
+      } else {
+        const name = a.slice(2);
+        if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+          flags[name] = args[++i] ?? "";
+        } else {
+          flags[name] = true;
+        }
+      }
+    }
+  }
+  return flags;
+}
+function positionals(args) {
+  const out = [];
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a.startsWith("--")) {
+      const eq = a.indexOf("=");
+      if (eq === -1) {
+        if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+          i++;
+        }
+      }
+      continue;
+    }
+    out.push(a);
+  }
+  return out;
+}
+var DEFAULT_PER_PAGE = 15;
 var modelsCmd = async (args, deps) => {
   const sub = args[0];
+  if (sub === "add") return modelsAdd(args.slice(1), deps);
+  if (sub === "remove") return modelsRemove(args.slice(1), deps);
+  if (sub === "list") return modelsList(args.slice(1), deps);
   if (sub === "refresh") {
     deps.renderer.writeInfo("Refreshing models.dev cache\u2026");
     try {
@@ -9169,9 +9782,13 @@ var modelsCmd = async (args, deps) => {
       return 1;
     }
   }
-  const providerId = sub ?? deps.config.provider;
+  const flags = parseFlags2(args);
+  const search = typeof flags["search"] === "string" ? flags["search"].toLowerCase() : "";
+  const perPage = Number(flags["per-page"]) > 0 ? Number(flags["per-page"]) : DEFAULT_PER_PAGE;
+  const page = Math.max(1, Number(flags["page"]) || 1);
+  const providerId = sub ?? deps.config.provider ?? "";
   if (!providerId) {
-    deps.renderer.writeError("Usage: wstack models <provider> | refresh");
+    deps.renderer.writeError("Usage: wstack models <provider> [--search <term>] [--page N] [--per-page N]");
     return 1;
   }
   let lookupId = providerId;
@@ -9195,34 +9812,209 @@ var modelsCmd = async (args, deps) => {
 `));
   const userModels = deps.config.providers?.[providerId]?.models;
   const catalogById = new Map(provider.models.map((m) => [m.id, m]));
-  const sorted = userModels && userModels.length > 0 ? userModels.map((id) => catalogById.get(id) ?? { id, name: id }) : [...provider.models].sort(
+  const allSorted = userModels && userModels.length > 0 ? userModels.map((id) => catalogById.get(id) ?? { id, name: id }) : [...provider.models].sort(
     (a, b) => (b.release_date ?? "").localeCompare(a.release_date ?? "")
   );
   if (userModels && userModels.length > 0)
     deps.renderer.write(color.dim(`(${userModels.length} model(s) from your saved config)
 `));
-  for (const m of sorted) {
-    const caps = [];
-    if ("tool_call" in m && m.tool_call) caps.push("tools");
-    if ("reasoning" in m && m.reasoning) caps.push("reasoning");
-    if ("modalities" in m && m.modalities?.input?.includes("image")) caps.push("vision");
-    const ctx = "limit" in m && m.limit?.context ? `${(m.limit.context / 1e3).toFixed(0)}k` : "?";
-    const cost = "cost" in m && m.cost?.input !== void 0 ? `$${m.cost.input}/$${m.cost.output ?? "?"}` : "";
-    deps.renderer.write(
-      `  ${m.id.padEnd(40)} ${color.dim(ctx.padStart(6))}  ${color.dim(cost.padEnd(14))} ${color.dim(caps.join(","))}
+  const filtered = search ? allSorted.filter((m) => m.id.toLowerCase().includes(search)) : allSorted;
+  const total = filtered.length;
+  const totalPages = Math.max(1, Math.ceil(total / perPage));
+  const actualPage = Math.min(page, totalPages);
+  const start = (actualPage - 1) * perPage;
+  const pageItems = filtered.slice(start, start + perPage);
+  const end = Math.min(start + pageItems.length, total);
+  const pageHint = totalPages > 1 ? color.cyan(`[page ${actualPage}/${totalPages}]`) : "";
+  const searchHint = search ? color.yellow(` (filtered: "${search}" \u2014 ${total} match${total === 1 ? "" : "es"})`) : color.dim(` (${total} model${total === 1 ? "" : "s"})`);
+  deps.renderer.write(`${pageHint}${searchHint}
+`);
+  if (pageItems.length === 0) {
+    deps.renderer.write(color.dim("(no models match)\n"));
+  } else {
+    if (start > 0)
+      deps.renderer.write(color.dim(`  ${String.fromCharCode(8593)} ${start} above
+`));
+    for (const m of pageItems) {
+      const caps = [];
+      if ("tool_call" in m && m.tool_call) caps.push("tools");
+      if ("reasoning" in m && m.reasoning) caps.push("reasoning");
+      if ("modalities" in m && m.modalities?.input?.includes("image")) caps.push("vision");
+      const ctx = "limit" in m && m.limit?.context ? `${(m.limit.context / 1e3).toFixed(0)}k` : "?";
+      const cost = "cost" in m && m.cost?.input !== void 0 ? `${m.cost.input}/${m.cost.output ?? "?"}` : "";
+      deps.renderer.write(
+        `  ${m.id.padEnd(40)} ${color.dim(ctx.padStart(6))}  ${color.dim(cost.padEnd(14))} ${color.dim(caps.join(","))}
 `
-    );
+      );
+    }
+    if (end < total)
+      deps.renderer.write(color.dim(`  ${String.fromCharCode(8595)} ${total - end} below
+`));
   }
+  const navLines = [];
+  if (totalPages > 1) {
+    if (actualPage > 1) navLines.push(`--page ${actualPage - 1} (prev)`);
+    if (actualPage < totalPages) navLines.push(`--page ${actualPage + 1} (next)`);
+  }
+  navLines.push("--search <term> (filter)");
+  deps.renderer.write(color.dim(`
+${navLines.join(" \xB7 ")}
+`));
   const age = await deps.modelsRegistry.ageSeconds();
   deps.renderer.write(
     color.dim(
-      `
-Cache age: ${isFinite(age) ? `${Math.round(age / 60)}m` : "never fetched"}. Run \`wstack models refresh\` to update.
+      `Cache age: ${isFinite(age) ? `${Math.round(age / 60)}m` : "never fetched"}. Run \`wstack models refresh\` to update.
 `
     )
   );
   return 0;
 };
+async function mutateModelsConfig(deps, mutator) {
+  const vault = deps.vault;
+  const configPath2 = deps.paths.globalConfig;
+  let fileExists = true;
+  let raw;
+  try {
+    raw = await fsp3.readFile(configPath2, "utf8");
+  } catch (err) {
+    if (err.code !== "ENOENT") throw err;
+    fileExists = false;
+    raw = "{}";
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    if (fileExists) {
+      throw new Error(
+        `Refusing to overwrite corrupt config at ${configPath2} (${err.message}).`
+      );
+    }
+    parsed = {};
+  }
+  const decrypted = decryptConfigSecrets$1(parsed, vault);
+  const models = decrypted.models ?? {};
+  mutator(models);
+  decrypted.models = models;
+  const encrypted = encryptConfigSecrets$1(decrypted, vault);
+  await atomicWrite(configPath2, JSON.stringify(encrypted, null, 2), { mode: 384 });
+}
+function parseSizeFlag(raw) {
+  if (!raw) return void 0;
+  const s = raw.trim().toLowerCase();
+  const match = /^(\d+(?:\.\d+)?)\s*(k|m|b)?$/.exec(s);
+  if (!match) return void 0;
+  const num = Number.parseFloat(match[1]);
+  const unit = match[2];
+  if (unit === "b") return Math.round(num * 1e9);
+  if (unit === "m") return Math.round(num * 1e6);
+  if (unit === "k") return Math.round(num * 1e3);
+  return Math.round(num);
+}
+function parseBoolFlag(flags, key) {
+  if (flags[key] === true || flags[key] === "true") return true;
+  if (flags[`no-${key}`] !== void 0) return false;
+  return void 0;
+}
+async function modelsAdd(args, deps) {
+  const flags = parseFlags2(args);
+  const pos = positionals(args);
+  const modelId = pos[0];
+  if (!modelId) {
+    deps.renderer.writeError(
+      "Usage: wstack models add <modelId> [--provider <id>] [--name <name>] [--max-context <N>] [--max-output <N>] [--tools] [--no-tools] [--vision] [--no-vision] [--reasoning] [--streaming] [--no-streaming] [--json-mode]"
+    );
+    return 1;
+  }
+  const existing = deps.config.models?.[modelId];
+  if (existing) {
+    deps.renderer.writeWarning(
+      `Model "${modelId}" already defined. Overwriting.`
+    );
+  }
+  const capabilities = {};
+  const toolsVal = parseBoolFlag(flags, "tools");
+  if (toolsVal !== void 0) capabilities.tools = toolsVal;
+  const visionVal = parseBoolFlag(flags, "vision");
+  if (visionVal !== void 0) capabilities.vision = visionVal;
+  const streamingVal = parseBoolFlag(flags, "streaming");
+  if (streamingVal !== void 0) capabilities.streaming = streamingVal;
+  const reasoningVal = parseBoolFlag(flags, "reasoning");
+  if (reasoningVal !== void 0) capabilities.reasoning = reasoningVal;
+  const jsonModeVal = parseBoolFlag(flags, "json-mode");
+  if (jsonModeVal !== void 0) capabilities.jsonMode = jsonModeVal;
+  const maxContextRaw = typeof flags["max-context"] === "string" ? flags["max-context"] : void 0;
+  const maxContext = parseSizeFlag(maxContextRaw);
+  if (maxContext !== void 0) capabilities.maxContext = maxContext;
+  const def = {};
+  const nameFlag = typeof flags["name"] === "string" ? flags["name"] : void 0;
+  const providerFlag = typeof flags["provider"] === "string" ? flags["provider"] : void 0;
+  if (nameFlag) def.name = nameFlag;
+  if (providerFlag) def.provider = providerFlag;
+  if (Object.keys(capabilities).length > 0) def.capabilities = capabilities;
+  const maxOutputRaw = typeof flags["max-output"] === "string" ? flags["max-output"] : void 0;
+  const maxOutput = parseSizeFlag(maxOutputRaw);
+  if (maxOutput !== void 0) def.maxOutput = maxOutput;
+  await mutateModelsConfig(deps, (models) => {
+    models[modelId] = def;
+  });
+  deps.renderer.writeInfo(`Custom model "${modelId}" ${existing ? "updated" : "added"}.`);
+  const capLines = [];
+  if (def.capabilities) {
+    for (const [k, v] of Object.entries(def.capabilities)) {
+      capLines.push(`  ${k}: ${v}`);
+    }
+  }
+  if (def.maxOutput !== void 0) capLines.push(`  maxOutput: ${def.maxOutput}`);
+  if (capLines.length > 0) {
+    deps.renderer.write(color.dim(capLines.join("\n") + "\n"));
+  }
+  return 0;
+}
+async function modelsRemove(args, deps) {
+  const modelId = args[0];
+  if (!modelId) {
+    deps.renderer.writeError("Usage: wstack models remove <modelId>");
+    return 1;
+  }
+  const existing = deps.config.models?.[modelId];
+  if (!existing) {
+    deps.renderer.writeError(`No custom model "${modelId}" found.`);
+    return 1;
+  }
+  await mutateModelsConfig(deps, (models) => {
+    delete models[modelId];
+  });
+  deps.renderer.writeInfo(`Removed custom model "${modelId}".`);
+  return 0;
+}
+async function modelsList(_args, deps) {
+  const models = deps.config.models ?? {};
+  const entries = Object.entries(models);
+  if (entries.length === 0) {
+    deps.renderer.write(color.dim("No custom models defined.\n"));
+    deps.renderer.write(color.dim("Use `wstack models add <modelId> --max-context 128k --tools`\n"));
+    return 0;
+  }
+  deps.renderer.write(color.bold("Custom models\n"));
+  for (const [id, def] of entries.sort(([a], [b]) => a.localeCompare(b))) {
+    const label = def.name ?? id;
+    const provider = def.provider ? ` ${color.dim(`(${def.provider})`)}` : "";
+    deps.renderer.write(`  ${color.bold(label)}${provider}
+`);
+    if (def.capabilities) {
+      for (const [k, v] of Object.entries(def.capabilities)) {
+        deps.renderer.write(`    ${color.dim(`${k}:`)} ${v}
+`);
+      }
+    }
+    if (def.maxOutput !== void 0) {
+      deps.renderer.write(`    ${color.dim("maxOutput:")} ${def.maxOutput}
+`);
+    }
+  }
+  return 0;
+}
 function redactKeys(obj) {
   if (!obj || typeof obj !== "object") return obj;
   if (Array.isArray(obj)) return obj.map(redactKeys);
@@ -9815,10 +10607,10 @@ var auditCmd = async (args, deps) => {
   return verify.ok ? 0 : 1;
 };
 async function listAudits(log, dir, deps) {
-  const fs22 = await import('fs/promises');
+  const fs25 = await import('fs/promises');
   let entries;
   try {
-    entries = await fs22.readdir(dir);
+    entries = await fs25.readdir(dir);
   } catch {
     deps.renderer.write(
       color.dim(`No sessions dir found at ${dir}. Run a session first.`) + "\n"
@@ -9895,6 +10687,9 @@ var helpCmd = async (_args, deps) => {
     "  wstack providers [--all]     List providers from models.dev",
     "  wstack models [<provider>]   List models",
     "  wstack models refresh        Force-refresh cache",
+    "  wstack models add <mid>      Add/override custom model (--max-context, --tools, --vision, \u2026)",
+    "  wstack models remove <mid>   Remove a custom model",
+    "  wstack models list           List all custom models",
     "  wstack mcp [list]            List MCP servers",
     "  wstack plugin [list|status|official|install|add|remove|enable|disable]  Manage plugins",
     "  wstack projects              List tracked projects",
@@ -9902,7 +10697,15 @@ var helpCmd = async (_args, deps) => {
     "  wstack doctor                Health checks",
     "  wstack export <id> [opts]    Render a session",
     "  wstack usage                 Token + cost summary",
-    "  wstack version               Print version"
+    "  wstack version               Print version",
+    "",
+    color.bold("Common flags"),
+    "  --yolo                       Auto-approve normal in-project tool calls",
+    "  --yolo-destructive           Also auto-approve clearly destructive YOLO-gated calls",
+    "  --force-all-yolo             Deprecated alias for --yolo-destructive",
+    "  --tui / --no-tui             Force or disable TUI mode",
+    '  --eternal "<mission>"        Start an eternal-autonomy loop',
+    "  --no-hints                   Hide launch hints"
   ];
   deps.renderer.write(lines.join("\n") + "\n");
   return 0;
@@ -9955,22 +10758,22 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color45) {
+function fmtTaskResultLine(r, color46) {
   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 ? color45.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color45.dim(errTail)}` : "";
+  const errKindChip = errKind ? color46.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color46.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color45.green("\u2713"), stats, tail: "" };
+      return { mark: color46.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color45.yellow("\u23F1"), stats: `${color45.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color46.yellow("\u23F1"), stats: `${color46.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color45.dim("\u2298"), stats: `${color45.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color46.dim("\u2298"), stats: `${color46.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color45.red("\u2717"), stats: `${color45.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color46.red("\u2717"), stats: `${color46.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 
@@ -10038,6 +10841,15 @@ async function boot(argv) {
     }).catch(() => {
     });
   }
+  if (!flags["no-models-refresh"]) {
+    try {
+      await modelsRegistry.refresh();
+      logger.info("models.dev catalog refreshed");
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      logger.warn(`models.dev refresh failed (${msg}); using cached catalog`);
+    }
+  }
   const first = positional[0];
   if (first && subcommands[first]) {
     const container = createDefaultContainer({
@@ -10066,7 +10878,8 @@ async function boot(argv) {
       vault,
       cwd,
       projectRoot,
-      userHome
+      userHome,
+      flags
     });
     await reader.close();
     return code;
@@ -10184,6 +10997,20 @@ async function boot(argv) {
     updateInfo
   };
 }
+var CONTEXT_OVERFLOW_RE = /context window|exceeds the context|too many tokens|context.*tokens/i;
+function contextOverflowHint(err) {
+  const structured = err.code === ERROR_CODES.PROVIDER_CONTEXT_OVERFLOW || err.code === ERROR_CODES.AGENT_CONTEXT_OVERFLOW;
+  const textual = CONTEXT_OVERFLOW_RE.test(`${err.message}
+${err.describe()}`);
+  if (!structured && !textual) return null;
+  return [
+    "Provider rejected the request as over its effective context window.",
+    "If you use a custom baseUrl/proxy, the real limit may be lower than models.dev reports.",
+    "Try: /context limit 220k",
+    "Then, if needed: /context thresholds 50% 70% 85%",
+    "Persistent config: set context.effectiveMaxContext."
+  ].join("\n");
+}
 function fmtElapsed(ms) {
   const s = Math.floor(ms / 1e3);
   if (s < 60) return `${s}s`;
@@ -10775,6 +11602,8 @@ ${taskList}`;
           if (err) {
             const tag = err.recoverable ? " (recoverable)" : "";
             opts.renderer.writeError(`Failed [${err.severity}]${tag}: ${err.describe()}`);
+            const hint = contextOverflowHint(err);
+            if (hint) opts.renderer.writeWarning(hint);
           } else {
             opts.renderer.writeError("Failed.");
           }
@@ -11139,7 +11968,17 @@ async function execute(deps) {
     const visionAdapters = () => createToolVisionAdapters(agent.tools);
     const supportsVision = async () => {
       try {
-        const caps = await capabilitiesFor(modelsRegistry, context.provider.id, context.model);
+        const providerConfig = config.providers?.[context.provider.id];
+        const mergedModels = mergeCustomModelDefs(
+          providerConfig?.customModels,
+          config.models
+        );
+        const caps = await capabilitiesFor(
+          modelsRegistry,
+          context.provider.id,
+          context.model,
+          mergedModels
+        );
         return caps.vision;
       } catch {
         return context.provider.capabilities.vision;
@@ -11206,6 +12045,8 @@ async function execute(deps) {
           if (err) {
             const tag = err.recoverable ? " (recoverable)" : "";
             renderer.writeError(`Failed [${err.severity}]${tag}: ${err.describe()}`);
+            const hint = contextOverflowHint(err);
+            if (hint) renderer.writeWarning(hint);
           } else {
             renderer.writeError("Failed.");
           }
@@ -12832,8 +13673,12 @@ async function setupCompaction(params) {
     providerId: config.provider ?? provider.id,
     modelId: config.model ?? context.model
   });
+  const initialPolicy = resolveContextWindowPolicy(config.context);
+  context.meta ??= {};
+  context.meta["contextWindowMode"] = initialPolicy.id;
+  context.meta["contextWindowPolicy"] = initialPolicy;
   let autoCompactor;
-  if (config.context.autoCompact !== false) {
+  if (config.context.autoCompact !== false && effectiveMaxContext > 0) {
     const auditLevel = resolveAuditLevel(fullConfig ?? config);
     const sessionBridge = providedBridge ?? createSessionEventBridge(sessionWriter, auditLevel);
     autoCompactor = new AutoCompactionMiddleware(
@@ -12842,15 +13687,15 @@ async function setupCompaction(params) {
       // Calibrated estimator: recordActualUsage() is called after each API
       // response so this converges on real token counts for compaction decisions.
       (ctx) => estimateRequestTokensCalibrated(ctx.messages, ctx.systemPrompt, ctx.tools ?? []).total,
+      initialPolicy.thresholds,
       {
-        warn: config.context.warnThreshold,
-        soft: config.context.softThreshold,
-        hard: config.context.hardThreshold
-      },
-      {
-        aggressiveOn: "soft",
+        aggressiveOn: initialPolicy.aggressiveOn,
         failureMode: "throw_on_hard",
         events,
+        policyProvider: (ctx) => {
+          const policy = ctx.meta?.["contextWindowPolicy"];
+          return policy && typeof policy === "object" ? policy : null;
+        },
         sessionBridge
       }
     );
@@ -12869,7 +13714,8 @@ function createAgent(params) {
     confirmAwaiter: params.confirmAwaiter,
     iterationTimeoutMs: params.config.tools.iterationTimeoutMs,
     perIterationOutputCapBytes: params.config.tools.perIterationOutputCapBytes,
-    tracer: params.tracer
+    tracer: params.tracer,
+    hookRunner: params.hookRunner
   });
   return new Agent({
     container: params.container,
@@ -12887,6 +13733,139 @@ function createAgent(params) {
     tracer: params.tracer
   });
 }
+function parseModelRef(ref) {
+  const trimmed = ref.trim();
+  const slash = trimmed.indexOf("/");
+  if (slash !== -1) {
+    return {
+      provider: trimmed.slice(0, slash) || void 0,
+      model: trimmed.slice(slash + 1).trim()
+    };
+  }
+  const parts = trimmed.split(/\s+/);
+  if (parts.length >= 2) {
+    return { provider: parts[0], model: parts.slice(1).join(" ") };
+  }
+  return { model: trimmed };
+}
+function overloadStatus(err) {
+  if (!(err instanceof ProviderError)) return null;
+  const s = err.status;
+  if (s === 429 || s === 529 || s >= 500) return s;
+  return null;
+}
+function createFallbackModelExtension(deps) {
+  const initial = deps.getConfig().fallbackModels ?? [];
+  if (initial.length === 0) return null;
+  let dirty = false;
+  return {
+    name: "fallback-model",
+    beforeRun: (ctx) => {
+      if (!dirty) return;
+      const cfg = deps.getConfig();
+      try {
+        ctx.provider = deps.buildProvider(cfg.provider);
+        ctx.model = cfg.model;
+        deps.onModelSwitch?.(cfg.provider, cfg.model);
+      } catch (err) {
+        deps.logger.warn(
+          `fallback-model: could not restore primary "${cfg.provider}/${cfg.model}": ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+      dirty = false;
+    },
+    wrapProviderRunner: async (ctx, request, inner) => {
+      try {
+        return await inner(ctx, request);
+      } catch (firstErr) {
+        let lastErr = firstErr;
+        const cfg = deps.getConfig();
+        const chain = cfg.fallbackModels ?? [];
+        for (const ref of chain) {
+          const status = overloadStatus(lastErr);
+          if (status === null) break;
+          const parsed = parseModelRef(ref);
+          if (!parsed.model) continue;
+          const targetProviderId = parsed.provider ?? cfg.provider;
+          const from = { providerId: ctx.provider.id, model: ctx.model };
+          let nextProvider;
+          try {
+            nextProvider = deps.buildProvider(targetProviderId);
+          } catch (err) {
+            deps.logger.warn(
+              `fallback-model: skipping "${ref}" \u2014 cannot build provider "${targetProviderId}": ${err instanceof Error ? err.message : String(err)}`
+            );
+            continue;
+          }
+          const providerSwitched = nextProvider.id !== from.providerId;
+          ctx.provider = nextProvider;
+          ctx.model = parsed.model;
+          request.model = parsed.model;
+          dirty = true;
+          deps.onModelSwitch?.(targetProviderId, parsed.model);
+          deps.events.emit("provider.fallback", {
+            from,
+            to: { providerId: nextProvider.id, model: parsed.model },
+            status,
+            providerSwitched
+          });
+          try {
+            return await inner(ctx, request);
+          } catch (err) {
+            lastErr = err;
+          }
+        }
+        throw lastErr;
+      }
+    }
+  };
+}
+
+// src/hooks-wiring.ts
+var HookBlockedError = class extends Error {
+  constructor(reason) {
+    super(`Prompt blocked by hook: ${reason}`);
+    this.name = "HookBlockedError";
+  }
+};
+function createUserPromptSubmitMiddleware(hookRunner) {
+  return {
+    name: "UserPromptSubmitHooks",
+    handler: async (payload, next) => {
+      const prompt = payload.text;
+      if (prompt && hookRunner.has("UserPromptSubmit")) {
+        const r = await hookRunner.userPromptSubmit(prompt, payload.ctx);
+        if (r.block) throw new HookBlockedError(r.reason ?? "no reason given");
+        if (r.additionalContext) {
+          const block = { type: "text", text: r.additionalContext };
+          payload.content = [...payload.content, block];
+          payload.text = `${prompt}
+
+${r.additionalContext}`;
+        }
+      }
+      return next(payload);
+    }
+  };
+}
+function createLifecycleHooksExtension(hookRunner) {
+  let started = false;
+  return {
+    name: "lifecycle-hooks",
+    beforeRun: async (ctx) => {
+      if (started) return;
+      started = true;
+      if (!hookRunner.has("SessionStart")) return;
+      const r = await hookRunner.sessionStart(ctx);
+      if (r.additionalContext) {
+        ctx.systemPrompt.push({ type: "text", text: r.additionalContext });
+      }
+    },
+    afterRun: async (ctx) => {
+      if (hookRunner.has("Stop")) await hookRunner.stop(ctx);
+    }
+  };
+}
 function setupMetrics(params) {
   const { flags, wpaths, events, logger, config } = params;
   let metricsSink;
@@ -13002,7 +13981,8 @@ async function setupPlugins(params) {
     skillLoader,
     configStore,
     pipelines,
-    paths
+    paths,
+    hookRegistry
   } = params;
   const builtinPlugins = [];
   const disabledBuiltins = new Set(
@@ -13067,6 +14047,7 @@ async function setupPlugins(params) {
       config: pluginConfig,
       log,
       extensions: agent.extensions,
+      hookRegistry,
       sessionWriter: {
         transcriptPath: sessionWriter.transcriptPath,
         append: (e) => sessionWriter.append(e)
@@ -13312,10 +14293,8 @@ async function launchEternalFromFlag(deps) {
     lastActivityAt: (/* @__PURE__ */ new Date()).toISOString()
   } : emptyGoal2(eternalFlag);
   await saveGoal2(goalPath, next);
-  const policy = deps.container.resolve(
-    TOKENS.PermissionPolicy
-  );
-  policy.setYolo(true);
+  const policy = deps.container.resolve(TOKENS.PermissionPolicy);
+  policy.setYolo?.(true);
   deps.configRef.current = patchConfig(deps.configRef.current, { yolo: true });
   const compactor = deps.container.resolve(TOKENS.Compactor);
   const engine = new EternalAutonomyEngine({
@@ -13378,7 +14357,7 @@ async function main(argv) {
     modelsRegistry,
     permission: {
       yolo: config.yolo,
-      forceAllYolo: flags["force-all-yolo"] === true,
+      yoloDestructive: flags["yolo-destructive"] === true || flags["force-all-yolo"] === true,
       promptDelegate: makePromptDelegate(reader)
     },
     compactor: {
@@ -13424,7 +14403,12 @@ async function main(argv) {
   const modeId = activeMode?.id ?? "default";
   const modePrompt = activeMode?.prompt ?? "";
   const [resolvedCaps, resolvedModel] = await Promise.all([
-    capabilitiesFor(modelsRegistry, provider.id, config.model).catch(() => void 0),
+    capabilitiesFor(
+      modelsRegistry,
+      provider.id,
+      config.model,
+      mergeCustomModelDefs(config.providers?.[provider.id]?.customModels, config.models)
+    ).catch(() => void 0),
     modelsRegistry.getModel(config.provider, config.model).catch(() => void 0)
   ]);
   const modelCapabilities = resolvedCaps ? {
@@ -13643,6 +14627,19 @@ async function main(argv) {
     });
   });
   const pipelines = setupPipelines({ events, logger });
+  const hooksEnabled = flags["no-hooks"] !== true;
+  const hookRegistry = new HookRegistry();
+  if (hooksEnabled) hookRegistry.loadShellHooks(config.hooks);
+  container.bind(TOKENS.HookRegistry, () => hookRegistry);
+  const hookRunner = new HookRunner({
+    registry: hookRegistry,
+    logger,
+    allowShell: hooksEnabled,
+    sessionId: () => session.id
+  });
+  if (hooksEnabled) {
+    pipelines.userInput.use(createUserPromptSubmitMiddleware(hookRunner));
+  }
   const compactor = container.resolve(TOKENS.Compactor);
   const compactionSetup = await setupCompaction({
     compactor,
@@ -13668,9 +14665,11 @@ async function main(argv) {
       providerId,
       modelId
     });
-    effectiveMaxContext = mc > 0 ? mc : 2e5;
+    effectiveMaxContext = mc;
     context.provider.capabilities.maxContext = effectiveMaxContext;
-    autoCompactor?.setMaxContext(effectiveMaxContext);
+    if (effectiveMaxContext > 0) {
+      autoCompactor?.setMaxContext(effectiveMaxContext);
+    }
     events.emit("ctx.max_context", { providerId, modelId, maxContext: effectiveMaxContext });
     updateSpinnerContext();
   };
@@ -13687,8 +14686,12 @@ async function main(argv) {
     pipelines,
     context,
     config,
-    confirmAwaiter: makeConfirmAwaiter(reader)
+    confirmAwaiter: makeConfirmAwaiter(reader),
+    hookRunner
   });
+  if (hooksEnabled) {
+    agent.extensions.register(createLifecycleHooksExtension(hookRunner));
+  }
   const mcpRegistry = new MCPRegistry({ toolRegistry, events, log: logger });
   if (config.features.mcp) {
     for (const cfg of Object.values(config.mcpServers ?? {})) {
@@ -13716,24 +14719,41 @@ async function main(argv) {
     healthRegistry,
     skillLoader: config.features.skills ? skillLoader : void 0,
     configStore,
-    paths: wpaths
+    paths: wpaths,
+    hookRegistry
   });
+  const resolveProviderCfg = (providerId) => {
+    const savedCfg = config.providers?.[providerId];
+    const resolvedProviderId = savedCfg?.type ?? providerId;
+    const cfgWithType = {
+      ...savedCfg ?? { type: providerId, apiKey: config.apiKey, baseUrl: config.baseUrl },
+      type: resolvedProviderId
+    };
+    return { resolvedProviderId, cfgWithType };
+  };
+  const buildProviderForId = (providerId) => {
+    const { resolvedProviderId, cfgWithType } = resolveProviderCfg(providerId);
+    return config.features.modelsRegistry && providerRegistry.has(resolvedProviderId) ? providerRegistry.create(cfgWithType) : makeProviderFromConfig(resolvedProviderId, cfgWithType);
+  };
+  const refreshMaxContextFor = (providerId, modelId) => {
+    const { resolvedProviderId, cfgWithType } = resolveProviderCfg(providerId);
+    void refreshMaxContext(resolvedProviderId, modelId, cfgWithType);
+  };
+  const fallbackExtension = createFallbackModelExtension({
+    getConfig: () => config,
+    buildProvider: buildProviderForId,
+    onModelSwitch: refreshMaxContextFor,
+    events,
+    logger
+  });
+  if (fallbackExtension) agent.extensions.register(fallbackExtension);
   const switchProviderAndModel = (providerId, modelId) => {
     try {
-      const savedCfg = config.providers?.[providerId];
-      const resolvedProviderId = savedCfg?.type ?? providerId;
-      const newCfg = savedCfg ?? {
-        type: providerId,
-        apiKey: config.apiKey,
-        baseUrl: config.baseUrl
-      };
-      const cfgWithType = { ...newCfg, type: resolvedProviderId };
-      const newProvider = config.features.modelsRegistry && providerRegistry.has(resolvedProviderId) ? providerRegistry.create(cfgWithType) : makeProviderFromConfig(resolvedProviderId, cfgWithType);
-      context.provider = newProvider;
+      context.provider = buildProviderForId(providerId);
       context.model = modelId;
       config = patchConfig(config, { provider: providerId, model: modelId });
       configStore.update({ provider: providerId, model: modelId });
-      void refreshMaxContext(resolvedProviderId, modelId, cfgWithType);
+      refreshMaxContextFor(providerId, modelId);
       return null;
     } catch (err) {
       return err instanceof Error ? err.message : String(err);
@@ -14340,6 +15360,21 @@ Restart WrongStack to load or unload plugin code in this session.`;
       }
       return result.message;
     },
+    onContextLimit: (tokens) => {
+      if (typeof tokens === "number" && Number.isFinite(tokens) && tokens > 0) {
+        effectiveMaxContext = tokens;
+        context.provider.capabilities.maxContext = tokens;
+        context.meta["effectiveMaxContext"] = tokens;
+        autoCompactor?.setMaxContext(tokens);
+        events.emit("ctx.max_context", {
+          providerId: config.provider,
+          modelId: context.model,
+          maxContext: tokens
+        });
+        updateSpinnerContext();
+      }
+      return effectiveMaxContext;
+    },
     onMcp: async (args) => {
       const parsed = parseMcpArgs(args);
       if (!parsed) {
@@ -14358,11 +15393,11 @@ Restart WrongStack to load or unload plugin code in this session.`;
     onYolo: (setTo) => {
       const policy = container.resolve(TOKENS.PermissionPolicy);
       if (setTo !== void 0) {
-        policy.setYolo(setTo);
+        policy.setYolo?.(setTo);
         config = patchConfig(config, { yolo: setTo });
         return setTo;
       }
-      return policy.getYolo();
+      return policy.getYolo?.() ?? config.yolo ?? false;
     },
     onNextPredict: (setTo) => {
       if (setTo !== void 0) {
@@ -14596,7 +15631,7 @@ Restart WrongStack to load or unload plugin code in this session.`;
     setStatuslineHiddenItems,
     getYolo: () => {
       const policy = container.resolve(TOKENS.PermissionPolicy);
-      return policy.getYolo();
+      return policy.getYolo?.() ?? config.yolo ?? false;
     },
     getAutonomy: () => autonomyMode,
     onAutonomy: (setTo) => {