@flrande/bak-extension 0.6.3 → 0.6.5

package/dist/.bak-e2e-build-stamp

@@ -1 +1 @@
-2026-03-12T12:13:27.330Z
+2026-03-13T06:30:44.568Z

package/dist/background.global.js

@@ -62,7 +62,7 @@
   // package.json
   var package_default = {
     name: "@flrande/bak-extension",
-    version: "0.6.3",
+    version: "0.6.5",
     type: "module",
     scripts: {
       build: "tsup src/background.ts src/content.ts src/popup.ts --format iife --out-dir dist --clean && node scripts/copy-assets.mjs",
@@ -548,7 +548,7 @@
       const initialUrl = options.initialUrl ?? DEFAULT_SESSION_BINDING_URL;
       const persisted = await this.storage.load(bindingId);
       const created = !persisted;
-      let state = this.normalizeState(persisted, bindingId);
+      let state = this.normalizeState(persisted, bindingId, options.label);
       const originalWindowId = state.windowId;
       let window2 = state.windowId !== null ? await this.waitForWindow(state.windowId) : null;
       let tabs = [];
@@ -681,7 +681,8 @@
       const ensured = await this.ensureBinding({
         bindingId,
         focus: false,
-        initialUrl: hadBinding ? options.url ?? DEFAULT_SESSION_BINDING_URL : DEFAULT_SESSION_BINDING_URL
+        initialUrl: hadBinding ? options.url ?? DEFAULT_SESSION_BINDING_URL : DEFAULT_SESSION_BINDING_URL,
+        label: options.label
       });
       let state = { ...ensured.binding, tabIds: [...ensured.binding.tabIds], tabs: [...ensured.binding.tabs] };
       if (state.windowId !== null && state.tabs.length === 0) {
@@ -715,7 +716,8 @@
         const repaired = await this.ensureBinding({
           bindingId,
           focus: false,
-          initialUrl: desiredUrl
+          initialUrl: desiredUrl,
+          label: options.label
         });
         state = { ...repaired.binding };
         reusablePrimaryTab = await this.resolveReusablePrimaryTab(state, true);
@@ -827,6 +829,43 @@
       const refreshed = await this.ensureBinding({ bindingId, focus: false });
       return { ok: true, binding: refreshed.binding };
     }
+    async closeTab(bindingId, tabId) {
+      const ensured = await this.ensureBinding({ bindingId, focus: false });
+      const resolvedTabId = typeof tabId === "number" ? tabId : ensured.binding.activeTabId ?? ensured.binding.primaryTabId ?? ensured.binding.tabs[0]?.id;
+      if (typeof resolvedTabId !== "number" || !ensured.binding.tabIds.includes(resolvedTabId)) {
+        throw new Error(`Tab ${tabId ?? "active"} does not belong to binding ${bindingId}`);
+      }
+      await this.browser.closeTab(resolvedTabId);
+      const remainingTabIds = ensured.binding.tabIds.filter((candidate) => candidate !== resolvedTabId);
+      if (remainingTabIds.length === 0) {
+        await this.storage.delete(ensured.binding.id);
+        return {
+          binding: null,
+          closedTabId: resolvedTabId
+        };
+      }
+      const tabs = await this.readLooseTrackedTabs(remainingTabIds);
+      const nextPrimaryTabId = ensured.binding.primaryTabId === resolvedTabId ? tabs[0]?.id ?? null : ensured.binding.primaryTabId;
+      const nextActiveTabId = ensured.binding.activeTabId === resolvedTabId ? tabs.find((candidate) => candidate.active)?.id ?? nextPrimaryTabId ?? tabs[0]?.id ?? null : ensured.binding.activeTabId;
+      const nextState = {
+        id: ensured.binding.id,
+        label: ensured.binding.label,
+        color: ensured.binding.color,
+        windowId: tabs[0]?.windowId ?? ensured.binding.windowId,
+        groupId: tabs[0]?.groupId ?? ensured.binding.groupId,
+        tabIds: tabs.map((candidate) => candidate.id),
+        activeTabId: nextActiveTabId,
+        primaryTabId: nextPrimaryTabId
+      };
+      await this.storage.save(nextState);
+      return {
+        binding: {
+          ...nextState,
+          tabs
+        },
+        closedTabId: resolvedTabId
+      };
+    }
     async reset(options = {}) {
       const bindingId = this.normalizeBindingId(options.bindingId);
       await this.close(bindingId);
@@ -842,10 +881,11 @@
         return { ok: true };
       }
       await this.storage.delete(bindingId);
-      if (state.windowId !== null) {
-        const existingWindow = await this.browser.getWindow(state.windowId);
-        if (existingWindow) {
-          await this.browser.closeWindow(state.windowId);
+      const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+      for (const trackedTab of trackedTabs) {
+        try {
+          await this.browser.closeTab(trackedTab.id);
+        } catch {
         }
       }
       return { ok: true };
@@ -896,10 +936,10 @@
       }
       return candidate;
     }
-    normalizeState(state, bindingId) {
+    normalizeState(state, bindingId, label) {
       return {
         id: bindingId,
-        label: state?.label ?? DEFAULT_SESSION_BINDING_LABEL,
+        label: label?.trim() ? label.trim() : state?.label ?? DEFAULT_SESSION_BINDING_LABEL,
         color: state?.color ?? DEFAULT_SESSION_BINDING_COLOR,
         windowId: state?.windowId ?? null,
         groupId: state?.groupId ?? null,
@@ -1066,6 +1106,10 @@
       state.tabIds = recreatedTabs.map((tab) => tab.id);
       state.primaryTabId = nextPrimaryTabId;
       state.activeTabId = nextActiveTabId;
+      await this.storage.save({
+        ...state,
+        tabIds: [...state.tabIds]
+      });
       for (const bindingTab of ownership.bindingTabs) {
         await this.browser.closeTab(bindingTab.id);
       }
@@ -1276,10 +1320,14 @@
   var ws = null;
   var reconnectTimer = null;
   var nextReconnectInMs = null;
+  var nextReconnectAt = null;
   var reconnectAttempt = 0;
   var lastError = null;
   var manualDisconnect = false;
   var sessionBindingStateMutationQueue = Promise.resolve();
+  var preserveHumanFocusDepth = 0;
+  var lastBindingUpdateAt = null;
+  var lastBindingUpdateReason = null;
   async function getConfig() {
     const stored = await chrome.storage.local.get([STORAGE_KEY_TOKEN, STORAGE_KEY_PORT, STORAGE_KEY_DEBUG_RICH_TEXT]);
     return {
@@ -1316,12 +1364,25 @@
       reconnectTimer = null;
     }
     nextReconnectInMs = null;
+    nextReconnectAt = null;
   }
   function sendResponse(payload) {
     if (ws && ws.readyState === WebSocket.OPEN) {
       ws.send(JSON.stringify(payload));
     }
   }
+  function sendEvent(event, data) {
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      ws.send(
+        JSON.stringify({
+          type: "event",
+          event,
+          data,
+          ts: Date.now()
+        })
+      );
+    }
+  }
   function toError(code, message, data) {
     return { code, message, data };
   }
@@ -1399,6 +1460,65 @@
   async function listSessionBindingStates() {
     return Object.values(await loadSessionBindingStateMap());
   }
+  function summarizeSessionBindings(states) {
+    const items = states.map((state) => {
+      const detached = state.windowId === null || state.tabIds.length === 0;
+      return {
+        id: state.id,
+        label: state.label,
+        tabCount: state.tabIds.length,
+        activeTabId: state.activeTabId,
+        windowId: state.windowId,
+        groupId: state.groupId,
+        detached
+      };
+    });
+    return {
+      count: items.length,
+      attachedCount: items.filter((item) => !item.detached).length,
+      detachedCount: items.filter((item) => item.detached).length,
+      tabCount: items.reduce((sum, item) => sum + item.tabCount, 0),
+      items
+    };
+  }
+  async function buildPopupState() {
+    const config = await getConfig();
+    const sessionBindings = summarizeSessionBindings(await listSessionBindingStates());
+    const reconnectRemainingMs = nextReconnectAt === null ? null : Math.max(0, nextReconnectAt - Date.now());
+    let connectionState;
+    if (!config.token) {
+      connectionState = "missing-token";
+    } else if (ws?.readyState === WebSocket.OPEN) {
+      connectionState = "connected";
+    } else if (ws?.readyState === WebSocket.CONNECTING) {
+      connectionState = "connecting";
+    } else if (manualDisconnect) {
+      connectionState = "manual";
+    } else if (nextReconnectInMs !== null) {
+      connectionState = "reconnecting";
+    } else {
+      connectionState = "disconnected";
+    }
+    return {
+      ok: true,
+      connected: ws?.readyState === WebSocket.OPEN,
+      connectionState,
+      hasToken: Boolean(config.token),
+      port: config.port,
+      wsUrl: `ws://127.0.0.1:${config.port}/extension`,
+      debugRichText: config.debugRichText,
+      lastError: lastError?.message ?? null,
+      lastErrorAt: lastError?.at ?? null,
+      lastErrorContext: lastError?.context ?? null,
+      reconnectAttempt,
+      nextReconnectInMs: reconnectRemainingMs,
+      manualDisconnect,
+      extensionVersion: EXTENSION_VERSION,
+      lastBindingUpdateAt,
+      lastBindingUpdateReason,
+      sessionBindings
+    };
+  }
   async function saveSessionBindingState(state) {
     await mutateSessionBindingStateMap((stateMap) => {
       stateMap[state.id] = state;
@@ -1409,6 +1529,28 @@
       delete stateMap[bindingId];
     });
   }
+  function toSessionBindingEventBrowser(state) {
+    if (!state) {
+      return null;
+    }
+    return {
+      windowId: state.windowId,
+      groupId: state.groupId,
+      tabIds: [...state.tabIds],
+      activeTabId: state.activeTabId,
+      primaryTabId: state.primaryTabId
+    };
+  }
+  function emitSessionBindingUpdated(bindingId, reason, state, extras = {}) {
+    lastBindingUpdateAt = Date.now();
+    lastBindingUpdateReason = reason;
+    sendEvent("sessionBinding.updated", {
+      bindingId,
+      reason,
+      browser: toSessionBindingEventBrowser(state),
+      ...extras
+    });
+  }
   var sessionBindingBrowser = {
     async getTab(tabId) {
       try {
@@ -1756,10 +1898,15 @@
       return action();
     }
     const focusContext = await captureFocusContext();
+    preserveHumanFocusDepth += 1;
     try {
       return await action();
     } finally {
-      await restoreFocusContext(focusContext);
+      try {
+        await restoreFocusContext(focusContext);
+      } finally {
+        preserveHumanFocusDepth = Math.max(0, preserveHumanFocusDepth - 1);
+      }
     }
   }
   function requireRpcEnvelope(method, value) {
@@ -2622,11 +2769,13 @@
           const result = await bindingManager.ensureBinding({
             bindingId: String(params.bindingId ?? ""),
             focus: params.focus === true,
-            initialUrl: typeof params.url === "string" ? params.url : void 0
+            initialUrl: typeof params.url === "string" ? params.url : void 0,
+            label: typeof params.label === "string" ? params.label : void 0
           });
           for (const tab of result.binding.tabs) {
             void ensureNetworkDebugger(tab.id).catch(() => void 0);
           }
+          emitSessionBindingUpdated(result.binding.id, "ensure", result.binding);
           return {
             browser: result.binding,
             created: result.created,
@@ -2647,11 +2796,13 @@
             bindingId: String(params.bindingId ?? ""),
             url: expectedUrl,
             active: params.active === true,
-            focus: params.focus === true
+            focus: params.focus === true,
+            label: typeof params.label === "string" ? params.label : void 0
           });
         });
         const finalized = await finalizeOpenedSessionBindingTab(opened, expectedUrl);
         void ensureNetworkDebugger(finalized.tab.id).catch(() => void 0);
+        emitSessionBindingUpdated(finalized.binding.id, "open-tab", finalized.binding);
         return {
           browser: finalized.binding,
           tab: finalized.tab
@@ -2674,6 +2825,7 @@
       case "sessionBinding.setActiveTab": {
         const result = await bindingManager.setActiveTab(Number(params.tabId), String(params.bindingId ?? ""));
         void ensureNetworkDebugger(result.tab.id).catch(() => void 0);
+        emitSessionBindingUpdated(result.binding.id, "set-active-tab", result.binding);
         return {
           browser: result.binding,
           tab: result.tab
@@ -2691,8 +2843,10 @@
           const result = await bindingManager.reset({
             bindingId: String(params.bindingId ?? ""),
             focus: params.focus === true,
-            initialUrl: typeof params.url === "string" ? params.url : void 0
+            initialUrl: typeof params.url === "string" ? params.url : void 0,
+            label: typeof params.label === "string" ? params.label : void 0
           });
+          emitSessionBindingUpdated(result.binding.id, "reset", result.binding);
           return {
             browser: result.binding,
             created: result.created,
@@ -2701,8 +2855,22 @@
           };
         });
       }
+      case "sessionBinding.closeTab": {
+        const bindingId = String(params.bindingId ?? "");
+        const result = await bindingManager.closeTab(bindingId, typeof params.tabId === "number" ? params.tabId : void 0);
+        emitSessionBindingUpdated(bindingId, "close-tab", result.binding, {
+          closedTabId: result.closedTabId
+        });
+        return {
+          browser: result.binding,
+          closedTabId: result.closedTabId
+        };
+      }
       case "sessionBinding.close": {
-        return await bindingManager.close(String(params.bindingId ?? ""));
+        const bindingId = String(params.bindingId ?? "");
+        const result = await bindingManager.close(bindingId);
+        emitSessionBindingUpdated(bindingId, "close", null);
+        return result;
       }
       case "page.goto": {
         return await preserveHumanFocus(typeof target.tabId !== "number", async () => {
@@ -3195,9 +3363,11 @@
     const delayMs = computeReconnectDelayMs(reconnectAttempt);
     reconnectAttempt += 1;
     nextReconnectInMs = delayMs;
+    nextReconnectAt = Date.now() + delayMs;
     reconnectTimer = setTimeout(() => {
       reconnectTimer = null;
       nextReconnectInMs = null;
+      nextReconnectAt = null;
       void connectWebSocket();
     }, delayMs);
     if (!lastError) {
@@ -3218,19 +3388,23 @@
       return;
     }
     const url = `ws://127.0.0.1:${config.port}/extension?token=${encodeURIComponent(config.token)}`;
-    ws = new WebSocket(url);
-    ws.addEventListener("open", () => {
+    const socket = new WebSocket(url);
+    ws = socket;
+    socket.addEventListener("open", () => {
+      if (ws !== socket) {
+        return;
+      }
       manualDisconnect = false;
       reconnectAttempt = 0;
       lastError = null;
-      ws?.send(JSON.stringify({
+      socket.send(JSON.stringify({
         type: "hello",
         role: "extension",
         version: EXTENSION_VERSION,
         ts: Date.now()
       }));
     });
-    ws.addEventListener("message", (event) => {
+    socket.addEventListener("message", (event) => {
       try {
         const request = JSON.parse(String(event.data));
         if (!request.id || !request.method) {
@@ -3251,59 +3425,97 @@
         });
       }
     });
-    ws.addEventListener("close", () => {
+    socket.addEventListener("close", () => {
+      if (ws !== socket) {
+        return;
+      }
       ws = null;
       scheduleReconnect("socket-closed");
     });
-    ws.addEventListener("error", () => {
+    socket.addEventListener("error", () => {
+      if (ws !== socket) {
+        return;
+      }
       setRuntimeError("Cannot connect to bak cli", "socket");
-      ws?.close();
+      socket.close();
     });
   }
   chrome.tabs.onRemoved.addListener((tabId) => {
     dropNetworkCapture(tabId);
     void mutateSessionBindingStateMap((stateMap) => {
+      const updates = [];
       for (const [bindingId, state] of Object.entries(stateMap)) {
         if (!state.tabIds.includes(tabId)) {
           continue;
         }
         const nextTabIds = state.tabIds.filter((id) => id !== tabId);
-        stateMap[bindingId] = {
+        if (nextTabIds.length === 0) {
+          delete stateMap[bindingId];
+          updates.push({ bindingId, state: null });
+          continue;
+        }
+        const fallbackTabId = nextTabIds[0] ?? null;
+        const nextState = {
           ...state,
           tabIds: nextTabIds,
-          activeTabId: state.activeTabId === tabId ? null : state.activeTabId,
-          primaryTabId: state.primaryTabId === tabId ? null : state.primaryTabId
+          activeTabId: state.activeTabId === tabId ? fallbackTabId : state.activeTabId,
+          primaryTabId: state.primaryTabId === tabId ? fallbackTabId : state.primaryTabId
         };
+        stateMap[bindingId] = nextState;
+        updates.push({ bindingId, state: nextState });
+      }
+      return updates;
+    }).then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, "tab-removed", update.state, {
+          closedTabId: tabId
+        });
       }
     });
   });
   chrome.tabs.onActivated.addListener((activeInfo) => {
-    void mutateSessionBindingStateMap((stateMap) => {
-      for (const [bindingId, state] of Object.entries(stateMap)) {
-        if (state.windowId !== activeInfo.windowId || !state.tabIds.includes(activeInfo.tabId)) {
-          continue;
+    if (preserveHumanFocusDepth > 0) {
+      return;
+    }
+    void chrome.windows.get(activeInfo.windowId).then((window2) => window2.focused === true).catch(() => false).then((windowFocused) => {
+      if (!windowFocused) {
+        return [];
+      }
+      return mutateSessionBindingStateMap((stateMap) => {
+        const updates = [];
+        for (const [bindingId, state] of Object.entries(stateMap)) {
+          if (state.windowId !== activeInfo.windowId || !state.tabIds.includes(activeInfo.tabId)) {
+            continue;
+          }
+          const nextState = {
+            ...state,
+            activeTabId: activeInfo.tabId
+          };
+          stateMap[bindingId] = nextState;
+          updates.push({ bindingId, state: nextState });
         }
-        stateMap[bindingId] = {
-          ...state,
-          activeTabId: activeInfo.tabId
-        };
+        return updates;
+      });
+    }).then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, "tab-activated", update.state);
       }
     });
   });
   chrome.windows.onRemoved.addListener((windowId) => {
     void mutateSessionBindingStateMap((stateMap) => {
+      const updates = [];
       for (const [bindingId, state] of Object.entries(stateMap)) {
         if (state.windowId !== windowId) {
           continue;
         }
-        stateMap[bindingId] = {
-          ...state,
-          windowId: null,
-          groupId: null,
-          tabIds: [],
-          activeTabId: null,
-          primaryTabId: null
-        };
+        delete stateMap[bindingId];
+        updates.push({ bindingId, state: null });
+      }
+      return updates;
+    }).then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, "window-removed", update.state);
       }
     });
   });
@@ -3317,8 +3529,9 @@
   chrome.runtime.onMessage.addListener((message, _sender, sendResponse2) => {
     if (message?.type === "bak.updateConfig") {
       manualDisconnect = false;
+      const token = typeof message.token === "string" ? message.token.trim() : "";
       void setConfig({
-        token: message.token,
+        ...token ? { token } : {},
         port: Number(message.port ?? DEFAULT_PORT),
         debugRichText: message.debugRichText === true
       }).then(() => {
@@ -3328,19 +3541,8 @@
       return true;
     }
     if (message?.type === "bak.getState") {
-      void getConfig().then((config) => {
-        sendResponse2({
-          ok: true,
-          connected: ws?.readyState === WebSocket.OPEN,
-          hasToken: Boolean(config.token),
-          port: config.port,
-          debugRichText: config.debugRichText,
-          lastError: lastError?.message ?? null,
-          lastErrorAt: lastError?.at ?? null,
-          lastErrorContext: lastError?.context ?? null,
-          reconnectAttempt,
-          nextReconnectInMs
-        });
+      void buildPopupState().then((state) => {
+        sendResponse2(state);
       });
       return true;
     }
@@ -3348,11 +3550,21 @@
       manualDisconnect = true;
       clearReconnectTimer();
       reconnectAttempt = 0;
+      lastError = null;
       ws?.close();
       ws = null;
       sendResponse2({ ok: true });
       return false;
     }
+    if (message?.type === "bak.reconnectNow") {
+      manualDisconnect = false;
+      clearReconnectTimer();
+      reconnectAttempt = 0;
+      ws?.close();
+      ws = null;
+      void connectWebSocket().then(() => sendResponse2({ ok: true }));
+      return true;
+    }
     return false;
   });
 })();

package/dist/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Browser Agent Kit",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "action": {
     "default_popup": "popup.html"
   },