@wrongstack/cli 0.299.0 → 0.301.0

package/dist/{cli-main-3MQDFSYK.js → cli-main-XWC57MGE.js}

@@ -1,3 +1,6 @@
+import {
+  setupPlugins
+} from "./chunk-ZECLGUTF.js";
 import {
   runProjectPicker
 } from "./chunk-5N34EWJR.js";
@@ -37,13 +40,10 @@ import {
   matchTaskNode,
   sddState
 } from "./chunk-XTIXVJXP.js";
-import {
-  setupPlugins
-} from "./chunk-4U3DMA2Y.js";
 import {
   PLUGIN_AUDIT_ENTRIES,
   runPluginManagementCommand
-} from "./chunk-PEKUKUCH.js";
+} from "./chunk-GUHQQG63.js";
 import {
   configureSimpleUiRuntimeContext,
   detectProjectFacts,
@@ -70,7 +70,7 @@ import {
   loadCachedAcpRegistry,
   refreshAcpRegistry,
   setupProvider
-} from "./chunk-4HH3YGG4.js";
+} from "./chunk-MRLYDHQ7.js";
 import {
   addCustomProvider,
   addKeyForCatalogProvider,
@@ -80,17 +80,18 @@ import {
   runClaudeOAuthLogin,
   runCopilotOAuthLogin,
   validateFamily
-} from "./chunk-L5CE52XW.js";
+} from "./chunk-O7XNGCRT.js";
 import {
   LOCAL_LLM_PRESETS,
   parseSpawnFlags
-} from "./chunk-ZNZJ34RF.js";
+} from "./chunk-MHF2IJDE.js";
 import {
-  buildPickableProviders
-} from "./chunk-66T43Q4Y.js";
+  buildPickableProviders,
+  visibleModelIds
+} from "./chunk-ETOEGL3V.js";
 import {
   runCodexOAuthLogin
-} from "./chunk-GO3TJICK.js";
+} from "./chunk-PYTFS4MC.js";
 import {
   activeLabel,
   loadConfigProviders,
@@ -101,10 +102,10 @@ import {
 } from "./chunk-PJHET45A.js";
 import {
   appendHistory
-} from "./chunk-YWUPHRGB.js";
+} from "./chunk-263G3FMB.js";
 import {
   activeProfileConfigPath
-} from "./chunk-DPJZQCVP.js";
+} from "./chunk-YMXXOOFN.js";
 import {
   __require
 } from "./chunk-7OCVIDC7.js";
