@flrande/bak-extension 0.6.9 → 0.6.10

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

@@ -1 +1 @@
-2026-03-13T09:31:23.678Z
+2026-03-13T17:21:34.586Z

package/dist/background.global.js

@@ -62,7 +62,7 @@
   // package.json
   var package_default = {
     name: "@flrande/bak-extension",
-    version: "0.6.9",
+    version: "0.6.10",
     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",
@@ -562,6 +562,13 @@
           }
         }
       }
+      if (!window2) {
+        const activeWindow = await this.attachBindingToActiveWindow(state);
+        if (activeWindow) {
+          window2 = activeWindow;
+          repairActions.push("attached-active-window");
+        }
+      }
       if (!window2) {
         const sharedWindow = await this.findSharedBindingWindow(bindingId);
         if (sharedWindow) {
@@ -605,21 +612,11 @@
         repairActions.push("pruned-missing-tabs");
       }
       state.tabIds = tabs.map((tab) => tab.id);
-      if (state.windowId !== null) {
-        const ownership = await this.inspectBindingWindowOwnership(state, state.windowId);
-        if (ownership.foreignTabs.length > 0 && ownership.bindingTabs.length > 0) {
-          const migrated = await this.moveBindingIntoBakWindow(state, ownership, initialUrl);
-          window2 = migrated.window;
-          tabs = migrated.tabs;
-          state.tabIds = tabs.map((tab) => tab.id);
-          repairActions.push("evacuated-foreign-window");
-        }
-      }
       if (tabs.length === 0) {
         const primary = await this.createBindingTab({
           windowId: state.windowId,
           url: initialUrl,
-          active: true
+          active: options.focus === true
         });
         tabs = [primary];
         state.tabIds = [primary.id];
@@ -670,9 +667,9 @@
         }
       }
       state.tabIds = [...new Set(tabs.map((tab) => tab.id))];
-      if (options.focus === true && state.activeTabId !== null) {
-        await this.browser.updateTab(state.activeTabId, { active: true });
-        window2 = await this.browser.updateWindow(state.windowId, { focused: true });
+      if (options.focus === true && state.windowId !== null && state.activeTabId !== null) {
+        await this.focusBindingWindow(state.windowId, state.activeTabId);
+        window2 = await this.waitForWindow(state.windowId, 300);
         void window2;
         repairActions.push("focused-window");
       }
@@ -759,9 +756,8 @@
         activeTabId: active || options.focus === true ? createdTab.id : state.activeTabId ?? state.primaryTabId ?? createdTab.id,
         primaryTabId: state.primaryTabId ?? createdTab.id
       };
