openmausbot 0.1.73 → 0.1.74

package/dist-server/pair-cli.js

@@ -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
@@ -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 ?? "");
 }
@@ -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);
       };
@@ -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) => {
@@ -20222,6 +20306,7 @@ function createAcpDriver(support11) {
               );
             }
             const cursor3 = typeof turn.resumeCursor === "string" ? turn.resumeCursor : null;
+            if (!cursor3) sessionAllows.delete(threadId);
             let sessionResult = null;
             if (cursor3) {
               try {
@@ -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",
@@ -22505,11 +22592,11 @@ 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, ...always ? { always: true } : {} }) + "\n");
           } catch {
           }
           opts.onResolve({ ...ask, behavior, source });
@@ -22579,11 +22666,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() {
@@ -22785,6 +22872,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 +22891,7 @@ var init_claude = __esm({
           } catch {
           }
           const kill = setTimeout(() => {
-            if (s.child.exitCode === null) killCliTree(s.child);
+            stopSession(s);
           }, 5e3);
           kill.unref?.();
         };
@@ -22842,7 +22934,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");
@@ -22987,7 +23079,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 +23138,8 @@ 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;
                   emit({
                     ...base2(threadId, eventTurnId),
                     type: "request.opened",
@@ -23053,6 +23147,10 @@ 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
                   });
@@ -23103,6 +23201,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 +23231,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 +23243,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") {
@@ -23241,7 +23342,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 +23488,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" });
@@ -23508,7 +23623,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),
@@ -24820,11 +24935,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 +24958,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";
@@ -25081,6 +25199,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),
@@ -25808,7 +25930,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
@@ -40317,9 +40439,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 +40454,7 @@ async function runServe(options, log = console.log) {
       }
       if (plan) cleanupTunnelOrigin(plan.origin);
     })();
-    return stopping;
+    return stopping2;
   };
   const onSignal = () => {
     void stop();
@@ -40341,7 +40463,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 +40471,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 +40526,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 }));