@flrande/bak-extension 0.6.7 → 0.6.8

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

@@ -1 +1 @@
-2026-03-13T07:58:24.806Z
+2026-03-13T08:51:15.417Z

package/dist/background.global.js

@@ -62,7 +62,7 @@
   // package.json
   var package_default = {
     name: "@flrande/bak-extension",
-    version: "0.6.7",
+    version: "0.6.8",
     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",
@@ -563,26 +563,37 @@
         }
       }
       if (!window2) {
-        const createdWindow = await this.browser.createWindow({
-          url: initialUrl,
-          focused: options.focus === true
-        });
-        state.windowId = createdWindow.id;
-        state.groupId = null;
-        state.tabIds = [];
-        state.activeTabId = null;
-        state.primaryTabId = null;
-        window2 = createdWindow;
-        const initialTab = typeof createdWindow.initialTabId === "number" ? await this.waitForTrackedTab(createdWindow.initialTabId, createdWindow.id) : null;
-        tabs = initialTab ? [initialTab] : await this.waitForWindowTabs(createdWindow.id);
-        state.tabIds = tabs.map((tab) => tab.id);
-        if (state.primaryTabId === null) {
-          state.primaryTabId = initialTab?.id ?? tabs[0]?.id ?? null;
-        }
-        if (state.activeTabId === null) {
-          state.activeTabId = tabs.find((tab) => tab.active)?.id ?? initialTab?.id ?? tabs[0]?.id ?? null;
-        }
-        repairActions.push(created ? "created-window" : "recreated-window");
+        const sharedWindow = await this.findSharedBindingWindow(bindingId);
+        if (sharedWindow) {
+          state.windowId = sharedWindow.id;
+          state.groupId = null;
+          state.tabIds = [];
+          state.activeTabId = null;
+          state.primaryTabId = null;
+          window2 = sharedWindow;
+          repairActions.push("attached-shared-window");
+        } else {
+          const createdWindow = await this.browser.createWindow({
+            url: initialUrl,
+            focused: options.focus === true
+          });
+          state.windowId = createdWindow.id;
+          state.groupId = null;
+          state.tabIds = [];
+          state.activeTabId = null;
+          state.primaryTabId = null;
+          window2 = createdWindow;
+          const initialTab = typeof createdWindow.initialTabId === "number" ? await this.waitForTrackedTab(createdWindow.initialTabId, createdWindow.id) : null;
+          tabs = initialTab ? [initialTab] : await this.waitForWindowTabs(createdWindow.id);
+          state.tabIds = tabs.map((tab) => tab.id);
+          if (state.primaryTabId === null) {
+            state.primaryTabId = initialTab?.id ?? tabs[0]?.id ?? null;
+          }
+          if (state.activeTabId === null) {
+            state.activeTabId = tabs.find((tab) => tab.active)?.id ?? initialTab?.id ?? tabs[0]?.id ?? null;
+          }
+          repairActions.push(created ? "created-window" : "recreated-window");
+        }
       }
       tabs = tabs.length > 0 ? tabs : await this.readTrackedTabs(state.tabIds, state.windowId);
       const recoveredTabs = await this.recoverBindingTabs(state, tabs);
