@wrongstack/cli 0.298.1 → 0.298.2

package/data/README.md

@@ -75,3 +75,54 @@ pnpm run sync:models -- --diff                               # what we override
 Then edit `providers.json` and commit. Keep it **small and curated** — it is an override layer,
 not a mirror of models.dev. Once models.dev catches up, drop the now-redundant override (`--diff`
 flags those).
+
+## Overlay vs. per-user `customModels` — when to use which
+
+There are **two** override layers in WrongStack, for two different audiences:
+
+| Layer | Location | Audience | Purpose |
+|---|---|---|---|
+| **Curated overlay** | `packages/cli/data/providers.json` (this file) | **All users, repo-wide** | Fix upstream errors, add models/providers models.dev doesn't list, remove bad entries (`_removeProviders` / `_removeModels` magic keys). Ships with every release. |
+| **`customModels` config** | `~/.wrongstack/profiles/<name>/config.json` → `providers.<id>.customModels` | **One user, one profile** | Per-user model visibility + per-model metadata overrides (limits, cost, modalities, capability flags) via the WebUI ModelListEditor or TUI `/auth` panel. |
+
+**Decision rule:** if the fix benefits every user of the product (an upstream data error, a brand-new
+model id), it belongs in the **overlay** — commit it here. If it's personal tuning (my context limit,
+my custom endpoint's pricing), it belongs in the user's **`customModels`** config — never here.
+
+Both layers deep-merge one level into `limit` / `cost` / `modalities` objects, and both follow the
+same precedence contract at resolution time:
+
+```
+top-level config.models  >  providers.<id>.customModels  >  overlay  >  models.dev catalog  >  wire-family defaults
+```
+
+The top-level `config.models` record overrides provider-local entries for the same model id
+(`mergeCustomModelDefs` in `packages/core/src/utils/merge-custom-models.ts`). Inline
+models.dev-style objects inside `providers.<id>.models` are normalized into `customModels` at
+config load — they are not a separate runtime layer.
+
+## Catalog cache & boot refresh
+
+The live models.dev catalog is fetched at boot and cached:
+
+- **Cache:** `~/.wrongstack/cache/models.dev.json` (fetched at startup; `--no-models-refresh`
+  skips the network fetch and uses the stale cache).
+- **Overlay cache:** `~/.wrongstack/cache/models-overlay.json` (fetched from GitHub raw; the
+  bundled `providers.json` is the offline floor).
+- Resolution: `merged = mergeModelsPayload(cachedModelsDev, overlay)` — the overlay always wins.
+
+If models.dev is unreachable and no cache exists, a non-empty overlay still drives the catalog
+on its own. Users never edit the cache files — they are regenerated on boot.
+
+## Modalities format (important)
+
+`modalities.input` and `modalities.output` are **plain string arrays**, not objects:
+
+```jsonc
+"modalities": { "input": ["text", "image", "pdf"], "output": ["text"] }
+```
+
+So `modalities.input[0] === "text"` (a string). The known values are `"text" | "image" | "audio" |
+"video" | "pdf"` (see `MODELS_DEV_MODALITY_VALUES` in `packages/core/src/models/models-dev-schema.ts`).
+New upstream values are tolerated at parse time — the schema validates "array of non-empty strings",
+not a closed enum.

package/dist/{auth-NLLGEYQR.js → auth-G5YKKSRH.js}

