@wrongstack/cli 0.299.0 → 0.301.0

package/dist/{execution-ANOYMWPO.js → execution-LHMSMDHB.js}

@@ -31,12 +31,19 @@ import {
 import {
   fmtTok
 } from "./chunk-TYO2OVAD.js";
+import {
+  terminalLink,
+  terminalText
+} from "./chunk-KE7E7DPX.js";
 import {
   CLI_VERSION
 } from "./chunk-XJXDOF63.js";
 import {
   resolveActiveApiKey
 } from "./chunk-PJHET45A.js";
+import {
+  activeProfileConfigPath
+} from "./chunk-YMXXOOFN.js";
 import "./chunk-7OCVIDC7.js";
 
 // src/execution.ts
@@ -182,12 +189,13 @@ async function runWebUIDispatch(ctx) {
     rebindTodosCheckpoint,
     agentTranscripts,
     sddSubagentFactory,
-    onKanbanDispatch
+    onKanbanDispatch,
+    getFleetBudget
   } = ctx;
   const isSimpleUi = flags["simpleui"] === true;
   agent.disableInteractiveConfirmation();
   renderer.setSilent(true);
-  const { runWebUI } = await import("./webui-server-PCLSXX6L.js");
+  const { runWebUI } = await import("./webui-server-DD35QFNO.js");
   const flagValue = (names) => {
     for (const name of names) {
       if (!Object.hasOwn(flags, name)) continue;
@@ -274,6 +282,7 @@ async function runWebUIDispatch(ctx) {
     mcpRegistry,
     subscribeEternalIteration,
     sessionStore,
+    ...getFleetBudget ? { getFleetBudget } : {},
     sessionsDir: projectSessionsDir,
     claimSession: activateSessionIdentity ? async (sessionId) => {
       const previousSessionId = agent.ctx.session?.id ?? session.id;
@@ -309,10 +318,12 @@ async function runWebUIDispatch(ctx) {
     // the default when it is taken (a second instance, leftover socket).
     onListening: ({ url }) => {
       const surface = isSimpleUi ? "SimpleUI" : "WebUI";
-      renderer.writeInfo(color2.green(`  \u2726 ${surface} running \u2192 ${color2.bold(url)}`));
       renderer.writeInfo(
-        color2.dim(`  Press Ctrl+C in this terminal to stop the ${surface} server.
-`)
+        `  \u2726 ${terminalText(surface, "success", { bold: true })} ${terminalText("running \u2192", "muted")} ${terminalLink(url)}`
+      );
+      renderer.writeInfo(
+        `  ${terminalText(`Press Ctrl+C in this terminal to stop the ${surface} server.`, "muted")}
+`
       );
     },
     // Make autonomy.switch from the browser flip the CLI's real
@@ -336,7 +347,11 @@ async function runWebUIDispatch(ctx) {
       resolve3(0);
     }).catch((err) => {
       renderer.setSilent(false);
-      console.debug(`[execution] webui error: ${err}`);
+      renderer.writeInfo(
+        color2.red(
+          `  \u2717 ${isSimpleUi ? "SimpleUI" : "WebUI"} failed to start: ${err instanceof Error ? err.message : String(err)}`
+        )
+      );
       resolve3(1);
     });
   });
@@ -831,13 +846,16 @@ async function handleProjectSwitchSpawn(opts) {
   const nodeExe = process.execPath;
   const spawnArgs = [cliPath, "--no-interactive"];
   if (resumeSessionId) spawnArgs.push("--resume", resumeSessionId);
-  spawn(nodeExe, spawnArgs, {
+  const child = spawn(nodeExe, spawnArgs, {
     cwd: root,
     stdio: "ignore",
-    detached: true
-  }).on("error", (err) => {
+    detached: true,
+    windowsHide: true
+  });
+  child.on("error", (err) => {
     console.error(color4.red(`Failed to spawn wstack: ${err.message}`));
   });
+  child.unref();
   console.log(
     [
       "",
@@ -932,6 +950,7 @@ async function switchProjectInPlace(ctx, targetRoot, displayName) {
   context.state.replaceMessages([]);
   context.state.replaceTodos([]);
   context.clearFileTracking();
+  context.clearMemoryEvidence?.();
   context.tokenCounter.reset();
   context.meta["packageTrackerOpts"] = { storageDir: nextWpaths.projectDir, projectRoot: resolved };
   context.state.setMeta(
@@ -973,7 +992,8 @@ async function switchProjectInPlace(ctx, targetRoot, displayName) {
     context.systemPrompt = await switchBuilder.build({
       cwd: resolved,
       projectRoot: resolved,
-      tools: agent.tools.list(),
+      tools: agent.tools.listForProvider(),
+      catalogTools: agent.tools.list(),
       provider: context.provider.id,
       model: context.model
     });
@@ -1287,7 +1307,7 @@ import * as fs3 from "node:fs/promises";
 import * as path7 from "node:path";
 import { decryptConfigSecrets, encryptConfigSecrets, noOpVault } from "@wrongstack/core/security";
 import { normalizeTokenSavingTier, resolveFleetChatVerbosity } from "@wrongstack/core/types";
-import { atomicWrite } from "@wrongstack/core/utils";
+import { atomicWrite, deepMerge } from "@wrongstack/core/utils";
 import { getProcessRegistry } from "@wrongstack/tools";
 var PANEL_IDS_CLI = [
   "projectPicker",
@@ -1366,6 +1386,7 @@ function createSettingsAdapter(ctx) {
       auditLevel: cfg.session?.auditLevel ?? "standard",
       indexOnStart: cfg.indexing?.onSessionStart !== false,
       maxIterations: cfg.tools?.maxIterations ?? 500,
+      nextStepsTool: cfg.tools?.nextsteps?.enabled === true,
       restrictFsToRoot: resolvedRestrict,
       autoProceedMaxIterations: cfg.autonomy?.autoProceedMaxIterations ?? 50,
       debugStream: cfg.debugStream ?? false,
@@ -1405,12 +1426,15 @@ function createSettingsAdapter(ctx) {
   }
   async function saveSettings(s) {
     try {
-      if (s.mode !== void 0 || s.delayMs !== void 0 || s.titleAnimation !== void 0 || s.yolo !== void 0 || s.fleetChatVerbosity !== void 0 || s.chime !== void 0 || s.confirmExit !== void 0 || s.mouseMode !== void 0 || s.featureMcp !== void 0 || s.featurePlugins !== void 0 || s.featureMemory !== void 0 || s.featureSkills !== void 0 || s.featureModelsRegistry !== void 0 || s.featureTokenSaving !== void 0 || s.allowOutsideProjectRoot !== void 0 || s.contextAutoCompact !== void 0 || s.contextStrategy !== void 0 || s.contextMode !== void 0 || s.maxConcurrent !== void 0 || s.logLevel !== void 0 || s.auditLevel !== void 0 || s.indexOnStart !== void 0 || s.maxIterations !== void 0 || s.restrictFsToRoot !== void 0 || s.nextPrediction !== void 0 || s.debugStream !== void 0 || s.shellBangWarningDontShowAgain !== void 0 || s.configScope !== void 0 || s.enhanceDelayMs !== void 0 || s.enhanceEnabled !== void 0 || s.enhanceLanguage !== void 0 || s.midRunSendPicker !== void 0 || s.statuslineMode !== void 0 || s.thinkingWord !== void 0 || s.animationStyle !== void 0 || s.autonomyNextPrompt !== void 0 || s.autoProceedMaxIterations !== void 0 || s.reasoningMode !== void 0 || s.reasoningEffort !== void 0 || s.reasoningPreserve !== void 0 || s.cacheTtl !== void 0 || s.breakerEnabled !== void 0 || s.breakerAutoKillResetMs !== void 0 || s.showModelReasoning !== void 0 || s.showAgentSwarmPanel !== void 0 || s.panelPositions !== void 0 || s.showSageMemoryInject !== void 0 || s.sageMemoryInjectThreshold !== void 0 || s.readSymbols !== void 0) {
+      if (s.mode !== void 0 || s.delayMs !== void 0 || s.titleAnimation !== void 0 || s.yolo !== void 0 || s.fleetChatVerbosity !== void 0 || s.chime !== void 0 || s.confirmExit !== void 0 || s.mouseMode !== void 0 || s.featureMcp !== void 0 || s.featurePlugins !== void 0 || s.featureMemory !== void 0 || s.featureSkills !== void 0 || s.featureModelsRegistry !== void 0 || s.featureTokenSaving !== void 0 || s.allowOutsideProjectRoot !== void 0 || s.contextAutoCompact !== void 0 || s.contextStrategy !== void 0 || s.contextMode !== void 0 || s.maxConcurrent !== void 0 || s.logLevel !== void 0 || s.auditLevel !== void 0 || s.indexOnStart !== void 0 || s.maxIterations !== void 0 || s.nextStepsTool !== void 0 || s.restrictFsToRoot !== void 0 || s.nextPrediction !== void 0 || s.debugStream !== void 0 || s.shellBangWarningDontShowAgain !== void 0 || s.configScope !== void 0 || s.enhanceDelayMs !== void 0 || s.enhanceEnabled !== void 0 || s.enhanceLanguage !== void 0 || s.midRunSendPicker !== void 0 || s.statuslineMode !== void 0 || s.thinkingWord !== void 0 || s.animationStyle !== void 0 || s.autonomyNextPrompt !== void 0 || s.autoProceedMaxIterations !== void 0 || s.reasoningMode !== void 0 || s.reasoningEffort !== void 0 || s.reasoningPreserve !== void 0 || s.cacheTtl !== void 0 || s.breakerEnabled !== void 0 || s.breakerAutoKillResetMs !== void 0 || s.showModelReasoning !== void 0 || s.showAgentSwarmPanel !== void 0 || s.panelPositions !== void 0 || s.showSageMemoryInject !== void 0 || s.sageMemoryInjectThreshold !== void 0 || s.readSymbols !== void 0) {
         const cfg = configStore.get();
-        const activeProfileName = cfg.activeProfile ?? "default";
         const persistDeps = {
           configStore,
-          profileConfigPath: wpaths.profileConfig(activeProfileName),
+          // Third copy of "which profile is active" — an inline cast plus a
+          // `?? 'default'`, identical to `activeProfileConfigPath` two files
+          // over. The comment above already promised this resolution was
+          // delegated; now it is.
+          profileConfigPath: activeProfileConfigPath(wpaths, cfg),
           inProjectConfigPath: wpaths.inProjectConfig,
           vault: noOpVault,
           resolveProfilePath: (name) => wpaths.profileConfig(name)
@@ -1500,9 +1524,10 @@ function createSettingsAdapter(ctx) {
           idx.onSessionStart = s.indexOnStart;
           decrypted.indexing = idx;
         }
-        if (s.maxIterations !== void 0 || fsAccess !== void 0) {
+        if (s.maxIterations !== void 0 || s.nextStepsTool !== void 0 || fsAccess !== void 0) {
           const tools = decrypted.tools ?? {};
           if (s.maxIterations !== void 0) tools.maxIterations = s.maxIterations;
+          if (s.nextStepsTool !== void 0) tools.nextsteps = { enabled: s.nextStepsTool };
           if (fsAccess !== void 0) tools.restrictToProjectRoot = fsAccess.restrictToProjectRoot;
           decrypted.tools = tools;
         }
@@ -1557,7 +1582,7 @@ function createSettingsAdapter(ctx) {
             const destRaw = await fs3.readFile(actualTarget, "utf8");
             const destParsed = JSON.parse(destRaw);
             const destDecrypted = decryptConfigSecrets(destParsed, noOpVault);
-            mergedToWrite = { ...destDecrypted, ...decrypted };
+            mergedToWrite = deepMerge(destDecrypted, decrypted);
           } catch (err) {
             if (err.code !== "ENOENT") {
               throw new Error(
@@ -1614,7 +1639,7 @@ function createSettingsAdapter(ctx) {
               ...decrypted.indexing ?? {}
             }
           } : {},
-          ...s.maxIterations !== void 0 || fsAccess !== void 0 ? {
+          ...s.maxIterations !== void 0 || s.nextStepsTool !== void 0 || fsAccess !== void 0 ? {
             tools: {
               ...currentConfig.tools,
               ...decrypted.tools ?? {}
@@ -1728,6 +1753,7 @@ function createBrainPanelHost(deps) {
         councilDistinctness: snap.council.distinctness,
         councilPerCallTimeoutMs: snap.council.perCallTimeoutMs,
         councilMaxConcurrency: snap.council.maxConcurrency,
+        councilVoterMaxTokens: snap.council.voterMaxTokens,
         councilJudgeMaxTokens: snap.council.judgeMaxTokens,
         // The EFFECTIVE judge, not `council.judge`. The configured one is
         // usually absent, so the panel used to read "auto" and say nothing
@@ -1809,6 +1835,7 @@ function createBrainPanelHost(deps) {
     setCouncilDistinctness: (mode) => apply({ council: { distinctness: mode } }),
     setCouncilPerCallTimeout: (ms) => apply({ council: { perCallTimeoutMs: ms ?? null } }),
     setCouncilMaxConcurrency: (count) => apply({ council: { maxConcurrency: count ?? null } }),
+    setCouncilVoterMaxTokens: (tokens) => apply({ council: { voterMaxTokens: tokens ?? null } }),
     setCouncilJudgeMaxTokens: (tokens) => apply({ council: { judgeMaxTokens: tokens ?? null } }),
     setLedgerEnabled: (on) => apply({ ledger: { enabled: on } }),
     setAutoDeny: (count) => apply({ ledger: { autoDenyAfterFailures: count ?? null } }),
@@ -1845,7 +1872,7 @@ var reviewerRoundRobinCursor = 0;
 function __resetReviewerRoundRobinCursor(value = 0) {
   reviewerRoundRobinCursor = value;
 }
-function assignReviewerModelsRoundRobin(provider, model, fallbackModels, statusTracker) {
+function assignReviewerModels(provider, model, fallbackModels, selection = "round-robin", statusTracker, random = Math.random) {
   const pool = buildReviewerModelPool(provider, model, fallbackModels, statusTracker);
   if (pool.length <= 1) {
     return {
@@ -1854,20 +1881,24 @@ function assignReviewerModelsRoundRobin(provider, model, fallbackModels, statusT
       fallbackModels: [...fallbackModels]
     };
   }
+  const cursor = selection === "random" ? Math.min(pool.length - 1, Math.floor(Math.max(0, random()) * pool.length)) : reviewerRoundRobinCursor;
   const assignment = selectRoundRobinReviewerAssignment(
     pool,
-    reviewerRoundRobinCursor,
+    cursor,
     provider,
     model,
     statusTracker
   );
-  reviewerRoundRobinCursor = assignment.nextCursor;
+  if (selection === "round-robin") reviewerRoundRobinCursor = assignment.nextCursor;
   return {
     provider: assignment.provider,
     model: assignment.model,
     fallbackModels: assignment.fallbackModels
   };
 }
+function assignReviewerModelsRoundRobin(provider, model, fallbackModels, statusTracker) {
+  return assignReviewerModels(provider, model, fallbackModels, "round-robin", statusTracker);
+}
 var MAX_REVIEWER_ATTEMPTS = 4;
 var REVIEWER_ATTEMPT_TIMEOUT_MS = 9e5;
 var REVIEWER_LADDER_BUDGET_MS = 12e5;
@@ -1970,7 +2001,7 @@ async function finalizeExecutionCleanup(input) {
     session,
     tokenCounter,
     events,
-    getPendingChimeraWork,
+    chimeraWork,
     director,
     reader
   } = input;
@@ -1982,6 +2013,19 @@ async function finalizeExecutionCleanup(input) {
   } catch (_err) {
   }
   await Promise.resolve(detachTodosCheckpoint?.()).catch(() => void 0);
+  try {
+    const { getProcessRegistry: getProcessRegistry2 } = await import("@wrongstack/tools");
+    getProcessRegistry2().killAll({ force: true, includeProtected: true });
+  } catch (err) {
+    console.warn(
+      JSON.stringify({
+        level: "warn",
+        event: "shutdown.process_kill_all_failed",
+        message: `Process registry killAll failed: ${err instanceof Error ? err.message : String(err)}`,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      })
+    );
+  }
   await mcpRegistry.stopAll().catch((err) => {
     console.warn(
       JSON.stringify({
@@ -2009,25 +2053,34 @@ async function finalizeExecutionCleanup(input) {
       })
     );
   });
-  events.emit("session.ended", {
-    id: activeSession.id,
-    sessionId: activeSession.id,
-    usage: tokenCounter.total()
-  });
-  if (getPendingChimeraWork) {
-    const chimeraWork = getPendingChimeraWork();
-    if (chimeraWork) {
-      await chimeraWork.catch((err) => {
-        console.warn(
-          JSON.stringify({
-            level: "warn",
-            event: "shutdown.chimera_work_failed",
-            message: `Pending chimera work failed: ${err instanceof Error ? err.message : String(err)}`,
-            timestamp: (/* @__PURE__ */ new Date()).toISOString()
-          })
-        );
-      });
+  const sessionEndProducers = /* @__PURE__ */ new Set();
+  events.emit(
+    "session.ended",
+    {
+      id: activeSession.id,
+      sessionId: activeSession.id,
+      usage: tokenCounter.total(),
+      waitUntil: (work) => {
+        const tracked = Promise.resolve(work).finally(() => sessionEndProducers.delete(tracked));
+        void tracked.catch(() => void 0);
+        sessionEndProducers.add(tracked);
+      }
+    }
+  );
+  try {
+    while (sessionEndProducers.size > 0) {
+      await Promise.allSettled([...sessionEndProducers]);
     }
+    await chimeraWork?.drainAndClose();
+  } catch (err) {
+    console.warn(
+      JSON.stringify({
+        level: "warn",
+        event: "shutdown.chimera_work_failed",
+        message: `Pending chimera work failed: ${err instanceof Error ? err.message : String(err)}`,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      })
+    );
   }
   if (director) {
     try {
@@ -2428,6 +2481,43 @@ var FleetStatusLine = class {
   }
 };
 
+// src/chimera-work-registry.ts
+function createChimeraWorkRegistry() {
+  const pending = /* @__PURE__ */ new Set();
+  let accepting = true;
+  let closePromise;
+  const track = (work) => {
+    if (!accepting) return false;
+    const tracked = Promise.resolve(work).finally(() => {
+      pending.delete(tracked);
+    });
+    void tracked.catch(() => void 0);
+    pending.add(tracked);
+    return true;
+  };
+  const snapshot = () => {
+    if (pending.size === 0) return void 0;
+    return Promise.allSettled([...pending]).then(() => void 0);
+  };
+  const drainAndClose = () => {
+    closePromise ??= (async () => {
+      while (pending.size > 0) {
+        await Promise.allSettled([...pending]);
+      }
+      accepting = false;
+    })();
+    return closePromise;
+  };
+  return {
+    track,
+    pending: snapshot,
+    drainAndClose,
+    get size() {
+      return pending.size;
+    }
+  };
+}
+
 // src/execution-chimera-cascade.ts
 import * as fsp from "node:fs/promises";
 import * as path8 from "node:path";
@@ -2689,7 +2779,7 @@ function installChimeraCascadeHandler({
   director,
   session,
   getPendingWork,
-  setPendingWork,
+  trackWork,
   buildLadder
 }) {
   events.onPattern("chimera.cascade_needed", (_event, payload) => {
@@ -2719,6 +2809,9 @@ function installChimeraCascadeHandler({
               maxIterations: 40,
               maxToolCalls: 200,
               timeoutMs,
+              // Cascade agents are ephemeral infrastructure: like reviewers,
+              // they must not consume the leader's lifetime maxSpawns budget.
+              spawnBudgetExempt: true,
               // Rung 0 stays unpinned so the role model matrix still decides;
               // later rungs pin a model precisely because it just failed.
               ...attempt.tier === "inherit" ? {} : {
@@ -2775,7 +2868,7 @@ function installChimeraCascadeHandler({
       }
       await maybeReReviewCascade({ events, session, bundle: p.bundle });
     })();
-    setPendingWork(pendingWork);
+    trackWork(pendingWork);
   });
 }
 async function maybeReReviewCascade({
@@ -2814,7 +2907,7 @@ async function maybeReReviewCascade({
           stopReason: "end_turn",
           usage: { input: 0, output: 0 }
         });
-        const emitted = emitReviewIfChanged(
+        const emitted = await emitReviewIfChanged(
           { events, emitCustom: events.emitCustom.bind(events) },
           reReviewBundle
         );
@@ -2886,13 +2979,14 @@ function installChimeraReviewHandler({
   projectDir,
   statusTracker,
   persistReview = persistChimeraReview,
-  setPendingWork
+  trackWork
 }) {
   events.onPattern("chimera.review_needed", (_event, payload) => {
     const p = payload;
     const reviewSessionId = agent.ctx.activeRunSessionId ?? agent.ctx.session?.id ?? session.id;
     const dir = director;
     if (!dir) {
+      void recordCompletedReview(events, { bundle: p }).catch(() => void 0);
       return;
     }
     if (p.files.length === 0) return;
@@ -2935,11 +3029,11 @@ function installChimeraReviewHandler({
           `\u{1F982} Chimera report persistence failed: ${message}. The review remains in the session transcript and mailbox.`
         );
       } finally {
-        recordCompletedReview(events, completion);
+        await recordCompletedReview(events, completion);
         events.emitCustom("chimera.review_complete", completion);
       }
     };
-    setPendingWork(
+    trackWork(
       (async () => {
         let subagentId;
         try {
@@ -2951,10 +3045,11 @@ function installChimeraReviewHandler({
           const baseProvider = rawProvider || tProvider || config.provider;
           const baseModel = rawModel || tModel || config.model;
           const baseFallbacks = p.reviewFallbackModels ? [...p.reviewFallbackModels] : resolveReviewerFallbackModels(void 0);
-          const assigned = assignReviewerModelsRoundRobin(
+          const assigned = assignReviewerModels(
             baseProvider,
             baseModel,
             baseFallbacks,
+            p.reviewModelSelection ?? "round-robin",
             statusTracker
           );
           const ladder = buildReviewerAttemptLadder({
@@ -2977,7 +3072,10 @@ function installChimeraReviewHandler({
               timeoutMs,
               provider: attempt.provider,
               model: attempt.model,
-              fallbackModels: attempt.fallbackModels
+              fallbackModels: attempt.fallbackModels,
+              // Reviewers are ephemeral background infrastructure: they must
+              // not consume the leader's lifetime maxSpawns budget.
+              spawnBudgetExempt: true
             }),
             // The reviewer is read-only, so a retry re-runs the task verbatim.
             buildTask: () => taskDesc,
@@ -4530,7 +4628,7 @@ async function execute(deps) {
   const profileName = config.activeProfile ?? "default";
   const bootUpdateInfo = initialUpdateInfo;
   const offStorageObservability = installStorageObservability(events, context.traceId);
-  let pendingChimeraWork;
+  const chimeraWork = createChimeraWorkRegistry();
   installChimeraReviewHandler({
     events,
     director,
@@ -4544,8 +4642,8 @@ async function execute(deps) {
     // this, a 429-stricken model is re-spawned on every concurrent reviewer
     // turn and burns the whole chain instead of staying quarantined.
     statusTracker,
-    setPendingWork: (work) => {
-      pendingChimeraWork = work;
+    trackWork: (work) => {
+      chimeraWork.track(work);
     }
   });
   installChimeraCascadeHandler({
@@ -4556,9 +4654,9 @@ async function execute(deps) {
       profileChain: effectiveFallbackChain2(config),
       session: { provider: config.provider, model: config.model }
     }),
-    getPendingWork: () => pendingChimeraWork,
-    setPendingWork: (work) => {
-      pendingChimeraWork = work;
+    getPendingWork: () => chimeraWork.pending(),
+    trackWork: (work) => {
+      chimeraWork.track(work);
     }
   });
   let code = 0;
@@ -4885,6 +4983,26 @@ async function execute(deps) {
         sddSubagentFactory,
         statusTracker,
         updateInfo: bootUpdateInfo,
+        getFleetBudget: () => {
+          const d = getDirector?.() ?? null;
+          if (!d) return null;
+          const snap = d.fleetManager?.budgetSnapshot?.();
+          const maxSpawns = snap?.maxSpawns ?? d.maxSpawns;
+          const usedSpawns = snap?.usedSpawns ?? d.spawnCount;
+          const remainingSpawns = snap?.remainingSpawns ?? Math.max(
+            0,
+            (Number.isFinite(maxSpawns) ? maxSpawns : Number.POSITIVE_INFINITY) - usedSpawns
+          );
+          const activeAgents = d.status().subagents.filter((s) => s.status === "running" || s.status === "idle").length;
+          return {
+            maxSpawns,
+            usedSpawns,
+            remainingSpawns,
+            activeAgents,
+            ...snap?.checkpointMaxSpawns !== void 0 ? { checkpointMaxSpawns: snap.checkpointMaxSpawns } : {},
+            ...snap?.ceilingMismatch ? { ceilingMismatch: true } : {}
+          };
+        },
         ...createKanbanDispatchHandler({ config, events, skillLoader, sddSubagentFactory })
       });
     } else {
@@ -4950,7 +5068,7 @@ async function execute(deps) {
       session,
       tokenCounter,
       events,
-      getPendingChimeraWork: () => pendingChimeraWork,
+      chimeraWork,
       director,
       reader
     });
@@ -4961,8 +5079,9 @@ export {
   CHIMERA_REVIEW_READ_ONLY_TOOLS,
   __resetReviewerRoundRobinCursor,
   applyChimeraReviewerReadOnlyPolicy,
+  assignReviewerModels,
   assignReviewerModelsRoundRobin,
   execute,
   resolveReviewerFallbackModels
 };
-//# sourceMappingURL=execution-ANOYMWPO.js.map
+//# sourceMappingURL=execution-LHMSMDHB.js.map

package/dist/execution-chimera-cascade.d.ts

@@ -3,19 +3,18 @@ import type { ExecuteDeps } from './execute-deps.js';
 type Director = NonNullable<ExecuteDeps['fleet']['director']>;
 type Events = ExecuteDeps['core']['events'];
 type Session = ExecuteDeps['session']['session'];
-type PendingChimeraWork = Promise<void> | undefined;
 export type InstallChimeraCascadeHandlerOptions = {
     events: Events;
     director: Director | null | undefined;
     session: Session;
-    getPendingWork: () => PendingChimeraWork;
-    setPendingWork: (work: PendingChimeraWork) => void;
+    getPendingWork: () => Promise<void> | undefined;
+    trackWork: (work: Promise<void>) => void;
     /**
      * Model ladder for cascade spawns. Supplied by the caller because only it
      * holds the live config. Omit to keep the single unpinned spawn.
      */
     buildLadder?: (() => ReviewerAttempt[]) | undefined;
 };
-export declare function installChimeraCascadeHandler({ events, director, session, getPendingWork, setPendingWork, buildLadder, }: InstallChimeraCascadeHandlerOptions): void;
+export declare function installChimeraCascadeHandler({ events, director, session, getPendingWork, trackWork, buildLadder, }: InstallChimeraCascadeHandlerOptions): void;
 export {};
 //# sourceMappingURL=execution-chimera-cascade.d.ts.map

package/dist/execution-chimera-review.d.ts

@@ -7,7 +7,6 @@ type Session = ExecuteDeps['session']['session'];
 type Mailbox = ExecuteDeps['session']['mailbox'];
 type Agent = ExecuteDeps['core']['agent'];
 type Config = ExecuteDeps['core']['config'];
-type PendingChimeraWork = Promise<void> | undefined;
 /**
  * Canonicalize a file path for citation gating. The reviewer can cite
  * absolute Windows paths (`D:\Codebox\...`) or mix casing on a
@@ -38,8 +37,8 @@ export type InstallChimeraReviewHandlerOptions = {
      */
     statusTracker?: ProviderModelStatusTracker | undefined;
     persistReview?: ((payload: ChimeraReviewCompletePayload, projectDir: string) => Promise<void>) | undefined;
-    setPendingWork: (work: PendingChimeraWork) => void;
+    trackWork: (work: Promise<void>) => void;
 };
-export declare function installChimeraReviewHandler({ events, director, session, mailbox, agent, config, projectDir, statusTracker, persistReview, setPendingWork, }: InstallChimeraReviewHandlerOptions): void;
+export declare function installChimeraReviewHandler({ events, director, session, mailbox, agent, config, projectDir, statusTracker, persistReview, trackWork, }: InstallChimeraReviewHandlerOptions): void;
 export {};
 //# sourceMappingURL=execution-chimera-review.d.ts.map

package/dist/execution-cleanup.d.ts

@@ -1,4 +1,5 @@
 import type { Director } from '@wrongstack/core/coordination';
+import type { ChimeraWorkRegistry } from './chimera-work-registry.js';
 import type { ExecuteDeps } from './execute-deps.js';
 import type { FleetStatusLine } from './fleet-statusline.js';
 export interface ExecutionCleanupInput {
@@ -13,8 +14,8 @@ export interface ExecutionCleanupInput {
     session: ExecuteDeps['session']['session'];
     tokenCounter: ExecuteDeps['core']['tokenCounter'];
     events: ExecuteDeps['core']['events'];
-    /** Getter for chimera's in-flight work promise — avoids stale captures. */
-    getPendingChimeraWork?: () => Promise<void> | undefined;
+    /** Session-scoped Chimera work tracker; drained before agent/session teardown. */
+    chimeraWork?: ChimeraWorkRegistry | undefined;
     /** Optional director reference for fleet cleanup at session end. */
     director?: Director | null | undefined;
     reader: ExecuteDeps['ui']['reader'];

package/dist/execution.d.ts

@@ -1,6 +1,6 @@
 import type { ExecuteDeps } from './execute-deps.js';
 export type { LiveSettingsInput } from './live-settings-input.js';
-export { __resetReviewerRoundRobinCursor, applyChimeraReviewerReadOnlyPolicy, assignReviewerModelsRoundRobin, CHIMERA_REVIEW_READ_ONLY_TOOLS, resolveReviewerFallbackModels, } from './chimera-reviewer-policy.js';
+export { __resetReviewerRoundRobinCursor, applyChimeraReviewerReadOnlyPolicy, assignReviewerModels, assignReviewerModelsRoundRobin, CHIMERA_REVIEW_READ_ONLY_TOOLS, resolveReviewerFallbackModels, } from './chimera-reviewer-policy.js';
 export type { BrainData, BrainLogEntry, ExecuteDeps, McpPickerItem, PluginPickerItem, RestoredToolCall, ToolPickerItem, } from './execute-deps.js';
 export declare function execute(deps: ExecuteDeps): Promise<number>;
 //# sourceMappingURL=execution.d.ts.map

package/dist/{export-TPORYVRZ.js → export-DOBGPY23.js}

@@ -1,3 +1,6 @@
+import {
+  restoreFlags
+} from "./chunk-CSAPOCBP.js";
 import "./chunk-7OCVIDC7.js";
 
 // src/subcommands/handlers/export.ts
@@ -7,6 +10,14 @@ import { DefaultSessionReader } from "@wrongstack/core/storage";
 import { expectDefined } from "@wrongstack/core/utils";
 import { toErrorMessage } from "@wrongstack/core/utils";
 var exportCmd = async (args, deps) => {
+  args = restoreFlags(args, deps, [
+    "format",
+    "f",
+    "out",
+    "o",
+    "no-tools",
+    "no-diagnostics"
+  ]);
   if (!deps.sessionStore) {
     deps.renderer.writeError("No session store configured.");
     return 1;
@@ -61,4 +72,4 @@ var exportCmd = async (args, deps) => {
 export {
   exportCmd
 };
-//# sourceMappingURL=export-TPORYVRZ.js.map
+//# sourceMappingURL=export-DOBGPY23.js.map

package/dist/fleet/budget-source.d.ts

@@ -0,0 +1,18 @@
+import type { Config } from '@wrongstack/core/types';
+export type FleetBudgetSource = 'cli-flag' | 'env' | 'profile' | 'default';
+export interface ResolvedFleetBudget {
+    maxConcurrent: number;
+    maxConcurrentSource: FleetBudgetSource;
+    maxSpawns: number;
+    maxSpawnsSource: FleetBudgetSource;
+}
+export declare function resolveFleetBudgetSources(input: {
+    flags?: Record<string, string | boolean> | undefined;
+    env?: NodeJS.ProcessEnv | undefined;
+    config?: Config | undefined;
+    /** Built-in maxConcurrent when nothing else wins. */
+    defaultMaxConcurrent?: number | undefined;
+    /** Built-in maxSpawns when nothing else wins. */
+    defaultMaxSpawns?: number | undefined;
+}): ResolvedFleetBudget;
+//# sourceMappingURL=budget-source.d.ts.map

package/dist/fleet/host-context.d.ts

@@ -1,5 +1,5 @@
 import type { SubagentConfig } from '@wrongstack/core/types';
 import type { MultiAgentDeps } from './host-types.js';
-export declare function resolveHostSubagentSkillContent(deps: MultiAgentDeps, roster: Record<string, SubagentConfig>, subCfg: SubagentConfig): Promise<string>;
+export declare function resolveHostSubagentSkillContent(deps: MultiAgentDeps, roster: Record<string, SubagentConfig>, subCfg: SubagentConfig, availableToolNames?: readonly string[]): Promise<string>;
 export declare function retrieveHostSubagentMemory(deps: MultiAgentDeps, getLeaderMode: (() => string | undefined) | undefined, subCfg: SubagentConfig, taskContext?: Record<string, unknown>): Promise<string[]>;
 //# sourceMappingURL=host-context.d.ts.map

package/dist/fleet/host-helpers.d.ts

@@ -10,6 +10,20 @@ export declare function buildShadowAgentTaskDescription(reason: string): string;
 export declare function touchLruKey(order: string[], key: string): void;
 export declare function setBoundedLruEntry<T>(map: Map<string, T>, order: string[], key: string, value: T, maxEntries: number): void;
 export declare const DEFAULT_SUBAGENT_HIDDEN_TOOLS: Set<string>;
+/**
+ * Tools a subagent can never receive — not even through an explicit
+ * `tools: [...]` allowlist.
+ *
+ * This is stricter than {@link DEFAULT_SUBAGENT_HIDDEN_TOOLS}, which only hides
+ * orchestration controls from the unrestricted default slice and still hands
+ * them over when a spawn asks for them by name. `nextsteps` records the
+ * leader's after-task suggestions: the runtime folds a recorded block into a
+ * LEADER turn only (`next-steps-slot.ts`), and `WIDE_SUBAGENT_CAPABILITIES`
+ * does not carry `session.nextsteps`. Granting it would produce either a
+ * permission rejection or a silent no-op, so asking for it by name is a
+ * mistake to correct rather than an intent to honor.
+ */
+export declare const NEVER_SUBAGENT_TOOLS: Set<string>;
 export declare function selectSubagentTools(allTools: readonly Tool[], directorToolsByName: ReadonlyMap<string, Tool>, allow?: readonly string[] | undefined): Tool[];
 export declare function resolveSubagentCapabilities(subCfg: SubagentConfig, toolsForAllow: (allow: readonly string[]) => readonly Tool[]): readonly string[] | undefined;
 export declare function resolveFleetWorktreePolicy(config: Config): FleetWorktreePolicy;