-      if (options.focus === true) {
-        await this.browser.updateTab(createdTab.id, { active: true });
-        await this.browser.updateWindow(state.windowId, { focused: true });
+      if (options.focus === true && state.windowId !== null) {
+        await this.focusBindingWindow(state.windowId, createdTab.id);
       }
       await this.storage.save(nextState);
       const tabs = await this.readTrackedTabs(nextState.tabIds, nextState.windowId);
@@ -831,15 +827,41 @@
       };
     }
     async focus(bindingId) {
-      const ensured = await this.ensureBinding({ bindingId, focus: false });
-      if (ensured.binding.activeTabId !== null) {
-        await this.browser.updateTab(ensured.binding.activeTabId, { active: true });
+      const normalizedBindingId = this.normalizeBindingId(bindingId);
+      let binding = await this.inspectBinding(normalizedBindingId) ?? (await this.ensureBinding({
+        bindingId: normalizedBindingId,
+        focus: false
+      })).binding;
+      let targetTabId = this.resolveFocusTabId(binding);
+      if (binding.windowId === null || targetTabId === null) {
+        binding = (await this.ensureBinding({
+          bindingId: normalizedBindingId,
+          focus: false
+        })).binding;
+        targetTabId = this.resolveFocusTabId(binding);
       }
-      if (ensured.binding.windowId !== null) {
-        await this.browser.updateWindow(ensured.binding.windowId, { focused: true });
+      if (binding.windowId !== null && targetTabId !== null) {
+        try {
+          await this.focusBindingWindow(binding.windowId, targetTabId);
+        } catch (error) {
+          if (!this.isMissingWindowError(error)) {
+            throw error;
+          }
+          binding = (await this.ensureBinding({
+            bindingId: normalizedBindingId,
+            focus: false
+          })).binding;
+          targetTabId = this.resolveFocusTabId(binding);
+          if (binding.windowId !== null && targetTabId !== null) {
+            await this.focusBindingWindow(binding.windowId, targetTabId);
+          }
+        }
       }
-      const refreshed = await this.ensureBinding({ bindingId, focus: false });
-      return { ok: true, binding: refreshed.binding };
+      const refreshed = await this.inspectBinding(normalizedBindingId) ?? binding;
+      return {
+        ok: true,
+        binding: refreshed.windowId !== null && targetTabId !== null ? this.withFocusedTab(refreshed, targetTabId) : refreshed
+      };
     }
     async closeTab(bindingId, tabId) {
       const binding = await this.inspectBinding(bindingId);
@@ -1081,128 +1103,27 @@
       }
       return null;
     }
-    async inspectBindingWindowOwnership(state, windowId) {
-      const windowTabs = await this.waitForWindowTabs(windowId, 500);
-      const bindingTabIds = new Set(this.collectCandidateTabIds(state));
-      const peerBindings = (await this.storage.list()).filter((candidate) => candidate.id !== state.id);
-      const peerTabIds = /* @__PURE__ */ new Set();
-      const peerGroupIds = /* @__PURE__ */ new Set();
-      for (const peer of peerBindings) {
-        for (const tabId of this.collectCandidateTabIds(peer)) {
-          peerTabIds.add(tabId);
-        }
-        if (peer.groupId !== null) {
-          peerGroupIds.add(peer.groupId);
-        }
-      }
-      const bindingTabs = [];
-      const sharedBindingTabs = [];
-      const foreignTabs = [];
-      for (const tab of windowTabs) {
-        if (bindingTabIds.has(tab.id) || state.groupId !== null && tab.groupId === state.groupId) {
-          bindingTabs.push(tab);
-          continue;
-        }
-        if (peerTabIds.has(tab.id) || tab.groupId !== null && peerGroupIds.has(tab.groupId)) {
-          sharedBindingTabs.push(tab);
-          continue;
-        }
-        foreignTabs.push(tab);
-      }
-      return {
-        bindingTabs,
-        sharedBindingTabs,
-        foreignTabs
-      };
-    }
-    async moveBindingIntoBakWindow(state, ownership, initialUrl) {
-      const sourceTabs = this.orderSessionBindingTabsForMigration(state, ownership.bindingTabs);
-      const seedUrl = sourceTabs[0]?.url ?? initialUrl;
-      const sharedWindow = await this.findSharedBindingWindow(state.id, state.windowId === null ? [] : [state.windowId]);
-      const window2 = sharedWindow ?? await this.browser.createWindow({
-        url: seedUrl || DEFAULT_SESSION_BINDING_URL,
-        focused: false
-      });
-      const initialTab = sharedWindow || typeof window2.initialTabId !== "number" ? null : await this.waitForTrackedTab(window2.initialTabId, window2.id);
-      const recreatedTabs = [];
-      const tabIdMap = /* @__PURE__ */ new Map();
-      if (sourceTabs[0]) {
-        const firstTab = initialTab ? await this.browser.updateTab(initialTab.id, {
-          url: sourceTabs[0].url,
-          active: false
-        }) : await this.createBindingTab({
-          windowId: window2.id,
-          url: sourceTabs[0].url,
-          active: false
-        });
-        recreatedTabs.push(firstTab);
-        tabIdMap.set(sourceTabs[0].id, firstTab.id);
-      }
-      for (const sourceTab of sourceTabs.slice(1)) {
-        const recreated = await this.createBindingTab({
-          windowId: window2.id,
-          url: sourceTab.url,
-          active: false
-        });
-        recreatedTabs.push(recreated);
-        tabIdMap.set(sourceTab.id, recreated.id);
+    async attachBindingToActiveWindow(state) {
+      const activeTab = await this.browser.getActiveTab();
+      if (!activeTab) {
+        return null;
       }
-      const nextPrimaryTabId = (state.primaryTabId !== null ? tabIdMap.get(state.primaryTabId) : void 0) ?? recreatedTabs[0]?.id ?? null;
-      const nextActiveTabId = (state.activeTabId !== null ? tabIdMap.get(state.activeTabId) : void 0) ?? nextPrimaryTabId ?? recreatedTabs[0]?.id ?? null;
-      if (nextActiveTabId !== null) {
-        await this.browser.updateTab(nextActiveTabId, { active: true });
+      const window2 = await this.waitForWindow(activeTab.windowId, 300);
+      if (!window2) {
+        return null;
       }
       state.windowId = window2.id;
       state.groupId = null;
-      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) {
-        try {
-          await this.browser.closeTab(bindingTab.id);
-        } catch {
-        }
-      }
-      return {
-        window: window2,
-        tabs: await this.readTrackedTabs(state.tabIds, state.windowId)
-      };
-    }
-    orderSessionBindingTabsForMigration(state, tabs) {
-      const ordered = [];
-      const seen = /* @__PURE__ */ new Set();
-      const pushById = (tabId) => {
-        if (typeof tabId !== "number") {
-          return;
-        }
-        const tab = tabs.find((candidate) => candidate.id === tabId);
-        if (!tab || seen.has(tab.id)) {
-          return;
-        }
-        ordered.push(tab);
-        seen.add(tab.id);
-      };
-      pushById(state.primaryTabId);
-      pushById(state.activeTabId);
-      for (const tab of tabs) {
-        if (seen.has(tab.id)) {
-          continue;
-        }
-        ordered.push(tab);
-        seen.add(tab.id);
-      }
-      return ordered;
+      state.tabIds = [];
+      state.activeTabId = null;
+      state.primaryTabId = null;
+      return window2;
     }
     async findSharedBindingWindow(bindingId, excludedWindowIds = []) {
       const peers = (await this.storage.list()).filter((candidate) => candidate.id !== bindingId);
       const candidateWindowIds = [];
       const peerTabIds = /* @__PURE__ */ new Set();
       const peerGroupIds = /* @__PURE__ */ new Set();
-      const reusablePeerIds = /* @__PURE__ */ new Set();
       const pushWindowId = (windowId) => {
         if (typeof windowId !== "number") {
           return;
@@ -1213,48 +1134,33 @@
         candidateWindowIds.push(windowId);
       };
       for (const peer of peers) {
-        if (peer.groupId === null) {
-          continue;
-        }
-        const group = await this.waitForGroup(peer.groupId, 300);
-        if (!group) {
-          continue;
-        }
-        reusablePeerIds.add(peer.id);
-        peerGroupIds.add(group.id);
-        pushWindowId(group.windowId);
-      }
-      for (const peer of peers) {
-        if (!reusablePeerIds.has(peer.id)) {
-          continue;
-        }
         const trackedTabIds = this.collectCandidateTabIds(peer);
+        pushWindowId(peer.windowId);
         for (const trackedTabId of trackedTabIds) {
           peerTabIds.add(trackedTabId);
         }
+        if (peer.groupId !== null) {
+          const group = await this.waitForGroup(peer.groupId, 300);
+          if (group) {
+            peerGroupIds.add(group.id);
+            pushWindowId(group.windowId);
+          }
+        }
         const trackedTabs = await this.readLooseTrackedTabs(trackedTabIds);
         for (const tab of trackedTabs) {
-          if (tab.groupId !== null && peerGroupIds.has(tab.groupId)) {
-            pushWindowId(tab.windowId);
-          }
+          pushWindowId(tab.windowId);
         }
       }
       for (const windowId of candidateWindowIds) {
         const window2 = await this.waitForWindow(windowId, 300);
         if (window2) {
-          const windowTabs = await this.waitForWindowTabs(window2.id, 300);
+          const windowTabs = await this.readStableWindowTabs(window2.id, WINDOW_TABS_LOOKUP_TIMEOUT_MS, 150);
           const ownedTabs = windowTabs.filter(
             (tab) => peerTabIds.has(tab.id) || tab.groupId !== null && peerGroupIds.has(tab.groupId)
           );
           if (ownedTabs.length === 0) {
             continue;
           }
-          const foreignTabs = windowTabs.filter(
-            (tab) => !peerTabIds.has(tab.id) && (tab.groupId === null || !peerGroupIds.has(tab.groupId))
-          );
-          if (foreignTabs.length > 0) {
-            continue;
-          }
           return window2;
         }
       }
@@ -1286,6 +1192,27 @@
       }
       return existingTabs;
     }
+    resolveFocusTabId(binding) {
+      return binding.activeTabId ?? binding.primaryTabId ?? binding.tabs[0]?.id ?? null;
+    }
+    withFocusedTab(binding, targetTabId) {
+      return {
+        ...binding,
+        activeTabId: targetTabId,
+        tabs: binding.tabs.map((tab) => ({
+          ...tab,
+          active: tab.id === targetTabId
+        }))
+      };
+    }
+    async focusBindingWindow(windowId, tabId) {
+      await this.browser.updateWindow(windowId, { focused: true });
+      await this.browser.updateTab(tabId, { active: true });
+      const focusedTab = await this.waitForTrackedTab(tabId, windowId, 500);
+      if (!focusedTab?.active) {
+        await this.browser.updateTab(tabId, { active: true });
+      }
+    }
     async collectBindingTabsForClose(state) {
       const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
       if (state.windowId === null || state.groupId === null) {
@@ -1416,6 +1343,34 @@
       }
       return [];
     }
+    async readStableWindowTabs(windowId, timeoutMs = WINDOW_TABS_LOOKUP_TIMEOUT_MS, settleMs = 150) {
+      const deadline = Date.now() + timeoutMs;
+      let bestTabs = [];
+      let bestSignature = "";
+      let lastSignature = "";
+      let stableSince = 0;
+      while (Date.now() < deadline) {
+        const tabs = await this.browser.listTabs({ windowId });
+        if (tabs.length > 0) {
+          const signature = this.windowTabSnapshotSignature(tabs);
+          if (tabs.length > bestTabs.length || tabs.length === bestTabs.length && signature !== bestSignature) {
+            bestTabs = tabs;
+            bestSignature = signature;
+          }
+          if (signature !== lastSignature) {
+            lastSignature = signature;
+            stableSince = Date.now();
+          } else if (Date.now() - stableSince >= settleMs) {
+            return bestTabs;
+          }
+        }
+        await this.delay(50);
+      }
+      return bestTabs;
+    }
+    windowTabSnapshotSignature(tabs) {
+      return [...tabs].map((tab) => `${tab.id}:${tab.groupId ?? "ungrouped"}`).sort().join("|");
+    }
     async delay(ms) {
       await new Promise((resolve) => setTimeout(resolve, ms));
     }
@@ -1738,54 +1693,20 @@
       }
     },
     async createWindow(options) {
-      const previouslyFocusedWindow = options.focused === true ? null : (await chrome.windows.getAll()).find((window2) => window2.focused === true && typeof window2.id === "number") ?? null;
-      const previouslyFocusedTabs = previouslyFocusedWindow?.id !== void 0 ? await chrome.tabs.query({ windowId: previouslyFocusedWindow.id }) : [];
-      const previouslyFocusedTabIds = new Set(
-        previouslyFocusedTabs.flatMap((tab) => typeof tab.id === "number" ? [tab.id] : [])
-      );
-      const previouslyFocusedTab = previouslyFocusedTabs.find((tab) => tab.active === true && typeof tab.id === "number") ?? null;
-      const desiredUrl = options.url ?? "about:blank";
-      let created = await chrome.windows.create({
-        url: desiredUrl,
-        focused: true
+      const created = await chrome.windows.create({
+        focused: options.focused,
+        url: options.url ?? "about:blank"
       });
       if (!created || typeof created.id !== "number") {
         throw new Error("Window missing id");
       }
-      const pickSeedTab = async (windowId) => {
-        const tabs = await chrome.tabs.query({ windowId });
-        const newlyCreatedTab = windowId === previouslyFocusedWindow?.id ? tabs.find((tab) => typeof tab.id === "number" && !previouslyFocusedTabIds.has(tab.id)) : null;
-        const normalizedDesiredUrl = normalizeComparableTabUrl(desiredUrl);
-        return newlyCreatedTab ?? tabs.find((tab) => {
-          const pendingUrl = "pendingUrl" in tab && typeof tab.pendingUrl === "string" ? tab.pendingUrl : "";
-          return normalizeComparableTabUrl(tab.url ?? pendingUrl) === normalizedDesiredUrl;
-        }) ?? tabs.find((tab) => tab.active === true && typeof tab.id === "number") ?? tabs.find((tab) => typeof tab.id === "number") ?? null;
-      };
-      let seedTab = await pickSeedTab(created.id);
-      const createdWindowTabs = await chrome.tabs.query({ windowId: created.id });
-      const createdWindowReusedFocusedWindow = previouslyFocusedWindow?.id === created.id;
-      const createdWindowLooksDirty = createdWindowTabs.length > 1;
-      if ((createdWindowReusedFocusedWindow || createdWindowLooksDirty) && typeof seedTab?.id === "number") {
-        created = await chrome.windows.create({
-          tabId: seedTab.id,
-          focused: true
-        });
-        if (!created || typeof created.id !== "number") {
-          throw new Error("Lifted window missing id");
-        }
-        seedTab = await pickSeedTab(created.id);
-      }
-      if (options.focused !== true && previouslyFocusedWindow?.id && previouslyFocusedWindow.id !== created.id) {
-        await chrome.windows.update(previouslyFocusedWindow.id, { focused: true });
-        if (typeof previouslyFocusedTab?.id === "number") {
-          await chrome.tabs.update(previouslyFocusedTab.id, { active: true });
-        }
-      }
-      const finalWindow = await chrome.windows.get(created.id);
+      const initialTabId = created.tabs?.find((tab) => typeof tab.id === "number")?.id ?? (await chrome.tabs.query({
+        windowId: created.id
+      })).find((tab) => typeof tab.id === "number")?.id ?? null;
       return {
-        id: finalWindow.id,
-        focused: Boolean(finalWindow.focused),
-        initialTabId: seedTab?.id ?? null
+        id: created.id,
+        focused: Boolean(created.focused),
+        initialTabId
       };
     },
     async updateWindow(windowId, options) {
@@ -2993,6 +2914,7 @@
       }
       case "sessionBinding.focus": {
         const result = await bindingManager.focus(String(params.bindingId ?? ""));
+        emitSessionBindingUpdated(result.binding.id, "focus", result.binding);
         return {
           ok: true,
           browser: result.binding

package/dist/manifest.json

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

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@flrande/bak-extension",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "type": "module",
   "dependencies": {
-    "@flrande/bak-protocol": "0.6.9"
+    "@flrande/bak-protocol": "0.6.10"
   },
   "devDependencies": {
     "@types/chrome": "^0.1.14",