@@ -13,10 +13,10 @@ import {
   runOAuthLoginKind,
   runOAuthLoginMenu,
   validateFamily
-} from "./chunk-I2BM6FK6.js";
+} from "./chunk-L5CE52XW.js";
 import {
   parseAuthFlags
-} from "./chunk-JBSQ7ONN.js";
+} from "./chunk-ZNZJ34RF.js";
 import "./chunk-66T43Q4Y.js";
 import "./chunk-GO3TJICK.js";
 import {
@@ -501,4 +501,4 @@ async function runAuthRemove(deps, providerId) {
 export {
   authCmd
 };
-//# sourceMappingURL=auth-NLLGEYQR.js.map
+//# sourceMappingURL=auth-G5YKKSRH.js.map

package/dist/chimera-reviewer-policy.d.ts

@@ -1,3 +1,4 @@
+import type { ProviderModelStatusTracker } from '@wrongstack/core/coordination';
 import type { SubagentConfig, SubagentError, TaskResult } from '@wrongstack/core/types';
 /**
  * Resolve the fallback-model chain used when spawning the chimera-review
@@ -19,8 +20,14 @@ export declare function __resetReviewerRoundRobinCursor(value?: number): void;
  * Builds the pool from the configured primary + fallback chain, then picks
  * the next entry via round-robin. When the pool has <=1 usable entry the
  * original primary/fallbacks are returned unchanged.
+ *
+ * When a {@link ProviderModelStatusTracker} is supplied, blocked entries
+ * (waiting-room / token-reset-limit room) are filtered from both the pool
+ * and the round-robin pick so a 429-stricken model is never re-spawned on
+ * a concurrent reviewer turn. Without the tracker, the legacy pre-waiting-
+ * room behavior is preserved.
  */
-export declare function assignReviewerModelsRoundRobin(provider: string, model: string, fallbackModels: readonly string[]): {
+export declare function assignReviewerModelsRoundRobin(provider: string, model: string, fallbackModels: readonly string[], statusTracker?: ProviderModelStatusTracker | undefined): {
     provider: string;
     model: string;
     fallbackModels: string[];

package/dist/{chunk-I2BM6FK6.js → chunk-L5CE52XW.js}

@@ -1,7 +1,7 @@
 import {
   LOCAL_LLM_PRESETS,
   runLiveProviderPicker
-} from "./chunk-JBSQ7ONN.js";
+} from "./chunk-ZNZJ34RF.js";
 import {
   openBrowser,
   runCodexOAuthLogin,
@@ -1327,4 +1327,4 @@ export {
   addKeyForProvider,
   runAuthLocal
 };
-//# sourceMappingURL=chunk-I2BM6FK6.js.map
+//# sourceMappingURL=chunk-L5CE52XW.js.map

package/dist/{chunk-JBSQ7ONN.js → chunk-ZNZJ34RF.js}

@@ -1020,4 +1020,4 @@ export {
   runLiveProviderPicker,
   runPicker
 };
-//# sourceMappingURL=chunk-JBSQ7ONN.js.map
+//# sourceMappingURL=chunk-ZNZJ34RF.js.map

package/dist/{cli-main-7QLL2PY6.js → cli-main-ZDZMCVLM.js}

@@ -80,11 +80,11 @@ import {
   runClaudeOAuthLogin,
   runCopilotOAuthLogin,
   validateFamily
-} from "./chunk-I2BM6FK6.js";
+} from "./chunk-L5CE52XW.js";
 import {
   LOCAL_LLM_PRESETS,
   parseSpawnFlags
-} from "./chunk-JBSQ7ONN.js";
+} from "./chunk-ZNZJ34RF.js";
 import {
   buildPickableProviders
 } from "./chunk-66T43Q4Y.js";
@@ -381,6 +381,187 @@ function createAuthPanelHost(deps) {
         return true;
       });
     },
