@wrongstack/cli 0.6.0 → 0.6.1

package/dist/index.js

@@ -3,7 +3,7 @@ import * as path23 from 'path';
 import { join } from 'path';
 import * as fsp2 from 'fs/promises';
 import { readdir, readFile } from 'fs/promises';
-import { color, allServers, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, ToolRegistry, createContextManagerTool, EventBus, SlashCommandRegistry, createDelegateTool, FLEET_ROSTER, EternalAutonomyEngine, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeAgentSubagentRunner, NULL_FLEET_BUS, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, DefaultPluginAPI, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, loadGoal, goalFilePath, summarizeUsage, emptyGoal, saveGoal, formatGoal, InputBuilder, projectHash, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1 } from '@wrongstack/core';
+import { color, DefaultPathResolver, TOKENS, DefaultSystemPromptBuilder, makeAutonomyPromptContributor, ToolRegistry, createContextManagerTool, EventBus, SlashCommandRegistry, createDelegateTool, FLEET_ROSTER, createMcpControlTool, EternalAutonomyEngine, DefaultLogger, DefaultModelsRegistry, ProviderRegistry, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, loadPlan, createDefaultPipelines, AutoCompactionMiddleware, estimateRequestTokens, Agent, loadPlugins, FleetManager, makeDirectorSessionFactory, Director, makeAgentSubagentRunner, NULL_FLEET_BUS, resolveWstackPaths, DefaultSecretVault, migratePlaintextSecrets, DefaultConfigLoader, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, atomicWrite, DefaultPluginAPI, AutoApprovePermissionPolicy, formatContextWindowModeList, repairToolUseAdjacency, getContextWindowMode, resolveContextWindowPolicy, formatTodosList, emptyPlan, clearPlan, savePlan, formatPlanTemplates, getPlanTemplate, addPlanItem, formatPlan, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, SpecStore, TaskGraphStore, SpecVersioning, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, DefaultTaskStore, TaskTracker, loadGoal, goalFilePath, summarizeUsage, emptyGoal, saveGoal, buildGoalPreamble, formatGoal, InputBuilder, projectHash, defaultOrchestrator, decryptConfigSecrets, encryptConfigSecrets as encryptConfigSecrets$1, allServers as allServers$1 } from '@wrongstack/core';
 import { createRequire } from 'module';
 import * as os6 from 'os';
 import os6__default from 'os';
@@ -17,8 +17,8 @@ import { createDefaultContainer, routeImagesForModel, readClipboardImage } from
 import { builtinToolsPack, rememberTool, forgetTool } from '@wrongstack/tools';
 import * as readline from 'readline';
 import { spawn } from 'child_process';
-import { buildGoalPreamble } from '@wrongstack/tui';
 import { SkillInstaller } from '@wrongstack/core/skills';
+import { allServers } from '@wrongstack/core/infrastructure';
 import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
 import { ToolExecutor } from '@wrongstack/core/execution';
 import { writeFileSync } from 'fs';
