@flrande/bak-extension 0.3.1 → 0.3.3

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

@@ -1 +1 @@
-2026-03-09T04:26:20.181Z
+2026-03-09T05:59:06.644Z

package/dist/background.global.js

@@ -52,8 +52,19 @@
       const persisted = await this.storage.load();
       const created = !persisted;
       let state = this.normalizeState(persisted, workspaceId);
+      const originalWindowId = state.windowId;
       let window = state.windowId !== null ? await this.waitForWindow(state.windowId) : null;
       let tabs = [];
+      if (!window) {
+        const rebound = await this.rebindWorkspaceWindow(state);
+        if (rebound) {
+          window = rebound.window;
+          tabs = rebound.tabs;
+          if (originalWindowId !== rebound.window.id) {
+            repairActions.push("rebound-window");
+          }
+        }
+      }
       if (!window) {
         const createdWindow = await this.browser.createWindow({
           url: initialUrl,
@@ -158,12 +169,22 @@
       };
     }
     async openTab(options = {}) {
+      const workspaceId = this.normalizeWorkspaceId(options.workspaceId);
+      const hadWorkspace = await this.loadWorkspaceRecord(workspaceId) !== null;
       const ensured = await this.ensureWorkspace({
-        workspaceId: options.workspaceId,
+        workspaceId,
         focus: false,
-        initialUrl: options.url ?? DEFAULT_WORKSPACE_URL
+        initialUrl: hadWorkspace ? options.url ?? DEFAULT_WORKSPACE_URL : DEFAULT_WORKSPACE_URL
       });
-      let state = { ...ensured.workspace };
+      let state = { ...ensured.workspace, tabIds: [...ensured.workspace.tabIds], tabs: [...ensured.workspace.tabs] };
+      if (state.windowId !== null && state.tabs.length === 0) {
+        const rebound = await this.rebindWorkspaceWindow(state);
+        if (rebound) {
+          state.windowId = rebound.window.id;
+          state.tabs = rebound.tabs;
+          state.tabIds = [...new Set(rebound.tabs.map((tab2) => tab2.id))];
+        }
+      }
       const active = options.active === true;
       const desiredUrl = options.url ?? DEFAULT_WORKSPACE_URL;
       let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
@@ -185,7 +206,7 @@
           throw error;
         }
         const repaired = await this.ensureWorkspace({
-          workspaceId: options.workspaceId,
+          workspaceId,
           focus: false,
           initialUrl: desiredUrl
         });
@@ -452,6 +473,60 @@
       )).filter((tab) => tab !== null);
       return tabs;
     }