@@ -1566,6 +1567,7 @@ function registerBuiltinTools(deps) {
     tier,
     contextTool: createContextManagerTool({ compactor: deps.compactor }),
     memory: { enabled: deps.config.features.memory, store: deps.memoryStore },
+    nextSteps: { enabled: deps.config.tools?.nextsteps?.enabled === true },
     coordinationTools: [
       makeMailboxTool({ projectDir: deps.wpaths.projectDir, events: deps.events }),
       makeMailSendTool({ projectDir: deps.wpaths.projectDir, events: deps.events }),
@@ -2781,6 +2783,9 @@ import {
 } from "@wrongstack/core/execution";
 import { TOKENS as TOKENS6 } from "@wrongstack/core/kernel";
 import { createMcpControlTool, createMcpUseTool } from "@wrongstack/core/tools";
+import {
+  normalizeTokenSavingTier as normalizeTokenSavingTier2
+} from "@wrongstack/core/types";
 
 // src/boot/brain-decision-log.ts
 var MAX_BRAIN_LOG_ENTRIES = 20;
@@ -2875,9 +2880,7 @@ import { wstackGlobalRoot } from "@wrongstack/core/utils";
 
 // src/fleet/host-helpers.ts
 import * as path2 from "node:path";
-import {
-  makeSubagentResultTool
-} from "@wrongstack/core/coordination";
+import { makeSubagentResultTool } from "@wrongstack/core/coordination";
 import { ToolCapabilities, WIDE_SUBAGENT_CAPABILITIES } from "@wrongstack/core/security";
 import { makePreferSideConflictResolver } from "@wrongstack/sdd";
 function isInsideDirectory(root, candidate) {
@@ -2953,10 +2956,13 @@ var DEFAULT_SUBAGENT_HIDDEN_TOOLS = /* @__PURE__ */ new Set([
   "collab_debug",
   "fleet_emit"
 ]);
+var NEVER_SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["nextsteps"]);
 function selectSubagentTools(allTools, directorToolsByName, allow) {
   if (!allow || allow.length === 0) {
     const visible = new Map(
-      allTools.filter((tool) => !DEFAULT_SUBAGENT_HIDDEN_TOOLS.has(tool.name)).map((tool) => [tool.name, tool])
+      allTools.filter(
+        (tool) => !DEFAULT_SUBAGENT_HIDDEN_TOOLS.has(tool.name) && !NEVER_SUBAGENT_TOOLS.has(tool.name)
+      ).map((tool) => [tool.name, tool])
     );
     visible.set("submit_result", makeSubagentResultTool());
     return Array.from(visible.values());
@@ -2964,12 +2970,20 @@ function selectSubagentTools(allTools, directorToolsByName, allow) {
   const allowSet = new Set(allow);
   const result = /* @__PURE__ */ new Map();
   for (const tool of allTools) {
-    if (allowSet.has(tool.name)) result.set(tool.name, tool);
+    if (allowSet.has(tool.name) && !NEVER_SUBAGENT_TOOLS.has(tool.name))
+      result.set(tool.name, tool);
   }
   for (const name of allowSet) {
+    if (NEVER_SUBAGENT_TOOLS.has(name)) continue;
     const directorTool = directorToolsByName.get(name);
     if (directorTool && !result.has(name)) result.set(name, directorTool);
   }
+  const missing = [...allowSet].filter(
+    (name) => !NEVER_SUBAGENT_TOOLS.has(name) && !result.has(name)
+  );
+  if (missing.length > 0) {
+    throw new Error(`Subagent tool contract is not registered: ${missing.sort().join(", ")}`);
+  }
   result.set("submit_result", makeSubagentResultTool());
   return Array.from(result.values());
 }
@@ -3263,6 +3277,10 @@ function registerDirectorStatsBridge(input) {
         ...u.toolCalls !== void 0 ? { toolCalls: u.toolCalls } : {}
       };
     });
+    const budgetSnap = director.fleetManager?.budgetSnapshot?.();
+    const maxSpawns = budgetSnap?.maxSpawns ?? director.maxSpawns;
+    const usedSpawns = budgetSnap?.usedSpawns ?? director.spawnCount;
+    const remainingSpawns = budgetSnap?.remainingSpawns ?? Math.max(0, (Number.isFinite(maxSpawns) ? maxSpawns : Number.POSITIVE_INFINITY) - usedSpawns);
     events.emit("coordinator.stats", {
       sessionId,
       total: payload.total,
@@ -3273,6 +3291,11 @@ function registerDirectorStatsBridge(input) {
       pending: payload.pending,
       completed: payload.completed,
       ...usage?.total?.cost !== void 0 ? { totalCostUsd: usage.total.cost } : {},
+      maxSpawns,
+      usedSpawns,
+      remainingSpawns,
+      ...budgetSnap?.checkpointMaxSpawns !== void 0 ? { checkpointMaxSpawns: budgetSnap.checkpointMaxSpawns } : {},
+      ...budgetSnap?.ceilingMismatch ? { ceilingMismatch: true } : {},
       subagentStatuses
     });
   });
@@ -3341,7 +3364,8 @@ import {
   Agent,
   Context,
   createDefaultPipelines,
-  createFallbackModelExtension
+  createFallbackModelExtension,
+  renderInstructionLayer
 } from "@wrongstack/core/agent";
 import {
   applyProjectAgentConfig,
@@ -3366,9 +3390,14 @@ import { EventBus } from "@wrongstack/core/kernel";
 import { AutoApprovePermissionPolicy } from "@wrongstack/core/security";
 
 // src/fleet/host-context.ts
+import {
+  missingRequiredRuntimeTools,
+  missingRuntimeCapabilities,
+  runtimeToolReferencesFromText
+} from "@wrongstack/core/agent-catalog";
 import { TOKENS as TOKENS2 } from "@wrongstack/core/kernel";
 import { getSageRetrieval } from "@wrongstack/sage";
-async function resolveHostSubagentSkillContent(deps, roster, subCfg) {
+async function resolveHostSubagentSkillContent(deps, roster, subCfg, availableToolNames = []) {
   const rosterSkillNames = subCfg.role ? roster[subCfg.role]?.skillNames : void 0;
   const skillNames = [...new Set(subCfg.skillNames ?? rosterSkillNames ?? [])];
   const directContent = subCfg.skillContent?.trim();
@@ -3381,8 +3410,14 @@ async function resolveHostSubagentSkillContent(deps, roster, subCfg) {
     try {
       const manifest = await deps.skillLoader.find(skillName);
       if (!manifest) continue;
+      if (missingRuntimeCapabilities(manifest.requiredCapabilities, availableToolNames).length > 0 || missingRequiredRuntimeTools(manifest.requiredTools, availableToolNames).length > 0) {
+        continue;
+      }
       const body = (await deps.skillLoader.readSaveBody(skillName)).trim();
       if (!body) continue;
+      if (missingRequiredRuntimeTools(runtimeToolReferencesFromText(body), availableToolNames).length > 0) {
+        continue;
+      }
       const entry = `## Skill: ${skillName}
 
 ${body.slice(0, maxCharsPerSkill)}`;
@@ -3798,16 +3833,26 @@ ${message} Falling back to the assigned checkout.` : `${message} Falling back to
       onlineAgents = await subagentMailbox.getAgentStatuses();
     } catch {
     }
+    const subagentTools = host.filterTools(effectiveCfg.tools);
     const baseSystem = await host.deps.systemPromptBuilder.build({
       cwd: subCwd,
       projectRoot: host.deps.projectRoot,
-      tools: host.filterTools(effectiveCfg.tools),
+      tools: subagentTools,
+      catalogTools: subagentTools,
       model: effModel,
       provider: effProvider,
       subagent: true,
       onlineAgents
     });
-    baseSystem.unshift({ type: "text", text: DEFAULT_SUBAGENT_BASELINE });
+    baseSystem.unshift({
+      type: "text",
+      text: renderInstructionLayer(DEFAULT_SUBAGENT_BASELINE, {
+        toolNames: new Set(subagentTools.map((tool) => tool.name)),
+        tier: "off",
+        subagent: true,
+        strictToolReferences: true
+      })
+    });
     if (availabilityNotice) baseSystem.push({ type: "text", text: availabilityNotice });
     const audienceMemory = await retrieveHostSubagentMemory(
       host.deps,
@@ -3825,7 +3870,8 @@ ${audienceMemory.map((text) => `- ${text}`).join("\n")}`
     const roleSkillContent = await resolveHostSubagentSkillContent(
       host.deps,
       host.roster,
-      effectiveCfg
+      effectiveCfg,
+      subagentTools.map((tool) => tool.name)
     );
     if (roleSkillContent) {
       for (let index = baseSystem.length - 1; index >= 0; index--) {
@@ -3872,7 +3918,8 @@ ${audienceMemory.map((text) => `- ${text}`).join("\n")}`
       projectRoot: host.deps.projectRoot,
       allowOutsideProjectRoot: config.features?.allowOutsideProjectRoot ?? !(config.tools?.restrictToProjectRoot ?? false),
       model: effModel,
-      tools: host.filterTools(tools),
+      tools: subagentTools,
+      catalogTools: subagentTools,
       agentId: subagentName,
       agentName: effectiveCfg.name ?? subagentName
     });
@@ -4125,6 +4172,9 @@ import {
 var DEFAULT_MIN_INTERVAL_MS = 15e3;
 var DEFAULT_GLOBAL_PER_MINUTE = 20;
 var BODY_MAX = 200;
+function isSilentInfrastructureAgent(name) {
+  return name.trim().toLowerCase() === "chimera-review";
+}
 function createFleetStatusBroadcaster(opts) {
   const cfg = opts.config;
   const minIntervalMs = cfg?.minIntervalMsPerAgent ?? DEFAULT_MIN_INTERVAL_MS;
@@ -4144,6 +4194,7 @@ function createFleetStatusBroadcaster(opts) {
   let droppedSinceLastSend = 0;
   const announcedSpawn = /* @__PURE__ */ new Set();
   const announcedBudget = /* @__PURE__ */ new Set();
+  const silentInfrastructureAgents = /* @__PURE__ */ new Set();
   const disposers = [];
   let stopped = false;
   function underGlobalCap(now) {
@@ -4208,9 +4259,14 @@ function createFleetStatusBroadcaster(opts) {
         opts.events.on("subagent.spawned", (e) => {
           if (announcedSpawn.has(e.subagentId)) return;
           announcedSpawn.add(e.subagentId);
+          const name = e.name ?? nameOf(e.subagentId);
+          if (isSilentInfrastructureAgent(name)) {
+            silentInfrastructureAgents.add(e.subagentId);
+            return;
+          }
           broadcast(e.subagentId, {
-            subject: `[${e.name ?? nameOf(e.subagentId)}] joined the fleet`,
-            body: `${e.name ?? nameOf(e.subagentId)} spawned${e.model ? ` on ${e.model}` : ""}${e.description ? ` \u2014 ${e.description.slice(0, 80)}` : ""}`,
+            subject: `[${name}] joined the fleet`,
+            body: `${name} spawned${e.model ? ` on ${e.model}` : ""}${e.description ? ` \u2014 ${e.description.slice(0, 80)}` : ""}`,
             priority: "low"
           });
         }),
@@ -4224,6 +4280,9 @@ function createFleetStatusBroadcaster(opts) {
         opts.events.on("subagent.task_completed", (e) => {
           heartbeat({ agentId: e.subagentId, status: "idle" });
           const name = nameOf(e.subagentId);
+          if (silentInfrastructureAgents.has(e.subagentId) || isSilentInfrastructureAgent(name)) {
+            return;
+          }
           const ok = e.status === "success";
           const secs = Math.round(e.durationMs / 1e3);
           broadcast(e.subagentId, {
@@ -4234,6 +4293,9 @@ function createFleetStatusBroadcaster(opts) {
         }),
         opts.events.on("subagent.budget_warning", (e) => {
           if (!broadcastBudgetWarnings) return;
+          if (silentInfrastructureAgents.has(e.subagentId) || isSilentInfrastructureAgent(nameOf(e.subagentId))) {
+            return;
+          }
           const key = `${e.subagentId}|${e.kind}`;
           if (announcedBudget.has(key)) return;
           announcedBudget.add(key);
@@ -4260,6 +4322,7 @@ function createFleetStatusBroadcaster(opts) {
           void mb().deregisterAgent(e.subagentId).catch(() => {
           });
           announcedSpawn.delete(e.subagentId);
+          silentInfrastructureAgents.delete(e.subagentId);
           lastSentAt.delete(e.subagentId);
           for (const key of announcedBudget) {
             if (key.startsWith(`${e.subagentId}|`)) announcedBudget.delete(key);
@@ -4366,7 +4429,47 @@ function buildFleetHostStatus(input) {
   const completedCount = completed.length;
   const liveCount = live.filter((s) => s.status === "running" || s.status === "idle").length;
   const summary = !input.coordinatorStatus && !input.completedResults ? "No subagents have been spawned." : liveCount > 0 ? `${pending.length} pending, ${liveCount} active, ${completedCount} completed.` : `${pending.length} pending, ${completedCount} completed.`;
-  return { pending, completed, live, summary };
+  return {
+    pending,
+    completed,
+    live,
+    summary,
+    ...input.budget ? { budget: input.budget } : {}
+  };
+}
+function formatFleetBudgetLines(budget, colorize) {
+  const bold = colorize?.bold ?? ((s) => s);
+  const dim = colorize?.dim ?? ((s) => s);
+  const amber = colorize?.amber ?? ((s) => s);
+  const fmtNum = (n) => Number.isFinite(n) ? String(n) : "\u221E";
+  const sourceSuffix = budget.effectiveSource ? `  ${dim(`(source: ${budget.effectiveSource})`)}` : "";
+  const lines = [
+    bold("Budget"),
+    `  maxConcurrent: ${budget.maxConcurrent}  \xB7  activeAgents: ${budget.activeAgents}`,
+    `  maxSpawns: ${fmtNum(budget.maxSpawns)}  \xB7  usedSpawns: ${budget.usedSpawns}  \xB7  remainingSpawns: ${fmtNum(budget.remainingSpawns)}${sourceSuffix}`
+  ];
+  if (budget.maxTokens !== void 0 && Number.isFinite(budget.maxTokens) && budget.maxTokens < Number.POSITIVE_INFINITY) {
+    lines.push(
+      `  tokens: ${budget.usedTokens ?? 0} / ${fmtNum(budget.maxTokens)} remaining ${fmtNum(budget.remainingTokens ?? 0)}`
+    );
+  }
+  if (budget.maxCostUsd !== void 0 && Number.isFinite(budget.maxCostUsd) && budget.maxCostUsd < Number.POSITIVE_INFINITY) {
+    const used = budget.usedCostUsd ?? 0;
+    const rem = budget.remainingCostUsd ?? 0;
+    lines.push(
+      `  costUsd: ${used.toFixed(4)} / ${budget.maxCostUsd.toFixed(4)} remaining ${rem.toFixed(4)}`
+    );
+  }
+  if (budget.ceilingMismatch && budget.checkpointMaxSpawns !== void 0) {
+    lines.push(
+      amber(
+        `  \u26A0 checkpoint maxSpawns was ${budget.checkpointMaxSpawns}; live ceiling is ${fmtNum(budget.maxSpawns)}`
+      )
+    );
+  } else if (budget.checkpointMaxSpawns !== void 0) {
+    lines.push(dim(`  checkpointMaxSpawns: ${budget.checkpointMaxSpawns}`));
+  }
+  return lines;
 }
 function aggregateFleetUsage(completed) {
   const bySubagent = /* @__PURE__ */ new Map();
@@ -5074,9 +5177,44 @@ var MultiAgentHost = class {
       coordinatorStatus: this.director ? this.getCoordinator().getStatus() : null,
       fleetStatus: this.fleetManager?.getFleetStatus() ?? null,
       completedResults: this.director ? this.director.completedResults() : null,
-      shadowTaskIds: this.shadowTaskIds
+      shadowTaskIds: this.shadowTaskIds,
+      budget: this.budgetView()
     });
   }
+  /**
+   * Read-only concurrency + lifetime spawn budget for `/fleet status` and
+   * resume diagnostics. Safe when no director/fleet is active yet.
+   */
+  budgetView() {
+    const snap = this.fleetManager?.budgetSnapshot?.();
+    const maxSpawns = snap?.maxSpawns ?? this.opts.maxSpawns ?? this.director?.maxSpawns ?? Number.POSITIVE_INFINITY;
+    const usedSpawns = snap?.usedSpawns ?? this.director?.spawnCount ?? 0;
+    const remainingSpawns = snap?.remainingSpawns ?? Math.max(0, (Number.isFinite(maxSpawns) ? maxSpawns : Number.POSITIVE_INFINITY) - usedSpawns);
+    const live = this.director ? this.getCoordinator().getStatus().subagents.filter((s) => s.status === "running" || s.status === "idle").length : 0;
+    const maxConcurrentSource = this.opts.budgetSources?.maxConcurrent ?? "default";
+    const maxSpawnsSource = this.opts.budgetSources?.maxSpawns ?? "default";
+    const effectiveSource = `maxConcurrent=${maxConcurrentSource}, maxSpawns=${maxSpawnsSource}`;
+    return {
+      maxConcurrent: this.getMaxConcurrent(),
+      activeAgents: live,
+      maxSpawns,
+      usedSpawns,
+      remainingSpawns,
+      maxConcurrentSource,
+      maxSpawnsSource,
+      effectiveSource,
+      ...snap ? {
+        maxTokens: snap.maxTokens,
+        usedTokens: snap.usedTokens,
+        remainingTokens: snap.remainingTokens,
+        maxCostUsd: snap.maxCostUsd,
+        usedCostUsd: snap.usedCostUsd,
+        remainingCostUsd: snap.remainingCostUsd,
+        ...snap.checkpointMaxSpawns !== void 0 ? { checkpointMaxSpawns: snap.checkpointMaxSpawns } : {},
+        ...snap.ceilingMismatch ? { ceilingMismatch: true } : {}
+      } : {}
+    };
+  }
   usage() {
     const completed = this.director ? this.director.completedResults().filter((r) => !this.shadowTaskIds.has(r.taskId)) : [];
     return aggregateFleetUsage(completed);
@@ -5176,7 +5314,10 @@ function resolveProviderCfg(config, providerId) {
 function buildProviderForId(args, providerId) {
   const { cfg, factoryType } = resolveProviderCfg(args.config, providerId);
   const useRegistry = !!args.config.features.modelsRegistry && args.providerRegistry.has(factoryType);
-  return useRegistry ? args.providerRegistry.create(cfg, factoryType) : makeProviderFromConfig2(providerId, cfg);
+  return useRegistry ? args.providerRegistry.create(cfg, factoryType) : makeProviderFromConfig2(
+    providerId,
+    factoryType === "ai-gateway" ? { ...cfg, type: factoryType } : cfg
+  );
 }
 
 // src/wiring/brain-and-orchestration.ts
@@ -5415,8 +5556,12 @@ function setupBrainAndOrchestration(deps) {
           maxCostUsd: config.fleet.budget.maxCostUsd
         }
       } : {},
-      maxSpawns: config.fleet?.budget?.maxSpawns,
+      maxSpawns: deps.maxSpawns ?? config.fleet?.budget?.maxSpawns,
       maxConcurrent,
+      budgetSources: {
+        maxConcurrent: deps.maxConcurrentSource ?? "default",
+        maxSpawns: deps.maxSpawnsSource ?? "default"
+      },
       getLeaderMaxContext: () => effectiveMaxContextRef.current,
       brain,
       agentMonitor,
@@ -5438,6 +5583,7 @@ function setupBrainAndOrchestration(deps) {
       events
     })
   );
+  toolRegistry.exposeToProvider("delegate");
   toolRegistry.register(
     createMcpControlTool({
       getConfig: () => configStore.get(),
@@ -5445,13 +5591,17 @@ function setupBrainAndOrchestration(deps) {
       registry: mcpRegistry
     })
   );
-  if (config.features.tokenSavingMode) {
-    toolRegistry.register(
-      createMcpUseTool({
-        registry: mcpRegistry,
-        toolRegistry
-      })
-    );
+  if (normalizeTokenSavingTier2(config.features.tokenSavingMode) !== "off") {
+    toolRegistry.exposeToProvider("mcp_control");
+  }
+  toolRegistry.register(
+    createMcpUseTool({
+      registry: mcpRegistry,
+      toolRegistry
+    })
+  );
+  if (normalizeTokenSavingTier2(config.features.tokenSavingMode) !== "off") {
+    toolRegistry.exposeToProvider("mcp_use");
   }
   return {
     brain,
@@ -5933,13 +6083,78 @@ import * as path10 from "node:path";
 import { expectDefined as expectDefined2 } from "@wrongstack/core/utils";
 import { createAgentMonitorService } from "@wrongstack/core/coordination";
 import { sessionScopedPath as sessionScopedPath2 } from "@wrongstack/core/utils";
+
+// src/fleet/budget-source.ts
+import { DEFAULT_MAX_FLEET_SPAWNS as DEFAULT_MAX_FLEET_SPAWNS3 } from "@wrongstack/core/coordination";
+function positiveInt(raw) {
+  if (typeof raw === "number" && Number.isFinite(raw) && raw > 0) return Math.floor(raw);
+  if (typeof raw === "string" && raw.trim() !== "") {
+    const n = Number.parseInt(raw, 10);
+    if (Number.isFinite(n) && n > 0) return n;
+  }
+  return void 0;
+}
+function resolveFleetBudgetSources(input) {
+  const flags = input.flags ?? {};
+  const env = input.env ?? process.env;
+  const config = input.config;
+  const defaultMaxConcurrent = input.defaultMaxConcurrent ?? 4;
+  const defaultMaxSpawns = input.defaultMaxSpawns ?? DEFAULT_MAX_FLEET_SPAWNS3;
+  const maxConcurrentFlag = positiveInt(flags["max-concurrent"]);
+  const maxConcurrentEnv = positiveInt(env["WRONGSTACK_MAX_CONCURRENT"]);
+  const maxConcurrentProfile = positiveInt(config?.maxConcurrent);
+  let maxConcurrent;
+  let maxConcurrentSource;
+  if (maxConcurrentFlag !== void 0) {
+    maxConcurrent = maxConcurrentFlag;
+    maxConcurrentSource = "cli-flag";
+  } else if (maxConcurrentEnv !== void 0) {
+    maxConcurrent = maxConcurrentEnv;
+    maxConcurrentSource = "env";
+  } else if (maxConcurrentProfile !== void 0) {
+    maxConcurrent = maxConcurrentProfile;
+    maxConcurrentSource = "profile";
+  } else {
+    maxConcurrent = defaultMaxConcurrent;
+    maxConcurrentSource = "default";
+  }
+  const maxSpawnsFlag = positiveInt(flags["max-spawns"]);
+  const maxSpawnsEnv = positiveInt(env["WRONGSTACK_MAX_SPAWNS"]);
+  const maxSpawnsProfile = positiveInt(config?.fleet?.budget?.maxSpawns);
+  let maxSpawns;
+  let maxSpawnsSource;
+  if (maxSpawnsFlag !== void 0) {
+    maxSpawns = maxSpawnsFlag;
+    maxSpawnsSource = "cli-flag";
+  } else if (maxSpawnsEnv !== void 0) {
+    maxSpawns = maxSpawnsEnv;
+    maxSpawnsSource = "env";
+  } else if (maxSpawnsProfile !== void 0) {
+    maxSpawns = maxSpawnsProfile;
+    maxSpawnsSource = "profile";
+  } else {
+    maxSpawns = defaultMaxSpawns;
+    maxSpawnsSource = "default";
+  }
+  return {
+    maxConcurrent,
+    maxConcurrentSource,
+    maxSpawns,
+    maxSpawnsSource
+  };
+}
+
+// src/wiring/director-setup.ts
 function setupDirectorAndAutonomy(deps) {
   const { flags, config, wpaths, session, events, autonomyModeRef } = deps;
   const directorMode = true;
-  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 maxConcurrentFromConfig = typeof config.maxConcurrent === "number" && config.maxConcurrent > 0 ? config.maxConcurrent : void 0;
-  const maxConcurrent = Number.isFinite(maxConcurrentFromFlag) && maxConcurrentFromFlag > 0 ? maxConcurrentFromFlag : Number.isFinite(maxConcurrentFromEnv) && maxConcurrentFromEnv > 0 ? maxConcurrentFromEnv : Number.isFinite(maxConcurrentFromConfig) && maxConcurrentFromConfig > 0 ? maxConcurrentFromConfig : void 0;
+  const {
+    maxConcurrent: resolvedMaxConcurrent,
+    maxConcurrentSource,
+    maxSpawns,
+    maxSpawnsSource
+  } = resolveFleetBudgetSources({ flags, config });
+  const maxConcurrent = maxConcurrentSource === "default" ? void 0 : resolvedMaxConcurrent;
   const autonomyMode = (() => {
     const v = flags["autonomy"];
     if (v === "auto" || v === "suggest" || v === "eternal" || v === "eternal-parallel") return v;
@@ -5986,6 +6201,9 @@ function setupDirectorAndAutonomy(deps) {
     director: null,
     directorMode,
     maxConcurrent,
+    maxSpawns,
+    maxConcurrentSource,
+    maxSpawnsSource,
     autonomyMode,
     nextPredictEnabled,
     currentSuggestions,
@@ -6105,6 +6323,7 @@ ${color6.dim("\u2500".repeat(40))}` : "";
     onAgents: (subagentId) => formatAgents(input, subagentId),
     onFleet: (action, target) => handleFleetAction(input, action, target),
     onFleetStatus: () => input.getDirector()?.status() ?? null,
+    onFleetBudget: () => input.multiAgentHost.budgetView(),
     onFleetUsage: () => input.getDirector()?.snapshot() ?? null,
     onFleetKill: () => killFleet2(input.getDirector()),
     onFleetTerminate: async (subagentId) => {
@@ -6223,6 +6442,15 @@ async function handleFleetAction(input, action, target) {
 function formatFleetStatus(host) {
   const status = host.status();
   const lines = [color6.bold("Fleet status"), `  ${status.summary}`];
+  const budget = status.budget ?? host.budgetView();
+  lines.push(
+    "",
+    ...formatFleetBudgetLines(budget, {
+      bold: color6.bold,
+      dim: color6.dim,
+      amber: color6.amber
+    })
+  );
   const icons = { running: "\u25CF", idle: "\u25CB", stopped: "\u2298" };
   const active2 = status.live.filter((agent) => agent.status === "running" || agent.status === "idle");
   if (active2.length > 0) {
@@ -6762,6 +6990,7 @@ function setupHqTelemetry(deps) {
 // src/wiring/lifecycle-plugins.ts
 import * as path15 from "node:path";
 import { getSharedProjectMailbox as getSharedProjectMailbox8 } from "@wrongstack/core/coordination";
+import { CouncilOrchestrator, OneShotOrchestrator as OneShotOrchestrator2 } from "@wrongstack/core/execution";
 import { countShellHooks, HookRegistry, HookRunner, shellHooksEqual } from "@wrongstack/core/hooks";
 import { allServers } from "@wrongstack/core/infrastructure";
 import { TOKENS as TOKENS8 } from "@wrongstack/core/kernel";
@@ -6769,7 +6998,7 @@ import { NotifierImpl } from "@wrongstack/core/notifications";
 import {
   SlashCommandRegistry
 } from "@wrongstack/core/registry";
-import { normalizeTokenSavingTier as normalizeTokenSavingTier2 } from "@wrongstack/core/types";
+import { normalizeTokenSavingTier as normalizeTokenSavingTier3 } from "@wrongstack/core/types";
 import {
   createVaultBackedMcpAuthorizationProviderFactory,
   MCPAuthorizationManager,
@@ -7041,13 +7270,19 @@ function setupMetrics(params) {
 }
 
 // src/wiring/pipeline.ts
-import { Agent as Agent2, createDefaultPipelines as createDefaultPipelines2 } from "@wrongstack/core/agent";
-import { applyModelRuntime as applyModelRuntime2, AutoCompactionMiddleware } from "@wrongstack/core/execution";
-import { createSessionEventBridge as createSessionEventBridge2, resolveAuditLevel } from "@wrongstack/core/storage";
+import {
+  Agent as Agent2,
+  createDefaultPipelines as createDefaultPipelines2
+} from "@wrongstack/core/agent";
+import {
+  AutoCompactionMiddleware,
+  applyModelRuntime as applyModelRuntime2,
+  ToolExecutor as ToolExecutor2
+} from "@wrongstack/core/execution";
 import { TOKENS as TOKENS7 } from "@wrongstack/core/kernel";
-import { estimateRequestTokensCalibrated } from "@wrongstack/core/utils";
+import { createSessionEventBridge as createSessionEventBridge2, resolveAuditLevel } from "@wrongstack/core/storage";
 import { resolveContextWindowPolicy } from "@wrongstack/core/types";
-import { ToolExecutor as ToolExecutor2 } from "@wrongstack/core/execution";
+import { estimateRequestTokensCalibrated } from "@wrongstack/core/utils";
 
 // src/wiring/mailbox-bridge-bootstrap.ts
 import { resolveProjectDir as resolveProjectDir2 } from "@wrongstack/core/coordination";
@@ -7159,7 +7394,7 @@ async function bootstrapMailboxBridgeAtStartup(params) {
   if (!params.projectRoot) {
     return null;
   }
-  const mode = params.config?.features?.mailboxBridge ?? "auto";
+  const mode = params.config?.features?.mailboxBridge ?? "off";
   if (mode === "off") {
     return null;
   }
@@ -7181,10 +7416,10 @@ async function bootstrapMailboxBridgeAtStartup(params) {
   switch (handle.source) {
     case "joined":
     case "spawned":
-      params.logger.debug(
-        `mailbox bridge ready via ${handle.source} on ${params.source} boot`,
-        { url: handle.url, lockPath: handle.lockPath }
-      );
+      params.logger.debug(`mailbox bridge ready via ${handle.source} on ${params.source} boot`, {
+        url: handle.url,
+        lockPath: handle.lockPath
+      });
       break;
     case "unhealthy":
       params.logger.warn(
@@ -7350,6 +7585,133 @@ function createAgent(params) {
   });
 }
 
+// src/wiring/provider-utility-tools.ts
+import { createContextManagerTool as createContextManagerTool2 } from "@wrongstack/core/infrastructure";
+import { createCouncilTool, createOneShotLLMTool } from "@wrongstack/core/tools";
+import {
+  createCouncilPersonaRegistry,
+  createCouncilProfileRegistry,
+  OneShotOrchestrator
+} from "@wrongstack/core/execution";
+import { ModelRouter } from "@wrongstack/core/models";
+async function adoptResumedProvider(input) {
+  if (!input.resumedProvider && !input.resumedModel) return;
+  const config = input.getConfig();
+  const provider = input.resumedProvider?.trim() || config.provider;
+  const model = input.resumedModel?.trim() || config.model;
+  if (provider === config.provider && model === config.model) return;
+  const error = await input.switchProviderAndModel(provider, model);
+  if (error) {
+    const current = input.getConfig();
+    input.logger.warn(
+      `Resume: could not switch to the session's model ${provider}/${model} (${error}); continuing with ${current.provider}/${current.model}.`
+    );
+  }
+}
+function createLiveModelRouter(getConfig) {
+  return {
+    pickForTask(role, description) {
+      const config = getConfig();
+      const router = new ModelRouter({
+        ...config.modelMatrix ? { matrix: config.modelMatrix } : {},
+        config: {
+          provider: config.provider,
+          model: config.model,
+          ...config.providers ? { providers: config.providers } : {}
+        }
+      });
+      return router.pickForTask(role, description);
+    }
+  };
+}
+function buildCouncilRegistries(cfg) {
+  const base = {
+    ...cfg?.defaultProfile ? { defaultProfile: cfg.defaultProfile } : {},
+    ...cfg?.maxConcurrency !== void 0 ? { maxConcurrency: cfg.maxConcurrency } : {}
+  };
+  if (!cfg?.personas?.length && !cfg?.profiles?.length) return base;
+  try {
+    const personas = createCouncilPersonaRegistry(cfg.personas ?? []);
+    const profiles = createCouncilProfileRegistry(
+      cfg.profiles ?? [],
+      personas
+    );
+    return { ...base, personas, profiles };
+  } catch (error) {
+    console.warn(
+      `Council tool: ignoring tools.council personas/profiles \u2014 ${error instanceof Error ? error.message : String(error)}. Falling back to the built-in lenses and panels.`
+    );
+    return base;
+  }
+}
+function registerProviderUtilityTools(input) {
+  const config = input.getConfig();
+  const llmTool = createOneShotLLMTool({
+    buildProvider: input.buildProvider,
+    getConfig: input.getConfig,
+    fallbackProfileManager: input.fallbackProfileManager,
+    defaultProvider: config.provider,
+    defaultModel: config.model,
+    wrapProviderCall: input.wrapProviderCall
+  });
+  registerOrOverride(input.toolRegistry, "llm", llmTool);
+  const councilOrchestrator = new OneShotOrchestrator({
+    buildProvider: input.buildProvider,
+    getConfig: input.getConfig,
+    fallbackProfileManager: input.fallbackProfileManager,
+    statusTracker: input.statusTracker,
+    // Council profiles route each seat by ROLE ('planner', 'critic',
+    // 'analyst', 'security-reviewer'…) rather than pinning models. Without a
+    // router those hints were inert: every seat fell through to the session
+    // provider/model, so a three-seat panel asked one model three times and
+    // reported a distinctness warning on every single call.
+    modelRouter: createLiveModelRouter(input.getConfig),
+    wrapProviderCall: input.wrapProviderCall
+  });
+  registerOrOverride(
+    input.toolRegistry,
+    "council",
+    createCouncilTool({
+      caller: councilOrchestrator,
+      fallbackProfileManager: input.fallbackProfileManager,
+      ...buildCouncilRegistries(config.tools?.council)
+    })
+  );
+  try {
+    const summarizer = new OneShotOrchestrator({
+      buildProvider: input.buildProvider,
+      getConfig: input.getConfig,
+      fallbackProfileManager: input.fallbackProfileManager,
+      statusTracker: input.statusTracker,
+      wrapProviderCall: input.wrapProviderCall
+    });
+    input.toolRegistry.override(
+      "context_manager",
+      createContextManagerTool2({
+        compactor: input.compactor,
+        summarizer: async (messages) => {
+          const result = await summarizer.call({
+            system: "Summarize concisely. Keep decisions and key facts.",
+            messages,
+            model: "deepseek-chat",
+            maxTokens: 1024,
+            timeoutMs: 3e4
+          });
+          return result.text || "(summary unavailable)";
+        }
+      })
+    );
+  } catch {
+  }
+}
+function registerOrOverride(registry, name, tool) {
+  try {
+    registry.register(tool);
+  } catch {
+    registry.override(name, tool);
+  }
+}
+
 // src/wiring/lifecycle-plugins.ts
 async function setupLifecycleAndPlugins(deps) {
   const {
@@ -7506,7 +7868,7 @@ async function setupLifecycleAndPlugins(deps) {
     toolRegistry,
     events,
     log: logger,
-    lazyMode: normalizeTokenSavingTier2(config.features.tokenSavingMode) !== "off",
+    lazyMode: normalizeTokenSavingTier3(config.features.tokenSavingMode) !== "off",
     cacheDir: wpaths.cacheDir,
     authorizationProviderFactory: createVaultBackedMcpAuthorizationProviderFactory({
       store: mcpTokenStore
@@ -7532,6 +7894,31 @@ async function setupLifecycleAndPlugins(deps) {
     () => hqPublisherRef.current
   );
   const notifier = new NotifierImpl();
+  const getLiveConfig = () => configStore.get();
+  const fallbackProfileManager = container.resolve(TOKENS8.FallbackProfileManager);
+  const statusTracker = container.resolve(TOKENS8.ProviderModelStatusTracker);
+  const buildUtilityProvider = (providerId) => buildProviderForIdRuntimeFn({ config: getLiveConfig(), providerRegistry }, providerId);
+  const pluginOneShot = new OneShotOrchestrator2({
+    buildProvider: buildUtilityProvider,
+    getConfig: getLiveConfig,
+    fallbackProfileManager,
+    statusTracker,
+    modelRouter: createLiveModelRouter(getLiveConfig),
+    logger,
+    // Route plugin completions through the same extension chain the agent loop
+    // uses. `prompt-firewall` (credential redaction), `llm-cache`,
+    // `model-router` and the token budgeter all live on `wrapProviderRunner`,
+    // and `api.llm` reached the provider without any of them. Resolved per
+    // call so a plugin enabled mid-session joins the chain.
+    wrapProviderCall: (request, inner) => agent.extensions.wrapProviderRunner((_ctx, req) => inner(req), {
+      exclude: ["fallback-model"]
+    })(agent.ctx, request)
+  });
+  const pluginCouncil = new CouncilOrchestrator({
+    caller: pluginOneShot,
+    fallbackProfileManager,
+    ...buildCouncilRegistries(getLiveConfig().tools?.council)
+  });
   const pluginHost = await setupPlugins({
     config,
     container,
@@ -7572,7 +7959,9 @@ async function setupLifecycleAndPlugins(deps) {
       model: config.model,
       getProvider: () => context.provider,
       getModel: () => context.model,
-      createProvider: (name) => buildProviderForIdRuntimeFn({ config: configStore.get(), providerRegistry }, name)
+      createProvider: (name) => buildProviderForIdRuntimeFn({ config: configStore.get(), providerRegistry }, name),
+      oneShot: (input) => pluginOneShot.call(input),
+      council: (question) => pluginCouncil.ask(question)
     }
   });
   return {
@@ -7593,12 +7982,16 @@ async function setupLifecycleAndPlugins(deps) {
 
 // src/wiring/management-tools.ts
 import * as fs5 from "node:fs/promises";
-import { createFallbackManageTools, createPluginManagerTool } from "@wrongstack/core/tools";
+import {
+  createFallbackManageTools,
+  createPluginManagerTool
+} from "@wrongstack/core/tools";
 function registerCliManagementTools({
   toolRegistry,
   configStore,
   profileConfigPath,
-  stdinInteractive
+  stdinInteractive,
+  getHookRunner
 }) {
   const fallbackManageTools = createFallbackManageTools({
     getConfig: () => configStore.get(),
@@ -7628,6 +8021,7 @@ ${prompt}
   for (const tool of fallbackManageTools) toolRegistry.register(tool);
   toolRegistry.register(
     createPluginManagerTool({
+      ...getHookRunner ? { getHookRunner } : {},
       getConfig: () => configStore.get(),
       catalog: PLUGIN_AUDIT_ENTRIES.map((entry) => {
         const aliases = [
@@ -7672,6 +8066,61 @@ import {
 } from "@wrongstack/core/storage";
 import { withCatalogCapabilities as withCatalogCapabilities2 } from "@wrongstack/providers";
 import { getSageService } from "@wrongstack/sage";
+
+// src/wiring/fallback-gate.ts
+function createFallbackGate(_events) {
+  const gateFn = (params) => {
+    const { events: bus, sessionId, from, status, candidates, autoSwitchSeconds, requestId } = params;
+    return runGate(bus, { sessionId, from, status, candidates, autoSwitchSeconds, requestId });
+  };
+  return gateFn;
+}
+function runGate(events, gateParams) {
+  const { sessionId, from, status, candidates, autoSwitchSeconds, requestId } = gateParams;
+  if (events.listenerCount("provider.fallback_pending") === 0) {
+    return Promise.resolve(null);
+  }
+  return new Promise((resolve8) => {
+    let settled = false;
+    let timer;
+    let deadline;
+    const cleanup = () => {
+      if (timer) clearTimeout(timer);
+      if (deadline) clearTimeout(deadline);
+      events.off("provider.fallback_choice", handler);
+    };
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve8(result);
+    };
+    const handler = (payload) => {
+      const p = payload;
+      if (p?.requestId !== requestId) return;
+      if (p.autoSwitch === true) {
+        finish(null);
+        return;
+      }
+      if (typeof p.providerId === "string" && typeof p.model === "string") {
+        finish({ providerId: p.providerId, model: p.model });
+      }
+    };
+    events.on("provider.fallback_choice", handler);
+    deadline = setTimeout(() => finish(null), Math.round(autoSwitchSeconds * 1500));
+    events.emit("provider.fallback_pending", {
+      ...sessionId ? { sessionId } : {},
+      from,
+      status,
+      candidates,
+      autoSwitchSeconds,
+      requestId,
+      timestamp: Date.now()
+    });
+  });
+}
+
+// src/wiring/provider-runtime-setup.ts
 function serializeProviderRuntimeSnapshot(snapshot) {
   return JSON.stringify(snapshot);
 }
@@ -7736,6 +8185,12 @@ function setupProviderRuntime(deps) {
       events,
       logger,
       statusTracker,
+      // Fallback gate — shows a modal with countdown + manual pick in every
+      // UI surface (TUI/WebUI/SimpleUI) before switching models. The gate
+      // emits provider.fallback_pending and waits for provider.fallback_choice
+      // or the auto-switch countdown.
+      fallbackGate: createFallbackGate(events),
+      fallbackGateSeconds: 7,
       ...cfg.fallbackStickiness?.primaryProbeInterval !== void 0 ? { primaryCooldownMs: cfg.fallbackStickiness.primaryProbeInterval } : {},
       ...cfg.fallbackStickiness?.stickyFallbackTurns !== void 0 ? { stickyFallbackTurns: cfg.fallbackStickiness.stickyFallbackTurns } : {}
     })
@@ -7783,19 +8238,34 @@ function setupProviderRuntime(deps) {
   if (process.env["WRONGSTACK_DISABLE_CONFIG_WATCH"] !== "1") {
     const activeProfile = typeof cfg.activeProfile === "string" && cfg.activeProfile ? cfg.activeProfile : "default";
     const configLayers = [
-      { path: wpaths.profileConfig(activeProfile), priority: 1 },
-      { path: wpaths.projectLocalConfig, priority: 2 },
-      { path: wpaths.inProjectConfig, priority: 3 }
+      { path: wpaths.profileConfig(activeProfile), priority: 1, trusted: true },
+      { path: wpaths.projectLocalConfig, priority: 2, trusted: true },
+      { path: wpaths.inProjectConfig, priority: 3, trusted: false }
     ];
+    const sanitizeUntrustedSnapshot = (snap, path32) => {
+      const { providers, apiKey, baseUrl, ...rest } = snap;
+      const dropped = [
+        ...Object.keys(providers ?? {}).length > 0 ? ["providers"] : [],
+        ...apiKey !== void 0 ? ["apiKey"] : [],
+        ...baseUrl !== void 0 ? ["baseUrl"] : []
+      ];
+      if (dropped.length > 0) {
+        logger.warn(
+          `Config watcher: ignored credential field(s) from the repo-committed config "${path32}": ${dropped.join(", ")}. Only your profile config may set these.`
+        );
+      }
+      return { ...rest, providers: {}, snapshotHasProviders: false };
+    };
     const readMergedSnapshot = async () => {
       let merged;
       for (const layer of configLayers.sort((a, b) => a.priority - b.priority)) {
-        const snap = await readProviderSnapshot(
+        const raw = await readProviderSnapshot(
           layer.path,
           vault,
           (msg) => logger.warn(`Config watcher (${layer.path}): ${msg}`)
         );
-        if (!snap) continue;
+        if (!raw) continue;
+        const snap = layer.trusted ? raw : sanitizeUntrustedSnapshot(raw, layer.path);
         if (!merged) {
           merged = {
             ...snap,
@@ -7977,130 +8447,6 @@ function warnUnlessMissing(logger, operation, error) {
   }
 }
 
-// src/wiring/provider-utility-tools.ts
-import { createContextManagerTool as createContextManagerTool2 } from "@wrongstack/core/infrastructure";
-import { createCouncilTool, createOneShotLLMTool } from "@wrongstack/core/tools";
-import {
-  createCouncilPersonaRegistry,
-  createCouncilProfileRegistry,
-  OneShotOrchestrator
-} from "@wrongstack/core/execution";
-import { ModelRouter } from "@wrongstack/core/models";
-async function adoptResumedProvider(input) {
-  if (!input.resumedProvider && !input.resumedModel) return;
-  const config = input.getConfig();
-  const provider = input.resumedProvider?.trim() || config.provider;
-  const model = input.resumedModel?.trim() || config.model;
-  if (provider === config.provider && model === config.model) return;
-  const error = await input.switchProviderAndModel(provider, model);
-  if (error) {
-    const current = input.getConfig();
-    input.logger.warn(
-      `Resume: could not switch to the session's model ${provider}/${model} (${error}); continuing with ${current.provider}/${current.model}.`
-    );
-  }
-}
-function createLiveModelRouter(getConfig) {
-  return {
-    pickForTask(role, description) {
-      const config = getConfig();
-      const router = new ModelRouter({
-        ...config.modelMatrix ? { matrix: config.modelMatrix } : {},
-        config: {
-          provider: config.provider,
-          model: config.model,
-          ...config.providers ? { providers: config.providers } : {}
-        }
-      });
-      return router.pickForTask(role, description);
-    }
-  };
-}
-function buildCouncilRegistries(cfg) {
-  const base = {
-    ...cfg?.defaultProfile ? { defaultProfile: cfg.defaultProfile } : {},
-    ...cfg?.maxConcurrency !== void 0 ? { maxConcurrency: cfg.maxConcurrency } : {}
-  };
-  if (!cfg?.personas?.length && !cfg?.profiles?.length) return base;
-  try {
-    const personas = createCouncilPersonaRegistry(cfg.personas ?? []);
-    const profiles = createCouncilProfileRegistry(
-      cfg.profiles ?? [],
-      personas
-    );
-    return { ...base, personas, profiles };
-  } catch (error) {
-    console.warn(
-      `Council tool: ignoring tools.council personas/profiles \u2014 ${error instanceof Error ? error.message : String(error)}. Falling back to the built-in lenses and panels.`
-    );
-    return base;
-  }
-}
-function registerProviderUtilityTools(input) {
-  const config = input.getConfig();
-  const llmTool = createOneShotLLMTool({
-    buildProvider: input.buildProvider,
-    getConfig: input.getConfig,
-    fallbackProfileManager: input.fallbackProfileManager,
-    defaultProvider: config.provider,
-    defaultModel: config.model
-  });
-  registerOrOverride(input.toolRegistry, "llm", llmTool);
-  const councilOrchestrator = new OneShotOrchestrator({
-    buildProvider: input.buildProvider,
-    getConfig: input.getConfig,
-    fallbackProfileManager: input.fallbackProfileManager,
-    statusTracker: input.statusTracker,
-    // Council profiles route each seat by ROLE ('planner', 'critic',
-    // 'analyst', 'security-reviewer'…) rather than pinning models. Without a
-    // router those hints were inert: every seat fell through to the session
-    // provider/model, so a three-seat panel asked one model three times and
-    // reported a distinctness warning on every single call.
-    modelRouter: createLiveModelRouter(input.getConfig)
-  });
-  registerOrOverride(
-    input.toolRegistry,
-    "council",
-    createCouncilTool({
-      caller: councilOrchestrator,
-      fallbackProfileManager: input.fallbackProfileManager,
-      ...buildCouncilRegistries(config.tools?.council)
-    })
-  );
-  try {
-    const summarizer = new OneShotOrchestrator({
-      buildProvider: input.buildProvider,
-      getConfig: input.getConfig,
-      fallbackProfileManager: input.fallbackProfileManager,
-      statusTracker: input.statusTracker
-    });
-    input.toolRegistry.override(
-      "context_manager",
-      createContextManagerTool2({
-        compactor: input.compactor,
-        summarizer: async (messages) => {
-          const result = await summarizer.call({
-            system: "Summarize concisely. Keep decisions and key facts.",
-            messages,
-            model: "deepseek-chat",
-            maxTokens: 1024,
-            timeoutMs: 3e4
-          });
-          return result.text || "(summary unavailable)";
-        }
-      })
-    );
-  } catch {
-  }
-}
-function registerOrOverride(registry, name, tool) {
-  try {
-    registry.register(tool);
-  } catch {
-    registry.override(name, tool);
-  }
-}
-
 // src/wiring/runtime-controller-deps.ts
 import { resolveConfiguredRefinerRef, resolveEnhanceFallbackRef } from "@wrongstack/core/execution";
 function createRuntimeControllerDeps(input) {
@@ -9055,8 +9401,9 @@ async function setupSession(params) {
         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(", ");
+        const spawnPart = typeof dirState.maxSpawns === "number" && Number.isFinite(dirState.maxSpawns) ? `, spawns ${dirState.spawnCount}/${dirState.maxSpawns} (checkpoint ceiling; live profile may differ)` : `, spawns used ${dirState.spawnCount}`;
         renderer.writeInfo(
-          `Prior fleet state: ${dirState.subagents.length} subagent${dirState.subagents.length === 1 ? "" : "s"}, tasks ${summary || "(none)"}.`
+          `Prior fleet state: ${dirState.subagents.length} subagent${dirState.subagents.length === 1 ? "" : "s"}, tasks ${summary || "(none)"}${spawnPart}.`
         );
       }
     } catch {
@@ -10584,15 +10931,16 @@ ${color13.dim("YOLO enabled; tool calls run without approval unless an explicit
 // src/slash-commands/brain.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
 import { readFile as readFile7 } from "node:fs/promises";
+import { parseModelRef } from "@wrongstack/core/agent";
 import { BUILTIN_COUNCIL_PERSONA_IDS, BUILTIN_COUNCIL_PERSONAS } from "@wrongstack/core/execution";
 import { color as color14 } from "@wrongstack/core/utils";
-import { parseModelRef } from "@wrongstack/core/agent";
 var RISK_LEVELS = /* @__PURE__ */ new Set(["off", "low", "medium", "high", "all"]);
 var COUNCIL_RISKS = /* @__PURE__ */ new Set(["medium", "high", "critical"]);
 var COUNCIL_DISTINCTNESS = /* @__PURE__ */ new Set(["none", "model", "provider"]);
 var COUNCIL_NUMERIC_OPS = {
   timeout: "perCallTimeoutMs",
   concurrency: "maxConcurrency",
+  votertokens: "voterMaxTokens",
   judgetokens: "judgeMaxTokens"
 };
 var PERSONA_SHORTHANDS = new Set(BUILTIN_COUNCIL_PERSONA_IDS);
@@ -10607,7 +10955,14 @@ var DENY_TERMINAL_VALUES = ["never", "when-decided", "always"];
 var TRACE_CONTENT_VALUES = ["none", "redacted", "full"];
 var TERMINAL_POLICY_VALUES = ["conservative", "deny-all", "continue-on-recommended"];
 var MONITOR_POLICY_VALUES = ["llm", "steer", "observe"];
-var DETERMINISTIC_TIER_NAMES = ["rule", "policy", "heuristic", "cache", "ledger-guard", "terminal"];
+var DETERMINISTIC_TIER_NAMES = [
+  "rule",
+  "policy",
+  "heuristic",
+  "cache",
+  "ledger-guard",
+  "terminal"
+];
 function parseRefEntry(ref) {
   const parsed = parseModelRef(ref);
   const model = parsed.model?.trim();
@@ -10675,7 +11030,7 @@ function buildBrainCommand(opts) {
       "  /brain council personas           List the built-in decision lenses",
       "  /brain council judge <ref|auto> | quorum <0..1> | approval <0..1>",
       "  /brain council distinctness <none|model|provider>   warn on a non-diverse panel",
-      "  /brain council timeout|concurrency|judgetokens <n|default>",
+      "  /brain council timeout|concurrency|votertokens|judgetokens <n|default>",
       "  /brain ledger [n]      Show the last n rows (default 15) of the persistent decision ledger",
       "  /brain ledger on|off | autodeny <n>",
       "  /brain stats           Per-tier decision counts: how often the Brain actually calls a model",
@@ -10787,7 +11142,10 @@ function buildBrainCommand(opts) {
           return { message: msg2 };
         }
         if (ref.toLowerCase() === "session") {
-          return applyPatch({ models: null }, (s) => `Brain decision model: ${color14.cyan("session model")} (pool cleared)${s.councilLabels.length === 0 ? "" : " \u2014 council dissolved"}`);
+          return applyPatch(
+            { models: null },
+            (s) => `Brain decision model: ${color14.cyan("session model")} (pool cleared)${s.councilLabels.length === 0 ? "" : " \u2014 council dissolved"}`
+          );
         }
         return applyPatch(
           { models: [ref] },
@@ -10803,7 +11161,10 @@ function buildBrainCommand(opts) {
           return { message: msg2 };
         }
         if (op === "clear") {
-          return applyPatch({ models: null }, () => `Brain LLM pool cleared \u2014 using the ${color14.cyan("session model")}`);
+          return applyPatch(
+            { models: null },
+            () => `Brain LLM pool cleared \u2014 using the ${color14.cyan("session model")}`
+          );
         }
         if (op === "add") {
           const ref = rest[1];
@@ -10813,7 +11174,10 @@ function buildBrainCommand(opts) {
             return { message: msg2 };
           }
           const current = (snapshot?.models ?? []).map(compactEntry);
-          return applyPatch({ models: [...current, ref] }, (s) => `Brain LLM pool: ${color14.cyan(poolSummary(s))}`);
+          return applyPatch(
+            { models: [...current, ref] },
+            (s) => `Brain LLM pool: ${color14.cyan(poolSummary(s))}`
+          );
         }
         if (op === "remove") {
           const target = rest[1];
@@ -10823,16 +11187,24 @@ function buildBrainCommand(opts) {
             return { message: msg2 };
           }
           const current = snapshot.models.map(compactEntry);
-          const idx = /^\d+$/.test(target) ? Number.parseInt(target, 10) - 1 : current.findIndex((c) => c === target || c.endsWith(`/${target}`) || c === parseRefEntry(target)?.model);
+          const idx = /^\d+$/.test(target) ? Number.parseInt(target, 10) - 1 : current.findIndex(
+            (c) => c === target || c.endsWith(`/${target}`) || c === parseRefEntry(target)?.model
+          );
           if (idx < 0 || idx >= current.length) {
             const msg2 = `No pool entry matches "${target}". Current pool: ${current.join(", ") || "(empty)"}`;
             opts.renderer.writeWarning(msg2);
             return { message: msg2 };
           }
           const next = current.filter((_, i) => i !== idx);
-          return applyPatch({ models: next.length > 0 ? next : null }, (s) => `Brain LLM pool: ${color14.cyan(poolSummary(s))}`);
+          return applyPatch(
+            { models: next.length > 0 ? next : null },
+            (s) => `Brain LLM pool: ${color14.cyan(poolSummary(s))}`
+          );
         }
-        return applyPatch({ models: rest }, (s) => `Brain LLM pool: ${color14.cyan(poolSummary(s))} ${color14.dim(`(${s.poolLabels.length}/${rest.length} resolved)`)}`);
+        return applyPatch(
+          { models: rest },
+          (s) => `Brain LLM pool: ${color14.cyan(poolSummary(s))} ${color14.dim(`(${s.poolLabels.length}/${rest.length} resolved)`)}`
+        );
       }
       if (subcommand === "strategy") {
         const strategy = (rest[0] ?? "").toLowerCase();
@@ -10882,7 +11254,10 @@ function buildBrainCommand(opts) {
           return { message: msg3 };
         }
         if (op === "on" || op === "off") {
-          return applyPatch({ council: { enabled: op === "on" } }, (s) => `Brain ${councilSummary(s)}${op === "on" && !s.council.enabled ? " \u2014 needs \u22652 resolvable voters (set /brain council voters or a \u22652-model pool)" : ""}`);
+          return applyPatch(
+            { council: { enabled: op === "on" } },
+            (s) => `Brain ${councilSummary(s)}${op === "on" && !s.council.enabled ? " \u2014 needs \u22652 resolvable voters (set /brain council voters or a \u22652-model pool)" : ""}`
+          );
         }
         if (op === "minrisk") {
           const level = (rest[1] ?? "").toLowerCase();
@@ -10891,7 +11266,10 @@ function buildBrainCommand(opts) {
             opts.renderer.writeWarning(msg3);
             return { message: msg3 };
           }
-          return applyPatch({ council: { minRisk: level } }, (s) => `Brain council risk floor set to ${color14.cyan(s.council.minRisk)} \u2014 questions at/above it convene the council`);
+          return applyPatch(
+            { council: { minRisk: level } },
+            (s) => `Brain council risk floor set to ${color14.cyan(s.council.minRisk)} \u2014 questions at/above it convene the council`
+          );
         }
         if (op === "voters") {
           const seats = rest.slice(1).map(parseSeat);
@@ -10900,7 +11278,10 @@ function buildBrainCommand(opts) {
             opts.renderer.writeWarning(msg3);
             return { message: msg3 };
           }
-          return applyPatch({ council: { voters: seats } }, councilSummary);
+          return applyPatch(
+            { council: { voters: seats } },
+            councilSummary
+          );
         }
         if (op === "personas") {
           const lines = [
@@ -10921,7 +11302,10 @@ function buildBrainCommand(opts) {
             opts.renderer.writeWarning(msg3);
             return { message: msg3 };
           }
-          return applyPatch({ council: { judge: ref.toLowerCase() === "auto" ? null : ref } }, (s) => `Brain council judge: ${color14.cyan(s.council.judge ? compactEntry(s.council.judge) : "auto")}${s.council.judge ? "" : color14.dim(judgeSummary(s).replace(/^, judge: /, " \u2192 "))}`);
+          return applyPatch(
+            { council: { judge: ref.toLowerCase() === "auto" ? null : ref } },
+            (s) => `Brain council judge: ${color14.cyan(s.council.judge ? compactEntry(s.council.judge) : "auto")}${s.council.judge ? "" : color14.dim(judgeSummary(s).replace(/^, judge: /, " \u2192 "))}`
+          );
         }
         if (op === "quorum" || op === "approval") {
           const value = Number(rest[1]);
@@ -10956,7 +11340,7 @@ function buildBrainCommand(opts) {
             return `Brain council ${op} set to ${color14.cyan(applied === void 0 ? "default" : String(applied))}`;
           });
         }
-        const msg2 = `Unknown council subcommand: ${op}. Use on, off, minrisk, voters, personas, judge, quorum, approval, distinctness, timeout, concurrency, or judgetokens.`;
+        const msg2 = `Unknown council subcommand: ${op}. Use on, off, minrisk, voters, personas, judge, quorum, approval, distinctness, timeout, concurrency, votertokens, or judgetokens.`;
         opts.renderer.writeWarning(msg2);
         return { message: msg2 };
       }
@@ -11077,7 +11461,9 @@ ${color14.dim(decision.rationale)}` : ""}`;
           lines.push(`  decision timeout: ${color14.cyan(`${snapshot.decisionTimeoutMs}ms`)}`);
         }
         if (snapshot?.humanTimeoutMs) {
-          lines.push(`  human timeout:    ${color14.cyan(`${snapshot.humanTimeoutMs}ms`)} ${color14.dim("(then terminal policy)")}`);
+          lines.push(
+            `  human timeout:    ${color14.cyan(`${snapshot.humanTimeoutMs}ms`)} ${color14.dim("(then terminal policy)")}`
+          );
         }
         const councilSeats = opts.brainSettings?.councilLabels ?? [];
         if (councilSeats.length > 0) {
@@ -11296,7 +11682,9 @@ ${color14.dim(decision.rationale)}` : ""}`;
           `  enabled  ${snapshot.trace.enabled ? color14.cyan("yes") : color14.dim("no")}`,
           `  content  ${color14.cyan(snapshot.trace.content)}`,
           snapshot.trace.path ? `  path     ${color14.dim(snapshot.trace.path)}` : "",
-          color14.dim("  Records tiers, every pool target (incl. failures), council votes and tokens.")
+          color14.dim(
+            "  Records tiers, every pool target (incl. failures), council votes and tokens."
+          )
         ].filter(Boolean).join("\n");
         opts.renderer.write(msg2);
         return { message: msg2 };
@@ -11388,7 +11776,9 @@ Usage: /brain escalation <conservative|deny-all|continue-on-recommended>`;
           `  enabled  ${m.enabled === false ? color14.dim("no") : color14.cyan("yes")}`,
           `  policy   ${color14.cyan(m.policy ?? "llm")}`,
           color14.dim("  Signals: tool-failure streak, error storm, agent stall, file churn."),
-          color14.dim("  Changes apply live; a change restarts the watchers, resetting signal counters.")
+          color14.dim(
+            "  Changes apply live; a change restarts the watchers, resetting signal counters."
+          )
         ].join("\n");
         opts.renderer.write(msg2);
         return { message: msg2 };
@@ -11426,7 +11816,10 @@ Usage: /brain escalation <conservative|deny-all|continue-on-recommended>`;
         }
         const snapshot = opts.brainRuntime?.getSnapshot();
         if (snapshot?.cache.enabled) {
-          lines.push("", color14.dim(`  cache: ${snapshot.cache.hits} hit / ${snapshot.cache.misses} miss`));
+          lines.push(
+            "",
+            color14.dim(`  cache: ${snapshot.cache.hits} hit / ${snapshot.cache.misses} miss`)
+          );
         }
         if (snapshot?.circuit && snapshot.circuit.state !== "closed") {
           lines.push(color14.dim(`  circuit: ${snapshot.circuit.state}`));
@@ -11437,7 +11830,10 @@ Usage: /brain escalation <conservative|deny-all|continue-on-recommended>`;
             lines.push(color14.dim(`  ${fmtAge(w.at).padEnd(8)} ${w.outcome}`));
           }
         }
-        lines.push("", color14.dim(`  Based on the last ${log.length} logged decision(s) of this session.`));
+        lines.push(
+          "",
+          color14.dim(`  Based on the last ${log.length} logged decision(s) of this session.`)
+        );
         const msg2 = lines.join("\n");
         opts.renderer.write(msg2);
         return { message: msg2 };
@@ -11574,6 +11970,7 @@ function buildClearCommand(opts) {
         ctx.contextEvidence = createContextEvidenceState();
         ctx.toolAdjacencyDirty = false;
         ctx.pendingPostToolContext = void 0;
+        ctx.clearMemoryEvidence?.();
         ctx.lastRequestTokens = void 0;
         ctx.lastRealInputTokens = void 0;
         for (const key of Object.keys(ctx.meta)) ctx.state.deleteMeta(key);
@@ -11861,8 +12258,17 @@ function buildCompactCommand(opts) {
 
 // src/slash-commands/context.ts
 import * as fs7 from "node:fs/promises";
-import { atomicWrite as atomicWrite3, color as color18, getContextBreakdown, repairToolUseAdjacency } from "@wrongstack/core/utils";
-import { formatContextWindowModeList, getContextWindowMode, resolveContextWindowPolicy as resolveContextWindowPolicy2 } from "@wrongstack/core/types";
+import {
+  formatContextWindowModeList,
+  getContextWindowMode,
+  resolveContextWindowPolicy as resolveContextWindowPolicy2
+} from "@wrongstack/core/types";
+import {
+  atomicWrite as atomicWrite3,
+  color as color18,
+  getContextBreakdown,
+  repairToolUseAdjacency
+} from "@wrongstack/core/utils";
 function buildContextCommand(opts) {
   return {
     name: "context",
@@ -12095,6 +12501,7 @@ function cacheMechanismLabel(providerId, cacheControl) {
   if (id.includes("google") || id.includes("gemini")) {
     return "implicit (auto) + explicit cachedContents (opt-in)";
   }
+  if (id.includes("gateway")) return "automatic (Gateway-managed, per routed upstream)";
   if (cacheControl === "auto") return "automatic + prompt_cache_key routing";
   return "none / provider-managed";
 }
@@ -12133,7 +12540,14 @@ function safeBreakdown(ctx) {
     return getContextBreakdown(ctx);
   } catch (err) {
     if (process.env["DEBUG_WS"]) {
-      console.warn(JSON.stringify({ level: "warn", event: "context.breakdown_failed", message: String(err), timestamp: Date.now() }));
+      console.warn(
+        JSON.stringify({
+          level: "warn",
+          event: "context.breakdown_failed",
+          message: String(err),
+          timestamp: Date.now()
+        })
+      );
     }
     return null;
   }
@@ -12161,7 +12575,7 @@ function renderBreakdown(bd, detailed) {
     `${color18.bold("Breakdown")} (${headerSuffix})`,
     `  system:   ${K(bd.system.total)} (${PCT(bd.system.total, limit)})`,
     `  tools:    ${K(bd.tools.total)} (${PCT(bd.tools.total, limit)})  \xB7  builtin ${K(bd.tools.builtin)}, mcp ${K(bd.tools.mcp)} across ${bd.tools.count} defs`,
-    `  history:  ${K(bd.history.total)} (${PCT(bd.history.total, limit)})  \xB7  text ${K(bd.history.text)}, tool results ${K(bd.history.toolResults)}`,
+    `  history:  ${K(bd.history.total)} (${PCT(bd.history.total, limit)})  \xB7  text ${K(bd.history.text)}, tool inputs ${K(bd.history.toolInputs ?? 0)}, results ${K(bd.history.toolResults)}, thinking ${K(bd.history.thinking ?? 0)}`,
     `  volatile: ${K(bd.volatile.total)} (${PCT(bd.volatile.total, limit)})  \xB7  ledger ${K(bd.volatile.ledger)}, nextsteps ${K(bd.volatile.nextsteps)}`,
     `  ${color18.bold("total")}:    ${K(bd.total)}${overBy > 0 ? "" : ` (${PCT(bd.total, limit)})`}`
   ];
@@ -12174,7 +12588,9 @@ function renderBreakdown(bd, detailed) {
   if (sources.length > 0) {
     const top = detailed ? sources : sources.slice(0, 3);
     out.push(
-      `  ${color18.dim("heaviest static:")} ${top.map(([src, tokens]) => `${SOURCE_LABELS[src] ?? src} ${K(tokens)}`).join(", ")}`
+      `  ${color18.dim("heaviest static:")} ${top.map(
+        ([src, tokens]) => `${SOURCE_LABELS[src] ?? src} ${K(tokens)}`
+      ).join(", ")}`
     );
     if (detailed && bd.tools.total > 0 && (bd.system.bySource["tool-usage"] ?? 0) > 0) {
       out.push(
@@ -13097,6 +13513,58 @@ function diagnoseConfig(cfg, plugins = []) {
       }
     }
   }
+  if ("fleet" in fixed) {
+    if (!isPlainObject(fixed["fleet"])) {
+      findings.push({
+        path: "fleet",
+        problem: `expected object, got ${JSON.stringify(fixed["fleet"])}`,
+        severity: "error",
+        fix: "removed (built-in defaults apply)"
+      });
+      delete fixed["fleet"];
+    } else {
+      const fleet = fixed["fleet"];
+      if ("budget" in fleet) {
+        if (!isPlainObject(fleet["budget"])) {
+          findings.push({
+            path: "fleet.budget",
+            problem: `expected object, got ${JSON.stringify(fleet["budget"])}`,
+            severity: "error",
+            fix: "removed (built-in defaults apply)"
+          });
+          delete fleet["budget"];
+        } else {
+          const budget = fleet["budget"];
+          for (const key of ["maxSpawns", "maxTokens", "maxCostUsd"]) {
+            if (!(key in budget)) continue;
+            const v = budget[key];
+            const n = coerceNumber(v);
+            if (n === void 0) {
+              delete budget[key];
+              findings.push({
+                path: `fleet.budget.${key}`,
+                problem: `expected a non-negative number, got ${JSON.stringify(v)}`,
+                severity: "error",
+                fix: "removed (built-in default applies)"
+              });
+            } else {
+              const clamped = Math.max(0, n);
+              const next = key === "maxCostUsd" ? clamped : Math.floor(clamped);
+              if (next !== v) {
+                budget[key] = next;
+                findings.push({
+                  path: `fleet.budget.${key}`,
+                  problem: `expected a non-negative ${key === "maxCostUsd" ? "number" : "integer"}, got ${JSON.stringify(v)}`,
+                  severity: "error",
+                  fix: `set to ${next}`
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
   for (const key of ["provider", "model"]) {
     if (key in fixed && typeof fixed[key] !== "string") {
       findings.push({
@@ -13380,7 +13848,7 @@ function buildDoctorCommand(opts) {
   ].join("\n");
   async function loadPluginSchemas() {
     try {
-      const { BUILTIN_PLUGIN_FACTORIES } = await import("./plugins-ETY6W3DC.js");
+      const { BUILTIN_PLUGIN_FACTORIES } = await import("./plugins-K3BAUP4D.js");
       const settled = await Promise.allSettled(BUILTIN_PLUGIN_FACTORIES.map((f) => f()));
       const loaded = [];
       for (const s of settled) {
@@ -15297,6 +15765,17 @@ async function handleStatus(opts, cmd) {
         lines.push(`  ${id} ${name} ${statusColor} ${ext}${task}`);
       }
     }
+    const budget = opts.onFleetBudget?.();
+    if (budget) {
+      lines.push(
+        "",
+        ...formatFleetBudgetLines(budget, {
+          bold: color26.bold,
+          dim: color26.dim,
+          amber: color26.amber
+        })
+      );
+    }
     const msg2 = lines.join("\n");
     opts.renderer.write(msg2);
     return { message: msg2 };
@@ -20462,6 +20941,7 @@ ${targetMode.description}`
 
 // src/slash-commands/modelcaps.ts
 import * as fs14 from "node:fs/promises";
+import { hasProviderCredential } from "@wrongstack/core/models";
 import { color as color36 } from "@wrongstack/core/utils";
 function fmtTokens(n) {
   if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
@@ -20569,13 +21049,7 @@ function buildModelCapsCommand(opts) {
       }
       const config = opts.configStore.get();
       const configProviders = config?.providers ?? {};
-      function hasKey(providerId) {
-        const pc = configProviders[providerId];
-        if (!pc) return false;
-        if (typeof pc.apiKey === "string" && pc.apiKey.length > 0) return true;
-        if (Array.isArray(pc.apiKeys) && pc.apiKeys.some((k) => k?.apiKey)) return true;
-        return false;
-      }
+      const hasKey = (provider) => hasProviderCredential(provider, { providers: configProviders });
       const lines = [
         `${color36.bold("Available Models")} ${color36.dim("\u2014 capacities + pricing")}`,
         ""
@@ -20585,7 +21059,7 @@ function buildModelCapsCommand(opts) {
         if (trimmed && !trimmed.includes("/") && !prov.id.toLowerCase().includes(trimmed) && !prov.name.toLowerCase().includes(trimmed)) {
           continue;
         }
-        const keyed = hasKey(prov.id);
+        const keyed = hasKey(prov);
         const marker = keyed ? color36.green("\u25CF") : color36.dim("\u25CB");
         lines.push(`  ${marker} ${color36.bold(prov.id.padEnd(16))} ${color36.dim(`(${prov.name})`)}`);
         const models = prov.models ?? [];
@@ -23502,6 +23976,26 @@ import { fallbackProfileChain } from "@wrongstack/core/agent";
 import { decryptConfigSecrets as decryptConfigSecrets4, encryptConfigSecrets as encryptConfigSecrets4, noOpVault as noOpVault6 } from "@wrongstack/core/security";
 import { MATRIX_PHASE_KEYS, matrixKeyKind, phaseForRole, resolveModelMatrix, resolveModelTargetFromEntry } from "@wrongstack/core/coordination";
 import { parseModelRef as parseModelRef3 } from "@wrongstack/core/agent";
+import { catalogProviderIdFor } from "@wrongstack/providers";
+async function resolveCatalogModelIds(registry, config, providerIds) {
+  const out = /* @__PURE__ */ new Map();
+  if (!registry) return out;
+  await Promise.all(
+    providerIds.map(async (id) => {
+      try {
+        const catalogId = catalogProviderIdFor(id, config.providers?.[id]?.type);
+        const provider = await registry.getProvider(catalogId);
+        if (provider) out.set(id, provider.models.map((m) => m.id));
+      } catch {
+      }
+    })
+  );
+  return out;
+}
+function summarizeModelIds(ids, limit = 8) {
+  if (ids.length <= limit) return ids.join(", ");
+  return `${ids.slice(0, limit).join(", ")} ${color44.dim(`\u2026 +${ids.length - limit} more`)}`;
+}
 function providerHasKey(entry) {
   if (!entry) return false;
   if (typeof entry.apiKey === "string" && entry.apiKey.length > 0) return true;
@@ -23703,9 +24197,10 @@ function buildSetModelCommand(opts) {
       );
       const matrix = config.modelMatrix ?? {};
       if (sub === "list") {
+        const catalogModels = await resolveCatalogModelIds(opts.modelsRegistry, config, keyed);
         const provLines = keyed.map((id) => {
-          const models = config.providers?.[id]?.models ?? [];
-          const ms = models.length ? models.join(", ") : color44.dim("(any model id accepted)");
+          const models = visibleModelIds(id, config, catalogModels.get(id) ?? []);
+          const ms = models.length ? summarizeModelIds(models) : color44.dim("(any model id accepted)");
           return `    ${color44.cyan(id.padEnd(16))} ${ms}`;
         });
         const roles = Object.keys(AGENT_CATALOG2).sort();
@@ -23781,6 +24276,11 @@ function buildSetModelCommand(opts) {
       if (sub === "doctor") {
         const issues = [];
         const warnings = [];
+        const doctorCatalogModels = await resolveCatalogModelIds(
+          opts.modelsRegistry,
+          config,
+          keyed
+        );
         for (const [key, entry] of Object.entries(matrix)) {
           const kind = matrixKeyKind(key);
           if (kind === "unknown") {
@@ -23803,9 +24303,14 @@ function buildSetModelCommand(opts) {
           const effectiveProvider = entry.provider ?? config.provider;
           const provCfg = config.providers?.[effectiveProvider];
           if (entry.model && provCfg?.models && provCfg.models.length > 0) {
-            if (!provCfg.models.includes(entry.model)) {
+            const reachable = visibleModelIds(
+              effectiveProvider,
+              config,
+              doctorCatalogModels.get(effectiveProvider) ?? []
+            );
+            if (!reachable.includes(entry.model)) {
               warnings.push(
-                `${color44.amber("\u26A0")} ${color44.amber(key)}: model "${entry.model}" not in ${effectiveProvider}'s model list (${provCfg.models.join(", ")})`
+                `${color44.amber("\u26A0")} ${color44.amber(key)}: model "${entry.model}" not in ${effectiveProvider}'s model list (${summarizeModelIds(reachable)})`
               );
             }
           }
@@ -25070,8 +25575,13 @@ async function switchProjectCommand(opts, ctx, target, displayName) {
   const child = spawn7(nodeExe, [cliPath, "--no-interactive"], {
     cwd: resolved,
     stdio: "inherit",
-    detached: false,
-    signal: AbortSignal.timeout(3e4)
+    detached: false
+    // NO abort signal: this child is a long-lived INTERACTIVE session that
+    // is meant to outlive the spawn call. The 30 s timeout fired 30 seconds
+    // after "Switched to <project> … (current session stays open)" and
+    // SIGTERM'd the new session mid-typing, with no message. Sibling
+    // long-lived spawns pass no signal (slash-commands/mailbox-serve.ts:98),
+    // and boot/tui-project-spawn.ts documents this exact bug being removed.
   });
   child.on("error", (err) => {
     console.error(color47.red(`Failed to spawn wstack: ${err.message}`));
@@ -25207,8 +25717,13 @@ async function spawnInProject(opts, _ctx, root, projectName) {
   const child = spawn7(nodeExe, [cliPath, "--no-interactive"], {
     cwd: root,
     stdio: "inherit",
-    detached: false,
-    signal: AbortSignal.timeout(3e4)
+    detached: false
+    // NO abort signal: this child is a long-lived INTERACTIVE session that
+    // is meant to outlive the spawn call. The 30 s timeout fired 30 seconds
+    // after "Switched to <project> … (current session stays open)" and
+    // SIGTERM'd the new session mid-typing, with no message. Sibling
+    // long-lived spawns pass no signal (slash-commands/mailbox-serve.ts:98),
+    // and boot/tui-project-spawn.ts documents this exact bug being removed.
   });
   child.on("error", (err) => {
     console.error(color47.red(`Failed to spawn wstack: ${err.message}`));
@@ -25244,8 +25759,13 @@ async function handleNewSession(_opts, _ctx) {
   const child = spawn7(nodeExe, [cliPath, "--no-interactive"], {
     cwd: process.cwd(),
     stdio: "inherit",
-    detached: false,
-    signal: AbortSignal.timeout(3e4)
+    detached: false
+    // NO abort signal: this child is a long-lived INTERACTIVE session that
+    // is meant to outlive the spawn call. The 30 s timeout fired 30 seconds
+    // after "Switched to <project> … (current session stays open)" and
+    // SIGTERM'd the new session mid-typing, with no message. Sibling
+    // long-lived spawns pass no signal (slash-commands/mailbox-serve.ts:98),
+    // and boot/tui-project-spawn.ts documents this exact bug being removed.
   });
   child.on("error", (err) => {
     console.error(color47.red(`Failed to spawn wstack: ${err.message}`));
@@ -25292,6 +25812,7 @@ async function handlePrevSessions(opts, _ctx) {
 import { spawn as spawn8 } from "node:child_process";
 import * as fsp3 from "node:fs/promises";
 import * as path27 from "node:path";
+import { emitReviewIfChanged } from "@wrongstack/core/plugin";
 async function runGit2(args, cwd) {
   return new Promise((resolve8) => {
     const child = spawn8("git", args, {
@@ -25385,16 +25906,29 @@ function buildReviewCommand(opts) {
           enabled: true,
           provider: ctx.provider.id,
           model: ctx.model,
-          maxFiles: limit
+          maxFiles: limit,
+          autoFix: "off",
+          cascadeOn: "off",
+          maxCascadeDepth: 0
         },
         cwd,
         files: filesWithContent
       };
-      opts.events.emitCustom("chimera.review_needed", payload);
+      const emitted = await emitReviewIfChanged(
+        { events: opts.events, emitCustom: opts.events.emitCustom.bind(opts.events) },
+        payload
+      );
+      if (!emitted) {
+        return {
+          message: "\u{1F982} Chimera review skipped \u2014 this file content already has a review in progress."
+        };
+      }
+      const skipped = filesWithContent.length - emitted.files.length;
       const note = truncated ? `
 ${existing.length - limit} more changed file(s) were not included \u2014 raise the cap with /review --limit ${existing.length}.` : "";
+      const skippedNote = skipped > 0 ? ` ${skipped} file(s) already under review were skipped.` : "";
       return {
-        message: `\u{1F982} Chimera review triggered for ${filesWithContent.length} file(s).
+        message: `\u{1F982} Chimera review triggered for ${emitted.files.length} file(s).${skippedNote}
 The review report will appear in chat history shortly.${note}`
       };
     }
@@ -25516,6 +26050,7 @@ function buildSettingsCommand(opts) {
     "  /settings context-strategy hybrid|intelligent|selective   Compactor strategy",
     "  /settings context-auto-compact on|off   Auto-compact context when thresholds crossed",
     "  /settings token-saving off|minimal|light|medium|aggressive   Token-saving mode",
+    "  /settings nextsteps-tool on|off   Give the leader a `nextsteps` tool alongside the <nextsteps> block (next session)",
     "  /settings mcp on|off            Load MCP servers declared in config",
     "  /settings plugins on|off        Load npm plugins declared in config",
     "  /settings memory on|off         Register remember/forget tools",
@@ -25565,6 +26100,7 @@ function buildSettingsCommand(opts) {
     const contextAutoCompact = context?.autoCompact !== false;
     const features = opts.configStore.get().features;
     const tokenSavingTier = features?.tokenSavingMode ?? "off";
+    const nextStepsToolEnabled = opts.configStore.get().tools?.nextsteps?.enabled === true;
     const maxConcurrent = opts.configStore.get().maxConcurrent ?? 4;
     const titleAnimation = autonomy?.terminalTitleAnimation !== false;
     const modelRuntime = opts.configStore.get().modelRuntime;
@@ -25607,6 +26143,7 @@ function buildSettingsCommand(opts) {
       `  context strategy:           ${color48.cyan(contextStrategy)}   ${color48.dim("change: /settings context-strategy hybrid|intelligent|selective")}`,
       `  context auto-compact:       ${contextAutoCompact ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("change: /settings context-auto-compact on|off")}`,
       `  token-saving:               ${color48.cyan(tokenSavingTier)}   ${color48.dim("change: /settings token-saving off|minimal|light|medium|aggressive")}`,
+      `  nextsteps tool:             ${nextStepsToolEnabled ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("change: /settings nextsteps-tool on|off")}`,
       `  MCP features:               ${feats?.mcp !== false ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("change: /settings mcp on|off")}`,
       `  plugin features:            ${feats?.plugins !== false ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("change: /settings plugins on|off")}`,
       `  memory features:            ${feats?.memory !== false ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("change: /settings memory on|off")}`,
@@ -26036,6 +26573,21 @@ function buildSettingsCommand(opts) {
             message: `${color48.green("\u2713")} context auto-compact \u2192 ${on ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("auto-compact context when thresholds crossed")}`
           };
         }
+        if (sub === "nextsteps-tool") {
+          const raw = (rest[0] ?? "").toLowerCase();
+          if (!["on", "off"].includes(raw)) {
+            return { message: `${color48.amber("Usage:")} /settings nextsteps-tool on|off` };
+          }
+          const on = raw === "on";
+          await persistConfigSetting(persistDeps, (cfg) => {
+            const tools = cfg.tools ?? {};
+            tools.nextsteps = { enabled: on };
+            cfg.tools = tools;
+          });
+          return {
+            message: `${color48.green("\u2713")} nextsteps tool \u2192 ${on ? color48.cyan("on") : color48.dim("off")}   ${color48.dim("takes effect in the next session")}`
+          };
+        }
         if (sub === "token-saving") {
           const raw = (rest[0] ?? "").toLowerCase();
           const tiers = ["off", "minimal", "light", "medium", "aggressive"];
@@ -29846,11 +30398,13 @@ async function runInteractive(cliCtx) {
     wpaths
   });
   const stdinInteractive = process.stdin.isTTY;
+  const hookRunnerRef = { current: null };
   registerCliManagementTools({
     toolRegistry,
     configStore,
     profileConfigPath,
-    stdinInteractive
+    stdinInteractive,
+    getHookRunner: () => hookRunnerRef.current
   });
   const { metricsSink, healthRegistry, metricsStatus } = (() => {
     const ms = setupMetrics({
@@ -29884,7 +30438,8 @@ async function runInteractive(cliCtx) {
   const systemPrompt = await promptBuilder.build({
     cwd,
     projectRoot,
-    tools: toolRegistry.list(),
+    tools: toolRegistry.listForProvider(),
+    catalogTools: toolRegistry.list(),
     provider: config.provider,
     model: config.model,
     onlineAgents
@@ -29998,7 +30553,8 @@ async function runInteractive(cliCtx) {
     slashRegistry,
     hqPublisherRef,
     brainMailbox,
-    pluginHost
+    pluginHost,
+    hookRunner
   } = await setupLifecycleAndPlugins({
     flags,
     config,
@@ -30035,6 +30591,7 @@ async function runInteractive(cliCtx) {
     logger,
     teardownHandlers
   });
+  hookRunnerRef.current = hookRunner;
   const fallbackProfileManager = container.resolve(TOKENS9.FallbackProfileManager);
   const statusTracker = await setupProviderStatus({
     events,
@@ -30079,11 +30636,21 @@ async function runInteractive(cliCtx) {
     getConfig: () => config,
     fallbackProfileManager,
     statusTracker,
+    wrapProviderCall: (request, inner) => agent.extensions.wrapProviderRunner(
+      (_ctx, wrappedRequest) => inner(wrappedRequest),
+      // OneShotOrchestrator owns the selected provider and fallback chain.
+      // The agent-loop fallback wrapper routes from and mutates agent.ctx,
+      // which may describe a different provider/model than this utility call.
+      { exclude: ["fallback-model"] }
+    )(agent.ctx, request),
     compactor: container.resolve(TOKENS9.Compactor)
   });
   let {
     director,
     maxConcurrent,
+    maxSpawns,
+    maxConcurrentSource,
+    maxSpawnsSource,
     autonomyMode,
     nextPredictEnabled,
     currentSuggestions,
@@ -30136,6 +30703,9 @@ async function runInteractive(cliCtx) {
     stateCheckpointPath,
     fleetRootForPromotion,
     maxConcurrent,
+    maxSpawns,
+    maxConcurrentSource,
+    maxSpawnsSource,
     effectiveMaxContextRef,
     mcpRegistry,
     sessResult,
@@ -30176,11 +30746,30 @@ async function runInteractive(cliCtx) {
     for (const tool of director.tools(FLEET_ROSTER5)) {
       toolRegistry.register(tool);
     }
-    renderer.writeInfo(`Director mode enabled. Roster: ${Object.keys(FLEET_ROSTER5).join(", ")}`);
-    renderer.writeInfo(`  fleet root \u2192 ${fleetRoot}`);
-    renderer.writeInfo(`  manifest   \u2192 ${manifestPath}`);
-    renderer.writeInfo(`  scratchpad \u2192 ${sharedScratchpadPath}`);
-    renderer.writeInfo(`  subagents  \u2192 ${subagentSessionsRoot}`);
+    const browserSurface = flags.webui === true || flags.simpleui === true;
+    if (browserSurface) {
+      renderer.writeInfo(
+        `Director mode enabled (${Object.keys(FLEET_ROSTER5).length} roles) \u2192 ${fleetRoot}`
+      );
+    } else {
+      renderer.writeInfo(`Director mode enabled. Roster: ${Object.keys(FLEET_ROSTER5).join(", ")}`);
+      renderer.writeInfo(`  fleet root \u2192 ${fleetRoot}`);
+      renderer.writeInfo(`  manifest   \u2192 ${manifestPath}`);
+      renderer.writeInfo(`  scratchpad \u2192 ${sharedScratchpadPath}`);
+      renderer.writeInfo(`  subagents  \u2192 ${subagentSessionsRoot}`);
+    }
+    if (priorFleetState) {
+      const budget = multiAgentHost.budgetView();
+      const fmt = (n) => Number.isFinite(n) ? String(n) : "\u221E";
+      renderer.writeInfo(
+        `  fleet budget \u2192 ${budget.usedSpawns}/${fmt(budget.maxSpawns)} spawns used (${fmt(budget.remainingSpawns)} remaining; maxConcurrent ${budget.maxConcurrent})`
+      );
+      if (budget.ceilingMismatch && budget.checkpointMaxSpawns !== void 0) {
+        renderer.writeInfo(
+          `  \u26A0 checkpoint maxSpawns was ${budget.checkpointMaxSpawns}; live ceiling is ${fmt(budget.maxSpawns)}`
+        );
+      }
+    }
   } else {
     renderer.writeInfo(`Running without Director \u2014 fleet orchestration tools disabled.`);
   }
@@ -30374,7 +30963,25 @@ async function runInteractive(cliCtx) {
     effectiveMaxContext: effectiveMaxContextRef.current,
     configRef,
     autonomyModeRef,
-    logger
+    logger,
+    // WITHOUT this the helper primed an engine and dropped it: the only live
+    // holder is the `eternalEngine` binding below, written solely by the slash
+    // handler. `--eternal "<mission>"` therefore forced YOLO on and set the
+    // mode to 'eternal', then the REPL found no engine, printed "no engine
+    // wired — falling back to off" on EVERY loop iteration without actually
+    // flipping the mode back or `continue`-ing, and left the user staring at
+    // unconfirmed tool calls. `cli-eternal-flag.test.ts` passes this ref, so
+    // the test exercised a wiring production never had.
+    // The live holder is `EternalAutonomyEngine | null`; the ref contract is
+    // `| undefined`. Bridge rather than widen either side.
+    eternalEngineRef: {
+      get current() {
+        return eternalEngine ?? void 0;
+      },
+      set current(engine) {
+        eternalEngine = engine ?? null;
+      }
+    }
   });
   config = configRef.current;
   if (eternalFlag.length > 0) {
@@ -30404,7 +31011,7 @@ async function runInteractive(cliCtx) {
     onEvent: evOn
   });
   const savedProviderCfg = config.providers?.[config.provider];
-  const { execute } = await import("./execution-ANOYMWPO.js");
+  const { execute } = await import("./execution-LHMSMDHB.js");
   const stopHeapWatchdog = startSharedHeapWatchdog({
     collectStats: () => {
       const hqQueue = hqPublisherRef.current?.getQueueStats();
@@ -30636,4 +31243,4 @@ export {
   CLI_VERSION,
   runInteractive
 };
-//# sourceMappingURL=cli-main-3MQDFSYK.js.map
+//# sourceMappingURL=cli-main-XWC57MGE.js.map