openmausbot 0.1.87 → 0.1.89

package/dist-server/openmausbot.js

@@ -17791,10 +17791,26 @@ var init_wire = __esm({
 function isModelVariant(value) {
   return typeof value === "string" && value.length > 0 && value.length <= 256 && value.trim() === value && !new RegExp("\\p{Cc}", "u").test(value);
 }
-var eventCounter, newEventId, newId;
+function titleCaseModelId(id, wordBreaks) {
+  return id.split(wordBreaks).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
+}
+function qualifiedModelLabel(id, qualifier, options = {}) {
+  const { redundantWhen = () => false, decorate = (facet) => ` \u2014 ${facet}` } = options;
+  if (!qualifier || redundantWhen(id, qualifier)) return id;
+  return `${id}${decorate(qualifier)}`;
+}
+var TurnNotStartedError, eventCounter, newEventId, newId;
 var init_contracts = __esm({
   "server/contracts.ts"() {
     "use strict";
+    TurnNotStartedError = class extends Error {
+      turnId;
+      constructor(turnId, message2) {
+        super(message2);
+        this.name = "TurnNotStartedError";
+        this.turnId = turnId;
+      }
+    };
     eventCounter = 0;
     newEventId = () => `ev-${Date.now().toString(36)}-${(eventCounter++).toString(36)}`;
     newId = () => crypto.randomUUID();
@@ -18923,7 +18939,16 @@ function loadConfig() {
   let cfg = {};
   try {
     cfg = parseStoredConfig(parseJson(readFileSync3(join9(DATA_DIR, "config.json"), "utf8")));
-  } catch {
+    lastIgnoredConfigWarning = "";
+  } catch (error51) {
+    if (error51?.code !== "ENOENT") {
+      const reason = error51 instanceof SyntaxError ? "invalid JSON" : error51 instanceof Error ? error51.message : "unable to read configuration";
+      const warning = `config: ignoring ${join9(DATA_DIR, "config.json")} and using defaults: ${reason}`;
+      if (warning !== lastIgnoredConfigWarning) console.warn(warning);
+      lastIgnoredConfigWarning = warning;
+    } else {
+      lastIgnoredConfigWarning = "";
+    }
   }
   cfg.mistral = { ...cfg.mistral };
   if (process.env.MISTRAL_API_KEY !== void 0) cfg.mistral.key = process.env.MISTRAL_API_KEY;
@@ -18995,6 +19020,7 @@ function saveConfig(patch, options = {}) {
   if (checkedPatch.language !== void 0) disk.language = checkedPatch.language;
   if (checkedPatch.customDomain !== void 0) disk.customDomain = checkedPatch.customDomain;
   if (checkedPatch.signIn !== void 0) disk.signIn = checkedPatch.signIn;
+  if (checkedPatch.automaticRecovery !== void 0) disk.automaticRecovery = checkedPatch.automaticRecovery;
   if (checkedPatch.defaultModelSelection !== void 0) {
     disk.defaultModelSelection = checkedPatch.defaultModelSelection;
     if (disk.newBotDefaults) {
@@ -19150,7 +19176,7 @@ function instanceConfigs(cfg) {
   }
   return map3;
 }
-var optionalText, SSH_ALIAS, LEGACY_BROWSER_PROFILE_ID, BROWSER_PROFILE_ID, MIN_ROOM_TURN_TIMEOUT_MINUTES, MAX_ROOM_TURN_TIMEOUT_MINUTES, DEFAULT_ROOM_HANDOFF_LIFETIME_MINUTES, DEFAULT_ROOM_HANDOFF_MIN_RUNWAY_MINUTES, DEFAULT_ROOM_HANDOFF_HARD_CAP_MINUTES, DEFAULT_MAX_CONCURRENT_BOT_THREADS, MAX_CONCURRENT_BOT_THREADS, MIN_THREAD_EVENT_LOG_BYTES, MAX_THREAD_EVENT_LOG_BYTES, MIN_LOCAL_VM_MAX_INSTANCES, MAX_LOCAL_VM_MAX_INSTANCES, CDP_PORT, CDP_URL, vpsConfigSchema, browserEngineConfigSchema, roomConfigSchema, localVmConfigSchema, browserProfileSchema, legacyBrowserProfileSchema, legacyBrowserProfilesSchema, storedBrowserProfilesSchema, browserProfilesSchema, featureConfigSchema, onboardingConfigSchema, instanceConfigSchema, instanceConfigMapSchema, defaultModelSelectionSchema, threadsConfigSchema, newBotsConfigSchema, newBotsPatchSchema, threadsPatchSchema, appConfigSchema, storedAppConfigSchema, appConfigPatchSchema, jsonObjectSchema, DATA_DIR, LEGACY_DATA_DIR, EVENTS_DIR, NATIVE_DIR, WORKSPACE_CREDENTIAL_ENV, CONTROL_PLANE_ENV, CONTROL_PLANE_ENV_PREFIX, PROVIDER_CREDENTIAL_ENV, configSaveListeners;
+var optionalText, SSH_ALIAS, LEGACY_BROWSER_PROFILE_ID, BROWSER_PROFILE_ID, MIN_ROOM_TURN_TIMEOUT_MINUTES, MAX_ROOM_TURN_TIMEOUT_MINUTES, DEFAULT_ROOM_HANDOFF_LIFETIME_MINUTES, DEFAULT_ROOM_HANDOFF_MIN_RUNWAY_MINUTES, DEFAULT_ROOM_HANDOFF_HARD_CAP_MINUTES, DEFAULT_MAX_CONCURRENT_BOT_THREADS, MAX_CONCURRENT_BOT_THREADS, MIN_THREAD_EVENT_LOG_BYTES, MAX_THREAD_EVENT_LOG_BYTES, MIN_LOCAL_VM_MAX_INSTANCES, MAX_LOCAL_VM_MAX_INSTANCES, CDP_PORT, CDP_URL, vpsConfigSchema, browserEngineConfigSchema, roomConfigSchema, localVmConfigSchema, browserProfileSchema, legacyBrowserProfileSchema, legacyBrowserProfilesSchema, storedBrowserProfilesSchema, browserProfilesSchema, featureConfigSchema, onboardingConfigSchema, instanceConfigSchema, instanceConfigMapSchema, defaultModelSelectionSchema, automaticRecoverySchema, threadsConfigSchema, newBotsConfigSchema, newBotsPatchSchema, threadsPatchSchema, appConfigSchema, storedAppConfigSchema, appConfigPatchSchema, jsonObjectSchema, DATA_DIR, LEGACY_DATA_DIR, EVENTS_DIR, NATIVE_DIR, lastIgnoredConfigWarning, WORKSPACE_CREDENTIAL_ENV, CONTROL_PLANE_ENV, CONTROL_PLANE_ENV_PREFIX, PROVIDER_CREDENTIAL_ENV, configSaveListeners;
 var init_config = __esm({
   "server/config.ts"() {
     "use strict";
@@ -19177,7 +19203,7 @@ var init_config = __esm({
     MIN_THREAD_EVENT_LOG_BYTES = 256 * 1024;
     MAX_THREAD_EVENT_LOG_BYTES = 4 * 1024 * 1024 * 1024;
     MIN_LOCAL_VM_MAX_INSTANCES = 1;
-    MAX_LOCAL_VM_MAX_INSTANCES = 4;
+    MAX_LOCAL_VM_MAX_INSTANCES = 8;
     CDP_PORT = /^[0-9]{1,5}$/;
     CDP_URL = /^(https?|wss?):\/\/\S+$/i;
     vpsConfigSchema = external_exports.object({
@@ -19290,6 +19316,13 @@ var init_config = __esm({
       (selection) => selection.variant === void 0 || selection.effort === void 0,
       "choose either a model variant or an effort level"
     );
+    automaticRecoverySchema = external_exports.object({
+      enabled: external_exports.boolean(),
+      backup: defaultModelSelectionSchema.optional()
+    }).strict().refine(
+      (recovery) => !recovery.enabled || recovery.backup !== void 0,
+      { message: "Choose a backup model before enabling automatic recovery", path: ["backup"] }
+    );
     threadsConfigSchema = external_exports.object({
       maxConcurrentPerBot: external_exports.number().int().min(1).max(MAX_CONCURRENT_BOT_THREADS),
       /** Cap each per-thread events/ and native/ NDJSON log at this many
@@ -19318,6 +19351,7 @@ var init_config = __esm({
        * addresses or `@domain` entries; admins get every scope, members chat only. */
       signIn: external_exports.object({ admins: external_exports.array(external_exports.string().max(320)).max(500).optional(), members: external_exports.array(external_exports.string().max(320)).max(5e3).optional() }).optional(),
       defaultModelSelection: defaultModelSelectionSchema.optional(),
+      automaticRecovery: automaticRecoverySchema.optional(),
       newBotDefaults: newBotDefaultsSchema.optional(),
       newBots: newBotsConfigSchema.optional(),
       /** CLI-only launch preferences. Never enable remote access implicitly. */
@@ -19432,6 +19466,7 @@ var init_config = __esm({
     LEGACY_DATA_DIR = join9(homedir4(), ".opengrokbot");
     EVENTS_DIR = join9(DATA_DIR, "events");
     NATIVE_DIR = join9(DATA_DIR, "native");
+    lastIgnoredConfigWarning = "";
     WORKSPACE_CREDENTIAL_ENV = [
       "XAI_API_KEY",
       "MISTRAL_API_KEY",
@@ -19877,6 +19912,8 @@ function knownDirs() {
     join11(home, ".volta", "bin"),
     join11(home, ".bun", "bin"),
     join11(home, ".asdf", "shims"),
+    join11(home, ".local", "share", "mise", "shims"),
+    // mise installer
     join11(home, ".deno", "bin"),
     join11(home, "bin"),
     ...nvmBinDirs()
@@ -19952,6 +19989,12 @@ function probeLoginShellPath() {
     }
   );
 }
+function userHome(env = process.env) {
+  return process.platform === "win32" ? env.USERPROFILE || env.HOME || homedir5() : env.HOME || env.USERPROFILE || homedir5();
+}
+function harnessHome(name, env = process.env) {
+  return join11(userHome(env), `.${name}`);
+}
 function findCliCandidates(name) {
   if (!name || /[\n\r]/.test(name)) return [];
   if (/[/\\]/.test(name) || /^[a-zA-Z]:/.test(name)) return [name];
@@ -20900,7 +20943,7 @@ var init_local_inject = __esm({
 
 // server/drivers/prompt-split.ts
 import { createHash as createHash3 } from "node:crypto";
-import { mkdirSync as mkdirSync9, readFileSync as readFileSync7 } from "node:fs";
+import { mkdirSync as mkdirSync9, readFileSync as readFileSync7, rmSync as rmSync4 } from "node:fs";
 import { join as join15 } from "node:path";
 function promptHalves(turn) {
   const { systemStable, systemVolatile } = turn;
@@ -20927,7 +20970,11 @@ function readPromptSplitReceipt(scope, key) {
     if (raw && typeof raw === "object" && !Array.isArray(raw)) {
       const record3 = raw;
       if (typeof record3.stable === "string" && typeof record3.volatile === "string") {
-        return { stable: record3.stable, volatile: record3.volatile };
+        return {
+          stable: record3.stable,
+          volatile: record3.volatile,
+          ...typeof record3.turnsSinceFull === "number" ? { turnsSinceFull: record3.turnsSinceFull } : {}
+        };
       }
     }
   } catch {
@@ -20938,13 +20985,21 @@ function writePromptSplitReceipt(scope, key, receipt) {
   mkdirSync9(join15(DATA_DIR, "prompt-split"), { recursive: true });
   writeFileAtomic(receiptPath(scope, key), JSON.stringify(receipt), { mode: 384 });
 }
-function splitSessionPrompt(stable, volatile, previous, fullSystem, text4, perTurnVolatile = false) {
-  const receipt = promptSplitFingerprints(stable, volatile);
-  if (previous === null || previous.stable !== receipt.stable) {
-    return { text: fullSystem ? fullSystem + "\n\n" + text4 : text4, receipt };
+function deletePromptSplitReceipt(scope, key) {
+  try {
+    rmSync4(receiptPath(scope, key));
+  } catch {
+  }
+}
+function splitSessionPrompt(stable, volatile, previous, fullSystem, text4, perTurnVolatile = false, reAnchorAfterTurns = 0) {
+  const fingerprints = promptSplitFingerprints(stable, volatile);
+  const turnsSinceFull = typeof previous?.turnsSinceFull === "number" ? previous.turnsSinceFull : 0;
+  const reAnchor = reAnchorAfterTurns > 0 && previous !== null && turnsSinceFull >= reAnchorAfterTurns;
+  if (previous === null || previous.stable !== fingerprints.stable || reAnchor) {
+    return { text: fullSystem ? fullSystem + "\n\n" + text4 : text4, receipt: { ...fingerprints, turnsSinceFull: 0 } };
   }
-  const note = previous.volatile === receipt.volatile && !perTurnVolatile ? "" : volatileContextNote(volatile, previous.volatile !== EMPTY_FINGERPRINT);
-  return { text: withContextNote(note, text4), receipt };
+  const note = previous.volatile === fingerprints.volatile && !perTurnVolatile ? "" : volatileContextNote(volatile, previous.volatile !== EMPTY_FINGERPRINT);
+  return { text: withContextNote(note, text4), receipt: { ...fingerprints, turnsSinceFull: turnsSinceFull + 1 } };
 }
 var VOLATILE_CONTEXT_NOTE_PREFIX, VOLATILE_CONTEXT_CLEARED_NOTE, digest, EMPTY_FINGERPRINT, receiptPath;
 var init_prompt_split = __esm({
@@ -21051,6 +21106,19 @@ function stripOmbAskBlock(output) {
   if (!OMB_ASK_FENCE.test(output)) return output;
   return output.replace(OMB_ASK_FENCE_GLOBAL, "").replace(/\n{3,}/g, "\n\n").trim();
 }
+function ombAskProtocolPrompt() {
+  return [
+    "",
+    "## Asking the person a question",
+    "When a decision belongs to the person, end your reply with a fenced block exactly like this:",
+    "",
+    "```omb-ask",
+    '{"questions":[{"question":"Ship the release now?","header":"Release","options":[{"label":"Ship now"},{"label":"Wait for the QA signoff"}]}]}',
+    "```",
+    "",
+    `The block must be the last thing in your reply. You may ask up to ${MAX_QUESTIONS} questions at once, each with up to ${MAX_OPTIONS} options; the person can always answer in their own words. Their answers arrive on your next prompt as \`Q:\`/\`A:\` lines \u2014 never invent them.`
+  ].join("\n");
+}
 function askQuestionSummary(questions) {
   const first = questions[0]?.question ?? "";
   const rest = questions.length - 1;
@@ -21199,7 +21267,7 @@ var init_ask_question = __esm({
 });
 
 // server/thread-log-rotation.ts
-import { closeSync as closeSync4, fstatSync, openSync as openSync4, readSync as readSync2, renameSync as renameSync5, rmSync as rmSync4, statSync as statSync3, writeSync } from "node:fs";
+import { closeSync as closeSync4, fstatSync, openSync as openSync4, readSync as readSync2, renameSync as renameSync5, rmSync as rmSync5, statSync as statSync3, writeSync } from "node:fs";
 function currentThreadLogCap() {
   try {
     return capProvider();
@@ -21251,7 +21319,7 @@ function trimToTail(file2, keepBytes) {
     renameSync5(staging, file2);
   } catch {
     try {
-      rmSync4(staging, { force: true });
+      rmSync5(staging, { force: true });
     } catch {
     }
   }
@@ -21423,6 +21491,128 @@ var init_resume_recovery = __esm({
   }
 });
 
+// server/drivers/session-idle.ts
+function usableMilliseconds(raw) {
+  const value = Number(raw);
+  return Number.isFinite(value) && value > 0 && value <= MAX_TIMER_MS ? value : null;
+}
+function sessionIdlePolicy(driverPrefix, env = process.env) {
+  const minimumMs = Math.max(
+    MINIMUM_IDLE_MS,
+    usableMilliseconds(
+      env[`OMB_${driverPrefix}_SESSION_IDLE_MIN_MS`] ?? env.OMB_SESSION_IDLE_MIN_MS
+    ) ?? 0
+  );
+  const configured = usableMilliseconds(
+    env[`OMB_${driverPrefix}_SESSION_IDLE_MS`] ?? env.OMB_SESSION_IDLE_MS
+  ) ?? DEFAULT_IDLE_MS;
+  return { idleMs: Math.max(minimumMs, configured), minimumMs };
+}
+var DEFAULT_IDLE_MS, MINIMUM_IDLE_MS, MAX_TIMER_MS;
+var init_session_idle = __esm({
+  "server/drivers/session-idle.ts"() {
+    "use strict";
+    DEFAULT_IDLE_MS = 10 * 6e4;
+    MINIMUM_IDLE_MS = 1e4;
+    MAX_TIMER_MS = 2147483647;
+  }
+});
+
+// shared/provider-safety.ts
+function isProviderSafetyBlock(message2) {
+  return /\bblocked by (?:our|the provider['’]s) safety systems\b|\bsafety monitoring\b.{0,100}\b(?:paused|ended|blocked)\b|\b(?:safety_check_failed|safety_policy_violation)\b/i.test(message2);
+}
+var init_provider_safety = __esm({
+  "shared/provider-safety.ts"() {
+    "use strict";
+  }
+});
+
+// server/drivers/retry.ts
+function classifyError(err) {
+  const text4 = messageOf(err);
+  if (isProviderSafetyBlock(text4)) return { transient: false, reason: "provider_safety" };
+  if (err && "exitCode" in err) {
+    const { exitCode: code } = err;
+    if (code !== null && code < 0) return { transient: false, reason: "interrupted" };
+    for (const { pattern, reason } of TRANSIENT_PATTERNS) {
+      if (pattern.test(text4)) return { transient: true, reason };
+    }
+    for (const { pattern, reason } of TERMINAL_PATTERNS) {
+      if (pattern.test(text4)) return { transient: false, reason };
+    }
+    return { transient: false, reason: "terminal_exit" };
+  }
+  for (const { pattern, reason } of TERMINAL_PATTERNS) {
+    if (pattern.test(text4)) return { transient: false, reason };
+  }
+  for (const { pattern, reason } of TRANSIENT_PATTERNS) {
+    if (pattern.test(text4)) return { transient: true, reason };
+  }
+  return { transient: false, reason: "unknown" };
+}
+function computeBackoff(attempt, random = Math.random) {
+  const base2 = BACKOFF_BASE_MS[Math.min(Math.max(attempt, 0), BACKOFF_BASE_MS.length - 1)];
+  const jitter = base2 * 0.25;
+  return Math.round(base2 - jitter + random() * jitter * 2);
+}
+function interruptibleDelay(ms, signal) {
+  let timer = null;
+  let onCancel = null;
+  const promise2 = new Promise((resolve12) => {
+    timer = setTimeout(() => resolve12("elapsed"), Math.max(1, ms));
+    timer.unref?.();
+    if (signal?.aborted) return resolve12("cancelled");
+    onCancel = () => {
+      clearTimeout(timer);
+      resolve12("cancelled");
+    };
+    signal?.addEventListener("abort", onCancel, { once: true });
+  });
+  return {
+    promise: promise2,
+    cancel: () => onCancel?.()
+  };
+}
+var RETRY_MAX_ATTEMPTS, BACKOFF_BASE_MS, TRANSIENT_PATTERNS, TERMINAL_PATTERNS, messageOf;
+var init_retry = __esm({
+  "server/drivers/retry.ts"() {
+    "use strict";
+    init_provider_safety();
+    RETRY_MAX_ATTEMPTS = 3;
+    BACKOFF_BASE_MS = [1e3, 3e3, 8e3];
+    TRANSIENT_PATTERNS = [
+      { pattern: /\b(?:429|rate.?limit|too many requests)\b/i, reason: "rate_limited" },
+      { pattern: /\boverloaded\b|\bcapacity\b/i, reason: "overloaded" },
+      { pattern: /\b5\d{2}\b|\binternal server error\b|\bbad gateway\b|\bservice unavailable\b/i, reason: "server_error" },
+      {
+        pattern: /\b(?:econnreset|econnrefused|epipe|etimedout|eai_again|connection reset|connection refused|socket hang up|network error|fetch failed)\b/i,
+        reason: "connection_reset"
+      },
+      { pattern: /\btimeout(ed)?\b|\btimed? out\b/i, reason: "timeout" }
+    ];
+    TERMINAL_PATTERNS = [
+      {
+        pattern: /\b(?:40[13]|unauthorized|forbidden|invalid api key|missing bearer|authentication required|not logged in|logged out)\b/i,
+        reason: "auth"
+      },
+      { pattern: /\b402\b|\bquota\b|\bbilling\b|\bsubscription\b/i, reason: "quota" },
+      { pattern: /\bmodel not found\b|\bunknown model\b|\bdoes not exist for model\b|\bunsupported model\b/i, reason: "unknown_model" },
+      { pattern: /\b400\b|\b422\b|\binvalid request\b|\bmalformed\b|\bunexpected status\b/i, reason: "invalid_request" },
+      { pattern: /\b404\b|\bno such thread\b|\bthread gone\b/i, reason: "not_found" },
+      // interrupt/cancel vocabulary from the drivers' own stop paths — a turn the
+      // user stopped must never come back as an auto-retry
+      { pattern: /\b(?:interrupted|cancelled by user)\b/i, reason: "interrupted" }
+    ];
+    messageOf = (err) => {
+      if (!err) return "";
+      if (err instanceof Error) return `${err.message}${err.cause ? ` ${String(err.cause)}` : ""}`;
+      if ("text" in err) return err.text;
+      return [err.stderr ?? "", ""].join(" ").trim();
+    };
+  }
+});
+
 // server/drivers/acp/core.ts
 import { homedir as homedir7 } from "node:os";
 import { lstat, mkdir as mkdir3, readFile, realpath, stat as stat2, writeFile } from "node:fs/promises";
@@ -21451,6 +21641,12 @@ function acpRpcError(value, method) {
     acpSessionFailure: value?.code === -32603
   });
 }
+function trackRunningTool(current, update, defaultStatus) {
+  if (typeof update.toolCallId !== "string" || !update.toolCallId) return;
+  const status = update.status ?? defaultStatus;
+  if (status === "completed" || status === "failed") current.runningTools.delete(update.toolCallId);
+  else if (status === "pending" || status === "in_progress") current.runningTools.add(update.toolCallId);
+}
 function acpVariantOption(result) {
   const option = (Array.isArray(result?.configOptions) ? result.configOptions : []).find(
     (entry) => entry?.type === "select" && typeof entry.id === "string" && (entry.id === "effort" || entry.category === "thought_level")
@@ -21542,6 +21738,17 @@ function versionFromProbe(stdout2, stderr) {
   const err = (stderr ?? "").trim().split(/\r\n|\n|\r/, 1)[0]?.trim() ?? "";
   return err || null;
 }
+function parseVersionTriple(value) {
+  const match = /(\d+)\.(\d+)\.(\d+)/.exec(value);
+  if (!match) return null;
+  return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+function versionAtLeast(installed, floor) {
+  for (let i2 = 0; i2 < 3; i2 += 1) {
+    if (installed[i2] !== floor[i2]) return installed[i2] > floor[i2];
+  }
+  return true;
+}
 function createAcpDriver(support11) {
   const DRIVER_KIND8 = support11.driverKind;
   const SOURCE = support11.nativeSource;
@@ -21587,9 +21794,19 @@ function createAcpDriver(support11) {
       const listeners = /* @__PURE__ */ new Set();
       const active = /* @__PURE__ */ new Map();
       const sessions = /* @__PURE__ */ new Map();
-      const configuredIdleMinimum = Number(process.env.OMB_ACP_SESSION_IDLE_MIN_MS);
-      const sessionIdleMinimum = Number.isFinite(configuredIdleMinimum) && configuredIdleMinimum > 0 ? configuredIdleMinimum : 1e4;
-      const SESSION_IDLE_MS = Math.max(sessionIdleMinimum, Number(process.env.OMB_ACP_SESSION_IDLE_MS) || 10 * 6e4);
+      const retiring = /* @__PURE__ */ new Map();
+      const retireChild = async (threadId, child) => {
+        let children = retiring.get(threadId);
+        if (!children) retiring.set(threadId, children = /* @__PURE__ */ new Set());
+        children.add(child);
+        const stopped = await killCliTree(child);
+        if (stopped) {
+          children.delete(child);
+          if (!children.size && retiring.get(threadId) === children) retiring.delete(threadId);
+        }
+        return stopped;
+      };
+      const { idleMs: SESSION_IDLE_MS } = sessionIdlePolicy("ACP");
       const closeSession = (threadId, why) => {
         const session = sessions.get(threadId);
         if (!session || session.closing) return;
@@ -21602,10 +21819,13 @@ function createAcpDriver(support11) {
           session.child.stdin.end();
         } catch {
         }
-        const kill = setTimeout(() => {
-          void killCliTree(session.child);
-        }, 5e3);
-        kill.unref?.();
+        if (support11.restartOnMcpChange) void retireChild(threadId, session.child);
+        else {
+          const kill = setTimeout(() => {
+            void killCliTree(session.child);
+          }, 5e3);
+          kill.unref?.();
+        }
       };
       const armIdle = (threadId) => {
         const session = sessions.get(threadId);
@@ -21696,6 +21916,7 @@ function createAcpDriver(support11) {
         const current = session.current;
         if (!current || current.state.settled) return;
         current.state.settled = true;
+        current.acknowledge();
         if (current.interruptTimer) clearTimeout(current.interruptTimer);
         for (const finish of current.asks.values()) finish("cancel", "system");
         session.acp.failAll(new Error("turn settled"));
@@ -21755,7 +21976,7 @@ function createAcpDriver(support11) {
             if (!(idleMs && idleMs > 0)) return;
             if (idleTimer) clearTimeout(idleTimer);
             idleTimer = setTimeout(() => {
-              if (session.current?.asks.size) {
+              if (session.current?.asks.size || session.current?.runningTools.size) {
                 armIdle2();
                 return;
               }
@@ -21869,6 +22090,7 @@ function createAcpDriver(support11) {
           }
         };
         const handleServerRequest = (msg, current) => {
+          current.state.startupActivity = true;
           if (msg.method === "fs/read_text_file" || msg.method === "fs/write_text_file") {
             void handleClientFileRequest(msg);
             return;
@@ -21972,6 +22194,9 @@ function createAcpDriver(support11) {
             if (current && !current.state.settled && session.sessionId && p2.sessionId === session.sessionId) current.receiveModelVariants(p2.update);
             return;
           }
+          if (current && ["agent_message_chunk", "agent_thought_chunk", "tool_call", "tool_call_update"].includes(p2.update?.sessionUpdate)) {
+            current.state.startupActivity = true;
+          }
           if (!current || !current.state.promptSent) return;
           const u4 = p2.update ?? {};
           switch (u4.sessionUpdate) {
@@ -22003,6 +22228,7 @@ function createAcpDriver(support11) {
             }
             case "tool_call": {
               current.flushAssistantText();
+              trackRunningTool(current, u4, "pending");
               emit({
                 ...base2(threadId, current.turnId),
                 type: "item.started",
@@ -22015,6 +22241,7 @@ function createAcpDriver(support11) {
               break;
             }
             case "tool_call_update": {
+              trackRunningTool(current, u4);
               if (u4.status === "completed" || u4.status === "failed") {
                 current.state.producedItem = true;
                 emit({
@@ -22164,7 +22391,7 @@ function createAcpDriver(support11) {
         }
         const pooled = sessions.get(threadId);
         let session;
-        if (pooled && !pooled.dead && !pooled.closing && pooled.contractKey === contractKey) {
+        if (pooled && !pooled.dead && !pooled.closing && pooled.contractKey === contractKey && (!support11.restartOnMcpChange || pooled.sessionKey === sessionKey)) {
           if (pooled.idleTimer) clearTimeout(pooled.idleTimer);
           pooled.idleTimer = null;
           session = pooled;
@@ -22177,7 +22404,15 @@ function createAcpDriver(support11) {
           sessions.set(threadId, session);
         }
         const request = (method, params, timeoutMs, receive, idleMs, idleMessage) => session.acp.request(method, params, timeoutMs, receive, idleMs, idleMessage);
-        const state = { settled: false, promptSent: false, text: "", producedItem: false };
+        const state = { settled: false, promptSent: false, text: "", producedItem: false, startupActivity: false, stopped: false };
+        let acknowledge = () => {
+        };
+        let rejectStartup = (_error) => {
+        };
+        const startupAck = turn.startupRecovery ? new Promise((resolve12, reject) => {
+          acknowledge = () => resolve12({ turnId });
+          rejectStartup = reject;
+        }) : null;
         const asks = /* @__PURE__ */ new Map();
         const modelOf = (result) => {
           const option = (Array.isArray(result?.configOptions) ? result.configOptions : []).find(
@@ -22222,12 +22457,15 @@ function createAcpDriver(support11) {
           turnConfig,
           controlsHost,
           state,
+          acknowledge,
           asks,
+          runningTools: /* @__PURE__ */ new Set(),
           interruptTimer: null,
           flushAssistantText,
           receiveModelVariants
         };
         const interrupt = () => {
+          state.stopped = true;
           if (session.sessionId) {
             session.acp.send({ jsonrpc: "2.0", method: "session/cancel", params: { sessionId: session.sessionId } });
             if (current.interruptTimer) clearTimeout(current.interruptTimer);
@@ -22240,12 +22478,24 @@ function createAcpDriver(support11) {
             closeSession(threadId, "stop");
           }
         };
-        active.set(threadId, { stop: () => closeSession(threadId, "stop"), interrupt, turnId, asks });
+        active.set(threadId, { stop: () => {
+          state.stopped = true;
+          closeSession(threadId, "stop");
+        }, interrupt, turnId, asks });
         emit({ ...base2(threadId, turnId), type: "turn.started" });
         session.current = current;
         (async () => {
           try {
             const handshake = async () => {
+              for (const child of retiring.get(threadId) ?? []) {
+                const stopped = await retireChild(threadId, child);
+                if (state.settled || session.closing) throw new Error("session closed");
+                if (!stopped) {
+                  closeSession(threadId, "replace-failed");
+                  throw new Error(`${support11.displayName} could not close its previous tool session. Try again.`);
+                }
+              }
+              if (state.settled || session.closing) throw new Error("session closed");
               if (!session.initResult) {
                 session.initResult = await request(
                   "initialize",
@@ -22421,7 +22671,8 @@ function createAcpDriver(support11) {
                 readPromptSplitReceipt(DRIVER_KIND8, receiptKey),
                 promptTurn.system,
                 promptTurn.text,
-                Boolean(turn.mentionTurn)
+                Boolean(turn.mentionTurn),
+                ACP_PROMPT_RE_ANCHOR_TURNS
               );
               promptInput = { ...promptTurn, system: "", text: composed.text };
               pendingSplitReceipt = { key: receiptKey, receipt: composed.receipt };
@@ -22436,7 +22687,9 @@ ${promptInput.text}` : promptInput.text;
             if (turn.variant !== void 0 && requestedVariantOption().currentValue !== turn.variant) {
               throw new Error(`${support11.displayName} changed variant before the prompt`);
             }
+            if (state.settled || state.stopped || session.closing) throw new Error("turn stopped");
             state.promptSent = true;
+            acknowledge();
             const promptIdleMs = promptIdleTimeoutMs();
             const result = await request(
               "session/prompt",
@@ -22444,7 +22697,7 @@ ${promptInput.text}` : promptInput.text;
               void 0,
               void 0,
               promptIdleMs,
-              `${DRIVER_KIND8} went fully silent ${Math.round(promptIdleMs / 1e3)} s after the message and the turn was stopped. Raise OPENMAUS_ACP_PROMPT_IDLE_TIMEOUT_MS if this model legitimately takes longer to answer.`
+              `${DRIVER_KIND8} sent nothing for ${Math.round(promptIdleMs / 1e3)} s with no tool running, so the turn was stopped as stuck. Send the message again to retry. On a self-hosted server, OPENMAUS_ACP_PROMPT_IDLE_TIMEOUT_MS sets this limit (0 turns it off).`
             );
             if (pendingSplitReceipt) {
               writePromptSplitReceipt(DRIVER_KIND8, pendingSplitReceipt.key, pendingSplitReceipt.receipt);
@@ -22475,6 +22728,32 @@ ${promptInput.text}` : promptInput.text;
               const message2 = e instanceof Error ? e.message : String(e);
               const code = support11.classifyError?.(e);
               const needsAuth = code === "invalid_credentials" || code === "inactive_subscription" || message2 === support11.loginNote;
+              const failure = classifyError({ text: message2 });
+              const transientStartup = failure.transient || failure.reason === "unknown" && code === "upstream_outage";
+              const denied = /\b(?:(?:permission|access) denied|(?:approval|permission) (?:required|denied|rejected)|requires? (?:approval|permission)|policy (?:restriction|violation)|(?:blocked|denied|restricted) by (?:the )?policy)\b/i.test(message2);
+              if (turn.startupRecovery && transientStartup && !needsAuth && !denied && (!code || code === "upstream_outage") && ![-32700, -32600, -32601, -32602].includes(e?.code) && !state.promptSent && !state.startupActivity && !state.producedItem && !state.text && !state.stopped && !session.closing && !asks.size && !current.runningTools.size) {
+                state.settled = true;
+                session.current = null;
+                if (current.interruptTimer) clearTimeout(current.interruptTimer);
+                closeSession(threadId, "startup-recovery");
+                const stopped = await killCliTree(session.child).catch(() => false);
+                if (current.interruptTimer) clearTimeout(current.interruptTimer);
+                active.delete(threadId);
+                if (stopped && !state.stopped) {
+                  rejectStartup(new TurnNotStartedError(turnId, message2));
+                  return;
+                }
+                acknowledge();
+                if (!state.stopped) emit({ ...base2(threadId, turnId), type: "runtime.error", message: message2 });
+                emit({
+                  ...base2(threadId, turnId),
+                  type: "turn.completed",
+                  ok: state.stopped,
+                  stopReason: state.stopped ? "cancelled" : "rpc_error",
+                  cost: null
+                });
+                return;
+              }
               emit({
                 ...base2(threadId, turnId),
                 type: "runtime.error",
@@ -22488,7 +22767,7 @@ ${promptInput.text}` : promptInput.text;
             }
           }
         })();
-        return { turnId };
+        return startupAck ?? { turnId };
       };
       const snapshot = async () => {
         const env = childEnv();
@@ -22544,6 +22823,9 @@ ${promptInput.text}` : promptInput.text;
           stopAll: async () => {
             for (const { stop } of active.values()) stop();
             for (const threadId of Array.from(sessions.keys())) closeSession(threadId, "stopAll");
+            for (const [threadId, children] of retiring) {
+              for (const child of children) void retireChild(threadId, child);
+            }
           },
           onEvent: (listener) => {
             listeners.add(listener);
@@ -22553,13 +22835,16 @@ ${promptInput.text}` : promptInput.text;
         dispose: async () => {
           for (const { stop } of active.values()) stop();
           for (const threadId of Array.from(sessions.keys())) closeSession(threadId, "dispose");
+          for (const [threadId, children] of retiring) {
+            for (const child of children) void retireChild(threadId, child);
+          }
           listeners.clear();
         }
       };
     }
   };
 }
-var envOr, INIT_TIMEOUT, SESSION_CONFIG_TIMEOUT, NEW_SESSION_TIMEOUT, LOAD_SESSION_TIMEOUT, promptIdleTimeoutMs, CLIENT_FILE_MAX_BYTES, TOOL_LOG_TEXT_LIMIT;
+var envOr, INIT_TIMEOUT, SESSION_CONFIG_TIMEOUT, NEW_SESSION_TIMEOUT, LOAD_SESSION_TIMEOUT, ACP_PROMPT_RE_ANCHOR_TURNS, promptIdleTimeoutMs, CLIENT_FILE_MAX_BYTES, TOOL_LOG_TEXT_LIMIT;
 var init_core3 = __esm({
   "server/drivers/acp/core.ts"() {
     "use strict";
@@ -22577,11 +22862,14 @@ var init_core3 = __esm({
     init_mcp_tool_images();
     init_redact2();
     init_resume_recovery();
+    init_session_idle();
+    init_retry();
     envOr = (key, fallback) => Number(process.env[key] ?? fallback);
     INIT_TIMEOUT = envOr("OPENMAUS_ACP_INIT_TIMEOUT_MS", 3e5);
     SESSION_CONFIG_TIMEOUT = envOr("OPENMAUS_ACP_SESSION_CONFIG_TIMEOUT_MS", 3e5);
     NEW_SESSION_TIMEOUT = envOr("OPENMAUS_ACP_NEW_SESSION_TIMEOUT_MS", 3e5);
     LOAD_SESSION_TIMEOUT = envOr("OPENMAUS_ACP_LOAD_SESSION_TIMEOUT_MS", 12e4);
+    ACP_PROMPT_RE_ANCHOR_TURNS = 8;
     promptIdleTimeoutMs = () => {
       const raw = process.env.OPENMAUS_ACP_PROMPT_IDLE_TIMEOUT_MS;
       if (raw === void 0) return 18e4;
@@ -23705,7 +23993,7 @@ function decodeConfig(raw) {
     ...typeof o.askTimeoutMs === "number" ? { askTimeoutMs: o.askTimeoutMs } : {}
   };
 }
-var DRIVER_KIND, BOX_API, MODELS, ASK_PROTOCOL, ASK_FENCE_ANY, catalog, providerFor, BoxAgentDriver;
+var DRIVER_KIND, BOX_API, MODELS, ASK_FENCE_ANY, catalog, providerFor, BoxAgentDriver;
 var init_boxagent = __esm({
   "server/drivers/boxagent.ts"() {
     "use strict";
@@ -23722,17 +24010,6 @@ var init_boxagent = __esm({
         { id: "gpt-5.4", label: "GPT-5.4 (Codex) \xB7 on the box" }
       ]
     };
-    ASK_PROTOCOL = [
-      "",
-      "## Asking the person a question",
-      "When a decision belongs to the person, end your reply with a fenced block exactly like this:",
-      "",
-      "```omb-ask",
-      '{"questions":[{"question":"Ship the release now?","header":"Release","options":[{"label":"Ship now"},{"label":"Wait for the QA signoff"}]}]}',
-      "```",
-      "",
-      "The block must be the last thing in your reply. You may ask up to 6 questions at once, each with up to 12 options; the person can always answer in their own words. Their answers arrive on your next prompt as `Q:`/`A:` lines \u2014 never invent them."
-    ].join("\n");
     ASK_FENCE_ANY = /(^|\n)[ \t]{0,3}(`{3,}|~{3,})[ \t]*omb-ask\b/;
     catalog = null;
     providerFor = (model) => {
@@ -23793,7 +24070,7 @@ var init_boxagent = __esm({
           const prompt = [
             turn.system,
             "You are working on the assigned cloud computer \u2014 use its desktop, Chrome, and shell within the access described above.",
-            ASK_PROTOCOL,
+            ombAskProtocolPrompt(),
             ...correction ? [correction] : [],
             "",
             turn.text
@@ -23992,7 +24269,7 @@ var init_boxagent = __esm({
           snapshot,
           adapter: {
             provider: DRIVER_KIND,
-            capabilities: { sessionModelSwitch: "in-session" },
+            capabilities: { sessionModelSwitch: "in-session", remoteAgent: true, usesCloudComputer: true },
             sendTurn,
             interruptTurn: async (threadId) => active.get(threadId)?.cancel(),
             respondToRequest: async (threadId, requestId, decision) => {
@@ -24445,104 +24722,9 @@ var init_mcp_gate_config = __esm({
   }
 });
 
-// shared/provider-safety.ts
-function isProviderSafetyBlock(message2) {
-  return /\bblocked by (?:our|the provider['’]s) safety systems\b|\bsafety monitoring\b.{0,100}\b(?:paused|ended|blocked)\b|\b(?:safety_check_failed|safety_policy_violation)\b/i.test(message2);
-}
-var init_provider_safety = __esm({
-  "shared/provider-safety.ts"() {
-    "use strict";
-  }
-});
-
-// server/drivers/retry.ts
-function classifyError(err) {
-  const text4 = messageOf(err);
-  if (isProviderSafetyBlock(text4)) return { transient: false, reason: "provider_safety" };
-  if (err && "exitCode" in err) {
-    const { exitCode: code } = err;
-    if (code !== null && code < 0) return { transient: false, reason: "interrupted" };
-    for (const { pattern, reason } of TRANSIENT_PATTERNS) {
-      if (pattern.test(text4)) return { transient: true, reason };
-    }
-    for (const { pattern, reason } of TERMINAL_PATTERNS) {
-      if (pattern.test(text4)) return { transient: false, reason };
-    }
-    return { transient: false, reason: "terminal_exit" };
-  }
-  for (const { pattern, reason } of TERMINAL_PATTERNS) {
-    if (pattern.test(text4)) return { transient: false, reason };
-  }
-  for (const { pattern, reason } of TRANSIENT_PATTERNS) {
-    if (pattern.test(text4)) return { transient: true, reason };
-  }
-  return { transient: false, reason: "unknown" };
-}
-function computeBackoff(attempt, random = Math.random) {
-  const base2 = BACKOFF_BASE_MS[Math.min(Math.max(attempt, 0), BACKOFF_BASE_MS.length - 1)];
-  const jitter = base2 * 0.25;
-  return Math.round(base2 - jitter + random() * jitter * 2);
-}
-function interruptibleDelay(ms, signal) {
-  let timer = null;
-  let onCancel = null;
-  const promise2 = new Promise((resolve12) => {
-    timer = setTimeout(() => resolve12("elapsed"), Math.max(1, ms));
-    timer.unref?.();
-    if (signal?.aborted) return resolve12("cancelled");
-    onCancel = () => {
-      clearTimeout(timer);
-      resolve12("cancelled");
-    };
-    signal?.addEventListener("abort", onCancel, { once: true });
-  });
-  return {
-    promise: promise2,
-    cancel: () => onCancel?.()
-  };
-}
-var RETRY_MAX_ATTEMPTS, BACKOFF_BASE_MS, TRANSIENT_PATTERNS, TERMINAL_PATTERNS, messageOf;
-var init_retry = __esm({
-  "server/drivers/retry.ts"() {
-    "use strict";
-    init_provider_safety();
-    RETRY_MAX_ATTEMPTS = 3;
-    BACKOFF_BASE_MS = [1e3, 3e3, 8e3];
-    TRANSIENT_PATTERNS = [
-      { pattern: /\b(?:429|rate.?limit|too many requests)\b/i, reason: "rate_limited" },
-      { pattern: /\boverloaded\b|\bcapacity\b/i, reason: "overloaded" },
-      { pattern: /\b5\d{2}\b|\binternal server error\b|\bbad gateway\b|\bservice unavailable\b/i, reason: "server_error" },
-      {
-        pattern: /\b(?:econnreset|econnrefused|epipe|etimedout|eai_again|connection reset|connection refused|socket hang up|network error|fetch failed)\b/i,
-        reason: "connection_reset"
-      },
-      { pattern: /\btimeout(ed)?\b|\btimed? out\b/i, reason: "timeout" }
-    ];
-    TERMINAL_PATTERNS = [
-      {
-        pattern: /\b(?:40[13]|unauthorized|forbidden|invalid api key|missing bearer|authentication required|not logged in|logged out)\b/i,
-        reason: "auth"
-      },
-      { pattern: /\b402\b|\bquota\b|\bbilling\b|\bsubscription\b/i, reason: "quota" },
-      { pattern: /\bmodel not found\b|\bunknown model\b|\bdoes not exist for model\b|\bunsupported model\b/i, reason: "unknown_model" },
-      { pattern: /\b400\b|\b422\b|\binvalid request\b|\bmalformed\b|\bunexpected status\b/i, reason: "invalid_request" },
-      { pattern: /\b404\b|\bno such thread\b|\bthread gone\b/i, reason: "not_found" },
-      // interrupt/cancel vocabulary from the drivers' own stop paths — a turn the
-      // user stopped must never come back as an auto-retry
-      { pattern: /\b(?:interrupted|cancelled by user)\b/i, reason: "interrupted" }
-    ];
-    messageOf = (err) => {
-      if (!err) return "";
-      if (err instanceof Error) return `${err.message}${err.cause ? ` ${String(err.cause)}` : ""}`;
-      if ("text" in err) return err.text;
-      return [err.stderr ?? "", ""].join(" ").trim();
-    };
-  }
-});
-
 // server/drivers/claude.ts
 import { createHash as createHash7, randomBytes as randomBytes2 } from "node:crypto";
-import { chmodSync as chmodSync4, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync2, readFileSync as readFileSync8, rmSync as rmSync5, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "node:fs";
+import { chmodSync as chmodSync4, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync2, readFileSync as readFileSync8, rmSync as rmSync6, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "node:fs";
 import { createServer as createNetServer } from "node:net";
 import { homedir as homedir9, tmpdir as tmpdir3 } from "node:os";
 import { join as join21, dirname as dirname9, isAbsolute as isAbsolute5, normalize } from "node:path";
@@ -24584,6 +24766,10 @@ function claudeAuthFailure(frame, text4) {
   if (frame.is_api_error_message !== true && typeof frame.error !== "string") return false;
   return frame.error === "authentication_failed" || classifyError({ text: text4 }).reason === "auth";
 }
+function claudeVersionTooOld(frame, text4) {
+  if (frame.is_api_error_message !== true && typeof frame.error !== "string") return false;
+  return /\bClaude Code v?\d+(?:\.\d+)+ does not support this model\b/i.test(text4);
+}
 function claudeEnvironment(model, source = process.env, configDir, instanceEnvironment = {}) {
   const env = { ...source, PATH: augmentedPath(), NPM_CONFIG_LOGLEVEL: "error" };
   if (configDir?.trim()) {
@@ -24655,15 +24841,7 @@ function autoCompactWindow(env) {
   return String(Math.min(1e6, Math.max(1e5, Math.floor(parsed))));
 }
 function parseClaudeCliVersion(stdout2) {
-  const match = /(\d+)\.(\d+)\.(\d+)/.exec(stdout2 ?? "");
-  if (!match) return null;
-  return [Number(match[1]), Number(match[2]), Number(match[3])];
-}
-function versionAtLeast(installed, floor) {
-  for (let i2 = 0; i2 < 3; i2 += 1) {
-    if (installed[i2] !== floor[i2]) return installed[i2] > floor[i2];
-  }
-  return true;
+  return parseVersionTriple(stdout2 ?? "");
 }
 function claudeCliSupports(version2, flag) {
   return version2 === null || versionAtLeast(version2, CLAUDE_FLAG_FLOORS[flag]);
@@ -24731,7 +24909,7 @@ function readClaudeModelCatalog(env = process.env) {
 function removePrivateTempDir(filePath) {
   if (!filePath) return true;
   try {
-    rmSync5(dirname9(filePath), { recursive: true, force: true, maxRetries: 3, retryDelay: 50 });
+    rmSync6(dirname9(filePath), { recursive: true, force: true, maxRetries: 3, retryDelay: 50 });
     return true;
   } catch {
     return false;
@@ -25026,6 +25204,8 @@ var init_claude = __esm({
     init_contracts();
     init_tool_summary();
     init_retry();
+    init_session_idle();
+    init_core3();
     init_local_inject();
     init_native();
     init_permission_command();
@@ -25124,9 +25304,7 @@ var init_claude = __esm({
         const listeners = /* @__PURE__ */ new Set();
         const active = /* @__PURE__ */ new Map();
         const sessions = /* @__PURE__ */ new Map();
-        const configuredIdleMinimum = Number(process.env.OMB_CLAUDE_SESSION_IDLE_MIN_MS);
-        const sessionIdleMinimum = Number.isFinite(configuredIdleMinimum) && configuredIdleMinimum > 0 ? configuredIdleMinimum : 1e4;
-        const SESSION_IDLE_MS = Math.max(sessionIdleMinimum, Number(process.env.OMB_CLAUDE_SESSION_IDLE_MS) || 10 * 6e4);
+        const { idleMs: SESSION_IDLE_MS } = sessionIdlePolicy("CLAUDE");
         const stopSession = (session) => {
           void killCliTree(session.child).then((stopped) => {
             if (stopped) void session.finishClose?.();
@@ -25387,7 +25565,7 @@ var init_claude = __esm({
               retryState.delete(threadId);
               if (mcpConfigPath) {
                 try {
-                  rmSync5(dirname9(mcpConfigPath), { recursive: true, force: true });
+                  rmSync6(dirname9(mcpConfigPath), { recursive: true, force: true });
                 } catch {
                 }
               }
@@ -25395,7 +25573,7 @@ var init_claude = __esm({
             }
             if (mcpConfigPath) {
               try {
-                rmSync5(dirname9(mcpConfigPath), { recursive: true, force: true });
+                rmSync6(dirname9(mcpConfigPath), { recursive: true, force: true });
               } catch {
               }
             }
@@ -25407,7 +25585,7 @@ var init_claude = __esm({
             broker = void 0;
             if (mcpConfigPath) {
               try {
-                rmSync5(dirname9(mcpConfigPath), { recursive: true, force: true });
+                rmSync6(dirname9(mcpConfigPath), { recursive: true, force: true });
               } catch {
               }
               mcpConfigPath = null;
@@ -25524,7 +25702,7 @@ var init_claude = __esm({
             session.broker?.pause();
             if (session.mcpConfigPath) {
               try {
-                rmSync5(dirname9(session.mcpConfigPath), { recursive: true, force: true });
+                rmSync6(dirname9(session.mcpConfigPath), { recursive: true, force: true });
               } catch {
               }
               session.mcpConfigPath = null;
@@ -25535,6 +25713,7 @@ var init_claude = __esm({
             active.delete(threadId);
             session.turn = null;
             retryState.delete(threadId);
+            if (stopReason === "update_required") closeSession(threadId, "update required");
             emit({ ...base2(threadId, t2.turnId), type: "turn.completed", ok, stopReason, cost, ...usage ? { usage } : {} });
             if (session.child.exitCode === null && !session.closing) armIdle(threadId);
           };
@@ -25580,6 +25759,11 @@ var init_claude = __esm({
                   emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", message: text4, setup: true });
                   break;
                 }
+                if (claudeVersionTooOld(o, text4)) {
+                  if (session.turn) session.turn.updateRequired = true;
+                  emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", message: text4, setup: true, claudeUpdate: true });
+                  break;
+                }
                 if (text4.trim()) {
                   const synthetic = o.is_api_error_message === true || typeof o.error === "string" ? { synthetic: true } : {};
                   if (!session.turn?.sawStreamDelta) {
@@ -25629,7 +25813,7 @@ var init_claude = __esm({
                 if (o.origin?.kind === "task-notification") break;
                 settle(
                   o.is_error !== true,
-                  session.turn?.authFailed ? "auth_required" : o.stop_reason ?? o.terminal_reason ?? null,
+                  session.turn?.authFailed ? "auth_required" : session.turn?.updateRequired ? "update_required" : o.stop_reason ?? o.terminal_reason ?? null,
                   o.total_cost_usd ?? null,
                   o.usage ? {
                     input: (o.usage.input_tokens || 0) + (o.usage.cache_read_input_tokens || 0) + (o.usage.cache_creation_input_tokens || 0),
@@ -25684,7 +25868,7 @@ var init_claude = __esm({
                 failedBroker?.close();
                 if (session.mcpConfigPath) {
                   try {
-                    rmSync5(dirname9(session.mcpConfigPath), { recursive: true, force: true });
+                    rmSync6(dirname9(session.mcpConfigPath), { recursive: true, force: true });
                   } catch {
                   }
                   session.mcpConfigPath = null;
@@ -25762,7 +25946,7 @@ var init_claude = __esm({
                 session.broker = void 0;
                 if (session.mcpConfigPath) {
                   try {
-                    rmSync5(dirname9(session.mcpConfigPath), { recursive: true, force: true });
+                    rmSync6(dirname9(session.mcpConfigPath), { recursive: true, force: true });
                   } catch {
                   }
                   session.mcpConfigPath = null;
@@ -25814,7 +25998,7 @@ var init_claude = __esm({
             session.broker?.close();
             if (session.mcpConfigPath) {
               try {
-                rmSync5(dirname9(session.mcpConfigPath), { recursive: true, force: true });
+                rmSync6(dirname9(session.mcpConfigPath), { recursive: true, force: true });
               } catch {
               }
             }
@@ -26028,9 +26212,9 @@ function mcpServerNamesInToml(toml) {
   return names;
 }
 function codexConfigMcpServerNames(env) {
-  const codexHome3 = env.CODEX_HOME || join22(env.HOME || env.USERPROFILE || homedir10(), ".codex");
+  const codexHome2 = env.CODEX_HOME || join22(env.HOME || env.USERPROFILE || homedir10(), ".codex");
   try {
-    return mcpServerNamesInToml(readFileSync9(join22(codexHome3, "config.toml"), "utf8"));
+    return mcpServerNamesInToml(readFileSync9(join22(codexHome2, "config.toml"), "utf8"));
   } catch {
     return /* @__PURE__ */ new Set();
   }
@@ -26049,10 +26233,124 @@ var init_codex_mcp_names = __esm({
   }
 });
 
+// server/drivers/codex-identity.ts
+import { homedir as homedir11 } from "node:os";
+import { isAbsolute as isAbsolute6, join as join23, resolve as resolve7 } from "node:path";
+function codexHome(env) {
+  if (env.CODEX_HOME) return isAbsolute6(env.CODEX_HOME) ? resolve7(env.CODEX_HOME) : null;
+  const home = userHome(env);
+  return isAbsolute6(home) ? join23(home, ".codex") : null;
+}
+async function codexAccountEmail(cli, env, timeoutMs = 3e3) {
+  const cwd = env.HOME || env.USERPROFILE || homedir11();
+  if (!isAbsolute6(cwd) || !codexHome(env)) return null;
+  return new Promise((resolveEmail) => {
+    let child;
+    try {
+      child = spawnCli(cli, ["app-server"], { cwd, env, stdio: ["pipe", "pipe", "pipe"] });
+    } catch {
+      resolveEmail(null);
+      return;
+    }
+    let finishing = false;
+    let buffer = "";
+    let outputBytes = 0;
+    let initialized = false;
+    const finish = async (email3) => {
+      if (finishing) return;
+      finishing = true;
+      clearTimeout(timer);
+      let stopped = await killCliTree(child, 1e3);
+      if (!stopped && child.pid) {
+        try {
+          if (process.platform === "win32") child.kill("SIGKILL");
+          else process.kill(-child.pid, "SIGKILL");
+        } catch {
+          try {
+            child.kill("SIGKILL");
+          } catch {
+          }
+        }
+        stopped = await killCliTree(child, 1e3);
+      }
+      resolveEmail(stopped ? email3 : null);
+    };
+    const timer = setTimeout(() => {
+      void finish(null);
+    }, timeoutMs);
+    timer.unref();
+    const send = (message2) => {
+      try {
+        child.stdin.write(`${JSON.stringify(message2)}
+`);
+      } catch {
+        void finish(null);
+      }
+    };
+    child.stdin.on("error", () => {
+      void finish(null);
+    });
+    child.stderr.resume();
+    child.on("error", () => {
+      void finish(null);
+    });
+    child.on("close", () => {
+      void finish(null);
+    });
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      if (finishing) return;
+      outputBytes += Buffer.byteLength(chunk);
+      if (outputBytes > MAX_OUTPUT3) {
+        void finish(null);
+        return;
+      }
+      buffer += chunk;
+      let newline;
+      while (!finishing && (newline = buffer.indexOf("\n")) !== -1) {
+        const line = buffer.slice(0, newline);
+        buffer = buffer.slice(newline + 1);
+        if (!line.trim()) continue;
+        let message2;
+        try {
+          message2 = JSON.parse(line);
+        } catch {
+          void finish(null);
+          return;
+        }
+        if (!initialized && message2?.id === 1) {
+          if (message2.error || !message2.result) {
+            void finish(null);
+            return;
+          }
+          initialized = true;
+          send({ method: "initialized", params: {} });
+          send({ id: 2, method: "account/read", params: { refreshToken: false } });
+        } else if (initialized && message2?.id === 2) {
+          const account = message2.error ? null : message2.result?.account;
+          const email3 = account?.type === "chatgpt" ? account.email : null;
+          void finish(typeof email3 === "string" && email3.length <= 254 && EMAIL.test(email3) && !/[\p{Cc}\p{Cf}]/u.test(email3) ? email3 : null);
+        }
+      }
+    });
+    send({ id: 1, method: "initialize", params: { clientInfo: { name: "openmausbot", version: "1" } } });
+  });
+}
+var MAX_OUTPUT3, EMAIL;
+var init_codex_identity = __esm({
+  "server/drivers/codex-identity.ts"() {
+    "use strict";
+    init_env_path();
+    init_procs();
+    MAX_OUTPUT3 = 16384;
+    EMAIL = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  }
+});
+
 // server/drivers/codex-catalog.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync10 } from "node:fs";
-import { homedir as homedir11 } from "node:os";
-import { basename as basename7, join as join23 } from "node:path";
+import { homedir as homedir12 } from "node:os";
+import { basename as basename7, join as join24 } from "node:path";
 function encodeCodexSelection(provider, model) {
   return `${provider}${SEP}${model}`;
 }
@@ -26067,7 +26365,7 @@ function decodeCodexSelection(id) {
 function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
   return new Promise((resolve12) => {
     const child = spawnCli(cli, ["app-server"], {
-      cwd: homedir11(),
+      cwd: homedir12(),
       env,
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -26166,10 +26464,6 @@ function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
     request("initialize", { clientInfo: { name: "openmausbot", version: "1" } }, "initialize");
   });
 }
-function codexHome(env) {
-  if (env.CODEX_HOME) return env.CODEX_HOME;
-  return join23(env.HOME || env.USERPROFILE || homedir11(), ".codex");
-}
 function unquote(raw) {
   let value = raw.trim();
   const hash2 = value.indexOf(" #");
@@ -26250,15 +26544,18 @@ function niceLabel(model, provider, known, named) {
   const encoded = encodeCodexSelection(provider, model);
   if (named.has(encoded)) return named.get(encoded);
   const host = providerName(provider, known);
-  return host === provider ? model : `${model} (${host})`;
+  return qualifiedModelLabel(model, host, {
+    redundantWhen: () => host === provider,
+    decorate: (facet) => ` (${facet})`
+  });
 }
 function collectCatalogNames(home) {
   const named = /* @__PURE__ */ new Map();
-  for (const file2 of listDir(join23(home, "model-catalogs"))) {
+  for (const file2 of listDir(join24(home, "model-catalogs"))) {
     if (!file2.endsWith(".json")) continue;
     const provider = basename7(file2, ".json").replace(/-models$/, "");
     if (!PROVIDER_ID.test(provider)) continue;
-    const raw = readText(join23(home, "model-catalogs", file2));
+    const raw = readText(join24(home, "model-catalogs", file2));
     if (!raw) continue;
     let parsed;
     try {
@@ -26310,7 +26607,8 @@ async function probeProviderModels(provider, env, fetchImpl) {
 async function readCodexModelCatalog(env = process.env, fetchImpl = fetch, cli) {
   const official = (cli ? await readCodexAppServerModelCatalog(cli, env) : null) ?? STATIC_CODEX_MODELS;
   const home = codexHome(env);
-  const mainText = readText(join23(home, "config.toml"));
+  if (!home) return mergeLocalInject(official, env, fetchImpl);
+  const mainText = readText(join24(home, "config.toml"));
   if (!mainText) return mergeLocalInject(official, env, fetchImpl);
   const main2 = parseCodexToml(mainText);
   const known = new Map(main2.providers.map((provider) => [provider.id, provider]));
@@ -26325,7 +26623,7 @@ async function readCodexModelCatalog(env = process.env, fetchImpl = fetch, cli)
   remember(main2.modelProvider, main2.model);
   for (const file2 of listDir(home)) {
     if (!file2.endsWith(".config.toml")) continue;
-    const profile = parseCodexToml(readText(join23(home, file2)) ?? "");
+    const profile = parseCodexToml(readText(join24(home, file2)) ?? "");
     for (const provider of profile.providers) {
       if (!known.has(provider.id)) known.set(provider.id, provider);
     }
@@ -26368,11 +26666,17 @@ var STATIC_CODEX_MODELS, OFFICIAL_CODEX_PROVIDER, SEP, MODEL_ID2, PROVIDER_ID;
 var init_codex_catalog = __esm({
   "server/drivers/codex-catalog.ts"() {
     "use strict";
+    init_contracts();
     init_procs();
+    init_codex_identity();
     init_local_inject();
     STATIC_CODEX_MODELS = {
       default: "gpt-5.6-sol",
       options: [
+        // Only used when live discovery fails; these rows do not establish account access.
+        { id: "gpt-6-astra", label: "GPT-6 Astra (availability unverified)" },
+        { id: "gpt-6-sol", label: "GPT-6 Sol (availability unverified)" },
+        { id: "gpt-6-luna", label: "GPT-6 Luna (availability unverified)" },
         { id: "gpt-5.6-sol", label: "GPT-5.6 Sol" },
         { id: "gpt-5.6-terra", label: "GPT-5.6 Terra" },
         { id: "gpt-5.6-luna", label: "GPT-5.6 Luna" },
@@ -26392,7 +26696,7 @@ var init_codex_catalog = __esm({
 // server/drivers/codex-instructions.ts
 import { createHash as createHash8 } from "node:crypto";
 import { mkdirSync as mkdirSync11, readFileSync as readFileSync11 } from "node:fs";
-import { join as join24 } from "node:path";
+import { join as join25 } from "node:path";
 function parseReceipt(raw) {
   if (!raw) return null;
   const trimmed = raw.trim();
@@ -26425,8 +26729,8 @@ function codexDeveloperInstructions(config2, botInstructions) {
 ${configured}` : botInstructions;
 }
 async function syncCodexInstructions(key, nativeThreadId, instructions, volatile, resumed, request, mentionTurn = false) {
-  const directory = join24(DATA_DIR, "codex-instructions");
-  const path3 = join24(directory, `${digest2(JSON.stringify([key, nativeThreadId]))}.sha256`);
+  const directory = join25(DATA_DIR, "codex-instructions");
+  const path3 = join25(directory, `${digest2(JSON.stringify([key, nativeThreadId]))}.sha256`);
   const fingerprint = digest2(instructions);
   const volatileFingerprint = digest2(volatile);
   let previous;
@@ -26482,15 +26786,15 @@ var init_codex_instructions = __esm({
 // server/drivers/codex-device-auth.ts
 import { randomUUID as randomUUID9 } from "node:crypto";
 import { realpathSync as realpathSync3 } from "node:fs";
-import { homedir as homedir12 } from "node:os";
-import { basename as basename8, dirname as dirname10, isAbsolute as isAbsolute6, join as join25, resolve as resolve7 } from "node:path";
+import { homedir as homedir13 } from "node:os";
+import { basename as basename8, dirname as dirname10, isAbsolute as isAbsolute7, join as join26, resolve as resolve8 } from "node:path";
 import { stripVTControlCharacters as stripVTControlCharacters5 } from "node:util";
 function canonicalPath2(path3) {
   try {
     return realpathSync3(path3);
   } catch {
     const parent = dirname10(path3);
-    return parent === path3 ? path3 : join25(canonicalPath2(parent), basename8(path3));
+    return parent === path3 ? path3 : join26(canonicalPath2(parent), basename8(path3));
   }
 }
 function codexDevicePrompt(output) {
@@ -26512,13 +26816,13 @@ function loginFailure(output) {
   }
   return "ChatGPT sign-in did not finish. Check the server's connection and that device-code login is enabled in ChatGPT, then try again.";
 }
-var DEVICE_URL, MAX_OUTPUT3, authenticatingHomes2, CodexDeviceAuthController;
+var DEVICE_URL, MAX_OUTPUT4, authenticatingHomes2, CodexDeviceAuthController;
 var init_codex_device_auth = __esm({
   "server/drivers/codex-device-auth.ts"() {
     "use strict";
     init_procs();
     DEVICE_URL = "https://auth.openai.com/codex/device";
-    MAX_OUTPUT3 = 16384;
+    MAX_OUTPUT4 = 16384;
     authenticatingHomes2 = /* @__PURE__ */ new Set();
     CodexDeviceAuthController = class {
       flow = null;
@@ -26537,11 +26841,11 @@ var init_codex_device_auth = __esm({
         await this.flow?.stopping;
         if (this.disposed) throw new Error("This provider was removed. Refresh Settings before signing in.");
         const env = this.options.environment();
-        const home = env.HOME || env.USERPROFILE || homedir12();
-        if (!isAbsolute6(home) || env.CODEX_HOME && !isAbsolute6(env.CODEX_HOME)) {
+        const home = env.HOME || env.USERPROFILE || homedir13();
+        if (!isAbsolute7(home) || env.CODEX_HOME && !isAbsolute7(env.CODEX_HOME)) {
           throw new Error("Use an absolute HOME and CODEX_HOME path for this server's Codex provider before signing in.");
         }
-        const homeKey = canonicalPath2(resolve7(env.CODEX_HOME || join25(home, ".codex")));
+        const homeKey = canonicalPath2(resolve8(env.CODEX_HOME || join26(home, ".codex")));
         if (authenticatingHomes2.has(homeKey)) {
           throw new Error("A ChatGPT sign-in is already running for this server account. Finish or cancel it before starting another.");
         }
@@ -26616,11 +26920,11 @@ var init_codex_device_auth = __esm({
         await this.flow?.stopping;
         if (this.disposed) throw new Error("This provider was removed. Refresh Settings before signing out.");
         const env = this.options.environment();
-        const home = env.HOME || env.USERPROFILE || homedir12();
-        if (!isAbsolute6(home) || env.CODEX_HOME && !isAbsolute6(env.CODEX_HOME)) {
+        const home = env.HOME || env.USERPROFILE || homedir13();
+        if (!isAbsolute7(home) || env.CODEX_HOME && !isAbsolute7(env.CODEX_HOME)) {
           throw new Error("Use an absolute HOME and CODEX_HOME path for this server's Codex provider before signing out.");
         }
-        const homeKey = canonicalPath2(resolve7(env.CODEX_HOME || join25(home, ".codex")));
+        const homeKey = canonicalPath2(resolve8(env.CODEX_HOME || join26(home, ".codex")));
         if (authenticatingHomes2.has(homeKey)) {
           throw new Error("A ChatGPT sign-in is running for this server account. Finish or cancel it before signing out.");
         }
@@ -26663,7 +26967,7 @@ var init_codex_device_auth = __esm({
           child.stdin.end();
           let output = "";
           const receive = (chunk) => {
-            if (output.length < MAX_OUTPUT3) output += chunk.toString("utf8").slice(0, MAX_OUTPUT3 - output.length);
+            if (output.length < MAX_OUTPUT4) output += chunk.toString("utf8").slice(0, MAX_OUTPUT4 - output.length);
           };
           child.stdout.on("data", receive);
           child.stderr.on("data", receive);
@@ -26698,7 +27002,7 @@ var init_codex_device_auth = __esm({
         let output = "";
         const receive = (chunk) => {
           if (flow.status.phase !== "waiting") return;
-          if (output.length + chunk.length > MAX_OUTPUT3) {
+          if (output.length + chunk.length > MAX_OUTPUT4) {
             this.finish(flow, "failed", "Codex returned an unexpected sign-in response. Update the server's Codex CLI and try again.");
             return;
           }
@@ -26777,116 +27081,51 @@ var init_codex_device_auth = __esm({
   }
 });
 
-// server/drivers/codex-identity.ts
-import { homedir as homedir13 } from "node:os";
-import { isAbsolute as isAbsolute7, join as join26, resolve as resolve8 } from "node:path";
-function codexHome2(env) {
-  if (env.CODEX_HOME) return isAbsolute7(env.CODEX_HOME) ? resolve8(env.CODEX_HOME) : null;
-  const home = env.HOME || env.USERPROFILE || homedir13();
-  return isAbsolute7(home) ? join26(home, ".codex") : null;
+// server/drivers/codex-release.ts
+function parseCodexReleaseVersion(value) {
+  const match = /^(?:.*\bcodex-cli\s+)?v?(\d+)\.(\d+)\.(\d+)(-[0-9a-z.-]+)?(?:\+[0-9a-z.-]+)?$/i.exec(value.trim());
+  return match ? { parts: match.slice(1, 4).map(Number), prerelease: Boolean(match[4]) } : null;
 }
-async function codexAccountEmail(cli, env, timeoutMs = 3e3) {
-  const cwd = env.HOME || env.USERPROFILE || homedir13();
-  if (!isAbsolute7(cwd) || !codexHome2(env)) return null;
-  return new Promise((resolveEmail) => {
-    let child;
-    try {
-      child = spawnCli(cli, ["app-server"], { cwd, env, stdio: ["pipe", "pipe", "pipe"] });
-    } catch {
-      resolveEmail(null);
-      return;
-    }
-    let finishing = false;
-    let buffer = "";
-    let outputBytes = 0;
-    let initialized = false;
-    const finish = async (email3) => {
-      if (finishing) return;
-      finishing = true;
-      clearTimeout(timer);
-      let stopped = await killCliTree(child, 1e3);
-      if (!stopped && child.pid) {
-        try {
-          if (process.platform === "win32") child.kill("SIGKILL");
-          else process.kill(-child.pid, "SIGKILL");
-        } catch {
-          try {
-            child.kill("SIGKILL");
-          } catch {
-          }
-        }
-        stopped = await killCliTree(child, 1e3);
-      }
-      resolveEmail(stopped ? email3 : null);
-    };
-    const timer = setTimeout(() => {
-      void finish(null);
-    }, timeoutMs);
-    timer.unref();
-    const send = (message2) => {
+function codexVersionBehind(installed, latest) {
+  const a2 = parseCodexReleaseVersion(installed);
+  const b2 = parseCodexReleaseVersion(latest);
+  if (!a2 || !b2 || b2.prerelease) return false;
+  for (let i2 = 0; i2 < 3; i2++) {
+    if (a2.parts[i2] !== b2.parts[i2]) return a2.parts[i2] < b2.parts[i2];
+  }
+  return a2.prerelease;
+}
+function createCodexReleaseReader(fetchImpl = fetch, now = Date.now) {
+  let cached3;
+  let expires = 0;
+  return () => {
+    if (cached3 && now() < expires) return cached3;
+    expires = now() + 60 * 60 * 1e3;
+    cached3 = (async () => {
       try {
-        child.stdin.write(`${JSON.stringify(message2)}
-`);
+        const response = await fetchImpl("https://registry.npmjs.org/@openai/codex/latest", {
+          signal: AbortSignal.timeout(3e3),
+          headers: { Accept: "application/json" }
+        });
+        if (!response.ok) throw new Error("Release lookup failed");
+        const payload = await response.json();
+        const version2 = typeof payload.version === "string" ? payload.version : "";
+        const parsed = parseCodexReleaseVersion(version2);
+        if (!parsed || parsed.prerelease) throw new Error("Invalid stable release");
+        return version2;
       } catch {
-        void finish(null);
-      }
-    };
-    child.stdin.on("error", () => {
-      void finish(null);
-    });
-    child.stderr.resume();
-    child.on("error", () => {
-      void finish(null);
-    });
-    child.on("close", () => {
-      void finish(null);
-    });
-    child.stdout.setEncoding("utf8");
-    child.stdout.on("data", (chunk) => {
-      if (finishing) return;
-      outputBytes += Buffer.byteLength(chunk);
-      if (outputBytes > MAX_OUTPUT4) {
-        void finish(null);
-        return;
-      }
-      buffer += chunk;
-      let newline;
-      while (!finishing && (newline = buffer.indexOf("\n")) !== -1) {
-        const line = buffer.slice(0, newline);
-        buffer = buffer.slice(newline + 1);
-        if (!line.trim()) continue;
-        let message2;
-        try {
-          message2 = JSON.parse(line);
-        } catch {
-          void finish(null);
-          return;
-        }
-        if (!initialized && message2?.id === 1) {
-          if (message2.error || !message2.result) {
-            void finish(null);
-            return;
-          }
-          initialized = true;
-          send({ method: "initialized", params: {} });
-          send({ id: 2, method: "account/read", params: { refreshToken: false } });
-        } else if (initialized && message2?.id === 2) {
-          const account = message2.error ? null : message2.result?.account;
-          const email3 = account?.type === "chatgpt" ? account.email : null;
-          void finish(typeof email3 === "string" && email3.length <= 254 && EMAIL.test(email3) && !/[\p{Cc}\p{Cf}]/u.test(email3) ? email3 : null);
-        }
+        expires = now() + 5 * 60 * 1e3;
+        return null;
       }
-    });
-    send({ id: 1, method: "initialize", params: { clientInfo: { name: "openmausbot", version: "1" } } });
-  });
+    })();
+    return cached3;
+  };
 }
-var MAX_OUTPUT4, EMAIL;
-var init_codex_identity = __esm({
-  "server/drivers/codex-identity.ts"() {
+var readLatestCodexRelease;
+var init_codex_release = __esm({
+  "server/drivers/codex-release.ts"() {
     "use strict";
-    init_procs();
-    MAX_OUTPUT4 = 16384;
-    EMAIL = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    readLatestCodexRelease = createCodexReleaseReader();
   }
 });
 
@@ -26896,18 +27135,6 @@ import { homedir as homedir14 } from "node:os";
 function missingNativeCodexThread(error51, cursor3) {
   return error51 instanceof CodexRpcError && error51.code === -32600 && error51.message === `no rollout found for thread id ${cursor3}`;
 }
-function codexPredatesAstra(version2) {
-  const value = version2.trim();
-  const match = /\bcodex-cli\s+v?(\d+)\.(\d+)\.(\d+)(?:[-+][0-9a-z.-]+)?(?![\d.])\b/i.exec(value) ?? /^v?(\d+)\.(\d+)\.(\d+)(?:[-+][0-9a-z.-]+)?$/i.exec(value);
-  if (!match) return false;
-  const installed = match.slice(1, 4).map(Number);
-  for (let i2 = 0; i2 < ASTRA_MIN_CODEX_VERSION.length; i2 += 1) {
-    if (installed[i2] !== ASTRA_MIN_CODEX_VERSION[i2]) {
-      return installed[i2] < ASTRA_MIN_CODEX_VERSION[i2];
-    }
-  }
-  return false;
-}
 function codexUpdateCommand(cli, platform = process.platform) {
   if (cli === "codex") return "codex update";
   const trimmed = cli.trim();
@@ -26916,13 +27143,12 @@ function codexUpdateCommand(cli, platform = process.platform) {
   const command = (tokens.length > 0 ? tokens : [trimmed]).map(quote2).join(" ");
   return platform === "win32" ? `& ${command} update` : `${command} update`;
 }
-function codexAstraUpdate(version2, models2, cli) {
-  if (models2.options.some((model) => model.id === ASTRA_MODEL_ID) || !codexPredatesAstra(version2)) {
-    return void 0;
-  }
+async function codexReleaseUpdate(version2, cli) {
+  const latest = await readLatestCodexRelease();
+  if (!latest || !codexVersionBehind(version2, latest)) return void 0;
   return {
-    title: "Update Codex for GPT-6 Astra",
-    message: "This Codex version predates Astra support. Update it, then refresh models. Astra must also be available to your signed-in ChatGPT account.",
+    title: `Update Codex to ${latest}`,
+    message: `A newer stable Codex CLI is available (installed: ${version2}). Update it, then refresh models. Model availability also depends on your signed-in account.`,
     command: codexUpdateCommand(cli)
   };
 }
@@ -27224,7 +27450,7 @@ function mountMcpServer(appServerArgs, env, name, server, preApproved = true) {
     appServerArgs.push("-c", `${prefix}.default_tools_approval_mode="auto"`);
   }
 }
-var DRIVER_KIND3, ASTRA_MODEL_ID, ASTRA_MIN_CODEX_VERSION, CodexRpcError, DENY_TIMEOUT_NOTE2, skippedSseServers, renamedMcpServers, plainRecord, containsControlCharacter, CodexDriver;
+var DRIVER_KIND3, CodexRpcError, DENY_TIMEOUT_NOTE2, skippedSseServers, renamedMcpServers, plainRecord, containsControlCharacter, CodexDriver;
 var init_codex = __esm({
   "server/drivers/codex.ts"() {
     "use strict";
@@ -27248,10 +27474,9 @@ var init_codex = __esm({
     init_resume_recovery();
     init_mcp_tool_images();
     init_ask_question();
+    init_codex_release();
     init_codex_catalog();
     DRIVER_KIND3 = "codex";
-    ASTRA_MODEL_ID = "gpt-6-astra";
-    ASTRA_MIN_CODEX_VERSION = [0, 153, 1];
     CodexRpcError = class extends Error {
       code;
       constructor(error51) {
@@ -28090,7 +28315,7 @@ ${stderr ?? ""}`))
             version: version2,
             authenticated,
             ...email3 ? { account: { email: email3 } } : {},
-            update: codexAstraUpdate(version2, models2, config2.cli),
+            update: await codexReleaseUpdate(version2, config2.cli),
             billing: "subscription"
           };
         };
@@ -37738,7 +37963,8 @@ function createOpenAIChatRuntime(options) {
     const done = new Promise((resolve12) => {
       resolveDone = resolve12;
     });
-    active.set(turn.threadId, { abort, turnId, done, approval });
+    const turnEntry = { abort, turnId, done, approval, asides: [] };
+    active.set(turn.threadId, turnEntry);
     emit({ ...base2(turn.threadId, turnId), type: "turn.started" });
     emit({ ...base2(turn.threadId, turnId), type: "session.started", sessionId: null, model });
     void (async () => {
@@ -37759,6 +37985,8 @@ function createOpenAIChatRuntime(options) {
         }
         for (let round = 0; round < 16; round++) {
           abort.signal.throwIfAborted();
+          const parked = turnEntry.asides.splice(0);
+          if (parked.length) messages.push({ role: "user", content: parked.join("\n\n") });
           native("out", options.nativeLog.outgoing(turn, messages, model));
           let attempt = 0;
           let completion;
@@ -37975,6 +38203,10 @@ function createOpenAIChatRuntime(options) {
       capabilities: {
         ...options.computerUse ? {
           computerMcp: options.tools !== false,
+          // Same gate as cloudComputerMcp: with tools off the runtime cannot
+          // mount the leased Box descriptor either. The fleet invariant test
+          // pins usesCloudComputer === (remoteAgent || cloudComputerMcp).
+          usesCloudComputer: options.tools !== false,
           cloudComputerMcp: options.tools !== false,
           localComputerMcp: options.tools !== false,
           browserMcp: options.tools !== false,
@@ -37984,7 +38216,10 @@ function createOpenAIChatRuntime(options) {
         sessionModelSwitch: "in-session",
         customMcp: options.tools !== false,
         agentsMcp: options.tools !== false,
-        composioMcp: options.tools !== false
+        composioMcp: options.tools !== false,
+        // The runtime owns the whole tool loop, so it can always take a
+        // user message mid-turn: park it, deliver before the next completion.
+        queueing: true
       },
       sendTurn,
       interruptTurn: async (threadId, turnId) => {
@@ -37994,6 +38229,12 @@ function createOpenAIChatRuntime(options) {
         await turn.done;
       },
       respondToRequest: async (threadId, requestId, decision) => active.get(threadId)?.approval.answer(requestId, decision.behavior, decision.message) ?? "unavailable",
+      steer: async (threadId, text4) => {
+        const running2 = active.get(threadId);
+        if (!running2) return "refused";
+        running2.asides.push(text4);
+        return "steered";
+      },
       hasSession: (threadId) => active.has(threadId),
       stopAll: async () => {
         const turns = [...active.values()];
@@ -38103,12 +38344,7 @@ var init_grok = __esm({
 
 // server/drivers/acp/grok.ts
 import { existsSync as existsSync11, readFileSync as readFileSync16, writeFileSync as writeFileSync9 } from "node:fs";
-import { homedir as homedir15 } from "node:os";
 import { join as join30 } from "node:path";
-function grokHome(env) {
-  if (env.GROK_HOME) return env.GROK_HOME;
-  return join30(env.HOME || env.USERPROFILE || homedir15(), ".grok");
-}
 function unquote2(raw) {
   const value = raw.trim();
   if (value.length >= 2 && value.startsWith('"') && value.endsWith('"')) {
@@ -38117,7 +38353,7 @@ function unquote2(raw) {
   return value;
 }
 function readGrokModelCatalog(env = process.env) {
-  const path3 = join30(grokHome(env), "config.toml");
+  const path3 = join30(env.GROK_HOME || harnessHome("grok", env), "config.toml");
   let text4 = "";
   try {
     text4 = readFileSync16(path3, "utf8");
@@ -38190,7 +38426,7 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
   if (!inject) return modelId;
   const host = localHost(inject.host);
   if (!host) return modelId;
-  const path3 = join30(grokHome(env), "config.toml");
+  const path3 = join30(env.GROK_HOME || harnessHome("grok", env), "config.toml");
   let text4 = "";
   try {
     text4 = readFileSync16(path3, "utf8");
@@ -38257,6 +38493,7 @@ var STATIC_GROK_MODELS, SLUG, support2, GrokAgentDriver;
 var init_grok2 = __esm({
   "server/drivers/acp/grok.ts"() {
     "use strict";
+    init_env_path();
     init_local_inject();
     init_core3();
     STATIC_GROK_MODELS = {
@@ -38337,7 +38574,7 @@ var init_grok2 = __esm({
       // an unauthenticated CLI is a user action, not something to paper over.
       pickAuthMethod: (methods) => methods.some((m2) => m2.id === "cached_token") ? "cached_token" : null,
       authFailure: "fail",
-      isAuthenticated: () => existsSync11(join30(homedir15(), ".grok", "auth.json")),
+      isAuthenticated: (env) => existsSync11(join30(harnessHome("grok", env), "auth.json")),
       // `--append-system-prompt`/`--rules` are accepted by the CLI but do NOT
       // reach the agent-stdio system prompt (verified against 1.0.0), so the
       // persona is prepended codex-style.
@@ -38351,11 +38588,10 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/gemini.ts
 import { existsSync as existsSync12, readFileSync as readFileSync17 } from "node:fs";
-import { homedir as homedir16 } from "node:os";
 import { join as join31 } from "node:path";
-function liveOauthCredential() {
+function liveOauthCredential(env) {
   try {
-    const creds = JSON.parse(readFileSync17(join31(homedir16(), ".gemini", "oauth_creds.json"), "utf8"));
+    const creds = JSON.parse(readFileSync17(join31(userHome(env), ".gemini", "oauth_creds.json"), "utf8"));
     if (typeof creds.access_token !== "string" || creds.access_token.trim().length === 0) return false;
     const hasRefresh = typeof creds.refresh_token === "string" && creds.refresh_token.trim().length > 0;
     if (creds.expiry_date !== void 0) {
@@ -38368,7 +38604,7 @@ function liveOauthCredential() {
   }
 }
 function geminiIsAuthenticated(env) {
-  return nonBlank(env.GEMINI_API_KEY) || nonBlank(env.GOOGLE_API_KEY) || existsSync12(join31(homedir16(), ".gemini", "oauth_creds.json")) && liveOauthCredential();
+  return nonBlank(env.GEMINI_API_KEY) || nonBlank(env.GOOGLE_API_KEY) || existsSync12(join31(userHome(env), ".gemini", "oauth_creds.json")) && liveOauthCredential(env);
 }
 function geminiApprovalArgs(fullAuto, approvalMode) {
   if (fullAuto) return ["--yolo"];
@@ -38379,6 +38615,7 @@ var AUTH_PREFERENCE, nonBlank, support3, GeminiAgentDriver;
 var init_gemini = __esm({
   "server/drivers/acp/gemini.ts"() {
     "use strict";
+    init_env_path();
     init_core3();
     AUTH_PREFERENCE = ["gemini-api-key", "oauth-personal", "vertex-ai"];
     nonBlank = (value) => Boolean(value?.trim());
@@ -38416,13 +38653,13 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/kimi.ts
 import { existsSync as existsSync13, mkdirSync as mkdirSync15, readFileSync as readFileSync18, writeFileSync as writeFileSync10 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
+import { homedir as homedir15 } from "node:os";
 import { join as join32 } from "node:path";
 function isLocalInjectAlias(slug) {
   return LOCAL_PROVIDER_PREFIXES.some((prefix) => slug.startsWith(prefix));
 }
 function kimiDataRoot(env) {
-  return env.KIMI_CODE_HOME || join32(env.HOME || env.USERPROFILE || homedir17(), ".kimi-code");
+  return env.KIMI_CODE_HOME || join32(env.HOME || env.USERPROFILE || homedir15(), ".kimi-code");
 }
 function credentialsPath(env) {
   return join32(kimiDataRoot(env), "credentials", "kimi-code.json");
@@ -38898,26 +39135,22 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/droid.ts
 import { existsSync as existsSync14, mkdirSync as mkdirSync16, readFileSync as readFileSync19, writeFileSync as writeFileSync11 } from "node:fs";
-import { homedir as homedir18 } from "node:os";
 import { join as join33 } from "node:path";
 function authFilePaths(env) {
-  const home = env.FACTORY_HOME_OVERRIDE || env.HOME || homedir18();
+  const home = env.FACTORY_HOME_OVERRIDE || userHome(env);
   return AUTH_FILES.map((name) => join33(home, ".factory", name));
 }
 function droidInjectId(host, model) {
   const safe = `${host}-${model}`.replace(/[^a-zA-Z0-9._+-]+/g, "-").replace(/-+/g, "-");
   return `${INJECT_ID_PREFIX}${safe}`;
 }
-function factoryHome(env) {
-  return env.FACTORY_HOME_OVERRIDE || env.HOME || env.USERPROFILE || homedir18();
-}
 function ensureDroidInjectModel(modelId, env = process.env) {
   const inject = decodeInjectId(modelId);
   if (!inject) return modelId;
   const host = localHost(inject.host);
   if (!host) return modelId;
   const id = droidInjectId(inject.host, inject.model);
-  const dir = join33(factoryHome(env), ".factory");
+  const dir = join33(env.FACTORY_HOME_OVERRIDE || userHome(env), ".factory");
   mkdirSync16(dir, { recursive: true });
   const path3 = join33(dir, "settings.json");
   let settings2 = {};
@@ -38959,7 +39192,7 @@ function applyDroidLocalAuthEnv(env, modelId) {
   env.FACTORY_API_KEY = "openmausbot-local";
 }
 function readSettings(env) {
-  return JSON.parse(readFileSync19(join33(factoryHome(env), ".factory", "settings.json"), "utf8"));
+  return JSON.parse(readFileSync19(join33(env.FACTORY_HOME_OVERRIDE || userHome(env), ".factory", "settings.json"), "utf8"));
 }
 async function resolveModels(env) {
   let catalog2 = MODELS3;
@@ -38997,6 +39230,7 @@ var AUTH_FILES, INJECT_ID_PREFIX, MODE_DEFAULT, MODE_FULL_AUTO, MODELS3, support
 var init_droid = __esm({
   "server/drivers/acp/droid.ts"() {
     "use strict";
+    init_env_path();
     init_local_inject();
     init_core3();
     AUTH_FILES = ["auth.v2.file", "auth.v2.loginkeychain", "auth.v2.keyring"];
@@ -39110,8 +39344,8 @@ function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
 function labelFor(id, explicit) {
-  if (explicit?.trim()) return explicit.trim();
-  return id.split(/[-_./]+/g).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
+  const trimmed = explicit?.trim();
+  return trimmed || titleCaseModelId(id, /[-_./]+/);
 }
 function pushModel(options, seen, id, label, custom2 = false) {
   if (!SLUG3.test(id) || seen.has(id)) return;
@@ -39277,6 +39511,7 @@ var STATIC_CURSOR_MODELS, SLUG3, EXEC_TIMEOUT_MS, nonBlank2, support6, CursorAge
 var init_cursor = __esm({
   "server/drivers/acp/cursor.ts"() {
     "use strict";
+    init_contracts();
     init_procs();
     init_core3();
     STATIC_CURSOR_MODELS = {
@@ -39350,10 +39585,10 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/opencode-go.ts
 import { existsSync as existsSync15, mkdirSync as mkdirSync17, readFileSync as readFileSync20, writeFileSync as writeFileSync12 } from "node:fs";
-import { homedir as homedir19 } from "node:os";
+import { homedir as homedir16 } from "node:os";
 import { join as join34 } from "node:path";
 function labelForModel(id) {
-  return id.split(/[-_.]+/g).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
+  return titleCaseModelId(id, /[-_.]+/);
 }
 function providerLabel(id) {
   if (id === "opencode") return "Zen";
@@ -39453,7 +39688,7 @@ async function discoverOpenCodeModels(environment, cli = "opencode") {
   }
 }
 function opencodeConfigDir(env) {
-  const home = env.HOME || env.USERPROFILE || homedir19();
+  const home = env.HOME || env.USERPROFILE || homedir16();
   return join34(env.XDG_CONFIG_HOME || join34(home, ".config"), "opencode");
 }
 function ensureOpenCodeInjectModel(modelId, env = process.env) {
@@ -39500,7 +39735,7 @@ function ensureOpenCodeInjectModel(modelId, env = process.env) {
   return native;
 }
 function storedAuthPaths(env) {
-  const home = env.HOME || env.USERPROFILE || homedir19();
+  const home = env.HOME || env.USERPROFILE || homedir16();
   const roots = [
     env.XDG_DATA_HOME || join34(home, ".local", "share"),
     process.platform === "darwin" ? join34(home, "Library", "Application Support") : process.platform === "win32" ? env.LOCALAPPDATA || join34(home, "AppData", "Local") : ""
@@ -39568,6 +39803,7 @@ var init_opencode_go = __esm({
     "use strict";
     init_local_inject();
     init_core3();
+    init_contracts();
     init_procs();
     STATIC_MODELS = {
       default: "opencode/x-preview-f-free",
@@ -39660,23 +39896,14 @@ ${turn.text}` : turn.text
 // server/drivers/acp/qwen.ts
 import { chmodSync as chmodSync5, existsSync as existsSync16, mkdirSync as mkdirSync18, readFileSync as readFileSync21, writeFileSync as writeFileSync13 } from "node:fs";
 import { createHash as createHash12 } from "node:crypto";
-import { homedir as homedir20 } from "node:os";
 import { join as join35 } from "node:path";
-function qwenHome(env) {
-  const home = process.platform === "win32" ? env.USERPROFILE || env.HOME || homedir20() : env.HOME || env.USERPROFILE || homedir20();
-  return join35(home, ".qwen");
-}
 function isRecord3(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function qwenModelLabel(id, name) {
-  if (!name || name.toLocaleLowerCase().endsWith(id.toLocaleLowerCase())) return id;
-  return `${id} \u2014 ${name}`;
-}
 function readQwenRoutes(env) {
   let settings2;
   try {
-    settings2 = JSON.parse(readFileSync21(join35(qwenHome(env), "settings.json"), "utf8"));
+    settings2 = JSON.parse(readFileSync21(join35(harnessHome("qwen", env), "settings.json"), "utf8"));
   } catch {
     return [];
   }
@@ -39744,7 +39971,9 @@ function readQwenRoutes(env) {
 function readQwenModelCatalog(env = process.env) {
   const options = readQwenRoutes(env).map(({ id, model, label, provider }) => ({
     id,
-    label: qwenModelLabel(model, label),
+    label: qualifiedModelLabel(model, label, {
+      redundantWhen: (id2, name) => name.toLocaleLowerCase().endsWith(id2.toLocaleLowerCase())
+    }),
     custom: true,
     provider
   }));
@@ -39758,7 +39987,7 @@ function ensureQwenInjectModel(modelId, env = process.env) {
   if (!inject) return modelId;
   const host = localHost(inject.host);
   if (!host) return modelId;
-  const dir = qwenHome(env);
+  const dir = harnessHome("qwen", env);
   mkdirSync18(dir, { recursive: true });
   const path3 = join35(dir, "settings.json");
   let settings2 = {};
@@ -39840,6 +40069,8 @@ var EMPTY, PROTOCOLS, support8, QwenAgentDriver;
 var init_qwen = __esm({
   "server/drivers/acp/qwen.ts"() {
     "use strict";
+    init_contracts();
+    init_env_path();
     init_local_inject();
     init_core3();
     EMPTY = { default: "", options: [] };
@@ -39865,6 +40096,9 @@ var init_qwen = __esm({
       // A raw -m only changes the model within the saved provider. ACP switches
       // the complete route and confirms it before any prompt leaves OMB.
       spawnArgs: (config2, turn) => ["--acp", ...qwenApprovalArgs(config2.fullAuto, turn.approvalMode)],
+      // Qwen's live session/load returns its cached MCP clients, ignoring fresh
+      // credentials. Cold-load the same conversation when those inputs change.
+      restartOnMcpChange: true,
       selectModel: { configId: "model" },
       pickAuthMethod: () => null,
       authFailure: "continue",
@@ -46766,7 +47000,7 @@ var init_browser = __esm({
 // server/drivers/acp/hermes.ts
 import { spawn as spawn6 } from "node:child_process";
 import { mkdirSync as mkdirSync19, readFileSync as readFileSync22, writeFileSync as writeFileSync14 } from "node:fs";
-import { homedir as homedir21 } from "node:os";
+import { homedir as homedir17 } from "node:os";
 import { join as join36 } from "node:path";
 function bindHermesScreenshotCompat(env, modelId) {
   delete env[HERMES_OPENMAUS_SCREENSHOT_COMPAT];
@@ -46776,9 +47010,6 @@ function bindHermesScreenshotCompat(env, modelId) {
   env[HERMES_OPENMAUS_SCREENSHOT_COMPAT] = "1";
   env[HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL] = inject.model;
 }
-function hermesHome(env) {
-  return env.HERMES_HOME || join36(env.HOME || env.USERPROFILE || homedir21(), ".hermes");
-}
 function quoteYaml(value) {
   if (/^[\w./:+-]+$/.test(value)) return value;
   return JSON.stringify(value);
@@ -46817,7 +47048,7 @@ function ensureHermesInjectProvider(modelId, env = process.env) {
   if (!inject) return modelId;
   const host = localHost(inject.host);
   if (!host) return modelId;
-  const dir = hermesHome(env);
+  const dir = env.HERMES_HOME || harnessHome("hermes", env);
   mkdirSync19(dir, { recursive: true });
   const path3 = join36(dir, "config.yaml");
   let text4 = "";
@@ -46887,7 +47118,7 @@ function hermesConfigDefault(text4) {
   return null;
 }
 function hermesConfiguredModel(env = process.env) {
-  const dir = hermesHome(env);
+  const dir = env.HERMES_HOME || harnessHome("hermes", env);
   let secrets = "";
   try {
     secrets = readFileSync22(join36(dir, ".env"), "utf8");
@@ -46988,7 +47219,7 @@ async function fetchHermesAcpModels(cli, env) {
         }
         if (msg?.id === initId) {
           if (!msg.result) return done([]);
-          sessionId = send("session/new", { cwd: env.HOME || env.USERPROFILE || homedir21(), mcpServers: [] });
+          sessionId = send("session/new", { cwd: env.HOME || env.USERPROFILE || homedir17(), mcpServers: [] });
         } else if (sessionId && msg?.id === sessionId) {
           const list = Array.isArray(msg.result?.models?.availableModels) ? msg.result.models.availableModels : [];
           done(
@@ -47032,6 +47263,7 @@ var init_hermes = __esm({
   "server/drivers/acp/hermes.ts"() {
     "use strict";
     init_browser();
+    init_env_path();
     init_procs();
     init_local_inject();
     init_core3();
@@ -47241,8 +47473,8 @@ var init_openai_compat = __esm({
 });
 
 // server/drivers/pi.ts
-import { chmodSync as chmodSync6, existsSync as existsSync17, mkdirSync as mkdirSync20, mkdtempSync as mkdtempSync3, readFileSync as readFileSync23, rmSync as rmSync6, writeFileSync as writeFileSync15 } from "node:fs";
-import { homedir as homedir22, tmpdir as tmpdir4 } from "node:os";
+import { chmodSync as chmodSync6, existsSync as existsSync17, mkdirSync as mkdirSync20, mkdtempSync as mkdtempSync3, readFileSync as readFileSync23, rmSync as rmSync7, writeFileSync as writeFileSync15 } from "node:fs";
+import { homedir as homedir18, tmpdir as tmpdir4 } from "node:os";
 import { join as join37 } from "node:path";
 function readPiPromptImages(turn) {
   return (turn.images ?? []).map((image) => ({
@@ -47344,7 +47576,7 @@ async function applyPiLocalCatalog(catalog2, env = process.env, fetchImpl = fetc
   return preferPiInjectRows(await mergeLocalInject(catalog2, env, fetchImpl));
 }
 function piAgentDir(env) {
-  return join37(env.HOME || env.USERPROFILE || homedir22(), ".pi", "agent");
+  return join37(env.HOME || env.USERPROFILE || homedir18(), ".pi", "agent");
 }
 function ensurePiInjectModel(modelId, env = process.env) {
   const split = splitPiModel(modelId);
@@ -47409,7 +47641,7 @@ function ensurePiInjectModel(modelId, env = process.env) {
   return split;
 }
 function readPiDefaultModel(env) {
-  const home = env.HOME || env.USERPROFILE || homedir22();
+  const home = env.HOME || env.USERPROFILE || homedir18();
   try {
     const s2 = JSON.parse(readFileSync23(`${home}/.pi/agent/settings.json`, "utf8"));
     return s2.defaultProvider && s2.defaultModel ? `${s2.defaultProvider}/${s2.defaultModel}` : "";
@@ -47486,13 +47718,14 @@ function piEnvironment(source) {
   for (const key of PROVIDER_CREDENTIAL_ENV) delete env[key];
   return env;
 }
-var DRIVER_KIND6, PI_ARGS, PI_MODEL_UPDATE_ARGS, NODE_ENV_FLAG2, EMPTY3, PiDriver;
+var DRIVER_KIND6, PI_ARGS, PI_MODEL_UPDATE_ARGS, NODE_ENV_FLAG2, PI_PROMPT_RE_ANCHOR_TURNS, PI_AGENT_END_GRACE_MS, PiRpcRefusalError, EMPTY3, PiDriver;
 var init_pi = __esm({
   "server/drivers/pi.ts"() {
     "use strict";
     init_config();
     init_env_path();
     init_procs();
+    init_prompt_split();
     init_proxy_paths();
     init_tool_summary();
     init_wire();
@@ -47504,6 +47737,10 @@ var init_pi = __esm({
     PI_ARGS = ["--mode", "rpc", "--no-session"];
     PI_MODEL_UPDATE_ARGS = ["update", "--models", "--no-approve"];
     NODE_ENV_FLAG2 = { ELECTRON_RUN_AS_NODE: "1" };
+    PI_PROMPT_RE_ANCHOR_TURNS = 8;
+    PI_AGENT_END_GRACE_MS = 6e4;
+    PiRpcRefusalError = class extends Error {
+    };
     EMPTY3 = { default: "", options: [] };
     PiDriver = {
       driverKind: DRIVER_KIND6,
@@ -47568,6 +47805,10 @@ var init_pi = __esm({
           const pending = /* @__PURE__ */ new Map();
           const askTimers = /* @__PURE__ */ new Set();
           let settled = false;
+          let endStopReason;
+          let endUsage;
+          let endErrorMessage;
+          let agentEndTimer = null;
           const images = readPiPromptImages(turn);
           if (typeof turn.model === "string" && turn.model) {
             ensurePiInjectModel(turn.model, { ...process.env, ...input.environment });
@@ -47580,7 +47821,7 @@ var init_pi = __esm({
               writeFileSync15(join37(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers }), { mode: 384 });
             } catch (err) {
               try {
-                rmSync6(mcpTempDir, { recursive: true, force: true });
+                rmSync7(mcpTempDir, { recursive: true, force: true });
               } catch {
               }
               throw err;
@@ -47601,7 +47842,7 @@ var init_pi = __esm({
             } catch (err) {
               if (mcpTempDir) {
                 try {
-                  rmSync6(mcpTempDir, { recursive: true, force: true });
+                  rmSync7(mcpTempDir, { recursive: true, force: true });
                 } catch {
                 }
               }
@@ -47610,7 +47851,9 @@ var init_pi = __esm({
           })();
           let buf = "";
           let assistantText = "";
+          let compactionObserved = false;
           const responseWaiters = /* @__PURE__ */ new Map();
+          let steerSeq = 0;
           const rejectWaiters = (err) => {
             for (const waiter of responseWaiters.values()) {
               clearTimeout(waiter.timer);
@@ -47618,13 +47861,13 @@ var init_pi = __esm({
             }
             responseWaiters.clear();
           };
-          const awaitResponse = (command, timeoutMs = 2e4) => new Promise((resolve12, reject) => {
+          const awaitResponse = (command, timeoutMs = 2e4, key = command) => new Promise((resolve12, reject) => {
             const timer = setTimeout(() => {
-              responseWaiters.delete(command);
+              responseWaiters.delete(key);
               reject(new Error(`pi ${command} timed out`));
             }, timeoutMs);
             timer.unref?.();
-            responseWaiters.set(command, { resolve: resolve12, reject, timer });
+            responseWaiters.set(key, { resolve: resolve12, reject, timer });
           });
           child.stdin.on("error", () => rejectWaiters(new Error("pi stdin closed")));
           const send = (obj) => {
@@ -47640,6 +47883,10 @@ var init_pi = __esm({
           const settle = (ok, stopReason, usage) => {
             if (settled) return;
             settled = true;
+            if (agentEndTimer) {
+              clearTimeout(agentEndTimer);
+              agentEndTimer = null;
+            }
             for (const timer of askTimers) clearTimeout(timer);
             askTimers.clear();
             pending.clear();
@@ -47661,12 +47908,25 @@ var init_pi = __esm({
             }
             if (mcpTempDir) {
               try {
-                rmSync6(mcpTempDir, { recursive: true, force: true });
+                rmSync7(mcpTempDir, { recursive: true, force: true });
               } catch {
               }
             }
             active.delete(threadId);
           };
+          const finishRun = () => {
+            const sr = endStopReason;
+            if (sr === "error" || sr === "failed") {
+              emit({
+                ...base2(threadId, turnId),
+                type: "runtime.error",
+                message: String(endErrorMessage ?? "pi turn failed").slice(0, 2e3)
+              });
+              settle(false, "failed", endUsage);
+              return;
+            }
+            settle(true, sr === "cancelled" || sr === "aborted" ? "cancelled" : "end_turn", endUsage);
+          };
           const stop = () => {
             try {
               send({ type: "abort" });
@@ -47678,17 +47938,35 @@ var init_pi = __esm({
             }
             settle(true, "cancelled");
           };
-          active.set(threadId, { stop, turnId, pending, child });
+          const steerActiveTurn = async (text4) => {
+            if (settled || child.exitCode !== null || child.signalCode !== null) return "refused";
+            let ack;
+            try {
+              const id = `steer:${++steerSeq}`;
+              ack = awaitResponse("steer", 2e4, id);
+              send({ type: "steer", id, message: text4 });
+            } catch {
+              return "refused";
+            }
+            try {
+              await ack;
+              return "steered";
+            } catch (error51) {
+              return error51 instanceof PiRpcRefusalError ? "refused" : "indeterminate";
+            }
+          };
+          active.set(threadId, { stop, turnId, pending, child, steer: steerActiveTurn });
           const onEvent = (evt) => {
             appendNative(threadId, { dir: "in", source: "pi.rpc", msg: evt });
             switch (evt.type) {
               case "response": {
-                if (evt.command && responseWaiters.has(evt.command)) {
-                  const waiter = responseWaiters.get(evt.command);
-                  responseWaiters.delete(evt.command);
+                const key = typeof evt.id === "string" && responseWaiters.has(evt.id) ? evt.id : evt.command;
+                if (key && responseWaiters.has(key)) {
+                  const waiter = responseWaiters.get(key);
+                  responseWaiters.delete(key);
                   clearTimeout(waiter.timer);
                   if (evt.success) waiter.resolve(evt.data);
-                  else waiter.reject(new Error(`pi ${evt.command} failed`));
+                  else waiter.reject(new PiRpcRefusalError(`pi ${evt.command} failed`));
                 }
                 return;
               }
@@ -47779,21 +48057,43 @@ var init_pi = __esm({
                 }
                 return;
               }
-              case "turn_end":
-              case "agent_end": {
+              case "compaction_start":
+              case "compaction_end":
+              case "auto_compaction_start":
+              case "auto_compaction_end": {
+                if (sessionReady && sessionFile) {
+                  compactionObserved = true;
+                  deletePromptSplitReceipt("pi", JSON.stringify([threadId, sessionFile]));
+                }
+                return;
+              }
+              case "turn_end": {
+                if (settled) return;
                 const sr = evt.message?.stopReason;
                 if (sr === "toolUse" || sr === "tool_use" || sr === "tool_calls") return;
-                const usage = evt.usage ?? evt.message?.usage;
-                if (sr === "error" || sr === "failed") {
-                  emit({
-                    ...base2(threadId, turnId),
-                    type: "runtime.error",
-                    message: String(evt.message?.errorMessage ?? "pi turn failed").slice(0, 2e3)
-                  });
-                  settle(false, "failed", usage);
-                  return;
+                endStopReason = sr;
+                endUsage = evt.usage ?? evt.message?.usage;
+                endErrorMessage = evt.message?.errorMessage;
+                if (agentEndTimer) clearTimeout(agentEndTimer);
+                agentEndTimer = setTimeout(finishRun, PI_AGENT_END_GRACE_MS);
+                agentEndTimer.unref?.();
+                return;
+              }
+              case "agent_end": {
+                if (evt.isTerminal === false || evt.willRetry === true) return;
+                if (agentEndTimer) {
+                  clearTimeout(agentEndTimer);
+                  agentEndTimer = null;
                 }
-                settle(true, sr === "cancelled" || sr === "aborted" ? "cancelled" : "end_turn", usage);
+                finishRun();
+                return;
+              }
+              case "agent_settled": {
+                if (agentEndTimer) {
+                  clearTimeout(agentEndTimer);
+                  agentEndTimer = null;
+                }
+                finishRun();
                 return;
               }
               default:
@@ -47827,12 +48127,14 @@ var init_pi = __esm({
           emit({ ...base2(threadId, turnId), type: "turn.started" });
           const sessionPath = typeof turn.resumeCursor === "string" ? turn.resumeCursor : null;
           let sessionFile = sessionPath;
+          let sessionReady = false;
           try {
             const command = sessionPath ? "switch_session" : "new_session";
             const hsPromise = awaitResponse(command);
             send(sessionPath ? { type: "switch_session", sessionPath } : { type: "new_session" });
             const hs = await hsPromise;
             if (hs?.sessionFile) sessionFile = hs.sessionFile;
+            sessionReady = true;
             emit({
               ...base2(threadId, turnId),
               type: "session.started",
@@ -47858,12 +48160,54 @@ var init_pi = __esm({
             } catch {
             }
           }
-          const message2 = turn.system ? `${turn.system}
+          const halves = promptHalves(turn);
+          let message2;
+          let pendingReceipt = null;
+          if (halves.stable !== null && sessionReady && sessionFile) {
+            const receiptKey = JSON.stringify([threadId, sessionFile]);
+            const composed = splitSessionPrompt(
+              halves.stable,
+              halves.volatile,
+              readPromptSplitReceipt("pi", receiptKey),
+              turn.system,
+              turn.text,
+              Boolean(turn.mentionTurn),
+              PI_PROMPT_RE_ANCHOR_TURNS
+            );
+            message2 = composed.text;
+            pendingReceipt = { key: receiptKey, receipt: composed.receipt };
+          } else {
+            message2 = turn.system ? `${turn.system}
 
 ${turn.text}` : turn.text;
+          }
           try {
+            const accepted = awaitResponse("prompt", 12e4);
             send({ type: "prompt", message: message2, ...images.length ? { images } : {} });
-          } catch {
+            void accepted.then(
+              () => {
+                if (!pendingReceipt || compactionObserved) return;
+                try {
+                  writePromptSplitReceipt("pi", pendingReceipt.key, pendingReceipt.receipt);
+                } catch {
+                }
+              },
+              (err) => {
+                if (settled) return;
+                emit({
+                  ...base2(threadId, turnId),
+                  type: "runtime.error",
+                  message: String(err?.message ?? err).slice(0, 2e3)
+                });
+                settle(false);
+              }
+            );
+          } catch (err) {
+            emit({
+              ...base2(threadId, turnId),
+              type: "runtime.error",
+              message: String(err?.message ?? err).slice(0, 2e3)
+            });
             settle(false);
           }
           return { turnId };
@@ -47930,7 +48274,10 @@ ${turn.text}` : turn.text;
               // Reasoning effort pins pi's thinking level per turn (none → off).
               // xhigh/max only land on models that expose them; pi rejects an
               // unsupported level and the turn keeps the engine default.
-              effortLevels: EFFORT_LEVELS
+              effortLevels: EFFORT_LEVELS,
+              // pi's RPC mode takes a mid-turn steer frame the runtime queues
+              // into the running agent without aborting the current step.
+              queueing: true
             },
             sendTurn,
             interruptTurn: async (threadId) => active.get(threadId)?.stop(),
@@ -47949,6 +48296,10 @@ ${turn.text}` : turn.text;
               });
               return decision.behavior === "allow" ? "allowed-once" : decision.behavior === "answer" ? "answered" : "rejected";
             },
+            steer: async (threadId, text4) => {
+              const entry = active.get(threadId);
+              return entry?.steer ? await entry.steer(text4) : "refused";
+            },
             hasSession: (threadId) => active.has(threadId),
             stopAll: async () => {
               for (const { stop } of active.values()) stop();
@@ -48092,13 +48443,13 @@ var init_mistral = __esm({
 
 // server/drivers/minimax.ts
 import { readFileSync as readFileSync24 } from "node:fs";
-import { homedir as homedir23 } from "node:os";
+import { homedir as homedir19 } from "node:os";
 import { join as join38 } from "node:path";
 function normalizedApiUrl(value) {
   const root = value.trim().replace(/\/+$/, "");
   return root.endsWith("/v1") ? root : `${root}/v1`;
 }
-function loadLocalMiniMaxConfig(home = homedir23()) {
+function loadLocalMiniMaxConfig(home = homedir19()) {
   try {
     const raw = localConfigSchema.parse(JSON.parse(readFileSync24(join38(home, ".mmx", "config.json"), "utf8")));
     const configuredUrl = raw.base_url?.trim() ? raw.base_url : raw.region === "cn" ? CN_URL : DEFAULT_URL3;
@@ -48823,8 +49174,8 @@ __export(browser_engine_exports, {
 });
 import { spawn as spawn8 } from "node:child_process";
 import { createHash as createHash13, randomBytes as randomBytes3, randomUUID as randomUUID14 } from "node:crypto";
-import { chmodSync as chmodSync7, constants as constants2, copyFileSync, existsSync as existsSync18, mkdirSync as mkdirSync21, readFileSync as readFileSync26, readdirSync as readdirSync3, renameSync as renameSync6, rmSync as rmSync7, statSync as statSync5, unlinkSync as unlinkSync7, writeFileSync as writeFileSync16 } from "node:fs";
-import { homedir as homedir24, tmpdir as tmpdir5 } from "node:os";
+import { chmodSync as chmodSync7, constants as constants2, copyFileSync, existsSync as existsSync18, mkdirSync as mkdirSync21, readFileSync as readFileSync26, readdirSync as readdirSync3, renameSync as renameSync6, rmSync as rmSync8, statSync as statSync5, unlinkSync as unlinkSync7, writeFileSync as writeFileSync16 } from "node:fs";
+import { homedir as homedir20, tmpdir as tmpdir5 } from "node:os";
 import { delimiter as delimiter6, dirname as dirname12, join as join42, resolve as resolve10 } from "node:path";
 function browserRestoreKey(session) {
   if (!/^[A-Za-z0-9_.-]{1,96}$/.test(session)) throw new Error("Invalid browser session.");
@@ -48833,7 +49184,7 @@ function browserRestoreKey(session) {
 function browserSessionsDirectory(env) {
   const namespace = env.AGENT_BROWSER_NAMESPACE;
   if (namespace && !/^[a-z0-9]+(?:[-_][a-z0-9]+)*$/.test(namespace)) throw new Error("Invalid browser namespace.");
-  const home = (process.platform === "win32" ? env.USERPROFILE : env.HOME) || homedir24();
+  const home = (process.platform === "win32" ? env.USERPROFILE : env.HOME) || homedir20();
   const stateRoot = namespace ? join42(home, ".agent-browser", "namespaces", namespace, "state") : join42(home, ".agent-browser");
   return join42(stateRoot, "sessions");
 }
@@ -49215,7 +49566,7 @@ function agentBrowserFrame(input) {
       } catch {
         fail(new Error("the browser reported a picture it did not write"));
       } finally {
-        rmSync7(file2, { force: true });
+        rmSync8(file2, { force: true });
       }
     };
     child.on("error", (error51) => done(error51 instanceof Error ? error51 : new Error(String(error51))));
@@ -49299,7 +49650,7 @@ var import_qrcode_terminal = __toESM(require_main(), 1);
 import { spawn as spawn9 } from "node:child_process";
 import { randomBytes as randomBytes4 } from "node:crypto";
 import { closeSync as closeSync6, existsSync as existsSync19, mkdirSync as mkdirSync22, openSync as openSync6, readFileSync as readFileSync27 } from "node:fs";
-import { homedir as homedir25 } from "node:os";
+import { homedir as homedir21 } from "node:os";
 import { dirname as dirname13, join as join43, resolve as resolve11 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -52793,7 +53144,7 @@ function parseArgs(argv, env = process.env) {
   const options = {
     command: command === "--help" || command === "-h" ? "help" : command,
     port: Number(env.OMB_PORT || 8799),
-    dataDir: env.OMB_DATA_DIR || join43(homedir25(), ".openmausbot"),
+    dataDir: env.OMB_DATA_DIR || join43(homedir21(), ".openmausbot"),
     tailscale: false,
     tunnel: false,
     client: false,
@@ -53721,7 +54072,7 @@ async function runOnboardingCommand(options, io = defaultIo(), startServer = run
     }
     if (options.command === "setup") {
       io.log("\nAll set. Start with: openmausbot (or npx openmausbot without a global install).");
-      if (options.dataDir !== join43(homedir25(), ".openmausbot") || options.port !== 8799) {
+      if (options.dataDir !== join43(homedir21(), ".openmausbot") || options.port !== 8799) {
         io.log(`Use the same --data-dir (${options.dataDir}) and --port (${options.port}) options when starting.`);
       }
       return 0;