+    async readLooseTrackedTabs(tabIds) {
+      const tabs = (await Promise.all(
+        tabIds.map(async (tabId) => {
+          return await this.browser.getTab(tabId);
+        })
+      )).filter((tab) => tab !== null);
+      return tabs;
+    }
+    collectCandidateTabIds(state) {
+      return [...new Set(state.tabIds.concat([state.activeTabId, state.primaryTabId].filter((value) => typeof value === "number")))];
+    }
+    async rebindWorkspaceWindow(state) {
+      const candidateWindowIds = [];
+      const pushWindowId = (windowId) => {
+        if (typeof windowId !== "number") {
+          return;
+        }
+        if (!candidateWindowIds.includes(windowId)) {
+          candidateWindowIds.push(windowId);
+        }
+      };
+      const group = state.groupId !== null ? await this.browser.getGroup(state.groupId) : null;
+      pushWindowId(group?.windowId);
+      const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+      for (const tab of trackedTabs) {
+        pushWindowId(tab.windowId);
+      }
+      for (const candidateWindowId of candidateWindowIds) {
+        const window = await this.waitForWindow(candidateWindowId);
+        if (!window) {
+          continue;
+        }
+        let tabs = await this.readTrackedTabs(this.collectCandidateTabIds(state), candidateWindowId);
+        if (tabs.length === 0 && group?.id !== null && group?.windowId === candidateWindowId) {
+          const windowTabs = await this.waitForWindowTabs(candidateWindowId, 750);
+          tabs = windowTabs.filter((tab) => tab.groupId === group.id);
+        }
+        if (tabs.length === 0) {
+          tabs = trackedTabs.filter((tab) => tab.windowId === candidateWindowId);
+        }
+        state.windowId = candidateWindowId;
+        if (tabs.length > 0) {
+          state.tabIds = [...new Set(tabs.map((tab) => tab.id))];
+          if (state.primaryTabId === null || !state.tabIds.includes(state.primaryTabId)) {
+            state.primaryTabId = tabs[0]?.id ?? null;
+          }
+          if (state.activeTabId === null || !state.tabIds.includes(state.activeTabId)) {
+            state.activeTabId = tabs.find((tab) => tab.active)?.id ?? state.primaryTabId;
+          }
+        }
+        return { window, tabs };
+      }
+      return null;
+    }
     async recoverWorkspaceTabs(state, existingTabs) {
       if (state.windowId === null) {
         return existingTabs;
@@ -524,17 +599,31 @@
       };
     }
     async resolveReusablePrimaryTab(workspace, allowReuse) {
-      if (!allowReuse || workspace.windowId === null) {
+      if (workspace.windowId === null) {
         return null;
       }
       if (workspace.primaryTabId !== null) {
         const trackedPrimary = workspace.tabs.find((tab) => tab.id === workspace.primaryTabId) ?? await this.waitForTrackedTab(workspace.primaryTabId, workspace.windowId);
-        if (trackedPrimary) {
+        if (trackedPrimary && (allowReuse || this.isReusableBlankWorkspaceTab(trackedPrimary, workspace))) {
           return trackedPrimary;
         }
       }
       const windowTabs = await this.waitForWindowTabs(workspace.windowId, 750);
-      return windowTabs.length === 1 ? windowTabs[0] : null;
+      if (windowTabs.length !== 1) {
+        return null;
+      }
+      const candidate = windowTabs[0];
+      if (allowReuse || this.isReusableBlankWorkspaceTab(candidate, workspace)) {
+        return candidate;
+      }
+      return null;
+    }
+    isReusableBlankWorkspaceTab(tab, workspace) {
+      if (workspace.tabIds.length > 1) {
+        return false;
+      }
+      const normalizedUrl = tab.url.trim().toLowerCase();
+      return normalizedUrl === "" || normalizedUrl === DEFAULT_WORKSPACE_URL;
     }
     async waitForWindow(windowId, timeoutMs = 750) {
       const deadline = Date.now() + timeoutMs;

package/package.json

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

package/src/workspace.ts

@@ -119,8 +119,19 @@ export class WorkspaceManager {
     const created = !persisted;
     let state = this.normalizeState(persisted, workspaceId);
 
+    const originalWindowId = state.windowId;
     let window = state.windowId !== null ? await this.waitForWindow(state.windowId) : null;
     let tabs: WorkspaceTab[] = [];
+    if (!window) {
+      const rebound = await this.rebindWorkspaceWindow(state);
+      if (rebound) {
+        window = rebound.window;
+        tabs = rebound.tabs;
+        if (originalWindowId !== rebound.window.id) {
+          repairActions.push('rebound-window');
+        }
+      }
+    }
     if (!window) {
       const createdWindow = await this.browser.createWindow({
         url: initialUrl,
@@ -236,12 +247,22 @@ export class WorkspaceManager {
   }
 
   async openTab(options: WorkspaceOpenTabOptions = {}): Promise<{ workspace: WorkspaceInfo; tab: WorkspaceTab }> {
+    const workspaceId = this.normalizeWorkspaceId(options.workspaceId);
+    const hadWorkspace = (await this.loadWorkspaceRecord(workspaceId)) !== null;
     const ensured = await this.ensureWorkspace({
-      workspaceId: options.workspaceId,
+      workspaceId,
       focus: false,
-      initialUrl: options.url ?? DEFAULT_WORKSPACE_URL
+      initialUrl: hadWorkspace ? options.url ?? DEFAULT_WORKSPACE_URL : DEFAULT_WORKSPACE_URL
     });
-    let state = { ...ensured.workspace };
+    let state = { ...ensured.workspace, tabIds: [...ensured.workspace.tabIds], tabs: [...ensured.workspace.tabs] };
+    if (state.windowId !== null && state.tabs.length === 0) {
+      const rebound = await this.rebindWorkspaceWindow(state);
+      if (rebound) {
+        state.windowId = rebound.window.id;
+        state.tabs = rebound.tabs;
+        state.tabIds = [...new Set(rebound.tabs.map((tab) => tab.id))];
+      }
+    }
     const active = options.active === true;
     const desiredUrl = options.url ?? DEFAULT_WORKSPACE_URL;
     let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
@@ -266,7 +287,7 @@ export class WorkspaceManager {
         throw error;
       }
       const repaired = await this.ensureWorkspace({
-        workspaceId: options.workspaceId,
+        workspaceId,
         focus: false,
         initialUrl: desiredUrl
       });
@@ -561,6 +582,69 @@ export class WorkspaceManager {
     return tabs;
   }
 
+  private async readLooseTrackedTabs(tabIds: number[]): Promise<WorkspaceTab[]> {
+    const tabs = (
+      await Promise.all(
+        tabIds.map(async (tabId) => {
+          return await this.browser.getTab(tabId);
+        })
+      )
+    ).filter((tab): tab is WorkspaceTab => tab !== null);
+    return tabs;
+  }
+
+  private collectCandidateTabIds(state: WorkspaceRecord): number[] {
+    return [...new Set(state.tabIds.concat([state.activeTabId, state.primaryTabId].filter((value): value is number => typeof value === 'number')))];
+  }
+
+  private async rebindWorkspaceWindow(state: WorkspaceRecord): Promise<{ window: WorkspaceWindow; tabs: WorkspaceTab[] } | null> {
+    const candidateWindowIds: number[] = [];
+    const pushWindowId = (windowId: number | null | undefined): void => {
+      if (typeof windowId !== 'number') {
+        return;
+      }
+      if (!candidateWindowIds.includes(windowId)) {
+        candidateWindowIds.push(windowId);
+      }
+    };
+
+    const group = state.groupId !== null ? await this.browser.getGroup(state.groupId) : null;
+    pushWindowId(group?.windowId);
+
+    const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+    for (const tab of trackedTabs) {
+      pushWindowId(tab.windowId);
+    }
+
+    for (const candidateWindowId of candidateWindowIds) {
+      const window = await this.waitForWindow(candidateWindowId);
+      if (!window) {
+        continue;
+      }
+      let tabs = await this.readTrackedTabs(this.collectCandidateTabIds(state), candidateWindowId);
+      if (tabs.length === 0 && group?.id !== null && group?.windowId === candidateWindowId) {
+        const windowTabs = await this.waitForWindowTabs(candidateWindowId, 750);
+        tabs = windowTabs.filter((tab) => tab.groupId === group.id);
+      }
+      if (tabs.length === 0) {
+        tabs = trackedTabs.filter((tab) => tab.windowId === candidateWindowId);
+      }
+      state.windowId = candidateWindowId;
+      if (tabs.length > 0) {
+        state.tabIds = [...new Set(tabs.map((tab) => tab.id))];
+        if (state.primaryTabId === null || !state.tabIds.includes(state.primaryTabId)) {
+          state.primaryTabId = tabs[0]?.id ?? null;
+        }
+        if (state.activeTabId === null || !state.tabIds.includes(state.activeTabId)) {
+          state.activeTabId = tabs.find((tab) => tab.active)?.id ?? state.primaryTabId;
+        }
+      }
+      return { window, tabs };
+    }
+
+    return null;
+  }
+
   private async recoverWorkspaceTabs(state: WorkspaceRecord, existingTabs: WorkspaceTab[]): Promise<WorkspaceTab[]> {
     if (state.windowId === null) {
       return existingTabs;
@@ -646,17 +730,32 @@ export class WorkspaceManager {
   }
 
   private async resolveReusablePrimaryTab(workspace: WorkspaceInfo, allowReuse: boolean): Promise<WorkspaceTab | null> {
-    if (!allowReuse || workspace.windowId === null) {
+    if (workspace.windowId === null) {
       return null;
     }
     if (workspace.primaryTabId !== null) {
       const trackedPrimary = workspace.tabs.find((tab) => tab.id === workspace.primaryTabId) ?? (await this.waitForTrackedTab(workspace.primaryTabId, workspace.windowId));
-      if (trackedPrimary) {
+      if (trackedPrimary && (allowReuse || this.isReusableBlankWorkspaceTab(trackedPrimary, workspace))) {
         return trackedPrimary;
       }
     }
     const windowTabs = await this.waitForWindowTabs(workspace.windowId, 750);
-    return windowTabs.length === 1 ? windowTabs[0]! : null;
+    if (windowTabs.length !== 1) {
+      return null;
+    }
+    const candidate = windowTabs[0]!;
+    if (allowReuse || this.isReusableBlankWorkspaceTab(candidate, workspace)) {
+      return candidate;
+    }
+    return null;
+  }
+
+  private isReusableBlankWorkspaceTab(tab: WorkspaceTab, workspace: WorkspaceInfo): boolean {
+    if (workspace.tabIds.length > 1) {
+      return false;
+    }
+    const normalizedUrl = tab.url.trim().toLowerCase();
+    return normalizedUrl === '' || normalizedUrl === DEFAULT_WORKSPACE_URL;
   }
 
   private async waitForWindow(windowId: number, timeoutMs = 750): Promise<WorkspaceWindow | null> {