opendevbrowser 0.0.25 → 0.0.26

package/dist/opendevbrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuClD,QAAA,MAAM,oBAAoB,EAAE,MAsQ3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA8ClD,QAAA,MAAM,oBAAoB,EAAE,MAmW3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/dist/opendevbrowser.js

@@ -1,5 +1,6 @@
 import {
   AGENT_INBOX_SYSTEM_MARKER,
+  DEFAULT_DAEMON_STATUS_FETCH_OPTIONS,
   DEFAULT_WORKFLOW_TRANSPORT_TIMEOUT_MS,
   DaemonClient,
   ScriptRunner,
@@ -11,19 +12,22 @@ import {
   classifySessionRelayEndpoint,
   createAutomationCoordinator,
   createCoreRuntimeAssemblies,
+  createDaemonStopHeaders,
   createOpenDevBrowserCore,
   executeMacroWithRuntime,
   extractExtension,
+  fetchDaemonStatus,
   fetchDaemonStatusFromMetadata,
-  getCurrentDaemonFingerprint,
+  fetchWithTimeout,
   inspectSession,
+  isCurrentDaemonFingerprint,
   onboarding_metadata_default,
   readDaemonMetadata,
   requireChallengeOrchestrationConfig,
   resolveBundledProviderRuntime,
   resolveSessionRelayRoute,
   startDaemon
-} from "./chunk-7U63PZ4W.js";
+} from "./chunk-GTTYIAI7.js";
 import "./chunk-STGGGVYT.js";
 import "./chunk-3ILXPKSJ.js";
 import "./chunk-TBUCZX4A.js";
@@ -35,7 +39,7 @@ import {
   classifyBlockerSignal,
   createRequestId,
   resolveInspiredesignCaptureMode
-} from "./chunk-Z6ENAZUN.js";
+} from "./chunk-AVQL6WAS.js";
 import "./chunk-FUSXMW3G.js";
 
 // src/cli/remote-manager.ts
