@wrongstack/cli 0.3.1 → 0.3.2

package/dist/index.js

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
-import { color, DefaultPathResolver, Container, DefaultConfigStore, TOKENS, DefaultSecretScrubber, DefaultRetryPolicy, DefaultErrorHandler, DefaultTokenCounter, DefaultModeStore, DefaultSessionStore, DefaultMemoryStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultPermissionPolicy, HybridCompactor, ProviderRegistry, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, Agent, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, makeDirectorSessionFactory, Director, DefaultMultiAgentCoordinator, makeAgentSubagentRunner, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, atomicWrite, AutoApprovePermissionPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, removePlanItem, formatPlan, setPlanItemStatus, addPlanItem, InputBuilder, decryptConfigSecrets, encryptConfigSecrets, DefaultPluginAPI } from '@wrongstack/core';
+import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, SlashCommandRegistry, loadPlugins, createDelegateTool, FLEET_ROSTER, DefaultLogger, DefaultModelsRegistry, DefaultSessionStore, DefaultSkillLoader, ProviderRegistry, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, Agent, makeDirectorSessionFactory, Director, DefaultMultiAgentCoordinator, makeAgentSubagentRunner, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, atomicWrite, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, removePlanItem, formatPlan, setPlanItemStatus, addPlanItem, InputBuilder, decryptConfigSecrets, encryptConfigSecrets, DefaultPluginAPI } from '@wrongstack/core';
 import * as fs3 from 'fs/promises';
 import { WebSocketServer, WebSocket } from 'ws';
 import { writeFileSync } from 'fs';
 import { createRequire } from 'module';
-import * as path13 from 'path';
+import * as path14 from 'path';
 import { MCPRegistry } from '@wrongstack/mcp';
 import { buildProviderFactoriesFromRegistry, makeProviderFromConfig, capabilitiesFor } from '@wrongstack/providers';
+import { createDefaultContainer, routeImagesForModel, readClipboardImage } from '@wrongstack/runtime';
 import { rememberTool, forgetTool } from '@wrongstack/tools';
 import { builtinToolsPack } from '@wrongstack/tools/pack';
 import * as os3 from 'os';
 import * as readline from 'readline';
 import { randomUUID } from 'crypto';
+import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -568,6 +570,216 @@ var init_plugin_api_factory = __esm({
   "src/plugin-api-factory.ts"() {
   }
 });