@@ -1104,7 +1104,7 @@ async function runWebUI(opts) {
   let abortController = null;
   const authToken = crypto.randomBytes(16).toString("hex");
   const wss = new WebSocketServer({ port, host: "127.0.0.1", maxPayload: 1 * 1024 * 1024 });
-  console.log(`[WebUI] WebSocket server starting on ws://localhost:${port}`);
+  console.log(`[WebUI] WebSocket server starting on ws://127.0.0.1:${port}`);
   const eventUnsubscribers = [];
   function setupEvents() {
     for (const unsub of eventUnsubscribers) unsub();
@@ -1220,7 +1220,7 @@ async function runWebUI(opts) {
   }
   return new Promise((resolve4) => {
     wss.on("listening", () => {
-      console.log(`[WebUI] WebSocket server running on ws://localhost:${port}`);
+      console.log(`[WebUI] WebSocket server running on ws://127.0.0.1:${port}`);
       setupEvents();
     });
     wss.on("connection", (ws, req2) => {
@@ -2322,10 +2322,10 @@ var theme = { primary: color.amber };
 async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => process.env.HOME ?? __require("os").homedir()) {
   try {
     const { atomicWrite: atomicWrite8 } = await import('@wrongstack/core');
-    const fs19 = await import('fs/promises');
+    const fs20 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs19.readFile(configPath2, "utf8");
+      const raw = await fs20.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -2679,52 +2679,79 @@ async function detectProjectFacts(root) {
 }
 function renderAgentsTemplate(f) {
   const cmd = (s) => s ? `\`${s}\`` : "_TODO_";
+  const hints = f.hints.length > 0 ? `
+
+> Auto-detected: ${f.hints.join(", ")}` : "";
   return `# AGENTS.md
 
-This file is loaded into WrongStack's system prompt as project context.
-Keep it concise, factual, and durable: write the information future agents
-need before they touch this codebase.
+> **DO NOT DELETE THIS FILE.** It is loaded into WrongStack's system prompt as
+> persistent project context. Previous content here may contain decisions,
+> architecture notes, domain knowledge, or verification history that should be
+> preserved. Merge additions rather than replacing.
 
 ## Project brief
 
-- **Purpose:** _What does this project do, and why does it exist?_
+- **Purpose:** _What does this project do and why does it exist?_
 - **Primary users:** _Who uses it: developers, operators, customers, internal systems?_
-- **Runtime/deployment:** _Where does it run: CLI, server, browser, worker, library, package?_
-- **Main entry points:** _Which files or commands should an agent inspect first?_
+- **Runtime / deployment:** _CLI, server, browser, worker, library, package?_${hints}
 
 ## How to work safely
 
 - _Project-specific rules the agent should always follow._
 - _Files, generated artifacts, migrations, or config the agent should not edit without asking._
-- _Preferred style or architecture choices that are not obvious from the code._
+- _Preferred style or architecture choices not obvious from the code._
+- _Known fragile areas or historical bugs that deserve extra caution._
 
 ## Commands
 
-- **Build:** ${cmd(f.build)}
-- **Test:** ${cmd(f.test)}
-- **Lint:** ${cmd(f.lint)}
-- **Run locally:** ${cmd(f.run)}
+| Command | Script |
+|---------|--------|
+| Build | ${cmd(f.build)} |
+| Test | ${cmd(f.test)} |
+| Lint | ${cmd(f.lint)} |
+| Run locally | ${cmd(f.run)} |
+
+## Key files and entry points
+
+| File / directory | Role |
+|---|---|
+| _src/_ | _Main source entry point(s)_ |
+| _tests/_ | _Test root or convention_ |
+| _docs/_ | _Architecture, runbooks, design notes_ |
+| _scripts/_ | _Automation scripts (CI, release, install, etc.)_ |
 
 ## Architecture notes
 
 _Summarize the important modules, data flow, boundaries, and ownership rules.
-Mention anything a newcomer might misread._
+Mention anything a newcomer might misread or that looks unusual but is intentional._
+
+### Dependency layers
+
+_Describe the key dependency direction or layered structure, e.g.: "core has no
+runtime deps; cli assembles everything above it."_
+
+### Extension points
+
+_Plugin, MCP, extension hooks, custom tools \u2014 what's wired up and how._
 
 ## Domain knowledge
 
 _Business rules, acronyms, invariants, external services, and notes where the
-code looks unusual but is intentional._
+code looks unusual but is intentional. E.g.: "IDs are ULIDs, not UUIDs", "the
+\`draft\` flag means uncommitted billing metadata", "MCP servers are restarted
+on disconnect with exponential backoff, up to 3 attempts"._
 
 ## Verification checklist
 
 - _What should be run after code changes?_
 - _What manual smoke test proves the common path still works?_
 - _What failure modes deserve extra attention?_
+- _Any known flaky tests or environment-dependent behavior?_
 
 ## Useful pointers
 
-- _Docs, dashboards, runbooks, issue trackers, design notes, or owner contacts._
-`;
+- _Docs, dashboards, runbooks, issue trackers, design notes, owner contacts._
+- _Related projects or repositories._`;
 }
 function countTurnPairs(messages) {
   let count = 0;
@@ -3128,7 +3155,7 @@ function buildStatsCommand(opts) {
 function buildFleetCommand(opts) {
   return {
     name: "fleet",
-    description: "Inspect or control the subagent fleet: /fleet [status|usage|kill <id>|manifest|retry [taskId]|log <id>|stream on|off|help]",
+    description: "Inspect or control the subagent fleet: /fleet [status|usage|kill <id>|manifest|concurrency [N]|retry [taskId]|log <id>|stream on|off|help]",
     help: [
       "Usage:",
       "  /fleet                  Show fleet status (alias for /fleet status).",
@@ -3136,6 +3163,8 @@ function buildFleetCommand(opts) {
       "  /fleet usage            Per-subagent runtime cost.",
       "  /fleet kill <id>        Terminate a running subagent.",
       "  /fleet manifest         Print the director manifest.",
+      "  /fleet concurrency      Show the current concurrent-subagent ceiling.",
+      "  /fleet concurrency N    Set the ceiling to N (>= 1). Lowering does not preempt running tasks.",
       "  /fleet retry            List interrupted tasks from the last run.",
       "  /fleet retry <taskId>   Re-spawn the matching subagent and re-assign the task.",
       "  /fleet retry all        Re-assign every interrupted task at once.",
@@ -3161,6 +3190,9 @@ function buildFleetCommand(opts) {
           if (!target) return { message: "Usage: /fleet kill <subagent-id>" };
           return { message: await opts.onFleet("kill", target) };
         }
+        case "concurrency": {
+          return { message: await opts.onFleet("concurrency", target) };
+        }
         case "retry": {
           if (!opts.onFleetRetry) {
             return { message: "Retry is only available when director mode is active." };
@@ -3298,20 +3330,10 @@ function buildHelpCommand(opts) {
 function buildInitCommand(opts) {
   return {
     name: "init",
-    description: "Create .wrongstack/AGENTS.md project context for the system prompt.",
-    async run(args, ctx) {
-      const force = args.trim() === "--force";
+    description: "Create or update .wrongstack/AGENTS.md project context for the system prompt.",
+    async run(_args, ctx) {
       const dir = path23.join(ctx.projectRoot, ".wrongstack");
       const file = path23.join(dir, "AGENTS.md");
-      try {
-        await fsp2.access(file);
-        if (!force) {
-          const msg2 = `AGENTS.md already exists at ${file}. Use "/init --force" to overwrite.`;
-          opts.renderer.writeWarning(msg2);
-          return { message: msg2 };
-        }
-      } catch {
-      }
       const detected = await detectProjectFacts(ctx.projectRoot);
       const body = renderAgentsTemplate(detected);
       await fsp2.mkdir(dir, { recursive: true });
@@ -3332,6 +3354,223 @@ No project type auto-detected. Edit the file with project context and instructio
     }
   };
 }
+function parseMcpArgs(args) {
+  const trimmed = args.trim();
+  if (!trimmed || trimmed === "list") return { action: "list", name: "" };
+  const parts = trimmed.split(/\s+/);
+  const action = parts[0];
+  const name = parts[1] ?? "";
+  const enable = parts.includes("--enable") || parts.includes("-e");
+  switch (action) {
+    case "add":
+      return name ? { action: "add", name, enable } : null;
+    case "remove":
+      return name ? { action: "remove", name } : null;
+    case "enable":
+      return name ? { action: "enable", name } : null;
+    case "disable":
+      return name ? { action: "disable", name } : null;
+    case "restart":
+      return name ? { action: "restart", name } : null;
+    default:
+      return null;
+  }
+}
+async function runMcpManagementCommand(parsed, deps) {
+  const { config, configPath: configPath2, mcpRegistry, allServerPresets } = deps;
+  const configured = config.mcpServers ?? {};
+  switch (parsed.action) {
+    case "list":
+      return renderList(configured, mcpRegistry, allServerPresets);
+    case "add":
+      return runAdd(parsed.name, parsed.enable ?? false, configured, configPath2, allServerPresets);
+    case "remove":
+      return runRemove(parsed.name, configured, configPath2, mcpRegistry);
+    case "enable":
+      return runEnable(parsed.name, configured, configPath2, mcpRegistry);
+    case "disable":
+      return runDisable(parsed.name, configured, configPath2, mcpRegistry);
+    case "restart":
+      return runRestart(parsed.name, mcpRegistry);
+  }
+}
+function renderList(configured, mcpRegistry, all) {
+  const lines = [];
+  const liveStatus = mcpRegistry.list();
+  const liveMap = new Map(liveStatus.map((s) => [s.name, s]));
+  const configuredNames = new Set(Object.keys(configured));
+  if (configuredNames.size > 0) {
+    lines.push(color.bold("Configured servers:"));
+    for (const [name, cfg] of Object.entries(configured)) {
+      const live = liveMap.get(name);
+      const toolCount = live ? color.dim(` (${live.toolCount} tools)`) : "";
+      const enabled = cfg.enabled === false ? `${color.dim("disabled")}  ` : `${color.green("\u25CF enabled")}  `;
+      const stateStr = live ? stateBadge(live.state) : color.dim("\u25CB not running");
+      lines.push(`  ${color.bold(name)}  ${enabled}${stateStr}${toolCount}`);
+      if (cfg.description) lines.push(`    ${color.dim(cfg.description)}`);
+    }
+    lines.push("");
+  }
+  const unconfigured = Object.entries(all).filter(([n]) => !configuredNames.has(n));
+  lines.push(color.bold("Available presets (run `/mcp add <name> --enable` to enable):"));
+  if (unconfigured.length === 0) {
+    lines.push(`  ${color.dim("All presets are already configured.")}`);
+  } else {
+    for (const [name, cfg] of unconfigured) {
+      const warn = cfg.permission === "deny" ? color.red(" \u26A0") : "";
+      lines.push(`  ${color.bold(name)}  ${cfg.description ?? cfg.transport}${warn}`);
+    }
+  }
+  lines.push("");
+  lines.push(color.dim("  /mcp add <name> [--enable]   /mcp remove <name>"));
+  lines.push(color.dim("  /mcp enable <name>            /mcp disable <name>"));
+  lines.push(color.dim("  /mcp restart <name>           (runtime restart)"));
+  return lines.join("\n");
+}
+async function runAdd(name, enable, configured, configPath2, all) {
+  const preset = all[name];
+  if (!preset) {
+    const known = Object.keys(all).join(", ");
+    return `Unknown server "${name}". Available: ${known}`;
+  }
+  if (configured[name]) {
+    const full2 = await readConfig(configPath2);
+    full2.mcpServers = {
+      ...full2.mcpServers ?? {},
+      [name]: { ...preset, ...configured[name], enabled: enable }
+    };
+    await writeConfig(configPath2, full2);
+    return `${color.green("Updated")} "${name}" (${enable ? "enabled" : "disabled"}). Config written.`;
+  }
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {}, [name]: { ...preset, enabled: enable } };
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  const verb = enable ? "Enabled" : "Added (disabled \u2014 /mcp enable to start)";
+  return `${color.green(verb)} "${name}" (${preset.transport}). Config written to ${configPath2}.`;
+}
+async function runRemove(name, configured, configPath2, mcpRegistry) {
+  if (!configured[name]) return `Server "${name}" is not in config.`;
+  await mcpRegistry.stop(name).catch(() => {
+  });
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {} };
+  delete mcpServers[name];
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  return `${color.yellow("Removed")} "${name}" from config.`;
+}
+async function runEnable(name, configured, configPath2, mcpRegistry) {
+  const cfg = configured[name];
+  if (!cfg) return `Server "${name}" is not in config. Run \`/mcp add ${name} --enable\` first.`;
+  if (cfg.enabled !== false) {
+    try {
+      await mcpRegistry.restart(name);
+      return `${color.green("\u25CF")} "${name}" is already enabled and running.`;
+    } catch {
+      await mcpRegistry.start({ ...cfg, enabled: true });
+      return `${color.green("Enabled")} "${name}" and started.`;
+    }
+  }
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {} };
+  mcpServers[name] = { ...mcpServers[name], enabled: true };
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  try {
+    await mcpRegistry.restart(name);
+  } catch {
+    await mcpRegistry.start({ ...cfg, enabled: true });
+  }
+  return `${color.green("Enabled")} "${name}" and started.`;
+}
+async function runDisable(name, configured, configPath2, mcpRegistry) {
+  const cfg = configured[name];
+  if (!cfg) return `Server "${name}" is not in config.`;
+  await mcpRegistry.stop(name).catch(() => {
+  });
+  const full = await readConfig(configPath2);
+  const mcpServers = { ...full.mcpServers ?? {} };
+  mcpServers[name] = { ...mcpServers[name], enabled: false };
+  full.mcpServers = mcpServers;
+  await writeConfig(configPath2, full);
+  return `${color.yellow("Disabled")} "${name}" and stopped.`;
+}
+async function runRestart(name, mcpRegistry) {
+  const live = mcpRegistry.list();
+  if (!live.find((s) => s.name === name)) {
+    return `Server "${name}" is not currently running. Add it with \`/mcp add ${name} --enable\`.`;
+  }
+  try {
+    await mcpRegistry.restart(name);
+    return `${color.green("\u2713")} Restarted "${name}".`;
+  } catch (err) {
+    return `${color.red("\u2717")} Failed to restart "${name}": ${err instanceof Error ? err.message : String(err)}`;
+  }
+}
+function stateBadge(state) {
+  switch (state) {
+    case "connected":
+      return color.green("\u25CF connected");
+    case "connecting":
+      return color.cyan("\u25D0 connecting");
+    case "reconnecting":
+      return color.cyan("\u25D1 reconnecting");
+    case "disconnected":
+      return color.dim("\u25CB disconnected");
+    case "failed":
+      return color.red("\u2717 failed");
+    default:
+      return color.dim(state);
+  }
+}
+async function readConfig(path24) {
+  try {
+    return JSON.parse(await fsp2.readFile(path24, "utf8"));
+  } catch {
+    return {};
+  }
+}
+async function writeConfig(path24, cfg) {
+  const raw = JSON.stringify(cfg, null, 2);
+  const tmp = path24 + ".tmp";
+  await fsp2.writeFile(tmp, raw, "utf8");
+  await fsp2.rename(tmp, path24);
+}
+
+// src/slash-commands/mcp.ts
+function buildMcpSlashCommand(opts) {
+  return {
+    name: "mcp",
+    description: "Manage MCP servers: /mcp [list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
+    aliases: ["mcp-servers"],
+    argsHint: "[list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
+    help: [
+      "Usage:",
+      "  /mcp                      List available and configured servers.",
+      "  /mcp list                 Same.",
+      "  /mcp add <name>           Add server preset to config (disabled).",
+      "  /mcp add <name> --enable  Add and immediately enable.",
+      "  /mcp remove <name>        Remove server from config.",
+      "  /mcp enable <name>        Enable server in config + start it.",
+      "  /mcp disable <name>       Disable server in config + stop it.",
+      "  /mcp restart <name>       Stop and restart a running server (REPL only).",
+      "",
+      "Examples:",
+      "  /mcp",
+      "  /mcp add filesystem --enable",
+      "  /mcp enable github",
+      "  /mcp restart brave-search"
+    ].join("\n"),
+    async run(args) {
+      if (!opts.onMcp) {
+        return { message: "MCP management is not available in this session." };
+      }
+      const result = await opts.onMcp(args.trim());
+      return { message: result };
+    }
+  };
+}
 
 // src/slash-commands/memory.ts
 function buildMemoryCommand(opts) {
@@ -4676,6 +4915,7 @@ function buildBuiltinSlashCommands(opts) {
     buildSkillUpdateCommand(opts),
     buildSkillUninstallCommand(opts),
     buildPluginCommand(opts),
+    buildMcpSlashCommand(opts),
     buildDiagCommand(opts),
     buildStatsCommand(opts),
     buildSpawnCommand(opts),
@@ -6138,12 +6378,8 @@ var initCmd = async (_args, deps) => {
   await atomicWrite(deps.paths.globalConfig, JSON.stringify(encrypted, null, 2));
   await fsp2.mkdir(path23.join(deps.projectRoot, ".wrongstack"), { recursive: true });
   const agentsFile = path23.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
-  try {
-    await fsp2.access(agentsFile);
-  } catch {
-    const detected2 = await detectProjectFacts(deps.projectRoot);
-    await atomicWrite(agentsFile, renderAgentsTemplate(detected2));
-  }
+  const projectFacts = await detectProjectFacts(deps.projectRoot);
+  await atomicWrite(agentsFile, renderAgentsTemplate(projectFacts));
   deps.renderer.writeInfo(`Wrote ${deps.paths.globalConfig}`);
   deps.renderer.writeInfo(`Project state lives in ${deps.paths.projectDir}`);
   deps.renderer.writeInfo('Try: wstack "<task>"  or  wstack');
@@ -6179,7 +6415,7 @@ var mcpCmd = async (args, deps) => {
     return removeMcpServer(name, deps);
   }
   if (sub === "restart") {
-    deps.renderer.writeWarning("mcp restart is only available in REPL mode.");
+    deps.renderer.writeWarning("mcp restart is only available in REPL mode. Use /mcp restart instead.");
     return 0;
   }
   deps.renderer.writeError(`Unknown mcp subcommand: ${sub}`);
@@ -6354,7 +6590,7 @@ function renderConfiguredPlugins(config) {
     return `  ${`${name}${suffix}`.padEnd(44)} ${enabled}`;
   }).join("\n");
 }
-async function readConfig(file) {
+async function readConfig2(file) {
   try {
     return JSON.parse(await fsp2.readFile(file, "utf8"));
   } catch {
@@ -6373,7 +6609,7 @@ function officialPluginState(config, spec) {
   return typeof match === "object" && match.enabled === false ? "disabled" : "enabled";
 }
 async function upsertPlugin(spec, opts, deps, verb) {
-  const existing = await readConfig(deps.configPath);
+  const existing = await readConfig2(deps.configPath);
   const plugins = Array.isArray(existing.plugins) ? existing.plugins : [];
   const idx = plugins.findIndex((p) => pluginName(p) === spec);
   const nextEntry = pluginEntry(spec, opts.enabled);
@@ -6396,7 +6632,7 @@ async function upsertPlugin(spec, opts, deps, verb) {
   };
 }
 async function removePlugin(spec, deps) {
-  const existing = await readConfig(deps.configPath);
+  const existing = await readConfig2(deps.configPath);
   const plugins = Array.isArray(existing.plugins) ? existing.plugins : [];
   const next = plugins.filter((p) => pluginName(p) !== spec);
   if (next.length === plugins.length) {
@@ -6932,12 +7168,23 @@ function parseRewindFlags(args) {
   }
   return flags;
 }
+function findSessionId(args) {
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--last" || a === "--to") {
+      i++;
+      continue;
+    }
+    if (!a.startsWith("--")) return a;
+  }
+  return void 0;
+}
 var rewindCmd = async (args, deps) => {
   const flags = parseRewindFlags(args);
   const wpaths = resolveWstackPaths({ projectRoot: deps.projectRoot });
   const sessionsDir = path23.join(wpaths.globalRoot, "sessions");
   const rewind = new DefaultSessionRewinder(sessionsDir);
-  let sessionId = args.find((a) => !a.startsWith("--"));
+  let sessionId = findSessionId(args);
   if (!sessionId) {
     if (!deps.sessionStore) {
       deps.renderer.writeError("No session store available.");
@@ -7146,22 +7393,22 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color34) {
+function fmtTaskResultLine(r, color35) {
   const stats = `${r.iterations}it ${r.toolCalls}tc ${fmtDuration(r.durationMs)}`;
   const errMsg = typeof r.error === "string" ? r.error : r.error?.message;
   const errKind = typeof r.error === "object" ? r.error?.kind : void 0;
   const errTail = errMsg ? ` \u2014 ${errMsg.replace(/\s+/g, " ").slice(0, 80)}${errMsg.length > 80 ? "\u2026" : ""}` : "";
-  const errKindChip = errKind ? color34.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color34.dim(errTail)}` : "";
+  const errKindChip = errKind ? color35.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color35.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color34.green("\u2713"), stats, tail: "" };
+      return { mark: color35.green("\u2713"), stats, tail: "" };
     case "timeout":
-      return { mark: color34.yellow("\u23F1"), stats: `${color34.yellow("timeout")} ${stats}`, tail: errSnip };
+      return { mark: color35.yellow("\u23F1"), stats: `${color35.yellow("timeout")} ${stats}`, tail: errSnip };
     case "stopped":
-      return { mark: color34.dim("\u2298"), stats: `${color34.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color35.dim("\u2298"), stats: `${color35.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color34.red("\u2717"), stats: `${color34.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color35.red("\u2717"), stats: `${color35.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 
@@ -8107,7 +8354,7 @@ var MultiAgentHost = class {
     const coordinatorConfig = {
       coordinatorId: randomUUID(),
       doneCondition: { type: "all_tasks_done" },
-      maxConcurrent: 8
+      maxConcurrent: this.opts.maxConcurrent ?? 4
     };
     const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path23.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
     this.director = new Director({
@@ -8484,6 +8731,37 @@ var MultiAgentHost = class {
       await this.getCoordinator().stopAll();
     }
   }
+  /**
+   * Current effective concurrent-subagent ceiling. Reads the live
+   * coordinator config when the director is built; otherwise falls back
+   * to the constructor option (or the default of 4 that buildDirector
+   * will apply on first /spawn).
+   */
+  getMaxConcurrent() {
+    if (this.director) {
+      return this.getCoordinator().config.maxConcurrent ?? 4;
+    }
+    return this.opts.maxConcurrent ?? 4;
+  }
+  /**
+   * Change the concurrent-subagent ceiling at runtime. Updates the
+   * constructor option (so lazy-built director picks it up) and, if the
+   * coordinator already exists, mutates its live config + triggers a
+   * dispatch pass so newly-allowed slots fill immediately.
+   *
+   * Throws on non-positive values; the caller is expected to validate
+   * user input first.
+   */
+  setMaxConcurrent(n) {
+    if (!Number.isFinite(n) || n < 1) {
+      throw new Error(`maxConcurrent must be a finite integer >= 1, got ${n}`);
+    }
+    const v = Math.floor(n);
+    this.opts.maxConcurrent = v;
+    if (this.director) {
+      this.getCoordinator().setMaxConcurrent(v);
+    }
+  }
 };
 function makePromptDelegate(reader) {
   return async (tool, input, suggestedPattern) => {
@@ -9186,6 +9464,8 @@ async function main(argv) {
   const memoryStore = container.resolve(TOKENS.MemoryStore);
   const skillLoader = container.resolve(TOKENS.SkillLoader);
   const sessionRef = {};
+  const autonomyModeRef = { current: "off" };
+  const goalPathForPrompt = path23.join(projectRoot, ".wrongstack", "goal.json");
   container.bind(
     TOKENS.SystemPromptBuilder,
     () => new DefaultSystemPromptBuilder({
@@ -9195,7 +9475,17 @@ async function main(argv) {
       modeId,
       modePrompt,
       modelCapabilities,
-      planPath: () => sessionRef.current ? path23.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0
+      planPath: () => sessionRef.current ? path23.join(wpaths.projectSessions, `${sessionRef.current.id}.plan.json`) : void 0,
+      contributors: [
+        // Injects the ETERNAL AUTONOMY block when the user has activated
+        // `/autonomy eternal`. Without this, the per-iteration directive
+        // is the only place the model sees the rules — compaction can
+        // drop it and the model forgets it's in autonomy mode.
+        makeAutonomyPromptContributor({
+          goalPath: goalPathForPrompt,
+          enabled: () => autonomyModeRef.current === "eternal"
+        })
+      ]
     })
   );
   const toolRegistry = new ToolRegistry();
@@ -9368,6 +9658,9 @@ async function main(argv) {
     }
   };
   const directorMode = flags["director"] === true || typeof flags["resume"] === "string";
+  const maxConcurrentFromFlag = typeof flags["max-concurrent"] === "string" ? Number.parseInt(flags["max-concurrent"], 10) : void 0;
+  const maxConcurrentFromEnv = typeof process.env["WRONGSTACK_MAX_CONCURRENT"] === "string" ? Number.parseInt(process.env["WRONGSTACK_MAX_CONCURRENT"], 10) : void 0;
+  const maxConcurrent = Number.isFinite(maxConcurrentFromFlag) && maxConcurrentFromFlag > 0 ? maxConcurrentFromFlag : Number.isFinite(maxConcurrentFromEnv) && maxConcurrentFromEnv > 0 ? maxConcurrentFromEnv : void 0;
   let director = null;
   let autonomyMode = "off";
   let eternalEngine = null;
@@ -9408,7 +9701,8 @@ async function main(argv) {
       directorRunId: session.id,
       fleetRoot: fleetRootForPromotion,
       stateCheckpointPath,
-      sessionWriter: session
+      sessionWriter: session,
+      maxConcurrent
     }
   );
   toolRegistry.register(
@@ -9423,6 +9717,13 @@ async function main(argv) {
       directorRunId: session.id
     })
   );
+  toolRegistry.register(
+    createMcpControlTool({
+      getConfig: () => configStore.get(),
+      configPath: wpaths.globalConfig,
+      registry: mcpRegistry
+    })
+  );
   if (directorMode) {
     director = await multiAgentHost.ensureDirector();
     if (director) {
@@ -9582,6 +9883,22 @@ async function main(argv) {
         }
         return `Manifest written \u2192 ${p}`;
       }
+      if (action === "concurrency") {
+        const current = multiAgentHost.getMaxConcurrent();
+        if (!target) {
+          return `Concurrent-subagent ceiling: ${current}`;
+        }
+        const n = Number.parseInt(target, 10);
+        if (!Number.isFinite(n) || n < 1) {
+          return `Invalid value "${target}". Concurrency must be an integer >= 1.`;
+        }
+        try {
+          multiAgentHost.setMaxConcurrent(n);
+        } catch (err) {
+          return err instanceof Error ? err.message : String(err);
+        }
+        return `Concurrent-subagent ceiling: ${current} \u2192 ${n}`;
+      }
       return `Unknown fleet action: ${action}`;
     },
     onFleetLog: async (subagentId, mode) => {
@@ -9800,6 +10117,21 @@ Restart WrongStack to load or unload plugin code in this session.`;
       }
       return result.message;
     },
+    onMcp: async (args) => {
+      const parsed = parseMcpArgs(args);
+      if (!parsed) {
+        return [
+          "Usage: /mcp [list|add <name>|remove <name>|enable <name>|disable <name>|restart <name>]",
+          "Run `/mcp` without args to see available servers."
+        ].join("\n");
+      }
+      return runMcpManagementCommand(parsed, {
+        config,
+        configPath: wpaths.globalConfig,
+        mcpRegistry,
+        allServerPresets: allServers$1()
+      });
+    },
     onYolo: (setTo) => {
       const policy = container.resolve(TOKENS.PermissionPolicy);
       if (setTo !== void 0) {
@@ -9812,6 +10144,7 @@ Restart WrongStack to load or unload plugin code in this session.`;
     onAutonomy: (setTo) => {
       if (setTo !== void 0) {
         autonomyMode = setTo;
+        autonomyModeRef.current = setTo;
         return setTo;
       }
       return autonomyMode;
@@ -9912,6 +10245,7 @@ Restart WrongStack to load or unload plugin code in this session.`;
     });
     await eternalEngine.prime();
     autonomyMode = "eternal";
+    autonomyModeRef.current = "eternal";
     renderer.write(
       color.red("Eternal mode launching from --eternal flag.") + color.dim(` Goal: ${eternalFlag.slice(0, 80)}${eternalFlag.length > 80 ? "\u2026" : ""}`) + "\n"
     );