openmausbot 0.1.73 → 0.1.75

package/dist-server/openmausbot.js

@@ -9752,8 +9752,8 @@ var capitalizeFirstCharacter, error28;
 var init_lt = __esm({
   "node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/locales/lt.js"() {
     init_util();
-    capitalizeFirstCharacter = (text3) => {
-      return text3.charAt(0).toUpperCase() + text3.slice(1);
+    capitalizeFirstCharacter = (text4) => {
+      return text4.charAt(0).toUpperCase() + text4.slice(1);
     };
     error28 = () => {
       const Sizable = {
@@ -17585,8 +17585,8 @@ var init_mcp_registry = __esm({
 });
 
 // server/schema.ts
-function parseJson(text3) {
-  return JSON.parse(text3);
+function parseJson(text4) {
+  return JSON.parse(text4);
 }
 function schemaIssue(error51, fallback) {
   const issue2 = error51.issues[0];
@@ -17782,7 +17782,7 @@ function saveConfig(patch, options = {}) {
   const checkedPatch = appConfigSchema.partial().parse(patch);
   const storedProfiles = storedBrowserProfilesSchema.safeParse(disk.browserProfiles);
   if (storedProfiles.success) disk.browserProfiles = storedProfiles.data;
-  for (const key of ["xai", "anthropic", "openaiCompat", "composio", "box", "opencodeGo", "tts", "imageGen", "profile", "rooms", "threads", "localVm", "features", "budgets", "billing"]) {
+  for (const key of ["xai", "anthropic", "openaiCompat", "composio", "box", "opencodeGo", "tts", "imageGen", "profile", "rooms", "threads", "localVm", "features", "budgets", "billing", "onboarding"]) {
     const section = checkedPatch[key];
     if (!section) continue;
     const current = jsonObjectSchema.safeParse(disk[key]);
@@ -17905,7 +17905,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, MAX_CONCURRENT_BOT_THREADS, MIN_LOCAL_VM_MAX_INSTANCES, MAX_LOCAL_VM_MAX_INSTANCES, vpsConfigSchema, roomConfigSchema, localVmConfigSchema, browserProfileSchema, legacyBrowserProfileSchema, legacyBrowserProfilesSchema, storedBrowserProfilesSchema, browserProfilesSchema, featureConfigSchema, instanceConfigSchema, instanceConfigMapSchema, defaultModelSelectionSchema, appConfigSchema, storedAppConfigSchema, appConfigPatchSchema, jsonObjectSchema, DATA_DIR, LEGACY_DATA_DIR, EVENTS_DIR, NATIVE_DIR, WORKSPACE_CREDENTIAL_ENV, PROVIDER_CREDENTIAL_ENV;
+var optionalText, SSH_ALIAS, LEGACY_BROWSER_PROFILE_ID, BROWSER_PROFILE_ID, MIN_ROOM_TURN_TIMEOUT_MINUTES, MAX_ROOM_TURN_TIMEOUT_MINUTES, MAX_CONCURRENT_BOT_THREADS, MIN_LOCAL_VM_MAX_INSTANCES, MAX_LOCAL_VM_MAX_INSTANCES, vpsConfigSchema, roomConfigSchema, localVmConfigSchema, browserProfileSchema, legacyBrowserProfileSchema, legacyBrowserProfilesSchema, storedBrowserProfilesSchema, browserProfilesSchema, featureConfigSchema, onboardingConfigSchema, instanceConfigSchema, instanceConfigMapSchema, defaultModelSelectionSchema, appConfigSchema, storedAppConfigSchema, appConfigPatchSchema, jsonObjectSchema, DATA_DIR, LEGACY_DATA_DIR, EVENTS_DIR, NATIVE_DIR, WORKSPACE_CREDENTIAL_ENV, PROVIDER_CREDENTIAL_ENV;
 var init_config = __esm({
   "server/config.ts"() {
     "use strict";
@@ -17979,6 +17979,14 @@ var init_config = __esm({
        * also has its own switch. */
       browser: external_exports.boolean().optional()
     });
+    onboardingConfigSchema = external_exports.object({
+      /** ISO timestamp of finishing (or skipping to the end of) the welcome flow. */
+      completedAt: external_exports.string().trim().max(40).optional(),
+      /** Which welcome flow was completed; a newer flow may re-show itself. */
+      version: external_exports.number().int().min(0).max(1e3).optional(),
+      reelSeen: external_exports.boolean().optional(),
+      hintsSeen: external_exports.array(external_exports.string().trim().min(1).max(60)).max(100).optional()
+    }).strict();
     instanceConfigSchema = external_exports.object({
       driver: external_exports.string().min(1),
       displayName: optionalText,
@@ -18072,6 +18080,7 @@ var init_config = __esm({
       threads: external_exports.object({ maxConcurrentPerBot: external_exports.number().int().min(1).max(MAX_CONCURRENT_BOT_THREADS) }).strict().optional(),
       localVm: localVmConfigSchema.optional(),
       features: featureConfigSchema.optional(),
+      onboarding: onboardingConfigSchema.optional(),
       browserProfiles: browserProfilesSchema.optional(),
       instances: instanceConfigMapSchema.optional(),
       /** User-configured MCP servers, mounted into every capable engine. Kept
@@ -18622,14 +18631,14 @@ function nodeExe(near) {
   return process.versions.electron ? null : process.execPath;
 }
 function parseCmdShim(shim) {
-  let text3;
+  let text4;
   try {
-    text3 = readFileSync6(shim, "utf8");
+    text4 = readFileSync6(shim, "utf8");
   } catch {
     return null;
   }
   const dir = dirname4(shim);
-  const targets = [...text3.matchAll(/"%~?dp0%?\\?([^"]+)"/g)].map((m) => join9(dir, m[1])).filter((p) => isFile(p) && basename2(p).toLowerCase() !== "node.exe");
+  const targets = [...text4.matchAll(/"%~?dp0%?\\?([^"]+)"/g)].map((m) => join9(dir, m[1])).filter((p) => isFile(p) && basename2(p).toLowerCase() !== "node.exe");
   const script = targets.find((p) => /\.[cm]?js$/i.test(p));
   if (script) {
     const node = nodeExe(dir);
@@ -18728,6 +18737,7 @@ function spawnCli(cli, args, opts) {
     // win32: taskkill /T does the reaping instead (see killCliTree)
     ...process.platform === "win32" ? { windowsHide: true } : { detached: true }
   });
+  if (process.platform !== "win32") cliGroups.add(child);
   child.stdin?.on("error", () => {
   });
   return child;
@@ -18760,8 +18770,59 @@ function describeSpawnFailure(err, cli) {
   return { message: `spawn failed: ${err.message}`, setup: false };
 }
 function killCliTree(child, timeoutMs = 5e3) {
+  const existing = stopping.get(child);
+  if (existing) return existing;
   const pid = child.pid;
-  if (!pid || child.exitCode !== null || child.signalCode !== null) return Promise.resolve(true);
+  if (!pid) return Promise.resolve(true);
+  if (!Number.isInteger(pid) || pid <= 1 || pid === process.pid) return Promise.resolve(false);
+  const run3 = stopCliTree(child, pid, Number.isFinite(timeoutMs) ? Math.max(0, timeoutMs) : 5e3);
+  stopping.set(child, run3);
+  void run3.then((stopped) => {
+    if (!stopped) stopping.delete(child);
+  });
+  return run3;
+}
+async function stopCliTree(child, pid, timeoutMs) {
+  const exited = () => child.exitCode !== null || child.signalCode !== null;
+  if (process.platform !== "win32") {
+    const group = cliGroups.has(child);
+    const settled = () => {
+      if (!exited()) return false;
+      if (!group) return true;
+      try {
+        process.kill(-pid, 0);
+        return false;
+      } catch (error51) {
+        return error51.code === "ESRCH";
+      }
+    };
+    const signal = (value) => {
+      try {
+        if (group) process.kill(-pid, value);
+        else child.kill(value);
+      } catch {
+        try {
+          child.kill(value);
+        } catch {
+        }
+      }
+    };
+    const wait2 = async (ms) => {
+      const deadline = Date.now() + ms;
+      while (!settled()) {
+        const remaining = deadline - Date.now();
+        if (remaining <= 0) return false;
+        await new Promise((resolve13) => setTimeout(resolve13, Math.min(25, remaining)));
+      }
+      return true;
+    };
+    if (settled()) return true;
+    signal("SIGTERM");
+    if (await wait2(timeoutMs)) return true;
+    signal("SIGKILL");
+    return wait2(1e3);
+  }
+  if (exited()) return true;
   return new Promise((resolve13) => {
     let timer;
     const done = (stopped) => {
@@ -18773,35 +18834,26 @@ function killCliTree(child, timeoutMs = 5e3) {
     child.once("close", closed);
     timer = setTimeout(() => done(false), timeoutMs);
     timer.unref?.();
-    if (process.platform === "win32") {
-      execFile3("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (err) => {
-        if (!err) return;
-        try {
-          child.kill();
-        } catch {
-        }
-      });
-      return;
-    }
-    try {
-      process.kill(-pid, "SIGTERM");
-    } catch {
+    execFile3("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (err) => {
+      if (!err) return;
       try {
-        child.kill("SIGTERM");
+        child.kill();
       } catch {
       }
-    }
+    });
   });
 }
 function brokerSocketPath(dataDir, tag) {
   return process.platform === "win32" ? `\\\\.\\pipe\\openmausbot-perm-${process.pid}-${tag}` : join10(dataDir, `perm-${tag}.sock`);
 }
-var WINDOWS_SAFE_COMMAND_LINE_CHARS;
+var WINDOWS_SAFE_COMMAND_LINE_CHARS, cliGroups, stopping;
 var init_procs = __esm({
   "server/procs.ts"() {
     "use strict";
     init_env_path();
     WINDOWS_SAFE_COMMAND_LINE_CHARS = 3e4;
+    cliGroups = /* @__PURE__ */ new WeakSet();
+    stopping = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -18888,19 +18940,19 @@ function runNpm(args, env, cwd, timeoutMs) {
     let timedOut = false;
     const timer = setTimeout(() => {
       timedOut = true;
-      void killCliTree(child);
+      void killCliTree(child).then((stopped) => {
+        rejectRun(new Error(stopped ? "The install took too long and was stopped. Check the server's network connection and try again." : "The install took too long, but npm could not be confirmed stopped. Ask the server administrator to stop the install process before trying again."));
+      });
     }, timeoutMs);
     timer.unref();
     child.once("error", (error51) => {
+      if (timedOut) return;
       clearTimeout(timer);
       rejectRun(new Error(error51.code === "ENOENT" ? "npm is not installed on this server. Install Node.js with npm for the user running OpenMausBot, then try again." : "npm could not start on this server. Check that Node.js is installed for the user running OpenMausBot."));
     });
     child.once("close", (code) => {
       clearTimeout(timer);
-      if (timedOut) {
-        rejectRun(new Error("The install took too long and was stopped. Check the server's network connection and try again."));
-        return;
-      }
+      if (timedOut) return;
       resolveRun({ code, output });
     });
   });
@@ -19515,6 +19567,7 @@ var init_container_computer = __esm({
 // shared/approval-mode.ts
 function supportsApprovalMode(driverKind, mode) {
   if (mode === "custom") return driverKind === "codex";
+  if (mode === "edits") return ["claudeAgent", "grokAgent", "antigravityAgent"].includes(driverKind ?? "");
   if (mode !== "full") return true;
   return ["codex", "claudeAgent", "antigravityAgent", "cursorAgent", "grokAgent", "opencodeGo"].includes(driverKind ?? "");
 }
@@ -19530,9 +19583,9 @@ function isSecretName(name) {
   if (SECRET_KEY_PARTS.some((part) => lower.includes(part))) return true;
   return /(^|[_.-])keys?$/.test(lower);
 }
-function redactSecretsInText(text3) {
-  if (!text3 || text3.length < 8) return text3;
-  let out = text3;
+function redactSecretsInText(text4) {
+  if (!text4 || text4.length < 8) return text4;
+  let out = text4;
   out = out.replace(PEM_BLOCK, (_m, open2, body, close) => `${open2}
 ${mask(body.trim())}
 ${close}`);
@@ -19643,8 +19696,8 @@ function askInputSummary(input) {
   if (typeof fields.question === "string") return cut(fields.question, QUESTION_LIMIT);
   if (typeof fields.command === "string") return cut(fields.command, LIMIT);
   if (typeof fields.url === "string") return cut(fields.url, LIMIT);
-  const text3 = JSON.stringify(fields);
-  return text3 === "{}" ? void 0 : cut(text3, LIMIT);
+  const text4 = JSON.stringify(fields);
+  return text4 === "{}" ? void 0 : cut(text4, LIMIT);
 }
 var QUESTION_LIMIT, LIMIT, cut;
 var init_tool_summary = __esm({
@@ -19653,7 +19706,7 @@ var init_tool_summary = __esm({
     init_redact();
     QUESTION_LIMIT = 300;
     LIMIT = 200;
-    cut = (text3, limit) => redactSecretsInText(text3).trim().slice(0, limit);
+    cut = (text4, limit) => redactSecretsInText(text4).trim().slice(0, limit);
   }
 });
 
@@ -19676,11 +19729,11 @@ function sanitizeToolLogValue(value, budget, depth = 0) {
   if (typeof value === "string") {
     if (/^data:image\//iu.test(value) || budget.text <= 0) return void 0;
     const limit = Math.min(TOOL_LOG_TEXT_LIMIT, budget.text);
-    const text3 = value.length <= limit ? value : `[Earlier output truncated]
+    const text4 = value.length <= limit ? value : `[Earlier output truncated]
 
 ${value.slice(-limit)}`;
-    budget.text -= text3.length;
-    return text3;
+    budget.text -= text4.length;
+    return text4;
   }
   if (Array.isArray(value)) {
     return value.flatMap((entry) => {
@@ -19712,6 +19765,20 @@ function decodeAcpConfig(defaultCli) {
     };
   };
 }
+function sessionOperationKey(toolCall) {
+  const rawInput = toolCall?.rawInput;
+  const command = typeof rawInput?.command === "string" ? rawInput.command : void 0;
+  const hasInput = rawInput && typeof rawInput === "object" && Object.keys(rawInput).length > 0;
+  if (!command && !hasInput) return null;
+  const stable = (value) => Array.isArray(value) ? value.map(stable) : value && typeof value === "object" ? Object.fromEntries(Object.keys(value).sort().map((key) => [key, stable(value[key])])) : value;
+  return JSON.stringify(stable({
+    kind: toolCall?.kind,
+    title: toolCall?.title,
+    command,
+    input: rawInput,
+    locations: toolCall?.locations
+  }));
+}
 function createAcpDriver(support11) {
   const DRIVER_KIND8 = support11.driverKind;
   const SOURCE = support11.nativeSource;
@@ -19755,6 +19822,7 @@ function createAcpDriver(support11) {
       if (support11.resolveModelsOnCreate !== false) await refreshModels();
       const listeners = /* @__PURE__ */ new Set();
       const active = /* @__PURE__ */ new Map();
+      const sessionAllows = /* @__PURE__ */ new Map();
       const emit = (event) => {
         for (const listener of listeners) listener(event);
       };
@@ -19972,10 +20040,10 @@ function createAcpDriver(support11) {
           }
         };
         const flushAssistantText = () => {
-          const text3 = state.text;
+          const text4 = state.text;
           state.text = "";
-          if (!text3.trim()) return;
-          emit({ ...base2(threadId, turnId), type: "item.completed", itemType: "assistant_text", text: text3 });
+          if (!text4.trim()) return;
+          emit({ ...base2(threadId, turnId), type: "item.completed", itemType: "assistant_text", text: text4 });
         };
         const settle = (ok, stopReason) => {
           if (state.settled) return;
@@ -20004,6 +20072,7 @@ function createAcpDriver(support11) {
           flushAssistantText();
           const options = Array.isArray(params.options) ? params.options : [];
           const optionFor = (want) => options.find((o) => o.kind === `${want}_once` && typeof o.optionId === "string")?.optionId ?? options.find((o) => String(o.kind ?? "").startsWith(want) && typeof o.optionId === "string")?.optionId ?? null;
+          const optionAlways = options.find((o) => o.kind === "allow_always" && typeof o.optionId === "string")?.optionId ?? null;
           const cancelled = { outcome: { outcome: "cancelled" } };
           const missing = (want) => emit({
             ...base2(threadId, turnId),
@@ -20022,15 +20091,28 @@ function createAcpDriver(support11) {
             });
           }
           const kind = String(toolCall.kind ?? "");
+          const operationKey = isQuestion || controlsHost ? null : sessionOperationKey(toolCall);
+          if (operationKey && sessionAllows.get(threadId)?.has(operationKey)) {
+            const allow = optionFor("allow");
+            if (allow) {
+              return send({ jsonrpc: "2.0", id: msg.id, result: { outcome: { outcome: "selected", optionId: allow } } });
+            }
+          }
           const tool = kind === "execute" ? "shell" : kind === "edit" ? "edit" : kind || "tool";
           const summary = String(toolCall.rawInput?.command ?? toolCall.title ?? tool).slice(0, 200);
           const requestId = newId();
-          const finish = (behavior, source = "user", message2) => {
+          const finish = (behavior, source = "user", message2, always) => {
             if (!asks.delete(requestId)) return;
             clearTimeout(timer);
             const want = behavior === "allow" ? "allow" : "reject";
+            const forSession = want === "allow" && always === true && !isQuestion && !controlsHost;
             const named = isQuestion && behavior === "answer" ? options.filter((option) => option.optionId === message2 || option.name?.trim() === message2) : [];
-            const optionId = behavior === "cancel" ? null : isQuestion ? named.length === 1 && typeof named[0].optionId === "string" ? named[0].optionId : null : optionFor(want);
+            const optionId = behavior === "cancel" ? null : isQuestion ? named.length === 1 && typeof named[0].optionId === "string" ? named[0].optionId : null : forSession ? optionAlways ?? optionFor("allow") : optionFor(want);
+            if (forSession && !optionAlways && optionId && operationKey) {
+              const remembered = sessionAllows.get(threadId) ?? /* @__PURE__ */ new Set();
+              remembered.add(operationKey);
+              sessionAllows.set(threadId, remembered);
+            }
             if (behavior !== "cancel" && !optionId) missing(isQuestion ? "matching answer" : want);
             send({
               jsonrpc: "2.0",
@@ -20060,7 +20142,9 @@ function createAcpDriver(support11) {
             tool,
             summary,
             choices: isQuestion ? options.flatMap((option) => typeof option.name === "string" && option.name.trim() ? [option.name.trim()] : []) : void 0,
-            approvalScope: controlsHost ? "local-computer" : void 0
+            approvalScope: controlsHost ? "local-computer" : void 0,
+            // the driver can honor a session-wide allow either way
+            allowSession: !isQuestion && !controlsHost ? true : void 0
           });
         };
         const handleNotification = (msg) => {
@@ -20215,13 +20299,14 @@ function createAcpDriver(support11) {
               }
             }
             const images = turn.images ?? [];
-            const runtimeAcceptsImages = init?.agentCapabilities?.promptCapabilities?.image === true;
+            const runtimeAcceptsImages = init?.agentCapabilities?.promptCapabilities?.image === true || support11.acceptsUnadvertisedImages?.(init) === true;
             if (images.length && support11.images === true && !runtimeAcceptsImages) {
               throw new Error(
                 `${support11.displayName} is configured for image attachments, but this installed runtime does not advertise ACP image input. Update the ${support11.displayName} CLI or send the message without an image.`
               );
             }
             const cursor3 = typeof turn.resumeCursor === "string" ? turn.resumeCursor : null;
+            if (!cursor3) sessionAllows.delete(threadId);
             let sessionResult = null;
             if (cursor3) {
               try {
@@ -20287,13 +20372,13 @@ function createAcpDriver(support11) {
             }
             emitSessionStarted();
             state.promptSent = true;
-            const text3 = support11.buildPromptText ? support11.buildPromptText(turn) : turn.system ? `${turn.system}
+            const text4 = support11.buildPromptText ? support11.buildPromptText(turn) : turn.system ? `${turn.system}
 
 ${turn.text}` : turn.text;
             const imageBlocks = support11.images === true && runtimeAcceptsImages ? await readAcpImageBlocks(images) : [];
             const result = await request("session/prompt", {
               sessionId,
-              prompt: [{ type: "text", text: text3 }, ...imageBlocks]
+              prompt: [{ type: "text", text: text4 }, ...imageBlocks]
             });
             const usage = result?.usage ?? result?._meta ?? {};
             if (typeof usage.inputTokens === "number" || typeof usage.outputTokens === "number") {
@@ -20380,7 +20465,7 @@ ${turn.text}` : turn.text;
             const turn = active.get(threadId);
             const finish = turn?.asks.get(requestId);
             if (!finish) return "unavailable";
-            finish(decision.behavior, "user", decision.message);
+            finish(decision.behavior, "user", decision.message, decision.always === true);
             return decision.behavior === "allow" ? "allowed-once" : decision.behavior === "answer" ? "answered" : "rejected";
           },
           hasSession: (threadId) => active.has(threadId),
@@ -20715,6 +20800,7 @@ var init_antigravity_acp = __esm({
       startupDiagnosticBytes = 0;
       nativeStartupHint;
       closed = false;
+      stopping;
       onAuthorizationUrl;
       /** Settles once the runtime process is gone. On Windows a running
        * executable pins its file and its directory, so an installer must not
@@ -20839,10 +20925,10 @@ var init_antigravity_acp = __esm({
         if (this.closed) return;
         this.closed = true;
         this.failAll(new Error("Antigravity ACP was closed."));
-        killCliTree(this.child);
+        this.stopping = killCliTree(this.child);
       }
-      /** Close, then wait (bounded) for the process to be gone. */
-      async closeAndWait(timeoutMs = 5e3) {
+      /** Allow the shared 5s TERM grace and 1s force-stop verification to finish. */
+      async closeAndWait(timeoutMs = 7e3) {
         this.close();
         let timer;
         const timedOut = new Promise((resolve13) => {
@@ -20850,7 +20936,7 @@ var init_antigravity_acp = __esm({
           timer.unref?.();
         });
         try {
-          return await Promise.race([this.exited.then(() => true), timedOut]);
+          return await Promise.race([this.stopping, timedOut]);
         } finally {
           clearTimeout(timer);
         }
@@ -21373,8 +21459,9 @@ var init_antigravity_runtime = __esm({
 });
 
 // server/drivers/antigravity.ts
-function antigravityPermissionMode(fullAuto) {
-  return fullAuto ? "yolo" : "default";
+function antigravityPermissionMode(fullAuto, approvalMode) {
+  if (fullAuto) return "yolo";
+  return approvalMode === "edits" ? "auto_edit" : "default";
 }
 var STATIC_ANTIGRAVITY_MODELS, managedAsset, support, AcpAntigravityDriver, AntigravityDriver;
 var init_antigravity = __esm({
@@ -21458,8 +21545,8 @@ var init_antigravity = __esm({
           return { state: "unavailable", reason: error51 instanceof Error ? error51.message : String(error51) };
         }
       },
-      configureSession: async ({ request, sessionId, config: config2 }) => {
-        const wanted = antigravityPermissionMode(config2.fullAuto);
+      configureSession: async ({ request, sessionId, config: config2, turn }) => {
+        const wanted = antigravityPermissionMode(config2.fullAuto, turn.approvalMode);
         const result = await request("session/set_config_option", {
           sessionId,
           configId: "mode",
@@ -21619,14 +21706,14 @@ var init_boxagent = __esm({
             let lastText = "";
             let pendingText = "";
             const flushAssistantText = () => {
-              const text3 = pendingText;
+              const text4 = pendingText;
               pendingText = "";
-              if (!text3.trim()) return;
-              emit({ ...base2(threadId, turnId), type: "item.completed", itemType: "assistant_text", text: text3 });
+              if (!text4.trim()) return;
+              emit({ ...base2(threadId, turnId), type: "item.completed", itemType: "assistant_text", text: text4 });
             };
-            const ingest = (text3) => {
-              const delta = text3.startsWith(lastText) ? text3.slice(lastText.length) : text3;
-              lastText = text3;
+            const ingest = (text4) => {
+              const delta = text4.startsWith(lastText) ? text4.slice(lastText.length) : text4;
+              lastText = text4;
               if (!delta) return;
               pendingText += delta;
               emit({ ...base2(threadId, turnId), type: "content.delta", streamKind: "assistant_text", delta });
@@ -21643,9 +21730,9 @@ var init_boxagent = __esm({
                   seen.add(id);
                   appendNative(threadId, { dir: "in", source: "box.events", msg: ev });
                   const kind = String(ev.type ?? ev.kind ?? "");
-                  const text3 = ev.text ?? ev.message ?? ev.data?.text ?? ev.data?.content ?? null;
-                  if (/assistant|message|output|response/i.test(kind) && typeof text3 === "string" && text3.trim()) {
-                    ingest(text3);
+                  const text4 = ev.text ?? ev.message ?? ev.data?.text ?? ev.data?.content ?? null;
+                  if (/assistant|message|output|response/i.test(kind) && typeof text4 === "string" && text4.trim()) {
+                    ingest(text4);
                   } else if (/tool|command|exec|browse/i.test(kind)) {
                     flushAssistantText();
                     emit({
@@ -22185,25 +22272,36 @@ 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 text3 = messageOf(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(text3)) return { transient: true, reason };
+      if (pattern.test(text4)) return { transient: true, reason };
     }
     for (const { pattern, reason } of TERMINAL_PATTERNS) {
-      if (pattern.test(text3)) return { transient: false, reason };
+      if (pattern.test(text4)) return { transient: false, reason };
     }
     return { transient: false, reason: "terminal_exit" };
   }
   for (const { pattern, reason } of TERMINAL_PATTERNS) {
-    if (pattern.test(text3)) return { transient: false, reason };
+    if (pattern.test(text4)) return { transient: false, reason };
   }
   for (const { pattern, reason } of TRANSIENT_PATTERNS) {
-    if (pattern.test(text3)) return { transient: true, reason };
+    if (pattern.test(text4)) return { transient: true, reason };
   }
   return { transient: false, reason: "unknown" };
 }
@@ -22234,6 +22332,7 @@ var RETRY_MAX_ATTEMPTS, BACKOFF_BASE_MS, TRANSIENT_PATTERNS, TERMINAL_PATTERNS,
 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 = [
@@ -22268,6 +22367,82 @@ var init_retry = __esm({
   }
 });
 
+// shared/ask-question.ts
+function text3(value, limit) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed ? trimmed.slice(0, limit) : void 0;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseOption(value) {
+  if (typeof value === "string") {
+    const label2 = text3(value, MAX_LABEL);
+    return label2 ? { label: label2 } : null;
+  }
+  if (!isRecord(value)) return null;
+  const label = text3(value.label, MAX_LABEL);
+  if (!label) return null;
+  const description = text3(value.description, MAX_DESCRIPTION);
+  return description ? { label, description } : { label };
+}
+function parseQuestion(value) {
+  if (!isRecord(value)) return null;
+  const question = text3(value.question, MAX_QUESTION_TEXT);
+  if (!question) return null;
+  const options = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of Array.isArray(value.options) ? value.options : []) {
+    const option = parseOption(raw);
+    if (!option || seen.has(option.label)) continue;
+    seen.add(option.label);
+    options.push(option);
+    if (options.length === MAX_OPTIONS) break;
+  }
+  const header = text3(value.header, MAX_LABEL);
+  return {
+    question,
+    ...header ? { header } : {},
+    ...value.multiSelect === true ? { multiSelect: true } : {},
+    options
+  };
+}
+function parseAskQuestions(input) {
+  if (!isRecord(input) || !Array.isArray(input.questions)) return null;
+  const questions = [];
+  for (const raw of input.questions) {
+    const question = parseQuestion(raw);
+    if (!question) continue;
+    questions.push(question);
+    if (questions.length === MAX_QUESTIONS) break;
+  }
+  return questions.length ? questions : null;
+}
+function askQuestionSummary(questions) {
+  const first = questions[0]?.question ?? "";
+  const rest = questions.length - 1;
+  return rest > 0 ? `${first} (+${rest} more question${rest > 1 ? "s" : ""})` : first;
+}
+function questionChoices(questions) {
+  if (questions.length !== 1) return void 0;
+  const only = questions[0];
+  if (only.multiSelect || only.options.length < 2) return void 0;
+  return only.options.map((option) => option.label);
+}
+var ASK_USER_QUESTION_TOOL, MAX_QUESTIONS, MAX_OPTIONS, MAX_QUESTION_TEXT, MAX_LABEL, MAX_DESCRIPTION;
+var init_ask_question = __esm({
+  "shared/ask-question.ts"() {
+    "use strict";
+    ASK_USER_QUESTION_TOOL = "AskUserQuestion";
+    MAX_QUESTIONS = 6;
+    MAX_OPTIONS = 12;
+    MAX_QUESTION_TEXT = 400;
+    MAX_LABEL = 120;
+    MAX_DESCRIPTION = 400;
+  }
+});
+
 // server/drivers/claude.ts
 import { createHash as createHash5, randomBytes as randomBytes2 } from "node:crypto";
 import { chmodSync as chmodSync4, mkdtempSync as mkdtempSync2, readFileSync as readFileSync8, rmSync as rmSync4, unlinkSync as unlinkSync3, writeFileSync as writeFileSync6 } from "node:fs";
@@ -22308,9 +22483,9 @@ function resolveClaudeConfigDir(configDir, env = process.env) {
   }
   return normalize(expanded);
 }
-function claudeAuthFailure(frame, text3) {
+function claudeAuthFailure(frame, text4) {
   if (frame.is_api_error_message !== true && typeof frame.error !== "string") return false;
-  return frame.error === "authentication_failed" || classifyError({ text: text3 }).reason === "auth";
+  return frame.error === "authentication_failed" || classifyError({ text: text4 }).reason === "auth";
 }
 function claudeEnvironment(model, source = process.env, configDir, instanceEnvironment = {}) {
   const env = { ...source, PATH: augmentedPath(), NPM_CONFIG_LOGLEVEL: "error" };
@@ -22334,6 +22509,24 @@ function claudeEnvironment(model, source = process.env, configDir, instanceEnvir
 function inheritsUserConfig(env) {
   return env.OMB_CLAUDE_INHERIT_USER_CONFIG === "1";
 }
+function readClaudeAuthSettings(env, instanceEnvironment = {}) {
+  if (CLAUDE_ACCOUNT_ENV_KEYS.some((key) => instanceEnvironment[key])) return {};
+  try {
+    const settings2 = JSON.parse(readFileSync8(join20(resolveClaudeConfigDir(void 0, env), "settings.json"), "utf8"));
+    const authEnv = {};
+    for (const key of CLAUDE_ACCOUNT_ENV_KEYS) {
+      if (!key.endsWith("_FILE_DESCRIPTOR") && typeof settings2?.env?.[key] === "string") {
+        authEnv[key] = settings2.env[key];
+      }
+    }
+    return {
+      ...Object.keys(authEnv).length ? { env: authEnv } : {},
+      ...typeof settings2?.apiKeyHelper === "string" && settings2.apiKeyHelper.trim() ? { apiKeyHelper: settings2.apiKeyHelper } : {}
+    };
+  } catch {
+    return {};
+  }
+}
 function projectMcpServers(cwd) {
   let parsed;
   try {
@@ -22438,7 +22631,12 @@ function removePrivateTempDir(filePath) {
 function systemEndedReply(kind) {
   return kind === "question" ? { behavior: "answer", message: "OpenMausBot: the turn is ending \u2014 wrap up." } : { behavior: "deny", message: "OpenMausBot: the turn ended" };
 }
+function askQuestions(ask) {
+  return ask.tool === ASK_USER_QUESTION_TOOL ? parseAskQuestions(ask.input) : null;
+}
 function askSummary(ask) {
+  const questions = askQuestions(ask);
+  if (questions) return askQuestionSummary(questions).slice(0, 300);
   return askInputSummary(ask.input) ?? ask.tool ?? "tool";
 }
 function permissionSocketPath(threadId) {
@@ -22505,11 +22703,13 @@ async function createPermissionBroker(opts) {
           continue;
         }
         const ask = { id: askId, kind, tool: msg.tool ?? "tool", input: msg.input ?? {}, at: Date.now() };
-        const finish = (behavior, message2, source) => {
+        const finish = (behavior, message2, source, always) => {
           if (!pending.delete(askId)) return;
           clearTimeout(timer);
           try {
-            conn.write(JSON.stringify({ t: "answer", id: askId, behavior, message: message2 }) + "\n");
+            conn.write(
+              JSON.stringify({ t: "answer", id: askId, behavior, message: message2, source, ...always ? { always: true } : {} }) + "\n"
+            );
           } catch {
           }
           opts.onResolve({ ...ask, behavior, source });
@@ -22579,11 +22779,11 @@ async function createPermissionBroker(opts) {
     }
   };
   return {
-    answer(askId, behavior, message2) {
+    answer(askId, behavior, message2, always) {
       const p = pending.get(askId);
       if (!p) return false;
       if (p.ask.kind === "question" ? behavior !== "answer" : behavior === "answer") return false;
-      p.finish(behavior, message2, "user");
+      p.finish(behavior, message2, "user", always && behavior === "allow");
       return true;
     },
     pause() {
@@ -22648,19 +22848,19 @@ function firstText(content) {
   }
   return "";
 }
-function withVolatileNote(text3, volatile) {
+function withVolatileNote(text4, volatile) {
   const body = volatile.trim() ? `This part of your instructions changed since this session started. It replaces the earlier copy:
 
 ${volatile.trim()}` : "The notes that were in your instructions when this session started have been cleared.";
   const note = `<system-reminder>
 ${body}
 </system-reminder>`;
-  return text3 ? `${note}
+  return text4 ? `${note}
 
-${text3}` : note;
+${text4}` : note;
 }
-function claudeUserMessage(text3, images) {
-  if (!images?.length) return { type: "user", message: { role: "user", content: text3 } };
+function claudeUserMessage(text4, images) {
+  if (!images?.length) return { type: "user", message: { role: "user", content: text4 } };
   const content = images.map((image) => ({
     type: "image",
     source: {
@@ -22669,7 +22869,7 @@ function claudeUserMessage(text3, images) {
       data: readFileSync8(image.path).toString("base64")
     }
   }));
-  if (text3) content.push({ type: "text", text: text3 });
+  if (text4) content.push({ type: "text", text: text4 });
   return { type: "user", message: { role: "user", content } };
 }
 function diagnosticClaudeUserMessage(message2) {
@@ -22707,6 +22907,7 @@ var init_claude = __esm({
     init_local_inject();
     init_native();
     init_proxy_paths();
+    init_ask_question();
     CLAUDE_ACCOUNT_ENV_KEYS = [
       "CLAUDE_CODE_OAUTH_TOKEN",
       "CLAUDE_CODE_OAUTH_REFRESH_TOKEN",
@@ -22785,6 +22986,11 @@ var init_claude = __esm({
         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 stopSession = (session) => {
+          void killCliTree(session.child).then((stopped) => {
+            if (stopped) void session.finishClose?.();
+          });
+        };
         const closeSession = (threadId, why) => {
           const s = sessions.get(threadId);
           if (!s || s.closing) return;
@@ -22799,7 +23005,7 @@ var init_claude = __esm({
           } catch {
           }
           const kill = setTimeout(() => {
-            if (s.child.exitCode === null) killCliTree(s.child);
+            stopSession(s);
           }, 5e3);
           kill.unref?.();
         };
@@ -22842,7 +23048,7 @@ var init_claude = __esm({
         const sendTurn = async (turn) => {
           const { threadId } = turn;
           if (active.has(threadId)) throw new Error("a turn is already running on this thread");
-          const permissionMode = turn.approvalMode === void 0 ? config2.permissionMode : turn.approvalMode === "full" ? "bypassPermissions" : turn.approvalMode === "auto" ? "auto" : "default";
+          const permissionMode = turn.approvalMode === void 0 ? config2.permissionMode : turn.approvalMode === "full" ? "bypassPermissions" : turn.approvalMode === "auto" ? "auto" : turn.approvalMode === "edits" ? "acceptEdits" : "default";
           const controlsHost = turn.integrations?.localComputer?.scope === "local-computer";
           if (controlsHost && permissionMode === "bypassPermissions" && turn.approvalMode !== "full") {
             throw new Error("local computer control requires the interactive approval broker");
@@ -22966,9 +23172,12 @@ var init_claude = __esm({
             args.push("--allowedTools", allowed.join(","));
           }
           const env = environment(turnModel);
+          const authSettings = isolated && !injected.injected ? readClaudeAuthSettings(env, input.environment) : {};
+          const authSettingsPath = mcpConfigPath && Object.keys(authSettings).length ? join20(dirname9(mcpConfigPath), "auth-settings.json") : null;
+          if (authSettingsPath) args.push("--settings", authSettingsPath);
           env.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS = "1";
           const cwd = turn.cwd ?? homedir9();
-          const privateFileFlags = /* @__PURE__ */ new Set(["--mcp-config"]);
+          const privateFileFlags = /* @__PURE__ */ new Set(["--mcp-config", "--settings"]);
           const keyArgs = args.filter((a2, i2) => !privateFileFlags.has(a2) && !privateFileFlags.has(args[i2 - 1] ?? ""));
           const argsKey = JSON.stringify({
             args: keyArgs,
@@ -22979,7 +23188,12 @@ var init_claude = __esm({
             cwd,
             model: injected.model ?? null,
             base: env.ANTHROPIC_BASE_URL ?? null,
-            configDir: env.CLAUDE_CONFIG_DIR ?? null
+            configDir: env.CLAUDE_CONFIG_DIR ?? null,
+            // Rotating an account's key/helper must not reuse the old process.
+            auth: createHash5("sha256").update(JSON.stringify({
+              settings: authSettings,
+              env: Object.fromEntries(CLAUDE_ACCOUNT_ENV_KEYS.map((key) => [key, env[key]]))
+            })).digest("hex")
           });
           const live = sessions.get(threadId);
           if (live && !live.turn && !live.closing && live.child.exitCode === null && live.argsKey === argsKey && (!sessionId || sessionId === live.sessionId)) {
@@ -22987,7 +23201,7 @@ var init_claude = __esm({
             live.turn = { turnId, settled: false, sawStreamDelta: false };
             active.set(threadId, { stop: () => {
               closeSession(threadId, "interrupted");
-              killCliTree(live.child);
+              stopSession(live);
             }, turnId, broker: live.broker });
             emit({ ...base2(threadId, turnId), type: "turn.started" });
             const volatile = turn.systemVolatile ?? "";
@@ -23046,6 +23260,9 @@ var init_claude = __esm({
                 onAsk: (ask) => {
                   const eventTurnId = sessions.get(threadId)?.turn?.turnId ?? turnId;
                   askTools.set(ask.id, typeof ask.tool === "string" ? ask.tool : void 0);
+                  const nativeMode = sessions.get(threadId)?.nativePermissionMode ?? null;
+                  const nativeReview = permissionMode === "auto" && nativeMode !== null ? nativeMode === "auto" ? "active" : "inactive" : void 0;
+                  const questions = askQuestions(ask);
                   emit({
                     ...base2(threadId, eventTurnId),
                     type: "request.opened",
@@ -23053,8 +23270,15 @@ var init_claude = __esm({
                     requestType: ask.kind,
                     tool: ask.tool,
                     summary: askSummary(ask),
+                    nativeReview,
+                    // the proxy hands Claude its own suggested rules on `always`;
+                    // host control stays one action at a time
+                    allowSession: ask.kind === "permission" && !(controlsHost && typeof ask.tool === "string" && ask.tool.startsWith("mcp__computer")) ? true : void 0,
                     approvalScope: typeof ask.tool === "string" && controlsHost && ask.tool.startsWith("mcp__computer") ? "local-computer" : void 0,
-                    choices: Array.isArray(ask.input?.choices) ? ask.input.choices.slice(0, 5) : void 0
+                    questions: questions ?? void 0,
+                    // A structured ask still offers flat labels, for the phone
+                    // companions and any client that predates the question card.
+                    choices: questions ? questionChoices(questions) : Array.isArray(ask.input?.choices) ? ask.input.choices.slice(0, 5) : void 0
                   });
                 },
                 onResolve: (resolved) => {
@@ -23077,6 +23301,9 @@ var init_claude = __esm({
             if (mcpConfigPath) {
               writeFileSync6(mcpConfigPath, JSON.stringify({ mcpServers }), { mode: 384 });
             }
+            if (authSettingsPath) {
+              writeFileSync6(authSettingsPath, JSON.stringify(authSettings), { mode: 384 });
+            }
             if (sessionId) args.push("--resume", sessionId);
             else args.push("--session-id", newSessionId);
           } catch (error51) {
@@ -23103,6 +23330,7 @@ var init_claude = __esm({
             volatile: turn.systemVolatile ?? "",
             sessionId: sessionId ?? newSessionId,
             sawInit: false,
+            nativePermissionMode: null,
             turn: { turnId, settled: false, sawStreamDelta: false },
             idleTimer: null,
             closing: false,
@@ -23132,6 +23360,7 @@ var init_claude = __esm({
           };
           const currentTurnId = () => session.turn?.turnId ?? turnId;
           const handleLine = (line) => {
+            if (session.closing) return;
             let o;
             try {
               o = JSON.parse(line);
@@ -23143,6 +23372,7 @@ var init_claude = __esm({
               case "system":
                 if (o.subtype === "init") {
                   session.sawInit = true;
+                  session.nativePermissionMode = typeof o.permissionMode === "string" ? o.permissionMode : null;
                   if (typeof o.session_id === "string") session.sessionId = o.session_id;
                   emit({ ...base2(threadId, currentTurnId()), type: "session.started", sessionId: o.session_id, model: o.model });
                 } else if (o.subtype === "thinking_tokens") {
@@ -23164,18 +23394,18 @@ var init_claude = __esm({
               }
               case "assistant": {
                 const msg = o.message ?? {};
-                const text3 = firstText(msg.content);
-                if (claudeAuthFailure(o, text3)) {
+                const text4 = firstText(msg.content);
+                if (claudeAuthFailure(o, text4)) {
                   if (session.turn) session.turn.authFailed = true;
-                  emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", message: text3, setup: true });
+                  emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", message: text4, setup: true });
                   break;
                 }
-                if (text3.trim()) {
+                if (text4.trim()) {
                   if (!session.turn?.sawStreamDelta) {
-                    emit({ ...base2(threadId, currentTurnId()), type: "content.delta", streamKind: "assistant_text", delta: text3 });
+                    emit({ ...base2(threadId, currentTurnId()), type: "content.delta", streamKind: "assistant_text", delta: text4 });
                   }
                   if (session.turn) session.turn.sawStreamDelta = false;
-                  emit({ ...base2(threadId, currentTurnId()), type: "item.completed", itemType: "assistant_text", text: text3 });
+                  emit({ ...base2(threadId, currentTurnId()), type: "item.completed", itemType: "assistant_text", text: text4 });
                 }
                 for (const b of Array.isArray(msg.content) ? msg.content : []) {
                   if (b.type === "tool_use") {
@@ -23241,7 +23471,17 @@ var init_claude = __esm({
             emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", ...describeSpawnFailure(e, config2.cli) });
             settle(false, "spawn_error");
           });
-          child.on("close", (code) => {
+          let closeFinalized = false;
+          const finalizeClose = async (code) => {
+            if (closeFinalized) return;
+            if (!await killCliTree(child, 0)) {
+              session.broker?.close();
+              session.broker = void 0;
+              emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", message: "Claude could not be confirmed stopped; its helper processes may still be running." });
+              return;
+            }
+            if (closeFinalized) return;
+            closeFinalized = true;
             if (session.turn && !session.turn.settled) {
               const message2 = `claude exited ${code} before result${session.stderr ? `: ${session.stderr.trim().slice(-300)}` : ""}`;
               const verdict = classifyError({ exitCode: code, stderr: message2 });
@@ -23377,12 +23617,16 @@ var init_claude = __esm({
             }
             removePrivateTempDir(session.systemPromptPath);
             if (sessions.get(threadId) === session) sessions.delete(threadId);
+          };
+          child.on("close", (code) => {
+            session.finishClose = () => finalizeClose(code);
+            void session.finishClose();
           });
           const stop = () => {
             closeSession(threadId, "interrupted");
             retry.cancelled = true;
             retryAbort.abort();
-            killCliTree(child);
+            stopSession(session);
           };
           active.set(threadId, { stop, turnId, broker });
           emit({ ...base2(threadId, turnId), type: "turn.started" });
@@ -23392,10 +23636,10 @@ var init_claude = __esm({
           }
           return { turnId };
         };
-        const steer = async (threadId, text3) => {
+        const steer = async (threadId, text4) => {
           const s = sessions.get(threadId);
           if (!s || !s.turn || s.turn.settled || s.closing || s.child.exitCode !== null) return false;
-          return writeUser(s, threadId, claudeUserMessage(text3, void 0));
+          return writeUser(s, threadId, claudeUserMessage(text4, void 0));
         };
         const login = new ClaudeLoginController({ cli: config2.cli, environment, onAuthenticated: async () => {
           await refreshModels();
@@ -23508,7 +23752,7 @@ var init_claude = __esm({
               const broker = sessions.get(threadId)?.broker ?? active.get(threadId)?.broker;
               if (!broker) return "unavailable";
               const behavior = decision.behavior === "answer" ? "answer" : decision.behavior;
-              if (!broker.answer(requestId, behavior, decision.message)) return "unavailable";
+              if (!broker.answer(requestId, behavior, decision.message, decision.always)) return "unavailable";
               return behavior === "allow" ? "allowed-once" : behavior === "answer" ? "answered" : "rejected";
             },
             hasSession: (threadId) => active.has(threadId),
@@ -23673,7 +23917,7 @@ function unquote(raw) {
   }
   return value;
 }
-function parseCodexToml(text3) {
+function parseCodexToml(text4) {
   const result = { providers: [] };
   const byId = /* @__PURE__ */ new Map();
   let section = "root";
@@ -23686,7 +23930,7 @@ function parseCodexToml(text3) {
     }
     return provider;
   };
-  for (const line of text3.split(/\r?\n/)) {
+  for (const line of text4.split(/\r?\n/)) {
     const stripped = line.trim();
     if (!stripped || stripped.startsWith("#")) continue;
     if (stripped.startsWith("[") && stripped.endsWith("]")) {
@@ -24768,6 +25012,7 @@ var init_codex = __esm({
             const earlyNotifications = [];
             const state = {
               settled: false,
+              lastError: "",
               lastText: "",
               sawStreamDelta: false,
               // codex reports token usage as a running THREAD total; the harness
@@ -24820,11 +25065,17 @@ var init_codex = __esm({
               });
               send({ jsonrpc: "2.0", id, method, params });
             });
-            let stopping;
-            const terminate = () => stopping ??= killCliTree(child);
-            const stop = () => {
+            let stopping2;
+            const terminate = () => stopping2 ??= killCliTree(child).then((stopped) => {
+              if (!stopped) stopping2 = void 0;
+              return stopped;
+            });
+            let completeStoppedTurn;
+            const stop = async () => {
               stopRequested = true;
-              return terminate();
+              const stopped = await terminate();
+              if (stopped) completeStoppedTurn?.();
+              return stopped;
             };
             const settle = async (ok, stopReason) => {
               if (state.settled) return;
@@ -24837,12 +25088,9 @@ var init_codex = __esm({
                 active.delete(threadId);
                 emit({ ...base2(threadId, turnId), type: "turn.completed", ok, stopReason, cost: null, ...state.usage ? { usage: state.usage } : {} });
               };
-              if (await stop()) {
-                complete();
-              } else {
+              completeStoppedTurn = complete;
+              if (!await stop()) {
                 emit({ ...base2(threadId, turnId), type: "runtime.error", message: "codex did not shut down after termination was requested" });
-                if (child.exitCode !== null || child.signalCode !== null) complete();
-                else child.once("close", complete);
               }
             };
             const controlsHost = turn.integrations?.localComputer?.scope === "local-computer";
@@ -25026,13 +25274,26 @@ var init_codex = __esm({
                 }
                 case "turn/completed": {
                   const t2 = p.turn ?? {};
-                  void settle(t2.status === "completed", t2.status === "completed" ? null : t2.error?.message ?? t2.status ?? "failed");
+                  const message2 = typeof t2.error?.message === "string" ? t2.error.message.slice(0, 400) : "";
+                  if (t2.status !== "completed" && message2 && message2 !== state.lastError) {
+                    state.lastError = message2;
+                    emit({
+                      ...base2(threadId, turnId),
+                      type: "runtime.error",
+                      message: message2,
+                      ...classifyError({ text: message2 }).reason === "auth" ? { setup: true } : {}
+                    });
+                  }
+                  void settle(t2.status === "completed", t2.status === "completed" ? null : classifyError({ text: message2 || state.lastError }).reason === "provider_safety" ? "provider_safety" : message2 || t2.status || "failed");
                   break;
                 }
                 case "error":
                   {
                     const message2 = p.message ?? p.error?.message;
-                    if (message2) emit({ ...base2(threadId, turnId), type: "runtime.error", message: String(message2).slice(0, 400) });
+                    if (message2) {
+                      state.lastError = String(message2).slice(0, 400);
+                      emit({ ...base2(threadId, turnId), type: "runtime.error", message: state.lastError });
+                    }
                   }
                   break;
               }
@@ -25081,6 +25342,10 @@ var init_codex = __esm({
             });
             child.on("close", (code) => {
               if (abandoned) return;
+              if (state.settled) {
+                void stop();
+                return;
+              }
               if (!state.settled) {
                 emit({
                   ...base2(threadId, turnId),
@@ -25236,7 +25501,7 @@ var init_codex = __esm({
                   message: message2,
                   ...needsAuth ? { setup: true } : {}
                 });
-                await settle(false, needsAuth ? "auth_required" : "rpc_error");
+                await settle(false, needsAuth ? "auth_required" : verdict.reason === "provider_safety" ? "provider_safety" : "rpc_error");
               }
             }
           };
@@ -25373,7 +25638,7 @@ function createOpenAIChatRuntime(options) {
     if (!response.body) {
       throw new Error(options.noBodyError ?? `${options.httpErrorLabel} returned no response body`);
     }
-    let text3 = "";
+    let text4 = "";
     let reasoning = "";
     let usage = null;
     const reader = response.body.getReader();
@@ -25405,7 +25670,7 @@ function createOpenAIChatRuntime(options) {
             onDelta?.(reasoningDelta, "reasoning_text");
           }
           if (contentDelta) {
-            text3 += contentDelta;
+            text4 += contentDelta;
             onDelta?.(contentDelta, "assistant_text");
           }
           if (chunk.usage) usage = usageFrom(chunk.usage);
@@ -25415,7 +25680,7 @@ function createOpenAIChatRuntime(options) {
       await reader.cancel().catch(() => {
       });
     }
-    return { text: text3, reasoning, usage };
+    return { text: text4, reasoning, usage };
   };
   const messagesFor = (turn) => [
     ...turn.system ? [{ role: "system", content: turn.system }] : [],
@@ -25532,8 +25797,8 @@ function createOpenAIChatRuntime(options) {
     },
     generateText: async (prompt) => {
       const model = options.generateModel?.() ?? options.models().default;
-      const { text: text3, reasoning } = await complete([{ role: "user", content: prompt }], model, false);
-      return text3.trim() ? text3 : reasoning;
+      const { text: text4, reasoning } = await complete([{ role: "user", content: prompt }], model, false);
+      return text4.trim() ? text4 : reasoning;
     },
     dispose: async () => {
       for (const abort of active.values()) abort.abort();
@@ -25601,7 +25866,7 @@ var init_grok = __esm({
           nativeLog: {
             source: "xai.chat.completions",
             outgoing: (_turn, messages, model) => ({ model, messages }),
-            incoming: ({ text: text3, usage }) => ({ text: text3, usage })
+            incoming: ({ text: text4, usage }) => ({ text: text4, usage })
           }
         });
       }
@@ -25626,9 +25891,9 @@ function unquote2(raw) {
 }
 function readGrokModelCatalog(env = process.env) {
   const path3 = join25(grokHome(env), "config.toml");
-  let text3 = "";
+  let text4 = "";
   try {
-    text3 = readFileSync11(path3, "utf8");
+    text4 = readFileSync11(path3, "utf8");
   } catch {
     return STATIC_GROK_MODELS;
   }
@@ -25646,7 +25911,7 @@ function readGrokModelCatalog(env = process.env) {
     options.push({ id: current.slug, label: current.name || current.slug, custom: true });
     current = null;
   };
-  for (const line of text3.split(/\r?\n/)) {
+  for (const line of text4.split(/\r?\n/)) {
     const stripped = line.trim();
     if (stripped === "[models]") {
       flush();
@@ -25699,11 +25964,11 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
   const host = localHost(inject.host);
   if (!host) return modelId;
   const path3 = join25(grokHome(env), "config.toml");
-  let text3 = "";
+  let text4 = "";
   try {
-    text3 = readFileSync11(path3, "utf8");
+    text4 = readFileSync11(path3, "utf8");
   } catch {
-    text3 = "";
+    text4 = "";
   }
   const taken = new Set(STATIC_GROK_MODELS.options.map((option) => option.id));
   let current = null;
@@ -25716,7 +25981,7 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
     current = null;
   };
   let found = null;
-  for (const line of text3.split(/\r?\n/)) {
+  for (const line of text4.split(/\r?\n/)) {
     const stripped = line.trim();
     if (stripped.startsWith("[model.") && stripped.endsWith("]")) {
       flush();
@@ -25749,12 +26014,18 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
     `api_key = ${quoteToml(hostApiKey(host, env))}`,
     ""
   ].join("\n");
-  const next = text3 && !text3.endsWith("\n") ? `${text3}
+  const next = text4 && !text4.endsWith("\n") ? `${text4}
 
-${block2}` : `${text3}${text3 ? "\n" : ""}${block2}`;
+${block2}` : `${text4}${text4 ? "\n" : ""}${block2}`;
   writeFileSync7(path3, next);
   return slug;
 }
+function grokAcceptsUnadvertisedImages(init) {
+  const meta3 = init?._meta;
+  if (meta3?.grokShell !== true || typeof meta3.agentVersion !== "string") return false;
+  const version2 = /^1\.0\.(\d+)$/.exec(meta3.agentVersion);
+  return Boolean(version2 && Number(version2[1]) >= 25);
+}
 var STATIC_GROK_MODELS, SLUG, support2, GrokAgentDriver;
 var init_grok2 = __esm({
   "server/drivers/acp/grok.ts"() {
@@ -25772,7 +26043,8 @@ var init_grok2 = __esm({
     support2 = {
       driverKind: "grokAgent",
       displayName: "Grok",
-      images: false,
+      images: true,
+      acceptsUnadvertisedImages: grokAcceptsUnadvertisedImages,
       models: STATIC_GROK_MODELS,
       resolveModels: (env) => mergeLocalInject(readGrokModelCatalog(env), env),
       // Grok's accepted levels vary by model and the CLI validates lazily — a
@@ -25808,7 +26080,7 @@ var init_grok2 = __esm({
       // crates/codegen/xai-grok-pager-bin/src/main.rs:1259-1273.
       spawnArgs: (config2, turn) => [
         "--permission-mode",
-        config2.fullAuto ? "bypassPermissions" : turn.approvalMode === "auto" ? "auto" : "default",
+        config2.fullAuto ? "bypassPermissions" : turn.approvalMode === "auto" ? "auto" : turn.approvalMode === "edits" ? "acceptEdits" : "default",
         "agent",
         ...turn.model ? ["-m", turn.model] : [],
         // long form on purpose: `--effort` is documented as an alias, and an
@@ -25946,18 +26218,18 @@ function stripTomlLineComment(line) {
   }
   return line;
 }
-function takeTomlBasicEscape(text3, i2) {
-  const code = text3[i2 + 1];
+function takeTomlBasicEscape(text4, i2) {
+  const code = text4[i2 + 1];
   if (code === void 0) return { ok: false };
   if (code === "u") {
-    const hex3 = text3.slice(i2 + 2, i2 + 6);
+    const hex3 = text4.slice(i2 + 2, i2 + 6);
     if (!/^[0-9a-fA-F]{4}$/.test(hex3)) return { ok: false };
     const point = parseInt(hex3, 16);
     if (point >= 55296 && point <= 57343) return { ok: false };
     return { ok: true, value: String.fromCharCode(point), next: i2 + 6 };
   }
   if (code === "U") {
-    const hex3 = text3.slice(i2 + 2, i2 + 10);
+    const hex3 = text4.slice(i2 + 2, i2 + 10);
     if (!/^[0-9a-fA-F]{8}$/.test(hex3)) return { ok: false };
     const point = parseInt(hex3, 16);
     if (point > 1114111 || point >= 55296 && point <= 57343) return { ok: false };
@@ -26029,14 +26301,14 @@ function tomlRowKey(row) {
   const eq = row.indexOf("=");
   return unquoteTomlKey(eq < 0 ? row : row.slice(0, eq));
 }
-function tomlTables(text3) {
+function tomlTables(text4) {
   const headings = [];
   let mode = "out";
   let i2 = 0;
-  const atLineStart = (idx) => idx === 0 || text3[idx - 1] === "\n";
-  while (i2 < text3.length) {
+  const atLineStart = (idx) => idx === 0 || text4[idx - 1] === "\n";
+  while (i2 < text4.length) {
     if (mode === "mlbasic") {
-      if (text3.startsWith('"""', i2)) {
+      if (text4.startsWith('"""', i2)) {
         mode = "out";
         i2 += 3;
         continue;
@@ -26045,7 +26317,7 @@ function tomlTables(text3) {
       continue;
     }
     if (mode === "mllit") {
-      if (text3.startsWith("'''", i2)) {
+      if (text4.startsWith("'''", i2)) {
         mode = "out";
         i2 += 3;
         continue;
@@ -26054,61 +26326,61 @@ function tomlTables(text3) {
       continue;
     }
     if (mode === "basic") {
-      if (text3[i2] === "\n") {
+      if (text4[i2] === "\n") {
         mode = "out";
         i2 += 1;
         continue;
       }
-      if (text3[i2] === "\\") {
+      if (text4[i2] === "\\") {
         i2 += 2;
         continue;
       }
-      if (text3[i2] === '"') mode = "out";
+      if (text4[i2] === '"') mode = "out";
       i2 += 1;
       continue;
     }
     if (mode === "literal") {
-      if (text3[i2] === "\n") {
+      if (text4[i2] === "\n") {
         mode = "out";
         i2 += 1;
         continue;
       }
-      if (text3[i2] === "'") mode = "out";
+      if (text4[i2] === "'") mode = "out";
       i2 += 1;
       continue;
     }
-    if (text3.startsWith('"""', i2)) {
+    if (text4.startsWith('"""', i2)) {
       mode = "mlbasic";
       i2 += 3;
       continue;
     }
-    if (text3.startsWith("'''", i2)) {
+    if (text4.startsWith("'''", i2)) {
       mode = "mllit";
       i2 += 3;
       continue;
     }
-    if (text3[i2] === '"') {
+    if (text4[i2] === '"') {
       mode = "basic";
       i2 += 1;
       continue;
     }
-    if (text3[i2] === "'") {
+    if (text4[i2] === "'") {
       mode = "literal";
       i2 += 1;
       continue;
     }
-    if (text3[i2] === "#") {
-      const nl = text3.indexOf("\n", i2);
-      i2 = nl < 0 ? text3.length : nl + 1;
+    if (text4[i2] === "#") {
+      const nl = text4.indexOf("\n", i2);
+      i2 = nl < 0 ? text4.length : nl + 1;
       continue;
     }
     if (atLineStart(i2)) {
       let j = i2;
-      while (j < text3.length && (text3[j] === " " || text3[j] === "	")) j += 1;
-      if (text3[j] === "[") {
-        const nl = text3.indexOf("\n", j);
-        const lineEnd = nl < 0 ? text3.length : nl;
-        const raw = text3.slice(j, lineEnd).replace(/\r$/, "");
+      while (j < text4.length && (text4[j] === " " || text4[j] === "	")) j += 1;
+      if (text4[j] === "[") {
+        const nl = text4.indexOf("\n", j);
+        const lineEnd = nl < 0 ? text4.length : nl;
+        const raw = text4.slice(j, lineEnd).replace(/\r$/, "");
         const stripped = stripTomlLineComment(raw).trim();
         const array2 = stripped.startsWith("[[");
         const name = array2 ? canonicalizeTomlHeading(`[${stripped.replace(/^\s*\[\[/, "").replace(/\]\]\s*$/, "")}]`) : canonicalizeTomlHeading(raw);
@@ -26121,11 +26393,11 @@ function tomlTables(text3) {
   }
   return headings.map((heading, index) => ({
     heading,
-    end: index + 1 < headings.length ? headings[index + 1].lineStart : text3.length
+    end: index + 1 < headings.length ? headings[index + 1].lineStart : text4.length
   })).filter((entry) => entry.heading.patchable && entry.heading.name).map((entry) => ({
     name: entry.heading.name,
     headingStart: entry.heading.lineStart,
-    bodyStart: entry.heading.lineEnd + (text3[entry.heading.lineEnd] === "\n" ? 1 : 0),
+    bodyStart: entry.heading.lineEnd + (text4[entry.heading.lineEnd] === "\n" ? 1 : 0),
     end: entry.end
   }));
 }
@@ -26181,22 +26453,22 @@ function tomlKeys(block2) {
   take(block2.length);
   return keys;
 }
-function hasTomlTable(text3, heading) {
+function hasTomlTable(text4, heading) {
   const name = canonicalizeTomlHeading(heading);
-  return name !== null && tomlTables(text3).some((table) => table.name === name);
+  return name !== null && tomlTables(text4).some((table) => table.name === name);
 }
-function patchTomlTable(text3, heading, rows) {
+function patchTomlTable(text4, heading, rows) {
   const name = canonicalizeTomlHeading(heading);
-  if (!name) return text3;
-  const table = tomlTables(text3).find((entry) => entry.name === name);
-  if (!table) return text3;
-  const keys = tomlKeys(text3.slice(table.bodyStart, table.end));
+  if (!name) return text4;
+  const table = tomlTables(text4).find((entry) => entry.name === name);
+  if (!table) return text4;
+  const keys = tomlKeys(text4.slice(table.bodyStart, table.end));
   const missing = rows.filter((row) => !keys.has(tomlRowKey(row)));
-  if (!missing.length) return text3;
+  if (!missing.length) return text4;
   let insertAt = table.end;
-  while (insertAt > table.bodyStart && (text3[insertAt - 1] === "\n" || text3[insertAt - 1] === "\r")) insertAt -= 1;
-  const before = text3.slice(0, insertAt);
-  const after = text3.slice(insertAt);
+  while (insertAt > table.bodyStart && (text4[insertAt - 1] === "\n" || text4[insertAt - 1] === "\r")) insertAt -= 1;
+  const before = text4.slice(0, insertAt);
+  const after = text4.slice(insertAt);
   const pad = before.endsWith("\n") || before.length === 0 ? "" : "\n";
   return `${before}${pad}${missing.join("\n")}${after.startsWith("\n") ? "" : "\n"}${after}`;
 }
@@ -26209,17 +26481,17 @@ function ensureKimiInjectAlias(modelId, env = process.env) {
   const dataRoot = kimiDataRoot(env);
   mkdirSync10(dataRoot, { recursive: true });
   const path3 = join27(dataRoot, "config.toml");
-  let text3 = "";
+  let text4 = "";
   try {
-    text3 = readFileSync13(path3, "utf8");
+    text4 = readFileSync13(path3, "utf8");
   } catch {
-    text3 = "";
+    text4 = "";
   }
-  const original = text3;
+  const original = text4;
   const providerHeading = `[providers.${inject.host}]`;
   const modelHeading = `[models.${quoteTomlKey(alias)}]`;
   const blocks = [];
-  if (!hasTomlTable(text3, providerHeading)) {
+  if (!hasTomlTable(text4, providerHeading)) {
     blocks.push(
       [
         providerHeading,
@@ -26230,8 +26502,8 @@ function ensureKimiInjectAlias(modelId, env = process.env) {
       ].join("\n")
     );
   }
-  if (hasTomlTable(text3, modelHeading)) {
-    text3 = patchTomlTable(text3, modelHeading, [`protocol = "openai"`, `max_context_size = 262144`]);
+  if (hasTomlTable(text4, modelHeading)) {
+    text4 = patchTomlTable(text4, modelHeading, [`protocol = "openai"`, `max_context_size = 262144`]);
   } else {
     blocks.push(
       [
@@ -26245,13 +26517,13 @@ function ensureKimiInjectAlias(modelId, env = process.env) {
     );
   }
   if (blocks.length) {
-    const prefix = text3 && !text3.endsWith("\n") ? `${text3}
+    const prefix = text4 && !text4.endsWith("\n") ? `${text4}
 
-` : text3 ? `${text3}
+` : text4 ? `${text4}
 ` : "";
     writeFileSync8(path3, `${prefix}${blocks.join("\n")}`);
-  } else if (text3 !== original) {
-    writeFileSync8(path3, text3);
+  } else if (text4 !== original) {
+    writeFileSync8(path3, text4);
   }
   return alias;
 }
@@ -26271,9 +26543,9 @@ function stripKimiModelEnv(env) {
 }
 function readKimiModelCatalog(env) {
   const dataRoot = kimiDataRoot(env);
-  let text3 = "";
+  let text4 = "";
   try {
-    text3 = readFileSync13(join27(dataRoot, "config.toml"), "utf8");
+    text4 = readFileSync13(join27(dataRoot, "config.toml"), "utf8");
   } catch {
     return STATIC_KIMI_MODELS;
   }
@@ -26289,7 +26561,7 @@ function readKimiModelCatalog(env) {
     options.push({ id: current.slug, label: current.name || current.slug, custom: true });
     current = null;
   };
-  for (const line of text3.split(/\r?\n/)) {
+  for (const line of text4.split(/\r?\n/)) {
     const stripped = line.trim();
     if ((stripped.startsWith("[model.") || stripped.startsWith("[models.")) && stripped.endsWith("]")) {
       flush();
@@ -26582,8 +26854,8 @@ function resolveCursorAcpModelId(available, wanted) {
   }
   return null;
 }
-function firstJsonValue(text3) {
-  const trimmed = text3.trim();
+function firstJsonValue(text4) {
+  const trimmed = text4.trim();
   if (!trimmed) return null;
   try {
     return JSON.parse(trimmed);
@@ -26657,12 +26929,12 @@ function stripModelMarkers(label) {
   }
   return { label: cleaned, isDefault, isCurrent };
 }
-function decodeCursorModelText(text3) {
+function decodeCursorModelText(text4) {
   const options = [];
   const seen = /* @__PURE__ */ new Set();
   let markedDefault;
   let markedCurrent;
-  for (const raw of text3.split(/\r?\n/)) {
+  for (const raw of text4.split(/\r?\n/)) {
     const line = raw.trim();
     if (!line || line.startsWith("#") || /^available\s+models?\b/i.test(line) || /^models?\b/i.test(line)) continue;
     const stripped = line.replace(/^[\s*•-]+\s*/, "");
@@ -26715,8 +26987,8 @@ function decodeCursorAuthStatus(payload) {
   }
   return null;
 }
-function decodeCursorAuthText(text3) {
-  const normalized = text3.trim().toLowerCase();
+function decodeCursorAuthText(text4) {
+  const normalized = text4.trim().toLowerCase();
   if (!normalized) return null;
   if (/not (?:logged|signed) in|not authenticated|unauthenticated|logged out/.test(normalized)) return false;
   if (/login successful|logged in|signed in|authenticated/.test(normalized)) return true;
@@ -27136,7 +27408,7 @@ function qwenHome(env) {
   const home = process.platform === "win32" ? env.USERPROFILE || env.HOME || homedir19() : env.HOME || env.USERPROFILE || homedir19();
   return join30(home, ".qwen");
 }
-function isRecord(value) {
+function isRecord2(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function qwenModelLabel(id, name) {
@@ -27150,15 +27422,15 @@ function readQwenRoutes(env) {
   } catch {
     return [];
   }
-  if (!isRecord(settings2) || !isRecord(settings2.modelProviders)) return [];
+  if (!isRecord2(settings2) || !isRecord2(settings2.modelProviders)) return [];
   const routes = [];
   const seen = /* @__PURE__ */ new Set();
-  const mappings = isRecord(settings2.providerProtocol) ? settings2.providerProtocol : {};
+  const mappings = isRecord2(settings2.providerProtocol) ? settings2.providerProtocol : {};
   for (const [provider, rows] of Object.entries(settings2.modelProviders)) {
     const protocol = Object.hasOwn(mappings, provider) ? mappings[provider] : provider;
     if (typeof protocol !== "string" || !PROTOCOLS.has(protocol) || !Array.isArray(rows)) continue;
     for (const row of rows) {
-      if (!isRecord(row) || typeof row.id !== "string") continue;
+      if (!isRecord2(row) || typeof row.id !== "string") continue;
       const model = row.id;
       if (!model.trim()) continue;
       if (row.baseUrl !== void 0 && typeof row.baseUrl !== "string") continue;
@@ -28304,14 +28576,14 @@ var init_stringifyComment = __esm({
 });
 
 // node_modules/.pnpm/yaml@2.9.0/node_modules/yaml/browser/dist/stringify/foldFlowLines.js
-function foldFlowLines(text3, indent, mode = "flow", { indentAtStart, lineWidth = 80, minContentWidth = 20, onFold, onOverflow } = {}) {
+function foldFlowLines(text4, indent, mode = "flow", { indentAtStart, lineWidth = 80, minContentWidth = 20, onFold, onOverflow } = {}) {
   if (!lineWidth || lineWidth < 0)
-    return text3;
+    return text4;
   if (lineWidth < minContentWidth)
     minContentWidth = 0;
   const endStep = Math.max(1 + minContentWidth, 1 + lineWidth - indent.length);
-  if (text3.length <= endStep)
-    return text3;
+  if (text4.length <= endStep)
+    return text4;
   const folds = [];
   const escapedFolds = {};
   let end = lineWidth - indent.length;
@@ -28328,14 +28600,14 @@ function foldFlowLines(text3, indent, mode = "flow", { indentAtStart, lineWidth
   let escStart = -1;
   let escEnd = -1;
   if (mode === FOLD_BLOCK) {
-    i2 = consumeMoreIndentedLines(text3, i2, indent.length);
+    i2 = consumeMoreIndentedLines(text4, i2, indent.length);
     if (i2 !== -1)
       end = i2 + endStep;
   }
-  for (let ch; ch = text3[i2 += 1]; ) {
+  for (let ch; ch = text4[i2 += 1]; ) {
     if (mode === FOLD_QUOTED && ch === "\\") {
       escStart = i2;
-      switch (text3[i2 + 1]) {
+      switch (text4[i2 + 1]) {
         case "x":
           i2 += 3;
           break;
@@ -28352,12 +28624,12 @@ function foldFlowLines(text3, indent, mode = "flow", { indentAtStart, lineWidth
     }
     if (ch === "\n") {
       if (mode === FOLD_BLOCK)
-        i2 = consumeMoreIndentedLines(text3, i2, indent.length);
+        i2 = consumeMoreIndentedLines(text4, i2, indent.length);
       end = i2 + indent.length + endStep;
       split = void 0;
     } else {
       if (ch === " " && prev && prev !== " " && prev !== "\n" && prev !== "	") {
-        const next = text3[i2 + 1];
+        const next = text4[i2 + 1];
         if (next && next !== " " && next !== "\n" && next !== "	")
           split = i2;
       }
@@ -28369,12 +28641,12 @@ function foldFlowLines(text3, indent, mode = "flow", { indentAtStart, lineWidth
         } else if (mode === FOLD_QUOTED) {
           while (prev === " " || prev === "	") {
             prev = ch;
-            ch = text3[i2 += 1];
+            ch = text4[i2 += 1];
             overflow = true;
           }
           const j = i2 > escEnd + 1 ? i2 - 2 : escStart - 1;
           if (escapedFolds[j])
-            return text3;
+            return text4;
           folds.push(j);
           escapedFolds[j] = true;
           end = j + endStep;
@@ -28389,39 +28661,39 @@ function foldFlowLines(text3, indent, mode = "flow", { indentAtStart, lineWidth
   if (overflow && onOverflow)
     onOverflow();
   if (folds.length === 0)
-    return text3;
+    return text4;
   if (onFold)
     onFold();
-  let res = text3.slice(0, folds[0]);
+  let res = text4.slice(0, folds[0]);
   for (let i3 = 0; i3 < folds.length; ++i3) {
     const fold = folds[i3];
-    const end2 = folds[i3 + 1] || text3.length;
+    const end2 = folds[i3 + 1] || text4.length;
     if (fold === 0)
       res = `
-${indent}${text3.slice(0, end2)}`;
+${indent}${text4.slice(0, end2)}`;
     else {
       if (mode === FOLD_QUOTED && escapedFolds[fold])
-        res += `${text3[fold]}\\`;
+        res += `${text4[fold]}\\`;
       res += `
-${indent}${text3.slice(fold + 1, end2)}`;
+${indent}${text4.slice(fold + 1, end2)}`;
     }
   }
   return res;
 }
-function consumeMoreIndentedLines(text3, i2, indent) {
+function consumeMoreIndentedLines(text4, i2, indent) {
   let end = i2;
   let start = i2 + 1;
-  let ch = text3[start];
+  let ch = text4[start];
   while (ch === " " || ch === "	") {
     if (i2 < start + indent) {
-      ch = text3[++i2];
+      ch = text4[++i2];
     } else {
       do {
-        ch = text3[++i2];
+        ch = text4[++i2];
       } while (ch && ch !== "\n");
       end = i2;
       start = i2 + 1;
-      ch = text3[start];
+      ch = text4[start];
     }
   }
   return end;
@@ -34247,24 +34519,24 @@ function quoteYaml(value) {
   if (/^[\w./:+-]+$/.test(value)) return value;
   return JSON.stringify(value);
 }
-function upsertHermesProvider(text3, hostId, baseUrl, apiKey) {
+function upsertHermesProvider(text4, hostId, baseUrl, apiKey) {
   const block2 = [`  ${hostId}:`, `    base_url: ${quoteYaml(baseUrl)}`, `    api_key: ${quoteYaml(apiKey)}`, ""].join(
     "\n"
   );
-  if (/^providers:\s*$/m.test(text3)) {
-    const replaced = replaceHermesHostBlock(text3, hostId, block2);
+  if (/^providers:\s*$/m.test(text4)) {
+    const replaced = replaceHermesHostBlock(text4, hostId, block2);
     if (replaced !== null) return replaced;
-    return text3.replace(/^providers:\s*$/m, `providers:
+    return text4.replace(/^providers:\s*$/m, `providers:
 ${block2.trimEnd()}`);
   }
-  const prefix = text3 && !text3.endsWith("\n") ? `${text3}
-` : text3;
+  const prefix = text4 && !text4.endsWith("\n") ? `${text4}
+` : text4;
   return `${prefix}
 providers:
 ${block2}`;
 }
-function replaceHermesHostBlock(text3, hostId, block2) {
-  const lines = text3.split("\n");
+function replaceHermesHostBlock(text4, hostId, block2) {
+  const lines = text4.split("\n");
   const start = lines.findIndex((line) => line === `  ${hostId}:`);
   if (start < 0) return null;
   let end = start + 1;
@@ -34284,14 +34556,14 @@ function ensureHermesInjectProvider(modelId, env = process.env) {
   const dir = hermesHome(env);
   mkdirSync14(dir, { recursive: true });
   const path3 = join31(dir, "config.yaml");
-  let text3 = "";
+  let text4 = "";
   try {
-    text3 = readFileSync17(path3, "utf8");
+    text4 = readFileSync17(path3, "utf8");
   } catch {
-    text3 = "";
+    text4 = "";
   }
-  const next = upsertHermesProvider(text3, inject.host, host.baseUrl, hostApiKey(host, env));
-  if (next !== text3) writeFileSync12(path3, next);
+  const next = upsertHermesProvider(text4, inject.host, host.baseUrl, hostApiKey(host, env));
+  if (next !== text4) writeFileSync12(path3, next);
   return hermesAcpModelId(modelId) ?? modelId;
 }
 function hermesAcpModelId(modelId) {
@@ -34301,8 +34573,8 @@ function hermesAcpModelId(modelId) {
   if (native && !native.includes(INJECT_SEP) && /^[a-z0-9_-]+:[\w./:-]+$/i.test(native)) return native;
   return null;
 }
-function nonEmptyDotenvValue(text3, name) {
-  const match = new RegExp(`^[ \\t]*(?:export[ \\t]+)?${name}[ \\t]*=[ \\t]*([^\\r\\n]*)$`, "m").exec(text3);
+function nonEmptyDotenvValue(text4, name) {
+  const match = new RegExp(`^[ \\t]*(?:export[ \\t]+)?${name}[ \\t]*=[ \\t]*([^\\r\\n]*)$`, "m").exec(text4);
   if (!match) return null;
   const raw = match[1].trim();
   if (!raw || raw.startsWith("#")) return null;
@@ -34319,10 +34591,10 @@ function nonEmptyDotenvValue(text3, name) {
 function yamlString(value) {
   return typeof value === "string" ? value.trim() : "";
 }
-function hermesConfigDefault(text3) {
+function hermesConfigDefault(text4) {
   let raw;
   try {
-    raw = parse3(text3);
+    raw = parse3(text4);
   } catch {
     return null;
   }
@@ -34667,8 +34939,8 @@ var init_openai_compat = __esm({
           nativeLog: {
             source: "openai-compat.chat.completions",
             outgoing: (_turn, messages, model) => ({ model, messageCount: messages.length }),
-            incoming: ({ text: text3, reasoning, usage }) => ({
-              textLength: text3.length,
+            incoming: ({ text: text4, reasoning, usage }) => ({
+              textLength: text4.length,
               reasoningLength: reasoning.length,
               usage
             })
@@ -35059,10 +35331,10 @@ var init_pi = __esm({
             child.stdin.write(JSON.stringify(obj) + "\n");
           };
           const flushAssistantText = () => {
-            const text3 = assistantText;
+            const text4 = assistantText;
             assistantText = "";
-            if (!text3.trim()) return;
-            emit({ ...base2(threadId, turnId), type: "item.completed", itemType: "assistant_text", text: text3 });
+            if (!text4.trim()) return;
+            emit({ ...base2(threadId, turnId), type: "item.completed", itemType: "assistant_text", text: text4 });
           };
           const settle = (ok, stopReason, usage) => {
             if (settled) return;
@@ -35455,7 +35727,7 @@ var init_minimax = __esm({
           nativeLog: {
             source: "minimax.chat.completions",
             outgoing: (_turn, messages, model) => ({ model, messageCount: messages.length }),
-            incoming: ({ text: text3, usage }) => ({ textLength: text3.length, usage })
+            incoming: ({ text: text4, usage }) => ({ textLength: text4.length, usage })
           }
         });
       }
@@ -37122,10 +37394,10 @@ async function verifyHostedEndpoint(endpoint, { fetchImpl, timeoutSignal, timeou
     signal: cancellationSignal ? AbortSignal.any([requestSignal, cancellationSignal]) : requestSignal
   });
   if (!response.ok) return false;
-  const text3 = await response.text();
-  if (Buffer.byteLength(text3) > 4096) return false;
+  const text4 = await response.text();
+  if (Buffer.byteLength(text4) > 4096) return false;
   try {
-    return JSON.parse(text3)?.app === "openmausbot";
+    return JSON.parse(text4)?.app === "openmausbot";
   } catch {
     return false;
   }
@@ -38046,9 +38318,9 @@ async function startCaddy(options) {
   });
   let output = "";
   const receive = (chunk) => {
-    const text3 = chunk.toString("utf8");
-    if (output.length < 16384) output += text3;
-    for (const line of text3.split(/\r?\n/)) {
+    const text4 = chunk.toString("utf8");
+    if (output.length < 16384) output += text4;
+    for (const line of text4.split(/\r?\n/)) {
       if (!line.trim()) continue;
       if (/"level":"(warn|error)"/.test(line) || /^\S+\s+(WARN|ERROR)/.test(line) || !line.startsWith("{")) options.log?.(`caddy: ${line.slice(0, 400)}`);
     }
@@ -38315,8 +38587,8 @@ function agentUnit(spec) {
 function emptyRegistry(domain2) {
   return { version: 1, domain: domain2, nextPort: FLEET_FIRST_PORT, workspaces: {} };
 }
-function parseRegistry(text3) {
-  const value = JSON.parse(text3);
+function parseRegistry(text4) {
+  const value = JSON.parse(text4);
   const record3 = value && typeof value === "object" ? value : null;
   if (!record3 || record3.version !== 1 || typeof record3.domain !== "string" || typeof record3.nextPort !== "number" || !record3.workspaces || typeof record3.workspaces !== "object") {
     throw new Error("fleet.json is not a fleet registry this version understands");
@@ -38740,9 +39012,9 @@ function failed(io, what, output) {
   return 1;
 }
 function loadRegistry(layout, deps) {
-  const text3 = deps.readText(layout.registryFile);
-  if (text3 === null) throw new Error(`no fleet on this server yet: run \`openmausbot fleet init --domain your.domain\` first`);
-  return parseRegistry(text3);
+  const text4 = deps.readText(layout.registryFile);
+  if (text4 === null) throw new Error(`no fleet on this server yet: run \`openmausbot fleet init --domain your.domain\` first`);
+  return parseRegistry(text4);
 }
 function planFleetAction(input, deps) {
   const layout = fleetLayout(input.root ?? "/");
@@ -38889,13 +39161,13 @@ function readUsage(dataDir, range) {
   const from = range.from.getTime();
   const to = range.to.getTime();
   for (const key of monthsBetween(range.from, range.to)) {
-    let text3;
+    let text4;
     try {
-      text3 = readFileSync2(join4(dataDir, DIR, `${key}.jsonl`), "utf8");
+      text4 = readFileSync2(join4(dataDir, DIR, `${key}.jsonl`), "utf8");
     } catch {
       continue;
     }
-    for (const line of text3.split("\n")) {
+    for (const line of text4.split("\n")) {
       if (!line) continue;
       try {
         const value = JSON.parse(line);
@@ -38989,15 +39261,15 @@ function summarizeUsage(rows, groupBy, prices = null) {
 var MAX_BODY = 256 * 1024;
 function readBody(req) {
   return new Promise((resolve13, reject) => {
-    let text3 = "";
+    let text4 = "";
     req.on("data", (chunk) => {
-      text3 += chunk.toString("utf8");
-      if (text3.length > MAX_BODY) reject(Object.assign(new Error("request too large"), { status: 413 }));
+      text4 += chunk.toString("utf8");
+      if (text4.length > MAX_BODY) reject(Object.assign(new Error("request too large"), { status: 413 }));
     });
     req.on("end", () => {
-      if (!text3.trim()) return resolve13({});
+      if (!text4.trim()) return resolve13({});
       try {
-        const value = JSON.parse(text3);
+        const value = JSON.parse(text4);
         resolve13(value && typeof value === "object" && !Array.isArray(value) ? value : {});
       } catch {
         reject(Object.assign(new Error("body must be JSON"), { status: 400 }));
@@ -39168,8 +39440,8 @@ var tailscaleEnvironment = () => ({
 });
 
 // server/tailscale.ts
-function classifyTailscaleStderr(text3) {
-  const t2 = text3.toLowerCase();
+function classifyTailscaleStderr(text4) {
+  const t2 = text4.toLowerCase();
   if (/not logged in|logged out|needs login|please log in/.test(t2)) return "not-logged-in";
   if (/is tailscale running|tailscaled is not running|connection refused|failed to connect to local tailscaled/.test(t2)) return "not-running";
   if (/access denied|permission denied|operator|must be root|not permitted/.test(t2)) return "needs-operator";
@@ -39900,9 +40172,9 @@ function pairingBlock(input) {
   }
   return lines.join("\n");
 }
-function qrToString(text3) {
+function qrToString(text4) {
   let out = "";
-  import_qrcode_terminal.default.generate(text3, { small: true }, (rendered) => {
+  import_qrcode_terminal.default.generate(text4, { small: true }, (rendered) => {
     out = rendered;
   });
   return out;
@@ -40317,9 +40589,9 @@ async function runServe(options, log = console.log) {
   });
   let tunnel = null;
   let caddy = null;
-  let stopping = null;
+  let stopping2 = null;
   const stop = () => {
-    stopping ??= (async () => {
+    stopping2 ??= (async () => {
       if (tunnel) await tunnel.stop().catch(() => void 0);
       if (caddy) await caddy.stop().catch(() => void 0);
       if (tailscaleServing && tailscale) await tailscaleServeOff(tailscale).catch(() => void 0);
@@ -40332,7 +40604,7 @@ async function runServe(options, log = console.log) {
       }
       if (plan) cleanupTunnelOrigin(plan.origin);
     })();
-    return stopping;
+    return stopping2;
   };
   const onSignal = () => {
     void stop();
@@ -40341,7 +40613,7 @@ async function runServe(options, log = console.log) {
   process.on("SIGTERM", onSignal);
   try {
     const deadline = Date.now() + 6e4;
-    while (Date.now() < deadline && exited === null && !stopping) {
+    while (Date.now() < deadline && exited === null && !stopping2) {
       if (await serverUp(options.port, child.pid)) break;
       await new Promise((r2) => setTimeout(r2, 250));
     }
@@ -40349,19 +40621,19 @@ async function runServe(options, log = console.log) {
       if (exited !== 0) log(`OpenMausBot could not start.${logPath ? ` Details: ${logPath}` : " See the output above."}`);
       return exited;
     }
-    if (stopping) return await childExit;
+    if (stopping2) return await childExit;
     if (!await serverUp(options.port, child.pid)) {
       console.error(`OpenMausBot did not become ready within a minute.${logPath ? ` Details: ${logPath}` : " See its output above."}`);
       await stop();
       return 1;
     }
-    if (stopping || exited !== null) return await childExit;
+    if (stopping2 || exited !== null) return await childExit;
     if (options.domain && caddyBinary) {
       try {
         caddy = await startCaddy({ binary: caddyBinary, dataDir: options.dataDir, domain: options.domain, appPort: options.port, webhookPort: Number(env.OMB_WEBHOOK_PORT), log });
         log(`https: Caddy serves ${publicUrl} \u2192 http://127.0.0.1:${options.port}; it gets the certificate from Let's Encrypt once DNS for ${options.domain} points at this machine`);
         void caddy.exited.then((code) => {
-          if (!stopping) log(`caddy: stopped (exit ${code ?? "signal"}); ${publicUrl} is no longer served. Stop and start the server again.`);
+          if (!stopping2) log(`caddy: stopped (exit ${code ?? "signal"}); ${publicUrl} is no longer served. Stop and start the server again.`);
         });
       } catch (error51) {
         console.error(`--domain: ${message(error51)}`);
@@ -40404,7 +40676,7 @@ async function runServe(options, log = console.log) {
         ]);
         if (timer) clearTimeout(timer);
       }
-      if (!stopping && exited === null) await showPhonePairing(options, publicUrl, log);
+      if (!stopping2 && exited === null) await showPhonePairing(options, publicUrl, log);
     } else if (options.pair && !options.guided) {
       log("");
       log(await mintPairing(options.port, { label: options.label ? `${options.label} owner` : void 0, client: options.client, publicUrl: publicUrl ?? void 0 }));