+async function setupProvider(params) {
+  const { config, modelsRegistry, logger } = params;
+  const savedProviderCfg = config.providers?.[config.provider];
+  let resolvedProvider = await modelsRegistry.getProvider(config.provider).catch(() => void 0);
+  if (!resolvedProvider && savedProviderCfg?.type && savedProviderCfg.type !== config.provider) {
+    resolvedProvider = await modelsRegistry.getProvider(savedProviderCfg.type).catch(() => void 0);
+  }
+  if (!resolvedProvider) {
+    if (!savedProviderCfg?.family) {
+      logger.warn(
+        `Provider "${config.provider}" not found in models.dev. Continuing with raw config.`
+      );
+    }
+  } else if (resolvedProvider.family === "unsupported" && !savedProviderCfg?.family) {
+    throw Object.assign(
+      new Error(
+        `Provider "${config.provider}" uses an unsupported wire family (${resolvedProvider.npm}). Install a plugin to enable it, or pick a different provider.`
+      ),
+      { code: "UNSUPPORTED_PROVIDER" }
+    );
+  }
+  const providerRegistry = new ProviderRegistry();
+  if (config.features.modelsRegistry) {
+    try {
+      const factories = await buildProviderFactoriesFromRegistry({
+        registry: modelsRegistry,
+        log: logger
+      });
+      for (const f of factories) providerRegistry.register(f);
+    } catch (err) {
+      throw new Error(
+        `Failed to load models.dev registry: ${err instanceof Error ? err.message : err}
+Try \`wstack models refresh\` once you have network access, or run with --no-features.`
+      );
+    }
+  }
+  const providerConfig = config.providers?.[config.provider] ?? {
+    type: config.provider,
+    apiKey: config.apiKey,
+    baseUrl: config.baseUrl
+  };
+  let provider;
+  try {
+    const cfgWithType = { ...providerConfig, type: config.provider };
+    if (config.features.modelsRegistry && providerRegistry.has(config.provider)) {
+      provider = providerRegistry.create(cfgWithType);
+    } else {
+      provider = makeProviderFromConfig(config.provider, cfgWithType);
+    }
+  } catch (err) {
+    throw new Error(
+      `Failed to create provider: ${err instanceof Error ? err.message : err}`
+    );
+  }
+  return { resolvedProvider, provider, providerRegistry };
+}
+async function setupSession(params) {
+  const { config, wpaths, projectRoot, cwd, sessionStore, systemPrompt, provider, tokenCounter, renderer, flags, onRecovery } = params;
+  let resumeId = typeof flags["resume"] === "string" ? flags["resume"] : void 0;
+  const recoveryLock = new RecoveryLock({ dir: wpaths.projectSessions, sessionStore });
+  if (!resumeId && !flags["no-recovery"]) {
+    const abandoned = await recoveryLock.checkAbandoned();
+    if (abandoned && abandoned.messageCount > 0) {
+      const choice = await onRecovery(abandoned, !!flags["recover"]);
+      if (choice === "resume") resumeId = abandoned.sessionId;
+      else if (choice === "delete") {
+        await sessionStore.delete(abandoned.sessionId).catch(() => void 0);
+        await recoveryLock.clear();
+      } else await recoveryLock.clear();
+    } else if (abandoned) {
+      await sessionStore.delete(abandoned.sessionId).catch(() => void 0);
+      await recoveryLock.clear();
+    }
+  }
+  let session;
+  let restoredMessages = [];
+  if (resumeId) {
+    try {
+      const resumed = await sessionStore.resume(resumeId);
+      session = resumed.writer;
+      restoredMessages = resumed.data.messages;
+      renderer.writeInfo(`Resumed session ${resumed.data.metadata.id} \u2014 ${restoredMessages.length} messages, ${resumed.data.usage.input + resumed.data.usage.output} tokens used previously.`);
+    } catch (err) {
+      renderer.writeError(`Resume failed: ${err instanceof Error ? err.message : String(err)}`);
+      throw Object.assign(new Error("RESUME_FAILED"), { exitCode: 2 });
+    }
+  } else {
+    session = await sessionStore.create({ id: "", title: "", model: config.model, provider: config.provider });
+  }
+  const sessionRef = { current: session };
+  await recoveryLock.write(session.id).catch(() => void 0);
+  const attachments = new DefaultAttachmentStore({ spoolDir: path14.join(wpaths.projectSessions, session.id, "attachments") });
+  const queueStore = new QueueStore({ dir: path14.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 = path14.join(wpaths.projectSessions, `${session.id}.todos.json`);
+  if (resumeId) {
+    try {
+      const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
+      if (restoredTodos && restoredTodos.length > 0) {
+        context.state.replaceTodos(restoredTodos);
+        renderer.writeInfo(`Restored ${restoredTodos.length} todo${restoredTodos.length === 1 ? "" : "s"} from previous run.`);
+      }
+    } catch {
+    }
+  }
+  const detachTodosCheckpoint = attachTodosCheckpoint(context.state, todosCheckpointPath, session.id);
+  const planPath = path14.join(wpaths.projectSessions, `${session.id}.plan.json`);
+  context.state.setMeta("plan.path", planPath);
+  if (resumeId) {
+    try {
+      const fleetRoot = path14.join(wpaths.projectSessions, session.id);
+      const dirState = await loadDirectorState(path14.join(fleetRoot, "director-state.json"));
+      if (dirState) {
+        const tCounts = {};
+        for (const t of dirState.tasks) tCounts[t.status] = (tCounts[t.status] ?? 0) + 1;
+        const summary = Object.entries(tCounts).map(([k, v]) => `${v} ${k}`).join(", ");
+        renderer.writeInfo(`Prior fleet state: ${dirState.subagents.length} subagent${dirState.subagents.length === 1 ? "" : "s"}, tasks ${summary || "(none)"}.`);
+      }
+    } catch {
+    }
+    try {
+      const plan = await loadPlan(planPath);
+      if (plan && plan.items.length > 0) {
+        const open = plan.items.filter((p) => p.status !== "done").length;
+        const done = plan.items.length - open;
+        renderer.writeInfo(`Plan: ${plan.items.length} item${plan.items.length === 1 ? "" : "s"} (${open} open, ${done} done). Use /plan to review.`);
+      }
+    } catch {
+    }
+  }
+  return { session, sessionRef, context, restoredMessages, attachments, recoveryLock, queueStore, planPath, detachTodosCheckpoint };
+}
+function setupPipelines(params) {
+  const { events, logger } = params;
+  const pipelines = createDefaultPipelines();
+  const installBoundary = (p) => {
+    p.setErrorHandler((ev) => {
+      const fromPlugin = !!ev.owner && ev.owner !== "core";
+      logger.error(
+        `Pipeline middleware "${ev.middleware}" crashed (owner=${ev.owner ?? "unknown"}); ${fromPlugin ? "swallowed" : "rethrown"}`,
+        ev.err
+      );
+      events.emit("error", {
+        err: ev.err instanceof Error ? ev.err : new Error(String(ev.err)),
+        phase: `pipeline:${ev.middleware}`
+      });
+      return fromPlugin ? "swallow" : "rethrow";
+    });
+  };
+  installBoundary(pipelines.request);
+  installBoundary(pipelines.response);
+  installBoundary(pipelines.toolCall);
+  installBoundary(pipelines.userInput);
+  installBoundary(pipelines.assistantOutput);
+  installBoundary(pipelines.contextWindow);
+  return pipelines;
+}
+async function setupCompaction(params) {
+  const { compactor, events, modelsRegistry, context, config, provider, pipelines } = params;
+  const resolvedCaps = await capabilitiesFor(modelsRegistry, provider.id, context.model).catch(() => void 0);
+  const effectiveMaxContext = config.context.effectiveMaxContext ?? resolvedCaps?.maxContext ?? provider.capabilities.maxContext;
+  if (config.context.autoCompact !== false) {
+    const autoCompactor = new AutoCompactionMiddleware(
+      compactor,
+      effectiveMaxContext,
+      (ctx) => {
+        let total = 0;
+        for (const m of ctx.messages) {
+          if (typeof m.content === "string") {
+            total += Math.ceil(m.content.length / 4);
+          } else if (Array.isArray(m.content)) {
+            for (const b of m.content) {
+              if (b.type === "text") {
+                total += Math.ceil(b.text.length / 4);
+              } else if (b.type === "tool_use" || b.type === "tool_result") {
+                total += Math.ceil(JSON.stringify(b).length / 4);
+              }
+            }
+          }
+        }
+        return total;
+      },
+      {
+        warn: config.context.warnThreshold,
+        soft: config.context.softThreshold,
+        hard: config.context.hardThreshold
+      },
+      { aggressiveOn: "soft", failureMode: "throw_on_hard", events }
+    );
+    pipelines.contextWindow.use({ name: "AutoCompaction", handler: autoCompactor.handler() });
+  }
+  return effectiveMaxContext;
+}
+function createAgent(params) {
+  return new Agent({
+    container: params.container,
+    tools: params.tools,
+    providers: params.providers,
+    events: params.events,
+    pipelines: params.pipelines,
+    context: params.context,
+    maxIterations: params.config.tools.maxIterations,
+    iterationTimeoutMs: params.config.tools.iterationTimeoutMs,
+    executionStrategy: params.config.tools.defaultExecutionStrategy,
+    perIterationOutputCapBytes: params.config.tools.perIterationOutputCapBytes,
+    confirmAwaiter: params.confirmAwaiter
+  });
+}
 
 // src/arg-parser.ts
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
@@ -693,7 +905,7 @@ function parseSpawnFlags(input) {
   return { description: rest.trim(), opts };
 }
 async function bootConfig(flags) {
-  const cwd = typeof flags["cwd"] === "string" ? path13.resolve(flags["cwd"]) : process.cwd();
+  const cwd = typeof flags["cwd"] === "string" ? path14.resolve(flags["cwd"]) : process.cwd();
   const pathResolver = new DefaultPathResolver(cwd);
   const projectRoot = pathResolver.projectRoot;
   const userHome = os3.homedir();
@@ -760,7 +972,7 @@ var ReadlineInputReader = class {
   history = [];
   pending = false;
   constructor(opts = {}) {
-    this.historyFile = opts.historyFile ?? path13.join(os3.homedir(), ".wrongstack", "history");
+    this.historyFile = opts.historyFile ?? path14.join(os3.homedir(), ".wrongstack", "history");
   }
   async loadHistory() {
     try {
@@ -772,7 +984,7 @@ var ReadlineInputReader = class {
   }
   async saveHistory() {
     try {
-      await fs3.mkdir(path13.dirname(this.historyFile), { recursive: true });
+      await fs3.mkdir(path14.dirname(this.historyFile), { recursive: true });
       await fs3.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
     } catch {
     }
@@ -1228,7 +1440,7 @@ async function saveToGlobalConfig(configPath, provider, model) {
 async function detectProjectFacts(root) {
   const facts = { hints: [] };
   try {
-    const pkg = JSON.parse(await fs3.readFile(path13.join(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(await fs3.readFile(path14.join(root, "package.json"), "utf8"));
     const scripts = pkg.scripts ?? {};
     const pm = (pkg.packageManager ?? "npm").split("@")[0] ?? "npm";
     if (scripts["build"]) facts.build = `${pm} run build`;
@@ -1240,28 +1452,28 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    await fs3.access(path13.join(root, "pyproject.toml"));
+    await fs3.access(path14.join(root, "pyproject.toml"));
     facts.test ??= "pytest";
     facts.lint ??= "ruff check .";
     facts.hints.push("pyproject.toml");
   } catch {
   }
   try {
-    await fs3.access(path13.join(root, "go.mod"));
+    await fs3.access(path14.join(root, "go.mod"));
     facts.build ??= "go build ./...";
     facts.test ??= "go test ./...";
     facts.hints.push("go.mod");
   } catch {
   }
   try {
-    await fs3.access(path13.join(root, "Cargo.toml"));
+    await fs3.access(path14.join(root, "Cargo.toml"));
     facts.build ??= "cargo build";
     facts.test ??= "cargo test";
     facts.hints.push("Cargo.toml");
   } catch {
   }
   try {
-    await fs3.access(path13.join(root, "Makefile"));
+    await fs3.access(path14.join(root, "Makefile"));
     facts.build ??= "make";
     facts.test ??= "make test";
     facts.hints.push("Makefile");
@@ -1398,7 +1610,9 @@ function buildCompactCommand(opts) {
       }
       const aggressive = args.trim() === "aggressive";
       const report = await opts.compactor.compact(ctx, { aggressive });
-      const msg = `Compaction: ${report.before} \u2192 ${report.after} tokens (${report.reductions.map((r) => `${r.phase}: ${r.saved}`).join(", ")})`;
+      const reductions = report.reductions.map((r) => `${r.phase}: ${r.saved}`).join(", ");
+      const repaired = report.repaired ? `; repaired ${report.repaired.removedToolUses.length} tool_use, ${report.repaired.removedToolResults.length} tool_result, ${report.repaired.removedMessages} empty messages` : "";
+      const msg = `Compaction: ${report.before} -> ${report.after} tokens (${reductions})${repaired}`;
       opts.renderer.writeInfo(msg);
       return { message: msg };
     }
@@ -1412,15 +1626,68 @@ function buildContextCommand(opts) {
     help: [
       "Usage:",
       "  /context           Show counts: messages, est. tokens, tool calls, todos, read files.",
-      "  /context detail    As above, plus model, cwd, projectRoot, and the file list."
+      "  /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 mode      List context-window modes.",
+      "  /context mode <id> Switch context-window mode for this session."
     ].join("\n"),
     async run(args, ctx) {
+      const trimmed = args.trim();
+      if (trimmed === "mode" || trimmed === "modes") {
+        const active = readPolicy(ctx)?.id ?? "balanced";
+        const msg2 = `${color.bold("Context Window Modes")}
+${formatContextWindowModeList(active)}`;
+        opts.renderer.write(`${msg2}
+`);
+        return { message: msg2 };
+      }
+      if (trimmed === "repair") {
+        const before = ctx.messages.length;
+        const repaired = repairToolUseAdjacency(ctx.messages);
+        if (repaired.report.changed) {
+          ctx.state.replaceMessages(repaired.messages);
+        }
+        const msg2 = repaired.report.changed ? [
+          `${color.green("Context repaired")}`,
+          `  messages:     ${before} -> ${ctx.messages.length}`,
+          `  tool_use:     removed ${repaired.report.removedToolUses.length}`,
+          `  tool_result:  removed ${repaired.report.removedToolResults.length}`,
+          `  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.startsWith("mode ")) {
+        const id = trimmed.slice("mode ".length).trim();
+        const mode = getContextWindowMode(id);
+        if (!mode) {
+          const msg3 = `Unknown context mode "${id}". Use /context mode to list modes.`;
+          opts.renderer.write(`${color.red(msg3)}
+`);
+          return { message: msg3 };
+        }
+        const policy2 = resolveContextWindowPolicy({}, mode.id);
+        ctx.meta["contextWindowMode"] = policy2.id;
+        ctx.meta["contextWindowPolicy"] = policy2;
+        const msg2 = [
+          `${color.green("Context mode set:")} ${policy2.id} (${policy2.name})`,
+          `  thresholds: warn ${pct(policy2.thresholds.warn)}, soft ${pct(policy2.thresholds.soft)}, hard ${pct(policy2.thresholds.hard)}`,
+          `  preserve:   last ${policy2.preserveK} user/assistant messages`,
+          `  elide:      old tool results >= ${policy2.eliseThreshold.toLocaleString()} tokens`
+        ].join("\n");
+        opts.renderer.write(`${msg2}
+`);
+        return { message: msg2 };
+      }
       const messages = ctx.messages;
-      const detailed = args.trim() === "detail";
+      const detailed = trimmed === "detail";
+      const policy = readPolicy(ctx);
       const lines = [
         `${color.bold("Context Window")}`,
         `  messages:    ${messages.length} total (${countTurnPairs(messages)} user+assistant pairs)`,
-        `  tokens (\u2248):  ${estimateTokens(messages).toLocaleString()} (chars \xF7 4 estimate)`,
+        `  tokens (est): ${estimateTokens(messages).toLocaleString()} (chars / 4 estimate)`,
+        `  mode:        ${policy ? `${policy.id} (${policy.name})` : "balanced"}`,
         `  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`,
@@ -1428,6 +1695,7 @@ function buildContextCommand(opts) {
       ];
       if (detailed) {
         lines.push(
+          `  thresholds:  warn ${pct(policy?.thresholds.warn ?? 0.6)}, soft ${pct(policy?.thresholds.soft ?? 0.75)}, hard ${pct(policy?.thresholds.hard ?? 0.9)}`,
           `  model:       ${ctx.model}`,
           `  cwd:         ${ctx.cwd}`,
           `  projectRoot: ${ctx.projectRoot}`,
@@ -1442,6 +1710,13 @@ function buildContextCommand(opts) {
     }
   };
 }
+function readPolicy(ctx) {
+  const policy = ctx.meta?.["contextWindowPolicy"];
+  return policy && typeof policy === "object" ? policy : null;
+}
+function pct(n) {
+  return `${Math.round(n * 100)}%`;
+}
 
 // src/slash-commands/diag-stats.ts
 function buildDiagCommand(opts) {
@@ -1643,8 +1918,8 @@ function buildInitCommand(opts) {
     description: "Scaffold .wrongstack/AGENTS.md in the current project.",
     async run(args, ctx) {
       const force = args.trim() === "--force";
-      const dir = path13.join(ctx.projectRoot, ".wrongstack");
-      const file = path13.join(dir, "AGENTS.md");
+      const dir = path14.join(ctx.projectRoot, ".wrongstack");
+      const file = path14.join(dir, "AGENTS.md");
       try {
         await fs3.access(file);
         if (!force) {
@@ -2043,13 +2318,13 @@ var MANIFESTS = [
 ];
 async function detectProjectKind(projectRoot) {
   try {
-    await fs3.access(path13.join(projectRoot, ".wrongstack", "AGENTS.md"));
+    await fs3.access(path14.join(projectRoot, ".wrongstack", "AGENTS.md"));
     return "initialized";
   } catch {
   }
   for (const m of MANIFESTS) {
     try {
-      await fs3.access(path13.join(projectRoot, m));
+      await fs3.access(path14.join(projectRoot, m));
       return "project";
     } catch {
     }
@@ -2057,8 +2332,8 @@ async function detectProjectKind(projectRoot) {
   return "empty";
 }
 async function scaffoldAgentsMd(projectRoot) {
-  const dir = path13.join(projectRoot, ".wrongstack");
-  const file = path13.join(dir, "AGENTS.md");
+  const dir = path14.join(projectRoot, ".wrongstack");
+  const file = path14.join(dir, "AGENTS.md");
   const facts = await detectProjectFacts(projectRoot);
   const body = renderAgentsTemplate(facts);
   await fs3.mkdir(dir, { recursive: true });
@@ -2071,7 +2346,7 @@ async function runProjectCheck(opts) {
   if (kind === "initialized") {
     renderer.write(
       `
-  ${color.green("\u2713")} Project initialized ${color.dim(`(${path13.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
+  ${color.green("\u2713")} Project initialized ${color.dim(`(${path14.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
 `
     );
     return true;
@@ -2367,14 +2642,14 @@ function summarize(value, name) {
   if (typeof v === "object" && v !== null) {
     const o = v;
     if (name === "edit") {
-      const path14 = typeof o["path"] === "string" ? o["path"] : "";
+      const path15 = typeof o["path"] === "string" ? o["path"] : "";
       const reps = typeof o["replacements"] === "number" ? o["replacements"] : 0;
-      return `${path14}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
+      return `${path15}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
     }
     if (name === "write") {
-      const path14 = typeof o["path"] === "string" ? o["path"] : "";
+      const path15 = typeof o["path"] === "string" ? o["path"] : "";
       const bytes = typeof o["bytes"] === "number" ? o["bytes"] : void 0;
-      return bytes !== void 0 ? `${path14}  ${bytes}B` : path14;
+      return bytes !== void 0 ? `${path15}  ${bytes}B` : path15;
     }
     if (typeof o["count"] === "number") {
       return `${o["count"]} match${o["count"] === 1 ? "" : "es"}`;
@@ -3137,7 +3412,7 @@ var doctorCmd = async (_args, deps) => {
   }
   try {
     await fs3.mkdir(deps.paths.projectSessions, { recursive: true });
-    const probe = path13.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
+    const probe = path14.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
     await fs3.writeFile(probe, "");
     await fs3.unlink(probe);
     checks.push({ name: "sessions writable", status: "ok", detail: deps.paths.projectSessions });
@@ -3240,8 +3515,8 @@ var exportCmd = async (args, deps) => {
     return 1;
   }
   if (output) {
-    await fs3.mkdir(path13.dirname(path13.resolve(deps.cwd, output)), { recursive: true });
-    await fs3.writeFile(path13.resolve(deps.cwd, output), rendered, "utf8");
+    await fs3.mkdir(path14.dirname(path14.resolve(deps.cwd, output)), { recursive: true });
+    await fs3.writeFile(path14.resolve(deps.cwd, output), rendered, "utf8");
     deps.renderer.write(`Wrote ${rendered.length} bytes to ${output}
 `);
   } else {
@@ -3302,8 +3577,8 @@ var initCmd = async (_args, deps) => {
   const config = { version: 1, provider: providerId, model: modelId };
   if (apiKey) config.apiKey = apiKey;
   await atomicWrite(deps.paths.globalConfig, JSON.stringify(config, null, 2));
-  await fs3.mkdir(path13.join(deps.projectRoot, ".wrongstack"), { recursive: true });
-  const agentsFile = path13.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
+  await fs3.mkdir(path14.join(deps.projectRoot, ".wrongstack"), { recursive: true });
+  const agentsFile = path14.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
   try {
     await fs3.access(agentsFile);
   } catch {
@@ -3317,86 +3592,7 @@ var initCmd = async (_args, deps) => {
   deps.renderer.writeInfo('Try: wstack "<task>"  or  wstack');
   return 0;
 };
-var BUILT_IN_MCP = {
-  filesystem: {
-    name: "filesystem",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-filesystem", "."],
-    permission: "confirm",
-    description: "Read, write, and navigate the local filesystem"
-  },
-  github: {
-    name: "github",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-github"],
-    permission: "confirm",
-    description: "GitHub API \u2014 issues, PRs, repos, search"
-  },
-  context7: {
-    name: "context7",
-    transport: "streamable-http",
-    url: "https://server.context7.ai/mcp",
-    permission: "confirm",
-    description: "Codebase-aware documentation and Q&A"
-  },
-  "brave-search": {
-    name: "brave-search",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-brave-search"],
-    permission: "confirm",
-    description: "Web search (Brave)"
-  },
-  block: {
-    name: "block",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-block"],
-    permission: "confirm",
-    description: "Postgres database via SQL"
-  },
-  everart: {
-    name: "everart",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-everart"],
-    permission: "confirm",
-    description: "AI image generation"
-  },
-  slack: {
-    name: "slack",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-slack"],
-    permission: "confirm",
-    description: "Slack messaging & channels"
-  },
-  aws: {
-    name: "aws",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-aws"],
-    permission: "confirm",
-    description: "AWS \u2014 EC2, S3, Lambda, IAM"
-  },
-  "google-maps": {
-    name: "google-maps",
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-google-maps"],
-    permission: "confirm",
-    description: "Google Maps \u2014 directions, geocoding, places"
-  },
-  sentinel: {
-    name: "sentinel",
-    transport: "streamable-http",
-    url: "https://mcp.sentinel.ai",
-    permission: "deny",
-    description: "Security vulnerability scanning"
-  }
-};
+var BUILT_IN_MCP = allServers();
 var mcpCmd = async (args, deps) => {
   const sub = args[0];
   if (!sub || sub === "list") {
@@ -3459,7 +3655,7 @@ async function addMcpServer(args, deps) {
     return 1;
   }
   const serverCfg = { ...factory };
-  if (!enable) serverCfg.enabled = false;
+  serverCfg.enabled = enable;
   let existing = {};
   try {
     existing = JSON.parse(await fs3.readFile(deps.paths.globalConfig, "utf8"));
@@ -3531,7 +3727,7 @@ var usageCmd = async (_args, deps) => {
   return 0;
 };
 var projectsCmd = async (_args, deps) => {
-  const projectsRoot = path13.join(deps.paths.globalRoot, "projects");
+  const projectsRoot = path14.join(deps.paths.globalRoot, "projects");
   try {
     const entries = await fs3.readdir(projectsRoot);
     if (entries.length === 0) {
@@ -3541,7 +3737,7 @@ var projectsCmd = async (_args, deps) => {
     for (const hash of entries) {
       try {
         const meta = JSON.parse(
-          await fs3.readFile(path13.join(projectsRoot, hash, "meta.json"), "utf8")
+          await fs3.readFile(path14.join(projectsRoot, hash, "meta.json"), "utf8")
         );
         deps.renderer.write(
           `  ${color.dim(hash)}  ${color.dim(meta.lastSeen ?? "")}  ${meta.root ?? "?"}
@@ -3839,7 +4035,7 @@ function resolveBundledSkillsDir() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path13.join(path13.dirname(corePkg), "skills");
+    return path14.join(path14.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -4008,6 +4204,10 @@ async function runRepl(opts) {
         continue;
       }
       interrupts = 0;
+      if (trimmed === "/image" || trimmed === "/paste-image" || raw === "\x1Bv") {
+        await pasteClipboardImage(builder, opts);
+        continue;
+      }
       if (trimmed.startsWith("/")) {
         try {
           const res = await opts.slashRegistry.dispatch(trimmed, opts.agent.ctx);
@@ -4032,7 +4232,23 @@ async function runRepl(opts) {
         const startedAt = Date.now();
         const before = opts.tokenCounter?.total();
         const costBefore = opts.tokenCounter?.estimateCost().total ?? 0;
-        const result = await opts.agent.run(blocks, { signal: runCtrl.signal });
+        const routed = blocks.some((block) => block.type === "image") ? await routeImagesForModel(blocks, {
+          supportsVision: opts.supportsVision ? await opts.supportsVision() : opts.agent.ctx.provider.capabilities.vision,
+          adapters: opts.visionAdapters ?? [],
+          ctx: opts.agent.ctx,
+          signal: runCtrl.signal,
+          providerId: opts.agent.ctx.provider.id,
+          model: opts.agent.ctx.model
+        }) : { blocks, route: "none", convertedImages: 0 };
+        if (routed.route === "adapter") {
+          opts.renderer.write(
+            color.dim(
+              `  \u21B3 image analyzed via ${routed.adapterName ?? "vision adapter"} (${routed.convertedImages} image${routed.convertedImages === 1 ? "" : "s"})
+`
+            )
+          );
+        }
+        const result = await opts.agent.run(routed.blocks, { signal: runCtrl.signal });
         if (result.status === "aborted") {
           opts.renderer.writeWarning("Aborted.");
         } else if (result.status === "failed") {
@@ -4071,6 +4287,23 @@ ${color.dim(
     });
   }
 }
+async function pasteClipboardImage(builder, opts) {
+  try {
+    const img = await readClipboardImage();
+    if (!img) {
+      opts.renderer.write(color.dim("  no image on clipboard\n"));
+      return;
+    }
+    const placeholder = await builder.appendImage(img.base64, img.mediaType);
+    const kb = (img.bytes / 1024).toFixed(0);
+    opts.renderer.write(color.dim(`  \u21B3 ${placeholder} (PNG ${kb}KB)
+`));
+  } catch (err) {
+    opts.renderer.writeError(
+      `Clipboard image error: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+}
 async function readPossiblyMultiline(opts) {
   const firstPrompt = theme2.primary("\u203A ");
   const contPrompt = color.dim("\xB7 ");
@@ -4096,9 +4329,9 @@ var FILLED = "\u2588";
 var EMPTY = "\u2591";
 function renderContextChip(used, max) {
   const ratio = Math.max(0, Math.min(1, used / max));
-  const pct = Math.round(ratio * 100);
+  const pct2 = Math.round(ratio * 100);
   const bar = renderProgress(ratio, 6);
-  return `${bar} ${pct}% (${fmtTok(used)}/${fmtTok(max)})`;
+  return `${bar} ${pct2}% (${fmtTok(used)}/${fmtTok(max)})`;
 }
 function renderProgress(ratio, width) {
   const clamped = Math.max(0, Math.min(1, ratio));
@@ -4142,6 +4375,7 @@ async function execute(deps) {
     queueStore,
     context,
     stats,
+    detachTodosCheckpoint,
     savedProviderCfg,
     resolvedProvider,
     getPickableProviders,
@@ -4152,6 +4386,15 @@ async function execute(deps) {
   } = deps;
   let code = 0;
   try {
+    const visionAdapters = () => createToolVisionAdapters(agent.tools);
+    const supportsVision = async () => {
+      try {
+        const caps = await capabilitiesFor(modelsRegistry, context.provider.id, context.model);
+        return caps.vision;
+      } catch {
+        return context.provider.capabilities.vision;
+      }
+    };
     const promptFlag = typeof flags["prompt"] === "string" ? flags["prompt"] : void 0;
     if (promptFlag) {
       positional.unshift(promptFlag);
@@ -4236,6 +4479,8 @@ async function execute(deps) {
           slashRegistry,
           attachments,
           tokenCounter,
+          visionAdapters,
+          supportsVision,
           model: context.model,
           banner: !flags["no-banner"],
           queueStore,
@@ -4287,9 +4532,11 @@ async function execute(deps) {
         reader,
         slashRegistry,
         tokenCounter,
+        visionAdapters,
+        supportsVision,
         attachments,
         effectiveMaxContext,
-        projectName: path13.basename(projectRoot) || void 0
+        projectName: path14.basename(projectRoot) || void 0
       });
       await webuiPromise;
     } else {
@@ -4299,13 +4546,16 @@ async function execute(deps) {
         reader,
         slashRegistry,
         tokenCounter,
+        visionAdapters,
+        supportsVision,
         attachments,
         effectiveMaxContext,
-        projectName: path13.basename(projectRoot) || void 0
+        projectName: path14.basename(projectRoot) || void 0
       });
     }
   } finally {
     stats.render(renderer);
+    await Promise.resolve(detachTodosCheckpoint?.()).catch(() => void 0);
     await mcpRegistry.stopAll();
     await session.append({
       type: "session_end",
@@ -4558,7 +4808,7 @@ var MultiAgentHost = class {
       model: opts?.model,
       tools: opts?.tools
     };
-    const transcriptPath = this.sessionFactory ? path13.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
+    const transcriptPath = this.sessionFactory ? path14.join(this.sessionFactory.dir, `${subagentConfig.name}.jsonl`) : void 0;
     if (this.director) {
       const subagentId = await this.director.spawn(subagentConfig);
       const taskId2 = randomUUID();
@@ -4710,16 +4960,16 @@ var MultiAgentHost = class {
     }
     this.opts.directorMode = true;
     if (this.opts.fleetRoot && !this.opts.manifestPath) {
-      this.opts.manifestPath = path13.join(this.opts.fleetRoot, "fleet.json");
+      this.opts.manifestPath = path14.join(this.opts.fleetRoot, "fleet.json");
     }
     if (this.opts.fleetRoot && !this.opts.sharedScratchpadPath) {
-      this.opts.sharedScratchpadPath = path13.join(this.opts.fleetRoot, "shared");
+      this.opts.sharedScratchpadPath = path14.join(this.opts.fleetRoot, "shared");
     }
     if (this.opts.fleetRoot && !this.opts.sessionsRoot) {
-      this.opts.sessionsRoot = path13.join(this.opts.fleetRoot, "subagents");
+      this.opts.sessionsRoot = path14.join(this.opts.fleetRoot, "subagents");
     }
     if (this.opts.fleetRoot && !this.opts.stateCheckpointPath) {
-      this.opts.stateCheckpointPath = path13.join(this.opts.fleetRoot, "director-state.json");
+      this.opts.stateCheckpointPath = path14.join(this.opts.fleetRoot, "director-state.json");
     }
     await this.ensureDirector();
     return this.director ?? null;
@@ -4839,11 +5089,11 @@ var SessionStats = class {
       if (e.name === "bash") this.bashCommands++;
       else if (e.name === "fetch") this.fetches++;
       if (!e.ok) return;
-      const path14 = typeof input?.path === "string" ? input.path : void 0;
-      if (e.name === "read" && path14) this.readPaths.add(path14);
-      else if (e.name === "edit" && path14) this.editedPaths.add(path14);
-      else if (e.name === "write" && path14) {
-        this.writtenPaths.add(path14);
+      const path15 = typeof input?.path === "string" ? input.path : void 0;
+      if (e.name === "read" && path15) this.readPaths.add(path15);
+      else if (e.name === "edit" && path15) this.editedPaths.add(path15);
+      else if (e.name === "write" && path15) {
+        this.writtenPaths.add(path15);
         const content = typeof input?.content === "string" ? input.content : "";
         this.bytesWritten += Buffer.byteLength(content, "utf8");
       }
@@ -4880,9 +5130,9 @@ var SessionStats = class {
     );
     const cache = this.tokenCounter.cacheStats();
     if (cache.readTokens > 0 || cache.writeTokens > 0) {
-      const pct = (cache.hitRatio * 100).toFixed(1);
+      const pct2 = (cache.hitRatio * 100).toFixed(1);
       lines.push(
-        `  Prompt cache:  ${pct}% hit  ${color.dim(`(${fmtTok(cache.readTokens)} read / ${fmtTok(cache.writeTokens)} write)`)}`
+        `  Prompt cache:  ${pct2}% hit  ${color.dim(`(${fmtTok(cache.readTokens)} read / ${fmtTok(cache.writeTokens)} write)`)}`
       );
     }
     if (cost.total > 0) {
@@ -5009,10 +5259,10 @@ var Spinner = class {
 };
 function renderContextChip2(ctx) {
   const ratio = Math.max(0, Math.min(1, ctx.used / ctx.max));
-  const pct = Math.round(ratio * 100);
+  const pct2 = Math.round(ratio * 100);
   const chipColor = ratio >= 0.85 ? color.red : ratio >= 0.65 ? color.yellow : color.cyan;
   const bar = renderProgress2(ratio, 8);
-  return color.dim("ctx ") + chipColor(bar) + chipColor(` ${pct}%`) + color.dim(` (${fmtTok(ctx.used)}/${fmtTok(ctx.max)})`);
+  return color.dim("ctx ") + chipColor(bar) + chipColor(` ${pct2}%`) + color.dim(` (${fmtTok(ctx.used)}/${fmtTok(ctx.max)})`);
 }
 function renderProgress2(ratio, width) {
   const clamped = Math.max(0, Math.min(1, ratio));
@@ -5026,7 +5276,7 @@ function resolveBundledSkillsDir2() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path13.join(path13.dirname(corePkg), "skills");
+    return path14.join(path14.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -5049,52 +5299,35 @@ async function main(argv) {
     logger
   } = ctx;
   const pathResolver = new DefaultPathResolver(cwd);
-  const savedProviderCfg = config.providers?.[config.provider];
-  let resolvedProvider = await modelsRegistry.getProvider(config.provider).catch(() => void 0);
-  if (!resolvedProvider && savedProviderCfg?.type && savedProviderCfg.type !== config.provider) {
-    resolvedProvider = await modelsRegistry.getProvider(savedProviderCfg.type).catch(() => void 0);
-  }
-  if (!resolvedProvider) {
-    if (!savedProviderCfg?.family) {
-      logger.warn(
-        `Provider "${config.provider}" not found in models.dev. Continuing with raw config.`
-      );
-    }
-  } else if (resolvedProvider.family === "unsupported" && !savedProviderCfg?.family) {
-    process.stderr.write(
-      `Provider "${config.provider}" uses an unsupported wire family (${resolvedProvider.npm}). Install a plugin to enable it, or pick a different provider.
-`
-    );
+  const container = createDefaultContainer({
+    config,
+    wpaths,
+    logger,
+    modelsRegistry,
+    permission: { yolo: config.yolo, promptDelegate: makePromptDelegate(reader) },
+    compactor: { preserveK: config.context.preserveK, eliseThreshold: config.context.eliseThreshold },
+    bundledSkillsDir: config.features.skills ? resolveBundledSkillsDir2() : void 0
+  });
+  const configStore = container.resolve(TOKENS.ConfigStore);
+  container.bind(TOKENS.PathResolver, () => pathResolver);
+  container.bind(TOKENS.Renderer, () => renderer);
+  container.bind(TOKENS.InputReader, () => reader);
+  const modeStore = container.resolve(TOKENS.ModeStore);
+  const activeMode = await modeStore.getActiveMode();
+  let resolvedProvider;
+  let providerRegistry;
+  let provider;
+  try {
+    const result = await setupProvider({ config, modelsRegistry, logger });
+    resolvedProvider = result.resolvedProvider;
+    providerRegistry = result.providerRegistry;
+    provider = result.provider;
+  } catch (err) {
+    process.stderr.write(`${err instanceof Error ? err.message : err}
+`);
     await reader.close();
     return 2;
   }
-  const container = new Container();
-  const configStore = new DefaultConfigStore(config);
-  container.bind(TOKENS.ConfigStore, () => configStore);
-  container.bind(TOKENS.Logger, () => logger);
-  container.bind(TOKENS.PathResolver, () => pathResolver);
-  container.bind(TOKENS.SecretScrubber, () => new DefaultSecretScrubber());
-  container.bind(TOKENS.RetryPolicy, () => new DefaultRetryPolicy());
-  container.bind(TOKENS.ErrorHandler, () => new DefaultErrorHandler());
-  container.bind(TOKENS.ModelsRegistry, () => modelsRegistry);
-  container.bind(
-    TOKENS.TokenCounter,
-    () => new DefaultTokenCounter({ registry: modelsRegistry, providerId: config.provider })
-  );
-  const modeStore = new DefaultModeStore({ directory: wpaths.configDir });
-  container.bind(TOKENS.ModeStore, () => modeStore);
-  container.bind(
-    TOKENS.SessionStore,
-    () => new DefaultSessionStore({ dir: wpaths.projectSessions })
-  );
-  const memoryStore = new DefaultMemoryStore({ paths: wpaths });
-  container.bind(TOKENS.MemoryStore, () => memoryStore);
-  const skillLoader = new DefaultSkillLoader({
-    paths: wpaths,
-    bundledDir: config.features.skills ? resolveBundledSkillsDir2() : void 0
-  });
-  container.bind(TOKENS.SkillLoader, () => skillLoader);
-  const activeMode = await modeStore.getActiveMode();
   const modeId = activeMode?.id ?? "default";
   const modePrompt = activeMode?.prompt ?? "";
   const resolvedModel = await modelsRegistry.getModel(config.provider, config.model);
@@ -5104,6 +5337,8 @@ async function main(argv) {
     supportsVision: resolvedModel.capabilities.vision,
     supportsReasoning: resolvedModel.capabilities.reasoning
   } : void 0;
+  const memoryStore = container.resolve(TOKENS.MemoryStore);
+  const skillLoader = container.resolve(TOKENS.SkillLoader);
   const sessionRef = {};
   container.bind(
     TOKENS.SystemPromptBuilder,
@@ -5114,46 +5349,9 @@ async function main(argv) {
       modeId,
       modePrompt,
       modelCapabilities,
-      // Reads the ref each time — returns undefined until the session
-      // is created, then resolves to the per-session plan JSON path.
-      planPath: () => sessionRef.current ? path13.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
-    })
-  );
-  container.bind(TOKENS.Renderer, () => renderer);
-  container.bind(TOKENS.InputReader, () => reader);
-  container.bind(
-    TOKENS.PermissionPolicy,
-    () => new DefaultPermissionPolicy({
-      trustFile: wpaths.projectTrust,
-      yolo: config.yolo,
-      promptDelegate: makePromptDelegate(reader)
-    })
-  );
-  container.bind(
-    TOKENS.Compactor,
-    () => new HybridCompactor({
-      preserveK: config.context.preserveK,
-      eliseThreshold: config.context.eliseThreshold
+      planPath: () => sessionRef.current ? path14.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
     })
   );
-  const providerRegistry = new ProviderRegistry();
-  if (config.features.modelsRegistry) {
-    try {
-      const factories = await buildProviderFactoriesFromRegistry({
-        registry: modelsRegistry,
-        log: logger
-      });
-      for (const f of factories) providerRegistry.register(f);
-    } catch (err) {
-      process.stderr.write(
-        `Failed to load models.dev registry: ${err instanceof Error ? err.message : err}
-Try \`wstack models refresh\` once you have network access, or run with --no-features.
-`
-      );
-      await reader.close();
-      return 2;
-    }
-  }
   const toolRegistry = new ToolRegistry();
   toolRegistry.registerAllOrThrow([...builtinToolsPack.tools ?? []], builtinToolsPack.name);
   toolRegistry.registerDefault(
@@ -5196,7 +5394,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     const dumpMetrics = () => {
       if (!metricsSink) return;
       try {
-        const out = path13.join(wpaths.projectSessions, "metrics.json");
+        const out = path14.join(wpaths.projectSessions, "metrics.json");
         const snap = metricsSink.snapshot();
         writeFileSync(out, JSON.stringify(snap, null, 2));
       } catch {
@@ -5281,27 +5479,6 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     process.stderr.write(color.red(`  \u2717 ${p.description}
 `));
   });
-  const providerConfig = config.providers?.[config.provider] ?? {
-    type: config.provider,
-    apiKey: config.apiKey,
-    baseUrl: config.baseUrl
-  };
-  let provider;
-  try {
-    const cfgWithType = { ...providerConfig, type: config.provider };
-    if (config.features.modelsRegistry && providerRegistry.has(config.provider)) {
-      provider = providerRegistry.create(cfgWithType);
-    } else {
-      provider = makeProviderFromConfig(config.provider, cfgWithType);
-    }
-  } catch (err) {
-    process.stderr.write(
-      `Failed to create provider: ${err instanceof Error ? err.message : err}
-`
-    );
-    await reader.close();
-    return 2;
-  }
   const promptBuilder = container.resolve(TOKENS.SystemPromptBuilder);
   const systemPrompt = await promptBuilder.build({
     cwd,
@@ -5311,59 +5488,29 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     model: config.model
   });
   const sessionStore = container.resolve(TOKENS.SessionStore);
-  let resumeId = typeof flags["resume"] === "string" ? flags["resume"] : void 0;
-  const recoveryLock = new RecoveryLock({
-    dir: wpaths.projectSessions,
-    sessionStore
+  const tokenCounter = container.resolve(TOKENS.TokenCounter);
+  const sessResult = await setupSession({
+    config: { model: config.model, provider: config.provider },
+    wpaths,
+    projectRoot,
+    cwd,
+    sessionStore,
+    systemPrompt,
+    provider,
+    tokenCounter,
+    renderer,
+    flags,
+    onRecovery: (abandoned, autoRecover) => promptRecovery(reader, renderer, abandoned, autoRecover)
   });
-  if (!resumeId && !flags["no-recovery"]) {
-    const abandoned = await recoveryLock.checkAbandoned();
-    if (abandoned && abandoned.messageCount > 0) {
-      const choice = await promptRecovery(reader, renderer, abandoned, !!flags["recover"]);
-      if (choice === "resume") {
-        resumeId = abandoned.sessionId;
-      } else if (choice === "delete") {
-        await sessionStore.delete(abandoned.sessionId).catch(() => void 0);
-        await recoveryLock.clear();
-      } else {
-        await recoveryLock.clear();
-      }
-    } else if (abandoned) {
-      await sessionStore.delete(abandoned.sessionId).catch(() => void 0);
-      await recoveryLock.clear();
-    }
-  }
-  let session;
-  let restoredMessages = [];
-  if (resumeId) {
-    try {
-      const resumed = await sessionStore.resume(resumeId);
-      session = resumed.writer;
-      restoredMessages = resumed.data.messages;
-      renderer.writeInfo(
-        `Resumed session ${resumed.data.metadata.id} \u2014 ${restoredMessages.length} messages, ${resumed.data.usage.input + resumed.data.usage.output} tokens used previously.`
-      );
-    } catch (err) {
-      renderer.writeError(`Resume failed: ${err instanceof Error ? err.message : String(err)}`);
-      return 2;
-    }
-  } else {
-    session = await sessionStore.create({
-      id: "",
-      title: "",
-      model: config.model,
-      provider: config.provider
-    });
-  }
+  const session = sessResult.session;
   sessionRef.current = session;
-  await recoveryLock.write(session.id).catch(() => void 0);
-  const attachments = new DefaultAttachmentStore({
-    spoolDir: path13.join(wpaths.projectSessions, session.id, "attachments")
-  });
-  const queueStore = new QueueStore({
-    dir: path13.join(wpaths.projectSessions, session.id)
-  });
-  const tokenCounter = container.resolve(TOKENS.TokenCounter);
+  sessResult.restoredMessages;
+  const context = sessResult.context;
+  const attachments = sessResult.attachments;
+  const recoveryLock = sessResult.recoveryLock;
+  const queueStore = sessResult.queueStore;
+  const planPath = sessResult.planPath;
+  const detachTodosCheckpoint = sessResult.detachTodosCheckpoint;
   const stats = new SessionStats(events, tokenCounter);
   const errorRing = [];
   events.on("error", (e) => {
@@ -5373,150 +5520,15 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     errorRing.push({ ts: (/* @__PURE__ */ new Date()).toISOString(), phase: e.phase, code, message });
     if (errorRing.length > 5) errorRing.shift();
   });
-  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 = path13.join(wpaths.projectSessions, `${session.id}.todos.json`);
-  if (resumeId) {
-    try {
-      const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
-      if (restoredTodos && restoredTodos.length > 0) {
-        context.state.replaceTodos(restoredTodos);
-        renderer.writeInfo(
-          `Restored ${restoredTodos.length} todo${restoredTodos.length === 1 ? "" : "s"} from previous run.`
-        );
-      }
-    } catch {
-    }
-  }
-  attachTodosCheckpoint(
-    context.state,
-    todosCheckpointPath,
-    session.id
-  );
-  const planPath = path13.join(wpaths.projectSessions, `${session.id}.plan.json`);
-  context.state.setMeta("plan.path", planPath);
-  if (resumeId) {
-    try {
-      const fleetRoot2 = path13.join(wpaths.projectSessions, session.id);
-      const dirState = await loadDirectorState(path13.join(fleetRoot2, "director-state.json"));
-      if (dirState) {
-        const tCounts = {};
-        for (const t of dirState.tasks) {
-          tCounts[t.status] = (tCounts[t.status] ?? 0) + 1;
-        }
-        const summary = Object.entries(tCounts).map(([k, v]) => `${v} ${k}`).join(", ");
-        renderer.writeInfo(
-          `Prior fleet state: ${dirState.subagents.length} subagent${dirState.subagents.length === 1 ? "" : "s"}, tasks ${summary || "(none)"}.`
-        );
-      }
-    } catch {
-    }
-    try {
-      const plan = await loadPlan(planPath);
-      if (plan && plan.items.length > 0) {
-        const open = plan.items.filter((p) => p.status !== "done").length;
-        const done = plan.items.length - open;
-        renderer.writeInfo(
-          `Plan: ${plan.items.length} item${plan.items.length === 1 ? "" : "s"} (${open} open, ${done} done). Use /plan to review.`
-        );
-      }
-    } catch {
-    }
-  }
-  const pipelines = createDefaultPipelines();
-  const installBoundary = (p) => {
-    p.setErrorHandler((ev) => {
-      const fromPlugin = !!ev.owner && ev.owner !== "core";
-      logger.error(
-        `Pipeline middleware "${ev.middleware}" crashed (owner=${ev.owner ?? "unknown"}); ${fromPlugin ? "swallowed" : "rethrown"}`,
-        ev.err
-      );
-      events.emit("error", {
-        err: ev.err instanceof Error ? ev.err : new Error(String(ev.err)),
-        phase: `pipeline:${ev.middleware}`
-      });
-      return fromPlugin ? "swallow" : "rethrow";
-    });
-  };
-  installBoundary(pipelines.request);
-  installBoundary(pipelines.response);
-  installBoundary(pipelines.toolCall);
-  installBoundary(pipelines.userInput);
-  installBoundary(pipelines.assistantOutput);
-  installBoundary(pipelines.contextWindow);
+  const pipelines = setupPipelines({ events, logger });
   const compactor = container.resolve(TOKENS.Compactor);
-  const resolvedCaps = await capabilitiesFor(modelsRegistry, config.provider, context.model).catch(
-    () => void 0
-  );
-  const effectiveMaxContext = config.context.effectiveMaxContext ?? resolvedCaps?.maxContext ?? provider.capabilities.maxContext;
+  const effectiveMaxContext = await setupCompaction({ compactor, events, modelsRegistry, context, config, provider, pipelines });
   const updateSpinnerContext = () => {
     if (effectiveMaxContext > 0 && lastInputTokens > 0) {
       spinner.setContext({ used: lastInputTokens, max: effectiveMaxContext });
-    } else {
-      spinner.setContext(void 0);
-    }
+    } else spinner.setContext(void 0);
   };
-  if (config.context.autoCompact !== false) {
-    const autoCompactor = new AutoCompactionMiddleware(
-      compactor,
-      effectiveMaxContext,
-      (ctx2) => {
-        const msgs = ctx2.messages;
-        let total = 0;
-        for (const m of msgs) {
-          if (typeof m.content === "string") total += Math.ceil(m.content.length / 4);
-          else if (Array.isArray(m.content)) {
-            for (const b of m.content) {
-              if (b.type === "text") total += Math.ceil(b.text.length / 4);
-              else if (b.type === "tool_use" || b.type === "tool_result") {
-                total += Math.ceil(JSON.stringify(b).length / 4);
-              }
-            }
-          }
-        }
-        return total;
-      },
-      {
-        warn: config.context.warnThreshold,
-        soft: config.context.softThreshold,
-        hard: config.context.hardThreshold
-      },
-      {
-        aggressiveOn: "soft",
-        failureMode: "throw_on_hard",
-        events
-      }
-    );
-    pipelines.contextWindow.use({
-      name: "AutoCompaction",
-      handler: autoCompactor.handler()
-    });
-  }
-  const agent = new Agent({
-    container,
-    tools: toolRegistry,
-    providers: providerRegistry,
-    events,
-    pipelines,
-    context,
-    maxIterations: config.tools.maxIterations,
-    iterationTimeoutMs: config.tools.iterationTimeoutMs,
-    executionStrategy: config.tools.defaultExecutionStrategy,
-    perIterationOutputCapBytes: config.tools.perIterationOutputCapBytes,
-    confirmAwaiter: makeConfirmAwaiter(reader)
-  });
+  const agent = createAgent({ container, tools: toolRegistry, providers: providerRegistry, events, pipelines, context, config, confirmAwaiter: makeConfirmAwaiter(reader) });
   const mcpRegistry = new MCPRegistry({ toolRegistry, events, log: logger });
   if (config.features.mcp) {
     for (const cfg of Object.values(config.mcpServers ?? {})) {
@@ -5589,12 +5601,12 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
   };
   const directorMode = flags["director"] === true;
   let director = null;
-  const fleetRoot = directorMode ? path13.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path13.join(fleetRoot, "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path13.join(fleetRoot, "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path13.join(fleetRoot, "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path13.join(fleetRoot, "director-state.json") : void 0;
-  const fleetRootForPromotion = path13.join(wpaths.projectSessions, session.id);
+  const fleetRoot = directorMode ? path14.join(wpaths.projectSessions, session.id) : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path14.join(fleetRoot, "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path14.join(fleetRoot, "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path14.join(fleetRoot, "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path14.join(fleetRoot, "director-state.json") : void 0;
+  const fleetRootForPromotion = path14.join(wpaths.projectSessions, session.id);
   const multiAgentHost = new MultiAgentHost(
     {
       container,
@@ -5746,7 +5758,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
       return `Unknown fleet action: ${action}`;
     },
     onFleetLog: async (subagentId, mode) => {
-      const subagentsRoot = path13.join(fleetRootForPromotion, "subagents");
+      const subagentsRoot = path14.join(fleetRootForPromotion, "subagents");
       let runDirs;
       try {
         runDirs = await fs3.readdir(subagentsRoot);
@@ -5755,7 +5767,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
       }
       const found = [];
       for (const runId of runDirs) {
-        const runDir = path13.join(subagentsRoot, runId);
+        const runDir = path14.join(subagentsRoot, runId);
         let files;
         try {
           files = await fs3.readdir(runDir);
@@ -5764,7 +5776,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
         }
         for (const f of files) {
           if (!f.endsWith(".jsonl")) continue;
-          const full = path13.join(runDir, f);
+          const full = path14.join(runDir, f);
           try {
             const stat2 = await fs3.stat(full);
             found.push({
@@ -5861,7 +5873,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
       }
       const dir = await multiAgentHost.ensureDirector();
       if (!dir) return "Director is not available.";
-      const dirStatePath = path13.join(fleetRootForPromotion, "director-state.json");
+      const dirStatePath = path14.join(fleetRootForPromotion, "director-state.json");
       const prior = await loadDirectorState(dirStatePath);
       if (!prior) {
         return "No prior director-state.json found \u2014 nothing to retry.";
@@ -5932,9 +5944,9 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
       for (const tool of director2.tools(FLEET_ROSTER)) {
         toolRegistry.register(tool);
       }
-      const mp = path13.join(fleetRootForPromotion, "fleet.json");
-      const sp = path13.join(fleetRootForPromotion, "shared");
-      const ss = path13.join(fleetRootForPromotion, "subagents");
+      const mp = path14.join(fleetRootForPromotion, "fleet.json");
+      const sp = path14.join(fleetRootForPromotion, "shared");
+      const ss = path14.join(fleetRootForPromotion, "subagents");
       const lines = [
         `${color.green("\u2713")} Promoted to director mode.`,
         `  Roster: ${Object.keys(FLEET_ROSTER).join(", ")}`,
@@ -5977,6 +5989,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     onStats: () => stats.format()
   });
   for (const cmd of slashCmds) slashRegistry.register(cmd);
+  const savedProviderCfg = config.providers?.[config.provider];
   return execute({
     agent,
     events,
@@ -5998,6 +6011,7 @@ Try \`wstack models refresh\` once you have network access, or run with --no-fea
     queueStore,
     context,
     stats,
+    detachTodosCheckpoint,
     savedProviderCfg,
     resolvedProvider: resolvedProvider ?? void 0,
     getPickableProviders: () => buildPickableProviders(modelsRegistry, config),