@flrande/bak-extension 0.3.2 → 0.3.4

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

@@ -1 +1 @@
-2026-03-09T04:50:59.948Z
+2026-03-09T06:27:35.243Z

package/dist/background.global.js

@@ -169,10 +169,12 @@
       };
     }
     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, tabIds: [...ensured.workspace.tabIds], tabs: [...ensured.workspace.tabs] };
       if (state.windowId !== null && state.tabs.length === 0) {
@@ -204,7 +206,7 @@
           throw error;
         }
         const repaired = await this.ensureWorkspace({
-          workspaceId: options.workspaceId,
+          workspaceId,
           focus: false,
           initialUrl: desiredUrl
         });
@@ -328,13 +330,13 @@
         await this.storage.save(null);
         return { ok: true };
       }
+      await this.storage.save(null);
       if (state.windowId !== null) {
         const existingWindow = await this.browser.getWindow(state.windowId);
         if (existingWindow) {
           await this.browser.closeWindow(state.windowId);
         }
       }
-      await this.storage.save(null);
       return { ok: true };
     }
     async resolveTarget(options = {}) {
@@ -597,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.2",
+  "version": "0.3.4",
   "type": "module",
   "dependencies": {
-    "@flrande/bak-protocol": "0.3.2"
+    "@flrande/bak-protocol": "0.3.4"
   },
   "devDependencies": {
     "@types/chrome": "^0.1.14",

package/src/workspace.ts

@@ -247,10 +247,12 @@ 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, tabIds: [...ensured.workspace.tabIds], tabs: [...ensured.workspace.tabs] };
     if (state.windowId !== null && state.tabs.length === 0) {
@@ -285,7 +287,7 @@ export class WorkspaceManager {
         throw error;
       }
       const repaired = await this.ensureWorkspace({
-        workspaceId: options.workspaceId,
+        workspaceId,
         focus: false,
         initialUrl: desiredUrl
       });
@@ -419,13 +421,15 @@ export class WorkspaceManager {
       await this.storage.save(null);
       return { ok: true };
     }
+    // Clear persisted state before closing the window so tab/window removal
+    // listeners cannot race and resurrect an empty workspace record.
+    await this.storage.save(null);
     if (state.windowId !== null) {
       const existingWindow = await this.browser.getWindow(state.windowId);
       if (existingWindow) {
         await this.browser.closeWindow(state.windowId);
       }
     }
-    await this.storage.save(null);
     return { ok: true };
   }
 
@@ -728,17 +732,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> {