+    editModelDetails(providerId, modelId, io) {
+      return runFlow(async () => {
+        const providers = await loadProviders();
+        const cfg = providers[providerId];
+        if (!cfg) {
+          io.onLog(`\u2717 Provider "${providerId}" no longer in config.`);
+          return false;
+        }
+        const catalogModel = await deps.modelsRegistry.getModel(
+          cfg.type && cfg.type !== providerId ? cfg.type : providerId,
+          modelId
+        ).catch(() => void 0);
+        const existing = cfg.customModels?.[modelId];
+        const currentMd = existing?.modelsDev ?? {};
+        io.onLog(
+          catalogModel ? `Catalog reference: ctx=${catalogModel.capabilities.maxContext ?? "?"}, out=${catalogModel.capabilities.maxOutput ?? "?"}` : `(no catalog entry for ${modelId})`
+        );
+        const name = (await io.prompt(
+          `Name (current: ${currentMd["name"] ?? modelId})`,
+          { secret: false }
+        )).trim();
+        const ctxRaw = (await io.prompt(
+          `Context window (current: ${currentMd.limit?.["context"] ?? "?"}, catalog: ${catalogModel?.capabilities.maxContext ?? "?"})`,
+          { secret: false }
+        )).trim();
+        const outRaw = (await io.prompt(
+          `Max output (current: ${existing?.maxOutput ?? currentMd.limit?.["output"] ?? "?"}, catalog: ${catalogModel?.capabilities.maxOutput ?? "?"})`,
+          { secret: false }
+        )).trim();
+        const costInRaw = (await io.prompt(
+          `Cost input $/1M (current: ${currentMd.cost?.["input"] ?? "?"}, catalog: ${catalogModel?.cost?.input ?? "?"})`,
+          { secret: false }
+        )).trim();
+        const costOutRaw = (await io.prompt(
+          `Cost output $/1M (current: ${currentMd.cost?.["output"] ?? "?"}, catalog: ${catalogModel?.cost?.output ?? "?"})`,
+          { secret: false }
+        )).trim();
+        const modelsDev = {};
+        if (name) modelsDev["name"] = name;
+        const limit = {};
+        if (ctxRaw) {
+          const n = Number(ctxRaw);
+          if (!Number.isNaN(n) && n >= 0) limit["context"] = n;
+        }
+        if (outRaw) {
+          const n = Number(outRaw);
+          if (!Number.isNaN(n) && n >= 0) limit["output"] = n;
+        }
+        if (Object.keys(limit).length > 0) modelsDev["limit"] = limit;
+        const cost = {};
+        if (costInRaw) {
+          const n = Number(costInRaw);
+          if (!Number.isNaN(n) && n >= 0) cost["input"] = n;
+        }
+        if (costOutRaw) {
+          const n = Number(costOutRaw);
+          if (!Number.isNaN(n) && n >= 0) cost["output"] = n;
+        }
+        if (Object.keys(cost).length > 0) modelsDev["cost"] = cost;
+        if (Object.keys(modelsDev).length === 0) {
+          io.onLog("(no changes \u2014 nothing entered)");
+          return true;
+        }
+        const err = await mutate((all) => {
+          const p = all[providerId];
+          if (!p) return `Provider "${providerId}" no longer in config.`;
+          if (!p.customModels) p.customModels = {};
+          const existingEntry = p.customModels[modelId] ?? {};
+          p.customModels[modelId] = {
+            ...existingEntry,
+            modelsDev: {
+              ...existingEntry.modelsDev ?? {},
+              ...modelsDev,
+              // Deep-merge limit/cost so partial overrides don't wipe sub-fields
+              ...limit || existingEntry.modelsDev ? {
+                limit: {
+                  ...existingEntry.modelsDev?.["limit"] ?? {},
+                  ...limit
+                }
+              } : {},
+              ...cost || existingEntry.modelsDev?.["cost"] ? {
+                cost: {
+                  ...existingEntry.modelsDev?.["cost"] ?? {},
+                  ...cost
+                }
+              } : {}
+            }
+          };
+          return null;
+        });
+        if (err) {
+          io.onLog(`\u2717 ${err}`);
+          return false;
+        }
+        io.onLog(`\u2713 ${modelId} updated`);
+        return true;
+      });
+    },
+    addModel(providerId, io, opts) {
+      return runFlow(async () => {
+        const providers = await loadProviders();
+        const cfg = providers[providerId];
+        if (!cfg) {
+          io.onLog(`\u2713 Provider "${providerId}" no longer in config.`);
+          return false;
+        }
+        const modelId = (await io.prompt("Model id", { secret: false })).trim();
+        if (!modelId) {
+          io.onLog("\u2717 Model id is required.");
+          return false;
+        }
+        if (opts?.fromCatalog) {
+          const catalogModel = await deps.modelsRegistry.getModel(
+            cfg.type && cfg.type !== providerId ? cfg.type : providerId,
+            modelId
+          ).catch(() => void 0);
+          if (catalogModel) {
+            io.onLog(
+              `Found in catalog: ctx=${catalogModel.capabilities.maxContext}, out=${catalogModel.capabilities.maxOutput}`
+            );
+          } else {
+            io.onLog(`(not found in catalog \u2014 entering as custom)`);
+          }
+        }
+        const err = await mutate((all) => {
+          const p = all[providerId];
+          if (!p) return `Provider "${providerId}" no longer in config.`;
+          if (!p.models) p.models = [];
+          if (!p.models.includes(modelId)) p.models.push(modelId);
+          return null;
+        });
+        if (err) {
+          io.onLog(`\u2717 ${err}`);
+          return false;
+        }
+        io.onLog(`\u2713 Added model "${modelId}" to ${providerId}`);
+        return true;
+      });
+    },
+    removeModel(providerId, modelId) {
+      return (async () => {
+        const err = await mutate((all) => {
+          const p = all[providerId];
+          if (!p) return `Provider "${providerId}" no longer in config.`;
+          if (p.models) {
+            p.models = p.models.filter((m) => m !== modelId);
+            if (p.models.length === 0) delete p.models;
+          }
+          if (p.customModels && modelId in p.customModels) {
+            delete p.customModels[modelId];
+            if (Object.keys(p.customModels).length === 0) delete p.customModels;
+          }
+          return null;
+        });
+        return err;
+      })();
+    },
+    resetModelToCatalog(providerId, modelId) {
+      return (async () => {
+        const providers = await loadProviders();
+        const cfg = providers[providerId];
+        if (!cfg) return `Provider "${providerId}" no longer in config.`;
+        const catalogModel = await deps.modelsRegistry.getModel(
+          cfg.type && cfg.type !== providerId ? cfg.type : providerId,
+          modelId
+        ).catch(() => void 0);
+        if (!catalogModel) {
+          return `Model "${modelId}" not found in catalog \u2014 cannot reset.`;
+        }
+        const err = await mutate((all) => {
+          const p = all[providerId];
+          if (!p) return `Provider "${providerId}" no longer in config.`;
+          if (p.customModels && modelId in p.customModels) {
+            delete p.customModels[modelId];
+            if (Object.keys(p.customModels).length === 0) delete p.customModels;
+          }
+          return null;
+        });
+        return err;
+      })();
+    },
     addCatalogProvider(catalogId, io) {
       return runFlow(async () => {
         const catalog = await deps.modelsRegistry.listProviders();
@@ -2842,7 +3023,7 @@ import {
 } from "@wrongstack/acp";
 import { ToolValidationError } from "@wrongstack/core/types";
 function buildAcpSubagentRunner(subagentId) {
-  let cmd = ACP_AGENT_COMMANDS[subagentId];
+  let cmd = Object.prototype.hasOwnProperty.call(ACP_AGENT_COMMANDS, subagentId) ? ACP_AGENT_COMMANDS[subagentId] : void 0;
   if (!cmd) {
     const desc = findAgentDescriptor(subagentId);
     if (desc) {
@@ -3182,6 +3363,75 @@ import { DefaultTokenCounter } from "@wrongstack/core/infrastructure";
 import { EventBus } from "@wrongstack/core/kernel";
 import { AutoApprovePermissionPolicy } from "@wrongstack/core/security";
 
+// src/fleet/host-context.ts
+import { TOKENS as TOKENS2 } from "@wrongstack/core/kernel";
+import { getSageRetrieval } from "@wrongstack/sage";
+async function resolveHostSubagentSkillContent(deps, roster, subCfg) {
+  const rosterSkillNames = subCfg.role ? roster[subCfg.role]?.skillNames : void 0;
+  const skillNames = [...new Set(subCfg.skillNames ?? rosterSkillNames ?? [])];
+  const directContent = subCfg.skillContent?.trim();
+  if (skillNames.length === 0 || !deps.skillLoader) return directContent ?? "";
+  const resolved = [];
+  let usedChars = 0;
+  const maxChars = 16e3;
+  const maxCharsPerSkill = 4e3;
+  for (const skillName of skillNames) {
+    try {
+      const manifest = await deps.skillLoader.find(skillName);
+      if (!manifest) continue;
+      const body = (await deps.skillLoader.readSaveBody(skillName)).trim();
+      if (!body) continue;
+      const entry = `## Skill: ${skillName}
+
+${body.slice(0, maxCharsPerSkill)}`;
+      if (usedChars + entry.length > maxChars) {
+        console.warn(
+          `[MultiAgentHost] resolveSubagentSkillContent: budget (${maxChars}) exhausted after ${resolved.length} skill(s); dropping "${skillName}" and remaining skills`
+        );
+        break;
+      }
+      resolved.push(entry);
+      usedChars += entry.length;
+    } catch {
+    }
+  }
+  const sections = [
+    directContent,
+    resolved.length > 0 ? `# Role-prioritized skills
+
+Apply these skills first for this assignment.
+
+${resolved.join("\n\n---\n\n")}` : void 0
+  ].filter((section) => Boolean(section));
+  return sections.join("\n\n");
+}
+async function retrieveHostSubagentMemory(deps, getLeaderMode, subCfg, taskContext) {
+  const memoryPort = deps.container.safeResolve(TOKENS2.MemoryStore);
+  const memory = memoryPort ? getSageRetrieval(memoryPort) : void 0;
+  if (!memory?.retrieveForAudience) return [];
+  const contextualTaskType = typeof taskContext?.["taskType"] === "string" ? taskContext["taskType"] : void 0;
+  try {
+    const taskType = subCfg.memoryContext?.taskType ?? contextualTaskType;
+    const mode = subCfg.memoryContext?.mode ?? getLeaderMode?.();
+    const matches = await memory.retrieveForAudience(
+      {
+        ...subCfg.role !== void 0 ? { role: subCfg.role } : {},
+        ...taskType !== void 0 ? { taskType } : {},
+        ...mode !== void 0 ? { mode } : {}
+      },
+      20
+    );
+    await memory.recordInjection?.(
+      matches.map((item) => item.id),
+      "subagent_audience",
+      deps.session.id
+    );
+    return matches.map((item) => item.text);
+  } catch {
+    return [];
+  }
+}
+
 // src/fleet/host-event-bridge.ts
 import * as path4 from "node:path";
 var BRIDGE_TEXT_CAP = 360;
@@ -3352,106 +3602,6 @@ function installSubagentEventBridge(opts) {
   };
 }
 
-// src/fleet/host-session-writer.ts
-function createParentSubagentSessionWriter(parentSession) {
-  return {
-    id: parentSession.id,
-    transcriptPath: parentSession.transcriptPath,
-    get pendingToolUses() {
-      return [];
-    },
-    append: (event) => parentSession.append({ ...event }),
-    appendBatch: (events) => parentSession.appendBatch(events.map((event) => ({ ...event }))),
-    flush: () => parentSession.flush(),
-    close: async () => {
-    },
-    recordFileChange: () => {
-    },
-    recordSideEffect: () => {
-    },
-    writeCheckpoint: async () => {
-    },
-    writeFileSnapshot: async () => {
-    },
-    truncateToCheckpoint: async () => 0,
-    clearSession: async () => {
-    },
-    writeInFlightMarker: async () => {
-    },
-    clearInFlightMarker: async () => {
-    }
-  };
-}
-
-// src/fleet/host-context.ts
-import { TOKENS as TOKENS2 } from "@wrongstack/core/kernel";
-import { getSageRetrieval } from "@wrongstack/sage";
-async function resolveHostSubagentSkillContent(deps, roster, subCfg) {
-  const rosterSkillNames = subCfg.role ? roster[subCfg.role]?.skillNames : void 0;
-  const skillNames = [...new Set(subCfg.skillNames ?? rosterSkillNames ?? [])];
-  const directContent = subCfg.skillContent?.trim();
-  if (skillNames.length === 0 || !deps.skillLoader) return directContent ?? "";
-  const resolved = [];
-  let usedChars = 0;
-  const maxChars = 16e3;
-  const maxCharsPerSkill = 4e3;
-  for (const skillName of skillNames) {
-    try {
-      const manifest = await deps.skillLoader.find(skillName);
-      if (!manifest) continue;
-      const body = (await deps.skillLoader.readSaveBody(skillName)).trim();
-      if (!body) continue;
-      const entry = `## Skill: ${skillName}
-
-${body.slice(0, maxCharsPerSkill)}`;
-      if (usedChars + entry.length > maxChars) {
-        console.warn(
-          `[MultiAgentHost] resolveSubagentSkillContent: budget (${maxChars}) exhausted after ${resolved.length} skill(s); dropping "${skillName}" and remaining skills`
-        );
-        break;
-      }
-      resolved.push(entry);
-      usedChars += entry.length;
-    } catch {
-    }
-  }
-  const sections = [
-    directContent,
-    resolved.length > 0 ? `# Role-prioritized skills
-
-Apply these skills first for this assignment.
-
-${resolved.join("\n\n---\n\n")}` : void 0
-  ].filter((section) => Boolean(section));
-  return sections.join("\n\n");
-}
-async function retrieveHostSubagentMemory(deps, getLeaderMode, subCfg, taskContext) {
-  const memoryPort = deps.container.safeResolve(TOKENS2.MemoryStore);
-  const memory = memoryPort ? getSageRetrieval(memoryPort) : void 0;
-  if (!memory?.retrieveForAudience) return [];
-  const contextualTaskType = typeof taskContext?.["taskType"] === "string" ? taskContext["taskType"] : void 0;
-  try {
-    const taskType = subCfg.memoryContext?.taskType ?? contextualTaskType;
-    const mode = subCfg.memoryContext?.mode ?? getLeaderMode?.();
-    const matches = await memory.retrieveForAudience(
-      {
-        ...subCfg.role !== void 0 ? { role: subCfg.role } : {},
-        ...taskType !== void 0 ? { taskType } : {},
-        ...mode !== void 0 ? { mode } : {}
-      },
-      20
-    );
-    await memory.recordInjection?.(
-      matches.map((item) => item.id),
-      "subagent_audience",
-      deps.session.id
-    );
-    return matches.map((item) => item.text);
-  } catch {
-    return [];
-  }
-}
-
 // src/fleet/host-provider.ts
 import { makeProviderFromConfig, withCatalogCapabilities } from "@wrongstack/providers";
 async function buildHostSubagentProvider(deps, config, overrideId, model) {
@@ -3532,6 +3682,37 @@ function resolveHostSubagentModelSelection(liveConfig, effectiveCfg, matrixTarge
   };
 }
 
+// src/fleet/host-session-writer.ts
+function createParentSubagentSessionWriter(parentSession) {
+  return {
+    id: parentSession.id,
+    transcriptPath: parentSession.transcriptPath,
+    get pendingToolUses() {
+      return [];
+    },
+    append: (event) => parentSession.append({ ...event }),
+    appendBatch: (events) => parentSession.appendBatch(events.map((event) => ({ ...event }))),
+    flush: () => parentSession.flush(),
+    close: async () => {
+    },
+    recordFileChange: () => {
+    },
+    recordSideEffect: () => {
+    },
+    writeCheckpoint: async () => {
+    },
+    writeFileSnapshot: async () => {
+    },
+    truncateToCheckpoint: async () => 0,
+    clearSession: async () => {
+    },
+    writeInFlightMarker: async () => {
+    },
+    clearInFlightMarker: async () => {
+    }
+  };
+}
+
 // src/fleet/host-subagent-factory.ts
 function createHostSubagentFactory(config, host) {
   return async (subCfg, task) => {
@@ -3544,7 +3725,14 @@ function createHostSubagentFactory(config, host) {
     const effectiveCfg = projectCfg ? applyProjectAgentConfig(subCfg, projectCfg, {
       protectSystemRole: isSystemRole
     }) : subCfg;
-    const matrixTarget = effectiveCfg.model ? void 0 : resolveSubagentModelTarget(liveConfig, effectiveCfg.role);
+    const matrixTarget = effectiveCfg.model ? void 0 : resolveSubagentModelTarget(liveConfig, effectiveCfg.role, {
+      // Thread the shared tracker so the resolved matrix target skips
+      // (provider, model) pairs currently in the waiting room. Without
+      // this, the subagent factory would seed its own primary from a
+      // doomed model the leader just 429-stricken, and the fallback
+      // extension would have to spend a turn rotating away.
+      ...host.opts.statusTracker ? { statusTracker: host.opts.statusTracker } : {}
+    });
     const modelSelection = resolveHostSubagentModelSelection(
       liveConfig,
       effectiveCfg,
@@ -3573,8 +3761,7 @@ function createHostSubagentFactory(config, host) {
         providerError = err;
       }
     }
-    if (!provider)
-      throw providerError ?? new Error("No permitted provider/model could be built.");
+    if (!provider) throw providerError ?? new Error("No permitted provider/model could be built.");
     let subReasoningConfig = await resolveHostSubagentReasoningConfig(
       host.deps,
       effProvider,
@@ -29806,7 +29993,7 @@ async function runInteractive(cliCtx) {
     onEvent: evOn
   });
   const savedProviderCfg = config.providers?.[config.provider];
-  const { execute } = await import("./execution-HJ643JGZ.js");
+  const { execute } = await import("./execution-BY556FCF.js");
   const stopHeapWatchdog = startSharedHeapWatchdog({
     collectStats: () => {
       const hqQueue = hqPublisherRef.current?.getQueueStats();
@@ -30038,4 +30225,4 @@ export {
   CLI_VERSION,
   runInteractive
 };
-//# sourceMappingURL=cli-main-7QLL2PY6.js.map
+//# sourceMappingURL=cli-main-ZDZMCVLM.js.map

package/dist/{execution-HJ643JGZ.js → execution-BY556FCF.js}

@@ -1289,6 +1289,29 @@ import { decryptConfigSecrets, encryptConfigSecrets, noOpVault } from "@wrongsta
 import { normalizeTokenSavingTier, resolveFleetChatVerbosity } from "@wrongstack/core/types";
 import { atomicWrite } from "@wrongstack/core/utils";
 import { getProcessRegistry } from "@wrongstack/tools";
+var PANEL_IDS_CLI = [
+  "projectPicker",
+  "fleet",
+  "agents",
+  "worktree",
+  "plan",
+  "todos",
+  "queue",
+  "processList",
+  "goal",
+  "sessions",
+  "coordinator",
+  "kanban",
+  "connections"
+];
+function coercePanelPositionMap(v) {
+  const out = {};
+  for (const id of PANEL_IDS_CLI) {
+    const value = v?.[id];
+    out[id] = value === "sidebar" ? "sidebar" : "bottom";
+  }
+  return out;
+}
 function coerceAgentSwarmMode(v) {
   if (v === true || v === void 0) return "bottom";
   if (v === false) return "off";
@@ -1365,6 +1388,16 @@ function createSettingsAdapter(ctx) {
       breakerAutoKillResetMs: cfg.circuitBreaker?.autoKillResetMs ?? 6e4,
       showModelReasoning: autonomy?.showModelReasoning ?? true,
       showAgentSwarmPanel: coerceAgentSwarmMode(autonomy?.showAgentSwarmPanel),
+      // Migrate the legacy `autonomy.showAgentSwarmPanel: 'sidebar'` into
+      // the new per-panel `panelPositions.fleet` map at the read boundary
+      // so users with old configs (no `panelPositions` key on disk) get
+      // their sidebar routing. Only migrate when the per-panel key is
+      // UNDEFINED — an explicit `panelPositions.fleet: 'bottom'` must
+      // NOT be reverted to `'sidebar'`.
+      panelPositions: coercePanelPositionMap({
+        ...autonomy?.panelPositions,
+        ...coerceAgentSwarmMode(autonomy?.showAgentSwarmPanel) === "sidebar" && autonomy?.panelPositions?.fleet === void 0 ? { fleet: "sidebar" } : {}
+      }),
       showSageMemoryInject: autonomy?.showSageMemoryInject ?? false,
       readSymbols: autonomy?.readAdvancedMode ?? false,
       sageMemoryInjectThreshold: cfg.Sage?.inject ? cfg.Sage.inject?.relationFloor : void 0
@@ -1372,7 +1405,7 @@ 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.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.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 = {
@@ -1421,6 +1454,7 @@ function createSettingsAdapter(ctx) {
         if (s.showModelReasoning !== void 0) autonomy.showModelReasoning = s.showModelReasoning;
         if (s.showAgentSwarmPanel !== void 0)
           autonomy.showAgentSwarmPanel = s.showAgentSwarmPanel;
+        if (s.panelPositions !== void 0) autonomy.panelPositions = s.panelPositions;
         if (s.showSageMemoryInject !== void 0)
           autonomy.showSageMemoryInject = s.showSageMemoryInject;
         if (s.readSymbols !== void 0) autonomy.readAdvancedMode = s.readSymbols;
@@ -1517,8 +1551,24 @@ function createSettingsAdapter(ctx) {
           decrypted,
           targetPath
         );
+        let mergedToWrite = decrypted;
+        if (actualTarget !== targetPath) {
+          try {
+            const destRaw = await fs3.readFile(actualTarget, "utf8");
+            const destParsed = JSON.parse(destRaw);
+            const destDecrypted = decryptConfigSecrets(destParsed, noOpVault);
+            mergedToWrite = { ...destDecrypted, ...decrypted };
+          } catch (err) {
+            if (err.code !== "ENOENT") {
+              throw new Error(
+                `Failed to read destination config at ${actualTarget}: ${err instanceof Error ? err.message : String(err)}`,
+                { cause: err }
+              );
+            }
+          }
+        }
         const isProjectTarget = actualTarget === wpaths.inProjectConfig;
-        const toWrite = isProjectTarget ? filterSafeForProject(decrypted) : decrypted;
+        const toWrite = isProjectTarget ? filterSafeForProject(mergedToWrite) : mergedToWrite;
         const encrypted = encryptConfigSecrets(toWrite, noOpVault);
         await fs3.mkdir(path7.dirname(actualTarget), { recursive: true });
         await atomicWrite(actualTarget, JSON.stringify(encrypted, null, 2), { mode: 384 });
@@ -1773,8 +1823,8 @@ var reviewerRoundRobinCursor = 0;
 function __resetReviewerRoundRobinCursor(value = 0) {
   reviewerRoundRobinCursor = value;
 }
-function assignReviewerModelsRoundRobin(provider, model, fallbackModels) {
-  const pool = buildReviewerModelPool(provider, model, fallbackModels);
+function assignReviewerModelsRoundRobin(provider, model, fallbackModels, statusTracker) {
+  const pool = buildReviewerModelPool(provider, model, fallbackModels, statusTracker);
   if (pool.length <= 1) {
     return {
       provider,
@@ -1786,7 +1836,8 @@ function assignReviewerModelsRoundRobin(provider, model, fallbackModels) {
     pool,
     reviewerRoundRobinCursor,
     provider,
-    model
+    model,
+    statusTracker
   );
   reviewerRoundRobinCursor = assignment.nextCursor;
   return {
@@ -2810,6 +2861,7 @@ function installChimeraReviewHandler({
   agent,
   config,
   projectDir,
+  statusTracker,
   persistReview = persistChimeraReview,
   setPendingWork
 }) {
@@ -2876,7 +2928,12 @@ 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(baseProvider, baseModel, baseFallbacks);
+          const assigned = assignReviewerModelsRoundRobin(
+            baseProvider,
+            baseModel,
+            baseFallbacks,
+            statusTracker
+          );
           const ladder = buildReviewerAttemptLadder({
             assigned,
             profileChain: effectiveFallbackChain(config),
@@ -3016,7 +3073,20 @@ ${reviewBody}`;
                 audience: "leaders",
                 subject,
                 body,
-                priority: "normal"
+                priority: "normal",
+                // Session-affinity stamp: the recipient's leader filter
+                // uses this to drop the message for any leader whose current
+                // session id does NOT match the originating session of the
+                // review (`reviewSessionId` is captured above from the
+                // agent's active run / session id). Without this token the
+                // project-wide mailbox would deliver every chimera result to
+                // every leader, inviting them to act on reports that belong
+                // to a different session.
+                sessionAffinity: {
+                  sessionId: reviewSessionId,
+                  reportId,
+                  kind: "chimera.review"
+                }
               });
               if (!mailMsg?.id) throw new Error("mailbox.send returned no message id");
               reviewMailMessageId = mailMsg.id;
@@ -4446,6 +4516,11 @@ async function execute(deps) {
     agent,
     config,
     projectDir: wpaths.projectDir,
+    // Thread the shared tracker so the round-robin Chimera reviewer picks
+    // skip (provider, model) pairs currently in the waiting room. Without
+    // 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;
     }
@@ -4867,4 +4942,4 @@ export {
   execute,
   resolveReviewerFallbackModels
 };
-//# sourceMappingURL=execution-HJ643JGZ.js.map
+//# sourceMappingURL=execution-BY556FCF.js.map

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

@@ -1,3 +1,4 @@
+import type { ProviderModelStatusTracker } from '@wrongstack/core/coordination';
 import { type ChimeraReviewCompletePayload } from '@wrongstack/core/plugin';
 import type { ExecuteDeps } from './execute-deps.js';
 type Director = NonNullable<ExecuteDeps['fleet']['director']>;
@@ -27,9 +28,18 @@ export type InstallChimeraReviewHandlerOptions = {
     agent: Agent;
     config: Config;
     projectDir: string;
+    /**
+     * Shared provider/model status tracker. When supplied, the round-robin
+     * Chimera reviewer spawn skips (provider, model) pairs currently in the
+     * waiting room (`state: 'blocked'`) so a 429-stricken model is never
+     * re-spawned on a concurrent reviewer turn. The tracker is the same
+     * singleton the leader's `/provider-status` reads from; see
+     * `packages/core/src/coordination/provider-status-tracker.ts`.
+     */
+    statusTracker?: ProviderModelStatusTracker | undefined;
     persistReview?: ((payload: ChimeraReviewCompletePayload, projectDir: string) => Promise<void>) | undefined;
     setPendingWork: (work: PendingChimeraWork) => void;
 };
-export declare function installChimeraReviewHandler({ events, director, session, mailbox, agent, config, projectDir, persistReview, setPendingWork, }: InstallChimeraReviewHandlerOptions): void;
+export declare function installChimeraReviewHandler({ events, director, session, mailbox, agent, config, projectDir, statusTracker, persistReview, setPendingWork, }: InstallChimeraReviewHandlerOptions): void;
 export {};
 //# sourceMappingURL=execution-chimera-review.d.ts.map

package/dist/index.js

@@ -36,7 +36,7 @@ import {
   parseArgs,
   runPicker,
   saveToGlobalConfig
-} from "./chunk-JBSQ7ONN.js";
+} from "./chunk-ZNZJ34RF.js";
 import {
   isKeylessLocalProvider,
   visibleModelIds
@@ -1497,7 +1497,7 @@ function compactSingleLine(text) {
 var loaders = {
   acp: async () => (await import("./acp-S4LZQB66.js")).acpCmd,
   init: async () => (await import("./init-E2NDDOHI.js")).initCmd,
-  auth: async () => (await import("./auth-NLLGEYQR.js")).authCmd,
+  auth: async () => (await import("./auth-G5YKKSRH.js")).authCmd,
   update: async () => (await import("./update-MV6TUACD.js")).updateCmd,
   sessions: async () => (await import("./sessions-config-NLCMK3BY.js")).sessionsCmd,
   config: async () => (await import("./sessions-config-NLCMK3BY.js")).configCmd,
@@ -3149,7 +3149,7 @@ async function initializeCli(argv) {
 async function main(argv) {
   const cliCtx = await initializeCli(argv);
   if (typeof cliCtx === "number") return cliCtx;
-  const { runInteractive } = await import("./cli-main-7QLL2PY6.js");
+  const { runInteractive } = await import("./cli-main-ZDZMCVLM.js");
   return runInteractive(cliCtx);
 }
 

package/dist/live-settings-input.d.ts

@@ -66,6 +66,14 @@ export interface LiveSettingsInput {
     /** Agent swarm panel placement: 'bottom' (lower region), 'sidebar' (right sidebar), or 'off' (hidden).
      * Backward-compat: legacy boolean values are coerced by the TUI settings adapter. Default: 'bottom'. */
     showAgentSwarmPanel?: 'bottom' | 'sidebar' | 'off' | boolean | undefined;
+    /**
+     * Per-panel position map (one entry per F-key panel id). Each value is
+     * 'bottom' (F-key behavior) or 'sidebar' (right-sidebar twin). Persisted
+     * as `autonomy.panelPositions` in the project/profile config. The TUI
+     * auto-save hook passes a full PanelPositionMap (13 entries); the adapter
+     * stores it as-is. Default: every panel 'bottom' when unset.
+     */
+    panelPositions?: Readonly<Record<string, 'bottom' | 'sidebar'>> | undefined;
     /** Show SAGE Memory Inject blocks in tool results. Default: false. */
     showSageMemoryInject?: boolean | undefined;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/cli",
-  "version": "0.298.1",
+  "version": "0.298.2",
   "license": "MIT",
   "description": "WrongStack CLI — terminal AI coding agent with provider catalog from models.dev. Provides `wrongstack` and `wstack` binaries.",
   "keywords": [
@@ -42,29 +42,29 @@
   ],
   "dependencies": {
     "ws": "^8.21.1",
-    "@wrongstack/acp": "0.298.1",
-    "@wrongstack/mcp": "0.298.1",
-    "@wrongstack/bench": "0.298.1",
-    "@wrongstack/kanban": "0.298.1",
-    "@wrongstack/providers": "0.298.1",
-    "@wrongstack/plug-lsp": "0.298.1",
-    "@wrongstack/runtime": "0.298.1",
-    "@wrongstack/core": "0.298.1",
-    "@wrongstack/plugins": "0.298.1",
-    "@wrongstack/sdd": "0.298.1",
-    "@wrongstack/security-scanner": "0.298.1",
-    "@wrongstack/simpleui": "0.298.1",
-    "@wrongstack/techstack": "0.298.1",
-    "@wrongstack/sage": "0.298.1",
-    "@wrongstack/telegram": "0.298.1",
-    "@wrongstack/webui": "0.298.1",
-    "@wrongstack/webui-server": "0.298.1",
-    "@wrongstack/tools": "0.298.1",
-    "@wrongstack/tui": "0.298.1",
-    "@wrongstack/webui-hq": "0.298.1"
+    "@wrongstack/bench": "0.298.2",
+    "@wrongstack/acp": "0.298.2",
+    "@wrongstack/kanban": "0.298.2",
+    "@wrongstack/plug-lsp": "0.298.2",
+    "@wrongstack/mcp": "0.298.2",
+    "@wrongstack/plugins": "0.298.2",
+    "@wrongstack/core": "0.298.2",
+    "@wrongstack/sdd": "0.298.2",
+    "@wrongstack/runtime": "0.298.2",
+    "@wrongstack/providers": "0.298.2",
+    "@wrongstack/security-scanner": "0.298.2",
+    "@wrongstack/simpleui": "0.298.2",
+    "@wrongstack/sage": "0.298.2",
+    "@wrongstack/telegram": "0.298.2",
+    "@wrongstack/techstack": "0.298.2",
+    "@wrongstack/tools": "0.298.2",
+    "@wrongstack/tui": "0.298.2",
+    "@wrongstack/webui-hq": "0.298.2",
+    "@wrongstack/webui-server": "0.298.2",
+    "@wrongstack/webui": "0.298.2"
   },
   "optionalDependencies": {
-    "@wrongstack/desktop": "0.298.1"
+    "@wrongstack/desktop": "0.298.2"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",