@zixt/host 0.0.97 → 0.0.98

package/dist/index.js

@@ -28,7 +28,7 @@ import { homedir as homedir3 } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.97",
+  version: "0.0.98",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -14764,6 +14764,7 @@ var BrowserTab = external_exports.object({
 var BROWSER_MAX_TABS = 12;
 var BrowserSessionState = external_exports.object({
   browserSessionId: BrowserSessionId,
+  taskId: TaskId,
   agentId: AgentId,
   /** Mirrors the active tab so a viewer can render before tabs arrive. */
   url: external_exports.string().max(2e3),
@@ -14796,6 +14797,7 @@ var BrowserCommand = external_exports.discriminatedUnion("action", [
 ]);
 var BrowserFramePayload = external_exports.object({
   browserSessionId: BrowserSessionId,
+  taskId: TaskId,
   agentId: AgentId,
   /** Per-session monotonic counter so late frames can be dropped. */
   frameSeq: external_exports.number().int().min(0),
@@ -17315,7 +17317,7 @@ var ListTasksResponse = external_exports.object({
 }).strict();
 
 // ../../packages/contracts/src/protocol.ts
-var PROTOCOL_VERSION = 9;
+var PROTOCOL_VERSION = 10;
 var BROWSER_PROFILE_INVENTORY_PAGE_SIZE = 200;
 var HELLO_UNWOUND_ASSIGNMENT_LIMIT = 1e3;
 var TASK_CANCEL_ACK_EVENT = "zixt.task.cancel.acknowledged";
@@ -18305,6 +18307,7 @@ var BrowserScreencastFrame = external_exports.object({
 var BrowserSessionEndedFrame = external_exports.object({
   type: external_exports.literal("browser.session.ended"),
   browserSessionId: external_exports.string().min(1).max(200),
+  taskId: TaskId,
   agentId: AgentId,
   reason: BrowserSessionEndReason
 });
@@ -18340,6 +18343,7 @@ var BrowserCredentialResultFrame = external_exports.discriminatedUnion("ok", [
 var BrowserOpenFrame = external_exports.object({
   type: external_exports.literal("browser.open"),
   requestId: external_exports.string().min(1).max(200),
+  taskId: TaskId,
   agentId: AgentId,
   /**
    * Cloud-owned browser-profile lifecycle revision. A Host persists the last
@@ -18353,11 +18357,13 @@ var BrowserOpenFrame = external_exports.object({
 });
 var BrowserCloseFrame = external_exports.object({
   type: external_exports.literal("browser.close"),
+  taskId: TaskId,
   agentId: AgentId,
   browserSessionId: external_exports.string().min(1).max(200)
 });
 var BrowserViewFrame = external_exports.object({
   type: external_exports.literal("browser.view"),
+  taskId: TaskId,
   agentId: AgentId,
   browserSessionId: external_exports.string().min(1).max(200),
   active: external_exports.boolean(),
@@ -18365,12 +18371,14 @@ var BrowserViewFrame = external_exports.object({
 });
 var BrowserInputFrame = external_exports.object({
   type: external_exports.literal("browser.input"),
+  taskId: TaskId,
   agentId: AgentId,
   browserSessionId: external_exports.string().min(1).max(200),
   events: external_exports.array(BrowserInputEvent).min(1).max(60)
 });
 var BrowserCommandFrame = external_exports.object({
   type: external_exports.literal("browser.command"),
+  taskId: TaskId,
   agentId: AgentId,
   browserSessionId: external_exports.string().min(1).max(200),
   command: BrowserCommand
@@ -22980,9 +22988,10 @@ var HostClient = class _HostClient {
               ...openRequestId !== void 0 ? { openRequestId } : {}
             }),
             frame: (payload) => this.sendBrowserFrame({ type: "browser.frame", frame: payload }),
-            ended: (browserSessionId, agentId, reason) => this.sendBrowserFrame({
+            ended: (browserSessionId, taskId, agentId, reason) => this.sendBrowserFrame({
               type: "browser.session.ended",
               browserSessionId,
+              taskId,
               agentId,
               reason
             })
@@ -23083,6 +23092,7 @@ var HostClient = class _HostClient {
         const bridge = this.opts.browser;
         if (!bridge) return;
         void bridge.open(
+          frame.taskId,
           frame.agentId,
           frame.browserSessionId,
           frame.viewport,
@@ -23092,6 +23102,7 @@ var HostClient = class _HostClient {
           this.sendBrowserFrame({
             type: "browser.session.ended",
             browserSessionId: frame.browserSessionId,
+            taskId: frame.taskId,
             agentId: frame.agentId,
             reason: "error"
           });
@@ -23099,17 +23110,33 @@ var HostClient = class _HostClient {
         return;
       }
       case "browser.close":
-        void this.opts.browser?.close(frame.agentId, "stopped").catch(() => {
+        void this.opts.browser?.close(frame.taskId, frame.agentId, frame.browserSessionId, "stopped").catch(() => {
         });
         return;
       case "browser.view":
-        void this.opts.browser?.setViewers(frame.agentId, frame.active, frame.viewerCount);
+        void this.opts.browser?.setViewers(
+          frame.taskId,
+          frame.agentId,
+          frame.browserSessionId,
+          frame.active,
+          frame.viewerCount
+        );
         return;
       case "browser.input":
-        void this.opts.browser?.applyInput(frame.agentId, frame.events);
+        void this.opts.browser?.applyInput(
+          frame.taskId,
+          frame.agentId,
+          frame.browserSessionId,
+          frame.events
+        );
         return;
       case "browser.command":
-        void this.opts.browser?.command(frame.agentId, frame.command);
+        void this.opts.browser?.command(
+          frame.taskId,
+          frame.agentId,
+          frame.browserSessionId,
+          frame.command
+        );
         return;
       case "browser.credential.result": {
         const waiter = this.browserCredentialWaiters.get(frame.requestId);
@@ -28512,7 +28539,7 @@ var BrowserManager = class {
    * open until a later trusted revision is successfully authorized.
    */
   deniedAuthorizations = /* @__PURE__ */ new Map();
-  /** Serializes open/close per teammate: one profile allows one live browser. */
+  /** Serializes profile lifecycle and session open/close per teammate. */
   locks = /* @__PURE__ */ new Map();
   events = null;
   profileRoot;
@@ -28562,9 +28589,9 @@ var BrowserManager = class {
     const first = await this.profileInventoryPages().next();
     return first.value ?? { agentIds: [], complete: true };
   }
-  sessionState(agentId) {
-    const session = this.sessions.get(agentId);
-    return session && !session.closed ? this.stateOf(session) : null;
+  sessionState(taskId, agentId) {
+    const session = this.sessions.get(taskId);
+    return session && !session.closed && (!agentId || session.agentId === agentId) ? this.stateOf(session) : null;
   }
   /** Serialized per agent so concurrent tool calls/frames can't double-launch. */
   withLock(agentId, work) {
@@ -28582,6 +28609,11 @@ var BrowserManager = class {
       throw new Error("invalid agent id for a browser profile path");
     }
   }
+  validateTaskId(taskId) {
+    if (!TaskId.safeParse(taskId).success) {
+      throw new Error("invalid task id for a browser session");
+    }
+  }
   exactChild(root, child) {
     const canonicalRoot = resolve7(root);
     const target = resolve7(canonicalRoot, child);
@@ -28694,13 +28726,14 @@ var BrowserManager = class {
     }
   }
   /**
-   * Ensure a live session for this teammate. An existing session is adopted
+   * Ensure a live session for this Task. An existing session is adopted
    * as-is (the cloud-minted id loses to the live one — the cloud reconciles
    * from the announced state). Missing Chromium surfaces as a thrown error
    * with the install remedy.
    */
-  ensure(agentId, browserSessionId) {
+  ensure(taskId, agentId, browserSessionId) {
     try {
+      this.validateTaskId(taskId);
       this.validateAgentId(agentId);
     } catch (error52) {
       return Promise.reject(error52);
@@ -28715,12 +28748,15 @@ var BrowserManager = class {
       if (lifecycle?.state === "purged") {
         throw new Error("this browser profile was retired and cannot be recreated locally");
       }
-      const existing = this.sessions.get(agentId);
+      const existing = this.sessions.get(taskId);
+      if (existing && existing.agentId !== agentId) {
+        throw new Error("browser session teammate does not match its Task");
+      }
       if (existing?.closeFailed) {
         throw new Error("the previous browser termination is not yet confirmed");
       }
       if (existing && !existing.closed) {
-        this.markActivity(agentId);
+        this.markActivity(taskId);
         return this.stateOf(existing);
       }
       await this.ensureOwnedDirectory(this.profileRoot);
@@ -28735,12 +28771,14 @@ var BrowserManager = class {
       }
       await mkdir6(profileDir, { recursive: true, mode: 448 });
       const adapter = await this.opts.factory.open({
+        taskId,
         agentId,
         profileDir,
         viewport: this.viewport
       });
       const session = {
         browserSessionId: browserSessionId ?? newId("brs"),
+        taskId,
         agentId,
         viewport: this.viewport,
         adapter,
@@ -28756,7 +28794,7 @@ var BrowserManager = class {
         closed: false,
         closeFailed: false
       };
-      this.sessions.set(agentId, session);
+      this.sessions.set(taskId, session);
       adapter.onStateChanged(() => {
         if (!session.closed) this.events?.state(this.stateOf(session));
       });
@@ -28766,17 +28804,23 @@ var BrowserManager = class {
     });
   }
   /** browser.open handler: ensure, then announce with the request correlation. */
-  async open(agentId, browserSessionId, _viewport, openRequestId, profileRevision) {
+  async open(taskId, agentId, browserSessionId, _viewport, openRequestId, profileRevision) {
     if (profileRevision !== void 0) await this.authorizeProfile(agentId, profileRevision);
-    const state = await this.ensure(agentId, browserSessionId);
+    const state = await this.ensure(taskId, agentId, browserSessionId);
     this.events?.state(state, openRequestId);
     return state;
   }
-  close(agentId, reason) {
-    return this.withLock(agentId, () => this.closeLocked(agentId, reason));
+  close(taskId, agentId, browserSessionId, reason) {
+    return this.withLock(
+      agentId,
+      () => this.closeLocked(taskId, reason, { agentId, browserSessionId })
+    );
   }
-  async closeLocked(agentId, reason) {
-    const session = this.sessions.get(agentId);
+  async closeLocked(taskId, reason, expected) {
+    const session = this.sessions.get(taskId);
+    if (expected && session && (session.agentId !== expected.agentId || session.browserSessionId !== expected.browserSessionId)) {
+      return;
+    }
     if (!session || session.closed && !session.closeFailed) return;
     session.closed = true;
     session.closeFailed = false;
@@ -28790,8 +28834,8 @@ var BrowserManager = class {
       session.closeFailed = true;
       throw error52;
     }
-    this.sessions.delete(agentId);
-    this.events?.ended(session.browserSessionId, agentId, reason);
+    this.sessions.delete(taskId);
+    this.events?.ended(session.browserSessionId, taskId, session.agentId, reason);
   }
   /** Persist retirement, close a live Chromium, then delete only this exact profile. */
   purge(agentId, purgeId, profileRevision) {
@@ -28811,22 +28855,25 @@ var BrowserManager = class {
         state: "purged",
         purgeId
       });
-      await this.closeLocked(agentId, "stopped");
+      const sessionTaskIds = [...this.sessions.values()].filter((session) => session.agentId === agentId).map((session) => session.taskId);
+      for (const taskId of sessionTaskIds) await this.closeLocked(taskId, "stopped");
       await rm6(this.profilePath(agentId), { recursive: true, force: true, maxRetries: 3 });
       await this.syncDirectory(this.profileRoot);
     });
   }
   async closeAll(reason) {
     await Promise.allSettled(
-      [...this.sessions.keys()].map((agentId) => this.close(agentId, reason))
+      [...this.sessions.values()].map(
+        (session) => this.close(session.taskId, session.agentId, session.browserSessionId, reason)
+      )
     );
   }
   /** Streaming is viewer-driven: no watcher, no capture cost. */
-  async setViewers(agentId, active, viewerCount) {
-    const session = this.sessions.get(agentId);
-    if (!session || session.closed) return;
+  async setViewers(taskId, agentId, browserSessionId, active, viewerCount) {
+    const session = this.exactSession(taskId, agentId, browserSessionId);
+    if (!session) return;
     session.viewerCount = active ? Math.max(1, viewerCount) : 0;
-    this.markActivity(agentId);
+    this.markActivity(taskId);
     if (session.viewerCount > 0) {
       await session.adapter.setFrameSink((frame) => this.enqueueFrame(session, frame));
       try {
@@ -28840,17 +28887,17 @@ var BrowserManager = class {
       session.pendingFrame = null;
     }
   }
-  applyInput(agentId, events) {
-    const session = this.sessions.get(agentId);
-    if (!session || session.closed) return Promise.resolve();
-    this.markActivity(agentId);
+  applyInput(taskId, agentId, browserSessionId, events) {
+    const session = this.exactSession(taskId, agentId, browserSessionId);
+    if (!session) return Promise.resolve();
+    this.markActivity(taskId);
     return this.enqueue(session, () => session.adapter.applyInput(events));
   }
   /** Chrome-level action from a human: tabs, reload, history, address bar. */
-  command(agentId, command) {
-    const session = this.sessions.get(agentId);
-    if (!session || session.closed) return Promise.resolve();
-    this.markActivity(agentId);
+  command(taskId, agentId, browserSessionId, command) {
+    const session = this.exactSession(taskId, agentId, browserSessionId);
+    if (!session) return Promise.resolve();
+    this.markActivity(taskId);
     const resizeGeneration = command.action === "resize" ? ++session.resizeGeneration : null;
     return this.enqueue(session, async () => {
       if (resizeGeneration !== null && resizeGeneration !== session.resizeGeneration) return;
@@ -28865,9 +28912,9 @@ var BrowserManager = class {
     });
   }
   /**
-   * One page, one queue. Everything that touches the live page goes through
-   * here in arrival order, including tool calls, so an agent action and a
-   * human's click cannot interleave halfway through each other.
+   * One Task session, one queue. Everything that touches its pages goes
+   * through here in arrival order, including tool calls, so an agent action
+   * and a human's click cannot interleave halfway through each other.
    */
   enqueue(session, work) {
     const next = session.inputQueue.then(work, work);
@@ -28876,11 +28923,11 @@ var BrowserManager = class {
     return next;
   }
   /** Tool surface: every call ensures the session and counts as activity. */
-  async tool(agentId) {
-    await this.ensure(agentId);
-    const session = this.sessions.get(agentId);
+  async tool(taskId, agentId) {
+    await this.ensure(taskId, agentId);
+    const session = this.sessions.get(taskId);
     if (!session || session.closed) throw new Error("browser session is not available");
-    const touch = () => this.markActivity(agentId);
+    const touch = () => this.markActivity(taskId);
     const queued = (work) => {
       touch();
       let result;
@@ -28917,6 +28964,7 @@ var BrowserManager = class {
     const page2 = session.adapter.state();
     return {
       browserSessionId: session.browserSessionId,
+      taskId: session.taskId,
       agentId: session.agentId,
       url: page2.url.slice(0, 2e3),
       title: page2.title.slice(0, 300),
@@ -28941,6 +28989,7 @@ var BrowserManager = class {
       session.lastFrameSentAt = Date.now();
       this.events?.frame({
         browserSessionId: session.browserSessionId,
+        taskId: session.taskId,
         agentId: session.agentId,
         frameSeq: session.frameSeq++,
         jpegBase64: pending.jpegBase64,
@@ -28950,8 +28999,12 @@ var BrowserManager = class {
     }, delay4);
     session.frameTimer.unref?.();
   }
-  markActivity(agentId) {
-    const session = this.sessions.get(agentId);
+  exactSession(taskId, agentId, browserSessionId) {
+    const session = this.sessions.get(taskId);
+    return session && !session.closed && session.agentId === agentId && session.browserSessionId === browserSessionId ? session : null;
+  }
+  markActivity(taskId) {
+    const session = this.sessions.get(taskId);
     if (!session || session.closed) return;
     this.armIdleTimer(session);
   }
@@ -28962,7 +29015,12 @@ var BrowserManager = class {
         this.armIdleTimer(session);
         return;
       }
-      void this.close(session.agentId, "idle_timeout").catch(() => {
+      void this.close(
+        session.taskId,
+        session.agentId,
+        session.browserSessionId,
+        "idle_timeout"
+      ).catch(() => {
       });
     }, this.idleTimeoutMs);
     session.idleTimer.unref?.();
@@ -28982,6 +29040,49 @@ async function loadPlaywright() {
 var KEY_ALIASES = { " ": "Space" };
 function createPlaywrightBrowserAdapterFactory(dependencies = {}) {
   const load = dependencies.loadPlaywright ?? loadPlaywright;
+  const runtimes = /* @__PURE__ */ new Map();
+  const runtimeLocks = /* @__PURE__ */ new Map();
+  const withRuntimeLock = (profileDir, work) => {
+    const tail = runtimeLocks.get(profileDir) ?? Promise.resolve();
+    const next = tail.then(work, work);
+    runtimeLocks.set(
+      profileDir,
+      next.catch(() => {
+      })
+    );
+    return next;
+  };
+  const acquireRuntime = (profileDir, viewport) => withRuntimeLock(profileDir, async () => {
+    let runtime = runtimes.get(profileDir);
+    if (!runtime) {
+      const playwright = await load();
+      const context = await playwright.chromium.launchPersistentContext(profileDir, {
+        headless: true,
+        // Use the full Chromium build so real sign-in pages see an ordinary
+        // browser shape rather than the headless-shell fingerprint.
+        channel: "chromium",
+        viewport,
+        args: ["--disable-blink-features=AutomationControlled"]
+      });
+      await Promise.all(context.pages().map((page2) => page2.close()));
+      runtime = { context, references: 0 };
+      runtimes.set(profileDir, runtime);
+    }
+    runtime.references += 1;
+    return runtime;
+  });
+  const releaseRuntime = (profileDir, runtime) => withRuntimeLock(profileDir, async () => {
+    if (runtimes.get(profileDir) !== runtime || runtime.references <= 0) return;
+    runtime.references -= 1;
+    if (runtime.references > 0) return;
+    try {
+      await runtime.context.close();
+      runtimes.delete(profileDir);
+    } catch (error52) {
+      runtime.references = 1;
+      throw error52;
+    }
+  });
   return {
     kind: "playwright",
     async capability() {
@@ -28996,28 +29097,8 @@ function createPlaywrightBrowserAdapterFactory(dependencies = {}) {
       }
     },
     async open({ profileDir, viewport }) {
-      const playwright = await load();
-      const context = await playwright.chromium.launchPersistentContext(profileDir, {
-        headless: true,
-        // Without a channel, Playwright resolves `headless: true` to its
-        // `chromium_headless_shell` build — a stripped binary missing pieces
-        // a browser is expected to have (no `window.chrome`, no plugins, a
-        // single-entry `navigator.languages`). Google Accounts reads that
-        // shape as "this browser or app may not be secure" and refuses the
-        // sign-in outright, which made every site behind a Google login a
-        // dead end for the person watching the panel. `chromium` selects the
-        // full browser this adapter's capability probe already checks for
-        // (`executablePath()` resolves to it), so the two now agree.
-        channel: "chromium",
-        viewport,
-        // Headless Chromium announces itself in two ways that bot protection
-        // reads as "not a person": `HeadlessChrome` in the user agent, and
-        // `navigator.webdriver`. This is a real Chrome rendering a real page
-        // for a real person watching it, so neither claim is informative —
-        // sites that act on them simply refuse to load. The user agent is
-        // corrected below, once the browser can tell us its own version.
-        args: ["--disable-blink-features=AutomationControlled"]
-      });
+      const runtime = await acquireRuntime(profileDir, viewport);
+      const context = runtime.context;
       let liveViewport = { ...viewport };
       const tabs = [];
       let activeTabId = null;
@@ -29175,6 +29256,13 @@ function createPlaywrightBrowserAdapterFactory(dependencies = {}) {
         });
         page2.on("domcontentloaded", () => settle4(tab.navigation));
         page2.on("load", () => settle4(tab.navigation));
+        page2.on("popup", (popup) => {
+          void adopt(popup).then(async (created) => {
+            activeTabId = created.tabId;
+            await syncScreencast();
+            emit();
+          });
+        });
         page2.on("close", () => {
           if (tab.loadingTimer) clearTimeout(tab.loadingTimer);
           tab.loadingTimer = null;
@@ -29195,16 +29283,15 @@ function createPlaywrightBrowserAdapterFactory(dependencies = {}) {
         });
         return tab;
       };
-      for (const page2 of context.pages()) await adopt(page2);
-      if (tabs.length === 0) await adopt(await context.newPage());
-      activeTabId = tabs[0].tabId;
-      context.on("page", (popup) => {
-        void adopt(popup).then(async (created) => {
-          activeTabId = created.tabId;
-          await syncScreencast();
-          emit();
+      try {
+        await adopt(await context.newPage());
+      } catch (error52) {
+        closed = true;
+        await releaseRuntime(profileDir, runtime).catch(() => {
         });
-      });
+        throw error52;
+      }
+      activeTabId = tabs[0].tabId;
       for (const tab of tabs) {
         tab.loading = false;
         await refreshTitle(tab);
@@ -29502,8 +29589,11 @@ function createPlaywrightBrowserAdapterFactory(dependencies = {}) {
         },
         async close() {
           closed = true;
-          for (const tab of tabs) await detachSession(tab);
-          await context.close();
+          for (const tab of [...tabs]) {
+            await detachSession(tab);
+            if (!tab.page.isClosed()) await tab.page.close();
+          }
+          await releaseRuntime(profileDir, runtime);
         }
       };
     }
@@ -29680,7 +29770,7 @@ function externalPage(page2, data, truncated = false) {
 var asString = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
 var asNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : void 0;
 function createBrowserToolPack(deps) {
-  const { manager, agentId } = deps;
+  const { manager, taskId, agentId } = deps;
   let detached = false;
   const guard = () => {
     if (detached) return "this run has ended; the browser tool is detached";
@@ -29691,7 +29781,7 @@ function createBrowserToolPack(deps) {
     const refused = guard();
     if (refused) return { ok: false, error: refused };
     try {
-      const tool = await manager.tool(agentId);
+      const tool = await manager.tool(taskId, agentId);
       switch (name) {
         case "browser_navigate": {
           const url3 = asString(args["url"]);
@@ -37943,6 +38033,7 @@ function createCliRunner(adapter, opts = {}) {
         toolPacks.push(
           createBrowserToolPack({
             manager: opts.browserManager,
+            taskId: task.taskId,
             agentId: task.agentId,
             authoritySignal: task.authoritySignal,
             cancelledNow: task.cancelledNow,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.97",
+  "version": "0.0.98",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",