@wrongstack/cli 0.299.0 → 0.300.0

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

@@ -1,3 +1,6 @@
+import {
+  setupPlugins
+} from "./chunk-4WJKVQJY.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-3MWUZMOL.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-V76R7DC5.js";
 import {
   LOCAL_LLM_PRESETS,
   parseSpawnFlags
-} from "./chunk-ZNZJ34RF.js";
+} from "./chunk-PEMN4T5O.js";
 import {
-  buildPickableProviders
-} from "./chunk-66T43Q4Y.js";
+  buildPickableProviders,
+  visibleModelIds
+} from "./chunk-N7ULWBO5.js";
 import {
   runCodexOAuthLogin
-} from "./chunk-GO3TJICK.js";
+} from "./chunk-PYTFS4MC.js";
 import {
   activeLabel,
   loadConfigProviders,
@@ -3263,6 +3264,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 +3278,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
     });
   });
@@ -4366,7 +4376,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 +5124,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 +5261,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 +5503,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,
@@ -5933,13 +6025,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 +6143,9 @@ function setupDirectorAndAutonomy(deps) {
     director: null,
     directorMode,
     maxConcurrent,
+    maxSpawns,
+    maxConcurrentSource,
+    maxSpawnsSource,
     autonomyMode,
     nextPredictEnabled,
     currentSuggestions,
@@ -6105,6 +6265,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 +6384,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 +6932,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";
@@ -7350,6 +7521,130 @@ 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
+  });
+  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/lifecycle-plugins.ts
 async function setupLifecycleAndPlugins(deps) {
   const {
@@ -7532,6 +7827,23 @@ 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
+  });
+  const pluginCouncil = new CouncilOrchestrator({
+    caller: pluginOneShot,
+    fallbackProfileManager,
+    ...buildCouncilRegistries(getLiveConfig().tools?.council)
+  });
   const pluginHost = await setupPlugins({
     config,
     container,
@@ -7572,7 +7884,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 {
@@ -7672,6 +7986,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 +8105,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 } : {}
     })
@@ -7977,130 +8352,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 +9306,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 {
@@ -12095,6 +12347,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";
 }
@@ -13097,6 +13350,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 +13685,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-56CMWMPR.js");
       const settled = await Promise.allSettled(BUILTIN_PLUGIN_FACTORIES.map((f) => f()));
       const loaded = [];
       for (const s of settled) {
@@ -15297,6 +15602,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 };
@@ -23502,6 +23818,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 +24039,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 +24118,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 +24145,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)})`
               );
             }
           }
@@ -30084,6 +30431,9 @@ async function runInteractive(cliCtx) {
   let {
     director,
     maxConcurrent,
+    maxSpawns,
+    maxConcurrentSource,
+    maxSpawnsSource,
     autonomyMode,
     nextPredictEnabled,
     currentSuggestions,
@@ -30136,6 +30486,9 @@ async function runInteractive(cliCtx) {
     stateCheckpointPath,
     fleetRootForPromotion,
     maxConcurrent,
+    maxSpawns,
+    maxConcurrentSource,
+    maxSpawnsSource,
     effectiveMaxContextRef,
     mcpRegistry,
     sessResult,
@@ -30176,11 +30529,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.`);
   }
@@ -30404,7 +30776,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-SHGM7BVC.js");
   const stopHeapWatchdog = startSharedHeapWatchdog({
     collectStats: () => {
       const hqQueue = hqPublisherRef.current?.getQueueStats();
@@ -30636,4 +31008,4 @@ export {
   CLI_VERSION,
   runInteractive
 };
-//# sourceMappingURL=cli-main-3MQDFSYK.js.map
+//# sourceMappingURL=cli-main-7B3G2YSG.js.map