@mearl/native-host 2.5.0 → 2.6.0

package/dist/agentbay-browser.d.ts

@@ -9,7 +9,11 @@ export interface AgentBayBrowserRecord extends DaemonRecord {
     name: string;
     sessionId: string;
     imageId?: string;
-    accessUrl?: string;
+    persistent?: boolean;
+    contextId?: string;
+    contextName?: string;
+    /** Successful context sync checkpoint for retrying deletion of the current session. */
+    contextSyncedAt?: string;
     createdAt: string;
     copiedCookies?: {
         domains: string[];
@@ -18,11 +22,25 @@ export interface AgentBayBrowserRecord extends DaemonRecord {
 }
 export interface AgentBaySessionLike {
     sessionId: string;
-    resourceUrl?: string;
     browser: {
         initializeAsync(options: Record<string, unknown>): Promise<boolean>;
         getEndpointUrl(): Promise<string>;
     };
+    info?(): Promise<{
+        success?: boolean;
+        data?: unknown;
+        errorMessage?: string;
+    }>;
+    callMcpTool?(toolName: string, args: Record<string, unknown>, autoGenSession?: boolean): Promise<{
+        success?: boolean;
+        errorMessage?: string;
+    }>;
+    context?: {
+        sync(): Promise<{
+            success: boolean;
+            errorMessage?: string;
+        }>;
+    };
     delete(syncContext?: boolean): Promise<{
         success: boolean;
         errorMessage?: string;
@@ -43,16 +61,34 @@ export interface AgentBayClientLike {
         session?: AgentBaySessionLike;
         errorMessage?: string;
     }>;
+    context?: {
+        get(name: string, create?: boolean): Promise<{
+            success: boolean;
+            context?: {
+                id: string;
+                name: string;
+            };
+            errorMessage?: string;
+        }>;
+        delete(context: {
+            id: string;
+            name: string;
+        }): Promise<{
+            success: boolean;
+            errorMessage?: string;
+        }>;
+    };
 }
 export interface AgentBayBrowserSummary {
     browserId: string;
     name: string;
     provider: 'agentbay';
     headless: false;
-    persistent: false;
+    persistent: boolean;
     agentbaySessionId: string;
     agentbayImageId?: string;
-    agentbayAccessUrl?: string;
+    agentbayContextId?: string;
+    agentbayContextName?: string;
     createdAt: string;
     copiedCookies?: AgentBayBrowserRecord['copiedCookies'];
     running: boolean;
@@ -79,13 +115,25 @@ interface AgentBayBrowserSessionInitOptions {
 export declare function agentBayBrowserId(name: string): string;
 export declare function resolveAgentBayApiKey(): string;
 export declare function resolveAgentBayImageId(value: unknown): string;
+export declare function agentBayContextName(browserId: string): string;
 export declare function normalizeDesktopUserAgent(value: unknown): string;
 export declare function normalizeAgentBayAccessUrl(value: unknown): string | undefined;
 export declare function hasAgentBayBrowser(selector: string): boolean;
 export declare function listAgentBayBrowsers(): AgentBayBrowserSummary[];
+export declare function getAgentBayAccessUrl(sessionId: string, dependencies?: Pick<AgentBayBrowserManagerDeps, 'createAgentBayClient' | 'resolveApiKey'>): Promise<string>;
 export declare function resolveAgentBayEndpoint(sessionId: string): Promise<string>;
 export declare function keepAgentBaySessionAlive(sessionId: string): Promise<void>;
 export declare function initializeAgentBayBrowserSession(session: Pick<AgentBaySessionLike, 'browser'>, input: Pick<BrowserLaunchParams, 'url'>, cookies: TransferableCookie[], options?: AgentBayBrowserSessionInitOptions): Promise<number>;
 export declare function launchAgentBayBrowser(input: BrowserLaunchParams, deps: AgentBayBrowserManagerDeps): Promise<AgentBayBrowserSummary>;
-export declare function closeAgentBayBrowser(selector: string): Promise<Record<string, any>>;
+export declare function releaseAgentBayBrowserResources(record: AgentBayBrowserRecord, agentBay: AgentBayClientLike, options?: {
+    deleteProfile?: boolean;
+    persistRecord?: (record: AgentBayBrowserRecord) => void;
+}): Promise<{
+    sessionDeleted: boolean;
+    contextSynced?: boolean;
+    contextDeleted?: boolean;
+}>;
+export declare function closeAgentBayBrowser(selector: string, options?: {
+    deleteProfile?: boolean;
+}): Promise<Record<string, any>>;
 export {};

package/dist/index.js

@@ -4795,7 +4795,15 @@ async function discoverTargets(port = 9222) {
   });
 }
 async function isCdpAvailable(port = 9222, userDataDir) {
-  if (readDevToolsActivePort(userDataDir) !== null) return true;
+  const activePort = readDevToolsActivePort(userDataDir)?.port;
+  if (activePort !== void 0) {
+    try {
+      await discoverTargets(activePort);
+      return true;
+    } catch {
+      if (activePort === port) return false;
+    }
+  }
   try {
     await discoverTargets(port);
     return true;
@@ -9574,9 +9582,6 @@ function validateAgentBayInput(input) {
   if (input.headless === true) {
     throw new Error("headless=true is not supported by the AgentBay browser provider");
   }
-  if (input.persistent === true) {
-    throw new Error("persistent is not supported by the AgentBay CDP provider yet");
-  }
   if (input.executablePath) {
     throw new Error("executablePath is only supported by the local browser provider");
   }
@@ -9592,6 +9597,9 @@ function resolveAgentBayImageId(value) {
   }
   return imageId;
 }
+function agentBayContextName(browserId) {
+  return `mearl-browser-${hashKey(browserId)}`;
+}
 function normalizeDesktopUserAgent(value) {
   const userAgent = typeof value === "string" ? value.trim() : "";
   if (!userAgent) throw new Error("Could not determine the control browser user agent");
@@ -9608,16 +9616,16 @@ function normalizeAgentBayAccessUrl(value) {
   }
 }
 function browserSummary2(record2, running) {
-  const accessUrl = normalizeAgentBayAccessUrl(record2.accessUrl);
   return {
     browserId: record2.browserId,
     name: record2.name,
     provider: "agentbay",
     headless: false,
-    persistent: false,
+    persistent: record2.persistent === true,
     agentbaySessionId: record2.sessionId,
     ...record2.imageId ? { agentbayImageId: record2.imageId } : {},
-    ...accessUrl ? { agentbayAccessUrl: accessUrl } : {},
+    ...record2.contextId ? { agentbayContextId: record2.contextId } : {},
+    ...record2.contextName ? { agentbayContextName: record2.contextName } : {},
     createdAt: record2.createdAt,
     ...record2.copiedCookies ? { copiedCookies: record2.copiedCookies } : {},
     running
@@ -9626,11 +9634,13 @@ function browserSummary2(record2, running) {
 function listRecords2() {
   const records = [];
   for (const file2 of listRecordFiles(keyedDir(AGENTBAY_BROWSERS_SUBDIR))) {
-    const record2 = readRecord(file2);
-    if (!record2) {
+    const stored = readRecord(file2);
+    if (!stored) {
       removeRecord(file2);
       continue;
     }
+    const { accessUrl: legacyAccessUrl, ...record2 } = stored;
+    if (legacyAccessUrl !== void 0) writeRecord(file2, record2);
     const running = isManagedProcess(record2.pid, `--browser-id ${record2.browserId}`);
     if (!running) removeRecord(keyedConfigFile("browsers", record2.browserId));
     records.push({ record: record2, running });
@@ -9651,12 +9661,46 @@ function listAgentBayBrowsers() {
 }
 async function requireSession(sessionId, apiKey) {
   const agentBay = await createClient(apiKey);
+  return requireSessionFromClient(agentBay, sessionId);
+}
+async function requireSessionFromClient(agentBay, sessionId) {
   const result = await agentBay.get(sessionId);
   if (!result.success || !result.session) {
     throw new Error(result.errorMessage || `AgentBay session not found: ${sessionId}`);
   }
   return result.session;
 }
+async function getAgentBayAccessUrl(sessionId, dependencies = {}) {
+  const apiKey = (dependencies.resolveApiKey ?? resolveAgentBayApiKey)();
+  const agentBay = dependencies.createAgentBayClient ? await dependencies.createAgentBayClient(apiKey) : await createClient(apiKey);
+  const session = await requireSessionFromClient(agentBay, sessionId);
+  if (!session.info) {
+    throw new Error("The installed AgentBay SDK does not support live session information");
+  }
+  const result = await session.info();
+  if (result.success === false) {
+    throw new Error(result.errorMessage || `AgentBay session info failed: ${sessionId}`);
+  }
+  const data = result.data && typeof result.data === "object" ? result.data : null;
+  const accessUrl = normalizeAgentBayAccessUrl(
+    data && "resourceUrl" in data ? data.resourceUrl : void 0
+  );
+  if (!accessUrl) {
+    throw new Error(`AgentBay session did not return a browser access URL: ${sessionId}`);
+  }
+  return accessUrl;
+}
+async function resolvePersistentContext(agentBay, browserId) {
+  if (!agentBay.context) {
+    throw new Error("The installed AgentBay SDK does not support persistent browser contexts");
+  }
+  const name = agentBayContextName(browserId);
+  const result = await agentBay.context.get(name, true);
+  if (!result.success || !result.context?.id) {
+    throw new Error(result.errorMessage || `Failed to create AgentBay browser context: ${name}`);
+  }
+  return { id: result.context.id, name: result.context.name || name };
+}
 async function resolveAgentBayEndpoint(sessionId) {
   const apiKey = resolveAgentBayApiKey();
   const { AgentBay, GetCdpLinkRequest } = await loadSdk();
@@ -9702,12 +9746,14 @@ async function launchAgentBayBrowser(input, deps) {
   const browserId = agentBayBrowserId(name);
   validateAgentBayInput(input);
   const imageId = resolveAgentBayImageId(input.imageId);
+  const persistent = input.persistent === true;
   const userAgentMode = resolveUserAgentMode(input.userAgentMode);
   const copyCookieDomains = input.copyCookieDomains === void 0 ? [] : normalizeCookieDomains(input.copyCookieDomains);
   const apiKey = (deps.resolveApiKey ?? resolveAgentBayApiKey)();
   const releaseLock = acquireLaunchLock(browserId);
   const persistBrowserRecord = deps.persistBrowserRecord ?? ((record2) => writeRecord(keyedConfigFile(AGENTBAY_BROWSERS_SUBDIR, record2.browserId), record2));
   let session = null;
+  let context;
   let hostPid = 0;
   let recordWritten = false;
   try {
@@ -9717,7 +9763,18 @@ async function launchAgentBayBrowser(input, deps) {
       userAgentMode === "desktop" ? deps.getBrowserUserAgent().then(normalizeDesktopUserAgent) : Promise.resolve(void 0)
     ]);
     const agentBay = await (deps.createAgentBayClient ?? createClient)(apiKey);
-    const created = await agentBay.create({ imageId, framework: "mearl" });
+    context = persistent ? await resolvePersistentContext(agentBay, browserId) : void 0;
+    const created = await agentBay.create({
+      imageId,
+      framework: "mearl",
+      ...context ? {
+        browserContext: {
+          contextId: context.id,
+          autoUpload: true,
+          syncMode: "standard"
+        }
+      } : {}
+    });
     if (!created.success || !created.session) {
       throw new Error(created.errorMessage || "AgentBay session creation failed");
     }
@@ -9750,14 +9807,14 @@ async function launchAgentBayBrowser(input, deps) {
     hostPid = host.pid ?? 0;
     if (!hostPid) throw new Error("AgentBay native host launched without a process id");
     host.unref();
-    const accessUrl = normalizeAgentBayAccessUrl(session.resourceUrl);
     const record2 = {
       pid: hostPid,
       browserId,
       name,
       sessionId: session.sessionId,
       imageId,
-      ...accessUrl ? { accessUrl } : {},
+      persistent,
+      ...context ? { contextId: context.id, contextName: context.name } : {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...copyCookieDomains.length > 0 ? { copiedCookies: { domains: copyCookieDomains, count: copiedCookieCount } } : {}
     };
@@ -9783,14 +9840,14 @@ async function launchAgentBayBrowser(input, deps) {
         cleanupError = deleteError;
       }
       if (cleanupError) {
-        const accessUrl = normalizeAgentBayAccessUrl(session.resourceUrl);
         const recoveryRecord = {
           pid: hostPid,
           browserId,
           name,
           sessionId: session.sessionId,
           imageId,
-          ...accessUrl ? { accessUrl } : {},
+          persistent,
+          ...context ? { contextId: context.id, contextName: context.name } : {},
           createdAt: (/* @__PURE__ */ new Date()).toISOString()
         };
         let recoverySaved = false;
@@ -9827,16 +9884,72 @@ function isMissingSessionError(error48) {
   const message = error48 instanceof Error ? error48.message : String(error48);
   return /not[ -]?found|does not exist|already deleted|invalid session/i.test(message);
 }
-async function closeAgentBayBrowser(selector) {
-  const record2 = findRecord(selector);
-  if (!record2) throw new Error(`AgentBay browser not found: ${selector}`);
+async function releaseAgentBayBrowserResources(record2, agentBay, options = {}) {
+  const deleteContext = record2.persistent === true && options.deleteProfile === true;
+  const syncContext = record2.persistent === true && !deleteContext;
+  let contextSynced = Boolean(record2.contextSyncedAt);
+  let session;
   try {
-    const session = await requireSession(record2.sessionId, resolveAgentBayApiKey());
-    const result = await session.delete(false);
-    if (!result.success) throw new Error(result.errorMessage || "AgentBay session deletion failed");
+    session = await requireSessionFromClient(agentBay, record2.sessionId);
   } catch (error48) {
     if (!isMissingSessionError(error48)) throw error48;
   }
+  if (session) {
+    if (syncContext && !contextSynced) {
+      if (!session.callMcpTool) {
+        throw new Error("The installed AgentBay SDK cannot stop the browser before context sync");
+      }
+      const stopped = await session.callMcpTool("stopChrome", {}, false);
+      if (stopped.success === false) {
+        throw new Error(stopped.errorMessage || "AgentBay browser shutdown failed");
+      }
+      if (!session.context) {
+        throw new Error("The installed AgentBay SDK cannot synchronize browser context state");
+      }
+      const synced = await session.context.sync();
+      if (!synced.success) {
+        throw new Error(synced.errorMessage || "AgentBay browser context sync failed");
+      }
+      contextSynced = true;
+      record2.contextSyncedAt = (/* @__PURE__ */ new Date()).toISOString();
+      options.persistRecord?.(record2);
+    }
+    try {
+      const result = await session.delete(false);
+      if (!result.success) {
+        throw new Error(result.errorMessage || "AgentBay session deletion failed");
+      }
+    } catch (error48) {
+      if (!isMissingSessionError(error48)) throw error48;
+    }
+  }
+  if (deleteContext) {
+    if (!record2.contextId || !record2.contextName || !agentBay.context) {
+      throw new Error("AgentBay browser context metadata is unavailable for profile deletion");
+    }
+    const result = await agentBay.context.delete({
+      id: record2.contextId,
+      name: record2.contextName
+    });
+    if (!result.success) throw new Error(result.errorMessage || "AgentBay context deletion failed");
+  }
+  return {
+    sessionDeleted: true,
+    ...syncContext ? { contextSynced } : {},
+    ...deleteContext ? { contextDeleted: true } : {}
+  };
+}
+async function closeAgentBayBrowser(selector, options = {}) {
+  const record2 = findRecord(selector);
+  if (!record2) throw new Error(`AgentBay browser not found: ${selector}`);
+  const agentBay = await createClient(resolveAgentBayApiKey());
+  const released = await releaseAgentBayBrowserResources(record2, agentBay, {
+    ...options,
+    persistRecord: (updatedRecord) => writeRecord(
+      keyedConfigFile(AGENTBAY_BROWSERS_SUBDIR, updatedRecord.browserId),
+      updatedRecord
+    )
+  });
   const closingOwnHost = record2.pid === process.pid;
   if (!closingOwnHost) await stopProcess(record2.pid, `--browser-id ${record2.browserId}`);
   removeRecord(keyedConfigFile(AGENTBAY_BROWSERS_SUBDIR, record2.browserId));
@@ -9849,7 +9962,8 @@ async function closeAgentBayBrowser(selector) {
     browserId: record2.browserId,
     provider: "agentbay",
     closed: true,
-    sessionDeleted: true
+    ...released,
+    ...record2.persistent === true ? { profileDeleted: options.deleteProfile === true } : { profileDeleted: true }
   };
 }
 
@@ -10006,7 +10120,8 @@ function mergeBrowserInventory(connected, managed) {
       ..."cdpPort" in managedBrowser ? { cdpPort: managedBrowser.cdpPort } : {},
       ..."agentbaySessionId" in managedBrowser ? { agentbaySessionId: managedBrowser.agentbaySessionId } : {},
       ..."agentbayImageId" in managedBrowser && managedBrowser.agentbayImageId ? { agentbayImageId: managedBrowser.agentbayImageId } : {},
-      ..."agentbayAccessUrl" in managedBrowser && managedBrowser.agentbayAccessUrl ? { agentbayAccessUrl: managedBrowser.agentbayAccessUrl } : {},
+      ..."agentbayContextId" in managedBrowser && managedBrowser.agentbayContextId ? { agentbayContextId: managedBrowser.agentbayContextId } : {},
+      ..."agentbayContextName" in managedBrowser && managedBrowser.agentbayContextName ? { agentbayContextName: managedBrowser.agentbayContextName } : {},
       createdAt: managedBrowser.createdAt,
       ..."account" in managedBrowser ? { account: managedBrowser.account } : {},
       ..."copiedCookies" in managedBrowser ? { copiedCookies: managedBrowser.copiedCookies } : {}
@@ -10023,7 +10138,8 @@ function mergeBrowserInventory(connected, managed) {
     ..."cdpPort" in browser ? { cdpPort: browser.cdpPort } : {},
     ..."agentbaySessionId" in browser ? { agentbaySessionId: browser.agentbaySessionId } : {},
     ..."agentbayImageId" in browser && browser.agentbayImageId ? { agentbayImageId: browser.agentbayImageId } : {},
-    ..."agentbayAccessUrl" in browser && browser.agentbayAccessUrl ? { agentbayAccessUrl: browser.agentbayAccessUrl } : {},
+    ..."agentbayContextId" in browser && browser.agentbayContextId ? { agentbayContextId: browser.agentbayContextId } : {},
+    ..."agentbayContextName" in browser && browser.agentbayContextName ? { agentbayContextName: browser.agentbayContextName } : {},
     createdAt: browser.createdAt,
     ..."account" in browser ? { account: browser.account } : {},
     ..."copiedCookies" in browser ? { copiedCookies: browser.copiedCookies } : {}
@@ -10047,7 +10163,7 @@ import os2 from "node:os";
 import { randomUUID as randomUUID4 } from "node:crypto";
 
 // src/version.ts
-var NATIVE_HOST_VERSION = true ? "2.5.0" : "unknown";
+var NATIVE_HOST_VERSION = true ? "2.6.0" : "unknown";
 
 // src/analytics.ts
 var MEASUREMENT_ID = "G-W84LJDZ6PH";
@@ -30701,6 +30817,7 @@ var nativeMessageBuffer = Buffer.alloc(0);
 var socketServer = null;
 var legacyServer = null;
 var inventoryExitTimer = null;
+var cdpRegistrationTimer = null;
 function scheduleInventoryExit() {
   if (inventoryExitTimer) clearTimeout(inventoryExitTimer);
   inventoryExitTimer = setTimeout(() => cleanupAndExit(0), INVENTORY_IDLE_EXIT_MS);
@@ -31010,6 +31127,24 @@ async function handleSocketLine(socket, line) {
     socket.write(JSON.stringify({ id, success: true, data: versions }) + "\n");
     return;
   }
+  if (action === "get_agentbay_access_url") {
+    try {
+      if (!AGENTBAY_SESSION_ID) {
+        throw new Error("The selected browser is not an AgentBay browser");
+      }
+      const agentbayAccessUrl = await getAgentBayAccessUrl(AGENTBAY_SESSION_ID);
+      socket.write(JSON.stringify({ id, success: true, data: { agentbayAccessUrl } }) + "\n");
+    } catch (error48) {
+      socket.write(
+        JSON.stringify({
+          id,
+          success: false,
+          error: error48 instanceof Error ? error48.message : String(error48)
+        }) + "\n"
+      );
+    }
+    return;
+  }
   if (isInternalExtensionAction(action)) {
     socket.write(
       JSON.stringify({ id, success: false, error: "Internal action is not available to clients" }) + "\n"
@@ -31037,7 +31172,7 @@ async function handleSocketLine(socket, line) {
           `Managed browser name is ambiguous: ${selector}. Use the full browserId from browser_list.`
         );
       }
-      const result = agentBayExists ? await closeAgentBayBrowser(selector) : await closeManagedBrowser(selector, { deleteProfile: data?.deleteProfile });
+      const result = agentBayExists ? await closeAgentBayBrowser(selector, { deleteProfile: data?.deleteProfile }) : await closeManagedBrowser(selector, { deleteProfile: data?.deleteProfile });
       socket.write(JSON.stringify({ id, success: true, data: result }) + "\n");
     } catch (error48) {
       socket.write(
@@ -31405,6 +31540,10 @@ function cleanupAndExit(code) {
     clearTimeout(inventoryExitTimer);
     inventoryExitTimer = null;
   }
+  if (cdpRegistrationTimer) {
+    clearInterval(cdpRegistrationTimer);
+    cdpRegistrationTimer = null;
+  }
   cdpSession?.close();
   agentChatManager?.dispose();
   agentChatManager = null;
@@ -31426,6 +31565,47 @@ function restartAfterUpdate() {
   forcedExit.unref();
   cleanupAndExit(0);
 }
+async function isDaemonBrowserAvailable() {
+  if (AGENTBAY_SESSION_ID) {
+    return getCdpSession().getBrowserClient().then(
+      () => true,
+      () => false
+    );
+  }
+  return isCdpAvailable(CDP_PORT, CDP_USER_DATA_DIR);
+}
+async function monitorDaemonBrowser() {
+  let published = false;
+  let checking = false;
+  const refresh = async () => {
+    if (checking) return;
+    checking = true;
+    try {
+      const available = await isDaemonBrowserAvailable();
+      if (available && !published) {
+        registerBrowser({
+          browserId: CDP_BROWSER_ID,
+          socketPath: INSTANCE_SOCKET_PATH,
+          browserName: CDP_BROWSER_NAME,
+          nativeHostVersion: NATIVE_HOST_VERSION,
+          transport: "cdp",
+          lastFocusedAt: CDP_BROWSER_ID.startsWith("managed:") ? 0 : void 0
+        });
+        published = true;
+      } else if (!available && published) {
+        unregisterBrowser();
+        published = false;
+      }
+    } finally {
+      checking = false;
+    }
+  };
+  await refresh();
+  cdpRegistrationTimer = setInterval(() => {
+    void refresh();
+  }, 2e3);
+  cdpRegistrationTimer.unref();
+}
 async function main() {
   initBrowserRegistry({ log });
   pruneDeadBrowsers();
@@ -31447,14 +31627,7 @@ async function main() {
     return;
   }
   if (isDaemonMode && !skipBrowserRegistration) {
-    registerBrowser({
-      browserId: CDP_BROWSER_ID,
-      socketPath: INSTANCE_SOCKET_PATH,
-      browserName: CDP_BROWSER_NAME,
-      nativeHostVersion: NATIVE_HOST_VERSION,
-      transport: "cdp",
-      lastFocusedAt: CDP_BROWSER_ID.startsWith("managed:") ? 0 : void 0
-    });
+    await monitorDaemonBrowser();
   }
   if (AGENTBAY_SESSION_ID) {
     const keepAliveTimer = setInterval(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/native-host",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Native Messaging Host for Mearl — bridges Chrome Extension and local socket server",
   "type": "module",
   "main": "dist/install.js",
@@ -37,9 +37,9 @@
     "@types/ws": "^8.18.1",
     "esbuild": "^0.25.2",
     "typescript": "^5.8.3",
-    "@mearl/browser-core": "2.5.0",
-    "@mearl/daemon-core": "2.5.0",
-    "@mearl/setup": "2.5.0"
+    "@mearl/browser-core": "2.6.0",
+    "@mearl/daemon-core": "2.6.0",
+    "@mearl/setup": "2.6.0"
   },
   "scripts": {
     "build": "rm -rf dist/ && node build.mjs",