@flrande/bak-extension 0.6.14 → 0.6.15

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

@@ -1 +1 @@
-2026-03-14T14:07:55.091Z
+2026-03-14T15:19:38.952Z

package/dist/background.global.js

@@ -556,7 +556,7 @@
   // package.json
   var package_default = {
     name: "@flrande/bak-extension",
-    version: "0.6.14",
+    version: "0.6.15",
     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",
@@ -990,10 +990,16 @@
     return typeof candidate.id === "string" && Array.isArray(candidate.tabIds) && (typeof candidate.windowId === "number" || candidate.windowId === null) && (typeof candidate.groupId === "number" || candidate.groupId === null) && (typeof candidate.activeTabId === "number" || candidate.activeTabId === null) && (typeof candidate.primaryTabId === "number" || candidate.primaryTabId === null);
   }
   function cloneSessionBindingRecord(state) {
-    return {
+    const cloned = {
       ...state,
       tabIds: [...state.tabIds]
     };
+    if (cloned.tabIds.length === 0) {
+      cloned.groupId = null;
+      cloned.activeTabId = null;
+      cloned.primaryTabId = null;
+    }
+    return cloned;
   }
   function normalizeSessionBindingRecordMap(value) {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
@@ -1376,6 +1382,34 @@
         };
       }
       const tabs = await this.readLooseTrackedTabs(remainingTabIds);
