@flrande/bak-extension 0.3.0 → 0.3.2

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

@@ -1 +1 @@
-2026-03-09T03:04:15.266Z
+2026-03-09T04:50:59.948Z

package/dist/background.global.js

@@ -43,12 +43,7 @@
       this.browser = browser;
     }
     async getWorkspaceInfo(workspaceId = DEFAULT_WORKSPACE_ID) {
-      const state = await this.loadWorkspaceRecord(workspaceId);
-      if (!state) {
-        return null;
-      }
-      const repaired = await this.ensureWorkspace({ workspaceId, focus: false, initialUrl: DEFAULT_WORKSPACE_URL });
-      return repaired.workspace;
+      return this.inspectWorkspace(workspaceId);
     }
     async ensureWorkspace(options = {}) {
       const workspaceId = this.normalizeWorkspaceId(options.workspaceId);
@@ -57,8 +52,19 @@
       const persisted = await this.storage.load();
       const created = !persisted;
       let state = this.normalizeState(persisted, workspaceId);
-      let window = state.windowId !== null ? await this.browser.getWindow(state.windowId) : null;
+      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,
@@ -138,6 +144,12 @@
       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);
+        if (primaryTab) {
+          tabs = [primaryTab];
+        }
+      }
       state.tabIds = [...new Set(tabs.map((tab) => tab.id))];
       if (options.focus === true && state.activeTabId !== null) {
         await this.browser.updateTab(state.activeTabId, { active: true });
@@ -162,18 +174,51 @@
         focus: false,
         initialUrl: options.url ?? DEFAULT_WORKSPACE_URL
       });