@@ -1075,7 +1079,7 @@ function createStatusTool(deps) {
         let updateHint;
         let sessionStatus = null;
         if (hubEnabled) {
-          const daemonStatus = await fetchDaemonStatusFromMetadata();
+          const daemonStatus = await fetchDaemonStatusFromMetadata(config, DEFAULT_DAEMON_STATUS_FETCH_OPTIONS);
           if (!daemonStatus) {
             return failure("Daemon not running. Start with `npx opendevbrowser serve`.", "status_failed");
           }
@@ -3188,7 +3192,7 @@ function createResearchRunTool(deps) {
     async execute(args) {
       try {
         const runtime = await resolveProviderRuntime(deps);
-        const { runResearchWorkflow } = await import("./providers-CYEJZVXB.js");
+        const { runResearchWorkflow } = await import("./providers-T2FQJCF6.js");
         const result = await runResearchWorkflow(runtime, {
           topic: args.topic,
           days: args.days,
@@ -3239,7 +3243,7 @@ function createShoppingRunTool(deps) {
     async execute(args) {
       try {
         const runtime = await resolveProviderRuntime(deps);
-        const { runShoppingWorkflow } = await import("./providers-CYEJZVXB.js");
+        const { runShoppingWorkflow } = await import("./providers-T2FQJCF6.js");
         const result = await runShoppingWorkflow(runtime, {
           query: args.query,
           providers: args.providers,
@@ -3308,7 +3312,7 @@ function createProductVideoRunTool(deps) {
     async execute(args) {
       try {
         const runtime = await resolveProviderRuntime(deps);
-        const { runProductVideoWorkflow } = await import("./providers-CYEJZVXB.js");
+        const { runProductVideoWorkflow } = await import("./providers-T2FQJCF6.js");
         const includeScreenshots = args.include_screenshots ?? true;
         const result = await runProductVideoWorkflow(runtime, {
           product_url: args.product_url,
@@ -3360,7 +3364,7 @@ function createInspiredesignRunTool(deps) {
     async execute(args) {
       try {
         const runtime = await resolveProviderRuntime(deps);
-        const { runInspiredesignWorkflow } = await import("./providers-CYEJZVXB.js");
+        const { runInspiredesignWorkflow } = await import("./providers-T2FQJCF6.js");
         const captureMode = resolveInspiredesignCaptureMode(args.captureMode, args.urls);
         const cookieSource = deps.config.get().providers?.cookieSource;
         const result = await runInspiredesignWorkflow(runtime, {
@@ -3473,7 +3477,9 @@ function createTools(deps) {
       execute: async (args, context) => {
         try {
           await deps.ensureHub?.();
-        } catch {
+        } catch (error) {
+          const serialized = serializeError(error);
+          return failure(serialized.message, serialized.code ?? "hub_unavailable", serialized.details);
         }
         return definition.execute(args, context);
       }
@@ -3643,6 +3649,69 @@ var OpenDevBrowserPlugin = async ({ directory, worktree }) => {
     toolDeps.providerRuntime = providerRuntime;
     toolDeps.browserFallbackPort = browserFallbackPort;
   };
+  const readEnsureHubBudgetMs = (deadlineMs) => {
+    const remainingMs = deadlineMs - Date.now();
+    return remainingMs > 0 ? remainingMs : null;
+  };
+  const stopTimeoutMs = (deadlineMs) => {
+    return Math.max(1, Math.min(500, readEnsureHubBudgetMs(deadlineMs) ?? 1));
+  };
+  const resolveHubStopConnection = (currentConfig, status) => {
+    const metadata = readDaemonMetadata();
+    if (metadata?.pid === status.pid) {
+      return { port: metadata.port, token: metadata.token };
+    }
+    return { port: currentConfig.daemonPort, token: currentConfig.daemonToken };
+  };
+  const isConfiguredHubConnection = (currentConfig, connection) => {
+    return connection.port === currentConfig.daemonPort && connection.token === currentConfig.daemonToken;
+  };
+  const waitForHubDaemonShutdown = async (connection, deadlineMs) => {
+    while (readEnsureHubBudgetMs(deadlineMs)) {
+      const status = await fetchDaemonStatus(connection.port, connection.token, {
+        timeoutMs: stopTimeoutMs(deadlineMs)
+      });
+      if (!status?.ok) {
+        return true;
+      }
+      await new Promise((resolve) => setTimeout(resolve, Math.min(100, stopTimeoutMs(deadlineMs))));
+    }
+    return false;
+  };
+  const stopMismatchedHubDaemon = async (currentConfig, status, deadlineMs) => {
+    const connection = resolveHubStopConnection(currentConfig, status);
+    const configuredConnection = isConfiguredHubConnection(currentConfig, connection);
+    let response;
+    try {
+      response = await fetchWithTimeout(`http://127.0.0.1:${connection.port}/stop`, {
+        method: "POST",
+        headers: createDaemonStopHeaders(connection.token, "plugin.ensureHub.upgrade")
+      }, stopTimeoutMs(deadlineMs));
+    } catch (error) {
+      if (!configuredConnection) {
+        return;
+      }
+      throw error instanceof Error ? error : new Error(String(error));
+    }
+    if (response.status === 409) {
+      if (!configuredConnection) {
+        return;
+      }
+      throw new Error(`Hub daemon on 127.0.0.1:${connection.port} pid=${status.pid} is protected by a different opendevbrowser build.`);
+    }
+    if (!response.ok) {
+      if (!configuredConnection) {
+        return;
+      }
+      throw new Error(`Hub daemon stop failed with status ${response.status}.`);
+    }
+    if (!await waitForHubDaemonShutdown(connection, deadlineMs)) {
+      if (!configuredConnection) {
+        return;
+      }
+      throw new Error(`Timed out waiting for hub daemon on 127.0.0.1:${connection.port} to stop.`);
+    }
+  };
   const ensureHub = async () => {
     const currentConfig = configStore.get();
     if (!isHubEnabled(currentConfig)) {
@@ -3654,29 +3723,26 @@ var OpenDevBrowserPlugin = async ({ directory, worktree }) => {
     const deadline = Date.now() + 2e3;
     let attempt = 0;
     let lastError = null;
-    const currentFingerprint = getCurrentDaemonFingerprint();
     while (attempt < 2 && Date.now() < deadline) {
       attempt += 1;
-      const status = await fetchDaemonStatusFromMetadata(currentConfig);
-      if (status?.ok && status.fingerprint === currentFingerprint) {
-        bindRemote();
-        await relay?.refresh?.();
-        return;
+      const statusTimeoutMs = readEnsureHubBudgetMs(deadline);
+      if (!statusTimeoutMs) {
+        break;
       }
+      const status = await fetchDaemonStatusFromMetadata(currentConfig, {
+        ...DEFAULT_DAEMON_STATUS_FETCH_OPTIONS,
+        timeoutMs: statusTimeoutMs
+      });
       if (status?.ok) {
-        const metadata = readDaemonMetadata();
-        const daemonPort = metadata?.port ?? currentConfig.daemonPort;
-        const daemonToken = metadata?.token ?? currentConfig.daemonToken;
-        if (daemonPort > 0 && daemonToken) {
-          try {
-            await fetch(`http://127.0.0.1:${daemonPort}/stop`, {
-              method: "POST",
-              headers: { Authorization: `Bearer ${daemonToken}` }
-            });
-          } catch (error) {
-            lastError = error instanceof Error ? error : new Error(String(error));
-          }
+        if (isCurrentDaemonFingerprint(status.fingerprint)) {
+          bindRemote();
+          await relay?.refresh?.();
+          return;
         }
+        await stopMismatchedHubDaemon(currentConfig, status, deadline);
+      }
+      if (!readEnsureHubBudgetMs(deadline)) {
+        break;
       }
       try {
         const { stop } = await startDaemon({ config: currentConfig, directory, worktree });
@@ -3684,6 +3750,22 @@ var OpenDevBrowserPlugin = async ({ directory, worktree }) => {
       } catch (error) {
         lastError = error instanceof Error ? error : new Error(String(error));
       }
+      const refreshedTimeoutMs = readEnsureHubBudgetMs(deadline);
+      if (!refreshedTimeoutMs) {
+        break;
+      }
+      const refreshedStatus = await fetchDaemonStatusFromMetadata(currentConfig, {
+        ...DEFAULT_DAEMON_STATUS_FETCH_OPTIONS,
+        timeoutMs: refreshedTimeoutMs
+      });
+      if (refreshedStatus?.ok) {
+        if (isCurrentDaemonFingerprint(refreshedStatus.fingerprint)) {
+          bindRemote();
+          await relay?.refresh?.();
+          return;
+        }
+        await stopMismatchedHubDaemon(currentConfig, refreshedStatus, deadline);
+      }
       if (Date.now() < deadline) {
         await new Promise((resolve) => setTimeout(resolve, 500));
       }
@@ -3696,7 +3778,6 @@ var OpenDevBrowserPlugin = async ({ directory, worktree }) => {
   toolDeps.ensureHub = ensureHub;
   const hubEnabled = isHubEnabled(config);
   if (hubEnabled) {
-    bindRemote();
     try {
       await ensureHub();
     } catch (error) {