@mearl/native-host 2.5.1 → 2.6.0

package/dist/agentbay-browser.d.ts

@@ -14,7 +14,6 @@ export interface AgentBayBrowserRecord extends DaemonRecord {
     contextName?: string;
     /** Successful context sync checkpoint for retrying deletion of the current session. */
     contextSyncedAt?: string;
-    accessUrl?: string;
     createdAt: string;
     copiedCookies?: {
         domains: string[];
@@ -23,11 +22,15 @@ 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;
@@ -86,7 +89,6 @@ export interface AgentBayBrowserSummary {
     agentbayImageId?: string;
     agentbayContextId?: string;
     agentbayContextName?: string;
-    agentbayAccessUrl?: string;
     createdAt: string;
     copiedCookies?: AgentBayBrowserRecord['copiedCookies'];
     running: boolean;
@@ -118,6 +120,7 @@ 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>;

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;
@@ -9608,7 +9616,6 @@ function normalizeAgentBayAccessUrl(value) {
   }
 }
 function browserSummary2(record2, running) {
-  const accessUrl = normalizeAgentBayAccessUrl(record2.accessUrl);
   return {
     browserId: record2.browserId,
     name: record2.name,
@@ -9619,7 +9626,6 @@ function browserSummary2(record2, running) {
     ...record2.imageId ? { agentbayImageId: record2.imageId } : {},
     ...record2.contextId ? { agentbayContextId: record2.contextId } : {},
     ...record2.contextName ? { agentbayContextName: record2.contextName } : {},
-    ...accessUrl ? { agentbayAccessUrl: accessUrl } : {},
     createdAt: record2.createdAt,
     ...record2.copiedCookies ? { copiedCookies: record2.copiedCookies } : {},
     running
@@ -9628,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 });
@@ -9662,6 +9670,26 @@ async function requireSessionFromClient(agentBay, 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");
@@ -9779,7 +9807,6 @@ 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,
@@ -9788,7 +9815,6 @@ async function launchAgentBayBrowser(input, deps) {
       imageId,
       persistent,
       ...context ? { contextId: context.id, contextName: context.name } : {},
-      ...accessUrl ? { accessUrl } : {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...copyCookieDomains.length > 0 ? { copiedCookies: { domains: copyCookieDomains, count: copiedCookieCount } } : {}
     };
@@ -9814,7 +9840,6 @@ async function launchAgentBayBrowser(input, deps) {
         cleanupError = deleteError;
       }
       if (cleanupError) {
-        const accessUrl = normalizeAgentBayAccessUrl(session.resourceUrl);
         const recoveryRecord = {
           pid: hostPid,
           browserId,
@@ -9823,7 +9848,6 @@ async function launchAgentBayBrowser(input, deps) {
           imageId,
           persistent,
           ...context ? { contextId: context.id, contextName: context.name } : {},
-          ...accessUrl ? { accessUrl } : {},
           createdAt: (/* @__PURE__ */ new Date()).toISOString()
         };
         let recoverySaved = false;
@@ -10098,7 +10122,6 @@ function mergeBrowserInventory(connected, managed) {
       ..."agentbayImageId" in managedBrowser && managedBrowser.agentbayImageId ? { agentbayImageId: managedBrowser.agentbayImageId } : {},
       ..."agentbayContextId" in managedBrowser && managedBrowser.agentbayContextId ? { agentbayContextId: managedBrowser.agentbayContextId } : {},
       ..."agentbayContextName" in managedBrowser && managedBrowser.agentbayContextName ? { agentbayContextName: managedBrowser.agentbayContextName } : {},
-      ..."agentbayAccessUrl" in managedBrowser && managedBrowser.agentbayAccessUrl ? { agentbayAccessUrl: managedBrowser.agentbayAccessUrl } : {},
       createdAt: managedBrowser.createdAt,
       ..."account" in managedBrowser ? { account: managedBrowser.account } : {},
       ..."copiedCookies" in managedBrowser ? { copiedCookies: managedBrowser.copiedCookies } : {}
@@ -10117,7 +10140,6 @@ function mergeBrowserInventory(connected, managed) {
     ..."agentbayImageId" in browser && browser.agentbayImageId ? { agentbayImageId: browser.agentbayImageId } : {},
     ..."agentbayContextId" in browser && browser.agentbayContextId ? { agentbayContextId: browser.agentbayContextId } : {},
     ..."agentbayContextName" in browser && browser.agentbayContextName ? { agentbayContextName: browser.agentbayContextName } : {},
-    ..."agentbayAccessUrl" in browser && browser.agentbayAccessUrl ? { agentbayAccessUrl: browser.agentbayAccessUrl } : {},
     createdAt: browser.createdAt,
     ..."account" in browser ? { account: browser.account } : {},
     ..."copiedCookies" in browser ? { copiedCookies: browser.copiedCookies } : {}
@@ -10141,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.1" : "unknown";
+var NATIVE_HOST_VERSION = true ? "2.6.0" : "unknown";
 
 // src/analytics.ts
 var MEASUREMENT_ID = "G-W84LJDZ6PH";
@@ -30795,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);
@@ -31104,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"
@@ -31499,6 +31540,10 @@ function cleanupAndExit(code) {
     clearTimeout(inventoryExitTimer);
     inventoryExitTimer = null;
   }
+  if (cdpRegistrationTimer) {
+    clearInterval(cdpRegistrationTimer);
+    cdpRegistrationTimer = null;
+  }
   cdpSession?.close();
   agentChatManager?.dispose();
   agentChatManager = null;
@@ -31520,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();
@@ -31541,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.1",
+  "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.1",
-    "@mearl/daemon-core": "2.5.1",
-    "@mearl/setup": "2.5.1"
+    "@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",