@wrongstack/cli 0.300.0 → 0.302.0

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

@@ -1,6 +1,6 @@
 import {
   setupPlugins
-} from "./chunk-4WJKVQJY.js";
+} from "./chunk-ZECLGUTF.js";
 import {
   runProjectPicker
 } from "./chunk-5N34EWJR.js";
@@ -43,7 +43,7 @@ import {
 import {
   PLUGIN_AUDIT_ENTRIES,
   runPluginManagementCommand
-} from "./chunk-3MWUZMOL.js";
+} from "./chunk-GUHQQG63.js";
 import {
   configureSimpleUiRuntimeContext,
   detectProjectFacts,
@@ -80,15 +80,15 @@ import {
   runClaudeOAuthLogin,
   runCopilotOAuthLogin,
   validateFamily
-} from "./chunk-V76R7DC5.js";
+} from "./chunk-3MOUBRKZ.js";
 import {
   LOCAL_LLM_PRESETS,
   parseSpawnFlags
-} from "./chunk-PEMN4T5O.js";
+} from "./chunk-MT6FGXO3.js";
 import {
   buildPickableProviders,
   visibleModelIds
-} from "./chunk-N7ULWBO5.js";
+} from "./chunk-ETOEGL3V.js";
 import {
   runCodexOAuthLogin
 } from "./chunk-PYTFS4MC.js";
@@ -102,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";
@@ -1567,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 }),
@@ -2782,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;
@@ -2876,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) {
@@ -2954,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());
@@ -2965,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());
 }
@@ -3351,7 +3364,8 @@ import {
   Agent,
   Context,
   createDefaultPipelines,
-  createFallbackModelExtension
+  createFallbackModelExtension,
+  renderInstructionLayer
 } from "@wrongstack/core/agent";
 import {
   applyProjectAgentConfig,
@@ -3376,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();
@@ -3391,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)}`;
@@ -3808,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,
@@ -3835,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--) {
@@ -3882,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
     });
@@ -4135,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;
@@ -4154,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) {
@@ -4218,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"
           });
         }),
@@ -4234,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, {
@@ -4244,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);
@@ -4270,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);
@@ -5530,6 +5583,7 @@ function setupBrainAndOrchestration(deps) {
       events
     })
   );
+  toolRegistry.exposeToProvider("delegate");
   toolRegistry.register(
     createMcpControlTool({
       getConfig: () => configStore.get(),
@@ -5537,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,
@@ -6940,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,
@@ -7212,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";
@@ -7330,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;
   }
@@ -7352,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(
@@ -7587,7 +7651,8 @@ function registerProviderUtilityTools(input) {
     getConfig: input.getConfig,
     fallbackProfileManager: input.fallbackProfileManager,
     defaultProvider: config.provider,
-    defaultModel: config.model
+    defaultModel: config.model,
+    wrapProviderCall: input.wrapProviderCall
   });
   registerOrOverride(input.toolRegistry, "llm", llmTool);
   const councilOrchestrator = new OneShotOrchestrator({
@@ -7600,7 +7665,8 @@ function registerProviderUtilityTools(input) {
     // 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)
+    modelRouter: createLiveModelRouter(input.getConfig),
+    wrapProviderCall: input.wrapProviderCall
   });
   registerOrOverride(
     input.toolRegistry,
@@ -7616,7 +7682,8 @@ function registerProviderUtilityTools(input) {
       buildProvider: input.buildProvider,
       getConfig: input.getConfig,
       fallbackProfileManager: input.fallbackProfileManager,
-      statusTracker: input.statusTracker
+      statusTracker: input.statusTracker,
+      wrapProviderCall: input.wrapProviderCall
     });
     input.toolRegistry.override(
       "context_manager",
@@ -7801,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
@@ -7837,7 +7904,15 @@ async function setupLifecycleAndPlugins(deps) {
     fallbackProfileManager,
     statusTracker,
     modelRouter: createLiveModelRouter(getLiveConfig),
-    logger
+    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,
@@ -7907,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(),
@@ -7942,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 = [
@@ -8158,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,
@@ -10836,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);
@@ -10859,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();
@@ -10927,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",
@@ -11039,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] },
@@ -11055,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];
@@ -11065,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];
@@ -11075,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();
@@ -11134,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();
@@ -11143,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);
@@ -11152,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 = [
@@ -11173,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]);
@@ -11208,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 };
       }
@@ -11329,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) {
@@ -11548,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 };
@@ -11640,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 };
@@ -11678,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}`));
@@ -11689,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 };
@@ -11826,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);
@@ -12113,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",
@@ -12386,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;
   }
@@ -12414,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)})`}`
   ];
@@ -12427,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(
@@ -13685,7 +13848,7 @@ function buildDoctorCommand(opts) {
   ].join("\n");
   async function loadPluginSchemas() {
     try {
-      const { BUILTIN_PLUGIN_FACTORIES } = await import("./plugins-56CMWMPR.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) {
@@ -20778,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`;
@@ -20885,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")}`,
         ""
@@ -20901,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 ?? [];
@@ -25417,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}`));
@@ -25554,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}`));
@@ -25591,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}`));
@@ -25639,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, {
@@ -25732,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}`
       };
     }
@@ -25863,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",
@@ -25912,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;
@@ -25954,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")}`,
@@ -26383,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"];
@@ -30130,7 +30335,8 @@ async function runInteractive(cliCtx) {
     events,
     container,
     configStore,
-    updateInfo
+    updateInfo,
+    webuiSessionChild
   } = cliCtx;
   const profileConfigPath = activeProfileConfigPath(wpaths, config);
   const modeStore = container.resolve(TOKENS9.ModeStore);
@@ -30193,11 +30399,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({
@@ -30231,7 +30439,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
@@ -30345,7 +30554,8 @@ async function runInteractive(cliCtx) {
     slashRegistry,
     hqPublisherRef,
     brainMailbox,
-    pluginHost
+    pluginHost,
+    hookRunner
   } = await setupLifecycleAndPlugins({
     flags,
     config,
@@ -30382,6 +30592,7 @@ async function runInteractive(cliCtx) {
     logger,
     teardownHandlers
   });
+  hookRunnerRef.current = hookRunner;
   const fallbackProfileManager = container.resolve(TOKENS9.FallbackProfileManager);
   const statusTracker = await setupProviderStatus({
     events,
@@ -30426,6 +30637,13 @@ 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 {
@@ -30746,7 +30964,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) {
@@ -30776,7 +31012,7 @@ async function runInteractive(cliCtx) {
     onEvent: evOn
   });
   const savedProviderCfg = config.providers?.[config.provider];
-  const { execute } = await import("./execution-SHGM7BVC.js");
+  const { execute } = await import("./execution-CQ772VPS.js");
   const stopHeapWatchdog = startSharedHeapWatchdog({
     collectStats: () => {
       const hqQueue = hqPublisherRef.current?.getQueueStats();
@@ -30834,6 +31070,7 @@ async function runInteractive(cliCtx) {
         projectRoot,
         flags,
         positional,
+        webuiSessionChild,
         // Forward preflight's update-info so the TUI banner can render
         // the "(update available: v…)" indicator next to the version
         // chip. May be undefined (e.g. when the registry check was
@@ -31008,4 +31245,4 @@ export {
   CLI_VERSION,
   runInteractive
 };
-//# sourceMappingURL=cli-main-7B3G2YSG.js.map
+//# sourceMappingURL=cli-main-EOJ74CI4.js.map