@@ -596,12 +607,12 @@
       state.tabIds = tabs.map((tab) => tab.id);
       if (state.windowId !== null) {
         const ownership = await this.inspectBindingWindowOwnership(state, state.windowId);
-        if (ownership.foreignTabs.length > 0) {
-          const migrated = await this.moveBindingIntoDedicatedWindow(state, ownership, initialUrl);
+        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("migrated-dirty-window");
+          repairActions.push("evacuated-foreign-window");
         }
       }
       if (tabs.length === 0) {
@@ -698,7 +709,7 @@
       const desiredUrl = options.url ?? DEFAULT_SESSION_BINDING_URL;
       let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
         state,
-        ensured.created || ensured.repairActions.includes("recreated-window") || ensured.repairActions.includes("created-primary-tab") || ensured.repairActions.includes("migrated-dirty-window")
+        ensured.created || ensured.repairActions.includes("recreated-window") || ensured.repairActions.includes("created-primary-tab")
       );
       let createdTab;
       try {
@@ -831,29 +842,32 @@
       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)) {
+      const binding = await this.inspectBinding(bindingId);
+      if (!binding) {
+        throw new Error(`Binding ${bindingId} does not exist`);
+      }
+      const resolvedTabId = typeof tabId === "number" ? tabId : binding.activeTabId ?? binding.primaryTabId ?? binding.tabs[0]?.id;
+      if (typeof resolvedTabId !== "number" || !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);
+      const remainingTabIds = binding.tabIds.filter((candidate) => candidate !== resolvedTabId);
       if (remainingTabIds.length === 0) {
-        await this.storage.delete(ensured.binding.id);
+        await this.storage.delete(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 nextPrimaryTabId = binding.primaryTabId === resolvedTabId ? tabs[0]?.id ?? null : binding.primaryTabId;
+      const nextActiveTabId = binding.activeTabId === resolvedTabId ? tabs.find((candidate) => candidate.active)?.id ?? nextPrimaryTabId ?? tabs[0]?.id ?? null : 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,
+        id: binding.id,
+        label: binding.label,
+        color: binding.color,
+        windowId: tabs[0]?.windowId ?? binding.windowId,
+        groupId: tabs[0]?.groupId ?? binding.groupId,
         tabIds: tabs.map((candidate) => candidate.id),
         activeTabId: nextActiveTabId,
         primaryTabId: nextPrimaryTabId
@@ -882,7 +896,7 @@
         return { ok: true };
       }
       await this.storage.delete(bindingId);
-      const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+      const trackedTabs = await this.collectBindingTabsForClose(state);
       for (const trackedTab of trackedTabs) {
         try {
           await this.browser.closeTab(trackedTab.id);
@@ -1069,24 +1083,59 @@
     }
     async inspectBindingWindowOwnership(state, windowId) {
       const windowTabs = await this.waitForWindowTabs(windowId, 500);
-      const trackedIds = new Set(this.collectCandidateTabIds(state));
+      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: windowTabs.filter((tab) => trackedIds.has(tab.id) || state.groupId !== null && tab.groupId === state.groupId),
-        foreignTabs: windowTabs.filter((tab) => !trackedIds.has(tab.id) && (state.groupId === null || tab.groupId !== state.groupId))
+        bindingTabs,
+        sharedBindingTabs,
+        foreignTabs
       };
     }
-    async moveBindingIntoDedicatedWindow(state, ownership, initialUrl) {
+    async moveBindingIntoBakWindow(state, ownership, initialUrl) {
       const sourceTabs = this.orderSessionBindingTabsForMigration(state, ownership.bindingTabs);
       const seedUrl = sourceTabs[0]?.url ?? initialUrl;
-      const window2 = await this.browser.createWindow({
+      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 = typeof window2.initialTabId === "number" ? await this.waitForTrackedTab(window2.initialTabId, window2.id) : null;
-      const recreatedTabs = initialTab ? [initialTab] : await this.waitForWindowTabs(window2.id);
-      const firstTab = recreatedTabs[0] ?? null;
+      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] && firstTab) {
+      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)) {
@@ -1098,7 +1147,7 @@
         recreatedTabs.push(recreated);
         tabIdMap.set(sourceTab.id, recreated.id);
       }
-      const nextPrimaryTabId = (state.primaryTabId !== null ? tabIdMap.get(state.primaryTabId) : void 0) ?? firstTab?.id ?? recreatedTabs[0]?.id ?? 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 });
@@ -1113,7 +1162,10 @@
         tabIds: [...state.tabIds]
       });
       for (const bindingTab of ownership.bindingTabs) {
-        await this.browser.closeTab(bindingTab.id);
+        try {
+          await this.browser.closeTab(bindingTab.id);
+        } catch {
+        }
       }
       return {
         window: window2,
@@ -1145,6 +1197,57 @@
       }
       return ordered;
     }
+    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 pushWindowId = (windowId) => {
+        if (typeof windowId !== "number") {
+          return;
+        }
+        if (excludedWindowIds.includes(windowId) || candidateWindowIds.includes(windowId)) {
+          return;
+        }
+        candidateWindowIds.push(windowId);
+      };
+      for (const peer of peers) {
+        pushWindowId(peer.windowId);
+        if (peer.groupId !== null) {
+          peerGroupIds.add(peer.groupId);
+          const group = await this.waitForGroup(peer.groupId, 300);
+          pushWindowId(group?.windowId);
+        }
+        const trackedTabIds = this.collectCandidateTabIds(peer);
+        for (const trackedTabId of trackedTabIds) {
+          peerTabIds.add(trackedTabId);
+        }
+        const trackedTabs = await this.readLooseTrackedTabs(trackedTabIds);
+        for (const tab of trackedTabs) {
+          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 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;
+        }
+      }
+      return null;
+    }
     async recoverBindingTabs(state, existingTabs) {
       if (state.windowId === null) {
         return existingTabs;
@@ -1171,6 +1274,19 @@
       }
       return existingTabs;
     }
