openmausbot 0.1.75 → 0.1.77

package/dist-server/pair-cli.js

@@ -1113,6 +1113,21 @@ var require_main = __commonJS({
 // server/atomic.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { closeSync, fsyncSync, openSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function renameWithRetry(tmp, path3, rename2 = renameSync) {
+  for (let attempt = 0; ; attempt += 1) {
+    try {
+      rename2(tmp, path3);
+      return;
+    } catch (e) {
+      const code = e.code;
+      if (!code || !RETRYABLE_RENAME_CODES.has(code) || attempt >= RENAME_RETRY_DELAYS_MS.length) throw e;
+      sleepSync(RENAME_RETRY_DELAYS_MS[attempt]);
+    }
+  }
+}
 function writeFileAtomic(path3, data, options = {}) {
   const tmp = `${path3}.${process.pid}.${randomUUID3()}.tmp`;
   let fd = null;
@@ -1122,7 +1137,7 @@ function writeFileAtomic(path3, data, options = {}) {
     fsyncSync(fd);
     closeSync(fd);
     fd = null;
-    renameSync(tmp, path3);
+    renameWithRetry(tmp, path3);
   } catch (e) {
     if (fd !== null) {
       try {
@@ -1137,9 +1152,12 @@ function writeFileAtomic(path3, data, options = {}) {
     throw e;
   }
 }
+var RENAME_RETRY_DELAYS_MS, RETRYABLE_RENAME_CODES;
 var init_atomic = __esm({
   "server/atomic.ts"() {
     "use strict";
+    RENAME_RETRY_DELAYS_MS = [5, 10, 20, 40, 80];
+    RETRYABLE_RENAME_CODES = /* @__PURE__ */ new Set(["EPERM", "EACCES", "EBUSY"]);
   }
 });
 
@@ -17601,9 +17619,9 @@ var init_schema = __esm({
 });
 
 // server/config.ts
-import { readFileSync as readFileSync4, mkdirSync as mkdirSync6, existsSync as existsSync5, renameSync as renameSync3 } from "node:fs";
+import { readFileSync as readFileSync3, mkdirSync as mkdirSync6, existsSync as existsSync5, renameSync as renameSync3 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join6 } from "node:path";
 function isValidSshAlias(value) {
   return typeof value === "string" && SSH_ALIAS.test(value);
 }
@@ -17736,7 +17754,7 @@ function parseStoredConfig(value) {
 function loadConfig() {
   let cfg = {};
   try {
-    cfg = parseStoredConfig(parseJson(readFileSync4(join7(DATA_DIR, "config.json"), "utf8")));
+    cfg = parseStoredConfig(parseJson(readFileSync3(join6(DATA_DIR, "config.json"), "utf8")));
   } catch {
   }
   cfg.xai = { ...cfg.xai };
@@ -17772,10 +17790,10 @@ function stripWorkspaceCredentialEnv(env) {
   for (const key of WORKSPACE_CREDENTIAL_ENV) delete env[key];
 }
 function saveConfig(patch, options = {}) {
-  const p = join7(DATA_DIR, "config.json");
+  const p = join6(DATA_DIR, "config.json");
   let disk = {};
   try {
-    const parsed = jsonObjectSchema.safeParse(parseJson(readFileSync4(p, "utf8")));
+    const parsed = jsonObjectSchema.safeParse(parseJson(readFileSync3(p, "utf8")));
     if (parsed.success) disk = parsed.data;
   } catch {
   }
@@ -17977,7 +17995,11 @@ var init_config = __esm({
       showToolCalls: external_exports.boolean().optional(),
       /** Experimental built-in browser. Off until explicitly enabled; each bot
        * also has its own switch. */
-      browser: external_exports.boolean().optional()
+      browser: external_exports.boolean().optional(),
+      /** Opt-in computer sharing (a desktop lending folders, a terminal or
+       * computer control to a workspace). Off until explicitly enabled; there is
+       * no Settings toggle — see sharedComputersEnabled. */
+      sharedComputers: external_exports.boolean().optional()
     });
     onboardingConfigSchema = external_exports.object({
       /** ISO timestamp of finishing (or skipping to the end of) the welcome flow. */
@@ -18094,10 +18116,10 @@ var init_config = __esm({
     });
     appConfigPatchSchema = appConfigSchema.omit({ instances: true, mcpServers: true, cliStartup: true, customDomain: true });
     jsonObjectSchema = external_exports.record(external_exports.string(), external_exports.json());
-    DATA_DIR = process.env.OMB_DATA_DIR ?? join7(homedir4(), ".openmausbot");
-    LEGACY_DATA_DIR = join7(homedir4(), ".opengrokbot");
-    EVENTS_DIR = join7(DATA_DIR, "events");
-    NATIVE_DIR = join7(DATA_DIR, "native");
+    DATA_DIR = process.env.OMB_DATA_DIR ?? join6(homedir4(), ".openmausbot");
+    LEGACY_DATA_DIR = join6(homedir4(), ".opengrokbot");
+    EVENTS_DIR = join6(DATA_DIR, "events");
+    NATIVE_DIR = join6(DATA_DIR, "native");
     WORKSPACE_CREDENTIAL_ENV = [
       "XAI_API_KEY",
       "OMB_ANTHROPIC_API_KEY",
@@ -18135,11 +18157,11 @@ var init_config = __esm({
 });
 
 // electron/data-dir-lease.mjs
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 import { createHash as createHash2, randomUUID as randomUUID5 } from "node:crypto";
-import { existsSync as existsSync6, linkSync, mkdirSync as mkdirSync7, readFileSync as readFileSync5, renameSync as renameSync4, unlinkSync as unlinkSync2, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync6, linkSync, mkdirSync as mkdirSync7, readFileSync as readFileSync4, renameSync as renameSync4, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
 import { hostname as hostname4, uptime } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 function leaseError(message2, cause) {
   return Object.assign(new DataDirLeaseError(message2), { cause });
 }
@@ -18149,10 +18171,10 @@ function isPid(value) {
 function readBootSession() {
   try {
     if (process.platform === "linux") {
-      return normalizeBootId(readFileSync5("/proc/sys/kernel/random/boot_id", "utf8"));
+      return normalizeBootId(readFileSync4("/proc/sys/kernel/random/boot_id", "utf8"));
     }
     if (process.platform === "darwin") {
-      return normalizeBootId(execFileSync("/usr/sbin/sysctl", ["-n", "kern.bootsessionuuid"], {
+      return normalizeBootId(execFileSync2("/usr/sbin/sysctl", ["-n", "kern.bootsessionuuid"], {
         encoding: "utf8",
         timeout: 5e3,
         stdio: ["ignore", "pipe", "ignore"]
@@ -18196,7 +18218,7 @@ function isReaperOwner(value, targetToken) {
 function parseRecord(path3, invalidMessage, validate) {
   let raw;
   try {
-    raw = readFileSync5(path3, "utf8");
+    raw = readFileSync4(path3, "utf8");
   } catch (error51) {
     if (error51?.code === "ENOENT") return null;
     throw leaseError("OpenMausBot cannot read the data-directory lease; refusing to start to protect its state.", error51);
@@ -18244,7 +18266,7 @@ function unlinkExact(path3, message2) {
 function publishRecord(path3, record3, prepareMessage, acquireMessage) {
   const candidatePath = `${path3}.candidate-${record3.pid}-${record3.token}`;
   try {
-    writeFileSync5(candidatePath, `${JSON.stringify(record3)}
+    writeFileSync4(candidatePath, `${JSON.stringify(record3)}
 `, { flag: "wx", mode: 384, flush: true });
   } catch (error51) {
     throw leaseError(prepareMessage, error51);
@@ -18331,10 +18353,10 @@ function prepareDataDir(dataDir, legacyDataDir) {
   } catch (error51) {
     throw leaseError("OpenMausBot cannot create its data directory.", error51);
   }
-  return join8(dataDir, LEASE_NAME);
+  return join7(dataDir, LEASE_NAME);
 }
 function assertNoLiveDelegatedChild(dataDir) {
-  const childLeasePath = join8(dataDir, DELEGATED_CHILD_DIR, LEASE_NAME);
+  const childLeasePath = join7(dataDir, DELEGATED_CHILD_DIR, LEASE_NAME);
   const child = readOwner(childLeasePath);
   if (!child) return;
   if (child.host !== hostname4()) {
@@ -18365,7 +18387,7 @@ function acquireDataDirLeaseInternal(dataDir, options = {}) {
   };
   const candidatePath = `${leasePath}.candidate-${owner.pid}-${owner.token}`;
   try {
-    writeFileSync5(candidatePath, `${JSON.stringify(owner)}
+    writeFileSync4(candidatePath, `${JSON.stringify(owner)}
 `, { flag: "wx", mode: 384, flush: true });
   } catch (error51) {
     throw leaseError("OpenMausBot cannot prepare its data-directory lease.", error51);
@@ -18457,13 +18479,13 @@ var init_data_dir_lease2 = __esm({
 
 // server/env-path.ts
 import { execFile as execFile2 } from "node:child_process";
-import { closeSync as closeSync2, existsSync as existsSync7, openSync as openSync2, readFileSync as readFileSync6, readSync, statSync as statSync2, readdirSync } from "node:fs";
+import { closeSync as closeSync3, existsSync as existsSync7, openSync as openSync3, readFileSync as readFileSync5, readSync, statSync as statSync2, readdirSync } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { basename as basename2, delimiter as delimiter3, dirname as dirname4, extname, join as join9 } from "node:path";
+import { basename as basename2, delimiter as delimiter3, dirname as dirname4, extname, join as join8 } from "node:path";
 function nvmBinDirs() {
   try {
-    const base2 = join9(homedir5(), ".nvm", "versions", "node");
-    return readdirSync(base2).filter((v) => v.startsWith("v")).sort((a2, b) => b.localeCompare(a2, void 0, { numeric: true })).map((v) => join9(base2, v, "bin"));
+    const base2 = join8(homedir5(), ".nvm", "versions", "node");
+    return readdirSync(base2).filter((v) => v.startsWith("v")).sort((a2, b) => b.localeCompare(a2, void 0, { numeric: true })).map((v) => join8(base2, v, "bin"));
   } catch {
     return [];
   }
@@ -18471,49 +18493,49 @@ function nvmBinDirs() {
 function knownDirs() {
   const home = homedir5();
   return [
-    join9(home, ".local", "bin"),
+    join8(home, ".local", "bin"),
     // claude installer default
-    join9(home, ".npm-global", "bin"),
+    join8(home, ".npm-global", "bin"),
     // npm prefix ~/.npm-global (claude, opencode)
-    join9(home, ".kimi-code", "bin"),
+    join8(home, ".kimi-code", "bin"),
     // kimi-code installer
-    join9(home, ".grok", "bin"),
+    join8(home, ".grok", "bin"),
     // x.ai installer
-    join9(home, ".opencode", "bin"),
+    join8(home, ".opencode", "bin"),
     // opencode installer
-    join9(home, ".claude", "local"),
+    join8(home, ".claude", "local"),
     // claude "local install"
     "/opt/homebrew/bin",
     // brew, Apple silicon
     "/usr/local/bin",
     // brew Intel / classic installs
-    join9(home, ".volta", "bin"),
-    join9(home, ".bun", "bin"),
-    join9(home, ".asdf", "shims"),
-    join9(home, ".deno", "bin"),
-    join9(home, "bin"),
+    join8(home, ".volta", "bin"),
+    join8(home, ".bun", "bin"),
+    join8(home, ".asdf", "shims"),
+    join8(home, ".deno", "bin"),
+    join8(home, "bin"),
     ...nvmBinDirs()
   ];
 }
 function windowsKnownDirs() {
   const home = homedir5();
-  const appData = process.env.APPDATA ?? join9(home, "AppData", "Roaming");
-  const localAppData = process.env.LOCALAPPDATA ?? join9(home, "AppData", "Local");
+  const appData = process.env.APPDATA ?? join8(home, "AppData", "Roaming");
+  const localAppData = process.env.LOCALAPPDATA ?? join8(home, "AppData", "Local");
   return [
-    join9(appData, "npm"),
+    join8(appData, "npm"),
     // npm -g shims: claude, codex
-    join9(home, ".grok", "bin"),
+    join8(home, ".grok", "bin"),
     // x.ai installer
-    join9(localAppData, "agy", "bin"),
+    join8(localAppData, "agy", "bin"),
     // Antigravity installer
-    join9(home, ".local", "bin"),
+    join8(home, ".local", "bin"),
     // claude native installer
-    join9(home, ".claude", "local"),
-    join9(home, "bin"),
+    join8(home, ".claude", "local"),
+    join8(home, "bin"),
     // Factory droid installer (%USERPROFILE%\bin)
-    join9(home, ".bun", "bin"),
-    join9(home, ".deno", "bin"),
-    join9(home, "go", "bin")
+    join8(home, ".bun", "bin"),
+    join8(home, ".deno", "bin"),
+    join8(home, "go", "bin")
   ];
 }
 function registerPathDir(dir) {
@@ -18573,7 +18595,7 @@ function findCliCandidates(name) {
   for (const dir of augmentedPath().split(delimiter3)) {
     if (!dir) continue;
     for (const ext of exts) {
-      const p = join9(dir, name + ext);
+      const p = join8(dir, name + ext);
       if (existsSync7(p)) {
         out.push(p);
         break;
@@ -18609,49 +18631,50 @@ function isFile(p) {
     return false;
   }
 }
-function whichWin(cli) {
-  const exts = (process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
+function whichWin(cli, env) {
+  const exts = ((env ?? process.env).PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
   const probe = (base2) => {
     const order = extname(base2) ? [base2, ...exts.map((e) => base2 + e)] : [...exts.map((e) => base2 + e), base2];
     return order.find(isFile) ?? null;
   };
   if (/[\\/]/.test(cli) || /^[a-zA-Z]:/.test(cli)) return probe(cli);
-  for (const dir of augmentedPath().split(delimiter3)) {
+  const path3 = env ? env.PATH ?? env.Path ?? "" : augmentedPath();
+  for (const dir of path3.split(delimiter3)) {
     if (!dir) continue;
-    const hit = probe(join9(dir, cli));
+    const hit = probe(join8(dir, cli));
     if (hit) return hit;
   }
   return null;
 }
-function nodeExe(near) {
-  const local = join9(near, "node.exe");
+function nodeExe(near, env) {
+  const local = join8(near, "node.exe");
   if (isFile(local)) return local;
-  const onPath2 = whichWin("node.exe");
+  const onPath2 = whichWin("node.exe", env);
   if (onPath2 && extname(onPath2).toLowerCase() === ".exe") return onPath2;
   return process.versions.electron ? null : process.execPath;
 }
-function parseCmdShim(shim) {
+function parseCmdShim(shim, env) {
   let text4;
   try {
-    text4 = readFileSync6(shim, "utf8");
+    text4 = readFileSync5(shim, "utf8");
   } catch {
     return null;
   }
   const dir = dirname4(shim);
-  const targets = [...text4.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) => join8(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);
+    const node = nodeExe(dir, env);
     if (node) return { command: node, args: [script] };
   }
   const exe = targets.find((p) => extname(p).toLowerCase() === ".exe");
   return exe ? { command: exe, args: [] } : null;
 }
-function parseNodeShebang(file2) {
+function parseNodeShebang(file2, env) {
   let head = "";
   let fd = null;
   try {
-    fd = openSync2(file2, "r");
+    fd = openSync3(file2, "r");
     const buf = Buffer.alloc(128);
     const n3 = readSync(fd, buf, 0, buf.length, 0);
     head = buf.subarray(0, n3).toString("utf8").split("\n", 1)[0];
@@ -18660,38 +18683,38 @@ function parseNodeShebang(file2) {
   } finally {
     if (fd !== null) {
       try {
-        closeSync2(fd);
+        closeSync3(fd);
       } catch {
       }
     }
   }
   if (!/^#!.*\bnode(\.exe)?\b/.test(head)) return null;
-  const node = nodeExe(dirname4(file2));
+  const node = nodeExe(dirname4(file2), env);
   return node ? { command: node, args: [file2] } : null;
 }
-function resolveWord(cli, args) {
+function resolveWord(cli, args, env) {
   if (process.platform !== "win32") return { command: cli, args };
-  const file2 = whichWin(cli);
+  const file2 = whichWin(cli, env);
   if (!file2) return { command: cli, args };
   const ext = extname(file2).toLowerCase();
   if (ext === ".cmd" || ext === ".bat") {
-    const direct = parseCmdShim(file2);
+    const direct = parseCmdShim(file2, env);
     return direct ? { command: direct.command, args: [...direct.args, ...args] } : { command: file2, args };
   }
   if (ext === ".exe" || ext === ".com") return { command: file2, args };
-  const viaNode = parseNodeShebang(file2);
+  const viaNode = parseNodeShebang(file2, env);
   return viaNode ? { command: viaNode.command, args: [...viaNode.args, ...args] } : { command: file2, args };
 }
-function resolveCliSpawn(cli, args) {
+function resolveCliSpawn(cli, args, env) {
   const trimmed = cli.trim();
-  if (trimmed.includes(" ") && existsSync7(trimmed)) return resolveWord(trimmed, args);
+  if (trimmed.includes(" ") && existsSync7(trimmed)) return resolveWord(trimmed, args, env);
   const split = splitCliString(cli);
   if (split.length > 1 || split[0] !== trimmed) {
     const [head, ...fixed] = split;
     if (!head) return { command: cli, args };
-    return resolveWord(head, [...fixed, ...args]);
+    return resolveWord(head, [...fixed, ...args], env);
   }
-  return resolveWord(cli, args);
+  return resolveWord(cli, args, env);
 }
 var cached2, probed, loginShellPath, registeredDirs;
 var init_env_path = __esm({
@@ -18709,9 +18732,9 @@ import {
   spawn as spawn5,
   execFile as execFile3
 } from "node:child_process";
-import { join as join10 } from "node:path";
-function resolveCli(cli, args = []) {
-  return resolveCliSpawn(cli, args);
+import { join as join9 } from "node:path";
+function resolveCli(cli, args = [], env) {
+  return resolveCliSpawn(cli, args, env);
 }
 function estimatedWindowsCommandLineChars(resolved) {
   return [resolved.command, ...resolved.args].reduce(
@@ -18825,9 +18848,13 @@ async function stopCliTree(child, pid, timeoutMs) {
   if (exited()) return true;
   return new Promise((resolve13) => {
     let timer;
+    let finished = false;
     const done = (stopped) => {
+      if (finished) return;
+      finished = true;
       clearTimeout(timer);
       child.off("close", closed);
+      child.off("exit", closed);
       resolve13(stopped);
     };
     const closed = () => done(true);
@@ -18835,7 +18862,12 @@ async function stopCliTree(child, pid, timeoutMs) {
     timer = setTimeout(() => done(false), timeoutMs);
     timer.unref?.();
     execFile3("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (err) => {
-      if (!err) return;
+      if (finished) return;
+      if (!err) {
+        if (exited()) done(true);
+        else child.once("exit", closed);
+        return;
+      }
       try {
         child.kill();
       } catch {
@@ -18844,7 +18876,7 @@ async function stopCliTree(child, pid, timeoutMs) {
   });
 }
 function brokerSocketPath(dataDir, tag) {
-  return process.platform === "win32" ? `\\\\.\\pipe\\openmausbot-perm-${process.pid}-${tag}` : join10(dataDir, `perm-${tag}.sock`);
+  return process.platform === "win32" ? `\\\\.\\pipe\\openmausbot-perm-${process.pid}-${tag}` : join9(dataDir, `perm-${tag}.sock`);
 }
 var WINDOWS_SAFE_COMMAND_LINE_CHARS, cliGroups, stopping;
 var init_procs = __esm({
@@ -18859,13 +18891,13 @@ var init_procs = __esm({
 
 // server/engine-install.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync8 } from "node:fs";
-import { join as join11 } from "node:path";
+import { join as join10 } from "node:path";
 import { stripVTControlCharacters as stripVTControlCharacters3 } from "node:util";
 function enginesPrefix(baseDir = DATA_DIR) {
-  return join11(baseDir, "tools", "npm");
+  return join10(baseDir, "tools", "npm");
 }
 function enginesBinDir(baseDir = DATA_DIR, platform = process.platform) {
-  return platform === "win32" ? enginesPrefix(baseDir) : join11(enginesPrefix(baseDir), "bin");
+  return platform === "win32" ? enginesPrefix(baseDir) : join10(enginesPrefix(baseDir), "bin");
 }
 function npmPackageOf(install) {
   const line = install?.command?.linux ?? install?.command?.darwin ?? install?.command?.win32;
@@ -18915,9 +18947,9 @@ async function installOnce(pkg, options) {
   }
 }
 function tail(output) {
-  const clean3 = stripVTControlCharacters3(output).trim();
-  if (!clean3) return "";
-  const lines = clean3.split(/\r?\n/).filter((line) => line.trim()).slice(-6);
+  const clean = stripVTControlCharacters3(output).trim();
+  if (!clean) return "";
+  const lines = clean.split(/\r?\n/).filter((line) => line.trim()).slice(-6);
   return `
 ${lines.join("\n").slice(-600)}`;
 }
@@ -19211,9 +19243,9 @@ var init_registry = __esm({
 });
 
 // server/drivers/local-inject.ts
-import { readFileSync as readFileSync7 } from "node:fs";
+import { readFileSync as readFileSync6 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join12 } from "node:path";
+import { join as join11 } from "node:path";
 function contextWindowsFromPs(extra) {
   const out = /* @__PURE__ */ new Map();
   const rec = extra && typeof extra === "object" ? extra : null;
@@ -19298,7 +19330,7 @@ function firstUnslothToken(row) {
 function readUnslothKey(env) {
   const home = env.HOME || env.USERPROFILE || homedir6();
   try {
-    const raw = JSON.parse(readFileSync7(join12(home, ".unsloth", "studio", "auth", "agent_api_key.json"), "utf8"));
+    const raw = JSON.parse(readFileSync6(join11(home, ".unsloth", "studio", "auth", "agent_api_key.json"), "utf8"));
     if (raw.servers && typeof raw.servers === "object") {
       const servers = raw.servers;
       for (const url2 of ["http://127.0.0.1:8888", "http://localhost:8888"]) {
@@ -19348,7 +19380,7 @@ async function timedJson(url2, env, host, fetchImpl) {
 function loadedIdsFromPayloads(_host, catalog, extra) {
   const loaded = /* @__PURE__ */ new Set();
   const catalogIds = new Set(idsFromModelsPayload(catalog));
-  const add2 = (id) => {
+  const add = (id) => {
     const base2 = id.split(":")[0];
     if (catalogIds.size && !catalogIds.has(id) && !catalogIds.has(base2)) return;
     if (!MODEL_ID.test(id)) return;
@@ -19361,10 +19393,10 @@ function loadedIdsFromPayloads(_host, catalog, extra) {
     const hasLoadedFlags = running2.some(
       (row) => row && typeof row === "object" && ("loaded" in row || "state" in row)
     );
-    if (!hasLoadedFlags && typeof rec.default_model === "string") add2(rec.default_model);
+    if (!hasLoadedFlags && typeof rec.default_model === "string") add(rec.default_model);
     for (const row of running2) {
       if (typeof row === "string") {
-        if (!hasLoadedFlags) add2(row);
+        if (!hasLoadedFlags) add(row);
         continue;
       }
       if (!row || typeof row !== "object") continue;
@@ -19374,20 +19406,20 @@ function loadedIdsFromPayloads(_host, catalog, extra) {
       const state = typeof item.state === "string" ? item.state.toLowerCase() : "";
       if (item.loaded === false || state === "not-loaded" || state === "unloaded") continue;
       if (item.loaded === true || state === "loaded" || state === "idle" || !hasLoadedFlags) {
-        add2(id);
+        add(id);
       }
     }
   }
   if (!loaded.size && catalog && typeof catalog === "object") {
     const rec = catalog;
-    if (typeof rec.default_model === "string") add2(rec.default_model);
+    if (typeof rec.default_model === "string") add(rec.default_model);
     const records = Array.isArray(rec.data) ? rec.data : [];
     for (const row of records) {
       if (!row || typeof row !== "object") continue;
       const item = row;
       if (typeof item.id !== "string") continue;
       const state = typeof item.state === "string" ? item.state.toLowerCase() : "";
-      if (item.loaded === true || state === "loaded") add2(item.id);
+      if (item.loaded === true || state === "loaded") add(item.id);
     }
   }
   return loaded;
@@ -19500,11 +19532,11 @@ var init_local_inject = __esm({
 
 // server/proxy-paths.ts
 import { existsSync as existsSync9 } from "node:fs";
-import { dirname as dirname5, join as join13 } from "node:path";
+import { dirname as dirname5, join as join12 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function resolveProxy(relative2) {
-  const source = join13(SERVER_ROOT, `${relative2}.ts`);
-  return existsSync9(source) ? source : join13(SERVER_ROOT, `${relative2}.js`);
+  const source = join12(SERVER_ROOT, `${relative2}.ts`);
+  return existsSync9(source) ? source : join12(SERVER_ROOT, `${relative2}.js`);
 }
 var SERVER_ROOT, SPAWNED_PROXIES;
 var init_proxy_paths = __esm({
@@ -19533,7 +19565,7 @@ var init_proxy_paths = __esm({
 
 // server/container-computer.ts
 import { execFile as execFile4 } from "node:child_process";
-import { join as join14, resolve as resolve3 } from "node:path";
+import { join as join13, resolve as resolve3 } from "node:path";
 import { promisify } from "node:util";
 function computerProxyEnv(computer) {
   return {
@@ -19557,7 +19589,7 @@ var init_container_computer = __esm({
     IMAGE_REPOSITORY = "localhost/openmausbot/cua-local-vm";
     IMAGE_LAYER_VERSION = "5";
     IMAGE = `${IMAGE_REPOSITORY}:driver-${CUA_DRIVER_VERSION}-v${IMAGE_LAYER_VERSION}`;
-    VM_WORKSPACE_DIR = join14(DATA_DIR, "vm-home");
+    VM_WORKSPACE_DIR = join13(DATA_DIR, "vm-home");
     MEMORY_BYTES = 4 * 1024 * 1024 * 1024;
     SHM_BYTES = 512 * 1024 * 1024;
     containerMcpPath = SPAWNED_PROXIES.containerMcp;
@@ -19661,11 +19693,11 @@ var init_redact = __esm({
 
 // server/drivers/native.ts
 import { appendFileSync as appendFileSync3 } from "node:fs";
-import { join as join15 } from "node:path";
+import { join as join14 } from "node:path";
 function appendNative(threadId, entry) {
   try {
     appendFileSync3(
-      join15(NATIVE_DIR, `${threadId}.ndjson`),
+      join14(NATIVE_DIR, `${threadId}.ndjson`),
       JSON.stringify({ at: (/* @__PURE__ */ new Date()).toISOString(), ...entry, msg: redactSecrets(entry.msg) }) + "\n",
       { mode: 384 }
     );
@@ -19681,6 +19713,41 @@ var init_native = __esm({
 });
 
 // server/tool-summary.ts
+function toolDetailPreview(value) {
+  if (value === void 0) return void 0;
+  let budget = 200;
+  let textBudget = 256e3;
+  const bounded = (item, depth = 0) => {
+    if (--budget < 0 || depth > 6) return "[additional data omitted]";
+    if (typeof item === "string") {
+      if (item.length > textBudget) return "[large content omitted]";
+      if (/^data:[^,\s]+;base64,/i.test(item)) return "[binary content omitted]";
+      if (/^\s*[[{]/.test(item)) {
+        try {
+          return bounded(JSON.parse(item), depth + 1);
+        } catch {
+        }
+      }
+      textBudget -= item.length;
+      return item;
+    }
+    if (typeof item === "bigint") return String(item);
+    if (item === null || typeof item !== "object") return item;
+    if (Array.isArray(item)) return item.slice(0, 40).map((child) => bounded(child, depth + 1)).concat(item.length > 40 ? ["[additional items omitted]"] : []);
+    const entries = Object.entries(item);
+    const result = /* @__PURE__ */ Object.create(null);
+    for (const [key, child] of entries.slice(0, 40)) {
+      result[key] = /token|secret|password|passwd|cookie|authorization|api.?key|(^|[_.-])keys?$/i.test(key) ? "[redacted]" : /^(data|base64|blob)$/i.test(key) && typeof child === "string" ? "[binary content omitted]" : bounded(child, depth + 1);
+    }
+    if (entries.length > 40) result["\u2026"] = "[additional fields omitted]";
+    return result;
+  };
+  const safe = redactSecrets(bounded(value));
+  const text4 = typeof safe === "string" ? safe : JSON.stringify(safe, null, 2);
+  if (!text4?.trim() || text4 === "{}" || text4 === "[]") return void 0;
+  return text4.length > 6e3 ? `${text4.slice(0, 6e3)}
+[\u2026 preview shortened]` : text4;
+}
 function fieldsOf(input) {
   if (input === null || typeof input !== "object" || Array.isArray(input)) return void 0;
   return input;
@@ -19810,12 +19877,12 @@ function createAcpDriver(support11) {
         support11.transformEnv?.(env, activeConfig, instanceId);
         return env;
       };
-      let models = support11.models;
+      let models2 = support11.models;
       const refreshModels = async () => {
         if (!support11.resolveModels) return;
         try {
           const resolved = await support11.resolveModels(childEnv(), config2, instanceId);
-          if (resolved.options.length) models = resolved;
+          if (resolved.options.length) models2 = resolved;
         } catch {
         }
       };
@@ -20186,7 +20253,8 @@ function createAcpDriver(support11) {
                 itemType: "tool",
                 itemId: u4.toolCallId,
                 title: String(u4.rawInput?.command ?? u4.title ?? "tool").slice(0, 80),
-                summary: commandSummary(u4.rawInput)
+                summary: commandSummary(u4.rawInput),
+                input: toolDetailPreview(u4.rawInput)
               });
               break;
             }
@@ -20197,7 +20265,8 @@ function createAcpDriver(support11) {
                   type: "item.completed",
                   itemType: "tool",
                   itemId: u4.toolCallId,
-                  ok: u4.status !== "failed"
+                  ok: u4.status !== "failed",
+                  output: toolDetailPreview(u4.rawOutput ?? u4.content)
                 });
               }
               break;
@@ -20438,7 +20507,7 @@ ${turn.text}` : turn.text;
         displayName: input.displayName,
         enabled: input.enabled,
         get models() {
-          return models;
+          return models2;
         },
         refreshModels: support11.resolveModels ? refreshModels : void 0,
         snapshot,
@@ -20515,7 +20584,7 @@ import { createHash as createHash3, randomUUID as randomUUID6 } from "node:crypt
 import { mkdir as mkdir2, mkdtemp, readFile as readFile2, rm, stat as stat2 } from "node:fs/promises";
 import { request as httpRequest } from "node:http";
 import { tmpdir as tmpdir2 } from "node:os";
-import { delimiter as delimiter4, join as join16, resolve as resolve5 } from "node:path";
+import { delimiter as delimiter4, join as join15, resolve as resolve5 } from "node:path";
 function quoteBrowserArgument(value) {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }
@@ -20550,11 +20619,11 @@ function authorizationUrlFromLine(line) {
   }
 }
 function antigravityProfileDirectory(instanceId, baseDir = DATA_DIR) {
-  return join16(baseDir, "providers", "antigravity", createHash3("sha256").update(instanceId).digest("hex"));
+  return join15(baseDir, "providers", "antigravity", createHash3("sha256").update(instanceId).digest("hex"));
 }
 async function prepareAntigravityProfile(input) {
   const directory = resolve5(input.profileDirectory ?? antigravityProfileDirectory(input.instanceId, input.baseDir));
-  const acpDirectory = join16(directory, "antigravity-acp");
+  const acpDirectory = join15(directory, "antigravity-acp");
   await mkdir2(acpDirectory, { recursive: true, mode: 448 });
   if (process.platform !== "win32") {
     const { chmod: chmod2 } = await import("node:fs/promises");
@@ -20562,7 +20631,7 @@ async function prepareAntigravityProfile(input) {
     await chmod2(acpDirectory, 448);
   }
   writeFileAtomic(
-    join16(acpDirectory, "settings.json"),
+    join15(acpDirectory, "settings.json"),
     `${JSON.stringify({ auth: { type: "oauth-personal" } })}
 `,
     { mode: 384 }
@@ -20585,7 +20654,7 @@ async function prepareAntigravityProfile(input) {
     PYTHONUNBUFFERED: "1",
     ELECTRON_RUN_AS_NODE: "1"
   });
-  return { directory, tokenPath: join16(acpDirectory, "acp_token.json"), environment };
+  return { directory, tokenPath: join15(acpDirectory, "acp_token.json"), environment };
 }
 async function antigravityProfileAuthenticated(profile) {
   try {
@@ -20714,7 +20783,7 @@ function isValidAntigravityInitializeResult(initialized, expectedVersion) {
   return true;
 }
 async function validateAntigravityRuntime(runtime, expectedVersion) {
-  const profileDirectory = await mkdtemp(join16(tmpdir2(), "openmaus-antigravity-verify-"));
+  const profileDirectory = await mkdtemp(join15(tmpdir2(), "openmaus-antigravity-verify-"));
   let client;
   let failed2 = false;
   let failure;
@@ -21104,7 +21173,7 @@ import {
   writeFile as writeFile2
 } from "node:fs/promises";
 import { constants } from "node:fs";
-import { delimiter as delimiter5, dirname as dirname7, isAbsolute as isAbsolute2, join as join17, resolve as resolve6 } from "node:path";
+import { delimiter as delimiter5, dirname as dirname7, isAbsolute as isAbsolute2, join as join16, resolve as resolve6 } from "node:path";
 import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { createInflateRaw } from "node:zlib";
@@ -21125,7 +21194,7 @@ async function retryOnWindowsFileLock(step, options = {}) {
   }
 }
 function runtimeRoot(baseDir = DATA_DIR) {
-  return join17(baseDir, "tools", "antigravity-acp", `${process.platform}-${process.arch}`);
+  return join16(baseDir, "tools", "antigravity-acp", `${process.platform}-${process.arch}`);
 }
 function executableNames(platform = process.platform) {
   return platform === "win32" ? { executable: "agy_acp_server.exe", harness: "localharness_external.exe" } : { executable: "agy_acp_server.par", harness: "localharness_external" };
@@ -21142,10 +21211,10 @@ async function executableFile(path3, bytes) {
 }
 async function completedRelease(directory, asset) {
   try {
-    const record3 = JSON.parse(await readFile3(join17(directory, INSTALL_RECORD), "utf8"));
+    const record3 = JSON.parse(await readFile3(join16(directory, INSTALL_RECORD), "utf8"));
     if (record3.sha256 !== asset.sha256 || record3.version !== asset.version || record3.executable.name !== asset.executable.name || record3.executable.bytes !== asset.executable.bytes || record3.harness.name !== asset.harness.name || record3.harness.bytes !== asset.harness.bytes) return null;
-    const executablePath = join17(directory, asset.executable.name);
-    const harnessPath = join17(directory, asset.harness.name);
+    const executablePath = join16(directory, asset.executable.name);
+    const harnessPath = join16(directory, asset.harness.name);
     if (!await executableFile(executablePath, asset.executable.bytes)) return null;
     if (!await executableFile(harnessPath, asset.harness.bytes)) return null;
     return { executablePath, harnessPath, source: "managed", version: asset.version };
@@ -21161,7 +21230,7 @@ function pathCandidates(binary2, env) {
 async function externalRuntime(candidate, source) {
   const names = executableNames();
   const executablePath = resolve6(candidate);
-  const harnessPath = join17(dirname7(executablePath), names.harness);
+  const harnessPath = join16(dirname7(executablePath), names.harness);
   if (!await executableFile(executablePath) || !await executableFile(harnessPath)) return null;
   return { executablePath, harnessPath, source, version: null };
 }
@@ -21181,7 +21250,7 @@ async function resolveAntigravityRuntime(binaryPath, env = process.env, baseDir
   }
   const asset = resolveAntigravityReleaseAsset();
   if (asset) {
-    const managed = await completedRelease(join17(runtimeRoot(baseDir), "versions", asset.sha256), asset);
+    const managed = await completedRelease(join16(runtimeRoot(baseDir), "versions", asset.sha256), asset);
     if (managed) return managed;
   }
   const names = executableNames();
@@ -21303,7 +21372,7 @@ async function extractPinnedArchive(archivePath, outputDirectory, asset) {
       start: dataOffset,
       end: dataOffset + entry.compressedBytes - 1
     });
-    const destination = createWriteStream(join17(outputDirectory, entry.name), { flags: "wx", mode: 448 });
+    const destination = createWriteStream(join16(outputDirectory, entry.name), { flags: "wx", mode: 448 });
     if (entry.compression === 8) await pipeline(source, createInflateRaw(), counter, destination);
     else await pipeline(source, counter, destination);
     if (bytes !== expectedBytes) throw new Error("An extracted file was truncated.");
@@ -21314,8 +21383,8 @@ async function installOnce2(options) {
   const asset = options.asset === void 0 ? resolveAntigravityReleaseAsset() : options.asset;
   if (!asset) throw new Error(`Google does not publish an Antigravity runtime for ${process.platform}-${process.arch}.`);
   const root = runtimeRoot(options.baseDir);
-  const versions = join17(root, "versions");
-  const destination = join17(versions, asset.sha256);
+  const versions = join16(root, "versions");
+  const destination = join16(versions, asset.sha256);
   await mkdir3(versions, { recursive: true, mode: 448 });
   const existing = await completedRelease(destination, asset);
   if (existing) {
@@ -21331,11 +21400,11 @@ async function installOnce2(options) {
   } catch (error51) {
     if (error51 instanceof Error && error51.message.includes("Antigravity needs")) throw error51;
   }
-  const staging = await mkdtemp2(join17(versions, `${STAGING_PREFIX}${randomUUID7()}-`));
+  const staging = await mkdtemp2(join16(versions, `${STAGING_PREFIX}${randomUUID7()}-`));
   let failed2 = false;
   try {
-    const archivePath = join17(staging, "download.zip");
-    const runtimeDirectory = join17(staging, "runtime");
+    const archivePath = join16(staging, "download.zip");
+    const runtimeDirectory = join16(staging, "runtime");
     await mkdir3(runtimeDirectory, { mode: 448 });
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), DOWNLOAD_TIMEOUT_MS2);
@@ -21381,12 +21450,12 @@ async function installOnce2(options) {
     }
     await extractPinnedArchive(archivePath, runtimeDirectory, asset);
     if (process.platform !== "win32") {
-      await chmod(join17(runtimeDirectory, asset.executable.name), 493);
-      await chmod(join17(runtimeDirectory, asset.harness.name), 493);
+      await chmod(join16(runtimeDirectory, asset.executable.name), 493);
+      await chmod(join16(runtimeDirectory, asset.harness.name), 493);
     }
     const candidate = {
-      executablePath: join17(runtimeDirectory, asset.executable.name),
-      harnessPath: join17(runtimeDirectory, asset.harness.name),
+      executablePath: join16(runtimeDirectory, asset.executable.name),
+      harnessPath: join16(runtimeDirectory, asset.harness.name),
       source: "managed",
       version: asset.version
     };
@@ -21397,7 +21466,7 @@ async function installOnce2(options) {
       executable: asset.executable,
       harness: asset.harness
     };
-    await writeFile2(join17(runtimeDirectory, INSTALL_RECORD), `${JSON.stringify(record3)}
+    await writeFile2(join16(runtimeDirectory, INSTALL_RECORD), `${JSON.stringify(record3)}
 `, { flag: "wx", mode: 384 });
     try {
       await retryOnWindowsFileLock(() => rename(runtimeDirectory, destination));
@@ -21678,7 +21747,7 @@ var init_boxagent = __esm({
           const model = turn.model || MODELS.default;
           const prompt = [
             turn.system,
-            "You are working on your own cloud computer \u2014 its desktop, Chrome, and shell are yours.",
+            "You are working on the assigned cloud computer \u2014 use its desktop, Chrome, and shell within the access described above.",
             "",
             turn.text
           ].filter((s) => s !== void 0).join("\n");
@@ -21859,14 +21928,14 @@ var init_resume_recovery = __esm({
 import { randomUUID as randomUUID8 } from "node:crypto";
 import { realpathSync } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { basename as basename4, dirname as dirname8, isAbsolute as isAbsolute3, join as join18, resolve as resolve7 } from "node:path";
+import { basename as basename4, dirname as dirname8, isAbsolute as isAbsolute3, join as join17, resolve as resolve7 } from "node:path";
 import { stripVTControlCharacters as stripVTControlCharacters4 } from "node:util";
 function canonicalPath(path3) {
   try {
     return realpathSync(path3);
   } catch {
     const parent = dirname8(path3);
-    return parent === path3 ? path3 : join18(canonicalPath(parent), basename4(path3));
+    return parent === path3 ? path3 : join17(canonicalPath(parent), basename4(path3));
   }
 }
 function claudeSignInLink(value) {
@@ -21923,7 +21992,7 @@ var init_claude_login_auth = __esm({
         if (!isAbsolute3(home) || env.CLAUDE_CONFIG_DIR && !isAbsolute3(env.CLAUDE_CONFIG_DIR)) {
           throw new Error("Use an absolute HOME and CLAUDE_CONFIG_DIR path for this server's Claude provider before signing in.");
         }
-        const homeKey = canonicalPath(resolve7(env.CLAUDE_CONFIG_DIR || join18(home, ".claude")));
+        const homeKey = canonicalPath(resolve7(env.CLAUDE_CONFIG_DIR || join17(home, ".claude")));
         if (authenticatingHomes.has(homeKey)) {
           throw new Error("A Claude sign-in is already running for this server account. Finish or cancel it before starting another.");
         }
@@ -22019,7 +22088,7 @@ var init_claude_login_auth = __esm({
         if (!isAbsolute3(home) || env.CLAUDE_CONFIG_DIR && !isAbsolute3(env.CLAUDE_CONFIG_DIR)) {
           throw new Error("Use an absolute HOME and CLAUDE_CONFIG_DIR path for this server's Claude provider before signing out.");
         }
-        const homeKey = canonicalPath(resolve7(env.CLAUDE_CONFIG_DIR || join18(home, ".claude")));
+        const homeKey = canonicalPath(resolve7(env.CLAUDE_CONFIG_DIR || join17(home, ".claude")));
         if (authenticatingHomes.has(homeKey)) {
           throw new Error("A Claude sign-in is running for this server account. Finish or cancel it before signing out.");
         }
@@ -22235,7 +22304,7 @@ var init_mcp_trim = __esm({
 });
 
 // server/mcp-gate-config.ts
-import { join as join19 } from "node:path";
+import { join as join18 } from "node:path";
 function resultBudget(env = process.env) {
   const raw = env.OMB_MCP_RESULT_BUDGET;
   if (raw === void 0 || raw === "") return DEFAULT_RESULT_BUDGET;
@@ -22243,7 +22312,7 @@ function resultBudget(env = process.env) {
   return Number.isFinite(parsed) && parsed >= 0 ? Math.floor(parsed) : DEFAULT_RESULT_BUDGET;
 }
 function spillDir(threadId) {
-  return join19(DATA_DIR, "tool-results", threadId.replace(/[^A-Za-z0-9_-]/g, "-").slice(0, 80) || "thread");
+  return join18(DATA_DIR, "tool-results", threadId.replace(/[^A-Za-z0-9_-]/g, "-").slice(0, 80) || "thread");
 }
 function gateServer(input) {
   const { name, server, budget } = input;
@@ -22445,10 +22514,10 @@ var init_ask_question = __esm({
 
 // 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";
+import { chmodSync as chmodSync4, mkdtempSync as mkdtempSync2, readFileSync as readFileSync7, rmSync as rmSync4, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "node:fs";
 import { createServer as createNetServer } from "node:net";
 import { homedir as homedir9, tmpdir as tmpdir3 } from "node:os";
-import { join as join20, dirname as dirname9, isAbsolute as isAbsolute4, normalize } from "node:path";
+import { join as join19, dirname as dirname9, isAbsolute as isAbsolute4, normalize } from "node:path";
 function claudeAuthStatus(cli, env, run3 = execCli) {
   return new Promise((resolve13) => {
     run3(cli, ["auth", "status", "--json"], { timeout: 8e3, maxBuffer: 65536, env }, (_error, stdout2) => {
@@ -22476,8 +22545,8 @@ function claudeAuthStatus(cli, env, run3 = execCli) {
 }
 function resolveClaudeConfigDir(configDir, env = process.env) {
   const home = env.HOME || env.USERPROFILE || homedir9();
-  const configured = configDir?.trim() || env.CLAUDE_CONFIG_DIR?.trim() || join20(home, ".claude");
-  const expanded = configured === "~" ? home : configured.startsWith("~/") ? join20(home, configured.slice(2)) : configured;
+  const configured = configDir?.trim() || env.CLAUDE_CONFIG_DIR?.trim() || join19(home, ".claude");
+  const expanded = configured === "~" ? home : configured.startsWith("~/") ? join19(home, configured.slice(2)) : configured;
   if (!isAbsolute4(expanded) || /[\p{Cc}\p{Cf}]/u.test(expanded)) {
     throw new Error("claude: configDir must be an absolute path or start with ~/");
   }
@@ -22512,7 +22581,7 @@ function inheritsUserConfig(env) {
 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 settings2 = JSON.parse(readFileSync7(join19(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") {
@@ -22530,7 +22599,7 @@ function readClaudeAuthSettings(env, instanceEnvironment = {}) {
 function projectMcpServers(cwd) {
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync8(join20(cwd, ".mcp.json"), "utf8"));
+    parsed = JSON.parse(readFileSync7(join19(cwd, ".mcp.json"), "utf8"));
   } catch {
     return {};
   }
@@ -22598,7 +22667,7 @@ function extrasFromUnknown(value) {
 function readClaudeModelCatalog(env = process.env) {
   let settings2 = {};
   try {
-    settings2 = JSON.parse(readFileSync8(join20(resolveClaudeConfigDir(void 0, env), "settings.json"), "utf8"));
+    settings2 = JSON.parse(readFileSync7(join19(resolveClaudeConfigDir(void 0, env), "settings.json"), "utf8"));
   } catch {
     return STATIC_CLAUDE_MODELS;
   }
@@ -22639,16 +22708,17 @@ function askSummary(ask) {
   if (questions) return askQuestionSummary(questions).slice(0, 300);
   return askInputSummary(ask.input) ?? ask.tool ?? "tool";
 }
-function permissionSocketPath(threadId) {
+function permissionSocketPath(threadId, botId) {
+  const key = botId ? `${botId}\0${threadId}` : threadId;
   const prefix = threadId.replace(/[^\w-]/g, "").slice(0, 4);
-  const digest2 = createHash5("sha256").update(threadId).digest("hex").slice(0, 4);
+  const digest2 = createHash5("sha256").update(key).digest("hex").slice(0, 4);
   return brokerSocketPath(DATA_DIR, `${prefix}${digest2}`);
 }
-function brokerSocketCandidates(threadId) {
-  const base2 = permissionSocketPath(threadId);
+function brokerSocketCandidates(threadId, botId) {
+  const base2 = permissionSocketPath(threadId, botId);
   if (process.platform !== "win32") {
-    const scope = createHash5("sha256").update(`${DATA_DIR}\0${process.pid}\0${threadId}`).digest("hex").slice(0, 16);
-    return [base2, join20(tmpdir3(), `omb-perm-${scope}.sock`)];
+    const scope = createHash5("sha256").update(`${DATA_DIR}\0${process.pid}\0${botId ?? ""}\0${threadId}`).digest("hex").slice(0, 16);
+    return [base2, join19(tmpdir3(), `omb-perm-${scope}.sock`)];
   }
   return [
     base2,
@@ -22866,7 +22936,7 @@ function claudeUserMessage(text4, images) {
     source: {
       type: "base64",
       media_type: image.mime,
-      data: readFileSync8(image.path).toString("base64")
+      data: readFileSync7(image.path).toString("base64")
     }
   }));
   if (text4) content.push({ type: "text", text: text4 });
@@ -22970,11 +23040,11 @@ var init_claude = __esm({
         const { instanceId, config: config2 } = input;
         const environment = (model) => claudeEnvironment(model, { ...process.env, ...input.environment }, config2.configDir, input.environment);
         const catalogEnv = environment();
-        let models = STATIC_CLAUDE_MODELS;
+        let models2 = STATIC_CLAUDE_MODELS;
         const refreshModels = async () => {
           try {
             const resolved = await mergeLocalInject(readClaudeModelCatalog(catalogEnv), catalogEnv);
-            if (resolved.options.length) models = resolved;
+            if (resolved.options.length) models2 = resolved;
           } catch {
           }
         };
@@ -23045,8 +23115,8 @@ var init_claude = __esm({
           createdAt: (/* @__PURE__ */ new Date()).toISOString()
         });
         const retryState = /* @__PURE__ */ new Map();
-        const sendTurn = async (turn) => {
-          const { threadId } = turn;
+        const sendTurn = async (turn, logicalTurnId) => {
+          const { threadId, botId } = 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" : turn.approvalMode === "edits" ? "acceptEdits" : "default";
           const controlsHost = turn.integrations?.localComputer?.scope === "local-computer";
@@ -23054,7 +23124,7 @@ var init_claude = __esm({
             throw new Error("local computer control requires the interactive approval broker");
           }
           const promptMsg = claudeUserMessage(turn.text, turn.images);
-          const turnId = newId();
+          const turnId = logicalTurnId ?? newId();
           const retryAbort = new AbortController();
           const retry = retryState.get(threadId) ?? { attempt: 0, cancelled: false };
           retry.cancelled = false;
@@ -23159,7 +23229,7 @@ var init_claude = __esm({
             if (gated) mcpServers[name] = gated;
           }
           let broker;
-          const socketPath = permissionSocketPath(threadId);
+          const socketPath = permissionSocketPath(threadId, botId);
           if (permissionMode !== "bypassPermissions") {
             args.push("--permission-prompt-tool", "mcp__ogb__approve");
           }
@@ -23167,13 +23237,13 @@ var init_claude = __esm({
           allowed.push("mcp__ogb");
           let mcpConfigPath = null;
           if (Object.keys(mcpServers).length) {
-            mcpConfigPath = join20(mkdtempSync2(join20(tmpdir3(), "omb-mcp-")), "mcp.json");
+            mcpConfigPath = join19(mkdtempSync2(join19(tmpdir3(), "omb-mcp-")), "mcp.json");
             args.push("--mcp-config", mcpConfigPath);
             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;
+          const authSettingsPath = mcpConfigPath && Object.keys(authSettings).length ? join19(dirname9(mcpConfigPath), "auth-settings.json") : null;
           if (authSettingsPath) args.push("--settings", authSettingsPath);
           env.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS = "1";
           const cwd = turn.cwd ?? homedir9();
@@ -23198,9 +23268,11 @@ var init_claude = __esm({
           const live = sessions.get(threadId);
           if (live && !live.turn && !live.closing && live.child.exitCode === null && live.argsKey === argsKey && (!sessionId || sessionId === live.sessionId)) {
             if (live.idleTimer) clearTimeout(live.idleTimer);
-            live.turn = { turnId, settled: false, sawStreamDelta: false };
+            live.turn = { turnId, input: turn, retryAbort, settled: false, sawStreamDelta: false };
             active.set(threadId, { stop: () => {
               closeSession(threadId, "interrupted");
+              retry.cancelled = true;
+              retryAbort.abort();
               stopSession(live);
             }, turnId, broker: live.broker });
             emit({ ...base2(threadId, turnId), type: "turn.started" });
@@ -23248,14 +23320,14 @@ var init_claude = __esm({
           };
           try {
             if (turn.system) {
-              systemPromptPath = join20(mkdtempSync2(join20(tmpdir3(), "omb-system-")), "prompt.txt");
-              writeFileSync6(systemPromptPath, turn.system, { mode: 384 });
+              systemPromptPath = join19(mkdtempSync2(join19(tmpdir3(), "omb-system-")), "prompt.txt");
+              writeFileSync5(systemPromptPath, turn.system, { mode: 384 });
               args.push("--append-system-prompt-file", systemPromptPath);
             }
             if (socketPath) {
               const askTools = /* @__PURE__ */ new Map();
               broker = await createPermissionBroker({
-                socketPaths: brokerSocketCandidates(threadId),
+                socketPaths: brokerSocketCandidates(threadId, botId),
                 isActive: () => Boolean(sessions.get(threadId)?.turn),
                 onAsk: (ask) => {
                   const eventTurnId = sessions.get(threadId)?.turn?.turnId ?? turnId;
@@ -23299,10 +23371,10 @@ var init_claude = __esm({
               }
             }
             if (mcpConfigPath) {
-              writeFileSync6(mcpConfigPath, JSON.stringify({ mcpServers }), { mode: 384 });
+              writeFileSync5(mcpConfigPath, JSON.stringify({ mcpServers }), { mode: 384 });
             }
             if (authSettingsPath) {
-              writeFileSync6(authSettingsPath, JSON.stringify(authSettings), { mode: 384 });
+              writeFileSync5(authSettingsPath, JSON.stringify(authSettings), { mode: 384 });
             }
             if (sessionId) args.push("--resume", sessionId);
             else args.push("--session-id", newSessionId);
@@ -23331,7 +23403,7 @@ var init_claude = __esm({
             sessionId: sessionId ?? newSessionId,
             sawInit: false,
             nativePermissionMode: null,
-            turn: { turnId, settled: false, sawStreamDelta: false },
+            turn: { turnId, input: turn, retryAbort, settled: false, sawStreamDelta: false },
             idleTimer: null,
             closing: false,
             stderr: ""
@@ -23415,7 +23487,8 @@ var init_claude = __esm({
                       itemType: "tool",
                       itemId: b.id,
                       title: b.name,
-                      summary: commandSummary(b.input)
+                      summary: commandSummary(b.input),
+                      input: toolDetailPreview(b.input)
                     });
                   }
                 }
@@ -23433,7 +23506,7 @@ var init_claude = __esm({
               case "user":
                 for (const b of Array.isArray(o.message?.content) ? o.message.content : []) {
                   if (b.type === "tool_result") {
-                    emit({ ...base2(threadId, currentTurnId()), type: "item.completed", itemType: "tool", itemId: b.tool_use_id, ok: !b.is_error });
+                    emit({ ...base2(threadId, currentTurnId()), type: "item.completed", itemType: "tool", itemId: b.tool_use_id, ok: !b.is_error, output: toolDetailPreview(b.content) });
                   }
                 }
                 break;
@@ -23483,9 +23556,11 @@ var init_claude = __esm({
             if (closeFinalized) return;
             closeFinalized = true;
             if (session.turn && !session.turn.settled) {
+              const { turnId: turnId2, input: turn2, retryAbort: retryAbort2 } = session.turn;
+              const retry2 = retryState.get(threadId) ?? { attempt: 0, cancelled: false };
               const message2 = `claude exited ${code} before result${session.stderr ? `: ${session.stderr.trim().slice(-300)}` : ""}`;
               const verdict = classifyError({ exitCode: code, stderr: message2 });
-              if (!retry.cancelled && code !== 0 && verdict.transient && !session.turn.sawStreamDelta && retry.attempt < RETRY_MAX_ATTEMPTS - 1) {
+              if (!retry2.cancelled && code !== 0 && verdict.transient && !session.turn.sawStreamDelta && retry2.attempt < RETRY_MAX_ATTEMPTS - 1) {
                 const failedBroker = session.broker;
                 session.broker = void 0;
                 failedBroker?.pause();
@@ -23503,23 +23578,23 @@ var init_claude = __esm({
                 }
                 sessions.delete(threadId);
                 session.turn = null;
-                retry.attempt++;
-                const delayMs = computeBackoff(retry.attempt - 1);
+                retry2.attempt++;
+                const delayMs = computeBackoff(retry2.attempt - 1);
                 emit({
-                  ...base2(threadId, turnId),
+                  ...base2(threadId, turnId2),
                   type: "turn.retrying",
-                  attempt: retry.attempt,
+                  attempt: retry2.attempt,
                   delayMs,
                   reason: verdict.reason
                 });
                 void (async () => {
-                  const wait2 = interruptibleDelay(delayMs * retryScale, retryAbort.signal);
+                  const wait2 = interruptibleDelay(delayMs * retryScale, retryAbort2.signal);
                   await wait2.promise;
-                  if (retry.cancelled) {
+                  if (retry2.cancelled) {
                     active.delete(threadId);
                     retryState.delete(threadId);
                     emit({
-                      ...base2(threadId, turnId),
+                      ...base2(threadId, turnId2),
                       type: "turn.completed",
                       ok: false,
                       stopReason: "interrupted",
@@ -23530,16 +23605,16 @@ var init_claude = __esm({
                   active.delete(threadId);
                   try {
                     const cursor3 = session.sessionId ?? sessionId ?? void 0;
-                    await sendTurn({ ...turn, resumeCursor: cursor3 });
+                    await sendTurn({ ...turn2, resumeCursor: cursor3 }, turnId2);
                   } catch (e) {
                     retryState.delete(threadId);
                     emit({
-                      ...base2(threadId, turnId),
+                      ...base2(threadId, turnId2),
                       type: "runtime.error",
                       message: e instanceof Error ? e.message : String(e)
                     });
                     emit({
-                      ...base2(threadId, turnId),
+                      ...base2(threadId, turnId2),
                       type: "turn.completed",
                       ok: false,
                       stopReason: "exit_before_result",
@@ -23555,10 +23630,10 @@ var init_claude = __esm({
                 promptSubmitted: session.sawInit,
                 producedOutput: session.turn.sawStreamDelta
               });
-              if (mayReplay(resumeFailure) && !retry.cancelled) {
+              if (mayReplay(resumeFailure) && !retry2.cancelled) {
                 const recovery = recoveryPromptFor({
-                  recoveryText: turn.recoveryText,
-                  currentText: turn.text,
+                  recoveryText: turn2.recoveryText,
+                  currentText: turn2.text,
                   failure: resumeFailure
                 });
                 session.broker?.close();
@@ -23578,23 +23653,23 @@ var init_claude = __esm({
                 session.turn = null;
                 active.delete(threadId);
                 emit({
-                  ...base2(threadId, turnId),
+                  ...base2(threadId, turnId2),
                   type: "turn.retrying",
-                  attempt: retry.attempt + 1,
+                  attempt: retry2.attempt + 1,
                   delayMs: 0,
                   reason: "resume_rejected"
                 });
                 void (async () => {
                   try {
-                    await sendTurn({ ...turn, resumeCursor: void 0, recoveryText: void 0, text: recovery.text });
+                    await sendTurn({ ...turn2, resumeCursor: void 0, recoveryText: void 0, text: recovery.text }, turnId2);
                   } catch (e) {
                     retryState.delete(threadId);
                     emit({
-                      ...base2(threadId, turnId),
+                      ...base2(threadId, turnId2),
                       type: "runtime.error",
                       message: e instanceof Error ? e.message : String(e)
                     });
-                    emit({ ...base2(threadId, turnId), type: "turn.completed", ok: false, stopReason: "exit_before_result", cost: null });
+                    emit({ ...base2(threadId, turnId2), type: "turn.completed", ok: false, stopReason: "exit_before_result", cost: null });
                   }
                 })();
                 return;
@@ -23718,7 +23793,7 @@ var init_claude = __esm({
           displayName: input.displayName,
           enabled: input.enabled,
           get models() {
-            return models;
+            return models2;
           },
           refreshModels,
           snapshot,
@@ -23783,9 +23858,9 @@ var init_claude = __esm({
 });
 
 // server/drivers/codex-catalog.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync9 } from "node:fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { basename as basename5, join as join21 } from "node:path";
+import { basename as basename5, join as join20 } from "node:path";
 function encodeCodexSelection(provider, model) {
   return `${provider}${SEP}${model}`;
 }
@@ -23807,7 +23882,7 @@ function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
     let settled = false;
     let buffer = "";
     let nextId = 1;
-    const models = [];
+    const models2 = [];
     const cursors = /* @__PURE__ */ new Set();
     const pending = /* @__PURE__ */ new Map();
     const finish = (catalog) => {
@@ -23865,7 +23940,7 @@ function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
           continue;
         }
         const page = message2.result;
-        if (Array.isArray(page?.data)) models.push(...page.data);
+        if (Array.isArray(page?.data)) models2.push(...page.data);
         const cursor3 = typeof page?.nextCursor === "string" && page.nextCursor ? page.nextCursor : null;
         if (cursor3 && !cursors.has(cursor3)) {
           cursors.add(cursor3);
@@ -23875,7 +23950,7 @@ function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
         const options = [];
         const seen = /* @__PURE__ */ new Set();
         let defaultModel = null;
-        for (const row of models) {
+        for (const row of models2) {
           if (row.hidden === true || typeof row.id !== "string" || !MODEL_ID2.test(row.id) || seen.has(row.id)) continue;
           seen.add(row.id);
           options.push({
@@ -23901,7 +23976,7 @@ function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
 }
 function codexHome(env) {
   if (env.CODEX_HOME) return env.CODEX_HOME;
-  return join21(env.HOME || env.USERPROFILE || homedir10(), ".codex");
+  return join20(env.HOME || env.USERPROFILE || homedir10(), ".codex");
 }
 function unquote(raw) {
   let value = raw.trim();
@@ -23964,7 +24039,7 @@ function parseCodexToml(text4) {
 }
 function readText(path3) {
   try {
-    return readFileSync9(path3, "utf8");
+    return readFileSync8(path3, "utf8");
   } catch {
     return null;
   }
@@ -23987,11 +24062,11 @@ function niceLabel(model, provider, known, named) {
 }
 function collectCatalogNames(home) {
   const named = /* @__PURE__ */ new Map();
-  for (const file2 of listDir(join21(home, "model-catalogs"))) {
+  for (const file2 of listDir(join20(home, "model-catalogs"))) {
     if (!file2.endsWith(".json")) continue;
     const provider = basename5(file2, ".json").replace(/-models$/, "");
     if (!PROVIDER_ID.test(provider)) continue;
-    const raw = readText(join21(home, "model-catalogs", file2));
+    const raw = readText(join20(home, "model-catalogs", file2));
     if (!raw) continue;
     let parsed;
     try {
@@ -24043,7 +24118,7 @@ async function probeProviderModels(provider, env, fetchImpl) {
 async function readCodexModelCatalog(env = process.env, fetchImpl = fetch, cli) {
   const official = (cli ? await readCodexAppServerModelCatalog(cli, env) : null) ?? STATIC_CODEX_MODELS;
   const home = codexHome(env);
-  const mainText = readText(join21(home, "config.toml"));
+  const mainText = readText(join20(home, "config.toml"));
   if (!mainText) return mergeLocalInject(official, env, fetchImpl);
   const main2 = parseCodexToml(mainText);
   const known = new Map(main2.providers.map((provider) => [provider.id, provider]));
@@ -24058,7 +24133,7 @@ async function readCodexModelCatalog(env = process.env, fetchImpl = fetch, cli)
   remember(main2.modelProvider, main2.model);
   for (const file2 of listDir(home)) {
     if (!file2.endsWith(".config.toml")) continue;
-    const profile = parseCodexToml(readText(join21(home, file2)) ?? "");
+    const profile = parseCodexToml(readText(join20(home, file2)) ?? "");
     for (const provider of profile.providers) {
       if (!known.has(provider.id)) known.set(provider.id, provider);
     }
@@ -24124,8 +24199,8 @@ var init_codex_catalog = __esm({
 
 // server/drivers/codex-instructions.ts
 import { createHash as createHash6 } from "node:crypto";
-import { mkdirSync as mkdirSync9, readFileSync as readFileSync10 } from "node:fs";
-import { join as join22 } from "node:path";
+import { mkdirSync as mkdirSync9, readFileSync as readFileSync9 } from "node:fs";
+import { join as join21 } from "node:path";
 function codexDeveloperInstructions(config2, botInstructions) {
   if (!config2 || typeof config2 !== "object" || Array.isArray(config2)) {
     throw new Error("Codex returned no effective configuration; cannot safely update bot instructions.");
@@ -24139,12 +24214,12 @@ function codexDeveloperInstructions(config2, botInstructions) {
 ${configured}` : botInstructions;
 }
 async function syncCodexInstructions(key, nativeThreadId, instructions, resumed, request) {
-  const directory = join22(DATA_DIR, "codex-instructions");
-  const path3 = join22(directory, `${digest(JSON.stringify([key, nativeThreadId]))}.sha256`);
+  const directory = join21(DATA_DIR, "codex-instructions");
+  const path3 = join21(directory, `${digest(JSON.stringify([key, nativeThreadId]))}.sha256`);
   const fingerprint = digest(instructions);
   let previous;
   try {
-    previous = readFileSync10(path3, "utf8");
+    previous = readFileSync9(path3, "utf8");
   } catch (error51) {
     if (error51.code !== "ENOENT") throw error51;
   }
@@ -24187,19 +24262,19 @@ var init_codex_instructions = __esm({
 import { randomUUID as randomUUID9 } from "node:crypto";
 import { realpathSync as realpathSync2 } from "node:fs";
 import { homedir as homedir11 } from "node:os";
-import { basename as basename6, dirname as dirname10, isAbsolute as isAbsolute5, join as join23, resolve as resolve8 } from "node:path";
+import { basename as basename6, dirname as dirname10, isAbsolute as isAbsolute5, join as join22, resolve as resolve8 } from "node:path";
 import { stripVTControlCharacters as stripVTControlCharacters5 } from "node:util";
 function canonicalPath2(path3) {
   try {
     return realpathSync2(path3);
   } catch {
     const parent = dirname10(path3);
-    return parent === path3 ? path3 : join23(canonicalPath2(parent), basename6(path3));
+    return parent === path3 ? path3 : join22(canonicalPath2(parent), basename6(path3));
   }
 }
 function codexDevicePrompt(output) {
-  const clean3 = stripVTControlCharacters5(output);
-  const lines = clean3.split(/\r?\n/).slice(0, -1).map((line) => line.trim());
+  const clean = stripVTControlCharacters5(output);
+  const lines = clean.split(/\r?\n/).slice(0, -1).map((line) => line.trim());
   if (!lines.some((line) => /^https:\/\/auth\.openai\.com\/codex\/device\/?$/.test(line))) return null;
   const userCode = lines.find((line) => /^[A-Z0-9]{4,8}-[A-Z0-9]{4,8}$/.test(line));
   return userCode ? { authorizationUrl: DEVICE_URL, userCode } : null;
@@ -24245,7 +24320,7 @@ var init_codex_device_auth = __esm({
         if (!isAbsolute5(home) || env.CODEX_HOME && !isAbsolute5(env.CODEX_HOME)) {
           throw new Error("Use an absolute HOME and CODEX_HOME path for this server's Codex provider before signing in.");
         }
-        const homeKey = canonicalPath2(resolve8(env.CODEX_HOME || join23(home, ".codex")));
+        const homeKey = canonicalPath2(resolve8(env.CODEX_HOME || join22(home, ".codex")));
         if (authenticatingHomes2.has(homeKey)) {
           throw new Error("A ChatGPT sign-in is already running for this server account. Finish or cancel it before starting another.");
         }
@@ -24324,7 +24399,7 @@ var init_codex_device_auth = __esm({
         if (!isAbsolute5(home) || env.CODEX_HOME && !isAbsolute5(env.CODEX_HOME)) {
           throw new Error("Use an absolute HOME and CODEX_HOME path for this server's Codex provider before signing out.");
         }
-        const homeKey = canonicalPath2(resolve8(env.CODEX_HOME || join23(home, ".codex")));
+        const homeKey = canonicalPath2(resolve8(env.CODEX_HOME || join22(home, ".codex")));
         if (authenticatingHomes2.has(homeKey)) {
           throw new Error("A ChatGPT sign-in is running for this server account. Finish or cancel it before signing out.");
         }
@@ -24483,11 +24558,11 @@ var init_codex_device_auth = __esm({
 
 // server/drivers/codex-identity.ts
 import { homedir as homedir12 } from "node:os";
-import { isAbsolute as isAbsolute6, join as join24, resolve as resolve9 } from "node:path";
+import { isAbsolute as isAbsolute6, join as join23, resolve as resolve9 } from "node:path";
 function codexHome2(env) {
   if (env.CODEX_HOME) return isAbsolute6(env.CODEX_HOME) ? resolve9(env.CODEX_HOME) : null;
   const home = env.HOME || env.USERPROFILE || homedir12();
-  return isAbsolute6(home) ? join24(home, ".codex") : null;
+  return isAbsolute6(home) ? join23(home, ".codex") : null;
 }
 async function codexAccountEmail(cli, env, timeoutMs = 3e3) {
   const cwd = env.HOME || env.USERPROFILE || homedir12();
@@ -24617,8 +24692,8 @@ function codexUpdateCommand(cli, platform = process.platform) {
   const command = (tokens.length > 0 ? tokens : [trimmed]).map(quote).join(" ");
   return platform === "win32" ? `& ${command} update` : `${command} update`;
 }
-function codexAstraUpdate(version2, models, cli) {
-  if (models.options.some((model) => model.id === ASTRA_MODEL_ID) || !codexPredatesAstra(version2)) {
+function codexAstraUpdate(version2, models2, cli) {
+  if (models2.options.some((model) => model.id === ASTRA_MODEL_ID) || !codexPredatesAstra(version2)) {
     return void 0;
   }
   return {
@@ -24912,11 +24987,11 @@ var init_codex = __esm({
           return env;
         };
         const catalogEnv = childEnv();
-        let models = STATIC_CODEX_MODELS;
+        let models2 = STATIC_CODEX_MODELS;
         const refreshModels = async () => {
           try {
             const resolved = await readCodexModelCatalog(catalogEnv, fetch, config2.cli);
-            if (resolved.options.length) models = resolved;
+            if (resolved.options.length) models2 = resolved;
           } catch {
           }
         };
@@ -25211,7 +25286,8 @@ var init_codex = __esm({
                       itemType: "tool",
                       itemId: item.id,
                       title,
-                      summary: item.type === "commandExecution" ? commandSummary({ command: item.command }) : void 0
+                      summary: item.type === "commandExecution" ? commandSummary({ command: item.command }) : void 0,
+                      input: toolDetailPreview(item.type === "commandExecution" ? { command: item.command, cwd: item.cwd } : item.type === "mcpToolCall" ? item.arguments : item.type === "fileChange" ? item.changes : item.query)
                     });
                   }
                   break;
@@ -25244,7 +25320,8 @@ var init_codex = __esm({
                       type: "item.completed",
                       itemType: "tool",
                       itemId: item.id,
-                      ok: item.status !== "failed" && item.status !== "declined"
+                      ok: item.status !== "failed" && item.status !== "declined",
+                      output: toolDetailPreview(item.type === "commandExecution" ? { output: item.aggregatedOutput, exitCode: item.exitCode } : item.type === "mcpToolCall" ? item.error ?? item.result : item.type === "fileChange" ? item.changes : item.action)
                     });
                   } else if (item.type === "reasoning") {
                     emit({ ...base2(threadId, turnId), type: "item.updated", itemType: "reasoning", tokens: null });
@@ -25535,7 +25612,7 @@ ${stderr ?? ""}`))
             version: version2,
             authenticated,
             ...email3 ? { account: { email: email3 } } : {},
-            update: codexAstraUpdate(version2, models, config2.cli),
+            update: codexAstraUpdate(version2, models2, config2.cli),
             billing: "subscription"
           };
         };
@@ -25545,7 +25622,7 @@ ${stderr ?? ""}`))
           displayName: input.displayName,
           enabled: input.enabled,
           get models() {
-            return models;
+            return models2;
           },
           refreshModels,
           startAuthentication: () => authentication.start(),
@@ -25615,72 +25692,89 @@ function createOpenAIChatRuntime(options) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString()
   });
   const complete = async (messages, model, stream, signal, onDelta) => {
-    const timeout = AbortSignal.timeout(options.timeoutMs);
-    const response = await fetch(`${options.apiUrl}/chat/completions`, {
-      method: "POST",
-      headers: { authorization: `Bearer ${options.apiKey}`, "content-type": "application/json" },
-      body: JSON.stringify(options.requestBody(model, messages, stream)),
-      signal: signal ? AbortSignal.any([signal, timeout]) : timeout
-    });
-    if (!response.ok) {
-      const body = await response.text().catch(() => "");
-      throw new Error(`${options.httpErrorLabel} HTTP ${response.status}${body ? `: ${body.slice(0, 200)}` : ""}`);
-    }
-    if (!stream) {
-      const json2 = await response.json();
-      const message2 = json2.choices?.[0]?.message;
-      return {
-        text: typeof message2?.content === "string" ? message2.content : "",
-        reasoning: options.reasoning && typeof message2?.reasoning_content === "string" ? message2.reasoning_content : "",
-        usage: usageFrom(json2.usage)
-      };
-    }
-    if (!response.body) {
-      throw new Error(options.noBodyError ?? `${options.httpErrorLabel} returned no response body`);
-    }
-    let text4 = "";
-    let reasoning = "";
-    let usage = null;
-    const reader = response.body.getReader();
-    const decoder = new TextDecoder();
-    let buffer = "";
+    const timeoutController = new AbortController();
+    let idleTimer = null;
+    const resetIdleTimer = () => {
+      if (idleTimer) clearTimeout(idleTimer);
+      idleTimer = setTimeout(() => {
+        timeoutController.abort(new DOMException("Streaming idle timeout elapsed", "AbortError"));
+      }, options.timeoutMs);
+    };
+    resetIdleTimer();
     try {
-      readLoop: for (; ; ) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        let newline;
-        while ((newline = buffer.indexOf("\n")) !== -1) {
-          const line = buffer.slice(0, newline).trim();
-          buffer = buffer.slice(newline + 1);
-          if (!line.startsWith("data:")) continue;
-          const data = line.slice(5).trim();
-          if (data === "[DONE]") break readLoop;
-          let chunk;
-          try {
-            chunk = JSON.parse(data);
-          } catch {
-            continue;
-          }
-          const delta = chunk.choices?.[0]?.delta;
-          const reasoningDelta = options.reasoning && typeof delta?.reasoning_content === "string" ? delta.reasoning_content : "";
-          const contentDelta = typeof delta?.content === "string" ? delta.content : "";
-          if (reasoningDelta) {
-            reasoning += reasoningDelta;
-            onDelta?.(reasoningDelta, "reasoning_text");
-          }
-          if (contentDelta) {
-            text4 += contentDelta;
-            onDelta?.(contentDelta, "assistant_text");
+      const activeSignal = signal ? AbortSignal.any([signal, timeoutController.signal]) : timeoutController.signal;
+      const response = await fetch(`${options.apiUrl}/chat/completions`, {
+        method: "POST",
+        headers: { authorization: `Bearer ${options.apiKey}`, "content-type": "application/json" },
+        body: JSON.stringify(options.requestBody(model, messages, stream)),
+        signal: activeSignal
+      });
+      if (!response.ok) {
+        const body = await response.text().catch(() => "");
+        throw new Error(`${options.httpErrorLabel} HTTP ${response.status}${body ? `: ${body.slice(0, 200)}` : ""}`);
+      }
+      if (!stream) {
+        const json2 = await response.json();
+        const message2 = json2.choices?.[0]?.message;
+        return {
+          text: typeof message2?.content === "string" ? message2.content : "",
+          reasoning: options.reasoning && typeof message2?.reasoning_content === "string" ? message2.reasoning_content : "",
+          usage: usageFrom(json2.usage)
+        };
+      }
+      if (!response.body) {
+        throw new Error(options.noBodyError ?? `${options.httpErrorLabel} returned no response body`);
+      }
+      let text4 = "";
+      let reasoning = "";
+      let usage = null;
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+      try {
+        readLoop: for (; ; ) {
+          const { done, value } = await reader.read();
+          if (done) {
+            if (buffer.trim() === "data: [DONE]") break;
+            throw new DOMException("Stream ended before completion", "AbortError");
+          }
+          resetIdleTimer();
+          buffer += decoder.decode(value, { stream: true });
+          let newline;
+          while ((newline = buffer.indexOf("\n")) !== -1) {
+            const line = buffer.slice(0, newline).trim();
+            buffer = buffer.slice(newline + 1);
+            if (!line.startsWith("data:")) continue;
+            const data = line.slice(5).trim();
+            if (data === "[DONE]") break readLoop;
+            let chunk;
+            try {
+              chunk = JSON.parse(data);
+            } catch {
+              continue;
+            }
+            const delta = chunk.choices?.[0]?.delta;
+            const reasoningDelta = options.reasoning && typeof delta?.reasoning_content === "string" ? delta.reasoning_content : "";
+            const contentDelta = typeof delta?.content === "string" ? delta.content : "";
+            if (reasoningDelta) {
+              reasoning += reasoningDelta;
+              onDelta?.(reasoningDelta, "reasoning_text");
+            }
+            if (contentDelta) {
+              text4 += contentDelta;
+              onDelta?.(contentDelta, "assistant_text");
+            }
+            if (chunk.usage) usage = usageFrom(chunk.usage);
           }
-          if (chunk.usage) usage = usageFrom(chunk.usage);
         }
+      } finally {
+        await reader.cancel().catch(() => {
+        });
       }
+      return { text: text4, reasoning, usage };
     } finally {
-      await reader.cancel().catch(() => {
-      });
+      if (idleTimer) clearTimeout(idleTimer);
     }
-    return { text: text4, reasoning, usage };
   };
   const messagesFor = (turn) => [
     ...turn.system ? [{ role: "system", content: turn.system }] : [],
@@ -25875,12 +25969,12 @@ var init_grok = __esm({
 });
 
 // server/drivers/acp/grok.ts
-import { existsSync as existsSync11, readFileSync as readFileSync11, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync11, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "node:fs";
 import { homedir as homedir14 } from "node:os";
-import { join as join25 } from "node:path";
+import { join as join24 } from "node:path";
 function grokHome(env) {
   if (env.GROK_HOME) return env.GROK_HOME;
-  return join25(env.HOME || env.USERPROFILE || homedir14(), ".grok");
+  return join24(env.HOME || env.USERPROFILE || homedir14(), ".grok");
 }
 function unquote2(raw) {
   const value = raw.trim();
@@ -25890,10 +25984,10 @@ function unquote2(raw) {
   return value;
 }
 function readGrokModelCatalog(env = process.env) {
-  const path3 = join25(grokHome(env), "config.toml");
+  const path3 = join24(grokHome(env), "config.toml");
   let text4 = "";
   try {
-    text4 = readFileSync11(path3, "utf8");
+    text4 = readFileSync10(path3, "utf8");
   } catch {
     return STATIC_GROK_MODELS;
   }
@@ -25963,10 +26057,10 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
   if (!inject) return modelId;
   const host = localHost(inject.host);
   if (!host) return modelId;
-  const path3 = join25(grokHome(env), "config.toml");
+  const path3 = join24(grokHome(env), "config.toml");
   let text4 = "";
   try {
-    text4 = readFileSync11(path3, "utf8");
+    text4 = readFileSync10(path3, "utf8");
   } catch {
     text4 = "";
   }
@@ -26017,7 +26111,7 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
   const next = text4 && !text4.endsWith("\n") ? `${text4}
 
 ${block2}` : `${text4}${text4 ? "\n" : ""}${block2}`;
-  writeFileSync7(path3, next);
+  writeFileSync6(path3, next);
   return slug;
 }
 function grokAcceptsUnadvertisedImages(init) {
@@ -26109,7 +26203,7 @@ var init_grok2 = __esm({
       // an unauthenticated CLI is a user action, not something to paper over.
       pickAuthMethod: (methods) => methods.some((m) => m.id === "cached_token") ? "cached_token" : null,
       authFailure: "fail",
-      isAuthenticated: () => existsSync11(join25(homedir14(), ".grok", "auth.json")),
+      isAuthenticated: () => existsSync11(join24(homedir14(), ".grok", "auth.json")),
       // `--append-system-prompt`/`--rules` are accepted by the CLI but do NOT
       // reach the agent-stdio system prompt (verified against 1.0.0), so the
       // persona is prepended codex-style.
@@ -26122,12 +26216,12 @@ ${turn.text}` : turn.text
 });
 
 // server/drivers/acp/gemini.ts
-import { existsSync as existsSync12, readFileSync as readFileSync12 } from "node:fs";
+import { existsSync as existsSync12, readFileSync as readFileSync11 } from "node:fs";
 import { homedir as homedir15 } from "node:os";
-import { join as join26 } from "node:path";
+import { join as join25 } from "node:path";
 function liveOauthCredential() {
   try {
-    const creds = JSON.parse(readFileSync12(join26(homedir15(), ".gemini", "oauth_creds.json"), "utf8"));
+    const creds = JSON.parse(readFileSync11(join25(homedir15(), ".gemini", "oauth_creds.json"), "utf8"));
     if (typeof creds.access_token !== "string" || creds.access_token.trim().length === 0) return false;
     const hasRefresh = typeof creds.refresh_token === "string" && creds.refresh_token.trim().length > 0;
     if (creds.expiry_date !== void 0) {
@@ -26140,7 +26234,7 @@ function liveOauthCredential() {
   }
 }
 function geminiIsAuthenticated(env) {
-  return nonBlank(env.GEMINI_API_KEY) || nonBlank(env.GOOGLE_API_KEY) || existsSync12(join26(homedir15(), ".gemini", "oauth_creds.json")) && liveOauthCredential();
+  return nonBlank(env.GEMINI_API_KEY) || nonBlank(env.GOOGLE_API_KEY) || existsSync12(join25(homedir15(), ".gemini", "oauth_creds.json")) && liveOauthCredential();
 }
 var AUTH_PREFERENCE, nonBlank, support3, GeminiAgentDriver;
 var init_gemini = __esm({
@@ -26182,17 +26276,17 @@ ${turn.text}` : turn.text
 });
 
 // server/drivers/acp/kimi.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync10, readFileSync as readFileSync13, writeFileSync as writeFileSync8 } from "node:fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync10, readFileSync as readFileSync12, writeFileSync as writeFileSync7 } from "node:fs";
 import { homedir as homedir16 } from "node:os";
-import { join as join27 } from "node:path";
+import { join as join26 } from "node:path";
 function isLocalInjectAlias(slug) {
   return LOCAL_PROVIDER_PREFIXES.some((prefix) => slug.startsWith(prefix));
 }
 function kimiDataRoot(env) {
-  return env.KIMI_CODE_HOME || join27(env.HOME || env.USERPROFILE || homedir16(), ".kimi-code");
+  return env.KIMI_CODE_HOME || join26(env.HOME || env.USERPROFILE || homedir16(), ".kimi-code");
 }
 function credentialsPath(env) {
-  return join27(kimiDataRoot(env), "credentials", "kimi-code.json");
+  return join26(kimiDataRoot(env), "credentials", "kimi-code.json");
 }
 function quoteToml2(value) {
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
@@ -26480,10 +26574,10 @@ function ensureKimiInjectAlias(modelId, env = process.env) {
   const alias = `${inject.host}/${inject.model.replace(/\//g, "-")}`;
   const dataRoot = kimiDataRoot(env);
   mkdirSync10(dataRoot, { recursive: true });
-  const path3 = join27(dataRoot, "config.toml");
+  const path3 = join26(dataRoot, "config.toml");
   let text4 = "";
   try {
-    text4 = readFileSync13(path3, "utf8");
+    text4 = readFileSync12(path3, "utf8");
   } catch {
     text4 = "";
   }
@@ -26521,9 +26615,9 @@ function ensureKimiInjectAlias(modelId, env = process.env) {
 
 ` : text4 ? `${text4}
 ` : "";
-    writeFileSync8(path3, `${prefix}${blocks.join("\n")}`);
+    writeFileSync7(path3, `${prefix}${blocks.join("\n")}`);
   } else if (text4 !== original) {
-    writeFileSync8(path3, text4);
+    writeFileSync7(path3, text4);
   }
   return alias;
 }
@@ -26545,7 +26639,7 @@ function readKimiModelCatalog(env) {
   const dataRoot = kimiDataRoot(env);
   let text4 = "";
   try {
-    text4 = readFileSync13(join27(dataRoot, "config.toml"), "utf8");
+    text4 = readFileSync12(join26(dataRoot, "config.toml"), "utf8");
   } catch {
     return STATIC_KIMI_MODELS;
   }
@@ -26664,12 +26758,12 @@ ${turn.text}` : turn.text
 });
 
 // server/drivers/acp/droid.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync11, readFileSync as readFileSync14, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync8 } from "node:fs";
 import { homedir as homedir17 } from "node:os";
-import { join as join28 } from "node:path";
+import { join as join27 } from "node:path";
 function authFilePaths(env) {
   const home = env.FACTORY_HOME_OVERRIDE || env.HOME || homedir17();
-  return AUTH_FILES.map((name) => join28(home, ".factory", name));
+  return AUTH_FILES.map((name) => join27(home, ".factory", name));
 }
 function droidInjectId(host, model) {
   const safe = `${host}-${model}`.replace(/[^a-zA-Z0-9._+-]+/g, "-").replace(/-+/g, "-");
@@ -26684,12 +26778,12 @@ function ensureDroidInjectModel(modelId, env = process.env) {
   const host = localHost(inject.host);
   if (!host) return modelId;
   const id = droidInjectId(inject.host, inject.model);
-  const dir = join28(factoryHome(env), ".factory");
+  const dir = join27(factoryHome(env), ".factory");
   mkdirSync11(dir, { recursive: true });
-  const path3 = join28(dir, "settings.json");
+  const path3 = join27(dir, "settings.json");
   let settings2 = {};
   try {
-    settings2 = JSON.parse(readFileSync14(path3, "utf8"));
+    settings2 = JSON.parse(readFileSync13(path3, "utf8"));
   } catch (error51) {
     if (existsSync14(path3)) throw error51;
   }
@@ -26701,7 +26795,7 @@ function ensureDroidInjectModel(modelId, env = process.env) {
     if (!match.id) {
       match.id = id;
       settings2.customModels = custom2;
-      writeFileSync9(path3, `${JSON.stringify(settings2, null, 2)}
+      writeFileSync8(path3, `${JSON.stringify(settings2, null, 2)}
 `);
     }
     return match.id;
@@ -26715,7 +26809,7 @@ function ensureDroidInjectModel(modelId, env = process.env) {
     provider: "generic-chat-completion-api"
   });
   settings2.customModels = custom2;
-  writeFileSync9(path3, `${JSON.stringify(settings2, null, 2)}
+  writeFileSync8(path3, `${JSON.stringify(settings2, null, 2)}
 `);
   return id;
 }
@@ -26726,7 +26820,7 @@ function applyDroidLocalAuthEnv(env, modelId) {
   env.FACTORY_API_KEY = "openmausbot-local";
 }
 function readSettings(env) {
-  return JSON.parse(readFileSync14(join28(factoryHome(env), ".factory", "settings.json"), "utf8"));
+  return JSON.parse(readFileSync13(join27(factoryHome(env), ".factory", "settings.json"), "utf8"));
 }
 async function resolveModels(env) {
   let catalog = MODELS3;
@@ -27116,9 +27210,9 @@ ${turn.text}` : turn.text
 });
 
 // server/drivers/acp/opencode-go.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync12, readFileSync as readFileSync15, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync12, readFileSync as readFileSync14, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir18 } from "node:os";
-import { join as join29 } from "node:path";
+import { join as join28 } from "node:path";
 function labelForModel(id) {
   return id.split(/[-_.]+/g).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
 }
@@ -27219,7 +27313,7 @@ async function discoverOpenCodeModels(environment, cli = "opencode") {
 }
 function opencodeConfigDir(env) {
   const home = env.HOME || env.USERPROFILE || homedir18();
-  return join29(env.XDG_CONFIG_HOME || join29(home, ".config"), "opencode");
+  return join28(env.XDG_CONFIG_HOME || join28(home, ".config"), "opencode");
 }
 function ensureOpenCodeInjectModel(modelId, env = process.env) {
   const inject = decodeInjectId(modelId);
@@ -27229,11 +27323,11 @@ function ensureOpenCodeInjectModel(modelId, env = process.env) {
   const native = `${inject.host}/${inject.model}`;
   const dir = opencodeConfigDir(env);
   mkdirSync12(dir, { recursive: true });
-  const path3 = join29(dir, "opencode.json");
+  const path3 = join28(dir, "opencode.json");
   let config2 = { $schema: "https://opencode.ai/config.json" };
   if (existsSync15(path3)) {
     try {
-      config2 = JSON.parse(readFileSync15(path3, "utf8"));
+      config2 = JSON.parse(readFileSync14(path3, "utf8"));
     } catch {
     }
   }
@@ -27248,29 +27342,29 @@ function ensureOpenCodeInjectModel(modelId, env = process.env) {
   const options = existing.options && typeof existing.options === "object" && !Array.isArray(existing.options) ? { ...existing.options } : {};
   options.baseURL = host.baseUrl;
   if (!options.apiKey) options.apiKey = hostApiKey(host, env);
-  const models = existing.models && typeof existing.models === "object" && !Array.isArray(existing.models) ? { ...existing.models } : {};
-  if (!models[inject.model]) {
-    models[inject.model] = { name: `${inject.model} (${host.label})` };
+  const models2 = existing.models && typeof existing.models === "object" && !Array.isArray(existing.models) ? { ...existing.models } : {};
+  if (!models2[inject.model]) {
+    models2[inject.model] = { name: `${inject.model} (${host.label})` };
   }
   providers[inject.host] = {
     ...existing,
     npm: existing.npm || "@ai-sdk/openai-compatible",
     name: existing.name || host.label,
     options,
-    models
+    models: models2
   };
   config2.provider = providers;
-  writeFileSync10(path3, `${JSON.stringify(config2, null, 2)}
+  writeFileSync9(path3, `${JSON.stringify(config2, null, 2)}
 `);
   return native;
 }
 function storedAuthPaths(env) {
   const home = env.HOME || env.USERPROFILE || homedir18();
   const roots = [
-    env.XDG_DATA_HOME || join29(home, ".local", "share"),
-    process.platform === "darwin" ? join29(home, "Library", "Application Support") : process.platform === "win32" ? env.LOCALAPPDATA || join29(home, "AppData", "Local") : ""
+    env.XDG_DATA_HOME || join28(home, ".local", "share"),
+    process.platform === "darwin" ? join28(home, "Library", "Application Support") : process.platform === "win32" ? env.LOCALAPPDATA || join28(home, "AppData", "Local") : ""
   ].filter(Boolean);
-  return [...new Set(roots)].map((root) => join29(root, "opencode", "auth.json"));
+  return [...new Set(roots)].map((root) => join28(root, "opencode", "auth.json"));
 }
 function usableAuthEntry(parsed) {
   return Object.values(parsed).some((auth) => {
@@ -27284,7 +27378,7 @@ function hasStoredOpenCodeAuth(env) {
   if (env.OPENCODE_AUTH_CONTENT) candidates.push(env.OPENCODE_AUTH_CONTENT);
   for (const path3 of storedAuthPaths(env)) {
     try {
-      candidates.push(readFileSync15(path3, "utf8"));
+      candidates.push(readFileSync14(path3, "utf8"));
     } catch {
     }
   }
@@ -27400,13 +27494,13 @@ ${turn.text}` : turn.text
 });
 
 // server/drivers/acp/qwen.ts
-import { chmodSync as chmodSync5, existsSync as existsSync16, mkdirSync as mkdirSync13, readFileSync as readFileSync16, writeFileSync as writeFileSync11 } from "node:fs";
+import { chmodSync as chmodSync5, existsSync as existsSync16, mkdirSync as mkdirSync13, readFileSync as readFileSync15, writeFileSync as writeFileSync10 } from "node:fs";
 import { createHash as createHash7 } from "node:crypto";
 import { homedir as homedir19 } from "node:os";
-import { join as join30 } from "node:path";
+import { join as join29 } from "node:path";
 function qwenHome(env) {
   const home = process.platform === "win32" ? env.USERPROFILE || env.HOME || homedir19() : env.HOME || env.USERPROFILE || homedir19();
-  return join30(home, ".qwen");
+  return join29(home, ".qwen");
 }
 function isRecord2(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
@@ -27418,7 +27512,7 @@ function qwenModelLabel(id, name) {
 function readQwenRoutes(env) {
   let settings2;
   try {
-    settings2 = JSON.parse(readFileSync16(join30(qwenHome(env), "settings.json"), "utf8"));
+    settings2 = JSON.parse(readFileSync15(join29(qwenHome(env), "settings.json"), "utf8"));
   } catch {
     return [];
   }
@@ -27502,11 +27596,11 @@ function ensureQwenInjectModel(modelId, env = process.env) {
   if (!host) return modelId;
   const dir = qwenHome(env);
   mkdirSync13(dir, { recursive: true });
-  const path3 = join30(dir, "settings.json");
+  const path3 = join29(dir, "settings.json");
   let settings2 = {};
   if (existsSync16(path3)) {
     try {
-      settings2 = JSON.parse(readFileSync16(path3, "utf8"));
+      settings2 = JSON.parse(readFileSync15(path3, "utf8"));
     } catch {
     }
   }
@@ -27530,7 +27624,7 @@ function ensureQwenInjectModel(modelId, env = process.env) {
     providers.openai = openai;
     settings2.modelProviders = providers;
   }
-  writeFileSync11(path3, `${JSON.stringify(settings2, null, 2)}
+  writeFileSync10(path3, `${JSON.stringify(settings2, null, 2)}
 `, { mode: 384 });
   try {
     chmodSync5(path3, 384);
@@ -29594,7 +29688,7 @@ var init_YAMLMap = __esm({
       static from(schema4, obj, ctx) {
         const { keepUndefined, replacer } = ctx;
         const map3 = new this(schema4);
-        const add2 = (key, value) => {
+        const add = (key, value) => {
           if (typeof replacer === "function")
             value = replacer.call(obj, key, value);
           else if (Array.isArray(replacer) && !replacer.includes(key))
@@ -29604,10 +29698,10 @@ var init_YAMLMap = __esm({
         };
         if (obj instanceof Map) {
           for (const [key, value] of obj)
-            add2(key, value);
+            add(key, value);
         } else if (obj && typeof obj === "object") {
           for (const key of Object.keys(obj))
-            add2(key, obj[key]);
+            add(key, obj[key]);
         }
         if (typeof schema4.sortMapEntries === "function") {
           map3.items.sort(schema4.sortMapEntries);
@@ -34501,9 +34595,9 @@ var init_browser = __esm({
 
 // server/drivers/acp/hermes.ts
 import { spawn as spawn6 } from "node:child_process";
-import { mkdirSync as mkdirSync14, readFileSync as readFileSync17, writeFileSync as writeFileSync12 } from "node:fs";
+import { mkdirSync as mkdirSync14, readFileSync as readFileSync16, writeFileSync as writeFileSync11 } from "node:fs";
 import { homedir as homedir20 } from "node:os";
-import { join as join31 } from "node:path";
+import { join as join30 } from "node:path";
 function bindHermesScreenshotCompat(env, modelId) {
   delete env[HERMES_OPENMAUS_SCREENSHOT_COMPAT];
   delete env[HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL];
@@ -34513,7 +34607,7 @@ function bindHermesScreenshotCompat(env, modelId) {
   env[HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL] = inject.model;
 }
 function hermesHome(env) {
-  return env.HERMES_HOME || join31(env.HOME || env.USERPROFILE || homedir20(), ".hermes");
+  return env.HERMES_HOME || join30(env.HOME || env.USERPROFILE || homedir20(), ".hermes");
 }
 function quoteYaml(value) {
   if (/^[\w./:+-]+$/.test(value)) return value;
@@ -34555,15 +34649,15 @@ function ensureHermesInjectProvider(modelId, env = process.env) {
   if (!host) return modelId;
   const dir = hermesHome(env);
   mkdirSync14(dir, { recursive: true });
-  const path3 = join31(dir, "config.yaml");
+  const path3 = join30(dir, "config.yaml");
   let text4 = "";
   try {
-    text4 = readFileSync17(path3, "utf8");
+    text4 = readFileSync16(path3, "utf8");
   } catch {
     text4 = "";
   }
   const next = upsertHermesProvider(text4, inject.host, host.baseUrl, hostApiKey(host, env));
-  if (next !== text4) writeFileSync12(path3, next);
+  if (next !== text4) writeFileSync11(path3, next);
   return hermesAcpModelId(modelId) ?? modelId;
 }
 function hermesAcpModelId(modelId) {
@@ -34626,13 +34720,13 @@ function hermesConfiguredModel(env = process.env) {
   const dir = hermesHome(env);
   let secrets = "";
   try {
-    secrets = readFileSync17(join31(dir, ".env"), "utf8");
+    secrets = readFileSync16(join30(dir, ".env"), "utf8");
   } catch {
   }
   const hasHostedProviderKey = HERMES_HOSTED_PROVIDER_KEYS.some((name) => nonEmptyDotenvValue(secrets, name));
   let configuredDefault = null;
   try {
-    configuredDefault = hermesConfigDefault(readFileSync17(join31(dir, "config.yaml"), "utf8"));
+    configuredDefault = hermesConfigDefault(readFileSync16(join30(dir, "config.yaml"), "utf8"));
   } catch {
   }
   const configuredProvider = configuredDefault?.provider.toLowerCase() ?? "";
@@ -34647,11 +34741,18 @@ function hermesConfiguredModel(env = process.env) {
     custom: true
   };
 }
+function hermesAcpModelsTimeoutMs(env) {
+  const raw = env[HERMES_ACP_MODELS_TIMEOUT_ENV];
+  if (raw === void 0) return HERMES_ACP_MODELS_DEFAULT_TIMEOUT_MS;
+  const parsed = Number(raw);
+  return Number.isInteger(parsed) && parsed > 0 && parsed <= 2147483647 ? parsed : HERMES_ACP_MODELS_DEFAULT_TIMEOUT_MS;
+}
 async function fetchHermesAcpModels(cli, env) {
   return await new Promise((resolve13) => {
     let child;
     try {
-      child = spawn6(cli, ["acp"], { stdio: ["pipe", "pipe", "ignore"], env });
+      const resolved = resolveCli(cli, ["acp"], env);
+      child = spawn6(resolved.command, resolved.args, { stdio: ["pipe", "pipe", "ignore"], env, windowsHide: true });
     } catch {
       return resolve13([]);
     }
@@ -34676,7 +34777,7 @@ async function fetchHermesAcpModels(cli, env) {
       }
       resolve13(out);
     };
-    timer = setTimeout(() => done([]), 5e3);
+    timer = setTimeout(() => done([]), hermesAcpModelsTimeoutMs(env));
     child.once("error", () => done([]));
     child.once("close", () => {
       if (hardKillTimer) clearTimeout(hardKillTimer);
@@ -34756,11 +34857,12 @@ async function applySetting2(request, method, params, what) {
     throw new Error(`Hermes rejected ${what} via ${method}: ${e.message}`);
   }
 }
-var EMPTY2, HERMES_OPENMAUS_SCREENSHOT_COMPAT, HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL, HERMES_CONFIG_MODEL_ID, HERMES_HOSTED_PROVIDER_KEYS, HERMES_LOCAL_CONFIG_PROVIDERS, support10, HermesAgentDriver;
+var EMPTY2, HERMES_OPENMAUS_SCREENSHOT_COMPAT, HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL, HERMES_CONFIG_MODEL_ID, HERMES_HOSTED_PROVIDER_KEYS, HERMES_LOCAL_CONFIG_PROVIDERS, HERMES_ACP_MODELS_TIMEOUT_ENV, HERMES_ACP_MODELS_DEFAULT_TIMEOUT_MS, support10, HermesAgentDriver;
 var init_hermes = __esm({
   "server/drivers/acp/hermes.ts"() {
     "use strict";
     init_browser();
+    init_procs();
     init_local_inject();
     init_core3();
     EMPTY2 = { default: "", options: [] };
@@ -34774,6 +34876,8 @@ var init_hermes = __esm({
       "Z_AI_API_KEY"
     ];
     HERMES_LOCAL_CONFIG_PROVIDERS = /* @__PURE__ */ new Set(["custom", "lmstudio", "ollama", "vllm", "llamacpp"]);
+    HERMES_ACP_MODELS_TIMEOUT_ENV = "HERMES_ACP_MODELS_TIMEOUT_MS";
+    HERMES_ACP_MODELS_DEFAULT_TIMEOUT_MS = 15e3;
     support10 = {
       driverKind: "hermesAgent",
       displayName: "Hermes",
@@ -34846,12 +34950,19 @@ function decodeConfig5(raw) {
     provider: typeof config2.provider === "string" ? config2.provider || void 0 : process.env.OPENAI_COMPAT_PROVIDER || void 0
   };
 }
-var DRIVER_KIND5, DEFAULT_MODELS, OpenAICompatDriver;
+var DRIVER_KIND5, DEFAULT_IDLE_TIMEOUT_MS, idleTimeoutMs, DEFAULT_MODELS, OpenAICompatDriver;
 var init_openai_compat = __esm({
   "server/drivers/openai-compat.ts"() {
     "use strict";
     init_openai_chat();
     DRIVER_KIND5 = "openai-compat";
+    DEFAULT_IDLE_TIMEOUT_MS = 18e4;
+    idleTimeoutMs = () => {
+      const raw = process.env.OPENMAUS_OPENAI_COMPAT_IDLE_TIMEOUT_MS;
+      if (!raw) return DEFAULT_IDLE_TIMEOUT_MS;
+      const value = Number(raw);
+      return Number.isSafeInteger(value) && value >= 1e3 && value <= 2147483647 ? value : DEFAULT_IDLE_TIMEOUT_MS;
+    };
     DEFAULT_MODELS = {
       default: "meta-llama/llama-3.3-70b-instruct",
       options: [
@@ -34932,7 +35043,7 @@ var init_openai_compat = __esm({
           httpErrorLabel: "upstream",
           missingKeyError: `no API key \u2014 set ${config2.apiKeyEnv} or add it to the instance config`,
           unavailableReason: `no API key \u2014 set ${config2.apiKeyEnv} or add it to the instance config`,
-          timeoutMs: 12e4,
+          timeoutMs: idleTimeoutMs(),
           reasoning: true,
           billing: "metered",
           includeUsageInCompleted: true,
@@ -34952,13 +35063,13 @@ var init_openai_compat = __esm({
 });
 
 // server/drivers/pi.ts
-import { chmodSync as chmodSync6, existsSync as existsSync17, mkdirSync as mkdirSync15, mkdtempSync as mkdtempSync3, readFileSync as readFileSync18, rmSync as rmSync5, writeFileSync as writeFileSync13 } from "node:fs";
+import { chmodSync as chmodSync6, existsSync as existsSync17, mkdirSync as mkdirSync15, mkdtempSync as mkdtempSync3, readFileSync as readFileSync17, rmSync as rmSync5, writeFileSync as writeFileSync12 } from "node:fs";
 import { homedir as homedir21, tmpdir as tmpdir4 } from "node:os";
-import { join as join32 } from "node:path";
+import { join as join31 } from "node:path";
 function readPiPromptImages(turn) {
   return (turn.images ?? []).map((image) => ({
     type: "image",
-    data: readFileSync18(image.path).toString("base64"),
+    data: readFileSync17(image.path).toString("base64"),
     mimeType: image.mime
   }));
 }
@@ -35061,7 +35172,7 @@ async function applyPiLocalCatalog(catalog, env = process.env, fetchImpl = fetch
   return preferPiInjectRows(await mergeLocalInject(catalog, env, fetchImpl));
 }
 function piAgentDir(env) {
-  return join32(env.HOME || env.USERPROFILE || homedir21(), ".pi", "agent");
+  return join31(env.HOME || env.USERPROFILE || homedir21(), ".pi", "agent");
 }
 function ensurePiInjectModel(modelId, env = process.env) {
   const split = splitPiModel(modelId);
@@ -35072,11 +35183,11 @@ function ensurePiInjectModel(modelId, env = process.env) {
   if (!host) return split;
   const dir = piAgentDir(env);
   mkdirSync15(dir, { recursive: true });
-  const path3 = join32(dir, "models.json");
+  const path3 = join31(dir, "models.json");
   let root = { providers: {} };
   if (existsSync17(path3)) {
     try {
-      const parsed = JSON.parse(readFileSync18(path3, "utf8"));
+      const parsed = JSON.parse(readFileSync17(path3, "utf8"));
       if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
         root = parsed;
       } else {
@@ -35101,11 +35212,11 @@ function ensurePiInjectModel(modelId, env = process.env) {
   if (!existing.compat) {
     existing.compat = { supportsDeveloperRole: false, supportsReasoningEffort: true };
   }
-  const models = Array.isArray(existing.models) ? existing.models.filter(
+  const models2 = Array.isArray(existing.models) ? existing.models.filter(
     (row) => Boolean(row) && typeof row === "object" && !Array.isArray(row)
   ) : [];
-  if (!models.some((row) => row.id === inject.model)) {
-    models.push({
+  if (!models2.some((row) => row.id === inject.model)) {
+    models2.push({
       id: inject.model,
       name: inject.model,
       reasoning: true,
@@ -35114,10 +35225,10 @@ function ensurePiInjectModel(modelId, env = process.env) {
       maxTokens: 16384
     });
   }
-  existing.models = models;
+  existing.models = models2;
   providers[inject.host] = existing;
   root.providers = providers;
-  writeFileSync13(path3, `${JSON.stringify(root, null, 2)}
+  writeFileSync12(path3, `${JSON.stringify(root, null, 2)}
 `, { mode: 384 });
   try {
     chmodSync6(path3, 384);
@@ -35128,7 +35239,7 @@ function ensurePiInjectModel(modelId, env = process.env) {
 function readPiDefaultModel(env) {
   const home = env.HOME || env.USERPROFILE || homedir21();
   try {
-    const s = JSON.parse(readFileSync18(`${home}/.pi/agent/settings.json`, "utf8"));
+    const s = JSON.parse(readFileSync17(`${home}/.pi/agent/settings.json`, "utf8"));
     return s.defaultProvider && s.defaultModel ? `${s.defaultProvider}/${s.defaultModel}` : "";
   } catch {
     return "";
@@ -35176,6 +35287,16 @@ async function fetchPiModels(cli, env) {
     }
   });
 }
+async function updatePiModelCatalog(cli, env) {
+  return new Promise((resolve13) => {
+    execCli(
+      cli,
+      PI_MODEL_UPDATE_ARGS,
+      { env, timeout: 6e4, maxBuffer: 1024 * 1024 },
+      (error51) => resolve13(!error51)
+    );
+  });
+}
 function decodeConfig6(raw) {
   if (raw === null || raw === void 0) return { cli: "pi", fullAuto: false };
   if (typeof raw !== "object") throw new Error("pi config must be an object");
@@ -35193,7 +35314,7 @@ function piEnvironment(source) {
   for (const key of PROVIDER_CREDENTIAL_ENV) delete env[key];
   return env;
 }
-var DRIVER_KIND6, PI_ARGS, NODE_ENV_FLAG2, EMPTY3, PiDriver;
+var DRIVER_KIND6, PI_ARGS, PI_MODEL_UPDATE_ARGS, NODE_ENV_FLAG2, EMPTY3, PiDriver;
 var init_pi = __esm({
   "server/drivers/pi.ts"() {
     "use strict";
@@ -35202,11 +35323,13 @@ var init_pi = __esm({
     init_env_path();
     init_procs();
     init_proxy_paths();
+    init_tool_summary();
     init_contracts();
     init_local_inject();
     init_native();
     DRIVER_KIND6 = "piAgent";
     PI_ARGS = ["--mode", "rpc", "--no-session"];
+    PI_MODEL_UPDATE_ARGS = ["update", "--models", "--no-approve"];
     NODE_ENV_FLAG2 = { ELECTRON_RUN_AS_NODE: "1" };
     EMPTY3 = { default: "", options: [] };
     PiDriver = {
@@ -35227,9 +35350,9 @@ var init_pi = __esm({
       async create(input) {
         const { instanceId, config: config2 } = input;
         const catalogEnv = piEnvironment({ ...process.env, ...input.environment });
-        let models = EMPTY3;
-        const refreshModels = async () => {
-          let base3 = models;
+        let models2 = EMPTY3;
+        const readModels = async () => {
+          let base3 = models2;
           try {
             const resolved = await fetchPiModels(config2.cli, catalogEnv);
             if (resolved.options.length) base3 = resolved;
@@ -35237,12 +35360,16 @@ var init_pi = __esm({
           }
           try {
             const next = await applyPiLocalCatalog(base3, catalogEnv);
-            if (next.options.length) models = next;
+            if (next.options.length) models2 = next;
           } catch {
-            if (base3.options.length) models = base3;
+            if (base3.options.length) models2 = base3;
           }
         };
-        await refreshModels();
+        const refreshModels = async () => {
+          await updatePiModelCatalog(config2.cli, catalogEnv);
+          await readModels();
+        };
+        await readModels();
         const listeners = /* @__PURE__ */ new Set();
         const active = /* @__PURE__ */ new Map();
         const emit = (event) => {
@@ -35274,9 +35401,9 @@ var init_pi = __esm({
           const mcpServers = buildMcpServers(turn);
           let mcpTempDir = null;
           if (mcpServers) {
-            mcpTempDir = mkdtempSync3(join32(tmpdir4(), "omb-pi-mcp-"));
+            mcpTempDir = mkdtempSync3(join31(tmpdir4(), "omb-pi-mcp-"));
             try {
-              writeFileSync13(join32(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers }), { mode: 384 });
+              writeFileSync12(join31(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers }), { mode: 384 });
             } catch (err) {
               try {
                 rmSync5(mcpTempDir, { recursive: true, force: true });
@@ -35294,7 +35421,7 @@ var init_pi = __esm({
                 env: piEnvironment({
                   ...process.env,
                   ...input.environment,
-                  ...mcpServers && mcpTempDir ? { OMB_MCP_CONFIG: join32(mcpTempDir, "mcp.json") } : {}
+                  ...mcpServers && mcpTempDir ? { OMB_MCP_CONFIG: join31(mcpTempDir, "mcp.json") } : {}
                 })
               });
             } catch (err) {
@@ -35406,7 +35533,9 @@ var init_pi = __esm({
                   type: "item.started",
                   itemType: "tool",
                   itemId: evt.toolCallId,
-                  title: String(evt.toolName ?? "tool").slice(0, 80)
+                  title: String(evt.toolName ?? "tool").slice(0, 80),
+                  summary: commandSummary(evt.args),
+                  input: toolDetailPreview(evt.args)
                 });
                 return;
               }
@@ -35416,7 +35545,8 @@ var init_pi = __esm({
                   type: "item.completed",
                   itemType: "tool",
                   itemId: evt.toolCallId,
-                  ok: !evt.isError
+                  ok: !evt.isError,
+                  output: toolDetailPreview(evt.result)
                 });
                 return;
               }
@@ -35565,7 +35695,7 @@ ${turn.text}` : turn.text;
           displayName: input.displayName,
           enabled: input.enabled,
           get models() {
-            return models;
+            return models2;
           },
           refreshModels,
           snapshot,
@@ -35631,16 +35761,16 @@ ${turn.text}` : turn.text;
 });
 
 // server/drivers/minimax.ts
-import { readFileSync as readFileSync19 } from "node:fs";
+import { readFileSync as readFileSync18 } from "node:fs";
 import { homedir as homedir22 } from "node:os";
-import { join as join33 } from "node:path";
+import { join as join32 } from "node:path";
 function normalizedApiUrl(value) {
   const root = value.trim().replace(/\/+$/, "");
   return root.endsWith("/v1") ? root : `${root}/v1`;
 }
 function loadLocalMiniMaxConfig(home = homedir22()) {
   try {
-    const raw = localConfigSchema.parse(JSON.parse(readFileSync19(join33(home, ".mmx", "config.json"), "utf8")));
+    const raw = localConfigSchema.parse(JSON.parse(readFileSync18(join32(home, ".mmx", "config.json"), "utf8")));
     const configuredUrl = raw.base_url?.trim() ? raw.base_url : raw.region === "cn" ? CN_URL : DEFAULT_URL2;
     return {
       apiKey: raw.api_key?.trim() ?? "",
@@ -35703,13 +35833,13 @@ var init_minimax = __esm({
         const local = loadLocalMiniMaxConfig();
         const apiKey = input.environment[API_KEY_ENV]?.trim() || process.env[API_KEY_ENV]?.trim() || local.apiKey;
         const apiUrl = input.config.url === DEFAULT_URL2 && local.url !== DEFAULT_URL2 ? local.url : input.config.url;
-        const models = local.defaultModel && MODELS4.options.some((model) => model.id === local.defaultModel) ? { ...MODELS4, default: local.defaultModel } : MODELS4;
+        const models2 = local.defaultModel && MODELS4.options.some((model) => model.id === local.defaultModel) ? { ...MODELS4, default: local.defaultModel } : MODELS4;
         return createOpenAIChatRuntime({
           input,
           driverKind: DRIVER_KIND7,
           apiKey,
           apiUrl,
-          models: () => models,
+          models: () => models2,
           requestBody: (model, messages, stream) => ({
             model,
             messages,
@@ -35854,16 +35984,16 @@ async function setupJson(url2, key, body) {
 }
 async function fetchSetupModels(url2, key) {
   const json2 = record2(await setupJson(url2, key));
-  const models = /* @__PURE__ */ new Map();
+  const models2 = /* @__PURE__ */ new Map();
   for (const entry of Array.isArray(json2?.data) ? json2.data : []) {
     const item = record2(entry);
     const id = typeof item?.id === "string" ? item.id.trim() : "";
-    if (!id || /[\u0000-\u001f\u007f]/u.test(id) || models.has(id)) continue;
+    if (!id || /[\u0000-\u001f\u007f]/u.test(id) || models2.has(id)) continue;
     const name = typeof item?.name === "string" ? item.name.replace(/[\u0000-\u001f\u007f]/gu, "").trim() : "";
-    models.set(id, { id, label: name || id });
+    models2.set(id, { id, label: name || id });
   }
-  if (!models.size) throw new SetupApiError("The API returned no usable models. Check the API URL and model access, or enter a model ID from your provider manually.");
-  return [...models.values()];
+  if (!models2.size) throw new SetupApiError("The API returned no usable models. Check the API URL and model access, or enter a model ID from your provider manually.");
+  return [...models2.values()];
 }
 async function verifySetupCompletion(url2, key, model, provider) {
   const id = model.trim();
@@ -35907,8 +36037,8 @@ __export(cli_setup_exports, {
   saveCliStartup: () => saveCliStartup
 });
 import { spawn as spawn7 } from "node:child_process";
-import { readFileSync as readFileSync20 } from "node:fs";
-import { join as join34, resolve as resolve10 } from "node:path";
+import { readFileSync as readFileSync19 } from "node:fs";
+import { join as join33, resolve as resolve10 } from "node:path";
 import { randomUUID as randomUUID10 } from "node:crypto";
 async function inspect(id, entry) {
   const registry2 = new ProviderRegistry(BUILT_IN_DRIVERS);
@@ -35945,7 +36075,7 @@ function assertDataDir(dataDir) {
 }
 function checkStoredConfig(dataDir) {
   try {
-    parseStoredConfig(JSON.parse(readFileSync20(join34(dataDir, "config.json"), "utf8")));
+    parseStoredConfig(JSON.parse(readFileSync19(join33(dataDir, "config.json"), "utf8")));
   } catch (error51) {
     if (error51.code === "ENOENT") return;
     throw new Error("Existing config.json could not be read or validated. Setup has not changed it; repair it before continuing.");
@@ -35977,14 +36107,14 @@ function saveCliStartup(dataDir, settings2) {
 function rawObject(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
-async function chooseModel(io, models) {
-  if (!models.options.length) throw new Error("This connection returned no models. Check the provider and try again.");
+async function chooseModel(io, models2) {
+  if (!models2.options.length) throw new Error("This connection returned no models. Check the provider and try again.");
   let query = "";
   for (; ; ) {
-    const matches = models.options.filter((m) => `${m.label} ${m.id}`.toLowerCase().includes(query.toLowerCase()));
-    const preferred = matches.find((m) => m.id === models.default);
+    const matches = models2.options.filter((m) => `${m.label} ${m.id}`.toLowerCase().includes(query.toLowerCase()));
+    const preferred = matches.find((m) => m.id === models2.default);
     const visible = (preferred ? [preferred, ...matches.filter((m) => m !== preferred)] : matches).slice(0, 20);
-    const defaultIndex = visible.findIndex((m) => m.id === models.default);
+    const defaultIndex = visible.findIndex((m) => m.id === models2.default);
     const selected = await io.choose("Choose your model", [
       ...visible.map((m) => m.label.trim() || m.id),
       "Search models\u2026"
@@ -36058,11 +36188,11 @@ async function runSetup(options, io = defaultSetupIo(), deps = dependencies) {
           id = prior?.[0] ?? native.id;
           if (!prior && runtime[id] && runtime[id].driver !== native.driver) id = `${native.id}-${randomUUID10().slice(0, 8)}`;
           entry = { ...cfg.instances?.[id] ?? { driver: native.driver }, enabled: true };
-          const models = await connectNative(native, id, entry, io, deps);
+          const models2 = await connectNative(native, id, entry, io, deps);
           const saved = cfg.defaultModelSelection;
           model = await chooseModel(io, {
-            ...models,
-            default: saved?.instanceId === id ? saved.model : models.default
+            ...models2,
+            default: saved?.instanceId === id ? saved.model : models2.default
           });
         } else {
           io.log("Connect an API key");
@@ -36092,21 +36222,21 @@ async function runSetup(options, io = defaultSetupIo(), deps = dependencies) {
           }
           if (!key) throw new Error("An API key is required. Nothing was saved.");
           io.log("Checking the model catalog\u2026");
-          let models;
+          let models2;
           try {
-            models = await deps.models(url2, key);
+            models2 = await deps.models(url2, key);
           } catch (error51) {
             if (error51 instanceof SetupCancelled) throw error51;
             io.log(error51 instanceof Error ? error51.message : "Could not load this model catalog.");
             if (!await io.confirm("Enter an exact chat model ID and check it directly instead?", false)) throw error51;
             const manual = (await io.ask("Chat model ID: ")).trim();
             if (!manual) throw new Error("A model ID is required. Nothing was saved.");
-            models = [{ id: manual, label: manual }];
+            models2 = [{ id: manual, label: manual }];
           }
           const previousModel = prior ? rawObject(prior[1].config).model : void 0;
           const preferredModel = cfg.defaultModelSelection?.instanceId === prior?.[0] ? cfg.defaultModelSelection?.model : previousModel;
           io.log("Choose a chat model; image, audio and embedding-only models cannot reply here.");
-          model = await chooseModel(io, { default: typeof preferredModel === "string" ? preferredModel : "", options: models });
+          model = await chooseModel(io, { default: typeof preferredModel === "string" ? preferredModel : "", options: models2 });
           if (!await io.confirm("Send one short test message? Your API provider may charge for this request.", true)) throw new SetupCancelled();
           if (routingProvider) await deps.verify(url2, key, model, routingProvider);
           else await deps.verify(url2, key, model);
@@ -36223,7 +36353,7 @@ var init_browser_engine_release = __esm({
 });
 
 // server/browser-bundle-release.ts
-import { join as join35 } from "node:path";
+import { join as join34 } from "node:path";
 function browserBundleSpec(target) {
   if (!Object.hasOwn(CHROME_ASSETS, target)) throw new Error(`Unsupported desktop browser target: ${target}`);
   const pinned = CHROME_ASSETS[target];
@@ -36259,10 +36389,10 @@ function browserBundlePaths(bundleDirectory, target) {
   const spec = browserBundleSpec(target);
   return {
     directory: bundleDirectory,
-    manifest: join35(bundleDirectory, "manifest.json"),
-    engine: join35(bundleDirectory, spec.engine.executable),
-    chrome: join35(bundleDirectory, spec.chrome.executable),
-    licenses: join35(bundleDirectory, "licenses")
+    manifest: join34(bundleDirectory, "manifest.json"),
+    engine: join34(bundleDirectory, spec.engine.executable),
+    chrome: join34(bundleDirectory, spec.chrome.executable),
+    licenses: join34(bundleDirectory, "licenses")
   };
 }
 var CHROME_VERSION, CHROME_ASSETS;
@@ -36302,7 +36432,7 @@ var init_bot_profile = __esm({
 });
 
 // server/bot-folder.ts
-import { join as join36 } from "node:path";
+import { join as join35 } from "node:path";
 var BOTS_DIR;
 var init_bot_folder = __esm({
   "server/bot-folder.ts"() {
@@ -36310,7 +36440,7 @@ var init_bot_folder = __esm({
     init_atomic();
     init_config();
     init_bot_profile();
-    BOTS_DIR = join36(DATA_DIR, "bots");
+    BOTS_DIR = join35(DATA_DIR, "bots");
   }
 });
 
@@ -36347,9 +36477,9 @@ __export(browser_engine_exports, {
 });
 import { spawn as spawn8 } from "node:child_process";
 import { createHash as createHash8, randomBytes as randomBytes3, randomUUID as randomUUID11 } from "node:crypto";
-import { chmodSync as chmodSync7, constants as constants2, copyFileSync, existsSync as existsSync18, mkdirSync as mkdirSync16, readFileSync as readFileSync21, readdirSync as readdirSync3, renameSync as renameSync5, rmSync as rmSync6, statSync as statSync3, unlinkSync as unlinkSync4, writeFileSync as writeFileSync14 } from "node:fs";
+import { chmodSync as chmodSync7, constants as constants2, copyFileSync, existsSync as existsSync18, mkdirSync as mkdirSync16, readFileSync as readFileSync20, readdirSync as readdirSync3, renameSync as renameSync5, rmSync as rmSync6, statSync as statSync3, unlinkSync as unlinkSync4, writeFileSync as writeFileSync13 } from "node:fs";
 import { homedir as homedir23, tmpdir as tmpdir5 } from "node:os";
-import { delimiter as delimiter6, dirname as dirname11, join as join37, resolve as resolve11 } from "node:path";
+import { delimiter as delimiter6, dirname as dirname11, join as join36, resolve as resolve11 } from "node:path";
 function browserRestoreKey(session) {
   if (!/^[A-Za-z0-9_-]{1,96}$/.test(session)) throw new Error("Invalid browser session.");
   return `omb-${createHash8("sha256").update(session).digest("hex")}`;
@@ -36358,20 +36488,20 @@ function browserSessionsDirectory(env) {
   const namespace = env.AGENT_BROWSER_NAMESPACE;
   if (namespace && !/^[a-z0-9]+(?:[-_][a-z0-9]+)*$/.test(namespace)) throw new Error("Invalid browser namespace.");
   const home = (process.platform === "win32" ? env.USERPROFILE : env.HOME) || homedir23();
-  const stateRoot = namespace ? join37(home, ".agent-browser", "namespaces", namespace, "state") : join37(home, ".agent-browser");
-  return join37(stateRoot, "sessions");
+  const stateRoot = namespace ? join36(home, ".agent-browser", "namespaces", namespace, "state") : join36(home, ".agent-browser");
+  return join36(stateRoot, "sessions");
 }
 function managedBrowserConfigPath(env) {
-  return join37(browserSessionsDirectory(env), "..", "omb-managed-config.json");
+  return join36(browserSessionsDirectory(env), "..", "omb-managed-config.json");
 }
 function ensureManagedBrowserConfig(env) {
   const path3 = managedBrowserConfigPath(env);
   mkdirSync16(dirname11(path3), { recursive: true, mode: 448 });
   try {
-    writeFileSync14(path3, "{}\n", { flag: "wx", mode: 384 });
+    writeFileSync13(path3, "{}\n", { flag: "wx", mode: 384 });
   } catch (error51) {
     if (error51.code !== "EEXIST") throw error51;
-    if (readFileSync21(path3, "utf8").trim() !== "{}") throw new Error("The managed browser configuration was changed. Restore it to an empty JSON object before connecting.");
+    if (readFileSync20(path3, "utf8").trim() !== "{}") throw new Error("The managed browser configuration was changed. Restore it to an empty JSON object before connecting.");
   }
   return path3;
 }
@@ -36449,11 +36579,11 @@ async function prepareBrowserSessionState(binaryPath, session, options = {}) {
   ensureManagedBrowserConfig(env);
   if (options.persistent === false) return;
   const directory = browserSessionsDirectory(env);
-  const key = join37(directory, session);
+  const key = join36(directory, session);
   let pending = preparedBrowserSessions.get(key);
   if (!pending) {
     pending = (async () => {
-      const targetBase = join37(directory, `${restoreKey}-${session}`);
+      const targetBase = join36(directory, `${restoreKey}-${session}`);
       const hasTarget = () => existsSync18(`${targetBase}.json.enc`) || existsSync18(`${targetBase}.json`);
       if (hasTarget()) return;
       check2();
@@ -36463,7 +36593,7 @@ async function prepareBrowserSessionState(binaryPath, session, options = {}) {
       check2();
       if (hasTarget()) return;
       const candidates = [".json.enc", ".json"].flatMap((suffix) => {
-        const path3 = join37(directory, `${session}-${session}${suffix}`);
+        const path3 = join36(directory, `${session}-${session}${suffix}`);
         try {
           const stat4 = statSync3(path3);
           if (!stat4.isFile()) throw new Error("Saved browser state is not a file.");
@@ -36498,7 +36628,7 @@ function isMusl(platform = process.platform, exists = existsSync18) {
 }
 function pinnedBinaryPath(dataDir = DATA_DIR, platform = process.platform, arch = process.arch) {
   const version2 = agentBrowserReleaseVersion(resolveAgentBrowserReleaseAsset(platform, arch));
-  return join37(dataDir, ENGINE_DIR, version2, executableName(platform));
+  return join36(dataDir, ENGINE_DIR, version2, executableName(platform));
 }
 function onPath(env, platform, exists) {
   const pathValue = platform === "win32" ? Object.entries(env).findLast(([key]) => key.toUpperCase() === "PATH")?.[1] : env.PATH;
@@ -36514,7 +36644,7 @@ function packagedBrowser(options) {
   const resources = (options.env ?? process.env).OMB_RESOURCES_PATH;
   if (!resources) return null;
   try {
-    return browserBundlePaths(join37(resolve11(resources), "browser-engine"), `${options.platform ?? process.platform}-${options.arch ?? process.arch}`);
+    return browserBundlePaths(join36(resolve11(resources), "browser-engine"), `${options.platform ?? process.platform}-${options.arch ?? process.arch}`);
   } catch {
     return null;
   }
@@ -36539,7 +36669,7 @@ async function installAgentBrowserBinary(options = {}) {
   const asset = options.asset ?? resolveAgentBrowserReleaseAsset(platform, options.arch ?? process.arch, options.musl ?? isMusl(platform));
   if (!asset) throw new Error(`agent-browser publishes no build for ${platform}-${options.arch ?? process.arch}.`);
   const destination = pinnedBinaryPath(options.dataDir, platform, options.arch);
-  const directory = join37(destination, "..");
+  const directory = join36(destination, "..");
   mkdirSync16(directory, { recursive: true, mode: 448 });
   const url2 = agentBrowserReleaseUrl(asset);
   options.log?.(`downloading agent-browser ${agentBrowserReleaseVersion(asset)} (${Math.round(asset.bytes / 1024 / 1024)} MB, digest pinned)`);
@@ -36558,7 +36688,7 @@ async function installAgentBrowserBinary(options = {}) {
   const digest2 = createHash8("sha256").update(body).digest("hex");
   if (digest2 !== asset.sha256) throw new Error("the agent-browser download failed its SHA-256 check; nothing was installed");
   const staging = `${destination}.${randomBytes3(6).toString("hex")}.part`;
-  writeFileSync14(staging, body, { mode: 493 });
+  writeFileSync13(staging, body, { mode: 493 });
   if (platform !== "win32") chmodSync7(staging, 493);
   renameSync5(staging, destination);
   return destination;
@@ -36591,9 +36721,9 @@ function ensureChrome(binaryPath, options = {}) {
   });
 }
 function browserEngineEncryptionKey(dataDir = DATA_DIR) {
-  const file2 = join37(dataDir, KEY_FILE);
+  const file2 = join36(dataDir, KEY_FILE);
   try {
-    const existing = readFileSync21(file2, "utf8").trim();
+    const existing = readFileSync20(file2, "utf8").trim();
     if (/^[0-9a-f]{64}$/u.test(existing)) return existing;
   } catch {
   }
@@ -36651,7 +36781,7 @@ function agentBrowserIntegration(input) {
   return { command: input.binaryPath, args: ["mcp", "--tools", "core", "--no-webmcp"], env };
 }
 function agentBrowserFrame(input) {
-  const file2 = join37(tmpdir5(), `openmausbot-browser-${randomUUID11()}.png`);
+  const file2 = join36(tmpdir5(), `openmausbot-browser-${randomUUID11()}.png`);
   return new Promise((settle, fail) => {
     const child = spawn8(input.binaryPath, ["screenshot", file2], {
       env: browserRuntimeEnv(input.env),
@@ -36673,7 +36803,7 @@ function agentBrowserFrame(input) {
           fail(error51);
           return;
         }
-        settle({ png: readFileSync21(file2).toString("base64"), format: "png" });
+        settle({ png: readFileSync20(file2).toString("base64"), format: "png" });
       } catch {
         fail(new Error("the browser reported a picture it did not write"));
       } finally {
@@ -36721,8 +36851,8 @@ async function clearBrowserSessionState(binaryPath, session, options = {}) {
     }
   };
   try {
-    for (const base2 of bases) for (const suffix of [".json", ".json.enc", ".json.previous", ".json.enc.previous"]) remove(join37(directory, base2 + suffix));
-    const pendingDirectory = join37(directory, ".tmp");
+    for (const base2 of bases) for (const suffix of [".json", ".json.enc", ".json.previous", ".json.enc.previous"]) remove(join36(directory, base2 + suffix));
+    const pendingDirectory = join36(directory, ".tmp");
     let pendingFiles = [];
     try {
       pendingFiles = readdirSync3(pendingDirectory);
@@ -36730,8 +36860,8 @@ async function clearBrowserSessionState(binaryPath, session, options = {}) {
       if (error51.code !== "ENOENT") throw error51;
     }
     const candidates = bases.map((base2) => new RegExp(`^${base2}-candidate-[0-9]+\\.json(?:\\.enc)?$`));
-    for (const name of pendingFiles) if (candidates.some((candidate) => candidate.test(name))) remove(join37(pendingDirectory, name));
-    preparedBrowserSessions.delete(join37(directory, session));
+    for (const name of pendingFiles) if (candidates.some((candidate) => candidate.test(name))) remove(join36(pendingDirectory, name));
+    preparedBrowserSessions.delete(join36(directory, session));
     return true;
   } catch {
     return false;
@@ -36759,9 +36889,9 @@ var init_browser_engine = __esm({
 // server/cli.ts
 var import_qrcode_terminal = __toESM(require_main(), 1);
 import { spawn as spawn9 } from "node:child_process";
-import { closeSync as closeSync3, existsSync as existsSync19, mkdirSync as mkdirSync17, openSync as openSync3, readFileSync as readFileSync22 } from "node:fs";
+import { closeSync as closeSync4, existsSync as existsSync19, mkdirSync as mkdirSync17, openSync as openSync4, readFileSync as readFileSync21 } from "node:fs";
 import { homedir as homedir24 } from "node:os";
-import { dirname as dirname12, join as join38, resolve as resolve12 } from "node:path";
+import { dirname as dirname12, join as join37, resolve as resolve12 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
@@ -38533,8 +38663,9 @@ function runServiceCommand(input, io) {
 }
 
 // server/fleet-cli.ts
-import { spawn as spawn3 } from "node:child_process";
-import { appendFileSync, existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
+init_atomic();
+import { execFileSync, spawn as spawn3 } from "node:child_process";
+import { appendFileSync, closeSync as closeSync2, existsSync as existsSync2, fsyncSync as fsyncSync2, lstatSync, mkdirSync as mkdirSync3, openSync as openSync2, readFileSync, rmSync as rmSync2 } from "node:fs";
 import { posix as posix3 } from "node:path";
 
 // server/fleet.ts
@@ -38626,8 +38757,9 @@ function templateUnit(spec) {
     "# Written by `openmausbot fleet init`. One unit for every workspace: %i is the slug.",
     "[Unit]",
     "Description=OpenMausBot workspace %i",
-    "After=network-online.target",
+    "After=network-online.target openmausbot-fence.service",
     "Wants=network-online.target",
+    "Requires=openmausbot-fence.service",
     "",
     "[Service]",
     "Type=simple",
@@ -38659,7 +38791,6 @@ function fenceUnit(layout = fleetLayout()) {
     "# Written by `openmausbot fleet init`: keeps each workspace's loopback ports to its own user.",
     "[Unit]",
     "Description=OpenMausBot per-workspace loopback fence",
-    "Before=openmausbot@.service",
     "",
     "[Service]",
     "Type=oneshot",
@@ -38674,14 +38805,16 @@ function fenceUnit(layout = fleetLayout()) {
 function fenceRules(workspaces) {
   const lines = ["#!/usr/sbin/nft -f", "# Written by `openmausbot fleet`; regenerated on every create, suspend, resume and delete.", "add table inet openmausbot", "flush table inet openmausbot", "table inet openmausbot {", "	chain output {", "		type filter hook output priority 0; policy accept;"];
   for (const workspace of [...workspaces].sort((a2, b) => a2.slug.localeCompare(b.slug))) {
+    if (workspace.status !== "running" && workspace.status !== "suspended" && workspace.status !== "retained" && !workspace.accountCreated) continue;
     lines.push(`		oif lo tcp dport { ${workspace.port}, ${workspace.webhookPort} } meta skuid != { ${fleetUser(workspace.slug)}, caddy, root } reject`);
   }
   lines.push("	}", "}", "");
   return lines.join("\n");
 }
 function caddySite(workspace) {
-  if (workspace.status === "suspended") {
-    return [`${workspace.host} {`, '	respond "This workspace is suspended." 503', "}", ""].join("\n");
+  if (workspace.status !== "running") {
+    const message2 = workspace.status === "suspended" ? "This workspace is suspended." : "This workspace is not available.";
+    return [`${workspace.host} {`, `	respond "${message2}" 503`, "}", ""].join("\n");
   }
   return [
     `${workspace.host} {`,
@@ -38709,11 +38842,23 @@ function instanceEnv(input) {
     `OMB_PUBLIC_URL=https://${input.workspace.host}`
   ];
   if (input.licenseKey) lines.push(`OMB_LICENSE_KEY=${input.licenseKey}`);
+  if (input.portalUrl) lines.push(`OMB_ADMIN_URL=${input.portalUrl}`, `OMB_ADMIN_WORKSPACE=${input.workspace.slug}`);
   return lines.join("\n") + "\n";
 }
+var MANAGED_OPENROUTER = "omb-managed-openrouter";
+function openRouterModelIds(value) {
+  if (!Array.isArray(value) || value.length > 100 || value.some((id) => typeof id !== "string" || !/^[a-zA-Z0-9][a-zA-Z0-9._:/+-]{0,159}$/.test(id))) {
+    throw new Error("OpenRouter models must be an array of at most 100 valid model IDs");
+  }
+  return [...new Set(value)];
+}
+function managedOpenRouterModels(models2) {
+  return Object.fromEntries(openRouterModelIds(models2).map((id) => [id, { name: id }]));
+}
 function initialConfig(seed) {
   const config2 = { signIn: { admins: seed.admins, members: seed.members } };
-  if (seed.anthropicKey) config2.anthropic = { key: seed.anthropicKey };
+  if (seed.anthropicKey) config2.anthropic = { key: seed.anthropicKey, ...seed.anthropicUrl ? { url: seed.anthropicUrl } : {} };
+  if (seed.openrouterDefault && seed.openrouterModels?.length) config2.defaultModelSelection = { instanceId: "opencodeGo", model: `${MANAGED_OPENROUTER}/${seed.openrouterModels[0]}` };
   if (seed.monthlyCapUsd !== void 0) config2.budgets = { monthlyUsd: seed.monthlyCapUsd };
   return `${JSON.stringify(config2, null, 2)}
 `;
@@ -38757,6 +38902,18 @@ function initPlan(input) {
 }
 function createPlan(input) {
   assertSlug(input.slug);
+  if (input.seed.portalUrl) {
+    const portal = new URL(input.seed.portalUrl);
+    if (portal.protocol !== "https:" || portal.origin !== input.seed.portalUrl) throw new Error("portalUrl must be an HTTPS origin without a path or credentials");
+    if (portal.hostname === `${input.slug}.${input.registry.domain}`) throw new Error("this workspace name is reserved for the admin portal");
+    if (input.seed.anthropicUrl && input.seed.anthropicUrl !== `${portal.origin}/api/gateway/${input.slug}/anthropic`) throw new Error("managed provider URL must belong to this workspace's portal gateway");
+  } else if (input.seed.anthropicUrl) throw new Error("a managed provider URL requires portalUrl");
+  if (input.seed.openrouterKey !== void 0 || input.seed.openrouterUrl !== void 0 || input.seed.openrouterModels !== void 0 || input.seed.openrouterDefault) {
+    if (!input.seed.portalUrl || input.seed.openrouterUrl !== `${input.seed.portalUrl}/api/gateway/${input.slug}/openrouter/v1`) throw new Error("managed OpenRouter URL must belong to this workspace's portal gateway");
+    if (!input.seed.openrouterKey || !/^[!-~]+$/.test(input.seed.openrouterKey)) throw new Error("managed OpenRouter requires a non-empty workspace credential without whitespace");
+    const models2 = openRouterModelIds(input.seed.openrouterModels ?? []);
+    if (input.seed.openrouterDefault && !models2.length) throw new Error("a default OpenRouter model requires a model assignment");
+  }
   if (input.registry.workspaces[input.slug]) throw new Error(`workspace "${input.slug}" already exists`);
   if (!input.seed.admins.length) throw new Error("a workspace needs at least one admin email (--admin)");
   for (const entry of [...input.seed.admins, ...input.seed.members]) assertEmailOrDomain(entry);
@@ -38772,15 +38929,36 @@ function createPlan(input) {
     createdAt: (input.now ?? /* @__PURE__ */ new Date()).toISOString()
   };
   const registry2 = { ...input.registry, nextPort: next, workspaces: { ...input.registry.workspaces, [workspace.slug]: workspace } };
+  const reserved = (accountCreated) => ({
+    ...registry2,
+    workspaces: { ...registry2.workspaces, [workspace.slug]: { ...workspace, status: "provisioning", accountCreated } }
+  });
   const user = fleetUser(workspace.slug);
   const home = workspaceHome(layout, workspace.slug);
   const dataDir = workspaceDataDir(layout, workspace.slug);
   const steps = [
+    // Reserve the identity and ports before any external resource is created.
+    // A crash leaves an inspectable reservation, never a silently reusable home.
+    { kind: "write", path: layout.registryFile, content: `${JSON.stringify(reserved(false), null, 2)}
+`, mode: 384 },
     { kind: "run", argv: ["useradd", "--system", "--create-home", "--home-dir", home, "--shell", "/usr/sbin/nologin", "--user-group", user], why: `the workspace's own account` },
+    { kind: "write", path: layout.registryFile, content: `${JSON.stringify(reserved(true), null, 2)}
+`, mode: 384 },
     { kind: "mkdir", path: dataDir, mode: 448, owner: user },
     { kind: "write", path: join3(dataDir, "config.json"), content: initialConfig(input.seed), mode: 384, owner: user },
+    ...input.seed.openrouterKey ? [
+      { kind: "mkdir", path: join3(home, ".config"), mode: 448, owner: user },
+      { kind: "mkdir", path: join3(home, ".config", "opencode"), mode: 448, owner: user },
+      { kind: "write", path: join3(home, ".config", "opencode", "opencode.json"), mode: 384, owner: user, content: `${JSON.stringify({ provider: { [MANAGED_OPENROUTER]: {
+        npm: "@ai-sdk/openai-compatible",
+        name: "Managed OpenRouter",
+        options: { baseURL: input.seed.openrouterUrl, apiKey: input.seed.openrouterKey },
+        models: managedOpenRouterModels(input.seed.openrouterModels ?? [])
+      } } }, null, 2)}
+` }
+    ] : [],
     ...input.seed.brandJson ? [{ kind: "write", path: join3(dataDir, "brand.json"), content: input.seed.brandJson, mode: 384, owner: user }] : [],
-    { kind: "write", path: join3(layout.instancesDir, `${workspace.slug}.env`), content: instanceEnv({ workspace, dataDir, licenseKey: input.licenseKey }), mode: 384 },
+    { kind: "write", path: join3(layout.instancesDir, `${workspace.slug}.env`), content: instanceEnv({ workspace, dataDir, licenseKey: input.licenseKey, portalUrl: input.seed.portalUrl }), mode: 384 },
     ...input.memoryMax ? [
       { kind: "mkdir", path: join3(layout.unitFile.replace(/openmausbot@\.service$/, ""), `openmausbot@${workspace.slug}.service.d`), mode: 493 },
       { kind: "write", path: join3(layout.unitFile.replace(/openmausbot@\.service$/, ""), `openmausbot@${workspace.slug}.service.d`, "limits.conf"), content: `[Service]
@@ -38800,10 +38978,14 @@ MemoryMax=${input.memoryMax}
   ];
   return { steps, registry: registry2, workspace };
 }
+function assertManagedWorkspace(workspace) {
+  if (workspace.status !== "running" && workspace.status !== "suspended") throw new Error(`workspace "${workspace.slug}" is ${workspace.status} and requires operator recovery`);
+}
 function withStatus(registry2, slug, status) {
   assertSlug(slug);
   const current = registry2.workspaces[slug];
   if (!current) throw new Error(`no workspace "${slug}"`);
+  assertManagedWorkspace(current);
   const workspace = { ...current, status };
   return { registry: { ...registry2, workspaces: { ...registry2.workspaces, [slug]: workspace } }, workspace };
 }
@@ -38841,8 +39023,9 @@ function deletePlan(input) {
   const layout = input.layout ?? fleetLayout();
   const workspace = input.registry.workspaces[input.slug];
   if (!workspace) throw new Error(`no workspace "${input.slug}"`);
+  assertManagedWorkspace(workspace);
   const { [input.slug]: _gone, ...rest } = input.registry.workspaces;
-  const registry2 = { ...input.registry, workspaces: rest };
+  const registry2 = { ...input.registry, workspaces: input.keepData ? { ...rest, [input.slug]: { ...workspace, status: "retained" } } : rest };
   const unitsDir = layout.unitFile.replace(/openmausbot@\.service$/, "");
   return {
     registry: registry2,
@@ -38853,8 +39036,10 @@ function deletePlan(input) {
       { kind: "remove", path: join3(layout.instancesDir, `${workspace.slug}.env`) },
       { kind: "remove", path: join3(unitsDir, `openmausbot@${workspace.slug}.service.d`, "limits.conf") },
       { kind: "write", path: layout.fenceFile, content: fenceRules(Object.values(registry2.workspaces)), mode: 384 },
-      { kind: "run", argv: ["nft", "-f", layout.fenceFile], why: "drop its fence rule" },
-      { kind: "run", argv: input.keepData ? ["userdel", fleetUser(workspace.slug)] : ["userdel", "--remove", fleetUser(workspace.slug)], why: input.keepData ? "remove the account, keep its home and data" : "remove the account and everything it owned" },
+      { kind: "run", argv: ["nft", "-f", layout.fenceFile], why: input.keepData ? "keep the retained account's fence" : "drop its fence rule" },
+      // Retain the nologin account too: recycling its UID would give a new
+      // workspace ownership of the preserved home, even under a different slug.
+      ...input.keepData ? [{ kind: "note", text: "keeping the disabled workspace's account, home and name reserved; operator recovery is required before reuse" }] : [{ kind: "run", argv: ["userdel", "--remove", fleetUser(workspace.slug)], why: "remove the account and everything it owned" }],
       { kind: "write", path: layout.registryFile, content: `${JSON.stringify(registry2, null, 2)}
 `, mode: 384 }
     ]
@@ -38881,10 +39066,12 @@ function applySignIn(configText, action, email3, chatOnly) {
   const members = without(list(current.members));
   if (action === "remove") {
     if (admins.length + members.length === list(current.admins).length + list(current.members).length) throw new Error(`${entry} is not on the list`);
+    if (!admins.length) throw new Error("a workspace needs at least one admin; add another admin first");
     return { config: `${JSON.stringify({ ...raw, signIn: { admins, members } }, null, 2)}
-`, summary: `${entry} can no longer sign in; existing sessions stay until they expire or are revoked` };
+`, summary: `${entry} was removed from the allow-list; existing email sessions are rechecked against the remaining entries` };
   }
   const next = chatOnly ? { admins, members: [...members, entry] } : { admins: [...admins, entry], members };
+  if (!next.admins.length) throw new Error("a workspace needs at least one admin; add another admin first");
   return { config: `${JSON.stringify({ ...raw, signIn: next }, null, 2)}
 `, summary: `${entry} can sign in with an emailed code (${chatOnly ? "chat and approvals" : "full access"})` };
 }
@@ -38896,11 +39083,14 @@ function describeSteps(steps) {
   for (const step of steps) {
     switch (step.kind) {
       case "mkdir":
-        lines.push(`install -d -m ${step.mode.toString(8)}${step.owner ? ` -o ${step.owner} -g ${step.owner}` : ""} ${shellQuote(step.path)}`);
+        lines.push(step.owner ? `# Create ${shellQuote(step.path)} mode ${step.mode.toString(8)} as ${step.owner} (use fleet --yes; never root chown on tenant paths)` : `install -d -m ${step.mode.toString(8)} ${shellQuote(step.path)}`);
         break;
       case "write":
+        if (step.owner) {
+          lines.push(`# Write ${shellQuote(step.path)} mode ${step.mode.toString(8)} as ${step.owner} (use fleet --yes; tenant content omitted)`);
+          break;
+        }
         lines.push(`cat > ${shellQuote(step.path)} <<'OMB_EOF'`, step.content.replace(/\n$/, ""), "OMB_EOF", `chmod ${step.mode.toString(8)} ${shellQuote(step.path)}`);
-        if (step.owner) lines.push(`chown ${step.owner}:${step.owner} ${shellQuote(step.path)}`);
         break;
       case "append-once":
         lines.push(`grep -qxF ${shellQuote(step.line)} ${shellQuote(step.path)} || printf '\\n%s\\n' ${shellQuote(step.line)} >> ${shellQuote(step.path)}`);
@@ -38923,6 +39113,113 @@ function describeSteps(steps) {
 }
 
 // server/fleet-cli.ts
+var TENANT_IO = String.raw`
+const fs = require("node:fs");
+const path = require("node:path");
+const { randomUUID } = require("node:crypto");
+const request = JSON.parse(fs.readFileSync(0, "utf8"));
+const { uid, gid, home, file, action, content, mode } = request;
+if (process.getuid() === 0) {
+  process.setgroups([]);
+  process.setgid(gid);
+  process.setuid(uid);
+}
+if (process.getuid() !== uid || process.getgid() !== gid || uid === 0 || gid === 0) throw Error("could not drop fleet file privileges");
+const limit = 4 * 1024 * 1024;
+const check = (stat, directory) => {
+  if (stat.uid !== uid || (directory ? !stat.isDirectory() : !stat.isFile() || stat.nlink !== 1)) throw Error("unsafe workspace file or directory");
+};
+const totals = { turns: 0, costUsd: null, billableUsd: null };
+let cursor = home;
+try {
+  check(fs.lstatSync(cursor), true);
+  for (const part of path.relative(home, path.dirname(file)).split(path.sep).filter(Boolean)) {
+    cursor = path.join(cursor, part);
+    check(fs.lstatSync(cursor), true);
+  }
+} catch (error) {
+  if (action !== "usage" || error.code !== "ENOENT") throw error;
+  process.stdout.write(JSON.stringify(totals));
+  process.exit(0);
+}
+let result = null;
+if (action === "mkdir") {
+  try { fs.mkdirSync(file, { mode }); } catch (error) { if (error.code !== "EEXIST") throw error; }
+  check(fs.lstatSync(file), true);
+} else if (action === "read" || action === "usage") {
+  let fd;
+  try { fd = fs.openSync(file, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK); }
+  catch (error) { if (error.code !== "ENOENT") throw error; }
+  if (fd !== undefined) {
+    try {
+      const stat = fs.fstatSync(fd);
+      check(stat, false);
+      if (stat.size > limit) throw Error("workspace file exceeds 4 MiB");
+      const data = Buffer.alloc(limit + 1);
+      let size = 0;
+      while (size < data.length) { const read = fs.readSync(fd, data, size, data.length - size, null); if (!read) break; size += read; }
+      if (size > limit) throw Error("workspace file exceeds 4 MiB");
+      result = data.subarray(0, size).toString("utf8");
+    } finally { fs.closeSync(fd); }
+  }
+  if (action === "usage") {
+    const to = Date.parse(content);
+    const date = new Date(to);
+    const from = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), 1);
+    // Scan one bounded month's text without retaining rows or allocating groups.
+    const text = result || "";
+    for (let offset = 0; offset < text.length;) {
+      const end = text.indexOf("\n", offset);
+      const line = text.slice(offset, end < 0 ? text.length : end);
+      offset = end < 0 ? text.length : end + 1;
+      let row;
+      try { row = JSON.parse(line); } catch { continue; }
+      if (!row || typeof row !== "object" || typeof row.at !== "string" || typeof row.botId !== "string" || typeof row.model !== "string" || typeof row.input !== "number" || typeof row.output !== "number" || !row.trigger || typeof row.trigger !== "object" || typeof row.trigger.kind !== "string") continue;
+      const at = Date.parse(row.at);
+      if (!(at >= from && at <= to)) continue;
+      totals.turns++;
+      if (typeof row.costUsd === "number" && Number.isFinite(row.costUsd) && row.costUsd >= 0) {
+        const sum = (totals.costUsd || 0) + row.costUsd;
+        if (!Number.isFinite(sum)) throw Error("workspace usage total exceeds numeric range");
+        totals.costUsd = sum;
+      }
+    }
+    result = totals;
+  }
+} else if (action === "write") {
+  if (Buffer.byteLength(content) > limit) throw Error("workspace file exceeds 4 MiB");
+  try { check(fs.lstatSync(file), false); } catch (error) { if (error.code !== "ENOENT") throw error; }
+  const temp = file + ".fleet-" + randomUUID();
+  let fd;
+  try {
+    fd = fs.openSync(temp, fs.constants.O_WRONLY | fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_NOFOLLOW, mode);
+    fs.writeFileSync(fd, content);
+    fs.fsyncSync(fd);
+    fs.closeSync(fd); fd = undefined;
+    fs.renameSync(temp, file);
+  } finally {
+    if (fd !== undefined) fs.closeSync(fd);
+    try { fs.unlinkSync(temp); } catch (error) { if (error.code !== "ENOENT") throw error; }
+  }
+} else throw Error("unknown fleet file operation");
+process.stdout.write(JSON.stringify(result));
+`;
+function tenantIo(owner, file2, action, content, mode) {
+  assertUnixUser(owner);
+  const options = { encoding: "utf8", timeout: 5e3, killSignal: "SIGKILL", cwd: "/", env: { PATH: "/usr/bin:/bin" }, stdio: ["pipe", "pipe", "pipe"] };
+  const account = execFileSync("/usr/bin/getent", ["passwd", owner], { ...options, maxBuffer: 8192 }).trim().split(":");
+  const uid = Number(account[2]);
+  const gid = Number(account[3]);
+  const home = account[5];
+  if (account.length !== 7 || account[0] !== owner || !Number.isSafeInteger(uid) || uid <= 0 || !Number.isSafeInteger(gid) || gid <= 0 || !home?.startsWith("/") || posix3.normalize(home) !== home || !file2.startsWith(`${home}/`) || posix3.normalize(file2) !== file2) {
+    throw new Error(`unsafe filesystem identity or path for ${owner}`);
+  }
+  try {
+    return JSON.parse(execFileSync(process.execPath, ["--eval", TENANT_IO], { ...options, maxBuffer: action === "usage" ? 8192 : 32 * 1024 * 1024, input: JSON.stringify({ uid, gid, home, file: file2, action, content, mode }) }));
+  } catch {
+    throw new Error(`could not ${action} workspace file as ${owner}: check ownership, links, file size and permissions`);
+  }
+}
 function defaultFleetDeps() {
   return {
     isRoot: () => typeof process.getuid === "function" && process.getuid() === 0,
@@ -38942,9 +39239,37 @@ function defaultFleetDeps() {
         resolve13({ code: null, output: error51 instanceof Error ? error51.message : String(error51) });
       }
     }),
-    readText: (path3) => existsSync2(path3) ? readFileSync(path3, "utf8") : null,
-    writeText: (path3, content, mode) => writeFileSync4(path3, content, { mode }),
-    mkdir: (path3, mode) => mkdirSync3(path3, { recursive: true, mode }),
+    pathExists: (path3) => {
+      try {
+        lstatSync(path3);
+        return true;
+      } catch (error51) {
+        if (error51.code === "ENOENT") return false;
+        throw error51;
+      }
+    },
+    readText: (path3, owner) => owner ? tenantIo(owner, path3, "read") : existsSync2(path3) ? readFileSync(path3, "utf8") : null,
+    usage: (dataDir, owner, now) => {
+      const at = now.toISOString();
+      return tenantIo(owner, posix3.join(dataDir, "usage", `${at.slice(0, 7)}.jsonl`), "usage", at);
+    },
+    writeText: (path3, content, mode, owner) => {
+      if (owner) {
+        tenantIo(owner, path3, "write", content, mode);
+        return;
+      }
+      writeFileAtomic(path3, content, { mode });
+      const directory = openSync2(posix3.dirname(path3), "r");
+      try {
+        fsyncSync2(directory);
+      } finally {
+        closeSync2(directory);
+      }
+    },
+    mkdir: (path3, mode, owner) => {
+      if (owner) tenantIo(owner, path3, "mkdir", void 0, mode);
+      else mkdirSync3(path3, { recursive: true, mode });
+    },
     appendOnce: (path3, line) => {
       const current = existsSync2(path3) ? readFileSync(path3, "utf8") : "";
       if (!current.split("\n").some((existing) => existing.trim() === line)) appendFileSync(path3, `${current.endsWith("\n") || !current ? "" : "\n"}
@@ -38971,18 +39296,10 @@ async function executePlan(steps, deps, io) {
   for (const step of steps) {
     switch (step.kind) {
       case "mkdir":
-        deps.mkdir(step.path, step.mode);
-        if (step.owner) {
-          const chown = await deps.run(["chown", `${step.owner}:${step.owner}`, step.path]);
-          if (chown.code !== 0) return failed(io, `chown ${step.path}`, chown.output);
-        }
+        deps.mkdir(step.path, step.mode, step.owner);
         break;
       case "write":
-        deps.writeText(step.path, step.content, step.mode);
-        if (step.owner) {
-          const chown = await deps.run(["chown", `${step.owner}:${step.owner}`, step.path]);
-          if (chown.code !== 0) return failed(io, `chown ${step.path}`, chown.output);
-        }
+        deps.writeText(step.path, step.content, step.mode, step.owner);
         break;
       case "append-once":
         deps.appendOnce(step.path, step.line);
@@ -39025,19 +39342,28 @@ function planFleetAction(input, deps) {
       if (warning) throw new Error(warning);
       const existing = deps.readText(layout.registryFile);
       if (existing !== null && !input.yes) throw new Error(`${layout.registryFile} exists; pass --yes to rewrite the template unit and fence (workspaces are kept)`);
-      const plan = initPlan({ domain: input.domain, node: input.node, script: input.script, operator: input.operator, layout });
-      if (existing) {
-        const kept = parseRegistry(existing);
-        plan.registry.workspaces = kept.workspaces;
-        plan.registry.nextPort = kept.nextPort;
-        return plan.steps.map((step) => step.kind === "write" && step.path === layout.registryFile ? { ...step, content: `${JSON.stringify(plan.registry, null, 2)}
-` } : step);
+      const kept = existing !== null ? parseRegistry(existing) : void 0;
+      const plan = initPlan({ domain: input.domain, node: input.node, script: input.script, operator: input.operator ?? kept?.operator, layout });
+      if (kept) {
+        const registry2 = { ...kept, ...plan.registry, workspaces: kept.workspaces, nextPort: kept.nextPort };
+        return plan.steps.flatMap((step) => {
+          if (step.kind === "write" && step.path === layout.registryFile) return [{ ...step, content: `${JSON.stringify(registry2, null, 2)}
+` }];
+          if (step.kind === "write" && step.path === layout.fenceFile) return [{ ...step, content: fenceRules(Object.values(registry2.workspaces)) }];
+          if (step.kind === "run" && step.argv.join(" ") === "systemctl enable --now openmausbot-fence.service") return [step, { kind: "run", argv: ["nft", "-f", layout.fenceFile], why: "reapply the preserved workspace fence" }];
+          return [step];
+        });
       }
       return plan.steps;
     }
     case "create": {
       if (!input.slug) throw new Error("fleet create needs a workspace name");
+      assertSlug(input.slug);
       const registry2 = loadRegistry(layout, deps);
+      if (registry2.workspaces[input.slug]) throw new Error(`workspace "${input.slug}" already exists`);
+      for (const path3 of [workspaceHome(layout, input.slug), posix3.join(layout.instancesDir, `${input.slug}.env`), posix3.join(layout.caddyDir, `${input.slug}.caddy`), posix3.join(posix3.dirname(layout.unitFile), `openmausbot@${input.slug}.service.d`)]) {
+        if (deps.pathExists(path3)) throw new Error(`workspace path already exists: ${path3}; recover or remove it explicitly before provisioning a fresh workspace`);
+      }
       const brandJson = input.brandJson ?? (input.brandFile ? deps.readText(input.brandFile) : void 0);
       if (input.brandFile && brandJson === null) throw new Error(`${input.brandFile} not found`);
       if (brandJson) JSON.parse(brandJson);
@@ -39046,19 +39372,60 @@ function planFleetAction(input, deps) {
       return createPlan({
         registry: registry2,
         slug: input.slug,
-        seed: { admins: input.admins, members: input.members, ...anthropicKey ? { anthropicKey } : {}, ...input.cap !== void 0 ? { monthlyCapUsd: input.cap } : {}, ...brandJson ? { brandJson } : {} },
+        seed: { admins: input.admins, members: input.members, ...anthropicKey ? { anthropicKey } : {}, ...input.anthropicUrl ? { anthropicUrl: input.anthropicUrl } : {}, ...input.portalUrl ? { portalUrl: input.portalUrl } : {}, ...input.cap !== void 0 ? { monthlyCapUsd: input.cap } : {}, ...brandJson ? { brandJson } : {}, openrouterKey: input.openrouterKey, openrouterUrl: input.openrouterUrl, openrouterModels: input.openrouterModels, openrouterDefault: input.openrouterDefault },
         ...input.licenseKey ? { licenseKey: input.licenseKey } : {},
         ...input.memory ? { memoryMax: input.memory } : {},
         layout
       }).steps;
     }
+    case "providers": {
+      if (!input.slug) throw new Error("fleet providers needs a workspace name");
+      assertSlug(input.slug);
+      const workspace = loadRegistry(layout, deps).workspaces[input.slug];
+      if (!workspace) throw new Error(`no workspace "${input.slug}"`);
+      assertManagedWorkspace(workspace);
+      const models2 = managedOpenRouterModels(input.openrouterModels);
+      const env = deps.readText(posix3.join(layout.instancesDir, `${input.slug}.env`)) ?? "";
+      const portal = /^OMB_ADMIN_URL=(.+)$/m.exec(env)?.[1];
+      if (!portal || !env.split("\n").includes(`OMB_ADMIN_WORKSPACE=${input.slug}`)) throw new Error("workspace has no trusted portal configuration; operator recovery is required");
+      try {
+        const url2 = new URL(portal);
+        if (url2.protocol !== "https:" || url2.origin !== portal) throw new Error();
+      } catch {
+        throw new Error("workspace portal configuration is invalid; operator recovery is required");
+      }
+      const file2 = posix3.join(workspaceHome(layout, input.slug), ".config", "opencode", "opencode.json");
+      const raw = deps.readText(file2, fleetUser(input.slug));
+      const object2 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+      let config2;
+      try {
+        const parsed = JSON.parse(raw ?? "null");
+        if (!object2(parsed)) throw new Error();
+        config2 = parsed;
+      } catch {
+        throw new Error("managed OpenRouter configuration is missing or invalid; operator recovery is required");
+      }
+      const providers = config2.provider;
+      const managed = object2(providers) ? providers[MANAGED_OPENROUTER] : void 0;
+      const options = object2(managed) ? managed.options : void 0;
+      if (!object2(managed) || managed.npm !== "@ai-sdk/openai-compatible" || !object2(options) || options.baseURL !== `${portal}/api/gateway/${input.slug}/openrouter/v1` || typeof options.apiKey !== "string" || !/^[!-~]+$/.test(options.apiKey)) {
+        throw new Error("managed OpenRouter configuration does not match the workspace portal; operator recovery is required");
+      }
+      managed.models = models2;
+      return [
+        { kind: "write", path: file2, content: `${JSON.stringify(config2, null, 2)}
+`, mode: 384, owner: fleetUser(input.slug) },
+        { kind: "note", text: "managed OpenRouter models updated; refresh the workspace model picker to load its catalog" }
+      ];
+    }
     case "users": {
       if (!input.slug || !input.userAction || !input.email) throw new Error("fleet users needs: NAME add|remove EMAIL [--chat-only]");
       assertSlug(input.slug);
       const registry2 = loadRegistry(layout, deps);
       if (!registry2.workspaces[input.slug]) throw new Error(`no workspace "${input.slug}"`);
+      assertManagedWorkspace(registry2.workspaces[input.slug]);
       const file2 = posix3.join(workspaceDataDir(layout, input.slug), "config.json");
-      const next = applySignIn(deps.readText(file2) ?? "{}", input.userAction, input.email, Boolean(input.chatOnly));
+      const next = applySignIn(deps.readText(file2, fleetUser(input.slug)) ?? "{}", input.userAction, input.email, Boolean(input.chatOnly));
       return [
         { kind: "write", path: file2, content: next.config, mode: 384, owner: fleetUser(input.slug) },
         { kind: "note", text: next.summary }
@@ -39072,7 +39439,7 @@ function planFleetAction(input, deps) {
     }
     case "delete": {
       if (!input.slug) throw new Error("fleet delete needs a workspace name");
-      if (!input.yes) throw new Error(`fleet delete removes the workspace's account${input.keepData ? "" : " and all of its data"}; pass --yes to confirm${input.keepData ? "" : ", or --keep-data to keep the home folder"}`);
+      if (!input.yes) throw new Error(`fleet delete ${input.keepData ? "retires the workspace, keeping its data and reserved Unix account" : "removes the workspace's account and all of its data"}; pass --yes to confirm${input.keepData ? "" : ", or --keep-data to keep the home folder and account reserved"}`);
       const registry2 = loadRegistry(layout, deps);
       return deletePlan({ registry: registry2, slug: input.slug, keepData: input.keepData, layout }).steps;
     }
@@ -39082,8 +39449,18 @@ function planFleetAction(input, deps) {
       return [];
   }
 }
+function markProvisioningFailed(input, deps) {
+  if (input.action !== "create" || !input.slug) return;
+  const layout = fleetLayout(input.root ?? "/");
+  const registry2 = loadRegistry(layout, deps);
+  const workspace = registry2.workspaces[input.slug];
+  if (workspace?.status !== "provisioning") return;
+  registry2.workspaces[input.slug] = { ...workspace, status: "error" };
+  deps.writeText(layout.registryFile, `${JSON.stringify(registry2, null, 2)}
+`, 384);
+}
 function printPlan(steps, io, reason) {
-  io.log(`${reason}; run these as root:`);
+  io.log(`${reason}; inspect this plan, then rerun the fleet command as root without --dry-run (with --yes where required):`);
   io.log("");
   for (const line of describeSteps(steps)) io.log(line);
   return 0;
@@ -39100,13 +39477,21 @@ async function runFleetCommand(input, io, deps = defaultFleetDeps()) {
         return 0;
       }
       for (const workspace of rows) {
-        const live = asRoot ? (await deps.run(["systemctl", "is-active", `openmausbot@${workspace.slug}.service`])).output.trim() : workspace.status;
+        const live = asRoot && (workspace.status === "running" || workspace.status === "suspended") ? (await deps.run(["systemctl", "is-active", `openmausbot@${workspace.slug}.service`])).output.trim() : workspace.status;
         io.log(`${workspace.slug.padEnd(24)} https://${workspace.host.padEnd(40)} :${String(workspace.port).padEnd(6)} ${live}`);
       }
       return 0;
     }
     const steps = planFleetAction(input, deps);
-    return asRoot ? await executePlan(steps, deps, io) : printPlan(steps, io, input.dryRun ? "dry run" : "not running as root");
+    if (!asRoot) return printPlan(steps, io, input.dryRun ? "dry run" : "not running as root");
+    try {
+      const code = await executePlan(steps, deps, io);
+      if (code !== 0) markProvisioningFailed(input, deps);
+      return code;
+    } catch (error51) {
+      markProvisioningFailed(input, deps);
+      throw error51;
+    }
   } catch (error51) {
     io.error(`fleet: ${error51 instanceof Error ? error51.message : String(error51)}`);
     return 2;
@@ -39117,147 +39502,6 @@ async function runFleetCommand(input, io, deps = defaultFleetDeps()) {
 import { appendFileSync as appendFileSync2, chmodSync as chmodSync2, existsSync as existsSync3, mkdirSync as mkdirSync4, rmSync as rmSync3 } from "node:fs";
 import { createServer } from "node:http";
 import { dirname as dirname2 } from "node:path";
-
-// server/usage-ledger.ts
-import { readFileSync as readFileSync2 } from "node:fs";
-import { join as join4 } from "node:path";
-
-// server/prices.ts
-function priceFor(turn, prices) {
-  return prices[`${turn.driverKind}/${turn.model}`] ?? prices[turn.model] ?? prices.default ?? null;
-}
-var clean = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : 0;
-function billableFor(turn, prices) {
-  const price = priceFor(turn, prices);
-  if (!price) return null;
-  const input = clean(turn.input);
-  const cached3 = Math.min(clean(turn.cachedInput), input);
-  const fresh = input - cached3;
-  const cachedRate = price.cachedInputPerMillion ?? price.inputPerMillion;
-  return (fresh * price.inputPerMillion + cached3 * cachedRate + clean(turn.output) * price.outputPerMillion) / 1e6;
-}
-
-// server/usage-ledger.ts
-var DIR = "usage";
-var DAY_MS = 24 * 60 * 6e4;
-var clean2 = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : 0;
-var finiteOrNull = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
-function monthKey(at) {
-  return `${at.getUTCFullYear()}-${String(at.getUTCMonth() + 1).padStart(2, "0")}`;
-}
-var isTrigger = (value) => typeof value === "object" && value !== null && typeof value.kind === "string";
-var isUsageRow = (value) => typeof value === "object" && value !== null && typeof value.at === "string" && typeof value.botId === "string" && typeof value.model === "string" && typeof value.input === "number" && typeof value.output === "number" && isTrigger(value.trigger);
-function monthsBetween(from, to) {
-  const keys = [];
-  const cursor3 = new Date(Date.UTC(from.getUTCFullYear(), from.getUTCMonth(), 1));
-  while (cursor3.getTime() <= to.getTime()) {
-    keys.push(monthKey(cursor3));
-    cursor3.setUTCMonth(cursor3.getUTCMonth() + 1);
-  }
-  return keys;
-}
-function readUsage(dataDir, range) {
-  const rows = [];
-  const from = range.from.getTime();
-  const to = range.to.getTime();
-  for (const key of monthsBetween(range.from, range.to)) {
-    let text4;
-    try {
-      text4 = readFileSync2(join4(dataDir, DIR, `${key}.jsonl`), "utf8");
-    } catch {
-      continue;
-    }
-    for (const line of text4.split("\n")) {
-      if (!line) continue;
-      try {
-        const value = JSON.parse(line);
-        if (!isUsageRow(value)) continue;
-        const at = Date.parse(value.at);
-        if (at >= from && at <= to) rows.push(value);
-      } catch {
-      }
-    }
-  }
-  return rows;
-}
-function triggerKey(trigger) {
-  switch (trigger.kind) {
-    case "user":
-      return `user:${(trigger.email ?? trigger.label ?? "").toLowerCase() || "unknown"}`;
-    case "owner":
-      return "owner";
-    case "routine":
-      return `routine:${trigger.routineId ?? trigger.label ?? "unknown"}`;
-    default:
-      return "bot";
-  }
-}
-function triggerLabel(trigger) {
-  switch (trigger.kind) {
-    case "user":
-      return trigger.email ?? trigger.label ?? "Signed-in user";
-    case "owner":
-      return "This computer";
-    case "routine":
-      return `Routine: ${trigger.label ?? trigger.routineId ?? "unknown"}`;
-    default:
-      return "Bot to bot";
-  }
-}
-function groupOf(row, groupBy) {
-  switch (groupBy) {
-    case "bot":
-      return { key: `bot:${row.botId}`, label: row.botName || row.botId };
-    case "model":
-      return { key: `model:${row.driverKind}/${row.model}`, label: row.model };
-    case "user":
-      return { key: triggerKey(row.trigger), label: triggerLabel(row.trigger) };
-    case "day":
-      return { key: `day:${row.at.slice(0, 10)}`, label: row.at.slice(0, 10) };
-    default:
-      return { key: `engine:${row.driverKind}`, label: row.driverKind };
-  }
-}
-function emptyGroup(key, label) {
-  return { key, label, turns: 0, input: 0, output: 0, cachedInput: 0, costUsd: null, unpriced: 0, billableUsd: null };
-}
-function add(group, row, prices) {
-  group.turns += 1;
-  group.input += clean2(row.input);
-  group.output += clean2(row.output);
-  group.cachedInput += clean2(row.cachedInput);
-  const cost = finiteOrNull(row.costUsd);
-  if (cost === null) group.unpriced += 1;
-  else group.costUsd = (group.costUsd ?? 0) + cost;
-  const billable = prices ? billableFor(row, prices) : null;
-  if (billable !== null) group.billableUsd = (group.billableUsd ?? 0) + billable;
-}
-function summarizeUsage(rows, groupBy, prices = null) {
-  const groups = /* @__PURE__ */ new Map();
-  const total = emptyGroup("total", "total");
-  for (const row of rows) {
-    const { key, label } = groupOf(row, groupBy);
-    let group = groups.get(key);
-    if (!group) {
-      group = emptyGroup(key, label);
-      groups.set(key, group);
-    }
-    add(group, row, prices);
-    add(total, row, prices);
-  }
-  const ordered = [...groups.values()];
-  if (groupBy === "day") ordered.sort((a2, b) => a2.key.localeCompare(b.key));
-  else {
-    ordered.sort((a2, b) => {
-      const costA = a2.costUsd ?? Number.NEGATIVE_INFINITY;
-      const costB = b.costUsd ?? Number.NEGATIVE_INFINITY;
-      return costB - costA || b.input + b.output - (a2.input + a2.output);
-    });
-  }
-  return { groups: ordered, total };
-}
-
-// server/fleet-agent.ts
 var MAX_BODY = 256 * 1024;
 function readBody(req) {
   return new Promise((resolve13, reject) => {
@@ -39281,10 +39525,20 @@ function readBody(req) {
 var strings = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [];
 var text = (value) => typeof value === "string" && value.trim() ? value.trim() : void 0;
 var number = (value) => typeof value === "number" && Number.isFinite(value) ? value : void 0;
-function workspaceUsage(layout, slug, now) {
-  const from = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));
-  const total = summarizeUsage(readUsage(workspaceDataDir(layout, slug), { from, to: now }), "bot").total;
-  return { month: now.toISOString().slice(0, 7), turns: total.turns, costUsd: total.costUsd, billableUsd: total.billableUsd };
+var models = (value) => {
+  try {
+    return openRouterModelIds(value);
+  } catch (error51) {
+    throw Object.assign(error51, { status: 400 });
+  }
+};
+function workspaceUsage(layout, slug, now, deps) {
+  const month = now.toISOString().slice(0, 7);
+  try {
+    return { month, ...deps.usage(workspaceDataDir(layout, slug), fleetUser(slug), now) };
+  } catch {
+    return { month, turns: null, costUsd: null, billableUsd: null, unavailable: true };
+  }
 }
 function createFleetAgent(options) {
   const deps = options.deps ?? defaultFleetDeps();
@@ -39311,7 +39565,7 @@ function createFleetAgent(options) {
     } catch {
     }
   };
-  const act = async (input) => {
+  const runAction = async (input) => {
     const log = [];
     const errors = [];
     const io = { log: (line) => log.push(line), error: (line) => errors.push(line) };
@@ -39322,10 +39576,29 @@ function createFleetAgent(options) {
       audit({ action: input.action, slug: input.slug, ok: false, error: error51 instanceof Error ? error51.message : String(error51) });
       return { status: 400, body: { error: error51 instanceof Error ? error51.message : String(error51) } };
     }
-    const code = await executePlan(steps, deps, io);
+    let code = 1;
+    try {
+      code = await executePlan(steps, deps, io);
+    } catch (error51) {
+      errors.push(error51 instanceof Error ? error51.message : String(error51));
+    }
+    if (code !== 0) {
+      try {
+        markProvisioningFailed(input, deps);
+      } catch {
+        errors.push("could not record the failed provisioning; inspect the reserved workspace before recovery");
+      }
+    }
     audit({ action: input.action, slug: input.slug, ok: code === 0, ...input.email ? { email: input.email } : {} });
     return code === 0 ? { status: 200, body: { ok: true, log } } : { status: 500, body: { error: errors[0] ?? "the step failed", log: [...log, ...errors] } };
   };
+  let mutationTail = Promise.resolve();
+  const act = (input) => {
+    const result = mutationTail.then(() => runAction(input));
+    mutationTail = result.catch(() => {
+    });
+    return result;
+  };
   const handle = async (req, res) => {
     const url2 = new URL(req.url ?? "/", "http://fleet");
     const method = req.method ?? "GET";
@@ -39337,10 +39610,11 @@ function createFleetAgent(options) {
       if (method === "GET" && url2.pathname === "/health") return send(200, { ok: true });
       if (method === "GET" && url2.pathname === "/workspaces") {
         const registry2 = loadRegistry(layout, deps);
+        const statusOnly = url2.searchParams.get("statusOnly") === "true";
         const workspaces = [];
         for (const workspace of Object.values(registry2.workspaces).sort((a2, b) => a2.slug.localeCompare(b.slug))) {
-          const live = (await deps.run(["systemctl", "is-active", `openmausbot@${workspace.slug}.service`])).output.trim() || "unknown";
-          workspaces.push({ ...workspace, live, usage: workspaceUsage(layout, workspace.slug, now()) });
+          const live = workspace.status === "running" || workspace.status === "suspended" ? (await deps.run(["systemctl", "is-active", `openmausbot@${workspace.slug}.service`])).output.trim() || "unknown" : workspace.status;
+          workspaces.push(statusOnly ? { slug: workspace.slug, live } : { ...workspace, live, usage: workspaceUsage(layout, workspace.slug, now(), deps) });
         }
         return send(200, { domain: registry2.domain, operator: registry2.operator ?? null, workspaces });
       }
@@ -39355,7 +39629,13 @@ function createFleetAgent(options) {
           cap: number(body.cap),
           memory: text(body.memory),
           brandJson: text(body.brandJson),
-          anthropicKey: text(body.anthropicKey)
+          anthropicKey: text(body.anthropicKey),
+          portalUrl: text(body.portalUrl),
+          anthropicUrl: text(body.anthropicUrl),
+          openrouterKey: text(body.openrouterKey),
+          openrouterUrl: text(body.openrouterUrl),
+          openrouterModels: body.openrouterModels === void 0 ? void 0 : models(body.openrouterModels),
+          openrouterDefault: body.openrouterDefault === true
         });
         return send(result.status, result.body);
       }
@@ -39363,11 +39643,16 @@ function createFleetAgent(options) {
         const result = await act({ ...base2(), action: "upgrade" });
         return send(result.status, result.body);
       }
-      const match = /^\/workspaces\/([a-z0-9-]+)(?:\/(users|suspend|resume))?$/.exec(url2.pathname);
+      const match = /^\/workspaces\/([a-z0-9-]+)(?:\/(users|providers|suspend|resume))?$/.exec(url2.pathname);
       if (match) {
         const slug = match[1];
         assertSlug(slug);
         const sub = match[2];
+        if (method === "POST" && sub === "providers") {
+          const body = await readBody(req);
+          const result = await act({ ...base2(), action: "providers", slug, openrouterModels: models(body.models) });
+          return send(result.status, result.body);
+        }
         if (method === "POST" && sub === "users") {
           const body = await readBody(req);
           const action = body.action === "remove" ? "remove" : body.action === "add" ? "add" : void 0;
@@ -39418,11 +39703,11 @@ import { execFile } from "node:child_process";
 
 // companion/src/listener.ts
 import { homedir as homedir3, networkInterfaces } from "node:os";
-import { delimiter as delimiter2, join as join5 } from "node:path";
+import { delimiter as delimiter2, join as join4 } from "node:path";
 function tailscaleCandidates(home = homedir3()) {
   return [
     "/Applications/Tailscale.app/Contents/MacOS/Tailscale",
-    join5(home, "Applications", "Tailscale.app", "Contents", "MacOS", "Tailscale"),
+    join4(home, "Applications", "Tailscale.app", "Contents", "MacOS", "Tailscale"),
     "/opt/homebrew/bin/tailscale",
     "/usr/local/bin/tailscale",
     "/usr/bin/tailscale",
@@ -39640,9 +39925,9 @@ function phonePairingInstructions(phone, input) {
 // server/tunnel.ts
 import { spawn as spawn4 } from "node:child_process";
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { chmodSync as chmodSync3, existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync3, statSync } from "node:fs";
+import { chmodSync as chmodSync3, existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync2, statSync } from "node:fs";
 import { hostname } from "node:os";
-import { dirname as dirname3, join as join6, resolve as resolve2 } from "node:path";
+import { dirname as dirname3, join as join5, resolve as resolve2 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // electron/secure-credential-state.mjs
@@ -39725,13 +40010,13 @@ function plainDocument(value) {
   return document;
 }
 function openTunnelCredentials(dataDir) {
-  const file2 = join6(dataDir, TUNNEL_CREDENTIALS_FILE);
+  const file2 = join5(dataDir, TUNNEL_CREDENTIALS_FILE);
   let initial = {};
   let status = "empty";
   if (existsSync4(file2)) {
     try {
       if (process.platform !== "win32" && (statSync(file2).mode & 63) !== 0) chmodSync3(file2, 384);
-      const parsed = plainDocument(JSON.parse(readFileSync3(file2, "utf8")));
+      const parsed = plainDocument(JSON.parse(readFileSync2(file2, "utf8")));
       if (!parsed) throw new Error("not a JSON object");
       initial = parsed;
       status = "ok";
@@ -39807,11 +40092,11 @@ function cloudflaredPath(dataDir, env = process.env) {
   return resolveCloudflaredBinary({ isPackaged: false, appPath: dataDir, environment: env });
 }
 function prepareEntry(here = HERE) {
-  const bundled = join6(here, "prepare-cloudflared.js");
+  const bundled = join5(here, "prepare-cloudflared.js");
   return existsSync4(bundled) ? bundled : resolve2(here, "..", "scripts", "prepare-cloudflared.mjs");
 }
 function guardianEntry(here = HERE) {
-  const bundled = join6(here, "tunnel-guardian.js");
+  const bundled = join5(here, "tunnel-guardian.js");
   if (existsSync4(bundled)) return bundled;
   const source = resolve2(here, "..", "electron", "managed-companion-guardian-main.mjs");
   return existsSync4(source) ? source : null;
@@ -39846,7 +40131,7 @@ function startTunnel(options) {
   const tunnel = createManagedCompanionTunnel({
     binaryPath: options.binaryPath,
     guardianEntry: options.guardian,
-    runtimeRoot: join6(options.dataDir, TUNNEL_RUNTIME_DIR),
+    runtimeRoot: join5(options.dataDir, TUNNEL_RUNTIME_DIR),
     originPort,
     environment: env,
     fetchImpl: options.fetchImpl,
@@ -39892,7 +40177,7 @@ function parseArgs(argv, env = process.env) {
   const options = {
     command: command === "--help" || command === "-h" ? "help" : command,
     port: Number(env.OMB_PORT || 8799),
-    dataDir: env.OMB_DATA_DIR || join38(homedir24(), ".openmausbot"),
+    dataDir: env.OMB_DATA_DIR || join37(homedir24(), ".openmausbot"),
     tailscale: false,
     tunnel: false,
     client: false,
@@ -40059,7 +40344,7 @@ function defaultIo() {
 }
 function serverVersion(here = HERE2) {
   try {
-    const parsed = JSON.parse(readFileSync22(resolve12(here, "..", "package.json"), "utf8"));
+    const parsed = JSON.parse(readFileSync21(resolve12(here, "..", "package.json"), "utf8"));
     const version2 = typeof parsed === "object" && parsed !== null ? Reflect.get(parsed, "version") : void 0;
     return typeof version2 === "string" && version2 ? version2 : "0.0.0";
   } catch {
@@ -40084,7 +40369,7 @@ async function isWorkspaceRunning(options) {
   try {
     const { status, body } = await api(options.port, "/api/health");
     if (status !== 200 || body?.app !== "openmausbot") return false;
-    const expected = readFileSync22(join38(options.dataDir, "environment-id"), "utf8").trim();
+    const expected = readFileSync21(join37(options.dataDir, "environment-id"), "utf8").trim();
     const descriptor = await api(options.port, "/.well-known/openmausbot/environment");
     return /^[0-9a-f-]{36}$/i.test(expected) && descriptor.status === 200 && descriptor.body?.environmentId === expected;
   } catch {
@@ -40284,11 +40569,11 @@ async function runStatus(options, io = defaultIo()) {
   return code;
 }
 async function runAccess(options, io = defaultIo()) {
-  const file2 = join38(options.dataDir, "config.json");
+  const file2 = join37(options.dataDir, "config.json");
   let raw = {};
   if (existsSync19(file2)) {
     try {
-      const parsed = JSON.parse(readFileSync22(file2, "utf8"));
+      const parsed = JSON.parse(readFileSync21(file2, "utf8"));
       if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new Error("not an object");
       raw = Object.fromEntries(Object.entries(parsed));
     } catch (error51) {
@@ -40436,16 +40721,16 @@ async function runBrowser(options, io = defaultIo()) {
   return 0;
 }
 function serverEntry(here = HERE2) {
-  const bundled = join38(here, "index.js");
+  const bundled = join37(here, "index.js");
   const root = resolve12(here, "..");
   if (existsSync19(bundled)) {
-    const staticDir2 = [join38(root, "dist"), join38(here, "..", "ui")].find((d) => existsSync19(join38(d, "index.html"))) ?? null;
-    const skillsDir = existsSync19(join38(root, "skills")) ? join38(root, "skills") : null;
+    const staticDir2 = [join37(root, "dist"), join37(here, "..", "ui")].find((d) => existsSync19(join37(d, "index.html"))) ?? null;
+    const skillsDir = existsSync19(join37(root, "skills")) ? join37(root, "skills") : null;
     return { command: process.execPath, args: [bundled], staticDir: staticDir2, skillsDir };
   }
-  const source = join38(here, "index.ts");
-  const staticDir = existsSync19(join38(root, "dist", "index.html")) ? join38(root, "dist") : null;
-  return { command: process.execPath, args: ["--experimental-strip-types", source], staticDir, skillsDir: existsSync19(join38(root, "skills")) ? join38(root, "skills") : null };
+  const source = join37(here, "index.ts");
+  const staticDir = existsSync19(join37(root, "dist", "index.html")) ? join37(root, "dist") : null;
+  return { command: process.execPath, args: ["--experimental-strip-types", source], staticDir, skillsDir: existsSync19(join37(root, "skills")) ? join37(root, "skills") : null };
 }
 async function planTunnel(options, log) {
   let access2 = null;
@@ -40545,10 +40830,10 @@ async function runServe(options, log = console.log) {
   let child;
   try {
     if (options.guided) {
-      const logsDir = join38(options.dataDir, "logs");
+      const logsDir = join37(options.dataDir, "logs");
       mkdirSync17(logsDir, { recursive: true, mode: 448 });
-      logPath = join38(logsDir, `server-${Date.now()}-${process.pid}.log`);
-      logFd = openSync3(logPath, "wx", 384);
+      logPath = join37(logsDir, `server-${Date.now()}-${process.pid}.log`);
+      logFd = openSync4(logPath, "wx", 384);
       log("\nStarting your workspace\u2026");
     }
     if (tailscale) {
@@ -40572,7 +40857,7 @@ async function runServe(options, log = console.log) {
     }
     throw error51;
   } finally {
-    if (logFd !== void 0) closeSync3(logFd);
+    if (logFd !== void 0) closeSync4(logFd);
     process.removeListener("SIGINT", cancelStartup);
     process.removeListener("SIGTERM", cancelStartup);
   }
@@ -40739,7 +41024,7 @@ async function runOnboardingCommand(options, io = defaultIo(), startServer = run
     }
     if (options.command === "setup") {
       io.log("\nAll set. Start with: openmausbot (or npx openmausbot without a global install).");
-      if (options.dataDir !== join38(homedir24(), ".openmausbot") || options.port !== 8799) {
+      if (options.dataDir !== join37(homedir24(), ".openmausbot") || options.port !== 8799) {
         io.log(`Use the same --data-dir (${options.dataDir}) and --port (${options.port}) options when starting.`);
       }
       return 0;