-      const 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;
-      const reusablePrimaryTab = (ensured.created || ensured.repairActions.includes("recreated-window") || ensured.repairActions.includes("created-primary-tab")) && state.tabs.length === 1 && state.primaryTabId !== null ? state.tabs.find((tab2) => tab2.id === state.primaryTabId) ?? null : null;
-      const createdTab = reusablePrimaryTab ? await this.browser.updateTab(reusablePrimaryTab.id, {
-        url: desiredUrl,
-        active
-      }) : await this.createWorkspaceTab({
-        windowId: state.windowId,
-        url: desiredUrl,
-        active
-      });
+      let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
+        state,
+        ensured.created || ensured.repairActions.includes("recreated-window") || ensured.repairActions.includes("created-primary-tab")
+      );
+      let createdTab;
+      try {
+        createdTab = reusablePrimaryTab ? await this.browser.updateTab(reusablePrimaryTab.id, {
+          url: desiredUrl,
+          active
+        }) : await this.createWorkspaceTab({
+          windowId: state.windowId,
+          url: desiredUrl,
+          active
+        });
+      } catch (error) {
+        if (!this.isMissingWindowError(error)) {
+          throw error;
+        }
+        const repaired = await this.ensureWorkspace({
+          workspaceId: options.workspaceId,
+          focus: false,
+          initialUrl: desiredUrl
+        });
+        state = { ...repaired.workspace };
+        reusablePrimaryTab = await this.resolveReusablePrimaryTab(state, true);
+        createdTab = reusablePrimaryTab ? await this.browser.updateTab(reusablePrimaryTab.id, {
+          url: desiredUrl,
+          active
+        }) : await this.createWorkspaceTab({
+          windowId: state.windowId,
+          url: desiredUrl,
+          active
+        });
+      }
       const nextTabIds = [.../* @__PURE__ */ new Set([...state.tabIds, createdTab.id])];
       const groupId = await this.browser.groupTabs([createdTab.id], state.groupId ?? void 0);
       await this.browser.updateGroup(groupId, {
@@ -207,17 +252,30 @@
       };
     }
     async listTabs(workspaceId = DEFAULT_WORKSPACE_ID) {
-      const ensured = await this.ensureWorkspace({ workspaceId });
+      const ensured = await this.inspectWorkspace(workspaceId);
+      if (!ensured) {
+        throw new Error(`Workspace ${workspaceId} does not exist`);
+      }
       return {
-        workspace: ensured.workspace,
-        tabs: ensured.workspace.tabs
+        workspace: ensured,
+        tabs: ensured.tabs
       };
     }
     async getActiveTab(workspaceId = DEFAULT_WORKSPACE_ID) {
-      const ensured = await this.ensureWorkspace({ workspaceId });
+      const ensured = await this.inspectWorkspace(workspaceId);
+      if (!ensured) {
+        const normalizedWorkspaceId = this.normalizeWorkspaceId(workspaceId);
+        return {
+          workspace: {
+            ...this.normalizeState(null, normalizedWorkspaceId),
+            tabs: []
+          },
+          tab: null
+        };
+      }
       return {
-        workspace: ensured.workspace,
-        tab: ensured.workspace.tabs.find((tab) => tab.id === ensured.workspace.activeTabId) ?? null
+        workspace: ensured,
+        tab: ensured.tabs.find((tab) => tab.id === ensured.activeTabId) ?? null
       };
     }
     async setActiveTab(tabId, workspaceId = DEFAULT_WORKSPACE_ID) {
@@ -413,6 +471,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;
@@ -446,12 +558,6 @@
       const deadline = Date.now() + 1500;
       let lastError2 = null;
       while (Date.now() < deadline) {
-        const window = await this.browser.getWindow(options.windowId);
-        if (!window) {
-          lastError2 = new Error(`No window with id: ${options.windowId}.`);
-          await this.delay(50);
-          continue;
-        }
         try {
           return await this.browser.createTab({
             windowId: options.windowId,
@@ -468,6 +574,52 @@
       }
       throw lastError2 ?? new Error(`No window with id: ${options.windowId}.`);
     }
+    async inspectWorkspace(workspaceId = DEFAULT_WORKSPACE_ID) {
+      const state = await this.loadWorkspaceRecord(workspaceId);
+      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];
+      }
+      if (tabs.length === 0 && state.primaryTabId !== null) {
+        const primaryTab = await this.waitForTrackedTab(state.primaryTabId, state.windowId, 300);
+        if (primaryTab) {
+          tabs = [primaryTab];
+        }
+      }
+      return {
+        ...state,
+        tabIds: [...new Set(state.tabIds.concat(tabs.map((tab) => tab.id)))],
+        tabs
+      };
+    }
+    async resolveReusablePrimaryTab(workspace, allowReuse) {
+      if (!allowReuse || 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) {
+          return trackedPrimary;
+        }
+      }
+      const windowTabs = await this.waitForWindowTabs(workspace.windowId, 750);
+      return windowTabs.length === 1 ? windowTabs[0] : null;
+    }
+    async waitForWindow(windowId, timeoutMs = 750) {
+      const deadline = Date.now() + timeoutMs;
+      while (Date.now() < deadline) {
+        const window = await this.browser.getWindow(windowId);
+        if (window) {
+          return window;
+        }
+        await this.delay(50);
+      }
+      return null;
+    }
     async waitForTrackedTab(tabId, windowId, timeoutMs = 1e3) {
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {

package/package.json

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

package/src/workspace.ts

@@ -108,12 +108,7 @@ export class WorkspaceManager {
   }
 
   async getWorkspaceInfo(workspaceId = DEFAULT_WORKSPACE_ID): Promise<WorkspaceInfo | null> {
-    const state = await this.loadWorkspaceRecord(workspaceId);
-    if (!state) {
-      return null;
-    }
-    const repaired = await this.ensureWorkspace({ workspaceId, focus: false, initialUrl: DEFAULT_WORKSPACE_URL });
-    return repaired.workspace;
+    return this.inspectWorkspace(workspaceId);
   }
 
   async ensureWorkspace(options: WorkspaceEnsureOptions = {}): Promise<WorkspaceEnsureResult> {
@@ -124,8 +119,19 @@ export class WorkspaceManager {
     const created = !persisted;
     let state = this.normalizeState(persisted, workspaceId);
 
-    let window = state.windowId !== null ? await this.browser.getWindow(state.windowId) : null;
+    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,
@@ -212,6 +218,12 @@ export class WorkspaceManager {
     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);
+      if (primaryTab) {
+        tabs = [primaryTab];
+      }
+    }
     state.tabIds = [...new Set(tabs.map((tab) => tab.id))];
 
     if (options.focus === true && state.activeTabId !== null) {
@@ -240,26 +252,56 @@ export class WorkspaceManager {
       focus: false,
       initialUrl: options.url ?? DEFAULT_WORKSPACE_URL
     });
-    const 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;
-    const reusablePrimaryTab =
-      (ensured.created || ensured.repairActions.includes('recreated-window') || ensured.repairActions.includes('created-primary-tab')) &&
-      state.tabs.length === 1 &&
-      state.primaryTabId !== null
-        ? state.tabs.find((tab) => tab.id === state.primaryTabId) ?? null
-        : null;
-
-    const createdTab = reusablePrimaryTab
-      ? await this.browser.updateTab(reusablePrimaryTab.id, {
-          url: desiredUrl,
-          active
-        })
-      : await this.createWorkspaceTab({
-          windowId: state.windowId,
-          url: desiredUrl,
-          active
-        });
+    let reusablePrimaryTab = await this.resolveReusablePrimaryTab(
+      state,
+      ensured.created || ensured.repairActions.includes('recreated-window') || ensured.repairActions.includes('created-primary-tab')
+    );
+
+    let createdTab: WorkspaceTab;
+    try {
+      createdTab = reusablePrimaryTab
+        ? await this.browser.updateTab(reusablePrimaryTab.id, {
+            url: desiredUrl,
+            active
+          })
+        : await this.createWorkspaceTab({
+            windowId: state.windowId,
+            url: desiredUrl,
+            active
+          });
+    } catch (error) {
+      if (!this.isMissingWindowError(error)) {
+        throw error;
+      }
+      const repaired = await this.ensureWorkspace({
+        workspaceId: options.workspaceId,
+        focus: false,
+        initialUrl: desiredUrl
+      });
+      state = { ...repaired.workspace };
+      reusablePrimaryTab = await this.resolveReusablePrimaryTab(state, true);
+      createdTab = reusablePrimaryTab
+        ? await this.browser.updateTab(reusablePrimaryTab.id, {
+            url: desiredUrl,
+            active
+          })
+        : await this.createWorkspaceTab({
+            windowId: state.windowId,
+            url: desiredUrl,
+            active
+          });
+    }
     const nextTabIds = [...new Set([...state.tabIds, createdTab.id])];
     const groupId = await this.browser.groupTabs([createdTab.id], state.groupId ?? undefined);
     await this.browser.updateGroup(groupId, {
@@ -296,18 +338,31 @@ export class WorkspaceManager {
   }
 
   async listTabs(workspaceId = DEFAULT_WORKSPACE_ID): Promise<{ workspace: WorkspaceInfo; tabs: WorkspaceTab[] }> {
-    const ensured = await this.ensureWorkspace({ workspaceId });
+    const ensured = await this.inspectWorkspace(workspaceId);
+    if (!ensured) {
+      throw new Error(`Workspace ${workspaceId} does not exist`);
+    }
     return {
-      workspace: ensured.workspace,
-      tabs: ensured.workspace.tabs
+      workspace: ensured,
+      tabs: ensured.tabs
     };
   }
 
   async getActiveTab(workspaceId = DEFAULT_WORKSPACE_ID): Promise<{ workspace: WorkspaceInfo; tab: WorkspaceTab | null }> {
-    const ensured = await this.ensureWorkspace({ workspaceId });
+    const ensured = await this.inspectWorkspace(workspaceId);
+    if (!ensured) {
+      const normalizedWorkspaceId = this.normalizeWorkspaceId(workspaceId);
+      return {
+        workspace: {
+          ...this.normalizeState(null, normalizedWorkspaceId),
+          tabs: []
+        },
+        tab: null
+      };
+    }
     return {
-      workspace: ensured.workspace,
-      tab: ensured.workspace.tabs.find((tab) => tab.id === ensured.workspace.activeTabId) ?? null
+      workspace: ensured,
+      tab: ensured.tabs.find((tab) => tab.id === ensured.activeTabId) ?? null
     };
   }
 
@@ -525,6 +580,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;
@@ -566,13 +684,6 @@ export class WorkspaceManager {
     let lastError: Error | null = null;
 
     while (Date.now() < deadline) {
-      const window = await this.browser.getWindow(options.windowId);
-      if (!window) {
-        lastError = new Error(`No window with id: ${options.windowId}.`);
-        await this.delay(50);
-        continue;
-      }
-
       try {
         return await this.browser.createTab({
           windowId: options.windowId,
@@ -591,6 +702,57 @@ export class WorkspaceManager {
     throw lastError ?? new Error(`No window with id: ${options.windowId}.`);
   }
 
+  private async inspectWorkspace(workspaceId = DEFAULT_WORKSPACE_ID): Promise<WorkspaceInfo | null> {
+    const state = await this.loadWorkspaceRecord(workspaceId);
+    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];
+    }
+    if (tabs.length === 0 && state.primaryTabId !== null) {
+      const primaryTab = await this.waitForTrackedTab(state.primaryTabId, state.windowId, 300);
+      if (primaryTab) {
+        tabs = [primaryTab];
+      }
+    }
+
+    return {
+      ...state,
+      tabIds: [...new Set(state.tabIds.concat(tabs.map((tab) => tab.id)))],
+      tabs
+    };
+  }
+
+  private async resolveReusablePrimaryTab(workspace: WorkspaceInfo, allowReuse: boolean): Promise<WorkspaceTab | null> {
+    if (!allowReuse || 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) {
+        return trackedPrimary;
+      }
+    }
+    const windowTabs = await this.waitForWindowTabs(workspace.windowId, 750);
+    return windowTabs.length === 1 ? windowTabs[0]! : null;
+  }
+
+  private async waitForWindow(windowId: number, timeoutMs = 750): Promise<WorkspaceWindow | null> {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const window = await this.browser.getWindow(windowId);
+      if (window) {
+        return window;
+      }
+      await this.delay(50);
+    }
+    return null;
+  }
+
   private async waitForTrackedTab(tabId: number, windowId: number | null, timeoutMs = 1_000): Promise<WorkspaceTab | null> {
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {