@agimon-ai/browse-tool 0.2.2 → 0.2.4

package/dist/extension/background.js

@@ -6214,20 +6214,30 @@ async function listPagesHandler(args, context, tabId) {
 async function newPageHandler(args, context, tabId) {
   try {
     const url = args.url || "about:blank";
-    const tab = await globalThis.chrome.tabs.create({ url });
+    const pageIdFromServer = typeof args.pageId === "string" ? args.pageId : void 0;
+    const setAsCurrent = args.setAsCurrent !== false;
+    const tab = await globalThis.chrome.tabs.create({ url, active: setAsCurrent });
     if (!tab.id) {
       return {
         content: [{ type: "text", text: "Failed to create tab" }],
         isError: true
       };
     }
-    const pageId = await context.tabRegistry.register(tab.id);
-    context.tabRegistry.setActive(pageId);
+    let pageId = pageIdFromServer;
+    if (pageId) {
+      context.tabRegistry.registerPage(pageId, tab.url);
+      context.tabRegistry.mapPageToTab(pageId, tab.id);
+    } else {
+      pageId = await context.tabRegistry.register(tab.id);
+    }
+    if (setAsCurrent) {
+      context.tabRegistry.setActive(pageId);
+    }
     return {
       content: [
         {
           type: "text",
-          text: JSON.stringify({ pageId, url: tab.url, title: tab.title })
+          text: JSON.stringify({ pageId, tabId: tab.id, url: tab.url, title: tab.title, isActive: setAsCurrent })
         }
       ]
     };
@@ -6367,7 +6377,14 @@ async function executeToolRequest(request, context) {
     }
   }
   try {
-    return await handler(request.arguments, context, tabId);
+    return await handler(
+      {
+        ...request.arguments,
+        ...request.pageId ? { pageId: request.pageId } : {}
+      },
+      context,
+      tabId
+    );
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
     return {
@@ -6771,6 +6788,31 @@ class ExtensionHttpClient {
       };
     }
   }
+  async sendTabMapped(request) {
+    try {
+      const response = await fetch(`${this.serverUrl}/extension/tab-mapped`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(request)
+      });
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        return {
+          success: false,
+          error: errorData.error || `HTTP ${response.status}: ${response.statusText}`
+        };
+      }
+      return { success: true };
+    } catch (error) {
+      this.lastError = error instanceof Error ? error.message : String(error);
+      return {
+        success: false,
+        error: this.lastError
+      };
+    }
+  }
   /**
    * Request handoff to AI control
    */
@@ -7296,6 +7338,7 @@ class WebSocketClient {
 }
 
 class TaskPollerService {
+  static BROWSER_LANE_KEY = "browser";
   client;
   wsClient = null;
   pollInterval = null;
@@ -7313,6 +7356,8 @@ class TaskPollerService {
   handoffRequested = false;
   useWebSocket = false;
   serverUrl;
+  webSocketTaskLanes = /* @__PURE__ */ new Map();
+  activeWebSocketTasks = 0;
   toolContext = {
     tabRegistry
   };
@@ -7348,15 +7393,7 @@ class TaskPollerService {
         this.handleWebSocketTask(task);
       },
       onPageCreated: async (pageId, _browserId, _url) => {
-        try {
-          const tabs = await globalThis.chrome.tabs.query({ active: true, currentWindow: true });
-          const activeTab = tabs[0];
-          if (activeTab?.id) {
-            tabRegistry.mapPageToTab(pageId, activeTab.id);
-          }
-        } catch {
-          tabRegistry.registerPage(pageId, _url);
-        }
+        await this.mapPageToActiveTab(pageId, _url);
       },
       onPageRemoved: (pageId) => {
         tabRegistry.unregisterPage(pageId);
@@ -7387,12 +7424,6 @@ class TaskPollerService {
     }
   }
   handleWebSocketTask(task) {
-    if (this.isExecuting) {
-      return;
-    }
-    this.isExecuting = true;
-    const prevStatus = this.status;
-    this.status = "executing";
     const serverTask = {
       id: task.payload.taskId,
       tool: task.payload.tool,
@@ -7406,15 +7437,40 @@ class TaskPollerService {
         } : {}
       }
     };
-    this.executeTaskWithWebSocket(serverTask).then(() => {
-      this.taskCount++;
-      this.lastTaskAt = /* @__PURE__ */ new Date();
-      this.status = prevStatus;
-      this.isExecuting = false;
-    }).catch(() => {
-      this.status = prevStatus;
-      this.isExecuting = false;
+    const laneKey = this.getWebSocketExecutionLane(serverTask);
+    const previous = this.webSocketTaskLanes.get(laneKey) ?? Promise.resolve();
+    const next = previous.catch(() => {
+    }).then(async () => {
+      this.activeWebSocketTasks += 1;
+      this.status = "executing";
+      try {
+        await this.executeTaskWithWebSocket(serverTask);
+        this.taskCount++;
+        this.lastTaskAt = /* @__PURE__ */ new Date();
+      } finally {
+        this.activeWebSocketTasks = Math.max(0, this.activeWebSocketTasks - 1);
+        if (this.activeWebSocketTasks === 0 && this.useWebSocket) {
+          this.status = this.wsClient?.isConnected() ? "websocket" : "error";
+        }
+      }
     });
+    const tracked = next.finally(() => {
+      if (this.webSocketTaskLanes.get(laneKey) === tracked) {
+        this.webSocketTaskLanes.delete(laneKey);
+      }
+    });
+    this.webSocketTaskLanes.set(laneKey, tracked);
+  }
+  getWebSocketExecutionLane(task) {
+    const pageId = typeof task.arguments.pageId === "string" ? task.arguments.pageId : void 0;
+    if (!pageId) {
+      return TaskPollerService.BROWSER_LANE_KEY;
+    }
+    const tab = tabRegistry.get(pageId);
+    if (!tab || tab.tabId < 0) {
+      return TaskPollerService.BROWSER_LANE_KEY;
+    }
+    return `tab:${tab.tabId}`;
   }
   async executeTaskWithWebSocket(task) {
     const result = await this.executeTaskCore(task);
@@ -7498,6 +7554,24 @@ class TaskPollerService {
       return void 0;
     }
   }
+  async mapPageToActiveTab(pageId, url) {
+    try {
+      const tabs = await globalThis.chrome.tabs.query({ active: true, currentWindow: true });
+      const activeTab = tabs[0];
+      if (!activeTab?.id) {
+        tabRegistry.registerPage(pageId, url);
+        return;
+      }
+      tabRegistry.mapPageToTab(pageId, activeTab.id);
+      if (this.useWebSocket) {
+        this.wsClient?.notifyTabMapped(pageId, activeTab.id);
+        return;
+      }
+      await this.client.sendTabMapped({ pageId, tabId: activeTab.id });
+    } catch {
+      tabRegistry.registerPage(pageId, url);
+    }
+  }
   stop() {
     if (this.pollInterval) {
       clearInterval(this.pollInterval);
@@ -7516,6 +7590,8 @@ class TaskPollerService {
     this.controlMode = void 0;
     this.handoffRequested = false;
     this.useWebSocket = false;
+    this.webSocketTaskLanes.clear();
+    this.activeWebSocketTasks = 0;
     this.client.disconnect();
   }
   async pollOnce() {