@flrande/bak-extension 0.6.5 → 0.6.6

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

@@ -1 +1 @@
-2026-03-13T06:30:44.568Z
+2026-03-13T07:15:48.660Z

package/dist/background.global.js

@@ -62,7 +62,7 @@
   // package.json
   var package_default = {
     name: "@flrande/bak-extension",
-    version: "0.6.5",
+    version: "0.6.6",
     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",
@@ -573,13 +573,14 @@
         state.activeTabId = null;
         state.primaryTabId = null;
         window2 = createdWindow;
-        tabs = await this.waitForWindowTabs(createdWindow.id);
+        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 = tabs[0]?.id ?? null;
+          state.primaryTabId = initialTab?.id ?? tabs[0]?.id ?? null;
         }
         if (state.activeTabId === null) {
-          state.activeTabId = tabs.find((tab) => tab.active)?.id ?? tabs[0]?.id ?? null;
+          state.activeTabId = tabs.find((tab) => tab.active)?.id ?? initialTab?.id ?? tabs[0]?.id ?? null;
         }
         repairActions.push(created ? "created-window" : "recreated-window");
       }
@@ -1081,7 +1082,8 @@
         url: seedUrl || DEFAULT_SESSION_BINDING_URL,
         focused: false
       });
-      const recreatedTabs = await this.waitForWindowTabs(window2.id);
+      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 tabIdMap = /* @__PURE__ */ new Map();
       if (sourceTabs[0] && firstTab) {
@@ -1608,14 +1610,42 @@
     },
     async createWindow(options) {
       const previouslyFocusedWindow = options.focused === true ? null : (await chrome.windows.getAll()).find((window2) => window2.focused === true && typeof window2.id === "number") ?? null;
-      const previouslyFocusedTab = previouslyFocusedWindow?.id !== void 0 ? (await chrome.tabs.query({ windowId: previouslyFocusedWindow.id, active: true })).find((tab) => typeof tab.id === "number") ?? null : null;
-      const created = await chrome.windows.create({
-        url: options.url ?? "about:blank",
+      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
       });
       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") {
@@ -1625,7 +1655,8 @@
       const finalWindow = await chrome.windows.get(created.id);
       return {
         id: finalWindow.id,
-        focused: Boolean(finalWindow.focused)
+        focused: Boolean(finalWindow.focused),
+        initialTabId: seedTab?.id ?? null
       };
     },
     async updateWindow(windowId, options) {

package/dist/manifest.json

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

package/package.json

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

package/src/background.ts

@@ -411,7 +411,7 @@ function emitSessionBindingUpdated(
   });
 }
 
-const sessionBindingBrowser: SessionBindingBrowser = {
+const sessionBindingBrowser: SessionBindingBrowser = {
   async getTab(tabId) {
     try {
       return toTabInfo(await chrome.tabs.get(tabId));
@@ -468,34 +468,71 @@ const sessionBindingBrowser: SessionBindingBrowser = {
       return null;
     }
   },
-  async createWindow(options) {
-    const previouslyFocusedWindow =
-      options.focused === true
-        ? null
-        : (await chrome.windows.getAll()).find((window) => window.focused === true && typeof window.id === 'number') ?? null;
-    const previouslyFocusedTab =
-      previouslyFocusedWindow?.id !== undefined
-        ? (await chrome.tabs.query({ windowId: previouslyFocusedWindow.id, active: true })).find((tab) => typeof tab.id === 'number') ?? null
-        : null;
-    const created = await chrome.windows.create({
-      url: options.url ?? 'about:blank',
-      focused: true
-    });
-    if (!created || typeof created.id !== 'number') {
-      throw new Error('Window missing 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 });
-      }
+  async createWindow(options) {
+    const previouslyFocusedWindow =
+      options.focused === true
+        ? null
+        : (await chrome.windows.getAll()).find((window) => window.focused === true && typeof window.id === 'number') ?? null;
+    const previouslyFocusedTabs =
+      previouslyFocusedWindow?.id !== undefined ? 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
+    });
+    if (!created || typeof created.id !== 'number') {
+      throw new Error('Window missing id');
+    }
+    const pickSeedTab = async (windowId: number): Promise<chrome.tabs.Tab | null> => {
+      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);
-    return {
-      id: finalWindow.id!,
-      focused: Boolean(finalWindow.focused)
-    };
-  },
+    return {
+      id: finalWindow.id!,
+      focused: Boolean(finalWindow.focused),
+      initialTabId: seedTab?.id ?? null
+    };
+  },
   async updateWindow(windowId, options) {
     const updated = await chrome.windows.update(windowId, {
       focused: options.focused

package/src/session-binding.ts

@@ -16,10 +16,11 @@ export interface SessionBindingTab {
   groupId: number | null;
 }
 
-export interface SessionBindingWindow {
-  id: number;
-  focused: boolean;
-}
+export interface SessionBindingWindow {
+  id: number;
+  focused: boolean;
+  initialTabId?: number | null;
+}
 
 export interface SessionBindingGroup {
   id: number;
@@ -143,27 +144,31 @@ class SessionBindingManager {
         }
       }
     }
-    if (!window) {
-      const createdWindow = await this.browser.createWindow({
-        url: initialUrl,
-        focused: options.focus === true
-      });
+    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;
-      tabs = await this.waitForWindowTabs(createdWindow.id);
-      state.tabIds = tabs.map((tab) => tab.id);
-      if (state.primaryTabId === null) {
-        state.primaryTabId = tabs[0]?.id ?? null;
-      }
-      if (state.activeTabId === null) {
-        state.activeTabId = tabs.find((tab) => tab.active)?.id ?? tabs[0]?.id ?? null;
-      }
-      repairActions.push(created ? 'created-window' : 'recreated-window');
-    }
+      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');
+    }
 
     tabs = tabs.length > 0 ? tabs : await this.readTrackedTabs(state.tabIds, state.windowId);
     const recoveredTabs = await this.recoverBindingTabs(state, tabs);
@@ -725,19 +730,21 @@ class SessionBindingManager {
     };
   }
 
-  private async moveBindingIntoDedicatedWindow(
-    state: SessionBindingRecord,
-    ownership: SessionBindingWindowOwnership,
-    initialUrl: string
-  ): Promise<{ window: SessionBindingWindow; tabs: SessionBindingTab[] }> {
+  private async moveBindingIntoDedicatedWindow(
+    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 recreatedTabs = await this.waitForWindowTabs(window.id);
-    const firstTab = recreatedTabs[0] ?? null;
+    const window = 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);