+    async collectBindingTabsForClose(state) {
+      const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+      if (state.windowId === null || state.groupId === null) {
+        return trackedTabs;
+      }
+      const windowTabs = await this.waitForWindowTabs(state.windowId, 300);
+      const groupedTabs = windowTabs.filter((tab) => tab.groupId === state.groupId);
+      const merged = /* @__PURE__ */ new Map();
+      for (const tab of [...trackedTabs, ...groupedTabs]) {
+        merged.set(tab.id, tab);
+      }
+      return [...merged.values()];
+    }
     async createBindingTab(options) {
       if (options.windowId === null) {
         throw new Error("Binding window is unavailable");
@@ -1200,6 +1316,7 @@
         return null;
       }
       let tabs = await this.readTrackedTabs(state.tabIds, state.windowId);
+      tabs = await this.recoverBindingTabs(state, tabs);
       const activeTab = state.activeTabId !== null ? await this.waitForTrackedTab(state.activeTabId, state.windowId, 300) : null;
       if (activeTab && !tabs.some((tab) => tab.id === activeTab.id)) {
         tabs = [...tabs, activeTab];

package/dist/manifest.json

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

package/package.json

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

package/src/session-binding.ts

@@ -68,8 +68,8 @@ export interface SessionBindingStorage {
   list(): Promise<SessionBindingRecord[]>;
 }
 
-export interface SessionBindingBrowser {
-  getTab(tabId: number): Promise<SessionBindingTab | null>;
+export interface SessionBindingBrowser {
+  getTab(tabId: number): Promise<SessionBindingTab | null>;
   getActiveTab(): Promise<SessionBindingTab | null>;
   listTabs(filter?: { windowId?: number }): Promise<SessionBindingTab[]>;
   createTab(options: { windowId?: number; url?: string; active?: boolean }): Promise<SessionBindingTab>;
@@ -81,14 +81,15 @@ export interface SessionBindingBrowser {
   closeWindow(windowId: number): Promise<void>;
   getGroup(groupId: number): Promise<SessionBindingGroup | null>;
   groupTabs(tabIds: number[], groupId?: number): Promise<number>;
-  updateGroup(groupId: number, options: { title?: string; color?: SessionBindingColor; collapsed?: boolean }): Promise<SessionBindingGroup>;
-}
-
-interface SessionBindingWindowOwnership {
-  bindingTabs: SessionBindingTab[];
-  foreignTabs: SessionBindingTab[];
-}
-
+  updateGroup(groupId: number, options: { title?: string; color?: SessionBindingColor; collapsed?: boolean }): Promise<SessionBindingGroup>;
+}
+
+interface SessionBindingWindowOwnership {
+  bindingTabs: SessionBindingTab[];
+  sharedBindingTabs: SessionBindingTab[];
+  foreignTabs: SessionBindingTab[];
+}
+
 export interface SessionBindingEnsureOptions {
   bindingId?: string;
   focus?: boolean;
@@ -145,54 +146,65 @@ class SessionBindingManager {
       }
     }
     if (!window) {
-      const createdWindow = await this.browser.createWindow({
-        url: initialUrl,
-        focused: options.focus === true
-      });
-      state.windowId = createdWindow.id;
-      state.groupId = null;
-      state.tabIds = [];
-      state.activeTabId = null;
-      state.primaryTabId = null;
-      window = createdWindow;
-      const initialTab =
-        typeof createdWindow.initialTabId === 'number'
-          ? await this.waitForTrackedTab(createdWindow.initialTabId, createdWindow.id)
-          : null;
-      tabs = initialTab ? [initialTab] : await this.waitForWindowTabs(createdWindow.id);
-      state.tabIds = tabs.map((tab) => tab.id);
-      if (state.primaryTabId === null) {
-        state.primaryTabId = initialTab?.id ?? tabs[0]?.id ?? null;
-      }
-      if (state.activeTabId === null) {
-        state.activeTabId = tabs.find((tab) => tab.active)?.id ?? initialTab?.id ?? tabs[0]?.id ?? null;
+      const sharedWindow = await this.findSharedBindingWindow(bindingId);
+      if (sharedWindow) {
+        state.windowId = sharedWindow.id;
+        state.groupId = null;
+        state.tabIds = [];
+        state.activeTabId = null;
+        state.primaryTabId = null;
+        window = sharedWindow;
+        repairActions.push('attached-shared-window');
+      } else {
+        const createdWindow = await this.browser.createWindow({
+          url: initialUrl,
+          focused: options.focus === true
+        });
+        state.windowId = createdWindow.id;
+        state.groupId = null;
+        state.tabIds = [];
+        state.activeTabId = null;
+        state.primaryTabId = null;
+        window = createdWindow;
+        const initialTab =
+          typeof createdWindow.initialTabId === 'number'
+            ? await this.waitForTrackedTab(createdWindow.initialTabId, createdWindow.id)
+            : null;
+        tabs = initialTab ? [initialTab] : await this.waitForWindowTabs(createdWindow.id);
+        state.tabIds = tabs.map((tab) => tab.id);
+        if (state.primaryTabId === null) {
+          state.primaryTabId = initialTab?.id ?? tabs[0]?.id ?? null;
+        }
+        if (state.activeTabId === null) {
+          state.activeTabId = tabs.find((tab) => tab.active)?.id ?? initialTab?.id ?? tabs[0]?.id ?? null;
+        }
+        repairActions.push(created ? 'created-window' : 'recreated-window');
       }
-      repairActions.push(created ? 'created-window' : 'recreated-window');
     }
-
-    tabs = tabs.length > 0 ? tabs : await this.readTrackedTabs(state.tabIds, state.windowId);
-    const recoveredTabs = await this.recoverBindingTabs(state, tabs);
-    if (recoveredTabs.length > tabs.length) {
+
+    tabs = tabs.length > 0 ? tabs : await this.readTrackedTabs(state.tabIds, state.windowId);
+    const recoveredTabs = await this.recoverBindingTabs(state, tabs);
+    if (recoveredTabs.length > tabs.length) {
       tabs = recoveredTabs;
       repairActions.push('recovered-tracked-tabs');
     }
     if (tabs.length !== state.tabIds.length) {
       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) {
-        const migrated = await this.moveBindingIntoDedicatedWindow(state, ownership, initialUrl);
-        window = migrated.window;
-        tabs = migrated.tabs;
-        state.tabIds = tabs.map((tab) => tab.id);
-        repairActions.push('migrated-dirty-window');
-      }
-    }
-
-    if (tabs.length === 0) {
+    }
+    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);
+        window = 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,
@@ -293,13 +305,12 @@ class SessionBindingManager {
     }
     const active = options.active === true;
     const desiredUrl = options.url ?? DEFAULT_SESSION_BINDING_URL;
-    let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
-      state,
-      ensured.created ||
-        ensured.repairActions.includes('recreated-window') ||
-        ensured.repairActions.includes('created-primary-tab') ||
-        ensured.repairActions.includes('migrated-dirty-window')
-    );
+    let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
+      state,
+      ensured.created ||
+        ensured.repairActions.includes('recreated-window') ||
+        ensured.repairActions.includes('created-primary-tab')
+    );
 
     let createdTab: SessionBindingTab;
     try {
@@ -443,20 +454,23 @@ class SessionBindingManager {
   }
 
   async closeTab(bindingId: string, tabId?: number): Promise<{ binding: SessionBindingInfo | null; closedTabId: number }> {
-    const ensured = await this.ensureBinding({ bindingId, focus: false });
+    const binding = await this.inspectBinding(bindingId);
+    if (!binding) {
+      throw new Error(`Binding ${bindingId} does not exist`);
+    }
     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)) {
+        : binding.activeTabId ?? binding.primaryTabId ?? binding.tabs[0]?.id;
+    if (typeof resolvedTabId !== 'number' || !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);
+    const remainingTabIds = binding.tabIds.filter((candidate) => candidate !== resolvedTabId);
 
     if (remainingTabIds.length === 0) {
-      await this.storage.delete(ensured.binding.id);
+      await this.storage.delete(binding.id);
       return {
         binding: null,
         closedTabId: resolvedTabId
@@ -465,17 +479,17 @@ class SessionBindingManager {
 
     const tabs = await this.readLooseTrackedTabs(remainingTabIds);
     const nextPrimaryTabId =
-      ensured.binding.primaryTabId === resolvedTabId ? tabs[0]?.id ?? null : ensured.binding.primaryTabId;
+      binding.primaryTabId === resolvedTabId ? tabs[0]?.id ?? null : binding.primaryTabId;
     const nextActiveTabId =
-      ensured.binding.activeTabId === resolvedTabId
+      binding.activeTabId === resolvedTabId
         ? tabs.find((candidate) => candidate.active)?.id ?? nextPrimaryTabId ?? tabs[0]?.id ?? null
-        : ensured.binding.activeTabId;
+        : binding.activeTabId;
     const nextState: SessionBindingRecord = {
-      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,
+      id: binding.id,
+      label: binding.label,
+      color: binding.color,
+      windowId: tabs[0]?.windowId ?? binding.windowId,
+      groupId: tabs[0]?.groupId ?? binding.groupId,
       tabIds: tabs.map((candidate) => candidate.id),
       activeTabId: nextActiveTabId,
       primaryTabId: nextPrimaryTabId
@@ -508,7 +522,7 @@ class SessionBindingManager {
     // Clear persisted state before closing the window so tab/window removal
     // listeners cannot race and resurrect an empty binding record.
     await this.storage.delete(bindingId);
-    const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+    const trackedTabs = await this.collectBindingTabsForClose(state);
     for (const trackedTab of trackedTabs) {
       try {
         await this.browser.closeTab(trackedTab.id);
@@ -673,7 +687,7 @@ class SessionBindingManager {
     return [...new Set(state.tabIds.concat([state.activeTabId, state.primaryTabId].filter((value): value is number => typeof value === 'number')))];
   }
 
-  private async rebindBindingWindow(state: SessionBindingRecord): Promise<{ window: SessionBindingWindow; tabs: SessionBindingTab[] } | null> {
+  private async rebindBindingWindow(state: SessionBindingRecord): Promise<{ window: SessionBindingWindow; tabs: SessionBindingTab[] } | null> {
     const candidateWindowIds: number[] = [];
     const pushWindowId = (windowId: number | null | undefined): void => {
       if (typeof windowId !== 'number') {
@@ -718,59 +732,100 @@ class SessionBindingManager {
       return { window, tabs };
     }
 
-    return null;
-  }
-
-  private async inspectBindingWindowOwnership(state: SessionBindingRecord, windowId: number): Promise<SessionBindingWindowOwnership> {
-    const windowTabs = await this.waitForWindowTabs(windowId, 500);
-    const trackedIds = new Set(this.collectCandidateTabIds(state));
-    return {
-      bindingTabs: windowTabs.filter((tab) => trackedIds.has(tab.id) || (state.groupId !== null && tab.groupId === state.groupId)),
-      foreignTabs: windowTabs.filter((tab) => !trackedIds.has(tab.id) && (state.groupId === null || tab.groupId !== state.groupId))
-    };
-  }
-
-  private async moveBindingIntoDedicatedWindow(
+    return null;
+  }
+
+  private async inspectBindingWindowOwnership(state: SessionBindingRecord, windowId: number): Promise<SessionBindingWindowOwnership> {
+    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 = new Set<number>();
+    const peerGroupIds = new Set<number>();
+    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: SessionBindingTab[] = [];
+    const sharedBindingTabs: SessionBindingTab[] = [];
+    const foreignTabs: SessionBindingTab[] = [];
+    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
+    };
+  }
+
+  private async moveBindingIntoBakWindow(
     state: SessionBindingRecord,
     ownership: SessionBindingWindowOwnership,
     initialUrl: string
   ): Promise<{ window: SessionBindingWindow; tabs: SessionBindingTab[] }> {
-    const sourceTabs = this.orderSessionBindingTabsForMigration(state, ownership.bindingTabs);
-    const seedUrl = sourceTabs[0]?.url ?? initialUrl;
-    const window = await this.browser.createWindow({
-      url: seedUrl || DEFAULT_SESSION_BINDING_URL,
-      focused: false
-    });
+    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 window =
+      sharedWindow ??
+      (await this.browser.createWindow({
+        url: seedUrl || DEFAULT_SESSION_BINDING_URL,
+        focused: false
+      }));
     const initialTab =
-      typeof window.initialTabId === 'number' ? await this.waitForTrackedTab(window.initialTabId, window.id) : null;
-    const recreatedTabs = initialTab ? [initialTab] : await this.waitForWindowTabs(window.id);
-    const firstTab = recreatedTabs[0] ?? null;
-    const tabIdMap = new Map<number, number>();
-    if (sourceTabs[0] && firstTab) {
-      tabIdMap.set(sourceTabs[0].id, firstTab.id);
-    }
-
-    for (const sourceTab of sourceTabs.slice(1)) {
-      const recreated = await this.createBindingTab({
-        windowId: window.id,
-        url: sourceTab.url,
-        active: false
-      });
-      recreatedTabs.push(recreated);
-      tabIdMap.set(sourceTab.id, recreated.id);
-    }
-
-    const nextPrimaryTabId =
-      (state.primaryTabId !== null ? tabIdMap.get(state.primaryTabId) : undefined) ??
-      firstTab?.id ??
-      recreatedTabs[0]?.id ??
-      null;
-    const nextActiveTabId =
-      (state.activeTabId !== null ? tabIdMap.get(state.activeTabId) : undefined) ?? nextPrimaryTabId ?? recreatedTabs[0]?.id ?? null;
-    if (nextActiveTabId !== null) {
-      await this.browser.updateTab(nextActiveTabId, { active: true });
-    }
-
+      sharedWindow || typeof window.initialTabId !== 'number' ? null : await this.waitForTrackedTab(window.initialTabId, window.id);
+    const recreatedTabs: SessionBindingTab[] = [];
+    const tabIdMap = new Map<number, number>();
+
+    if (sourceTabs[0]) {
+      const firstTab = initialTab
+        ? await this.browser.updateTab(initialTab.id, {
+            url: sourceTabs[0].url,
+            active: false
+          })
+        : await this.createBindingTab({
+            windowId: window.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: window.id,
+        url: sourceTab.url,
+        active: false
+      });
+      recreatedTabs.push(recreated);
+      tabIdMap.set(sourceTab.id, recreated.id);
+    }
+
+    const nextPrimaryTabId =
+      (state.primaryTabId !== null ? tabIdMap.get(state.primaryTabId) : undefined) ??
+      recreatedTabs[0]?.id ??
+      null;
+    const nextActiveTabId =
+      (state.activeTabId !== null ? tabIdMap.get(state.activeTabId) : undefined) ?? nextPrimaryTabId ?? recreatedTabs[0]?.id ?? null;
+    if (nextActiveTabId !== null) {
+      await this.browser.updateTab(nextActiveTabId, { active: true });
+    }
+
     state.windowId = window.id;
     state.groupId = null;
     state.tabIds = recreatedTabs.map((tab) => tab.id);
@@ -782,43 +837,102 @@ class SessionBindingManager {
     });
 
     for (const bindingTab of ownership.bindingTabs) {
-      await this.browser.closeTab(bindingTab.id);
+      try {
+        await this.browser.closeTab(bindingTab.id);
+      } catch {
+        // Ignore tabs that were already removed while evacuating the binding.
+      }
     }
+
+    return {
+      window,
+      tabs: await this.readTrackedTabs(state.tabIds, state.windowId)
+    };
+  }
+
+  private orderSessionBindingTabsForMigration(state: SessionBindingRecord, tabs: SessionBindingTab[]): SessionBindingTab[] {
+    const ordered: SessionBindingTab[] = [];
+    const seen = new Set<number>();
+    const pushById = (tabId: number | null): void => {
+      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;
+  }
+
+  private async findSharedBindingWindow(bindingId: string, excludedWindowIds: number[] = []): Promise<SessionBindingWindow | null> {
+    const peers = (await this.storage.list()).filter((candidate) => candidate.id !== bindingId);
+    const candidateWindowIds: number[] = [];
+    const peerTabIds = new Set<number>();
+    const peerGroupIds = new Set<number>();
+    const pushWindowId = (windowId: number | null | undefined): void => {
+      if (typeof windowId !== 'number') {
+        return;
+      }
+      if (excludedWindowIds.includes(windowId) || candidateWindowIds.includes(windowId)) {
+        return;
+      }
+      candidateWindowIds.push(windowId);
+    };
+
+    for (const peer of peers) {
+      pushWindowId(peer.windowId);
+      if (peer.groupId !== null) {
+        peerGroupIds.add(peer.groupId);
+        const group = await this.waitForGroup(peer.groupId, 300);
+        pushWindowId(group?.windowId);
+      }
+      const trackedTabIds = this.collectCandidateTabIds(peer);
+      for (const trackedTabId of trackedTabIds) {
+        peerTabIds.add(trackedTabId);
+      }
+      const trackedTabs = await this.readLooseTrackedTabs(trackedTabIds);
+      for (const tab of trackedTabs) {
+        pushWindowId(tab.windowId);
+      }
+    }
+
+    for (const windowId of candidateWindowIds) {
+      const window = await this.waitForWindow(windowId, 300);
+      if (window) {
+        const windowTabs = await this.waitForWindowTabs(window.id, 300);
+        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 window;
+      }
+    }
+
+    return null;
+  }
 
-    return {
-      window,
-      tabs: await this.readTrackedTabs(state.tabIds, state.windowId)
-    };
-  }
-
-  private orderSessionBindingTabsForMigration(state: SessionBindingRecord, tabs: SessionBindingTab[]): SessionBindingTab[] {
-    const ordered: SessionBindingTab[] = [];
-    const seen = new Set<number>();
-    const pushById = (tabId: number | null): void => {
-      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;
-  }
-
-  private async recoverBindingTabs(state: SessionBindingRecord, existingTabs: SessionBindingTab[]): Promise<SessionBindingTab[]> {
+  private async recoverBindingTabs(state: SessionBindingRecord, existingTabs: SessionBindingTab[]): Promise<SessionBindingTab[]> {
     if (state.windowId === null) {
       return existingTabs;
     }
@@ -847,8 +961,22 @@ class SessionBindingManager {
       return preferredTabs;
     }
 
-    return existingTabs;
-  }
+    return existingTabs;
+  }
+
+  private async collectBindingTabsForClose(state: SessionBindingRecord): Promise<SessionBindingTab[]> {
+    const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+    if (state.windowId === null || state.groupId === null) {
+      return trackedTabs;
+    }
+    const windowTabs = await this.waitForWindowTabs(state.windowId, 300);
+    const groupedTabs = windowTabs.filter((tab) => tab.groupId === state.groupId);
+    const merged = new Map<number, SessionBindingTab>();
+    for (const tab of [...trackedTabs, ...groupedTabs]) {
+      merged.set(tab.id, tab);
+    }
+    return [...merged.values()];
+  }
 
   private async createBindingTab(options: { windowId: number | null; url: string; active: boolean }): Promise<SessionBindingTab> {
     if (options.windowId === null) {
@@ -877,17 +1005,18 @@ class SessionBindingManager {
     throw lastError ?? new Error(`No window with id: ${options.windowId}.`);
   }
 
-  private async inspectBinding(bindingId: string): Promise<SessionBindingInfo | null> {
-    const state = await this.loadBindingRecord(bindingId);
-    if (!state) {
-      return null;
-    }
-
-    let tabs = await this.readTrackedTabs(state.tabIds, state.windowId);
-    const activeTab = state.activeTabId !== null ? await this.waitForTrackedTab(state.activeTabId, state.windowId, 300) : null;
-    if (activeTab && !tabs.some((tab) => tab.id === activeTab.id)) {
-      tabs = [...tabs, activeTab];
-    }
+  private async inspectBinding(bindingId: string): Promise<SessionBindingInfo | null> {
+    const state = await this.loadBindingRecord(bindingId);
+    if (!state) {
+      return null;
+    }
+
+    let tabs = await this.readTrackedTabs(state.tabIds, state.windowId);
+    tabs = await this.recoverBindingTabs(state, tabs);
+    const activeTab = state.activeTabId !== null ? await this.waitForTrackedTab(state.activeTabId, state.windowId, 300) : null;
+    if (activeTab && !tabs.some((tab) => tab.id === activeTab.id)) {
+      tabs = [...tabs, activeTab];
+    }
     if (tabs.length === 0 && state.primaryTabId !== null) {
       const primaryTab = await this.waitForTrackedTab(state.primaryTabId, state.windowId, 300);
       if (primaryTab) {