@wrongstack/cli 0.300.0 → 0.302.0

package/dist/{execution-SHGM7BVC.js → execution-CQ772VPS.js}

@@ -25,22 +25,34 @@ import {
   trySaveSpecFromAIOutput,
   trySaveTasksFromAIOutput
 } from "./chunk-XTIXVJXP.js";
+import {
+  WEBUI_SESSION_CHILD_CAPABILITIES,
+  writeWebuiSessionChildError,
+  writeWebuiSessionChildReady
+} from "./chunk-PFVVUH5B.js";
 import {
   theme
 } from "./chunk-QD544J2B.js";
 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
-import * as path11 from "node:path";
+import * as path12 from "node:path";
 import { effectiveFallbackChain as effectiveFallbackChain2, setQueuedMessagesSnapshot as setQueuedMessagesSnapshot2 } from "@wrongstack/core/agent";
 import { attachTodosCheckpoint as attachTodosCheckpoint2 } from "@wrongstack/core/storage";
 import { normalizeTokenSavingTier as normalizeTokenSavingTier2 } from "@wrongstack/core/types";
@@ -148,6 +160,7 @@ async function runTuiDispatch(options) {
 }
 
 // src/boot/dispatch-webui.ts
+import * as path from "node:path";
 import { color as color2 } from "@wrongstack/core/utils";
 async function runWebUIDispatch(ctx) {
   const {
@@ -183,12 +196,14 @@ async function runWebUIDispatch(ctx) {
     agentTranscripts,
     sddSubagentFactory,
     onKanbanDispatch,
-    getFleetBudget
+    getFleetBudget,
+    webuiSessionChild
   } = ctx;
-  const isSimpleUi = flags["simpleui"] === true;
+  const isSessionChild = Boolean(webuiSessionChild);
+  const isSimpleUi = !isSessionChild && flags["simpleui"] === true;
   agent.disableInteractiveConfirmation();
   renderer.setSilent(true);
-  const { runWebUI } = await import("./webui-server-G3EKFXLL.js");
+  const { runWebUI } = await import("./webui-server-NFNRGNNT.js");
   const flagValue = (names) => {
     for (const name of names) {
       if (!Object.hasOwn(flags, name)) continue;
@@ -231,22 +246,32 @@ async function runWebUIDispatch(ctx) {
   let webuiRequireToken;
   let frontendDistDir;
   try {
-    webuiHost = flagValue(["webui-host", "host"]) ?? process.env["WEBUI_HOST"] ?? process.env["WS_HOST"] ?? "127.0.0.1";
+    webuiHost = webuiSessionChild?.host ?? flagValue(["webui-host", "host"]) ?? process.env["WEBUI_HOST"] ?? process.env["WS_HOST"] ?? "127.0.0.1";
     const defaultPort = isSimpleUi ? 3466 : 3456;
-    webuiPort = parsePort(
+    webuiPort = webuiSessionChild?.port ?? parsePort(
       flagValue(["webui-port", "http-port", "port", "ws-port"]) ?? process.env["WEBUI_PORT"] ?? process.env["PORT"] ?? process.env["WS_PORT"],
       defaultPort,
       "--port"
     );
-    webuiAccessToken = flagValue(["webui-token"]) ?? process.env["WEBUI_TOKEN"] ?? process.env["WEBUI_AUTH_TOKEN"];
-    webuiPublicUrl = flagValue(["webui-public-url", "public-url"]) ?? process.env["WEBUI_PUBLIC_URL"];
-    webuiPublicWsUrl = flagValue(["webui-public-ws-url", "public-ws-url"]) ?? process.env["WEBUI_PUBLIC_WS_URL"];
-    webuiRequireToken = flagBoolean(["webui-require-token", "require-token"]) ?? envFlag("WEBUI_REQUIRE_TOKEN");
+    webuiAccessToken = webuiSessionChild?.token ?? flagValue(["webui-token"]) ?? process.env["WEBUI_TOKEN"] ?? process.env["WEBUI_AUTH_TOKEN"];
+    webuiPublicUrl = webuiSessionChild?.publicUrl ?? flagValue(["webui-public-url", "public-url"]) ?? process.env["WEBUI_PUBLIC_URL"];
+    webuiPublicWsUrl = webuiSessionChild?.publicWsUrl ?? flagValue(["webui-public-ws-url", "public-ws-url"]) ?? process.env["WEBUI_PUBLIC_WS_URL"];
+    webuiRequireToken = webuiSessionChild?.requireToken ?? flagBoolean(["webui-require-token", "require-token"]) ?? envFlag("WEBUI_REQUIRE_TOKEN");
     if (isSimpleUi) {
       const { ensureSimpleUiDistDir } = await import("./simpleui-dist-JIFGUJO7.js");
       frontendDistDir = await ensureSimpleUiDistDir();
     }
   } catch (err) {
+    if (webuiSessionChild) {
+      await writeWebuiSessionChildError(webuiSessionChild.readyFile, {
+        protocolVersion: webuiSessionChild.protocolVersion,
+        runtimeId: webuiSessionChild.runtimeId,
+        parentShellId: webuiSessionChild.parentShellId,
+        phase: "validate_args",
+        recoverable: false,
+        error: err
+      }).catch(() => void 0);
+    }
     renderer.setSilent(false);
     renderer.writeInfo(color2.red(`  ${err instanceof Error ? err.message : String(err)}`));
     return 1;
@@ -264,9 +289,11 @@ async function runWebUIDispatch(ctx) {
     publicUrl: webuiPublicUrl,
     publicWsUrl: webuiPublicWsUrl,
     requireToken: webuiRequireToken,
+    strictPort: webuiSessionChild?.strictPort,
     projectRoot,
     appConfig: config,
-    open: !!flags.open,
+    open: webuiSessionChild ? false : !!flags.open,
+    webuiSessionChild,
     agentTranscripts,
     hqAllowExec: flagBoolean(["hq-allow-exec"]) ?? false,
     modelsRegistry,
@@ -309,12 +336,57 @@ async function runWebUIDispatch(ctx) {
     // listening, using the RESOLVED port. Requested ports auto-advance past
     // busy ports inside runWebUI, so a banner printed up-front lies whenever
     // the default when it is taken (a second instance, leftover socket).
-    onListening: ({ url }) => {
+    onListening: ({ httpPort, host, url, authToken }) => {
+      if (webuiSessionChild) {
+        void writeWebuiSessionChildReady(webuiSessionChild.readyFile, {
+          type: "webui.session_child.ready",
+          protocolVersion: webuiSessionChild.protocolVersion,
+          runtime: {
+            role: "session-child",
+            runtimeId: webuiSessionChild.runtimeId,
+            pid: process.pid,
+            parentPid: webuiSessionChild.parentPid,
+            parentShellId: webuiSessionChild.parentShellId,
+            startedAt: (/* @__PURE__ */ new Date()).toISOString()
+          },
+          project: {
+            projectRoot,
+            workingDir: webuiSessionChild.workingDir,
+            projectSlug: path.basename(projectRoot) || projectRoot,
+            projectName: path.basename(projectRoot) || projectRoot
+          },
+          session: {
+            sessionId: session.id,
+            created: !webuiSessionChild.resume,
+            resumed: webuiSessionChild.resume,
+            provider: config.provider,
+            model: config.model
+          },
+          endpoint: {
+            surface: "webui",
+            host,
+            httpPort,
+            url,
+            ...webuiPublicUrl ? { publicUrl: webuiPublicUrl } : {},
+            ...webuiPublicWsUrl ? { publicWsUrl: webuiPublicWsUrl } : {},
+            requireToken: webuiRequireToken,
+            auth: authToken ? { scheme: "registry-token", tokenPresent: true, token: authToken } : { scheme: "none", tokenPresent: false }
+          },
+          registry: {
+            webuiInstanceRegistered: true,
+            sessionRegistered: true
+          },
+          capabilities: [...WEBUI_SESSION_CHILD_CAPABILITIES]
+        }).catch(() => void 0);
+        return;
+      }
       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
@@ -337,6 +409,16 @@ async function runWebUIDispatch(ctx) {
       );
       resolve3(0);
     }).catch((err) => {
+      if (webuiSessionChild) {
+        void writeWebuiSessionChildError(webuiSessionChild.readyFile, {
+          protocolVersion: webuiSessionChild.protocolVersion,
+          runtimeId: webuiSessionChild.runtimeId,
+          parentShellId: webuiSessionChild.parentShellId,
+          phase: "start_server",
+          recoverable: false,
+          error: err
+        }).catch(() => void 0);
+      }
       renderer.setSilent(false);
       renderer.writeInfo(
         color2.red(
@@ -353,8 +435,8 @@ async function runWebUIDispatch(ctx) {
 function resolveExecutionMode(positional, flags) {
   const prompt = typeof flags["prompt"] === "string" ? flags["prompt"] : "";
   if (positional.length > 0 || prompt.length > 0) return "single-shot";
-  if (flags.tui && flags["no-tui"] !== true && !flags.webui) return "tui";
-  if (flags.webui) return "webui";
+  if (flags.tui && flags["no-tui"] !== true && !flags.webui && !flags["webui-session-child"]) return "tui";
+  if (flags.webui || flags["webui-session-child"]) return "webui";
   return "repl";
 }
 
@@ -494,7 +576,7 @@ function createTuiCoordinatorCallbacks({
 }
 
 // src/boot/tui-coordinator-setup.ts
-import * as path from "node:path";
+import * as path2 from "node:path";
 import { AutonomousCoordinator } from "@wrongstack/core/coordination";
 function setupAutonomousCoordinator(ctx) {
   const { state, events, context, wpaths, mailbox, director, getDirector, coordinatorController, onCoordinatorStopSetter } = ctx;
@@ -503,7 +585,7 @@ function setupAutonomousCoordinator(ctx) {
     const currentDirector = getDirector?.() ?? director;
     if (!currentDirector) return null;
     const transcript = context.session.transcriptPath;
-    const sessionDir = transcript ? path.dirname(transcript) : wpaths.projectDir;
+    const sessionDir = transcript ? path2.dirname(transcript) : wpaths.projectDir;
     const llmProvider = {
       decide: async (prompt) => {
         const sysPrompt = [
@@ -714,10 +796,10 @@ function wireGoal(events) {
 }
 
 // src/boot/tui-live-sessions.ts
-import * as path2 from "node:path";
+import * as path3 from "node:path";
 async function getLiveSessions(ctx) {
   const { SessionRegistry } = await import("@wrongstack/core/storage");
-  const globalRoot = path2.dirname(ctx.state.wpaths.globalConfig);
+  const globalRoot = path3.dirname(ctx.state.wpaths.globalConfig);
   const registry = new SessionRegistry(globalRoot);
   const sessions = await registry.list();
   return sessions.filter((s) => s.status !== "stale").map((s) => ({
@@ -747,7 +829,7 @@ function onSwitchToSession(ctx, _sessionId, targetRoot, projectName) {
 }
 
 // src/boot/tui-project-picker-callback.ts
-import * as path3 from "node:path";
+import * as path4 from "node:path";
 import { color as color3 } from "@wrongstack/core/utils";
 async function getProjectPickerItems(ctx) {
   const { buildPickerItems } = await import("./project-picker-BOCWHBXP.js");
@@ -761,7 +843,7 @@ async function onProjectSelect(ctx, slug, kind) {
   try {
     if (kind === "action") {
       if (slug === "new-session") {
-        const name = path3.basename(state.projectRoot) || state.projectRoot;
+        const name = path4.basename(state.projectRoot) || state.projectRoot;
         const err2 = await switchProjectInPlace2(state.projectRoot, name);
         if (err2) renderer.write(color3.red(`Project switch failed: ${err2}
 `));
@@ -772,8 +854,8 @@ async function onProjectSelect(ctx, slug, kind) {
     const manifest = await loadManifest(state.wpaths.globalConfig);
     const project = manifest.projects.find((p) => p.slug === slug);
     if (!project) return;
-    const targetRoot = path3.resolve(project.root);
-    if (path3.resolve(state.projectRoot) === targetRoot) return;
+    const targetRoot = path4.resolve(project.root);
+    if (path4.resolve(state.projectRoot) === targetRoot) return;
     const fleetStatus = director?.status();
     const fleetRunning = fleetStatus?.subagents.filter((a) => a.status === "running").length ?? 0;
     const eternalActive = getEternalEngine?.()?.currentState === "running";
@@ -811,7 +893,7 @@ ${parts.join("\n")}
 import { spawn } from "node:child_process";
 import { createRequire } from "node:module";
 import * as fs from "node:fs/promises";
-import * as path4 from "node:path";
+import * as path5 from "node:path";
 import { color as color4 } from "@wrongstack/core/utils";
 async function handleProjectSwitchSpawn(opts) {
   const PROJECT_SWITCH_EXIT_CODE = 42;
@@ -824,8 +906,8 @@ async function handleProjectSwitchSpawn(opts) {
   try {
     const req = createRequire(import.meta.url);
     const pkgPath = req.resolve("@wrongstack/cli/package.json");
-    const pkgDir = path4.dirname(pkgPath);
-    cliPath = path4.join(pkgDir, "dist", "index.js");
+    const pkgDir = path5.dirname(pkgPath);
+    cliPath = path5.join(pkgDir, "dist", "index.js");
     await fs.access(cliPath);
   } catch {
     cliPath = process.argv[1] ?? "";
@@ -837,13 +919,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(
     [
       "",
@@ -858,7 +943,7 @@ async function handleProjectSwitchSpawn(opts) {
 
 // src/boot/tui-project-switch.ts
 import * as fs2 from "node:fs/promises";
-import * as path5 from "node:path";
+import * as path6 from "node:path";
 import {
   DefaultSystemPromptBuilder,
   setQueuedMessagesSnapshot
@@ -879,7 +964,7 @@ async function switchProjectInPlace(ctx, targetRoot, displayName) {
     skillLoader,
     attachTodosCheckpoint: attachTodosCheckpoint3
   } = ctx;
-  const resolved = path5.resolve(targetRoot);
+  const resolved = path6.resolve(targetRoot);
   const stat2 = await fs2.stat(resolved).catch(() => null);
   if (!stat2?.isDirectory()) return `Cannot switch: not a directory: ${resolved}`;
   const oldWriter = context.session;
@@ -918,7 +1003,7 @@ async function switchProjectInPlace(ctx, targetRoot, displayName) {
     await state.activateSessionIdentity(nextWriter.id, {
       projectSlug: nextWpaths.projectSlug,
       projectRoot: resolved,
-      projectName: displayName || path5.basename(resolved),
+      projectName: displayName || path6.basename(resolved),
       workingDir: resolved
     });
   } catch (err) {
@@ -938,6 +1023,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(
@@ -979,7 +1065,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
     });
@@ -1053,7 +1140,7 @@ async function onSDDOutput(output) {
 }
 
 // src/boot/tui-session-resume.ts
-import * as path6 from "node:path";
+import * as path7 from "node:path";
 import { attachTodosCheckpoint, loadTodosCheckpoint } from "@wrongstack/core/storage";
 import { sessionScopedPath as sessionScopedPath2 } from "@wrongstack/core/utils";
 async function resumeSession(ctx, sessionId) {
@@ -1079,7 +1166,7 @@ async function resumeSession(ctx, sessionId) {
   }
   try {
     const { SessionRegistry } = await import("@wrongstack/core/storage");
-    const registry = new SessionRegistry(path6.dirname(state.wpaths.globalConfig));
+    const registry = new SessionRegistry(path7.dirname(state.wpaths.globalConfig));
     const live = (await registry.list()).find(
       (s) => s.sessionId === canonicalSessionId && s.status !== "stale" && s.pid !== process.pid
     );
@@ -1290,10 +1377,10 @@ async function resumeSession(ctx, sessionId) {
 
 // src/boot/tui-settings-adapter.ts
 import * as fs3 from "node:fs/promises";
-import * as path7 from "node:path";
+import * as path8 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",
@@ -1372,6 +1459,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,
@@ -1411,12 +1499,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)
@@ -1506,9 +1597,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;
         }
@@ -1563,7 +1655,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(
@@ -1576,7 +1668,7 @@ function createSettingsAdapter(ctx) {
         const isProjectTarget = actualTarget === wpaths.inProjectConfig;
         const toWrite = isProjectTarget ? filterSafeForProject(mergedToWrite) : mergedToWrite;
         const encrypted = encryptConfigSecrets(toWrite, noOpVault);
-        await fs3.mkdir(path7.dirname(actualTarget), { recursive: true });
+        await fs3.mkdir(path8.dirname(actualTarget), { recursive: true });
         await atomicWrite(actualTarget, JSON.stringify(encrypted, null, 2), { mode: 384 });
         const currentConfig = configStore.get();
         const nextModelRuntime = {
@@ -1620,7 +1712,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 ?? {}
@@ -1734,6 +1826,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
@@ -1815,6 +1908,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 } }),
@@ -1851,7 +1945,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 {
@@ -1860,20 +1954,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;
@@ -1976,7 +2074,7 @@ async function finalizeExecutionCleanup(input) {
     session,
     tokenCounter,
     events,
-    getPendingChimeraWork,
+    chimeraWork,
     director,
     reader
   } = input;
@@ -2028,25 +2126,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 {
@@ -2447,9 +2554,46 @@ 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";
+import * as path9 from "node:path";
 import { emitReviewIfChanged } from "@wrongstack/core/plugin";
 
 // src/chimera-review-task.ts
@@ -2708,7 +2852,7 @@ function installChimeraCascadeHandler({
   director,
   session,
   getPendingWork,
-  setPendingWork,
+  trackWork,
   buildLadder
 }) {
   events.onPattern("chimera.cascade_needed", (_event, payload) => {
@@ -2797,7 +2941,7 @@ function installChimeraCascadeHandler({
       }
       await maybeReReviewCascade({ events, session, bundle: p.bundle });
     })();
-    setPendingWork(pendingWork);
+    trackWork(pendingWork);
   });
 }
 async function maybeReReviewCascade({
@@ -2812,7 +2956,7 @@ async function maybeReReviewCascade({
       const reReadFiles = [];
       for (const f of bundle.files) {
         try {
-          const absPath = path8.join(bundle.cwd, f.path);
+          const absPath = path9.join(bundle.cwd, f.path);
           const content = await fsp.readFile(absPath, "utf8");
           reReadFiles.push({ path: f.path, status: "modified", content });
         } catch {
@@ -2836,7 +2980,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
         );
@@ -2881,7 +3025,7 @@ async function maybeReReviewCascade({
 
 // src/execution-chimera-review.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-import path9 from "node:path";
+import path10 from "node:path";
 import { effectiveFallbackChain } from "@wrongstack/core/agent";
 import {
   CHIMERA_REVIEW_PROMPT,
@@ -2894,7 +3038,7 @@ import {
 function normalizeFileKeyForCitation(raw, cwd) {
   const forward = raw.replace(/\\/g, "/").replace(/^\.\//, "");
   const isAbsolute = forward.startsWith("/") || /^[a-zA-Z]:\//.test(forward);
-  const pathMod = process.platform === "win32" ? path9.win32 : path9;
+  const pathMod = process.platform === "win32" ? path10.win32 : path10;
   const relative = isAbsolute ? pathMod.relative(cwd, forward).replace(/\\/g, "/").replace(/^\.\//, "") : forward;
   return process.platform === "win32" ? relative.toLowerCase() : relative;
 }
@@ -2908,13 +3052,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;
@@ -2957,11 +3102,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 {
@@ -2973,10 +3118,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({
@@ -3090,16 +3236,16 @@ function installChimeraReviewHandler({
             const changedBasenameIndex = /* @__PURE__ */ new Map();
             for (const file of p.files) {
               const normalized = normalizeFileKeyForCitation(file.path, p.cwd);
-              const basename5 = path9.basename(file.path).toLowerCase();
-              const bucket = changedBasenameIndex.get(basename5);
+              const basename6 = path10.basename(file.path).toLowerCase();
+              const bucket = changedBasenameIndex.get(basename6);
               if (bucket) bucket.push(normalized);
-              else changedBasenameIndex.set(basename5, [normalized]);
+              else changedBasenameIndex.set(basename6, [normalized]);
             }
             const droppedCitations = citedFindings.filter((finding) => {
               const citedKey = normalizeFileKeyForCitation(finding.location.file, p.cwd);
               if (citedPaths.has(citedKey)) return false;
-              const basename5 = path9.basename(finding.location.file).toLowerCase();
-              const bucket = changedBasenameIndex.get(basename5);
+              const basename6 = path10.basename(finding.location.file).toLowerCase();
+              const bucket = changedBasenameIndex.get(basename6);
               return !(bucket && bucket.length === 1);
             });
             const effectiveHasFindings = reviewHasFindings && (parsedReview.findings.length === 0 || parsedReview.findings.length > droppedCitations.length);
@@ -3621,7 +3767,7 @@ function printBanner(renderer, projectName) {
 
 // src/repl-client-registration.ts
 import * as crypto from "node:crypto";
-import * as path10 from "node:path";
+import * as path11 from "node:path";
 import {
   getSharedProjectMailbox,
   resolveProjectDir
@@ -3634,7 +3780,7 @@ function registerReplClient(opts) {
   const hqConnection = startCliHqConnection({
     clientKind: "repl",
     projectRoot: replProjectRoot,
-    projectName: path10.basename(replProjectRoot),
+    projectName: path11.basename(replProjectRoot),
     appConfig: opts.appConfig,
     capabilities: ["telemetry.publish", "mailbox.summary"]
   });
@@ -3648,7 +3794,7 @@ function registerReplClient(opts) {
   clientMailbox.registerClient({
     clientId,
     sessionId: opts.getSessionId?.() ?? replProjectRoot,
-    name: `REPL [${path10.basename(replProjectRoot)}]`,
+    name: `REPL [${path11.basename(replProjectRoot)}]`,
     source: "repl",
     pid: process.pid
   }).then(() => {
@@ -4442,7 +4588,8 @@ async function execute(deps) {
       slashRegistry,
       tokenCounter,
       activateSessionIdentity,
-      updateInfo: initialUpdateInfo
+      updateInfo: initialUpdateInfo,
+      webuiSessionChild
     },
     session: {
       session,
@@ -4555,7 +4702,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,
@@ -4569,8 +4716,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({
@@ -4581,9 +4728,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;
@@ -4910,6 +5057,7 @@ async function execute(deps) {
         sddSubagentFactory,
         statusTracker,
         updateInfo: bootUpdateInfo,
+        webuiSessionChild,
         getFleetBudget: () => {
           const d = getDirector?.() ?? null;
           if (!d) return null;
@@ -4952,7 +5100,7 @@ async function execute(deps) {
           attachments,
           effectiveMaxContext,
           getEffectiveMaxContext,
-          projectName: path11.basename(projectRoot) || void 0,
+          projectName: path12.basename(projectRoot) || void 0,
           projectRoot,
           appConfig: config,
           getSessionId: () => agent.ctx.session?.id ?? session.id,
@@ -4995,7 +5143,7 @@ async function execute(deps) {
       session,
       tokenCounter,
       events,
-      getPendingChimeraWork: () => pendingChimeraWork,
+      chimeraWork,
       director,
       reader
     });
@@ -5006,8 +5154,9 @@ export {
   CHIMERA_REVIEW_READ_ONLY_TOOLS,
   __resetReviewerRoundRobinCursor,
   applyChimeraReviewerReadOnlyPolicy,
+  assignReviewerModels,
   assignReviewerModelsRoundRobin,
   execute,
   resolveReviewerFallbackModels
 };
-//# sourceMappingURL=execution-SHGM7BVC.js.map
+//# sourceMappingURL=execution-CQ772VPS.js.map