+      if (tabs.length === 0) {
+        const liveWindow = binding.windowId !== null ? await this.waitForWindow(binding.windowId, 300) : null;
+        if (!liveWindow) {
+          await this.storage.delete(binding.id);
+          return {
+            binding: null,
+            closedTabId: resolvedTabId
+          };
+        }
+        const nextState2 = {
+          id: binding.id,
+          label: binding.label,
+          color: binding.color,
+          windowId: liveWindow.id,
+          groupId: null,
+          tabIds: [],
+          activeTabId: null,
+          primaryTabId: null
+        };
+        await this.storage.save(nextState2);
+        return {
+          binding: {
+            ...nextState2,
+            tabs: []
+          },
+          closedTabId: resolvedTabId
+        };
+      }
       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 = {
@@ -2041,38 +2075,82 @@
   async function listSessionBindingStates() {
     return Object.values(await loadSessionBindingStateMap());
   }
-  async function summarizeSessionBindings(states) {
-    const items = await Promise.all(
-      states.map(async (state) => {
-        const detached = state.windowId === null || state.tabIds.length === 0;
-        const activeTab = typeof state.activeTabId === "number" ? await sessionBindingBrowser.getTab(state.activeTabId) : null;
-        const bindingUpdate = bindingUpdateMetadata.get(state.id);
-        return {
-          id: state.id,
-          label: state.label,
-          tabCount: state.tabIds.length,
-          activeTabId: state.activeTabId,
-          activeTabTitle: activeTab?.title ?? null,
-          activeTabUrl: activeTab?.url ?? null,
-          windowId: state.windowId,
-          groupId: state.groupId,
-          detached,
-          lastBindingUpdateAt: bindingUpdate?.at ?? null,
-          lastBindingUpdateReason: bindingUpdate?.reason ?? null
-        };
+  function collectPopupSessionBindingTabIds(state) {
+    return [
+      ...new Set(state.tabIds.concat([state.activeTabId, state.primaryTabId].filter((value) => typeof value === "number")))
+    ];
+  }
+  async function inspectPopupSessionBinding(state) {
+    const trackedTabs = (await Promise.all(
+      collectPopupSessionBindingTabIds(state).map(async (tabId) => {
+        return await sessionBindingBrowser.getTab(tabId);
       })
-    );
+    )).filter((tab) => tab !== null);
+    const liveWindow = typeof state.windowId === "number" ? await sessionBindingBrowser.getWindow(state.windowId) : null;
+    const activeTab = trackedTabs.find((tab) => tab.id === state.activeTabId) ?? trackedTabs.find((tab) => tab.active) ?? trackedTabs[0] ?? null;
+    const status = trackedTabs.length > 0 ? "attached" : liveWindow ? "window-only" : "detached";
+    const bindingUpdate = bindingUpdateMetadata.get(state.id);
+    return {
+      summary: {
+        id: state.id,
+        label: state.label,
+        tabCount: trackedTabs.length,
+        activeTabId: activeTab?.id ?? null,
+        activeTabTitle: activeTab?.title ?? null,
+        activeTabUrl: activeTab?.url ?? null,
+        windowId: activeTab?.windowId ?? trackedTabs[0]?.windowId ?? liveWindow?.id ?? state.windowId,
+        groupId: trackedTabs.length > 0 ? activeTab?.groupId ?? trackedTabs.find((tab) => tab.groupId !== null)?.groupId ?? state.groupId : null,
+        status,
+        lastBindingUpdateAt: bindingUpdate?.at ?? null,
+        lastBindingUpdateReason: bindingUpdate?.reason ?? null
+      },
+      prune: status === "detached"
+    };
+  }
+  async function summarizeSessionBindings() {
+    const statusRank = {
+      attached: 0,
+      "window-only": 1,
+      detached: 2
+    };
+    const items = await mutateSessionBindingStateMap(async (stateMap) => {
+      const inspected = await Promise.all(
+        Object.entries(stateMap).map(async ([bindingId, state]) => {
+          return {
+            bindingId,
+            inspected: await inspectPopupSessionBinding(state)
+          };
+        })
+      );
+      for (const entry of inspected) {
+        if (entry.inspected.prune) {
+          delete stateMap[entry.bindingId];
+        }
+      }
+      return inspected.filter((entry) => !entry.inspected.prune).map((entry) => entry.inspected.summary).sort((left, right) => {
+        const byStatus = statusRank[left.status] - statusRank[right.status];
+        if (byStatus !== 0) {
+          return byStatus;
+        }
+        const byUpdate = (right.lastBindingUpdateAt ?? 0) - (left.lastBindingUpdateAt ?? 0);
+        if (byUpdate !== 0) {
+          return byUpdate;
+        }
+        return left.label.localeCompare(right.label);
+      });
+    });
     return {
       count: items.length,
-      attachedCount: items.filter((item) => !item.detached).length,
-      detachedCount: items.filter((item) => item.detached).length,
+      attachedCount: items.filter((item) => item.status === "attached").length,
+      windowOnlyCount: items.filter((item) => item.status === "window-only").length,
+      detachedCount: items.filter((item) => item.status === "detached").length,
       tabCount: items.reduce((sum, item) => sum + item.tabCount, 0),
       items
     };
   }
   async function buildPopupState() {
     const config = await getConfig();
-    const sessionBindings = await summarizeSessionBindings(await listSessionBindingStates());
+    const sessionBindings = await summarizeSessionBindings();
     const reconnectRemainingMs = nextReconnectAt === null ? null : Math.max(0, nextReconnectAt - Date.now());
     let connectionState;
     if (!config.token) {

package/dist/manifest.json

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

package/dist/popup.global.js

@@ -101,7 +101,7 @@
     const lastError = `${state.lastErrorContext ?? ""} ${state.lastError ?? ""}`.toLowerCase();
     const runtimeOffline = lastError.includes("cannot connect to bak cli");
     if (state.connected) {
-      const body = state.sessionBindings.detachedCount > 0 ? `${pluralize(state.sessionBindings.detachedCount, "remembered session")} are detached. Check the cards below before you continue browser work.` : "The extension bridge is healthy and ready for CLI-driven browser work.";
+      const body = state.sessionBindings.detachedCount > 0 ? `${pluralize(state.sessionBindings.detachedCount, "remembered session")} are detached. Check the cards below before you continue browser work.` : state.sessionBindings.windowOnlyCount > 0 ? `${pluralize(state.sessionBindings.windowOnlyCount, "remembered session")} still point at a live window, but do not own tabs yet.` : "The extension bridge is healthy and ready for CLI-driven browser work.";
       return {
         badge: "Ready",
         title: "Connected to the local bak runtime",
@@ -110,6 +110,9 @@
         recoverySteps: state.sessionBindings.detachedCount > 0 ? [
           "Resume or recreate detached work from the bak CLI before sending new page commands.",
           "Use the Sessions panel below to confirm which remembered session lost its owned tabs."
+        ] : state.sessionBindings.windowOnlyCount > 0 ? [
+          "New bak page commands can reuse those remembered windows without disturbing your human tabs.",
+          "Use the Sessions panel below to confirm which binding is only waiting for a new owned tab."
         ] : [
           "Start browser work from the bak CLI.",
           "Use Reconnect bridge only when you intentionally changed token or port settings."
@@ -234,7 +237,7 @@
     if (state.count === 0) {
       sessionSummaryEl.textContent = "No remembered sessions";
     } else {
-      sessionSummaryEl.textContent = `${pluralize(state.count, "session")}, ${pluralize(state.attachedCount, "attached binding")}, ${pluralize(state.detachedCount, "detached binding")}, ${pluralize(state.tabCount, "tracked tab")}`;
+      sessionSummaryEl.textContent = `${pluralize(state.count, "session")}, ${pluralize(state.attachedCount, "attached binding")}, ${pluralize(state.windowOnlyCount, "window-only binding")}, ${pluralize(state.detachedCount, "detached binding")}, ${pluralize(state.tabCount, "tracked tab")}`;
     }
     sessionCardsEl.replaceChildren();
     if (state.items.length === 0) {
@@ -247,7 +250,7 @@
     for (const item of state.items) {
       const card = document.createElement("section");
       card.className = "session-card";
-      card.dataset.detached = item.detached ? "true" : "false";
+      card.dataset.status = item.status;
       const header = document.createElement("div");
       header.className = "session-card-header";
       const titleWrap = document.createElement("div");
@@ -261,16 +264,16 @@
       titleWrap.append(title, subtitle);
       const badge = document.createElement("span");
       badge.className = "session-badge";
-      badge.dataset.detached = item.detached ? "true" : "false";
-      badge.textContent = item.detached ? "Detached" : "Attached";
+      badge.dataset.status = item.status;
+      badge.textContent = item.status === "attached" ? "Attached" : item.status === "window-only" ? "Window only" : "Detached";
       header.append(titleWrap, badge);
       const activeTitle = document.createElement("div");
       activeTitle.className = "session-active-title";
-      activeTitle.textContent = item.activeTabTitle ? truncate(item.activeTabTitle, 72) : "No active tab title";
+      activeTitle.textContent = item.activeTabTitle ? truncate(item.activeTabTitle, 72) : item.status === "window-only" ? "No owned tab yet" : "No active tab title";
       activeTitle.title = item.activeTabTitle ?? "";
       const activeUrl = document.createElement("div");
       activeUrl.className = "session-active-url";
-      activeUrl.textContent = formatUrl(item.activeTabUrl);
+      activeUrl.textContent = item.status === "window-only" && !item.activeTabUrl ? "Next bak page command can reuse this window" : formatUrl(item.activeTabUrl);
       activeUrl.title = item.activeTabUrl ?? "";
       const meta = document.createElement("div");
       meta.className = "session-meta-grid";
@@ -286,7 +289,7 @@
       );
       const footer = document.createElement("div");
       footer.className = "session-card-footer";
-      footer.textContent = item.detached ? "bak still remembers this session, but its owned tabs or window are missing." : "The saved binding still points at live browser tabs.";
+      footer.textContent = item.status === "attached" ? "The saved binding still points at live browser tabs." : item.status === "window-only" ? "bak still remembers the target window for this session, but it does not own any live tabs right now." : "bak still remembers this session, but its owned tabs or window are missing.";
       card.append(header, activeTitle, activeUrl, meta, footer);
       sessionCardsEl.appendChild(card);
     }

package/dist/popup.html

@@ -245,7 +245,12 @@
         background: rgba(255, 255, 255, 0.92);
       }
 
-      .session-card[data-detached="true"] {
+      .session-card[data-status="window-only"] {
+        border-color: #38bdf8;
+        background: rgba(240, 249, 255, 0.95);
+      }
+
+      .session-card[data-status="detached"] {
         border-color: #f59e0b;
         background: rgba(255, 251, 235, 0.95);
       }
@@ -283,12 +288,17 @@
         white-space: nowrap;
       }
 
-      .session-badge[data-detached="true"] {
+      .session-badge[data-status="window-only"] {
+        background: #e0f2fe;
+        color: #0369a1;
+      }
+
+      .session-badge[data-status="detached"] {
         background: #fef3c7;
         color: #b45309;
       }
 
-      .session-badge[data-detached="false"] {
+      .session-badge[data-status="attached"] {
         background: #dbeafe;
         color: #1d4ed8;
       }

package/package.json

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

package/public/popup.html

@@ -245,7 +245,12 @@
         background: rgba(255, 255, 255, 0.92);
       }
 
-      .session-card[data-detached="true"] {
+      .session-card[data-status="window-only"] {
+        border-color: #38bdf8;
+        background: rgba(240, 249, 255, 0.95);
+      }
+
+      .session-card[data-status="detached"] {
         border-color: #f59e0b;
         background: rgba(255, 251, 235, 0.95);
       }
@@ -283,12 +288,17 @@
         white-space: nowrap;
       }
 
-      .session-badge[data-detached="true"] {
+      .session-badge[data-status="window-only"] {
+        background: #e0f2fe;
+        color: #0369a1;
+      }
+
+      .session-badge[data-status="detached"] {
         background: #fef3c7;
         color: #b45309;
       }
 
-      .session-badge[data-detached="false"] {
+      .session-badge[data-status="attached"] {
         background: #dbeafe;
         color: #1d4ed8;
       }

package/src/background.ts

@@ -70,12 +70,14 @@ interface ExtensionConfig {
   debugRichText: boolean;
 }
 
-interface RuntimeErrorDetails {
-  message: string;
-  context: 'config' | 'socket' | 'request' | 'parse';
-  at: number;
-}
-
+interface RuntimeErrorDetails {
+  message: string;
+  context: 'config' | 'socket' | 'request' | 'parse';
+  at: number;
+}
+
+type PopupSessionBindingStatus = 'attached' | 'window-only' | 'detached';
+
 interface PopupSessionBindingSummary {
   id: string;
   label: string;
@@ -85,7 +87,7 @@ interface PopupSessionBindingSummary {
   activeTabUrl: string | null;
   windowId: number | null;
   groupId: number | null;
-  detached: boolean;
+  status: PopupSessionBindingStatus;
   lastBindingUpdateAt: number | null;
   lastBindingUpdateReason: string | null;
 }
@@ -107,14 +109,15 @@ interface PopupState {
   extensionVersion: string;
   lastBindingUpdateAt: number | null;
   lastBindingUpdateReason: string | null;
-  sessionBindings: {
-    count: number;
-    attachedCount: number;
-    detachedCount: number;
-    tabCount: number;
-    items: PopupSessionBindingSummary[];
-  };
-}
+  sessionBindings: {
+    count: number;
+    attachedCount: number;
+    windowOnlyCount: number;
+    detachedCount: number;
+    tabCount: number;
+    items: PopupSessionBindingSummary[];
+  };
+}
 
 const DEFAULT_PORT = 17373;
 const STORAGE_KEY_TOKEN = 'pairToken';
@@ -344,44 +347,99 @@ async function loadSessionBindingState(bindingId: string): Promise<SessionBindin
   return stateMap[bindingId] ?? null;
 }
 
-async function listSessionBindingStates(): Promise<SessionBindingRecord[]> {
-  return Object.values(await loadSessionBindingStateMap());
-}
-
-async function summarizeSessionBindings(states: SessionBindingRecord[]): Promise<PopupState['sessionBindings']> {
-  const items = await Promise.all(
-    states.map(async (state) => {
-      const detached = state.windowId === null || state.tabIds.length === 0;
-      const activeTab =
-        typeof state.activeTabId === 'number' ? await sessionBindingBrowser.getTab(state.activeTabId) : null;
-      const bindingUpdate = bindingUpdateMetadata.get(state.id);
-      return {
-        id: state.id,
-        label: state.label,
-        tabCount: state.tabIds.length,
-        activeTabId: state.activeTabId,
-        activeTabTitle: activeTab?.title ?? null,
-        activeTabUrl: activeTab?.url ?? null,
-        windowId: state.windowId,
-        groupId: state.groupId,
-        detached,
-        lastBindingUpdateAt: bindingUpdate?.at ?? null,
-        lastBindingUpdateReason: bindingUpdate?.reason ?? null
-      } satisfies PopupSessionBindingSummary;
-    })
-  );
+async function listSessionBindingStates(): Promise<SessionBindingRecord[]> {
+  return Object.values(await loadSessionBindingStateMap());
+}
+
+function collectPopupSessionBindingTabIds(state: SessionBindingRecord): number[] {
+  return [
+    ...new Set(state.tabIds.concat([state.activeTabId, state.primaryTabId].filter((value): value is number => typeof value === 'number')))
+  ];
+}
+
+async function inspectPopupSessionBinding(
+  state: SessionBindingRecord
+): Promise<{ summary: PopupSessionBindingSummary; prune: boolean }> {
+  const trackedTabs = (
+    await Promise.all(
+      collectPopupSessionBindingTabIds(state).map(async (tabId) => {
+        return await sessionBindingBrowser.getTab(tabId);
+      })
+    )
+  ).filter((tab): tab is SessionBindingTab => tab !== null);
+  const liveWindow = typeof state.windowId === 'number' ? await sessionBindingBrowser.getWindow(state.windowId) : null;
+  const activeTab = trackedTabs.find((tab) => tab.id === state.activeTabId) ?? trackedTabs.find((tab) => tab.active) ?? trackedTabs[0] ?? null;
+  const status: PopupSessionBindingStatus = trackedTabs.length > 0 ? 'attached' : liveWindow ? 'window-only' : 'detached';
+  const bindingUpdate = bindingUpdateMetadata.get(state.id);
+  return {
+    summary: {
+      id: state.id,
+      label: state.label,
+      tabCount: trackedTabs.length,
+      activeTabId: activeTab?.id ?? null,
+      activeTabTitle: activeTab?.title ?? null,
+      activeTabUrl: activeTab?.url ?? null,
+      windowId: activeTab?.windowId ?? trackedTabs[0]?.windowId ?? liveWindow?.id ?? state.windowId,
+      groupId:
+        trackedTabs.length > 0
+          ? activeTab?.groupId ?? trackedTabs.find((tab) => tab.groupId !== null)?.groupId ?? state.groupId
+          : null,
+      status,
+      lastBindingUpdateAt: bindingUpdate?.at ?? null,
+      lastBindingUpdateReason: bindingUpdate?.reason ?? null
+    },
+    prune: status === 'detached'
+  };
+}
+
+async function summarizeSessionBindings(): Promise<PopupState['sessionBindings']> {
+  const statusRank: Record<PopupSessionBindingStatus, number> = {
+    attached: 0,
+    'window-only': 1,
+    detached: 2
+  };
+  const items = await mutateSessionBindingStateMap(async (stateMap) => {
+    const inspected = await Promise.all(
+      Object.entries(stateMap).map(async ([bindingId, state]) => {
+        return {
+          bindingId,
+          inspected: await inspectPopupSessionBinding(state)
+        };
+      })
+    );
+    for (const entry of inspected) {
+      if (entry.inspected.prune) {
+        delete stateMap[entry.bindingId];
+      }
+    }
+    return inspected
+      .filter((entry) => !entry.inspected.prune)
+      .map((entry) => entry.inspected.summary)
+      .sort((left, right) => {
+        const byStatus = statusRank[left.status] - statusRank[right.status];
+        if (byStatus !== 0) {
+          return byStatus;
+        }
+        const byUpdate = (right.lastBindingUpdateAt ?? 0) - (left.lastBindingUpdateAt ?? 0);
+        if (byUpdate !== 0) {
+          return byUpdate;
+        }
+        return left.label.localeCompare(right.label);
+      });
+  });
   return {
     count: items.length,
-    attachedCount: items.filter((item) => !item.detached).length,
-    detachedCount: items.filter((item) => item.detached).length,
-    tabCount: items.reduce((sum, item) => sum + item.tabCount, 0),
-    items
-  };
-}
-
+    attachedCount: items.filter((item) => item.status === 'attached').length,
+    windowOnlyCount: items.filter((item) => item.status === 'window-only').length,
+    detachedCount: items.filter((item) => item.status === 'detached').length,
+    tabCount: items.reduce((sum, item) => sum + item.tabCount, 0),
+    items
+  };
+}
+
 async function buildPopupState(): Promise<PopupState> {
   const config = await getConfig();
-  const sessionBindings = await summarizeSessionBindings(await listSessionBindingStates());
+  const sessionBindings = await summarizeSessionBindings();
   const reconnectRemainingMs = nextReconnectAt === null ? null : Math.max(0, nextReconnectAt - Date.now());
   let connectionState: PopupState['connectionState'];
   if (!config.token) {

package/src/popup.ts

@@ -21,6 +21,7 @@ const sessionSummaryEl = document.getElementById('sessionSummary') as HTMLDivEle
 const sessionCardsEl = document.getElementById('sessionCards') as HTMLDivElement;
 
 type PopupTone = 'neutral' | 'success' | 'warning' | 'error';
+type PopupSessionBindingStatus = 'attached' | 'window-only' | 'detached';
 
 interface PopupState {
   ok: boolean;
@@ -42,6 +43,7 @@ interface PopupState {
   sessionBindings: {
     count: number;
     attachedCount: number;
+    windowOnlyCount: number;
     detachedCount: number;
     tabCount: number;
     items: Array<{
@@ -53,7 +55,7 @@ interface PopupState {
       activeTabUrl: string | null;
       windowId: number | null;
       groupId: number | null;
-      detached: boolean;
+      status: PopupSessionBindingStatus;
       lastBindingUpdateAt: number | null;
       lastBindingUpdateReason: string | null;
     }>;
@@ -158,6 +160,8 @@ function describeStatus(state: PopupState): StatusDescriptor {
     const body =
       state.sessionBindings.detachedCount > 0
         ? `${pluralize(state.sessionBindings.detachedCount, 'remembered session')} are detached. Check the cards below before you continue browser work.`
+        : state.sessionBindings.windowOnlyCount > 0
+          ? `${pluralize(state.sessionBindings.windowOnlyCount, 'remembered session')} still point at a live window, but do not own tabs yet.`
         : 'The extension bridge is healthy and ready for CLI-driven browser work.';
     return {
       badge: 'Ready',
@@ -169,6 +173,11 @@ function describeStatus(state: PopupState): StatusDescriptor {
             'Resume or recreate detached work from the bak CLI before sending new page commands.',
             'Use the Sessions panel below to confirm which remembered session lost its owned tabs.'
           ]
+        : state.sessionBindings.windowOnlyCount > 0
+          ? [
+              'New bak page commands can reuse those remembered windows without disturbing your human tabs.',
+              'Use the Sessions panel below to confirm which binding is only waiting for a new owned tab.'
+            ]
         : [
             'Start browser work from the bak CLI.',
             'Use Reconnect bridge only when you intentionally changed token or port settings.'
@@ -311,6 +320,7 @@ function renderSessionBindings(state: PopupState['sessionBindings']): void {
     sessionSummaryEl.textContent =
       `${pluralize(state.count, 'session')}, ` +
       `${pluralize(state.attachedCount, 'attached binding')}, ` +
+      `${pluralize(state.windowOnlyCount, 'window-only binding')}, ` +
       `${pluralize(state.detachedCount, 'detached binding')}, ` +
       `${pluralize(state.tabCount, 'tracked tab')}`;
   }
@@ -328,7 +338,7 @@ function renderSessionBindings(state: PopupState['sessionBindings']): void {
   for (const item of state.items) {
     const card = document.createElement('section');
     card.className = 'session-card';
-    card.dataset.detached = item.detached ? 'true' : 'false';
+    card.dataset.status = item.status;
 
     const header = document.createElement('div');
     header.className = 'session-card-header';
@@ -348,19 +358,24 @@ function renderSessionBindings(state: PopupState['sessionBindings']): void {
 
     const badge = document.createElement('span');
     badge.className = 'session-badge';
-    badge.dataset.detached = item.detached ? 'true' : 'false';
-    badge.textContent = item.detached ? 'Detached' : 'Attached';
+    badge.dataset.status = item.status;
+    badge.textContent = item.status === 'attached' ? 'Attached' : item.status === 'window-only' ? 'Window only' : 'Detached';
 
     header.append(titleWrap, badge);
 
     const activeTitle = document.createElement('div');
     activeTitle.className = 'session-active-title';
-    activeTitle.textContent = item.activeTabTitle ? truncate(item.activeTabTitle, 72) : 'No active tab title';
+    activeTitle.textContent =
+      item.activeTabTitle
+        ? truncate(item.activeTabTitle, 72)
+        : item.status === 'window-only'
+          ? 'No owned tab yet'
+          : 'No active tab title';
     activeTitle.title = item.activeTabTitle ?? '';
 
     const activeUrl = document.createElement('div');
     activeUrl.className = 'session-active-url';
-    activeUrl.textContent = formatUrl(item.activeTabUrl);
+    activeUrl.textContent = item.status === 'window-only' && !item.activeTabUrl ? 'Next bak page command can reuse this window' : formatUrl(item.activeTabUrl);
     activeUrl.title = item.activeTabUrl ?? '';
 
     const meta = document.createElement('div');
@@ -380,9 +395,12 @@ function renderSessionBindings(state: PopupState['sessionBindings']): void {
 
     const footer = document.createElement('div');
     footer.className = 'session-card-footer';
-    footer.textContent = item.detached
-      ? 'bak still remembers this session, but its owned tabs or window are missing.'
-      : 'The saved binding still points at live browser tabs.';
+    footer.textContent =
+      item.status === 'attached'
+        ? 'The saved binding still points at live browser tabs.'
+        : item.status === 'window-only'
+          ? 'bak still remembers the target window for this session, but it does not own any live tabs right now.'
+          : 'bak still remembers this session, but its owned tabs or window are missing.';
 
     card.append(header, activeTitle, activeUrl, meta, footer);
     sessionCardsEl.appendChild(card);

package/src/session-binding-storage.ts

@@ -18,10 +18,16 @@ function isSessionBindingRecord(value: unknown): value is SessionBindingRecord {
 }
 
 function cloneSessionBindingRecord(state: SessionBindingRecord): SessionBindingRecord {
-  return {
+  const cloned: SessionBindingRecord = {
     ...state,
     tabIds: [...state.tabIds]
   };
+  if (cloned.tabIds.length === 0) {
+    cloned.groupId = null;
+    cloned.activeTabId = null;
+    cloned.primaryTabId = null;
+  }
+  return cloned;
 }
 
 function normalizeSessionBindingRecordMap(value: unknown): { found: boolean; map: Record<string, SessionBindingRecord> } {

package/src/session-binding.ts

@@ -482,10 +482,10 @@ class SessionBindingManager {
     };
   }
 
-  async closeTab(bindingId: string, tabId?: number): Promise<{ binding: SessionBindingInfo | null; closedTabId: number }> {
-    const binding = await this.inspectBinding(bindingId);
-    if (!binding) {
-      throw new Error(`Binding ${bindingId} does not exist`);
+  async closeTab(bindingId: string, tabId?: number): Promise<{ binding: SessionBindingInfo | null; closedTabId: number }> {
+    const binding = await this.inspectBinding(bindingId);
+    if (!binding) {
+      throw new Error(`Binding ${bindingId} does not exist`);
     }
     const resolvedTabId =
       typeof tabId === 'number'
@@ -505,13 +505,43 @@ class SessionBindingManager {
         closedTabId: resolvedTabId
       };
     }
-
-    const tabs = await this.readLooseTrackedTabs(remainingTabIds);
-    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
+
+    const tabs = await this.readLooseTrackedTabs(remainingTabIds);
+    if (tabs.length === 0) {
+      const liveWindow = binding.windowId !== null ? await this.waitForWindow(binding.windowId, 300) : null;
+      if (!liveWindow) {
+        await this.storage.delete(binding.id);
+        return {
+          binding: null,
+          closedTabId: resolvedTabId
+        };
+      }
+
+      const nextState: SessionBindingRecord = {
+        id: binding.id,
+        label: binding.label,
+        color: binding.color,
+        windowId: liveWindow.id,
+        groupId: null,
+        tabIds: [],
+        activeTabId: null,
+        primaryTabId: null
+      };
+      await this.storage.save(nextState);
+      return {
+        binding: {
+          ...nextState,
+          tabs: []
+        },
+        closedTabId: resolvedTabId
+      };
+    }
+
+    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: SessionBindingRecord = {
       id: binding.id,