openmausbot 0.1.60 → 0.1.62

package/dist-server/index.js

@@ -6,9 +6,9 @@ var __export = (target, all2) => {
 
 // server/index.ts
 import { createHash as createHash25, randomBytes as randomBytes7, randomUUID as randomUUID17, timingSafeEqual as timingSafeEqual4 } from "node:crypto";
-import { existsSync as existsSync25, readFileSync as readFileSync38, rmSync as rmSync6, unlinkSync as unlinkSync9 } from "node:fs";
+import { existsSync as existsSync25, readFileSync as readFileSync38, rmSync as rmSync7, unlinkSync as unlinkSync9 } from "node:fs";
 import { createServer as createServer3 } from "node:http";
-import { extname as extname5, join as join49 } from "node:path";
+import { extname as extname5, join as join50 } from "node:path";
 
 // node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -15651,6 +15651,15 @@ import { readFileSync as readFileSync3, mkdirSync, existsSync as existsSync2, re
 import { homedir as homedir2 } from "node:os";
 import { join as join3 } from "node:path";
 
+// server/contracts.ts
+var EFFORT_LEVELS = ["none", "low", "medium", "high", "xhigh", "max"];
+function isEffortLevel(value) {
+  return typeof value === "string" && EFFORT_LEVELS.includes(value);
+}
+var eventCounter = 0;
+var newEventId = () => `ev-${Date.now().toString(36)}-${(eventCounter++).toString(36)}`;
+var newId = () => crypto.randomUUID();
+
 // server/mcp-registry.ts
 var MAX_MCP_SERVERS = 20;
 var MAX_ARGS = 64;
@@ -15933,7 +15942,19 @@ var instanceConfigSchema = external_exports.object({
   config: external_exports.json().optional()
 });
 var instanceConfigMapSchema = external_exports.record(external_exports.string(), instanceConfigSchema);
+var defaultModelSelectionSchema = external_exports.object({
+  instanceId: external_exports.string().trim().min(1),
+  model: external_exports.string().trim().min(1),
+  effort: external_exports.enum(EFFORT_LEVELS).optional()
+});
 var appConfigSchema = external_exports.object({
+  defaultModelSelection: defaultModelSelectionSchema.optional(),
+  /** CLI-only launch preferences. Never enable remote access implicitly. */
+  cliStartup: external_exports.object({
+    access: external_exports.enum(["local", "tunnel", "tailscale", "public-url"]),
+    publicUrl: external_exports.string().url().optional(),
+    phone: external_exports.enum(["ios", "android"]).optional()
+  }).optional(),
   xai: external_exports.object({ key: optionalText, url: optionalText }).optional(),
   /** `model` seeds the default selection; `provider` pins an OpenRouter
    * upstream (e.g. "fireworks"). Both are non-secret and optional. */
@@ -15970,7 +15991,7 @@ var appConfigSchema = external_exports.object({
 var storedAppConfigSchema = appConfigSchema.extend({
   browserProfiles: storedBrowserProfilesSchema.optional()
 });
-var appConfigPatchSchema = appConfigSchema.omit({ instances: true, mcpServers: true });
+var appConfigPatchSchema = appConfigSchema.omit({ instances: true, mcpServers: true, cliStartup: true });
 var jsonObjectSchema = external_exports.record(external_exports.string(), external_exports.json());
 function browserProfilePartitionId(profile) {
   return profile.partitionId ?? profile.id;
@@ -16170,6 +16191,10 @@ function saveConfig(patch) {
   }
   if (checkedPatch.vps !== void 0) disk.vps = normalizeVpsConfig(checkedPatch.vps);
   if (checkedPatch.language !== void 0) disk.language = checkedPatch.language;
+  if (checkedPatch.defaultModelSelection !== void 0) {
+    disk.defaultModelSelection = checkedPatch.defaultModelSelection;
+  }
+  if (checkedPatch.cliStartup !== void 0) disk.cliStartup = checkedPatch.cliStartup;
   if (checkedPatch.mcpServers !== void 0) {
     disk.mcpServers = jsonObjectSchema.parse(checkedPatch.mcpServers);
   }
@@ -16289,6 +16314,7 @@ function instanceConfigs(cfg2) {
         const current2 = typeof raw === "object" && raw !== null && !Array.isArray(raw) ? raw : {};
         const merged = { ...current2 };
         for (const [k, v] of Object.entries(defaults)) {
+          if (k === "provider" && typeof merged[k] === "string") continue;
           if (typeof merged[k] !== "string" || !merged[k].trim()) merged[k] = v;
         }
         entry.config = merged;
@@ -28129,15 +28155,6 @@ function buildNotification(kind, bot, threadId, detail, extra) {
   return notification;
 }
 
-// server/contracts.ts
-var EFFORT_LEVELS = ["none", "low", "medium", "high", "xhigh", "max"];
-function isEffortLevel(value) {
-  return typeof value === "string" && EFFORT_LEVELS.includes(value);
-}
-var eventCounter = 0;
-var newEventId = () => `ev-${Date.now().toString(36)}-${(eventCounter++).toString(36)}`;
-var newId = () => crypto.randomUUID();
-
 // server/drivers/retry.ts
 var RETRY_MAX_ATTEMPTS = 3;
 var BACKOFF_BASE_MS = [1e3, 3e3, 8e3];
@@ -30848,6 +30865,10 @@ function claudeSignedIn(cli, env, run3 = execCli) {
     });
   });
 }
+function claudeAuthFailure(frame, text6) {
+  if (frame.is_api_error_message !== true && typeof frame.error !== "string") return false;
+  return frame.error === "authentication_failed" || classifyError({ text: text6 }).reason === "auth";
+}
 function claudeEnvironment(model, source = process.env) {
   const env = { ...source, PATH: augmentedPath(), NPM_CONFIG_LOGLEVEL: "error" };
   delete env.CLAUDECODE;
@@ -31562,6 +31583,11 @@ var ClaudeDriver = {
           case "assistant": {
             const msg = o.message ?? {};
             const text6 = firstText(msg.content);
+            if (claudeAuthFailure(o, text6)) {
+              if (session.turn) session.turn.authFailed = true;
+              emit({ ...base2(threadId, currentTurnId()), type: "runtime.error", message: text6, setup: true });
+              break;
+            }
             if (text6.trim()) {
               if (!session.turn?.sawStreamDelta) {
                 emit({ ...base2(threadId, currentTurnId()), type: "content.delta", streamKind: "assistant_text", delta: text6 });
@@ -31596,7 +31622,7 @@ var ClaudeDriver = {
             if (o.origin?.kind === "task-notification") break;
             settle(
               o.is_error !== true,
-              o.stop_reason ?? o.terminal_reason ?? null,
+              session.turn?.authFailed ? "auth_required" : o.stop_reason ?? o.terminal_reason ?? null,
               o.total_cost_usd ?? null,
               o.usage ? {
                 input: (o.usage.input_tokens || 0) + (o.usage.cache_read_input_tokens || 0) + (o.usage.cache_creation_input_tokens || 0),
@@ -41630,7 +41656,9 @@ function decodeConfig5(raw) {
     apiKeyEnv: typeof config2.apiKeyEnv === "string" && config2.apiKeyEnv ? config2.apiKeyEnv : "OPENAI_COMPAT_API_KEY",
     key: typeof config2.key === "string" && config2.key ? config2.key : void 0,
     model: typeof config2.model === "string" && config2.model ? config2.model : process.env.OPENAI_COMPAT_MODEL || void 0,
-    provider: typeof config2.provider === "string" && config2.provider ? config2.provider : process.env.OPENAI_COMPAT_PROVIDER || void 0
+    // An explicit empty override disables inherited routing for an isolated
+    // connection (CLI setup uses this). Absent still inherits the global pin.
+    provider: typeof config2.provider === "string" ? config2.provider || void 0 : process.env.OPENAI_COMPAT_PROVIDER || void 0
   };
 }
 var OpenAICompatDriver = {
@@ -44165,6 +44193,26 @@ function mirrorActivity(bus2, from, channel, name2, ok, notify2) {
   markMirrored(bus2, channel, notify2);
 }
 
+// server/recall-disclosure.ts
+var announced = /* @__PURE__ */ new Map();
+function claimRecallCrossings(roomThreadId, sources) {
+  const seen = announced.get(roomThreadId) ?? /* @__PURE__ */ new Set();
+  const threadIds = [];
+  let count = 0;
+  for (const threadId of sources) {
+    if (seen.has(threadId)) continue;
+    if (!threadIds.includes(threadId)) threadIds.push(threadId);
+    count += 1;
+  }
+  if (!threadIds.length) return { threadIds: [], count: 0 };
+  for (const threadId of threadIds) seen.add(threadId);
+  announced.set(roomThreadId, seen);
+  return { threadIds, count };
+}
+function recallCrossingLabel(botName, count) {
+  return `${botName} recalled ${count} message${count === 1 ? "" : "s"} from its private chat with you`;
+}
+
 // server/replies.ts
 var MAX_REPLY_EXCERPT = 900;
 function replyExcerpt(text6, limit = MAX_REPLY_EXCERPT) {
@@ -45207,6 +45255,22 @@ var ProviderRegistry = class {
   }
 };
 
+// server/default-model-selection.ts
+function selectDefaultModelSelection(instances, preferred) {
+  if (preferred) {
+    const instance = instances.find((candidate) => candidate.instanceId === preferred.instanceId);
+    if (instance?.snapshot.state !== "available" || instance.snapshot.authenticated === false || !(instance.models.default === preferred.model || instance.models.options.some((model) => model.id === preferred.model))) {
+      return { instanceId: "", model: "" };
+    }
+    const selection = { ...preferred };
+    if (selection.effort && !instance.capabilities?.effortLevels?.includes(selection.effort)) delete selection.effort;
+    return selection;
+  }
+  const available = instances.filter((instance) => instance.snapshot.state === "available");
+  const pick2 = available.find((instance) => instance.driverKind === "claudeAgent") ?? available[0];
+  return { instanceId: pick2?.instanceId ?? "", model: pick2?.models.default ?? "" };
+}
+
 // server/room-post-budget.ts
 var SENDER_WINDOW_MS = 6e4;
 var SENDER_MAX = 10;
@@ -49596,8 +49660,12 @@ var CalendarCallManager = class {
 // server/browser-engine.ts
 import { spawn as spawn4 } from "node:child_process";
 import { createHash as createHash16, randomBytes as randomBytes4, randomUUID as randomUUID12 } from "node:crypto";
-import { chmodSync as chmodSync5, existsSync as existsSync18, mkdirSync as mkdirSync20, readFileSync as readFileSync31, renameSync as renameSync5, statSync as statSync8, writeFileSync as writeFileSync15 } from "node:fs";
-import { delimiter as delimiter4, join as join40, resolve as resolve10 } from "node:path";
+import { chmodSync as chmodSync5, existsSync as existsSync18, mkdirSync as mkdirSync20, readFileSync as readFileSync31, renameSync as renameSync5, rmSync as rmSync6, statSync as statSync8, writeFileSync as writeFileSync15 } from "node:fs";
+import { tmpdir as tmpdir6 } from "node:os";
+import { delimiter as delimiter4, join as join41, resolve as resolve10 } from "node:path";
+
+// server/browser-bundle-release.ts
+import { join as join40 } from "node:path";
 
 // server/browser-engine-release.ts
 var AGENT_BROWSER_VERSION = "0.36.0";
@@ -49628,17 +49696,77 @@ var RELEASES2 = /* @__PURE__ */ new Map([
   ],
   [
     "win32-x64",
-    { target: "win32-x64", asset: "agent-browser-win32-x64.exe", sha256: "412ff72737a109e93f5304b0ff76c988fb6f1f451d0fc7e010577922bcc20ff3", bytes: 13837312 }
+    {
+      target: "win32-x64",
+      version: "0.36.0-omb.1",
+      asset: "agent-browser-win32-x64-0.36.0-omb.1.exe",
+      url: "https://github.com/milind-soni/OpenMausBot/releases/download/browser-engine-v0.36.0-omb.1/agent-browser-win32-x64-0.36.0-omb.1.exe",
+      sha256: "33bee834f6a6072ec8688b0914726e0262874d758f69f27e8baf7eaac6b5ed15",
+      bytes: 13806080
+    }
   ]
 ]);
 function agentBrowserReleaseUrl(asset) {
-  return `https://github.com/vercel-labs/agent-browser/releases/download/v${AGENT_BROWSER_VERSION}/${asset.asset}`;
+  return asset.url ?? `https://github.com/vercel-labs/agent-browser/releases/download/v${AGENT_BROWSER_VERSION}/${asset.asset}`;
+}
+function agentBrowserReleaseVersion(asset) {
+  return asset?.version ?? AGENT_BROWSER_VERSION;
 }
 function resolveAgentBrowserReleaseAsset(platform = process.platform, arch = process.arch, musl = false) {
   const key3 = platform === "linux" && musl ? `linux-musl-${arch}` : `${platform}-${arch}`;
   return RELEASES2.get(key3) ?? null;
 }
 
+// server/browser-bundle-release.ts
+var CHROME_VERSION = "152.0.7977.82";
+var CHROME_ASSETS = {
+  "darwin-arm64": { platform: "mac-arm64", bytes: 97760996, sha256: "1615f063c894aa824fd55c89f8f05e9904f63cce0c95d0cbce7394d77884fba5", executableSha256: "ac18537fb2bc2b72b0440893b6ea5d4ef3bacc6220b1e9a1693c73f8b1045fbe" },
+  "darwin-x64": { platform: "mac-x64", bytes: 102895824, sha256: "c903707292c6aaed7c6e572c0bb5e6645454e45d9e0e6db27e876b18e9165f31", executableSha256: "2faefd55d4e47764956e31e338d362a1e794037fa772a426ffd510f122f33f19" },
+  "linux-x64": { platform: "linux64", bytes: 119454769, sha256: "0ca12ea26b502a83e32db334a17883c315348845efc071d908de7a6d94a97eff", executableSha256: "1301a5024fef1d58c4cfbde5d44794cb18c5b2cbbe4f3c64f81cc4eaa683c45f" },
+  "win32-x64": { platform: "win64", bytes: 119768220, sha256: "86fb1fa7fbbda65f6f1572062c358803e61a6e6d9489e6619b37a61d609fa845", executableSha256: "ec0744f041cb6c35c439c85a5ac42d77b507838cd59cac005e25114025336c98" }
+};
+function browserBundleSpec(target) {
+  if (!Object.hasOwn(CHROME_ASSETS, target)) throw new Error(`Unsupported desktop browser target: ${target}`);
+  const pinned = CHROME_ASSETS[target];
+  const [platform, arch] = target.split("-");
+  const engine = resolveAgentBrowserReleaseAsset(platform, arch);
+  const suffix = platform === "win32" ? ".exe" : "";
+  const directory = `chrome-headless-shell-${pinned.platform}`;
+  return {
+    schemaVersion: 1,
+    target,
+    engine: {
+      version: agentBrowserReleaseVersion(engine),
+      asset: engine.asset,
+      url: agentBrowserReleaseUrl(engine),
+      bytes: engine.bytes,
+      sha256: engine.sha256,
+      executable: `agent-browser${suffix}`
+    },
+    chrome: {
+      version: CHROME_VERSION,
+      asset: `${directory}.zip`,
+      url: `https://storage.googleapis.com/chrome-for-testing-public/${CHROME_VERSION}/${pinned.platform}/${directory}.zip`,
+      bytes: pinned.bytes,
+      sha256: pinned.sha256,
+      executableSha256: pinned.executableSha256,
+      executable: `chrome/${directory}/chrome-headless-shell${suffix}`,
+      license: `chrome/${directory}/LICENSE.headless_shell`,
+      about: `chrome/${directory}/ABOUT`
+    }
+  };
+}
+function browserBundlePaths(bundleDirectory, target) {
+  const spec = browserBundleSpec(target);
+  return {
+    directory: bundleDirectory,
+    manifest: join40(bundleDirectory, "manifest.json"),
+    engine: join40(bundleDirectory, spec.engine.executable),
+    chrome: join40(bundleDirectory, spec.chrome.executable),
+    licenses: join40(bundleDirectory, "licenses")
+  };
+}
+
 // server/browser-engine.ts
 var ENGINE_DIR = "tools/agent-browser";
 var KEY_FILE = "browser-engine-key";
@@ -49649,8 +49777,9 @@ function executableName(platform = process.platform) {
 function isMusl(platform = process.platform, exists = existsSync18) {
   return platform === "linux" && (exists("/lib/ld-musl-x86_64.so.1") || exists("/lib/ld-musl-aarch64.so.1"));
 }
-function pinnedBinaryPath(dataDir = DATA_DIR, platform = process.platform) {
-  return join40(dataDir, ENGINE_DIR, AGENT_BROWSER_VERSION, executableName(platform));
+function pinnedBinaryPath(dataDir = DATA_DIR, platform = process.platform, arch = process.arch) {
+  const version2 = agentBrowserReleaseVersion(resolveAgentBrowserReleaseAsset(platform, arch));
+  return join41(dataDir, ENGINE_DIR, version2, executableName(platform));
 }
 function onPath(env, platform, exists) {
   const pathValue = platform === "win32" ? Object.entries(env).findLast(([key3]) => key3.toUpperCase() === "PATH")?.[1] : env.PATH;
@@ -49662,13 +49791,27 @@ function onPath(env, platform, exists) {
   }
   return null;
 }
+function packagedBrowser(options) {
+  const resources = (options.env ?? process.env).OMB_RESOURCES_PATH;
+  if (!resources) return null;
+  try {
+    return browserBundlePaths(join41(resolve10(resources), "browser-engine"), `${options.platform ?? process.platform}-${options.arch ?? process.arch}`);
+  } catch {
+    return null;
+  }
+}
+function completePackage(bundle, exists) {
+  return [bundle.manifest, bundle.engine, bundle.chrome, bundle.licenses].every(exists);
+}
 function resolveAgentBrowserBinary(options = {}) {
   const env = options.env ?? process.env;
   const platform = options.platform ?? process.platform;
   const exists = options.exists ?? existsSync18;
   const override = env.OMB_AGENT_BROWSER_PATH?.trim();
   if (override) return resolve10(override) && exists(resolve10(override)) ? resolve10(override) : null;
-  const pinned = pinnedBinaryPath(options.dataDir, platform);
+  const bundle = packagedBrowser(options);
+  if (bundle && exists(bundle.directory)) return completePackage(bundle, exists) ? bundle.engine : null;
+  const pinned = pinnedBinaryPath(options.dataDir, platform, options.arch);
   if (exists(pinned)) return pinned;
   return onPath(env, platform, exists);
 }
@@ -49676,11 +49819,11 @@ async function installAgentBrowserBinary(options = {}) {
   const platform = options.platform ?? process.platform;
   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);
-  const directory = join40(destination, "..");
+  const destination = pinnedBinaryPath(options.dataDir, platform, options.arch);
+  const directory = join41(destination, "..");
   mkdirSync20(directory, { recursive: true, mode: 448 });
   const url2 = agentBrowserReleaseUrl(asset);
-  options.log?.(`downloading agent-browser ${AGENT_BROWSER_VERSION} (${Math.round(asset.bytes / 1024 / 1024)} MB, digest pinned)`);
+  options.log?.(`downloading agent-browser ${agentBrowserReleaseVersion(asset)} (${Math.round(asset.bytes / 1024 / 1024)} MB, digest pinned)`);
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), DOWNLOAD_TIMEOUT_MS2);
   timer.unref?.();
@@ -49702,6 +49845,11 @@ async function installAgentBrowserBinary(options = {}) {
   return destination;
 }
 function ensureChrome(binaryPath, options = {}) {
+  const bundle = packagedBrowser(options);
+  if (!options.withDeps && bundle && resolve10(binaryPath) === bundle.engine && completePackage(bundle, existsSync18)) {
+    options.log?.("agent-browser: the bundled browser is ready; no download needed");
+    return Promise.resolve();
+  }
   const args = ["install", ...options.withDeps ? ["--with-deps"] : []];
   return new Promise((done, fail2) => {
     const child = spawn4(binaryPath, args, { env: options.env ?? process.env, stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
@@ -49724,7 +49872,7 @@ function ensureChrome(binaryPath, options = {}) {
   });
 }
 function browserEngineEncryptionKey(dataDir = DATA_DIR) {
-  const file2 = join40(dataDir, KEY_FILE);
+  const file2 = join41(dataDir, KEY_FILE);
   try {
     const existing = readFileSync31(file2, "utf8").trim();
     if (/^[0-9a-f]{64}$/u.test(existing)) return existing;
@@ -49738,14 +49886,28 @@ function browserEngineEncryptionKey(dataDir = DATA_DIR) {
 }
 function browserEngineStatus(options = {}) {
   const binaryPath = resolveAgentBrowserBinary(options);
-  if (binaryPath) return { kind: "ready", binaryPath, version: AGENT_BROWSER_VERSION };
+  const bundle = packagedBrowser(options);
+  if (binaryPath) {
+    const platform2 = options.platform ?? process.platform;
+    const managed = binaryPath === bundle?.engine || binaryPath === pinnedBinaryPath(options.dataDir, platform2, options.arch);
+    const version2 = managed ? agentBrowserReleaseVersion(resolveAgentBrowserReleaseAsset(platform2, options.arch)) : AGENT_BROWSER_VERSION;
+    return { kind: "ready", binaryPath, version: version2 };
+  }
+  if (bundle && (options.exists ?? existsSync18)(bundle.directory)) {
+    return { kind: "unavailable", reason: "The desktop browser bundle is incomplete. Reinstall or update OpenMausBot to repair it.", installable: false };
+  }
   const platform = options.platform ?? process.platform;
-  const asset = resolveAgentBrowserReleaseAsset(platform, process.arch, isMusl(platform));
-  return asset ? { kind: "unavailable", reason: "agent-browser is not installed on this machine yet", installable: true } : { kind: "unavailable", reason: `agent-browser publishes no build for ${platform}-${process.arch}`, installable: false };
+  const arch = options.arch ?? process.arch;
+  const asset = resolveAgentBrowserReleaseAsset(platform, arch, isMusl(platform));
+  return asset ? { kind: "unavailable", reason: "agent-browser is not installed on this machine yet", installable: true } : { kind: "unavailable", reason: `agent-browser publishes no build for ${platform}-${arch}`, installable: false };
 }
 function agentBrowserIntegration(input) {
   const env = {
     AGENT_BROWSER_SESSION: input.session,
+    // The MCP server invokes child CLI commands without forwarding its own
+    // global flags. The environment keeps page-provided tools disabled in
+    // those commands too, and avoids changing browser launch settings later.
+    AGENT_BROWSER_NO_WEBMCP: "1",
     // This is a restore *name*, not a boolean. "1" would give every bot
     // the same saved cookies despite using different daemon sessions.
     AGENT_BROWSER_RESTORE: input.session,
@@ -49753,10 +49915,53 @@ function agentBrowserIntegration(input) {
     AGENT_BROWSER_ENCRYPTION_KEY: input.encryptionKey
   };
   if (input.headless !== false) env.AGENT_BROWSER_HEADLESS = "1";
-  const path = (input.env ?? process.env).PATH;
-  if (path) env.PATH = path;
+  const sourceEnv = input.env ?? process.env;
+  for (const name2 of ["PATH", "AGENT_BROWSER_EXECUTABLE_PATH"]) {
+    if (sourceEnv[name2]) env[name2] = sourceEnv[name2];
+  }
+  const bundle = packagedBrowser({ env: sourceEnv });
+  if (!env.AGENT_BROWSER_EXECUTABLE_PATH && bundle && resolve10(input.binaryPath) === bundle.engine && completePackage(bundle, existsSync18)) {
+    env.AGENT_BROWSER_EXECUTABLE_PATH = bundle.chrome;
+  }
   return { command: input.binaryPath, args: ["mcp", "--tools", "core", "--no-webmcp"], env };
 }
+var FRAME_TIMEOUT_MS = 1e4;
+function agentBrowserFrame(input) {
+  const file2 = join41(tmpdir6(), `openmausbot-browser-${randomUUID12()}.png`);
+  return new Promise((settle, fail2) => {
+    const child = spawn4(input.binaryPath, ["screenshot", file2], {
+      env: { ...process.env, ...input.env },
+      stdio: ["ignore", "ignore", "pipe"],
+      windowsHide: true
+    });
+    let stderr = "";
+    child.stderr?.on("data", (chunk) => {
+      if (stderr.length < 2e3) stderr += String(chunk);
+    });
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      fail2(new Error("the browser did not return a picture in time"));
+    }, input.timeoutMs ?? FRAME_TIMEOUT_MS);
+    const done = (error51) => {
+      clearTimeout(timer);
+      try {
+        if (error51) {
+          fail2(error51);
+          return;
+        }
+        settle({ png: readFileSync31(file2).toString("base64"), format: "png" });
+      } catch {
+        fail2(new Error("the browser reported a picture it did not write"));
+      } finally {
+        rmSync6(file2, { force: true });
+      }
+    };
+    child.on("error", (error51) => done(error51 instanceof Error ? error51 : new Error(String(error51))));
+    child.on("close", (code) => {
+      done(code === 0 ? null : new Error(`the browser could not be pictured${stderr.trim() ? `: ${stderr.trim().slice(0, 200)}` : ""}`));
+    });
+  });
+}
 function browserSessionId(botId, partitionId) {
   if (partitionId === "guest") return `guest-${randomUUID12()}`;
   const raw = partitionId || `bot-${botId}`;
@@ -49811,6 +50016,49 @@ async function captureOutsideHumanControl(control, capture) {
   return { png, mime: format === "jpeg" ? "image/jpeg" : "image/png" };
 }
 
+// server/screen-frame-source.ts
+function createScreenFrameSource(input) {
+  let current2 = null;
+  let lastAt = 0;
+  let attemptedSurface;
+  let last = null;
+  let lastSurface;
+  const selectedSurface = () => input.captures[source.surface] ? source.surface : input.captures.computer ? "computer" : "browser";
+  const source = {
+    surface: input.captures.computer ? "computer" : "browser",
+    get last() {
+      return lastSurface === selectedSurface() ? last : null;
+    },
+    async capture(fresh = false) {
+      while (current2) await current2;
+      if (input.control().held) return;
+      const surface = selectedSurface();
+      if (!fresh && attemptedSurface === surface && Date.now() - lastAt < input.minGapMs) return;
+      attemptedSurface = surface;
+      current2 = (async () => {
+        try {
+          const capture = input.captures[surface];
+          if (!capture) return;
+          const frame = await captureOutsideHumanControl(input.control, capture);
+          if (!frame || surface !== selectedSurface()) return;
+          last = frame;
+          lastSurface = surface;
+          input.onFrame(frame);
+        } catch {
+        } finally {
+          lastAt = Date.now();
+        }
+      })();
+      try {
+        await current2;
+      } finally {
+        current2 = null;
+      }
+    }
+  };
+  return source;
+}
+
 // server/screen-frame-gate.ts
 import { createHash as createHash17 } from "node:crypto";
 var SCREEN_TOUCHING_TOOLS = /* @__PURE__ */ new Set([
@@ -49824,7 +50072,8 @@ var SCREEN_TOUCHING_TOOLS = /* @__PURE__ */ new Set([
   "open_url",
   "browser_click",
   "browser_fill",
-  // built-in browser
+  // built-in browser: the Electron surface's names, kept because a bot on an
+  // older remote harness can still call them
   "browser_navigate",
   "browser_type",
   "browser_press",
@@ -49835,6 +50084,20 @@ var SCREEN_TOUCHING_TOOLS = /* @__PURE__ */ new Set([
   "browser_back",
   "browser_forward",
   "browser_screenshot",
+  // built-in browser: agent-browser's names. The engine swap replaced the
+  // Electron surface without renaming these here, so every browser turn
+  // stopped counting as screen work and no page ever reached the transcript.
+  // Read-only tools stay out by the same rule as everywhere else in this
+  // list: agent_browser_snapshot, _read and _get_text return text, and the
+  // waits change nothing the action before them did not already count.
+  "agent_browser_open",
+  "agent_browser_click",
+  "agent_browser_fill",
+  "agent_browser_type",
+  "agent_browser_press",
+  "agent_browser_select",
+  "agent_browser_check",
+  "agent_browser_screenshot",
   // Cua Driver (local Mac, Local VM, VPS)
   "double_click",
   "right_click",
@@ -49855,6 +50118,14 @@ function screenFrameHash(png) {
 function settledFrameIsNews(shownFrameHash, png) {
   return shownFrameHash === void 0 || screenFrameHash(png) !== shownFrameHash;
 }
+function screenSurfaceForTool(toolName) {
+  const name2 = toolName.toLowerCase();
+  if (name2.startsWith("mcp__computer__") || name2.startsWith("computer_")) return "computer";
+  if (name2.startsWith("mcp__browser__")) return "browser";
+  const bare = name2.replace(/^mcp__.+?__/, "");
+  if (bare === "browser_click" || bare === "browser_fill") return "computer";
+  return bare.startsWith("agent_browser_") || bare.startsWith("browser_") ? "browser" : "computer";
+}
 
 // server/routine-requests.ts
 import { createHash as createHash18 } from "node:crypto";
@@ -50862,13 +51133,13 @@ function profileRevision(bot) {
 import { appendFile as appendFile2 } from "node:fs/promises";
 import { createHash as createHash20, randomUUID as randomUUID13 } from "node:crypto";
 import { closeSync as closeSync8, existsSync as existsSync19, fstatSync as fstatSync3, mkdirSync as mkdirSync21, openSync as openSync8, readSync as readSync3 } from "node:fs";
-import { join as join41 } from "node:path";
+import { join as join42 } from "node:path";
 var FILE_NAME2 = "history.ndjson";
 var ONE_LINER = 200;
 var MAX_HISTORY_READ_BYTES = 8 * 1024 * 1024;
 var writeQueues2 = /* @__PURE__ */ new Map();
 function historyFile(botId) {
-  return join41(botFolder(botId), FILE_NAME2);
+  return join42(botFolder(botId), FILE_NAME2);
 }
 function oneLiner(value) {
   return value.replace(/\s+/g, " ").trim().slice(0, ONE_LINER);
@@ -51265,8 +51536,8 @@ function parseBotDirectory(value) {
 }
 async function readBounded(response, maxBytes) {
   const oversized = () => new Error("The bot directory response is too large");
-  const announced = Number(response.headers.get("content-length") ?? 0);
-  if (announced > maxBytes) throw oversized();
+  const announced2 = Number(response.headers.get("content-length") ?? 0);
+  if (announced2 > maxBytes) throw oversized();
   if (!response.body) {
     const raw = await response.text();
     if (Buffer.byteLength(raw) > maxBytes) throw oversized();
@@ -51368,7 +51639,7 @@ function matchDirectoryBots(profile, bots, limit = 5) {
 
 // server/project-scout.ts
 import { readFileSync as readFileSync32, readdirSync as readdirSync6, statSync as statSync9 } from "node:fs";
-import { basename as basename5, join as join42 } from "node:path";
+import { basename as basename5, join as join43 } from "node:path";
 
 // shared/import-name.ts
 function takeImportName(value, taken, maxLength = 100) {
@@ -51572,7 +51843,7 @@ function isDir(path) {
   }
 }
 function packageJson(cwd) {
-  const raw = readText2(join42(cwd, "package.json"));
+  const raw = readText2(join43(cwd, "package.json"));
   if (!raw) return { deps: /* @__PURE__ */ new Set() };
   try {
     const parsed = JSON.parse(raw);
@@ -51595,7 +51866,7 @@ function packageJson(cwd) {
   }
 }
 function readme(cwd) {
-  const raw = readText2(join42(cwd, "README.md")) ?? readText2(join42(cwd, "readme.md")) ?? readText2(join42(cwd, "README"));
+  const raw = readText2(join43(cwd, "README.md")) ?? readText2(join43(cwd, "readme.md")) ?? readText2(join43(cwd, "README"));
   if (!raw) return {};
   let title;
   let summary;
@@ -51669,12 +51940,12 @@ function scoutProject(cwd) {
   const pkg = packageJson(cwd);
   const md = readme(cwd);
   const entries = new Set(listNames(cwd));
-  const pythonDeps = `${readText2(join42(cwd, "requirements.txt")) ?? ""}
-${readText2(join42(cwd, "pyproject.toml")) ?? ""}`.toLowerCase();
+  const pythonDeps = `${readText2(join43(cwd, "requirements.txt")) ?? ""}
+${readText2(join43(cwd, "pyproject.toml")) ?? ""}`.toLowerCase();
   const hasDep = (dep) => pkg.deps.has(dep) || pythonDeps.length > 1 && pythonDeps.includes(dep);
   const pathEvidence = (path) => {
-    if (path.includes("/")) return isDir(join42(cwd, path)) && listNames(join42(cwd, path)).length > 0 ? `${path}/` : null;
-    if (entries.has(path)) return isDir(join42(cwd, path)) ? `${path}/` : path;
+    if (path.includes("/")) return isDir(join43(cwd, path)) && listNames(join43(cwd, path)).length > 0 ? `${path}/` : null;
+    if (entries.has(path)) return isDir(join43(cwd, path)) ? `${path}/` : path;
     return null;
   };
   const signals = [];
@@ -51687,7 +51958,7 @@ ${readText2(join42(cwd, "pyproject.toml")) ?? ""}`.toLowerCase();
     }
     if (detector.role === "docs" && evidence.length > 0) {
       const hasMkdocs = evidence.includes("mkdocs.yml");
-      const hasMarkdown = listNames(join42(cwd, "docs")).some((name2) => name2.endsWith(".md"));
+      const hasMarkdown = listNames(join43(cwd, "docs")).some((name2) => name2.endsWith(".md"));
       if (!hasMkdocs && !hasMarkdown) continue;
     }
     if (evidence.length > 0) signals.push({ role: detector.role, evidence: evidence.slice(0, 6) });
@@ -52182,8 +52453,8 @@ async function fetchJson(url2, maxBytes, fetcher) {
     const error51 = Object.assign(new Error(`GitHub returned HTTP ${response.status}`), { status: response.status });
     throw error51;
   }
-  const announced = Number(response.headers.get("content-length") ?? 0);
-  if (announced > maxBytes) throw new Error("The remote team file is too large");
+  const announced2 = Number(response.headers.get("content-length") ?? 0);
+  if (announced2 > maxBytes) throw new Error("The remote team file is too large");
   const raw = await response.text();
   if (Buffer.byteLength(raw) > maxBytes) throw new Error("The remote team file is too large");
   try {
@@ -52199,8 +52470,8 @@ async function fetchText2(url2, maxBytes, fetcher) {
     signal: AbortSignal.timeout(1e4)
   });
   if (!response.ok) throw Object.assign(new Error(`GitHub returned HTTP ${response.status}`), { status: response.status });
-  const announced = Number(response.headers.get("content-length") ?? 0);
-  if (announced > maxBytes) throw new Error("The remote team file is too large");
+  const announced2 = Number(response.headers.get("content-length") ?? 0);
+  if (announced2 > maxBytes) throw new Error("The remote team file is too large");
   const raw = await response.text();
   if (Buffer.byteLength(raw) > maxBytes) throw new Error("The remote team file is too large");
   return raw;
@@ -52277,7 +52548,7 @@ async function fetchGithubTeam(input, fetcher = fetch) {
 
 // server/thread-events.ts
 import { closeSync as closeSync9, fstatSync as fstatSync4, openSync as openSync9, readSync as readSync4 } from "node:fs";
-import { join as join43 } from "node:path";
+import { join as join44 } from "node:path";
 var DEFAULT_LIMIT = 300;
 var MAX_LIMIT = 2e3;
 var READ_CHUNK = 64 * 1024;
@@ -52411,8 +52682,8 @@ function readThreadEvents(input) {
   assertThreadId(threadId);
   const requested = input.limit ?? DEFAULT_LIMIT;
   const limit = Number.isFinite(requested) ? Math.max(1, Math.min(Math.trunc(requested), MAX_LIMIT)) : DEFAULT_LIMIT;
-  const runtime = readRecentLines(join43(eventsDir, `${threadId}.ndjson`), limit, isRuntimeEvent);
-  const native = readRecentLines(join43(nativeDir, `${threadId}.ndjson`), limit, isNativeRecord);
+  const runtime = readRecentLines(join44(eventsDir, `${threadId}.ndjson`), limit, isRuntimeEvent);
+  const native = readRecentLines(join44(nativeDir, `${threadId}.ndjson`), limit, isNativeRecord);
   const merged = [
     ...runtime.lines.map((data) => ({ kind: "runtime", at: data.createdAt, data })),
     ...native.lines.map((data) => ({ kind: "native", at: data.at, data }))
@@ -52589,7 +52860,7 @@ function memberTurnSelection(selection) {
 // server/webhooks.ts
 import { createHash as createHash21, randomBytes as randomBytes5, randomUUID as randomUUID14, timingSafeEqual } from "node:crypto";
 import { mkdirSync as mkdirSync22, readFileSync as readFileSync33 } from "node:fs";
-import { dirname as dirname13, join as join44 } from "node:path";
+import { dirname as dirname13, join as join45 } from "node:path";
 var MAX_DELIVERIES = 2e3;
 var MAX_ATTEMPTS = 2e3;
 var MAX_EVENT_CHARS = 48e3;
@@ -52776,7 +53047,7 @@ var WebhookManager = class {
   rate = /* @__PURE__ */ new Map();
   constructor(options) {
     this.options = options;
-    this.file = options.file ?? join44(DATA_DIR, "webhooks.json");
+    this.file = options.file ?? join45(DATA_DIR, "webhooks.json");
     this.now = options.now ?? Date.now;
     try {
       const parsed = webhookFileSchema.safeParse(parseJson(readFileSync33(this.file, "utf8")));
@@ -53040,7 +53311,7 @@ var WebhookManager = class {
 
 // server/skill-library.ts
 import { existsSync as existsSync20, readFileSync as readFileSync34, readdirSync as readdirSync7 } from "node:fs";
-import { basename as basename6, join as join45 } from "node:path";
+import { basename as basename6, join as join46 } from "node:path";
 var SAFE_ID = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 function strings(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string" && item.trim()) ? value.map((item) => item.trim()) : null;
@@ -53069,19 +53340,19 @@ function parseSkillManifest(value, directory) {
   };
 }
 function loadSkillDirectory(directory) {
-  const manifestPath2 = join45(directory, "manifest.json");
-  const skillPath = join45(directory, "SKILL.md");
+  const manifestPath2 = join46(directory, "manifest.json");
+  const skillPath = join46(directory, "SKILL.md");
   if (!existsSync20(manifestPath2) || !existsSync20(skillPath)) return null;
   const manifest = parseSkillManifest(JSON.parse(readFileSync34(manifestPath2, "utf8")), directory);
   const instructions = readFileSync34(skillPath, "utf8").trim();
   if (!instructions.startsWith("---")) throw new Error(`${skillPath} has no skill frontmatter`);
   return { manifest, instructions, directory };
 }
-function loadBundledSkills(root = process.env.OMB_SKILLS_DIR || join45(process.cwd(), "skills")) {
+function loadBundledSkills(root = process.env.OMB_SKILLS_DIR || join46(process.cwd(), "skills")) {
   if (!existsSync20(root)) return [];
   const skills = [];
   for (const name2 of readdirSync7(root).sort()) {
-    const directory = join45(root, name2);
+    const directory = join46(root, name2);
     const skill = loadSkillDirectory(directory);
     if (skill) skills.push(skill);
   }
@@ -53098,7 +53369,7 @@ function loadUserSkills(root) {
   const skills = [];
   for (const name2 of names) {
     try {
-      const skill = loadSkillDirectory(join45(root, name2));
+      const skill = loadSkillDirectory(join46(root, name2));
       if (skill) skills.push(skill);
     } catch {
     }
@@ -53802,7 +54073,7 @@ function createGracefulShutdown({
 import { createHash as createHash22, randomUUID as randomUUID15 } from "node:crypto";
 import { existsSync as existsSync21, linkSync as linkSync4, mkdirSync as mkdirSync23, readFileSync as readFileSync35, renameSync as renameSync6, unlinkSync as unlinkSync8, writeFileSync as writeFileSync16 } from "node:fs";
 import { hostname as hostname4 } from "node:os";
-import { join as join46 } from "node:path";
+import { join as join47 } from "node:path";
 var LEASE_NAME = "openmausbot-server.lease";
 var DELEGATED_CHILD_DIR = ".openmausbot-server-child";
 var CHILD_LEASE_ENV = "OPENMAUSBOT_INTERNAL_DATA_DIR_LEASE";
@@ -53961,10 +54232,10 @@ function prepareDataDir(dataDir, legacyDataDir) {
   } catch (error51) {
     throw leaseError("OpenMausBot cannot create its data directory.", error51);
   }
-  return join46(dataDir, LEASE_NAME);
+  return join47(dataDir, LEASE_NAME);
 }
 function assertNoLiveDelegatedChild(dataDir) {
-  const childLeasePath = join46(dataDir, DELEGATED_CHILD_DIR, LEASE_NAME);
+  const childLeasePath = join47(dataDir, DELEGATED_CHILD_DIR, LEASE_NAME);
   const child = readOwner(childLeasePath);
   if (!child) return;
   if (child.host !== hostname4()) {
@@ -54006,13 +54277,13 @@ function validateChildDelegation(dataDir, encoded) {
   const capability = parseCapability(encoded);
   const invalid = () => leaseError("The OpenMausBot desktop lease delegation is invalid; refusing to start to protect its state.");
   if (!capability) throw invalid();
-  const parentLeasePath = join46(dataDir, LEASE_NAME);
+  const parentLeasePath = join47(dataDir, LEASE_NAME);
   const matchesLiveParent = (owner2) => Boolean(owner2 && owner2.pid === capability.pid && owner2.token === capability.token && owner2.host === hostname4() && processIsAlive2(owner2.pid));
   if (!matchesLiveParent(readOwner(parentLeasePath))) {
     throw invalid();
   }
   const childLease = acquireDataDirLeaseInternal(
-    join46(dataDir, DELEGATED_CHILD_DIR),
+    join47(dataDir, DELEGATED_CHILD_DIR),
     { guardDelegatedChild: false }
   );
   if (!matchesLiveParent(readOwner(parentLeasePath))) {
@@ -54111,14 +54382,14 @@ function acquireDataDirLeaseForProcess(dataDir, environment = process.env) {
 
 // server/enterprise.ts
 import { existsSync as existsSync22 } from "node:fs";
-import { join as join47 } from "node:path";
+import { join as join48 } from "node:path";
 import { pathToFileURL } from "node:url";
 var layerSchema = external_exports.object({
   customer: external_exports.string().min(1),
   features: external_exports.array(external_exports.string().min(1)),
   expiresAt: external_exports.string().nullable()
 });
-var DEFAULT_DIR = join47(SERVER_ROOT, "..", "enterprise");
+var DEFAULT_DIR = join48(SERVER_ROOT, "..", "enterprise");
 var current = { edition: "oss", features: [] };
 function oss(notice) {
   current = notice ? { edition: "oss", features: [], notice } : { edition: "oss", features: [] };
@@ -54127,7 +54398,7 @@ function oss(notice) {
 async function loadEnterpriseLayer(options = {}) {
   const dir = options.dir ?? process.env.OMB_ENTERPRISE_DIR ?? DEFAULT_DIR;
   const licenseKey = options.licenseKey ?? process.env.OMB_LICENSE_KEY;
-  const entry = [join47(dir, "server", "index.ts"), join47(dir, "server", "index.js")].find((candidate) => existsSync22(candidate));
+  const entry = [join48(dir, "server", "index.ts"), join48(dir, "server", "index.js")].find((candidate) => existsSync22(candidate));
   if (!entry) {
     return oss(
       licenseKey ? `OMB_LICENSE_KEY is set but no enterprise layer exists at ${dir}` : void 0
@@ -54559,6 +54830,7 @@ function resolveRequestAuth(req, options) {
     if (!session.scopes.includes(needed)) {
       return deny(403, `forbidden: this session lacks the ${needed} scope`);
     }
+    if (via !== "ticket") options.sessions.renew(session.id);
     return { auth: { kind: "session", session, via, scopes: session.scopes }, status: 401, error: "" };
   }
   const proxied = isProxied(req);
@@ -54594,7 +54866,17 @@ var SCOPES = ["admin", "client"];
 var PAIRING_CODE_ALPHABET = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 var PAIRING_CODE_LENGTH = 12;
 var PAIRING_CODE_TTL_MS = 5 * 6e4;
-var SESSION_TTL_MS = 30 * 24 * 60 * 6e4;
+function daysMs(value, fallbackDays) {
+  const days = Number(value);
+  const ok = Number.isInteger(days) && days >= 1 && days <= 3650;
+  return (ok ? days : fallbackDays) * 24 * 60 * 6e4;
+}
+var SESSION_TTL_MS = daysMs(process.env.OMB_SESSION_TTL_DAYS, 30);
+var SESSION_MAX_AGE_MS = daysMs(process.env.OMB_SESSION_MAX_DAYS, 180);
+var SESSION_RENEW_WHEN_LEFT_MS = SESSION_TTL_MS / 2;
+function cookieMaxAgeSeconds(session, now = Date.now()) {
+  return Math.max(1, Math.floor((session.expiresAt - now) / 1e3));
+}
 var STREAM_TICKET_TTL_MS = 5 * 6e4;
 var LOCKOUT = { failures: 10, windowMs: 6e4, lockMs: 6e4 };
 var EXCHANGE_REPLAY_MS = 6e4;
@@ -54793,7 +55075,9 @@ var SessionRegistry = class {
       scopes: [...pairing.scopes],
       createdAt: now,
       lastSeenAt: now,
-      expiresAt: now + SESSION_TTL_MS
+      // The absolute cap applies from the first term, so a TTL configured
+      // longer than the cap does not hand out a session the cap forbids.
+      expiresAt: now + Math.min(SESSION_TTL_MS, SESSION_MAX_AGE_MS)
     };
     this.sessions.push(record2);
     this.lastSeenWrites.set(record2.id, now);
@@ -54817,6 +55101,25 @@ var SessionRegistry = class {
     }
     return record2;
   }
+  /** Sliding expiry. Called by the request gate once a request has passed
+   * the origin and scope checks (so a rejected request never extends
+   * anything): a still-valid session with half its term or less left is
+   * renewed for the full term, capped at SESSION_MAX_AGE_MS from pairing.
+   * Nothing expired is revived. Writes at most once per half-term, so it
+   * adds nothing to the last-seen traffic. Returns whether it renewed. */
+  renew(sessionId) {
+    const record2 = this.sessions.find((s) => s.id === sessionId);
+    const now = this.now();
+    if (!record2 || record2.expiresAt <= now) return false;
+    if (record2.expiresAt - now > SESSION_RENEW_WHEN_LEFT_MS) return false;
+    const next = Math.min(now + SESSION_TTL_MS, record2.createdAt + SESSION_MAX_AGE_MS);
+    if (next <= record2.expiresAt) return false;
+    record2.expiresAt = next;
+    record2.lastSeenAt = now;
+    this.lastSeenWrites.set(record2.id, now);
+    this.persist();
+    return true;
+  }
   /** Still valid right now (prunes expiry first). */
   isLive(sessionId) {
     this.prune();
@@ -54859,7 +55162,7 @@ var SessionRegistry = class {
 
 // server/brand.ts
 import { existsSync as existsSync24, readFileSync as readFileSync37 } from "node:fs";
-import { join as join48 } from "node:path";
+import { join as join49 } from "node:path";
 var HEX_COLOUR = /^#[0-9a-fA-F]{6}$/;
 var MAX_LOGO_CHARS = 3e5;
 var brandSchema = external_exports.object({
@@ -54876,7 +55179,7 @@ var brandSchema = external_exports.object({
 }).strict();
 var DEFAULT_BRAND = { name: "OpenMausBot" };
 function brandFile() {
-  return process.env.OMB_BRAND_FILE || join48(DATA_DIR, "brand.json");
+  return process.env.OMB_BRAND_FILE || join49(DATA_DIR, "brand.json");
 }
 function loadBrand(options = {}) {
   const file2 = options.file ?? brandFile();
@@ -57372,7 +57675,7 @@ function releaseDataDirLeaseAtExit() {
 }
 process.once("exit", releaseDataDirLeaseAtExit);
 var ENVIRONMENT_ID = loadEnvironmentId(DATA_DIR);
-var sessions = new SessionRegistry({ file: join49(DATA_DIR, "sessions.json") });
+var sessions = new SessionRegistry({ file: join50(DATA_DIR, "sessions.json") });
 var SESSION_COOKIE = sessionCookieName(PORT, ENVIRONMENT_ID);
 var DESKTOP_MANAGED = process.env.OMB_DESKTOP_PARENT === "1";
 var desktopMutationToken = DESKTOP_MANAGED ? "" : void 0;
@@ -57382,7 +57685,7 @@ var cfg = loadConfig();
 var registry2 = new ProviderRegistry(BUILT_IN_DRIVERS);
 await registry2.load(instanceConfigs(cfg));
 var bundledSkills = loadBundledSkills();
-var availableSkills = () => mergeSkills(bundledSkills, loadUserSkills(join49(DATA_DIR, "skills")));
+var availableSkills = () => mergeSkills(bundledSkills, loadUserSkills(join50(DATA_DIR, "skills")));
 var utilityParentPort = process.parentPort;
 function postDesktopPrivateMessage(message3) {
   if (!utilityParentPort) return false;
@@ -57408,7 +57711,7 @@ function applyDesktopMutationTokenMessage(raw) {
   return true;
 }
 var browserCleanup = new BrowserCleanupCoordinator({
-  file: join49(DATA_DIR, "browser-cleanups.json"),
+  file: join50(DATA_DIR, "browser-cleanups.json"),
   send: (request) => {
     const status = browserEngineStatus();
     const sessions2 = request.type === "openmausbot:browser-bot-deleted" && request.botId ? [browserSessionId(request.botId, "")] : request.partitionId ? [browserSessionId("", request.partitionId)] : [];
@@ -57765,10 +58068,7 @@ function askBotAndWait(targetBotId, message3, depth, fromBotId) {
   });
 }
 async function defaultSelection() {
-  const described = await registry2.describe();
-  const available = described.filter((d) => d.snapshot.state === "available");
-  const pick2 = available.find((d) => d.driverKind === "claudeAgent") ?? available[0];
-  return { instanceId: pick2?.instanceId ?? "", model: pick2?.models.default ?? "" };
+  return selectDefaultModelSelection(await registry2.describe(), cfg.defaultModelSelection);
 }
 function checkedModelSelection(raw, current2, requireAvailableModel = false) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -58538,12 +58838,16 @@ function broadcast(payload) {
 data: ${JSON.stringify({ ...payload, seq: seq2 })}
 
 `;
-  replayBuffer.push({ seq: seq2, kind, frame: kind === "screen" ? null : frame });
+  const clientFrame = kind === "config" ? `id: ${STREAM_ID}:${seq2}
+data: ${JSON.stringify({ ...configForAccess(payload, false), seq: seq2 })}
+
+` : frame;
+  replayBuffer.push({ seq: seq2, kind, frame: kind === "screen" ? null : frame, clientFrame: kind === "screen" ? null : clientFrame });
   if (replayBuffer.length > REPLAY_MAX) replayBuffer.shift();
   for (const client of [...sseClients]) {
     if (!wants(client, kind)) continue;
     try {
-      client.res.write(frame);
+      client.res.write(client.admin ? frame : clientFrame);
     } catch {
       sseClients.delete(client);
     }
@@ -59042,7 +59346,7 @@ bus.subscribe((event) => {
         if (bot) {
           const touches = screenTouchingTool(toolName);
           if (touches || /computer|screenshot|click|type_text|press_key|scroll|open_url|wait_for|browser_/i.test(toolName)) {
-            pokeScreenPoller(bot.id, touches);
+            pokeScreenPoller(bot.id, touches, screenSurfaceForTool(toolName));
           }
         }
       }
@@ -59606,45 +59910,29 @@ function drainQueuedSends() {
 var screenPollers = /* @__PURE__ */ new Map();
 var SCREEN_POLL_MS = 6e3;
 var SCREEN_MIN_GAP_MS = 3e3;
-function startScreenPoller(botId, capture, { screenIsTheWork = false } = {}) {
+function startScreenPoller(botId, captures, { screenIsTheWork = false } = {}) {
+  if (!captures.computer && !captures.browser) return;
   if (screenPollers.has(botId)) return;
-  let current2 = null;
-  let lastAt = 0;
-  const entry = {
+  const entry = Object.assign(createScreenFrameSource({
+    captures,
+    control: () => ({
+      held: computerControl.snapshot(botId).held,
+      revision: computerControlRevision.get(botId) ?? 0
+    }),
+    onFrame: (frame) => broadcast({ kind: "screen", botId, ...frame }),
+    minGapMs: SCREEN_MIN_GAP_MS
+  }), {
     timer: null,
-    capture: () => {
-      if (computerControl.snapshot(botId).held) return Promise.resolve();
-      if (!current2 && Date.now() - lastAt < SCREEN_MIN_GAP_MS) return Promise.resolve();
-      current2 ??= (async () => {
-        try {
-          const frame = await captureOutsideHumanControl(
-            () => ({
-              held: computerControl.snapshot(botId).held,
-              revision: computerControlRevision.get(botId) ?? 0
-            }),
-            capture
-          );
-          if (!frame) return;
-          entry.last = frame;
-          broadcast({ kind: "screen", botId, ...frame });
-        } catch {
-        } finally {
-          lastAt = Date.now();
-          current2 = null;
-        }
-      })();
-      return current2;
-    },
-    last: null,
     touched: screenIsTheWork
-  };
+  });
   entry.timer = setInterval(() => void entry.capture(), SCREEN_POLL_MS);
   screenPollers.set(botId, entry);
 }
-function pokeScreenPoller(botId, touches) {
+function pokeScreenPoller(botId, touches, surface) {
   const entry = screenPollers.get(botId);
   if (!entry) return;
   if (touches) entry.touched = true;
+  if (touches && surface) entry.surface = surface;
   void entry.capture();
 }
 function stopScreenPoller(botId) {
@@ -59666,7 +59954,7 @@ async function finalScreenFrame(botId, threadId) {
   if (entry.timer) clearInterval(entry.timer);
   screenPollers.delete(botId);
   if (!entry.touched) return null;
-  await entry.capture();
+  await entry.capture(true);
   const frame = entry.last;
   if (!frame || !settledFrameIsNews(shownScreenHash(botId, threadId), frame.png)) return null;
   settledScreenHashes.set(botId, screenFrameHash(frame.png));
@@ -59837,6 +60125,7 @@ async function startTurn(botId, text6, opts) {
       }
       const wants2 = plan.computer;
       let previewCapture = null;
+      let browserCapture = null;
       let computerKind = null;
       let autoVpsProblem = null;
       if (wants2 === "vm") {
@@ -60005,6 +60294,10 @@ async function startTurn(botId, text6, opts) {
         const selectedProfile = liveBot.browserProfile;
         browser = browserIntegration(bot.id, selectedProfile);
         if (browser) integrations.browser = browser.integration;
+        if (browser) {
+          const frame = { binaryPath: browser.integration.command, env: browser.integration.env };
+          browserCapture = () => agentBrowserFrame(frame);
+        }
       }
       await pendingCancelledProviderHandshakes.waitForClear(threadId);
       if (!markDirectTurnDispatching(bot.id, dispatchClaimId, threadId)) {
@@ -60066,8 +60359,12 @@ async function startTurn(botId, text6, opts) {
       if (!isExternalContextMarker(task2.lastInstanceId) || task2.lastInstanceId === externalContextMarker) {
         store.markTaskDispatched(bot.id, threadId, instanceId);
       }
-      if (previewCapture && store.bot(bot.id)?.busy) {
-        startScreenPoller(bot.id, previewCapture, { screenIsTheWork: instance.driverKind === "boxAgent" });
+      if ((previewCapture || browserCapture) && store.bot(bot.id)?.busy) {
+        startScreenPoller(
+          bot.id,
+          { ...previewCapture ? { computer: previewCapture } : {}, ...browserCapture ? { browser: browserCapture } : {} },
+          { screenIsTheWork: instance.driverKind === "boxAgent" }
+        );
       }
       if (store.bot(bot.id)?.busy !== true) {
         revokeInternalCapabilityGeneration(threadId, dispatchClaimId);
@@ -62286,6 +62583,15 @@ function configStatus() {
     browserProfiles: cfg.browserProfiles ?? []
   };
 }
+function configForAccess(status, admin) {
+  if (admin) return status;
+  return {
+    ...status,
+    vps: { configured: status.vps.configured, sshAlias: "" },
+    profile: { name: status.profile.name, email: "" },
+    browserProfiles: status.browserProfiles.map((profile) => Object.fromEntries(Object.entries(profile).filter(([key3]) => key3 !== "partitionId")))
+  };
+}
 function mcpServerResponse() {
   return { servers: listMcpServers(cfg.mcpServers) };
 }
@@ -62332,7 +62638,7 @@ var claudeUpdatesInFlight = /* @__PURE__ */ new Set();
 function serveStatic(res, path) {
   if (!STATIC_DIR) return false;
   const safe = path === "/" ? "/index.html" : path.replace(/\.\./g, "");
-  const file2 = join49(STATIC_DIR, safe);
+  const file2 = join50(STATIC_DIR, safe);
   try {
     const data = readFileSync38(file2);
     res.writeHead(200, { "content-type": MIME[extname5(file2)] ?? "application/octet-stream" });
@@ -62340,7 +62646,7 @@ function serveStatic(res, path) {
     return true;
   } catch {
     try {
-      const data = readFileSync38(join49(STATIC_DIR, "index.html"));
+      const data = readFileSync38(join50(STATIC_DIR, "index.html"));
       res.writeHead(200, { "content-type": "text/html" });
       res.end(data);
       return true;
@@ -62388,7 +62694,12 @@ function readBody(req, limit = 1e6) {
   });
 }
 var handleRequest = async (req, res) => {
-  const url2 = new URL(req.url ?? "/", `http://localhost:${PORT}`);
+  let url2;
+  try {
+    url2 = new URL(req.url ?? "/", `http://localhost:${PORT}`);
+  } catch {
+    return json3(res, 400, { error: "invalid request URL" });
+  }
   const path = url2.pathname;
   const method = req.method ?? "GET";
   let m = null;
@@ -62414,7 +62725,7 @@ var handleRequest = async (req, res) => {
       const environment = environmentDescriptor({ environmentId: ENVIRONMENT_ID, desktopManaged: DESKTOP_MANAGED });
       if (wantsCookie) {
         const secure = requestOrigin(req)?.startsWith("https://") === true;
-        res.setHeader("set-cookie", serializeSessionCookie(SESSION_COOKIE, result.token, { secure, maxAgeSeconds: SESSION_TTL_MS / 1e3 }));
+        res.setHeader("set-cookie", serializeSessionCookie(SESSION_COOKIE, result.token, { secure, maxAgeSeconds: cookieMaxAgeSeconds(result.session) }));
         return json3(res, 200, { session: result.session, environment });
       }
       return json3(res, 200, { token: result.token, session: result.session, environment });
@@ -62427,6 +62738,13 @@ var handleRequest = async (req, res) => {
       loopbackMutationToken: desktopMutationToken,
       companionMutationToken
     });
+    if (gate.auth?.kind === "session" && gate.auth.via === "cookie") {
+      const presented = parseCookies(req.headers.cookie).get(SESSION_COOKIE);
+      if (presented) {
+        const secure = requestOrigin(req)?.startsWith("https://") === true;
+        res.setHeader("set-cookie", serializeSessionCookie(SESSION_COOKIE, presented, { secure, maxAgeSeconds: cookieMaxAgeSeconds(gate.auth.session) }));
+      }
+    }
     if (method === "GET" && path === "/api/health" && !gate.auth) {
       return json3(res, 200, { app: "openmausbot" });
     }
@@ -62472,7 +62790,7 @@ var handleRequest = async (req, res) => {
         hint: base2 ? null : "this server has no public address to put in a link: set OMB_PUBLIC_URL, or open /pair on the address you use and type the code"
       });
     }
-    if (method === "GET" && path === "/api/auth/pairing") return json3(res, 200, { pairings: sessions.openPairings() });
+    if (method === "GET" && path === "/api/auth/pairing") return json3(res, 200, { pairings: sessions.openPairings(), publicUrl: PUBLIC_URL });
     m = path.match(/^\/api\/auth\/pairing\/([\w-]+)$/);
     if (m && method === "DELETE") {
       const cancelled = sessions.cancelPairing(m[1]);
@@ -62697,6 +63015,16 @@ var handleRequest = async (req, res) => {
         });
         return json3(res, 201, proposed);
       }
+      const discloseRecall = (bot, roomThreadId, sourceThreadIds) => {
+        const crossing = claimRecallCrossings(roomThreadId, sourceThreadIds);
+        if (!crossing.count) return;
+        store.appendMessage(roomThreadId, {
+          role: "bot",
+          kind: "activity",
+          from: { botId: bot.id, name: bot.name, color: bot.color },
+          tool: { name: recallCrossingLabel(bot.name, crossing.count), ok: true }
+        });
+      };
       if (method === "GET" && path === "/api/internal/session-search") {
         const fromBotId = String(url2.searchParams.get("fromBotId") ?? "");
         const from = store.bot(fromBotId);
@@ -62710,11 +63038,16 @@ var handleRequest = async (req, res) => {
         const rawLimit = Number(url2.searchParams.get("limit"));
         const limit = Number.isFinite(rawLimit) && rawLimit > 0 ? Math.min(Math.trunc(rawLimit), 25) : 12;
         const ownThreads = [.../* @__PURE__ */ new Set([from.threadId, ...(from.tasks ?? []).map((task2) => task2.threadId)])];
+        const inRoom = Boolean(store.groupByThread(fromThreadId));
         const hits = recallMessages(q, ownThreads, limit).map((hit) => ({
           ...hit,
           task: store.taskByThread(from.id, hit.threadId)?.title,
-          current: hit.threadId === fromThreadId
+          current: hit.threadId === fromThreadId,
+          crossed: inRoom && hit.threadId !== fromThreadId
         }));
+        if (inRoom) {
+          discloseRecall(from, fromThreadId, hits.filter((hit) => hit.crossed).map((hit) => hit.threadId));
+        }
         return json3(res, 200, { hits });
       }
       if (method === "GET" && path === "/api/internal/session-read") {
@@ -62731,8 +63064,12 @@ var handleRequest = async (req, res) => {
         const own3 = threadId === from.threadId || Boolean(store.taskByThread(from.id, threadId));
         const message3 = own3 ? readMessageText(threadId, messageId) : null;
         if (!message3) return json3(res, 404, { error: "no such message in your conversations" });
+        const readInRoom = Boolean(store.groupByThread(fromThreadId));
+        const readCrossed = readInRoom && threadId !== fromThreadId;
+        if (readCrossed) discloseRecall(from, fromThreadId, [threadId]);
         return json3(res, 200, {
           ...message3,
+          crossed: readCrossed,
           text: message3.text.length > SESSION_READ_MAX_CHARS ? `${message3.text.slice(0, SESSION_READ_MAX_CHARS)}\u2026` : message3.text,
           task: store.taskByThread(from.id, threadId)?.title
         });
@@ -63421,7 +63758,7 @@ var handleRequest = async (req, res) => {
       return webhooks.remove(webhookMatch[1]) ? json3(res, 200, { ok: true }) : json3(res, 404, { error: "no such webhook" });
     }
     if (method === "GET" && path === "/api/events") {
-      const client = { res, screens: url2.searchParams.get("screens") !== "off" };
+      const client = { res, admin: auth.scopes.includes("admin"), screens: url2.searchParams.get("screens") !== "off" };
       if (auth.kind === "session") client.sessionId = auth.session.id;
       res.writeHead(200, {
         "content-type": "text/event-stream",
@@ -63447,7 +63784,8 @@ var handleRequest = async (req, res) => {
       );
       if (resumed) {
         for (const buffered of replayBuffer) {
-          if (buffered.seq > since && buffered.frame && wants(client, buffered.kind)) res.write(buffered.frame);
+          const frame = client.admin ? buffered.frame : buffered.clientFrame;
+          if (buffered.seq > since && frame && wants(client, buffered.kind)) res.write(frame);
         }
       }
       sseClients.add(client);
@@ -64288,7 +64626,7 @@ data: ${JSON.stringify({ kind: "ping" })}
       for (const threadId of threadIds) {
         for (const dir of [EVENTS_DIR, NATIVE_DIR]) {
           try {
-            unlinkSync9(join49(dir, `${threadId}.ndjson`));
+            unlinkSync9(join50(dir, `${threadId}.ndjson`));
           } catch {
           }
         }
@@ -65010,7 +65348,7 @@ data: ${JSON.stringify({ kind: "ping" })}
         }
         for (const dir of [EVENTS_DIR, NATIVE_DIR]) {
           try {
-            unlinkSync9(join49(dir, `${bot.threadId}.ndjson`));
+            unlinkSync9(join50(dir, `${bot.threadId}.ndjson`));
           } catch {
           }
         }
@@ -66099,16 +66437,7 @@ data: ${JSON.stringify({ kind: "ping" })}
       }
     }
     if (method === "GET" && path === "/api/config") {
-      const status = configStatus();
-      if (auth.kind === "session" && !auth.scopes.includes("admin")) {
-        return json3(res, 200, {
-          ...status,
-          vps: { configured: status.vps.configured, sshAlias: "" },
-          profile: { name: status.profile.name, email: "" },
-          browserProfiles: status.browserProfiles.map((profile) => Object.fromEntries(Object.entries(profile).filter(([key3]) => key3 !== "partitionId")))
-        });
-      }
-      return json3(res, 200, status);
+      return json3(res, 200, configForAccess(configStatus(), auth.scopes.includes("admin")));
     }
     if ((method === "PUT" || method === "PATCH") && path === "/api/config") {
       const body = await readBody(req);
@@ -66767,7 +67096,7 @@ server.listen(PORT, "127.0.0.1", () => {
 var TUNNEL_SOCKET = process.env.OMB_TUNNEL_SOCKET?.trim() || null;
 var tunnelListener = null;
 if (TUNNEL_SOCKET) {
-  if (process.platform !== "win32") rmSync6(TUNNEL_SOCKET, { force: true });
+  if (process.platform !== "win32") rmSync7(TUNNEL_SOCKET, { force: true });
   tunnelListener = createServer3(handleRequest);
   tunnelListener.listen(TUNNEL_SOCKET, () => {
     console.log(`openmausbot tunnel listener on ${TUNNEL_SOCKET}`);