openmausbot 0.1.68 → 0.1.69

package/dist-server/pair-cli.js

@@ -2298,7 +2298,7 @@ function displayText(value, multiline = false) {
 }
 function plainText(question, hidden, context) {
   const { input, output, signal } = context;
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     input.setRawMode?.(hidden);
     const rl = createInterface({ input, terminal: hidden });
     let finished = false;
@@ -2309,7 +2309,7 @@ function plainText(question, hidden, context) {
       rl.close();
       output.write("\n");
       if (error51) reject(error51);
-      else resolve12(answer ?? "");
+      else resolve13(answer ?? "");
     };
     const cancel = () => finish(void 0, signal.reason ?? new SetupCancelled());
     signal.addEventListener("abort", cancel, { once: true });
@@ -17526,6 +17526,30 @@ var init_zod = __esm({
   }
 });
 
+// shared/image-generation.ts
+function normalizeImageGenerationUrl(value) {
+  const message2 = "Use an HTTPS API base URL, or HTTP for a local router, without passwords, query parameters or fragments";
+  let url2;
+  try {
+    url2 = new URL(value.trim());
+  } catch {
+    throw new Error(message2);
+  }
+  if (value.length > 2048 || url2.username || url2.password || url2.search || url2.hash) throw new Error(message2);
+  const host = url2.hostname.toLowerCase();
+  const ipv43 = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.exec(host);
+  const local = host === "localhost" || host.endsWith(".localhost") || host.endsWith(".local") || host === "host.docker.internal" || host === "host.containers.internal" || host === "[::1]" || /^\[f[cd][0-9a-f]{2}:/.test(host) || ipv43 && (Number(ipv43[1]) === 127 || Number(ipv43[1]) === 10 || Number(ipv43[1]) === 192 && Number(ipv43[2]) === 168 || Number(ipv43[1]) === 172 && Number(ipv43[2]) >= 16 && Number(ipv43[2]) <= 31);
+  if (url2.protocol !== "https:" && !(url2.protocol === "http:" && local)) throw new Error(message2);
+  if (ipv43 && (Number(ipv43[1]) === 0 || Number(ipv43[1]) === 169 && Number(ipv43[2]) === 254)) throw new Error(message2);
+  url2.pathname = url2.pathname.replace(/\/+$/, "").replace(/\/images\/generations$/, "");
+  return url2.toString().replace(/\/+$/, "");
+}
+var init_image_generation = __esm({
+  "shared/image-generation.ts"() {
+    "use strict";
+  }
+});
+
 // server/contracts.ts
 var EFFORT_LEVELS, eventCounter, newEventId, newId;
 var init_contracts = __esm({
@@ -17732,6 +17756,7 @@ function loadConfig() {
   if (process.env.OMB_TTS_KEY !== void 0) cfg.tts.key = process.env.OMB_TTS_KEY;
   cfg.imageGen = { ...cfg.imageGen };
   if (process.env.OMB_OPENAI_IMAGE_KEY !== void 0) cfg.imageGen.key = process.env.OMB_OPENAI_IMAGE_KEY;
+  if (process.env.OMB_CUSTOM_IMAGE_KEY !== void 0) cfg.imageGen.customApiKey = process.env.OMB_CUSTOM_IMAGE_KEY;
   const splitEmails = (value) => value.split(/[,\s]+/).map((entry) => entry.trim().toLowerCase()).filter(Boolean);
   if (process.env.OMB_SIGNIN_EMAILS !== void 0 || process.env.OMB_SIGNIN_MEMBER_EMAILS !== void 0) {
     cfg.signIn = { ...cfg.signIn };
@@ -17880,6 +17905,7 @@ var init_config = __esm({
   "server/config.ts"() {
     "use strict";
     init_zod();
+    init_image_generation();
     init_atomic();
     init_contracts();
     init_mcp_registry();
@@ -17988,8 +18014,25 @@ var init_config = __esm({
        * engine: "elevenlabs" (default; needs a key) or "system" (the Mac's
        * built-in voices, no key). */
       tts: external_exports.object({ key: optionalText, voice: optionalText, provider: external_exports.enum(["elevenlabs", "system"]).optional() }).optional(),
-      /** OpenAI key used only by the in-process avatar image generator. */
-      imageGen: external_exports.object({ key: optionalText }).optional(),
+      /** Avatar provider credentials stay separate; choosing a router never reuses a cloud key. */
+      imageGen: external_exports.object({
+        provider: external_exports.enum(["openai", "xai", "custom"]).optional(),
+        key: optionalText,
+        customApiKey: optionalText,
+        customUrl: external_exports.string().trim().max(2048).transform((value, ctx) => {
+          if (!value) return "";
+          try {
+            return normalizeImageGenerationUrl(value);
+          } catch (error51) {
+            ctx.addIssue({ code: "custom", message: error51.message });
+            return external_exports.NEVER;
+          }
+        }).optional(),
+        customModel: external_exports.string().trim().max(200).refine(
+          (value) => !["\r", "\n", "\0"].some((character) => value.includes(character)),
+          "Use a model ID without control characters"
+        ).optional()
+      }).optional(),
       /** Non-secret profile details shown in the sidebar. */
       profile: external_exports.object({ name: optionalText, email: optionalText }).optional(),
       /** UI language override (BCP-47, lowercase). Empty/absent = follow the
@@ -18024,6 +18067,7 @@ var init_config = __esm({
       "OPENCODE_API_KEY",
       "OMB_TTS_KEY",
       "OMB_OPENAI_IMAGE_KEY",
+      "OMB_CUSTOM_IMAGE_KEY",
       "COMPOSIO_API_KEY",
       "OMB_COMPOSIO_BROKER_TOKEN",
       // Harness-private filesystem hints are not credentials themselves, but
@@ -18679,12 +18723,12 @@ function describeSpawnFailure(err, cli) {
 function killCliTree(child, timeoutMs = 5e3) {
   const pid = child.pid;
   if (!pid || child.exitCode !== null || child.signalCode !== null) return Promise.resolve(true);
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let timer;
     const done = (stopped) => {
       clearTimeout(timer);
       child.off("close", closed);
-      resolve12(stopped);
+      resolve13(stopped);
     };
     const closed = () => done(true);
     child.once("close", closed);
@@ -18909,8 +18953,10 @@ var init_registry = __esm({
               access: driver?.metadata.access ?? "subscription",
               install: driver?.install,
               authentication: inst.startAuthentication ? {
-                method: inst.getAuthentication && inst.completeAuthentication ? "paste-code" : inst.getAuthentication ? "device-code" : "browser"
+                method: inst.getAuthentication && inst.completeAuthentication ? "paste-code" : inst.getAuthentication ? "device-code" : "browser",
                 // a link and a callback URL (managed engines)
+                // the browser may remove the stored sign-in to switch accounts
+                signOut: inst.signOut !== void 0
               } : void 0,
               cli: this.cliByInstance.get(inst.instanceId),
               cliDefault: cliDefaultOf(driver),
@@ -19625,7 +19671,7 @@ function createAcpDriver(support11) {
           }
           appendNative(threadId, { dir: "out", source: SOURCE, msg: nativeLogMessage(obj) });
         };
-        const request = (method, params, timeoutMs) => new Promise((resolve12, reject) => {
+        const request = (method, params, timeoutMs) => new Promise((resolve13, reject) => {
           const id = nextId++;
           let timer = null;
           if (timeoutMs) {
@@ -19635,7 +19681,7 @@ function createAcpDriver(support11) {
             }, timeoutMs);
             timer.unref?.();
           }
-          rpcPending.set(id, { resolve: resolve12, reject, timer });
+          rpcPending.set(id, { resolve: resolve13, reject, timer });
           send({ jsonrpc: "2.0", id, method, params });
         });
         const stop = () => killCliTree(child);
@@ -20071,12 +20117,12 @@ ${turn.text}` : turn.text;
       const snapshot = async () => {
         const env = childEnv();
         if (support11.snapshot) return support11.snapshot(env, config2, instanceId);
-        const version2 = await new Promise((resolve12) => {
+        const version2 = await new Promise((resolve13) => {
           execCli(
             config2.cli,
             ["--version"],
             { timeout: 8e3, env },
-            (err, stdout2) => resolve12(err ? null : stdout2.trim())
+            (err, stdout2) => resolve13(err ? null : stdout2.trim())
           );
         });
         if (!version2) return { state: "unavailable", reason: `\`${config2.cli}\` CLI not found` };
@@ -20466,14 +20512,14 @@ var init_antigravity_acp = __esm({
         this.child.stderr.setEncoding("utf8");
         this.child.stderr.on("data", (chunk) => this.consumeDiagnostics(chunk));
         this.child.once("error", (error51) => this.failAll(error51));
-        this.exited = new Promise((resolve12) => {
+        this.exited = new Promise((resolve13) => {
           this.child.once("close", (code, signal) => {
             this.noteStartupDiagnostic(this.diagnosticBuffer);
             this.diagnosticBuffer = "";
             if (!this.closed) this.failAll(new Error(
               `Antigravity ACP exited ${code ?? signal ?? "unexpectedly"}.${this.nativeStartupHint ? ` ${this.nativeStartupHint}` : ""}`
             ));
-            resolve12();
+            resolve13();
           });
         });
       }
@@ -20579,8 +20625,8 @@ var init_antigravity_acp = __esm({
       async closeAndWait(timeoutMs = 5e3) {
         this.close();
         let timer;
-        const timedOut = new Promise((resolve12) => {
-          timer = setTimeout(() => resolve12(false), timeoutMs);
+        const timedOut = new Promise((resolve13) => {
+          timer = setTimeout(() => resolve13(false), timeoutMs);
           timer.unref?.();
         });
         try {
@@ -21089,7 +21135,7 @@ var init_antigravity_runtime = __esm({
     FREE_SPACE_MARGIN = 256 * 1024 * 1024;
     DOWNLOAD_TIMEOUT_MS2 = 45 * 6e4;
     STAGING_PREFIX = ".install-";
-    wait = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
+    wait = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
     INSTALL_RECORD = ".install-complete.json";
     AntigravitySetupError = class extends Error {
       status = 409;
@@ -21803,13 +21849,13 @@ function computeBackoff(attempt, random = Math.random) {
 function interruptibleDelay(ms, signal) {
   let timer = null;
   let onCancel = null;
-  const promise2 = new Promise((resolve12) => {
-    timer = setTimeout(() => resolve12("elapsed"), Math.max(1, ms));
+  const promise2 = new Promise((resolve13) => {
+    timer = setTimeout(() => resolve13("elapsed"), Math.max(1, ms));
     timer.unref?.();
-    if (signal?.aborted) return resolve12("cancelled");
+    if (signal?.aborted) return resolve13("cancelled");
     onCancel = () => {
       clearTimeout(timer);
-      resolve12("cancelled");
+      resolve13("cancelled");
     };
     signal?.addEventListener("abort", onCancel, { once: true });
   });
@@ -21863,24 +21909,24 @@ import { createServer as createNetServer } from "node:net";
 import { homedir as homedir9, tmpdir as tmpdir3 } from "node:os";
 import { join as join16, dirname as dirname8, isAbsolute as isAbsolute4, normalize } from "node:path";
 function claudeAuthStatus(cli, env, run3 = execCli) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     run3(cli, ["auth", "status", "--json"], { timeout: 8e3, maxBuffer: 65536, env }, (_error, stdout2) => {
       try {
         const status = JSON.parse(stdout2);
         if (!status || typeof status !== "object" || !("loggedIn" in status) || status.loggedIn !== true) {
-          return resolve12({ authenticated: false });
+          return resolve13({ authenticated: false });
         }
         const identity = status;
         const boundedText = (value, max) => typeof value === "string" && value.trim().length > 0 && value.length <= max && !/[\p{Cc}\p{Cf}]/u.test(value) ? value.trim() : void 0;
         const candidateEmail = boundedText(identity.email, 254);
         const email3 = candidateEmail && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(candidateEmail) ? candidateEmail : void 0;
         const organization = boundedText(identity.orgName, 160);
-        resolve12({
+        resolve13({
           authenticated: true,
           ...email3 || organization ? { account: { ...email3 ? { email: email3 } : {}, ...organization ? { organization } : {} } } : {}
         });
       } catch {
-        resolve12({ authenticated: false });
+        resolve13({ authenticated: false });
       }
     });
   });
@@ -22071,9 +22117,9 @@ async function createPermissionBroker(opts) {
       unlinkSync3(candidate);
     } catch {
     }
-    let outcome = await new Promise((resolve12) => {
-      attempt.once("listening", () => resolve12("listening"));
-      attempt.once("error", (error51) => resolve12(error51));
+    let outcome = await new Promise((resolve13) => {
+      attempt.once("listening", () => resolve13("listening"));
+      attempt.once("error", (error51) => resolve13(error51));
       attempt.listen(candidate);
     });
     if (outcome === "listening" && process.platform !== "win32") {
@@ -22330,19 +22376,19 @@ var init_claude = __esm({
         };
         const writeUser = (s, threadId, promptMsg) => {
           if (!s.child.stdin.writable || s.child.stdin.destroyed) return Promise.resolve(false);
-          return new Promise((resolve12) => {
+          return new Promise((resolve13) => {
             try {
               s.child.stdin.write(JSON.stringify(promptMsg) + "\n", (error51) => {
-                if (error51) return resolve12(false);
+                if (error51) return resolve13(false);
                 appendNative(threadId, {
                   dir: "out",
                   source: "claude.sdk.message",
                   msg: diagnosticClaudeUserMessage(promptMsg)
                 });
-                resolve12(true);
+                resolve13(true);
               });
             } catch {
-              resolve12(false);
+              resolve13(false);
             }
           });
         };
@@ -22832,19 +22878,19 @@ var init_claude = __esm({
         } });
         const snapshot = async () => {
           const env = environment();
-          const version2 = await new Promise((resolve12) => {
+          const version2 = await new Promise((resolve13) => {
             execCli(
               config2.cli,
               ["--version"],
               { timeout: 8e3, env },
-              (err, stdout2) => resolve12(err ? null : stdout2.trim())
+              (err, stdout2) => resolve13(err ? null : stdout2.trim())
             );
           });
           if (!version2) return { state: "unavailable", reason: `\`${config2.cli}\` CLI not found` };
           const auth = await claudeAuthStatus(config2.cli, env);
           return { state: "available", version: version2, ...auth, billing: "subscription" };
         };
-        const generateReview = (prompt, signal) => new Promise((resolve12, reject) => {
+        const generateReview = (prompt, signal) => new Promise((resolve13, reject) => {
           const child = spawnCli(
             config2.cli,
             ["-p", "--model", "claude-haiku-4-5", "--output-format", "text"],
@@ -22862,7 +22908,7 @@ var init_claude = __esm({
             clearTimeout(timer);
             signal?.removeEventListener("abort", onAbort);
             if (error51) reject(error51);
-            else resolve12(stdout2.trim());
+            else resolve13(stdout2.trim());
           };
           const onAbort = () => {
             killCliTree(child);
@@ -22977,7 +23023,7 @@ function decodeCodexSelection(id) {
   return { model: id, modelProvider: MODEL_ID2.test(id) ? OFFICIAL_CODEX_PROVIDER : null };
 }
 function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const child = spawnCli(cli, ["app-server"], {
       cwd: homedir10(),
       env,
@@ -22994,7 +23040,7 @@ function readCodexAppServerModelCatalog(cli, env, timeoutMs = 8e3) {
       settled = true;
       clearTimeout(timer);
       killCliTree(child);
-      resolve12(catalog);
+      resolve13(catalog);
     };
     const request = (method, params, kind) => {
       const id = nextId++;
@@ -23405,6 +23451,7 @@ var init_codex_device_auth = __esm({
     authenticatingHomes2 = /* @__PURE__ */ new Set();
     CodexDeviceAuthController = class {
       flow = null;
+      command = null;
       disposed = false;
       options;
       constructor(options) {
@@ -23480,12 +23527,92 @@ var init_codex_device_auth = __esm({
         if (this.flow?.status.phase === "waiting") this.finish(this.flow, "cancelled", "ChatGPT sign-in cancelled.");
         await this.flow?.stopping;
         if (this.flow?.terminationFailed) throw new Error(this.flow.status.message);
+        if (this.command && !await this.stopChild(this.command)) {
+          throw new Error("Codex could not be stopped on this server. Ask the server administrator to stop the account command before trying again.");
+        }
       }
       async dispose() {
         this.disposed = true;
         await this.cancel();
         this.flow = null;
       }
+      /** Remove the ChatGPT sign-in Codex stores for this server account so a
+       * different account can connect. A sign-in in progress is never pulled
+       * away underneath the browser completing it. */
+      async signOut() {
+        if (this.disposed) throw new Error("This provider was removed. Refresh Settings before signing out.");
+        if (this.flow?.status.phase === "waiting") throw new Error("Finish or cancel the ChatGPT sign-in in progress before signing out.");
+        await this.flow?.stopping;
+        if (this.disposed) throw new Error("This provider was removed. Refresh Settings before signing out.");
+        const env = this.options.environment();
+        const home = env.HOME || env.USERPROFILE || homedir11();
+        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 || join19(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.");
+        }
+        authenticatingHomes2.add(homeKey);
+        try {
+          const before = await this.exec(["login", "status"], env, home);
+          if (before.code === 1 && /^not logged in\b/im.test(before.output)) return;
+          if (before.code !== 0 || !/^logged in.*chatgpt\b/im.test(before.output)) {
+            throw new Error("Codex did not confirm a ChatGPT sign-in. Other authentication methods will not be removed; ask the server administrator to check the account.");
+          }
+          const logout = await this.exec(["logout"], env, home);
+          if (logout.code !== 0) throw new Error("Codex could not remove the sign-in on this server. Check the server's Codex installation and try again.");
+          const status = await this.exec(["login", "status"], env, home);
+          if (status.code !== 1 || !/^not logged in\b/im.test(status.output)) {
+            throw new Error("Codex still reports a sign-in on this server. Update Codex and check its login status before trying again.");
+          }
+        } finally {
+          const child = this.command;
+          if (child && child.exitCode === null && child.signalCode === null) {
+            child.once("close", () => authenticatingHomes2.delete(homeKey));
+          } else authenticatingHomes2.delete(homeKey);
+        }
+      }
+      /** One bounded, non-interactive Codex command. Its output stays here;
+       * callers see an exit code and a status-line match, never the text. */
+      exec(args, env, cwd) {
+        return new Promise((resolveExec, rejectExec) => {
+          if (this.disposed) {
+            rejectExec(new Error("This provider was removed. Refresh Settings before signing out."));
+            return;
+          }
+          let child;
+          try {
+            child = spawnCli(this.options.cli, args, { env: { ...env, NO_COLOR: "1" }, cwd, stdio: ["pipe", "pipe", "pipe"] });
+          } catch {
+            rejectExec(new Error("Codex could not start on this server. Install or update the configured Codex CLI, then try again."));
+            return;
+          }
+          this.command = child;
+          child.stdin.end();
+          let output = "";
+          const receive = (chunk) => {
+            if (output.length < MAX_OUTPUT2) output += chunk.toString("utf8").slice(0, MAX_OUTPUT2 - output.length);
+          };
+          child.stdout.on("data", receive);
+          child.stderr.on("data", receive);
+          const timer = setTimeout(() => {
+            void this.stopChild(child).catch(() => false).then((stopped) => {
+              if (!stopped) rejectExec(new Error("Codex could not be stopped on this server. Ask the server administrator to stop the account command before trying again."));
+            });
+          }, this.options.startupTimeoutMs ?? 3e4);
+          timer.unref();
+          child.once("error", (error51) => {
+            clearTimeout(timer);
+            rejectExec(new Error(error51.code === "ENOENT" ? "Codex is not installed on this server. Run npm install -g @openai/codex@latest on the server, then try again." : "Codex could not start on this server. Check the configured CLI path and its executable permissions."));
+          });
+          child.once("close", (code) => {
+            clearTimeout(timer);
+            if (this.command === child) this.command = null;
+            resolveExec({ code, output: stripVTControlCharacters4(output) });
+          });
+        });
+      }
       run(flow, args, env, cwd, done, parsePrompt = false) {
         if (flow.status.phase !== "waiting") return;
         let child;
@@ -23540,7 +23667,7 @@ var init_codex_device_auth = __esm({
           if (phase === "succeeded") flow.resolve({ ...flow.status, phase });
           else flow.reject(new Error(message2 ?? "ChatGPT sign-in did not finish."));
         }
-        flow.stopping = this.stopChild(flow).catch(() => false).then((stopped) => {
+        flow.stopping = this.stopChild(flow.child).catch(() => false).then((stopped) => {
           const release = () => authenticatingHomes2.delete(flow.homeKey);
           if (stopped) {
             release();
@@ -23555,8 +23682,7 @@ var init_codex_device_auth = __esm({
         if (phase === "succeeded") void this.options.onAuthenticated?.().catch(() => {
         });
       }
-      async stopChild(flow) {
-        const child = flow.child;
+      async stopChild(child) {
         if (!child || await killCliTree(child, this.options.terminateTimeoutMs ?? 1500)) return true;
         if (process.platform !== "win32" && child.pid) {
           try {
@@ -23580,9 +23706,122 @@ var init_codex_device_auth = __esm({
   }
 });
 
+// server/drivers/codex-identity.ts
+import { homedir as homedir12 } from "node:os";
+import { isAbsolute as isAbsolute6, join as join20, 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) ? join20(home, ".codex") : null;
+}
+async function codexAccountEmail(cli, env, timeoutMs = 3e3) {
+  const cwd = env.HOME || env.USERPROFILE || homedir12();
+  if (!isAbsolute6(cwd) || !codexHome2(env)) return null;
+  return new Promise((resolveEmail) => {
+    let child;
+    try {
+      child = spawnCli(cli, ["app-server"], { cwd, env, stdio: ["pipe", "pipe", "pipe"] });
+    } catch {
+      resolveEmail(null);
+      return;
+    }
+    let finishing = false;
+    let buffer = "";
+    let outputBytes = 0;
+    let initialized = false;
+    const finish = async (email3) => {
+      if (finishing) return;
+      finishing = true;
+      clearTimeout(timer);
+      let stopped = await killCliTree(child, 1e3);
+      if (!stopped && child.pid) {
+        try {
+          if (process.platform === "win32") child.kill("SIGKILL");
+          else process.kill(-child.pid, "SIGKILL");
+        } catch {
+          try {
+            child.kill("SIGKILL");
+          } catch {
+          }
+        }
+        stopped = await killCliTree(child, 1e3);
+      }
+      resolveEmail(stopped ? email3 : null);
+    };
+    const timer = setTimeout(() => {
+      void finish(null);
+    }, timeoutMs);
+    timer.unref();
+    const send = (message2) => {
+      try {
+        child.stdin.write(`${JSON.stringify(message2)}
+`);
+      } catch {
+        void finish(null);
+      }
+    };
+    child.stdin.on("error", () => {
+      void finish(null);
+    });
+    child.stderr.resume();
+    child.on("error", () => {
+      void finish(null);
+    });
+    child.on("close", () => {
+      void finish(null);
+    });
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      if (finishing) return;
+      outputBytes += Buffer.byteLength(chunk);
+      if (outputBytes > MAX_OUTPUT3) {
+        void finish(null);
+        return;
+      }
+      buffer += chunk;
+      let newline;
+      while (!finishing && (newline = buffer.indexOf("\n")) !== -1) {
+        const line = buffer.slice(0, newline);
+        buffer = buffer.slice(newline + 1);
+        if (!line.trim()) continue;
+        let message2;
+        try {
+          message2 = JSON.parse(line);
+        } catch {
+          void finish(null);
+          return;
+        }
+        if (!initialized && message2?.id === 1) {
+          if (message2.error || !message2.result) {
+            void finish(null);
+            return;
+          }
+          initialized = true;
+          send({ method: "initialized", params: {} });
+          send({ id: 2, method: "account/read", params: { refreshToken: false } });
+        } else if (initialized && message2?.id === 2) {
+          const account = message2.error ? null : message2.result?.account;
+          const email3 = account?.type === "chatgpt" ? account.email : null;
+          void finish(typeof email3 === "string" && email3.length <= 254 && EMAIL.test(email3) && !/[\p{Cc}\p{Cf}]/u.test(email3) ? email3 : null);
+        }
+      }
+    });
+    send({ id: 1, method: "initialize", params: { clientInfo: { name: "openmausbot", version: "1" } } });
+  });
+}
+var MAX_OUTPUT3, EMAIL;
+var init_codex_identity = __esm({
+  "server/drivers/codex-identity.ts"() {
+    "use strict";
+    init_procs();
+    MAX_OUTPUT3 = 16384;
+    EMAIL = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  }
+});
+
 // server/drivers/codex.ts
 import { existsSync as existsSync7 } from "node:fs";
-import { homedir as homedir12 } from "node:os";
+import { homedir as homedir13 } from "node:os";
 function codexPredatesAstra(version2) {
   const value = version2.trim();
   const match = /\bcodex-cli\s+v?(\d+)\.(\d+)\.(\d+)(?:[-+][0-9a-z.-]+)?(?![\d.])\b/i.exec(value) ?? /^v?(\d+)\.(\d+)\.(\d+)(?:[-+][0-9a-z.-]+)?$/i.exec(value);
@@ -23852,6 +24091,7 @@ var init_codex = __esm({
     init_native();
     init_codex_instructions();
     init_codex_device_auth();
+    init_codex_identity();
     init_codex_catalog();
     DRIVER_KIND3 = "codex";
     ASTRA_MODEL_ID = "gpt-6-astra";
@@ -23985,7 +24225,7 @@ var init_codex = __esm({
               );
             }
             const child = spawnCli(config2.cli, appServerArgs, {
-              cwd: turn.cwd ?? homedir12(),
+              cwd: turn.cwd ?? homedir13(),
               env,
               stdio: ["pipe", "pipe", "pipe"]
             });
@@ -24013,7 +24253,7 @@ var init_codex = __esm({
                 msg: codexNativeLogMessage(obj)
               });
             };
-            const request = (method, params, timeoutMs = 6e4) => new Promise((resolve12, reject) => {
+            const request = (method, params, timeoutMs = 6e4) => new Promise((resolve13, reject) => {
               const id = nextId++;
               if (method === "config/read") sensitiveResponseIds.add(id);
               const timer = setTimeout(() => {
@@ -24023,7 +24263,7 @@ var init_codex = __esm({
               rpcPending.set(id, {
                 resolve: (v) => {
                   clearTimeout(timer);
-                  resolve12(v);
+                  resolve13(v);
                 },
                 reject: (e) => {
                   clearTimeout(timer);
@@ -24291,7 +24531,7 @@ var init_codex = __esm({
               let effectiveConfig;
               try {
                 const configured = await request("config/read", {
-                  cwd: turn.cwd ?? homedir12(),
+                  cwd: turn.cwd ?? homedir13(),
                   includeLayers: false
                 });
                 effectiveConfig = configured?.config;
@@ -24335,7 +24575,7 @@ var init_codex = __esm({
                 const selection = decodeCodexSelection(turn.model);
                 const startThread = () => request("thread/start", {
                   developerInstructions,
-                  cwd: turn.cwd ?? homedir12(),
+                  cwd: turn.cwd ?? homedir13(),
                   model: selection.model,
                   ...selection.modelProvider ? { modelProvider: selection.modelProvider } : {},
                   ...approvalParams.thread,
@@ -24402,8 +24642,8 @@ var init_codex = __esm({
                   void settle(false, "shutdown_timeout");
                   return;
                 }
-                await new Promise((resolve12) => {
-                  const timer = setTimeout(resolve12, Math.max(1, Math.round(delayMs * retryScale)));
+                await new Promise((resolve13) => {
+                  const timer = setTimeout(resolve13, Math.max(1, Math.round(delayMs * retryScale)));
                   timer.unref?.();
                 });
                 if (!stopRequested) {
@@ -24431,28 +24671,30 @@ var init_codex = __esm({
         };
         const snapshot = async () => {
           const env = childEnv();
-          const version2 = await new Promise((resolve12) => {
+          const version2 = await new Promise((resolve13) => {
             execCli(
               config2.cli,
               ["--version"],
               { timeout: 8e3, env },
-              (err, stdout2) => resolve12(err ? null : stdout2.trim())
+              (err, stdout2) => resolve13(err ? null : stdout2.trim())
             );
           });
           if (!version2) return { state: "unavailable", reason: `\`${config2.cli}\` CLI not found` };
-          const authenticated = await new Promise((resolve12) => {
+          const authenticated = await new Promise((resolve13) => {
             execCli(
               config2.cli,
               ["login", "status"],
               { timeout: 8e3, env },
-              (err, stdout2, stderr) => resolve12(!err && /^logged in\b/im.test(`${stdout2}
+              (err, stdout2, stderr) => resolve13(!err && /^logged in\b/im.test(`${stdout2}
 ${stderr ?? ""}`))
             );
           });
+          const email3 = authenticated ? await codexAccountEmail(config2.cli, env) : null;
           return {
             state: "available",
             version: version2,
             authenticated,
+            ...email3 ? { account: { email: email3 } } : {},
             update: codexAstraUpdate(version2, models, config2.cli),
             billing: "subscription"
           };
@@ -24469,6 +24711,7 @@ ${stderr ?? ""}`))
           startAuthentication: () => authentication.start(),
           getAuthentication: (flowId) => authentication.get(flowId),
           cancelAuthentication: () => authentication.cancel(),
+          signOut: () => authentication.signOut(),
           snapshot,
           adapter: {
             provider: DRIVER_KIND3,
@@ -24793,11 +25036,11 @@ var init_grok = __esm({
 
 // server/drivers/acp/grok.ts
 import { existsSync as existsSync8, readFileSync as readFileSync9, writeFileSync as writeFileSync6 } from "node:fs";
-import { homedir as homedir13 } from "node:os";
-import { join as join20 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { join as join21 } from "node:path";
 function grokHome(env) {
   if (env.GROK_HOME) return env.GROK_HOME;
-  return join20(env.HOME || env.USERPROFILE || homedir13(), ".grok");
+  return join21(env.HOME || env.USERPROFILE || homedir14(), ".grok");
 }
 function unquote2(raw) {
   const value = raw.trim();
@@ -24807,7 +25050,7 @@ function unquote2(raw) {
   return value;
 }
 function readGrokModelCatalog(env = process.env) {
-  const path3 = join20(grokHome(env), "config.toml");
+  const path3 = join21(grokHome(env), "config.toml");
   let text2 = "";
   try {
     text2 = readFileSync9(path3, "utf8");
@@ -24880,7 +25123,7 @@ function ensureGrokInjectSlug(modelId, env = process.env) {
   if (!inject) return modelId;
   const host = localHost(inject.host);
   if (!host) return modelId;
-  const path3 = join20(grokHome(env), "config.toml");
+  const path3 = join21(grokHome(env), "config.toml");
   let text2 = "";
   try {
     text2 = readFileSync9(path3, "utf8");
@@ -25015,7 +25258,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: () => existsSync8(join20(homedir13(), ".grok", "auth.json")),
+      isAuthenticated: () => existsSync8(join21(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.
@@ -25029,11 +25272,11 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/gemini.ts
 import { existsSync as existsSync9, readFileSync as readFileSync10 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
-import { join as join21 } from "node:path";
+import { homedir as homedir15 } from "node:os";
+import { join as join22 } from "node:path";
 function liveOauthCredential() {
   try {
-    const creds = JSON.parse(readFileSync10(join21(homedir14(), ".gemini", "oauth_creds.json"), "utf8"));
+    const creds = JSON.parse(readFileSync10(join22(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) {
@@ -25046,7 +25289,7 @@ function liveOauthCredential() {
   }
 }
 function geminiIsAuthenticated(env) {
-  return nonBlank(env.GEMINI_API_KEY) || nonBlank(env.GOOGLE_API_KEY) || existsSync9(join21(homedir14(), ".gemini", "oauth_creds.json")) && liveOauthCredential();
+  return nonBlank(env.GEMINI_API_KEY) || nonBlank(env.GOOGLE_API_KEY) || existsSync9(join22(homedir15(), ".gemini", "oauth_creds.json")) && liveOauthCredential();
 }
 var AUTH_PREFERENCE, nonBlank, support3, GeminiAgentDriver;
 var init_gemini = __esm({
@@ -25089,16 +25332,16 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/kimi.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync11, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir as homedir15 } from "node:os";
-import { join as join22 } from "node:path";
+import { homedir as homedir16 } from "node:os";
+import { join as join23 } from "node:path";
 function isLocalInjectAlias(slug) {
   return LOCAL_PROVIDER_PREFIXES.some((prefix) => slug.startsWith(prefix));
 }
 function kimiDataRoot(env) {
-  return env.KIMI_CODE_HOME || join22(env.HOME || env.USERPROFILE || homedir15(), ".kimi-code");
+  return env.KIMI_CODE_HOME || join23(env.HOME || env.USERPROFILE || homedir16(), ".kimi-code");
 }
 function credentialsPath(env) {
-  return join22(kimiDataRoot(env), "credentials", "kimi-code.json");
+  return join23(kimiDataRoot(env), "credentials", "kimi-code.json");
 }
 function quoteToml2(value) {
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
@@ -25386,7 +25629,7 @@ function ensureKimiInjectAlias(modelId, env = process.env) {
   const alias = `${inject.host}/${inject.model.replace(/\//g, "-")}`;
   const dataRoot = kimiDataRoot(env);
   mkdirSync7(dataRoot, { recursive: true });
-  const path3 = join22(dataRoot, "config.toml");
+  const path3 = join23(dataRoot, "config.toml");
   let text2 = "";
   try {
     text2 = readFileSync11(path3, "utf8");
@@ -25451,7 +25694,7 @@ function readKimiModelCatalog(env) {
   const dataRoot = kimiDataRoot(env);
   let text2 = "";
   try {
-    text2 = readFileSync11(join22(dataRoot, "config.toml"), "utf8");
+    text2 = readFileSync11(join23(dataRoot, "config.toml"), "utf8");
   } catch {
     return STATIC_KIMI_MODELS;
   }
@@ -25571,18 +25814,18 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/droid.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync8, readFileSync as readFileSync12, writeFileSync as writeFileSync8 } from "node:fs";
-import { homedir as homedir16 } from "node:os";
-import { join as join23 } from "node:path";
+import { homedir as homedir17 } from "node:os";
+import { join as join24 } from "node:path";
 function authFilePaths(env) {
-  const home = env.FACTORY_HOME_OVERRIDE || env.HOME || homedir16();
-  return AUTH_FILES.map((name) => join23(home, ".factory", name));
+  const home = env.FACTORY_HOME_OVERRIDE || env.HOME || homedir17();
+  return AUTH_FILES.map((name) => join24(home, ".factory", name));
 }
 function droidInjectId(host, model) {
   const safe = `${host}-${model}`.replace(/[^a-zA-Z0-9._+-]+/g, "-").replace(/-+/g, "-");
   return `${INJECT_ID_PREFIX}${safe}`;
 }
 function factoryHome(env) {
-  return env.FACTORY_HOME_OVERRIDE || env.HOME || env.USERPROFILE || homedir16();
+  return env.FACTORY_HOME_OVERRIDE || env.HOME || env.USERPROFILE || homedir17();
 }
 function ensureDroidInjectModel(modelId, env = process.env) {
   const inject = decodeInjectId(modelId);
@@ -25590,9 +25833,9 @@ function ensureDroidInjectModel(modelId, env = process.env) {
   const host = localHost(inject.host);
   if (!host) return modelId;
   const id = droidInjectId(inject.host, inject.model);
-  const dir = join23(factoryHome(env), ".factory");
+  const dir = join24(factoryHome(env), ".factory");
   mkdirSync8(dir, { recursive: true });
-  const path3 = join23(dir, "settings.json");
+  const path3 = join24(dir, "settings.json");
   let settings2 = {};
   try {
     settings2 = JSON.parse(readFileSync12(path3, "utf8"));
@@ -25632,7 +25875,7 @@ function applyDroidLocalAuthEnv(env, modelId) {
   env.FACTORY_API_KEY = "openmausbot-local";
 }
 function readSettings(env) {
-  return JSON.parse(readFileSync12(join23(factoryHome(env), ".factory", "settings.json"), "utf8"));
+  return JSON.parse(readFileSync12(join24(factoryHome(env), ".factory", "settings.json"), "utf8"));
 }
 async function resolveModels(env) {
   let catalog = MODELS3;
@@ -25901,10 +26144,10 @@ function decodeCursorAuthText(text2) {
   return null;
 }
 function execText(run3, cli, args, env) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     run3(cli, args, { timeout: EXEC_TIMEOUT_MS, env }, (err, stdout2) => {
-      if (err) return resolve12(null);
-      resolve12(String(stdout2 ?? ""));
+      if (err) return resolve13(null);
+      resolve13(String(stdout2 ?? ""));
     });
   });
 }
@@ -26023,8 +26266,8 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/opencode-go.ts
 import { existsSync as existsSync12, mkdirSync as mkdirSync9, readFileSync as readFileSync13, writeFileSync as writeFileSync9 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
-import { join as join24 } from "node:path";
+import { homedir as homedir18 } from "node:os";
+import { join as join25 } from "node:path";
 function labelForModel(id) {
   return id.split(/[-_.]+/g).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
 }
@@ -26098,7 +26341,7 @@ function parseOpenCodeModelsOutput(stdout2) {
   return { default: (preferred ?? options[0]).id, options };
 }
 function runOpenCodeModels(cli, environment, verbose) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     execCli(
       cli,
       ["models", ...verbose ? ["--verbose"] : []],
@@ -26108,7 +26351,7 @@ function runOpenCodeModels(cli, environment, verbose) {
           reject(new Error(stderr?.trim() || error51.message, { cause: error51 }));
           return;
         }
-        resolve12(stdout2);
+        resolve13(stdout2);
       }
     );
   });
@@ -26124,8 +26367,8 @@ async function discoverOpenCodeModels(environment, cli = "opencode") {
   }
 }
 function opencodeConfigDir(env) {
-  const home = env.HOME || env.USERPROFILE || homedir17();
-  return join24(env.XDG_CONFIG_HOME || join24(home, ".config"), "opencode");
+  const home = env.HOME || env.USERPROFILE || homedir18();
+  return join25(env.XDG_CONFIG_HOME || join25(home, ".config"), "opencode");
 }
 function ensureOpenCodeInjectModel(modelId, env = process.env) {
   const inject = decodeInjectId(modelId);
@@ -26135,7 +26378,7 @@ function ensureOpenCodeInjectModel(modelId, env = process.env) {
   const native = `${inject.host}/${inject.model}`;
   const dir = opencodeConfigDir(env);
   mkdirSync9(dir, { recursive: true });
-  const path3 = join24(dir, "opencode.json");
+  const path3 = join25(dir, "opencode.json");
   let config2 = { $schema: "https://opencode.ai/config.json" };
   if (existsSync12(path3)) {
     try {
@@ -26171,12 +26414,12 @@ function ensureOpenCodeInjectModel(modelId, env = process.env) {
   return native;
 }
 function storedAuthPaths(env) {
-  const home = env.HOME || env.USERPROFILE || homedir17();
+  const home = env.HOME || env.USERPROFILE || homedir18();
   const roots = [
-    env.XDG_DATA_HOME || join24(home, ".local", "share"),
-    process.platform === "darwin" ? join24(home, "Library", "Application Support") : process.platform === "win32" ? env.LOCALAPPDATA || join24(home, "AppData", "Local") : ""
+    env.XDG_DATA_HOME || join25(home, ".local", "share"),
+    process.platform === "darwin" ? join25(home, "Library", "Application Support") : process.platform === "win32" ? env.LOCALAPPDATA || join25(home, "AppData", "Local") : ""
   ].filter(Boolean);
-  return [...new Set(roots)].map((root) => join24(root, "opencode", "auth.json"));
+  return [...new Set(roots)].map((root) => join25(root, "opencode", "auth.json"));
 }
 function usableAuthEntry(parsed) {
   return Object.values(parsed).some((auth) => {
@@ -26307,10 +26550,96 @@ ${turn.text}` : turn.text
 
 // server/drivers/acp/qwen.ts
 import { chmodSync as chmodSync4, existsSync as existsSync13, mkdirSync as mkdirSync10, readFileSync as readFileSync14, writeFileSync as writeFileSync10 } from "node:fs";
-import { homedir as homedir18 } from "node:os";
-import { join as join25 } from "node:path";
+import { createHash as createHash7 } from "node:crypto";
+import { homedir as homedir19 } from "node:os";
+import { join as join26 } from "node:path";
 function qwenHome(env) {
-  return join25(env.HOME || env.USERPROFILE || homedir18(), ".qwen");
+  const home = process.platform === "win32" ? env.USERPROFILE || env.HOME || homedir19() : env.HOME || env.USERPROFILE || homedir19();
+  return join26(home, ".qwen");
+}
+function isRecord(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function qwenModelLabel(id, name) {
+  if (!name || name.toLocaleLowerCase().endsWith(id.toLocaleLowerCase())) return id;
+  return `${id} \u2014 ${name}`;
+}
+function readQwenRoutes(env) {
+  let settings2;
+  try {
+    settings2 = JSON.parse(readFileSync14(join26(qwenHome(env), "settings.json"), "utf8"));
+  } catch {
+    return [];
+  }
+  if (!isRecord(settings2) || !isRecord(settings2.modelProviders)) return [];
+  const routes = [];
+  const seen = /* @__PURE__ */ new Set();
+  const mappings = isRecord(settings2.providerProtocol) ? settings2.providerProtocol : {};
+  for (const [provider, rows] of Object.entries(settings2.modelProviders)) {
+    const protocol = Object.hasOwn(mappings, provider) ? mappings[provider] : provider;
+    if (typeof protocol !== "string" || !PROTOCOLS.has(protocol) || !Array.isArray(rows)) continue;
+    for (const row of rows) {
+      if (!isRecord(row) || typeof row.id !== "string") continue;
+      const model = row.id;
+      if (!model.trim()) continue;
+      if (row.baseUrl !== void 0 && typeof row.baseUrl !== "string") continue;
+      const baseUrl = typeof row.baseUrl === "string" && row.baseUrl ? row.baseUrl : void 0;
+      if (baseUrl) {
+        try {
+          new URL(baseUrl);
+        } catch {
+          throw new Error("A Qwen model has an invalid endpoint. Fix its baseUrl in Qwen settings and refresh models.");
+        }
+      }
+      const identity = JSON.stringify([protocol, model, baseUrl ?? null]);
+      if (seen.has(identity)) continue;
+      seen.add(identity);
+      if (row.imageOnly === true || row.voiceOnly === true || row.fastOnly === true) continue;
+      routes.push({
+        id: `${model}(${protocol})`,
+        model,
+        provider,
+        protocol,
+        baseUrl,
+        label: typeof row.name === "string" && row.name ? row.name : model,
+        envKey: typeof row.envKey === "string" ? row.envKey : void 0
+      });
+    }
+  }
+  const counts = /* @__PURE__ */ new Map();
+  for (const route of routes) counts.set(route.id, (counts.get(route.id) ?? 0) + 1);
+  for (const route of routes) {
+    if (counts.get(route.id) === 1) continue;
+    const endpoint = route.baseUrl ?? (route.protocol === "openai" ? "https://api.openai.com/v1" : "");
+    let publicEndpoint = null;
+    if (endpoint) {
+      try {
+        const url2 = new URL(endpoint);
+        url2.username = "";
+        url2.password = "";
+        url2.search = "";
+        url2.hash = "";
+        publicEndpoint = url2.href;
+      } catch {
+        throw new Error("A Qwen model has an invalid endpoint. Fix its baseUrl in Qwen settings and refresh models.");
+      }
+    }
+    const identity = [route.id, route.label, route.envKey ?? null, route.baseUrl === void 0, publicEndpoint];
+    route.id = `qwen-route:v1:${createHash7("sha256").update(JSON.stringify(identity)).digest("base64url").slice(0, 16)}`;
+  }
+  if (new Set(routes.map((route) => route.id)).size !== routes.length) {
+    throw new Error("Qwen has indistinguishable model routes. Give them distinct names, envKey values, or public endpoints in Qwen settings.");
+  }
+  return routes;
+}
+function readQwenModelCatalog(env = process.env) {
+  const options = readQwenRoutes(env).map(({ id, model, label, provider }) => ({
+    id,
+    label: qwenModelLabel(model, label),
+    custom: true,
+    provider
+  }));
+  return { default: options[0]?.id ?? "", options };
 }
 function envKeyFor(hostId) {
   return `OPENMAUSBOT_QWEN_${hostId.toUpperCase().replace(/[^A-Z0-9]+/g, "_")}_API_KEY`;
@@ -26322,7 +26651,7 @@ function ensureQwenInjectModel(modelId, env = process.env) {
   if (!host) return modelId;
   const dir = qwenHome(env);
   mkdirSync10(dir, { recursive: true });
-  const path3 = join25(dir, "settings.json");
+  const path3 = join26(dir, "settings.json");
   let settings2 = {};
   if (existsSync13(path3)) {
     try {
@@ -26359,23 +26688,54 @@ function ensureQwenInjectModel(modelId, env = process.env) {
   return inject.model;
 }
 async function resolveModels2(env) {
-  const catalog = await mergeLocalInject(EMPTY, env);
-  return { default: catalog.options[0]?.id ?? "", options: catalog.options };
-}
-var EMPTY, support8, QwenAgentDriver;
+  const catalog = await mergeLocalInject(readQwenModelCatalog(env), env);
+  const routes = readQwenRoutes(env);
+  const replacements = /* @__PURE__ */ new Map();
+  for (const option of catalog.options) {
+    const injected = decodeInjectId(option.id);
+    if (!injected) continue;
+    const endpoint = localHost(injected.host)?.baseUrl;
+    for (const route of routes) {
+      if (route.protocol === "openai" && route.model === injected.model && route.baseUrl === endpoint) {
+        replacements.set(route.id, option.id);
+      }
+    }
+  }
+  const options = catalog.options.filter((option) => !replacements.has(option.id));
+  const preferred = replacements.get(catalog.default) ?? catalog.default;
+  return { default: options.some((option) => option.id === preferred) ? preferred : options[0]?.id ?? "", options };
+}
+function resolveQwenTurnModel(model, env) {
+  if (!model) return model;
+  const injected = decodeInjectId(model);
+  if (injected) ensureQwenInjectModel(model, env);
+  const routes = readQwenRoutes(env);
+  if (injected) {
+    const route = routes.find((row) => row.protocol === "openai" && row.model === injected.model && row.baseUrl === localHost(injected.host)?.baseUrl);
+    if (!route) throw new Error("Qwen could not configure this local model. Refresh models and select it again.");
+    return route.id;
+  }
+  if (routes.some((route) => route.id === model)) return model;
+  const matches = routes.filter((route) => route.model === model);
+  if (matches.length > 1) throw new Error("This Qwen model has multiple providers. Refresh models and select the intended provider again.");
+  if (!matches.length) throw new Error("This Qwen model is no longer configured. Refresh models and select it again.");
+  return matches[0].id;
+}
+var EMPTY, PROTOCOLS, support8, QwenAgentDriver;
 var init_qwen = __esm({
   "server/drivers/acp/qwen.ts"() {
     "use strict";
     init_local_inject();
     init_core3();
     EMPTY = { default: "", options: [] };
+    PROTOCOLS = /* @__PURE__ */ new Set(["openai", "anthropic", "gemini", "vertex-ai"]);
     support8 = {
       driverKind: "qwenAgent",
       displayName: "Qwen",
       access: "custom",
       models: EMPTY,
       resolveModels: resolveModels2,
-      resolveTurnModel: (model, env) => model ? ensureQwenInjectModel(model, env) : model,
+      resolveTurnModel: resolveQwenTurnModel,
       defaultCli: "qwen",
       nativeSource: "qwen.acp",
       loginNote: "Qwen Code CLI is not installed",
@@ -26387,7 +26747,10 @@ var init_qwen = __esm({
         },
         docsUrl: "https://qwenlm.github.io/qwen-code-docs/en/users/overview/"
       },
-      spawnArgs: (_config, turn) => ["--acp", ...turn.model ? ["-m", turn.model] : []],
+      // A raw -m only changes the model within the saved provider. ACP switches
+      // the complete route and confirms it before any prompt leaves OMB.
+      spawnArgs: () => ["--acp"],
+      selectModel: { configId: "model" },
       pickAuthMethod: () => null,
       authFailure: "continue",
       isAuthenticated: () => true,
@@ -33288,8 +33651,8 @@ var init_browser = __esm({
 // server/drivers/acp/hermes.ts
 import { spawn as spawn5 } from "node:child_process";
 import { mkdirSync as mkdirSync11, readFileSync as readFileSync15, writeFileSync as writeFileSync11 } from "node:fs";
-import { homedir as homedir19 } from "node:os";
-import { join as join26 } from "node:path";
+import { homedir as homedir20 } from "node:os";
+import { join as join27 } from "node:path";
 function bindHermesScreenshotCompat(env, modelId) {
   delete env[HERMES_OPENMAUS_SCREENSHOT_COMPAT];
   delete env[HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL];
@@ -33299,7 +33662,7 @@ function bindHermesScreenshotCompat(env, modelId) {
   env[HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL] = inject.model;
 }
 function hermesHome(env) {
-  return env.HERMES_HOME || join26(env.HOME || env.USERPROFILE || homedir19(), ".hermes");
+  return env.HERMES_HOME || join27(env.HOME || env.USERPROFILE || homedir20(), ".hermes");
 }
 function quoteYaml(value) {
   if (/^[\w./:+-]+$/.test(value)) return value;
@@ -33341,7 +33704,7 @@ function ensureHermesInjectProvider(modelId, env = process.env) {
   if (!host) return modelId;
   const dir = hermesHome(env);
   mkdirSync11(dir, { recursive: true });
-  const path3 = join26(dir, "config.yaml");
+  const path3 = join27(dir, "config.yaml");
   let text2 = "";
   try {
     text2 = readFileSync15(path3, "utf8");
@@ -33412,13 +33775,13 @@ function hermesConfiguredModel(env = process.env) {
   const dir = hermesHome(env);
   let secrets = "";
   try {
-    secrets = readFileSync15(join26(dir, ".env"), "utf8");
+    secrets = readFileSync15(join27(dir, ".env"), "utf8");
   } catch {
   }
   const hasHostedProviderKey = HERMES_HOSTED_PROVIDER_KEYS.some((name) => nonEmptyDotenvValue(secrets, name));
   let configuredDefault = null;
   try {
-    configuredDefault = hermesConfigDefault(readFileSync15(join26(dir, "config.yaml"), "utf8"));
+    configuredDefault = hermesConfigDefault(readFileSync15(join27(dir, "config.yaml"), "utf8"));
   } catch {
   }
   const configuredProvider = configuredDefault?.provider.toLowerCase() ?? "";
@@ -33434,12 +33797,12 @@ function hermesConfiguredModel(env = process.env) {
   };
 }
 async function fetchHermesAcpModels(cli, env) {
-  return await new Promise((resolve12) => {
+  return await new Promise((resolve13) => {
     let child;
     try {
       child = spawn5(cli, ["acp"], { stdio: ["pipe", "pipe", "ignore"], env });
     } catch {
-      return resolve12([]);
+      return resolve13([]);
     }
     let settled = false;
     let timer;
@@ -33460,7 +33823,7 @@ async function fetchHermesAcpModels(cli, env) {
         }
       } catch {
       }
-      resolve12(out);
+      resolve13(out);
     };
     timer = setTimeout(() => done([]), 5e3);
     child.once("error", () => done([]));
@@ -33503,7 +33866,7 @@ async function fetchHermesAcpModels(cli, env) {
         }
         if (msg?.id === initId) {
           if (!msg.result) return done([]);
-          sessionId = send("session/new", { cwd: env.HOME || env.USERPROFILE || homedir19(), mcpServers: [] });
+          sessionId = send("session/new", { cwd: env.HOME || env.USERPROFILE || homedir20(), mcpServers: [] });
         } else if (sessionId && msg?.id === sessionId) {
           const list = Array.isArray(msg.result?.models?.availableModels) ? msg.result.models.availableModels : [];
           done(
@@ -33739,8 +34102,8 @@ var init_openai_compat = __esm({
 
 // server/drivers/pi.ts
 import { chmodSync as chmodSync5, existsSync as existsSync14, mkdirSync as mkdirSync12, mkdtempSync as mkdtempSync3, readFileSync as readFileSync16, rmSync as rmSync3, writeFileSync as writeFileSync12 } from "node:fs";
-import { homedir as homedir20, tmpdir as tmpdir4 } from "node:os";
-import { join as join27 } from "node:path";
+import { homedir as homedir21, tmpdir as tmpdir4 } from "node:os";
+import { join as join28 } from "node:path";
 function readPiPromptImages(turn) {
   return (turn.images ?? []).map((image) => ({
     type: "image",
@@ -33847,7 +34210,7 @@ async function applyPiLocalCatalog(catalog, env = process.env, fetchImpl = fetch
   return preferPiInjectRows(await mergeLocalInject(catalog, env, fetchImpl));
 }
 function piAgentDir(env) {
-  return join27(env.HOME || env.USERPROFILE || homedir20(), ".pi", "agent");
+  return join28(env.HOME || env.USERPROFILE || homedir21(), ".pi", "agent");
 }
 function ensurePiInjectModel(modelId, env = process.env) {
   const split = splitPiModel(modelId);
@@ -33858,7 +34221,7 @@ function ensurePiInjectModel(modelId, env = process.env) {
   if (!host) return split;
   const dir = piAgentDir(env);
   mkdirSync12(dir, { recursive: true });
-  const path3 = join27(dir, "models.json");
+  const path3 = join28(dir, "models.json");
   let root = { providers: {} };
   if (existsSync14(path3)) {
     try {
@@ -33912,7 +34275,7 @@ function ensurePiInjectModel(modelId, env = process.env) {
   return split;
 }
 function readPiDefaultModel(env) {
-  const home = env.HOME || env.USERPROFILE || homedir20();
+  const home = env.HOME || env.USERPROFILE || homedir21();
   try {
     const s = JSON.parse(readFileSync16(`${home}/.pi/agent/settings.json`, "utf8"));
     return s.defaultProvider && s.defaultModel ? `${s.defaultProvider}/${s.defaultModel}` : "";
@@ -33922,7 +34285,7 @@ function readPiDefaultModel(env) {
 }
 async function fetchPiModels(cli, env) {
   const child = spawnCli(cli, PI_ARGS, { stdio: ["pipe", "pipe", "pipe"], env });
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let buf = "";
     let done = false;
     const fallbackDefault = readPiDefaultModel(env);
@@ -33933,7 +34296,7 @@ async function fetchPiModels(cli, env) {
         killCliTree(child);
       } catch {
       }
-      resolve12(catalog);
+      resolve13(catalog);
     };
     const timer = setTimeout(() => finish({ default: "", options: [] }), 15e3);
     timer.unref?.();
@@ -34060,9 +34423,9 @@ var init_pi = __esm({
           const mcpServers = buildMcpServers(turn);
           let mcpTempDir = null;
           if (mcpServers) {
-            mcpTempDir = mkdtempSync3(join27(tmpdir4(), "omb-pi-mcp-"));
+            mcpTempDir = mkdtempSync3(join28(tmpdir4(), "omb-pi-mcp-"));
             try {
-              writeFileSync12(join27(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers }), { mode: 384 });
+              writeFileSync12(join28(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers }), { mode: 384 });
             } catch (err) {
               try {
                 rmSync3(mcpTempDir, { recursive: true, force: true });
@@ -34080,7 +34443,7 @@ var init_pi = __esm({
                 env: piEnvironment({
                   ...process.env,
                   ...input.environment,
-                  ...mcpServers && mcpTempDir ? { OMB_MCP_CONFIG: join27(mcpTempDir, "mcp.json") } : {}
+                  ...mcpServers && mcpTempDir ? { OMB_MCP_CONFIG: join28(mcpTempDir, "mcp.json") } : {}
                 })
               });
             } catch (err) {
@@ -34103,13 +34466,13 @@ var init_pi = __esm({
             }
             responseWaiters.clear();
           };
-          const awaitResponse = (command, timeoutMs = 2e4) => new Promise((resolve12, reject) => {
+          const awaitResponse = (command, timeoutMs = 2e4) => new Promise((resolve13, reject) => {
             const timer = setTimeout(() => {
               responseWaiters.delete(command);
               reject(new Error(`pi ${command} timed out`));
             }, timeoutMs);
             timer.unref?.();
-            responseWaiters.set(command, { resolve: resolve12, reject, timer });
+            responseWaiters.set(command, { resolve: resolve13, reject, timer });
           });
           child.stdin.on("error", () => rejectWaiters(new Error("pi stdin closed")));
           const send = (obj) => {
@@ -34317,7 +34680,7 @@ ${turn.text}` : turn.text;
           return { turnId };
         };
         const snapshot = async () => {
-          const version2 = await new Promise((resolve12) => {
+          const version2 = await new Promise((resolve13) => {
             const child = spawnCli(config2.cli, ["--version"], {
               stdio: ["ignore", "pipe", "pipe"],
               env: piEnvironment({ ...process.env, ...input.environment })
@@ -34330,16 +34693,16 @@ ${turn.text}` : turn.text;
                 killCliTree(child);
               } catch {
               }
-              resolve12(null);
+              resolve13(null);
             }, 8e3);
             timer.unref?.();
             child.on("error", () => {
               clearTimeout(timer);
-              resolve12(null);
+              resolve13(null);
             });
             child.on("close", () => {
               clearTimeout(timer);
-              resolve12(out.trim() || null);
+              resolve13(out.trim() || null);
             });
           });
           if (!version2) return { state: "unavailable", reason: `\`${config2.cli}\` CLI not found` };
@@ -34418,15 +34781,15 @@ ${turn.text}` : turn.text;
 
 // server/drivers/minimax.ts
 import { readFileSync as readFileSync17 } from "node:fs";
-import { homedir as homedir21 } from "node:os";
-import { join as join28 } from "node:path";
+import { homedir as homedir22 } from "node:os";
+import { join as join29 } from "node:path";
 function normalizedApiUrl(value) {
   const root = value.trim().replace(/\/+$/, "");
   return root.endsWith("/v1") ? root : `${root}/v1`;
 }
-function loadLocalMiniMaxConfig(home = homedir21()) {
+function loadLocalMiniMaxConfig(home = homedir22()) {
   try {
-    const raw = localConfigSchema.parse(JSON.parse(readFileSync17(join28(home, ".mmx", "config.json"), "utf8")));
+    const raw = localConfigSchema.parse(JSON.parse(readFileSync17(join29(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() ?? "",
@@ -34694,7 +35057,7 @@ __export(cli_setup_exports, {
 });
 import { spawn as spawn6 } from "node:child_process";
 import { readFileSync as readFileSync18 } from "node:fs";
-import { join as join29, resolve as resolve9 } from "node:path";
+import { join as join30, 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);
@@ -34727,11 +35090,11 @@ async function runSetupCli(cli, args, environment = {}) {
   resetPathCache();
 }
 function assertDataDir(dataDir) {
-  if (resolve9(dataDir) !== resolve9(DATA_DIR)) throw new Error("Setup data directory mismatch. Restart the CLI with --data-dir.");
+  if (resolve10(dataDir) !== resolve10(DATA_DIR)) throw new Error("Setup data directory mismatch. Restart the CLI with --data-dir.");
 }
 function checkStoredConfig(dataDir) {
   try {
-    parseStoredConfig(JSON.parse(readFileSync18(join29(dataDir, "config.json"), "utf8")));
+    parseStoredConfig(JSON.parse(readFileSync18(join30(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.");
@@ -35009,7 +35372,7 @@ var init_browser_engine_release = __esm({
 });
 
 // server/browser-bundle-release.ts
-import { join as join30 } from "node:path";
+import { join as join31 } 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];
@@ -35045,10 +35408,10 @@ function browserBundlePaths(bundleDirectory, target) {
   const spec = browserBundleSpec(target);
   return {
     directory: bundleDirectory,
-    manifest: join30(bundleDirectory, "manifest.json"),
-    engine: join30(bundleDirectory, spec.engine.executable),
-    chrome: join30(bundleDirectory, spec.chrome.executable),
-    licenses: join30(bundleDirectory, "licenses")
+    manifest: join31(bundleDirectory, "manifest.json"),
+    engine: join31(bundleDirectory, spec.engine.executable),
+    chrome: join31(bundleDirectory, spec.chrome.executable),
+    licenses: join31(bundleDirectory, "licenses")
   };
 }
 var CHROME_VERSION, CHROME_ASSETS;
@@ -35102,23 +35465,23 @@ __export(browser_engine_exports, {
   resolveAgentBrowserBinary: () => resolveAgentBrowserBinary
 });
 import { spawn as spawn7 } from "node:child_process";
-import { createHash as createHash7, randomBytes as randomBytes3, randomUUID as randomUUID11 } from "node:crypto";
+import { createHash as createHash8, randomBytes as randomBytes3, randomUUID as randomUUID11 } from "node:crypto";
 import { chmodSync as chmodSync6, constants as constants2, copyFileSync, existsSync as existsSync15, mkdirSync as mkdirSync13, readFileSync as readFileSync19, readdirSync as readdirSync3, renameSync as renameSync5, rmSync as rmSync4, statSync as statSync3, unlinkSync as unlinkSync4, writeFileSync as writeFileSync13 } from "node:fs";
-import { homedir as homedir22, tmpdir as tmpdir5 } from "node:os";
-import { delimiter as delimiter6, dirname as dirname10, join as join31, resolve as resolve10 } from "node:path";
+import { homedir as homedir23, tmpdir as tmpdir5 } from "node:os";
+import { delimiter as delimiter6, dirname as dirname10, join as join32, 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-${createHash7("sha256").update(session).digest("hex")}`;
+  return `omb-${createHash8("sha256").update(session).digest("hex")}`;
 }
 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) || homedir22();
-  const stateRoot = namespace ? join31(home, ".agent-browser", "namespaces", namespace, "state") : join31(home, ".agent-browser");
-  return join31(stateRoot, "sessions");
+  const home = (process.platform === "win32" ? env.USERPROFILE : env.HOME) || homedir23();
+  const stateRoot = namespace ? join32(home, ".agent-browser", "namespaces", namespace, "state") : join32(home, ".agent-browser");
+  return join32(stateRoot, "sessions");
 }
 function managedBrowserConfigPath(env) {
-  return join31(browserSessionsDirectory(env), "..", "omb-managed-config.json");
+  return join32(browserSessionsDirectory(env), "..", "omb-managed-config.json");
 }
 function ensureManagedBrowserConfig(env) {
   const path3 = managedBrowserConfigPath(env);
@@ -35191,7 +35554,7 @@ async function closeBrowserSession(binaryPath, env, timeoutMs = 15e3) {
     } catch {
       return false;
     }
-    await new Promise((resolve12) => setTimeout(resolve12, Math.min(25, Math.max(1, deadline - Date.now()))));
+    await new Promise((resolve13) => setTimeout(resolve13, Math.min(25, Math.max(1, deadline - Date.now()))));
   }
   return false;
 }
@@ -35205,11 +35568,11 @@ async function prepareBrowserSessionState(binaryPath, session, options = {}) {
   ensureManagedBrowserConfig(env);
   if (options.persistent === false) return;
   const directory = browserSessionsDirectory(env);
-  const key = join31(directory, session);
+  const key = join32(directory, session);
   let pending = preparedBrowserSessions.get(key);
   if (!pending) {
     pending = (async () => {
-      const targetBase = join31(directory, `${restoreKey}-${session}`);
+      const targetBase = join32(directory, `${restoreKey}-${session}`);
       const hasTarget = () => existsSync15(`${targetBase}.json.enc`) || existsSync15(`${targetBase}.json`);
       if (hasTarget()) return;
       check2();
@@ -35219,7 +35582,7 @@ async function prepareBrowserSessionState(binaryPath, session, options = {}) {
       check2();
       if (hasTarget()) return;
       const candidates = [".json.enc", ".json"].flatMap((suffix) => {
-        const path3 = join31(directory, `${session}-${session}${suffix}`);
+        const path3 = join32(directory, `${session}-${session}${suffix}`);
         try {
           const stat4 = statSync3(path3);
           if (!stat4.isFile()) throw new Error("Saved browser state is not a file.");
@@ -35254,14 +35617,14 @@ function isMusl(platform = process.platform, exists = existsSync15) {
 }
 function pinnedBinaryPath(dataDir = DATA_DIR, platform = process.platform, arch = process.arch) {
   const version2 = agentBrowserReleaseVersion(resolveAgentBrowserReleaseAsset(platform, arch));
-  return join31(dataDir, ENGINE_DIR, version2, executableName(platform));
+  return join32(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;
   for (const part of (pathValue ?? "").split(delimiter6)) {
     const dir = part.trim().replace(/^"|"$/gu, "");
     if (!dir) continue;
-    const candidate = resolve10(dir, executableName(platform));
+    const candidate = resolve11(dir, executableName(platform));
     if (exists(candidate)) return candidate;
   }
   return null;
@@ -35270,7 +35633,7 @@ function packagedBrowser(options) {
   const resources = (options.env ?? process.env).OMB_RESOURCES_PATH;
   if (!resources) return null;
   try {
-    return browserBundlePaths(join31(resolve10(resources), "browser-engine"), `${options.platform ?? process.platform}-${options.arch ?? process.arch}`);
+    return browserBundlePaths(join32(resolve11(resources), "browser-engine"), `${options.platform ?? process.platform}-${options.arch ?? process.arch}`);
   } catch {
     return null;
   }
@@ -35283,7 +35646,7 @@ function resolveAgentBrowserBinary(options = {}) {
   const platform = options.platform ?? process.platform;
   const exists = options.exists ?? existsSync15;
   const override = env.OMB_AGENT_BROWSER_PATH?.trim();
-  if (override) return resolve10(override) && exists(resolve10(override)) ? resolve10(override) : null;
+  if (override) return resolve11(override) && exists(resolve11(override)) ? resolve11(override) : null;
   const bundle = packagedBrowser(options);
   if (bundle && exists(bundle.directory)) return completePackage(bundle, exists) ? bundle.engine : null;
   const pinned = pinnedBinaryPath(options.dataDir, platform, options.arch);
@@ -35295,7 +35658,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 = join31(destination, "..");
+  const directory = join32(destination, "..");
   mkdirSync13(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)`);
@@ -35311,7 +35674,7 @@ async function installAgentBrowserBinary(options = {}) {
     clearTimeout(timer);
   }
   if (body.length !== asset.bytes) throw new Error("the agent-browser download did not match its pinned size; nothing was installed");
-  const digest2 = createHash7("sha256").update(body).digest("hex");
+  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`;
   writeFileSync13(staging, body, { mode: 493 });
@@ -35321,7 +35684,7 @@ async function installAgentBrowserBinary(options = {}) {
 }
 function ensureChrome(binaryPath, options = {}) {
   const bundle = packagedBrowser(options);
-  if (!options.withDeps && bundle && resolve10(binaryPath) === bundle.engine && completePackage(bundle, existsSync15)) {
+  if (!options.withDeps && bundle && resolve11(binaryPath) === bundle.engine && completePackage(bundle, existsSync15)) {
     options.log?.("agent-browser: the bundled browser is ready; no download needed");
     return Promise.resolve();
   }
@@ -35347,7 +35710,7 @@ function ensureChrome(binaryPath, options = {}) {
   });
 }
 function browserEngineEncryptionKey(dataDir = DATA_DIR) {
-  const file2 = join31(dataDir, KEY_FILE);
+  const file2 = join32(dataDir, KEY_FILE);
   try {
     const existing = readFileSync19(file2, "utf8").trim();
     if (/^[0-9a-f]{64}$/u.test(existing)) return existing;
@@ -35401,13 +35764,13 @@ function agentBrowserIntegration(input) {
     if (sourceEnv[name]) env[name] = sourceEnv[name];
   }
   const bundle = packagedBrowser({ env: sourceEnv });
-  if (!env.AGENT_BROWSER_EXECUTABLE_PATH && bundle && resolve10(input.binaryPath) === bundle.engine && completePackage(bundle, existsSync15)) {
+  if (!env.AGENT_BROWSER_EXECUTABLE_PATH && bundle && resolve11(input.binaryPath) === bundle.engine && completePackage(bundle, existsSync15)) {
     env.AGENT_BROWSER_EXECUTABLE_PATH = bundle.chrome;
   }
   return { command: input.binaryPath, args: ["mcp", "--tools", "core", "--no-webmcp"], env };
 }
 function agentBrowserFrame(input) {
-  const file2 = join31(tmpdir5(), `openmausbot-browser-${randomUUID11()}.png`);
+  const file2 = join32(tmpdir5(), `openmausbot-browser-${randomUUID11()}.png`);
   return new Promise((settle, fail) => {
     const child = spawn7(input.binaryPath, ["screenshot", file2], {
       env: browserRuntimeEnv(input.env),
@@ -35477,8 +35840,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(join31(directory, base2 + suffix));
-    const pendingDirectory = join31(directory, ".tmp");
+    for (const base2 of bases) for (const suffix of [".json", ".json.enc", ".json.previous", ".json.enc.previous"]) remove(join32(directory, base2 + suffix));
+    const pendingDirectory = join32(directory, ".tmp");
     let pendingFiles = [];
     try {
       pendingFiles = readdirSync3(pendingDirectory);
@@ -35486,8 +35849,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(join31(pendingDirectory, name));
-    preparedBrowserSessions.delete(join31(directory, session));
+    for (const name of pendingFiles) if (candidates.some((candidate) => candidate.test(name))) remove(join32(pendingDirectory, name));
+    preparedBrowserSessions.delete(join32(directory, session));
     return true;
   } catch {
     return false;
@@ -35515,8 +35878,8 @@ var init_browser_engine = __esm({
 var import_qrcode_terminal = __toESM(require_main(), 1);
 import { spawn as spawn8 } from "node:child_process";
 import { closeSync as closeSync3, existsSync as existsSync16, mkdirSync as mkdirSync14, openSync as openSync3, readFileSync as readFileSync20 } from "node:fs";
-import { homedir as homedir23 } from "node:os";
-import { dirname as dirname11, join as join32, resolve as resolve11 } from "node:path";
+import { homedir as homedir24 } from "node:os";
+import { dirname as dirname11, join as join33, resolve as resolve12 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
@@ -36114,13 +36477,13 @@ function writePrivateToken(runtimeRoot2, token, { fileSystem, processId, identif
 }
 async function waitForExit(child, milliseconds) {
   if (child.exitCode !== null || child.signalCode !== null) return;
-  await new Promise((resolve12) => {
+  await new Promise((resolve13) => {
     let settled = false;
     const finish = () => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve12();
+      resolve13();
     };
     child.once("exit", finish);
     const timer = setTimeout(finish, milliseconds);
@@ -36284,8 +36647,8 @@ function createManagedCompanionTunnel({
       child = spawned;
       const cancellationController = new AbortController();
       let resolveCancellation;
-      const cancellation = new Promise((resolve12) => {
-        resolveCancellation = resolve12;
+      const cancellation = new Promise((resolve13) => {
+        resolveCancellation = resolve13;
       });
       let cancelled = false;
       attemptHandle = {
@@ -36301,8 +36664,8 @@ function createManagedCompanionTunnel({
       let terminated = false;
       let expectedStop = false;
       let resolveExit;
-      const exit = new Promise((resolve12) => {
-        resolveExit = resolve12;
+      const exit = new Promise((resolve13) => {
+        resolveExit = resolve13;
       });
       const onTerminated = () => {
         if (terminated) return;
@@ -36336,8 +36699,8 @@ function createManagedCompanionTunnel({
         }
         if (Date.now() >= deadline) break;
         await Promise.race([
-          new Promise((resolve12) => {
-            const timer = setTimeout(resolve12, verifyIntervalMs);
+          new Promise((resolve13) => {
+            const timer = setTimeout(resolve13, verifyIntervalMs);
             timer.unref?.();
           }),
           exit,
@@ -37337,14 +37700,14 @@ function explainTailscaleFailure(reason) {
   }
 }
 function run(cli, args, timeoutMs) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     execFile(
       cli,
       args,
       { timeout: timeoutMs, killSignal: "SIGKILL", maxBuffer: 16 * 1024 * 1024, env: { ...process.env, PATH: searchPath() } },
       (error51, stdout2, stderr) => {
         const code = error51 && "code" in error51 && typeof error51.code === "number" ? error51.code : error51 ? null : 0;
-        resolve12({ ok: !error51, stdout: String(stdout2 ?? ""), stderr: String(stderr ?? ""), code });
+        resolve13({ ok: !error51, stdout: String(stdout2 ?? ""), stderr: String(stderr ?? ""), code });
       }
     );
   });
@@ -37761,7 +38124,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 || join32(homedir23(), ".openmausbot"),
+    dataDir: env.OMB_DATA_DIR || join33(homedir24(), ".openmausbot"),
     tailscale: false,
     tunnel: false,
     client: false,
@@ -37780,7 +38143,7 @@ function parseArgs(argv, env = process.env) {
     };
     try {
       if (arg === "--port") options.port = Number(value());
-      else if (arg === "--data-dir") options.dataDir = resolve11(value());
+      else if (arg === "--data-dir") options.dataDir = resolve12(value());
       else if (arg === "--label") options.label = value();
       else if (arg === "--public-url") options.publicUrl = value().replace(/\/+$/, "");
       else if (arg === "--tailscale") options.tailscale = true;
@@ -37891,7 +38254,7 @@ function defaultIo() {
 }
 function serverVersion(here = HERE2) {
   try {
-    const parsed = JSON.parse(readFileSync20(resolve11(here, "..", "package.json"), "utf8"));
+    const parsed = JSON.parse(readFileSync20(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 {
@@ -37916,7 +38279,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 = readFileSync20(join32(options.dataDir, "environment-id"), "utf8").trim();
+    const expected = readFileSync20(join33(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 {
@@ -38116,7 +38479,7 @@ async function runStatus(options, io = defaultIo()) {
   return code;
 }
 async function runAccess(options, io = defaultIo()) {
-  const file2 = join32(options.dataDir, "config.json");
+  const file2 = join33(options.dataDir, "config.json");
   let raw = {};
   if (existsSync16(file2)) {
     try {
@@ -38268,16 +38631,16 @@ async function runBrowser(options, io = defaultIo()) {
   return 0;
 }
 function serverEntry(here = HERE2) {
-  const bundled = join32(here, "index.js");
-  const root = resolve11(here, "..");
+  const bundled = join33(here, "index.js");
+  const root = resolve12(here, "..");
   if (existsSync16(bundled)) {
-    const staticDir2 = [join32(root, "dist"), join32(here, "..", "ui")].find((d) => existsSync16(join32(d, "index.html"))) ?? null;
-    const skillsDir = existsSync16(join32(root, "skills")) ? join32(root, "skills") : null;
+    const staticDir2 = [join33(root, "dist"), join33(here, "..", "ui")].find((d) => existsSync16(join33(d, "index.html"))) ?? null;
+    const skillsDir = existsSync16(join33(root, "skills")) ? join33(root, "skills") : null;
     return { command: process.execPath, args: [bundled], staticDir: staticDir2, skillsDir };
   }
-  const source = join32(here, "index.ts");
-  const staticDir = existsSync16(join32(root, "dist", "index.html")) ? join32(root, "dist") : null;
-  return { command: process.execPath, args: ["--experimental-strip-types", source], staticDir, skillsDir: existsSync16(join32(root, "skills")) ? join32(root, "skills") : null };
+  const source = join33(here, "index.ts");
+  const staticDir = existsSync16(join33(root, "dist", "index.html")) ? join33(root, "dist") : null;
+  return { command: process.execPath, args: ["--experimental-strip-types", source], staticDir, skillsDir: existsSync16(join33(root, "skills")) ? join33(root, "skills") : null };
 }
 async function planTunnel(options, log) {
   let access2 = null;
@@ -38377,9 +38740,9 @@ async function runServe(options, log = console.log) {
   let child;
   try {
     if (options.guided) {
-      const logsDir = join32(options.dataDir, "logs");
+      const logsDir = join33(options.dataDir, "logs");
       mkdirSync14(logsDir, { recursive: true, mode: 448 });
-      logPath = join32(logsDir, `server-${Date.now()}-${process.pid}.log`);
+      logPath = join33(logsDir, `server-${Date.now()}-${process.pid}.log`);
       logFd = openSync3(logPath, "wx", 384);
       log("\nStarting your workspace\u2026");
     }
@@ -38571,7 +38934,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 !== join32(homedir23(), ".openmausbot") || options.port !== 8799) {
+      if (options.dataDir !== join33(homedir24(), ".openmausbot") || options.port !== 8799) {
         io.log(`Use the same --data-dir (${options.dataDir}) and --port (${options.port}) options when starting.`);
       }
       return 0;