@flrande/bak-extension 0.6.3 → 0.6.4

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

@@ -1 +1 @@
-2026-03-12T12:13:27.330Z
+2026-03-12T15:53:45.600Z

package/dist/background.global.js

@@ -62,7 +62,7 @@
   // package.json
   var package_default = {
     name: "@flrande/bak-extension",
-    version: "0.6.3",
+    version: "0.6.4",
     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",
@@ -548,7 +548,7 @@
       const initialUrl = options.initialUrl ?? DEFAULT_SESSION_BINDING_URL;
       const persisted = await this.storage.load(bindingId);
       const created = !persisted;
-      let state = this.normalizeState(persisted, bindingId);
+      let state = this.normalizeState(persisted, bindingId, options.label);
       const originalWindowId = state.windowId;
       let window2 = state.windowId !== null ? await this.waitForWindow(state.windowId) : null;
       let tabs = [];
@@ -681,7 +681,8 @@
       const ensured = await this.ensureBinding({
         bindingId,
         focus: false,
-        initialUrl: hadBinding ? options.url ?? DEFAULT_SESSION_BINDING_URL : DEFAULT_SESSION_BINDING_URL
+        initialUrl: hadBinding ? options.url ?? DEFAULT_SESSION_BINDING_URL : DEFAULT_SESSION_BINDING_URL,
+        label: options.label
       });
       let state = { ...ensured.binding, tabIds: [...ensured.binding.tabIds], tabs: [...ensured.binding.tabs] };
       if (state.windowId !== null && state.tabs.length === 0) {
@@ -715,7 +716,8 @@
         const repaired = await this.ensureBinding({
           bindingId,
           focus: false,
-          initialUrl: desiredUrl
+          initialUrl: desiredUrl,
+          label: options.label
         });
         state = { ...repaired.binding };
         reusablePrimaryTab = await this.resolveReusablePrimaryTab(state, true);
@@ -827,6 +829,56 @@
       const refreshed = await this.ensureBinding({ bindingId, focus: false });
       return { ok: true, binding: refreshed.binding };
     }
+    async closeTab(bindingId, tabId) {
+      const ensured = await this.ensureBinding({ bindingId, focus: false });
+      const resolvedTabId = typeof tabId === "number" ? tabId : ensured.binding.activeTabId ?? ensured.binding.primaryTabId ?? ensured.binding.tabs[0]?.id;
+      if (typeof resolvedTabId !== "number" || !ensured.binding.tabIds.includes(resolvedTabId)) {
+        throw new Error(`Tab ${tabId ?? "active"} does not belong to binding ${bindingId}`);
+      }
+      await this.browser.closeTab(resolvedTabId);
+      const remainingTabIds = ensured.binding.tabIds.filter((candidate) => candidate !== resolvedTabId);
+      if (remainingTabIds.length === 0) {
+        const emptied = {
+          id: ensured.binding.id,
+          label: ensured.binding.label,
+          color: ensured.binding.color,
+          windowId: null,
+          groupId: null,
+          tabIds: [],
+          activeTabId: null,
+          primaryTabId: null
+        };
+        await this.storage.save(emptied);
+        return {
+          binding: {
+            ...emptied,
+            tabs: []
+          },
+          closedTabId: resolvedTabId
+        };
+      }
+      const tabs = await this.readLooseTrackedTabs(remainingTabIds);
+      const nextPrimaryTabId = ensured.binding.primaryTabId === resolvedTabId ? tabs[0]?.id ?? null : ensured.binding.primaryTabId;
+      const nextActiveTabId = ensured.binding.activeTabId === resolvedTabId ? tabs.find((candidate) => candidate.active)?.id ?? nextPrimaryTabId ?? tabs[0]?.id ?? null : ensured.binding.activeTabId;
+      const nextState = {
+        id: ensured.binding.id,
+        label: ensured.binding.label,
+        color: ensured.binding.color,
+        windowId: tabs[0]?.windowId ?? ensured.binding.windowId,
+        groupId: tabs[0]?.groupId ?? ensured.binding.groupId,
+        tabIds: tabs.map((candidate) => candidate.id),
+        activeTabId: nextActiveTabId,
+        primaryTabId: nextPrimaryTabId
+      };
+      await this.storage.save(nextState);
+      return {
+        binding: {
+          ...nextState,
+          tabs
+        },
+        closedTabId: resolvedTabId
+      };
+    }
     async reset(options = {}) {
       const bindingId = this.normalizeBindingId(options.bindingId);
       await this.close(bindingId);
@@ -842,10 +894,11 @@
         return { ok: true };
       }
       await this.storage.delete(bindingId);
-      if (state.windowId !== null) {
-        const existingWindow = await this.browser.getWindow(state.windowId);
-        if (existingWindow) {
-          await this.browser.closeWindow(state.windowId);
+      const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+      for (const trackedTab of trackedTabs) {
+        try {
+          await this.browser.closeTab(trackedTab.id);
+        } catch {
         }
       }
       return { ok: true };
@@ -896,10 +949,10 @@
       }
       return candidate;
     }
-    normalizeState(state, bindingId) {
+    normalizeState(state, bindingId, label) {
       return {
         id: bindingId,
-        label: state?.label ?? DEFAULT_SESSION_BINDING_LABEL,
+        label: label?.trim() ? label.trim() : state?.label ?? DEFAULT_SESSION_BINDING_LABEL,
         color: state?.color ?? DEFAULT_SESSION_BINDING_COLOR,
         windowId: state?.windowId ?? null,
         groupId: state?.groupId ?? null,
@@ -1066,6 +1119,10 @@
       state.tabIds = recreatedTabs.map((tab) => tab.id);
       state.primaryTabId = nextPrimaryTabId;
       state.activeTabId = nextActiveTabId;
+      await this.storage.save({
+        ...state,
+        tabIds: [...state.tabIds]
+      });
       for (const bindingTab of ownership.bindingTabs) {
         await this.browser.closeTab(bindingTab.id);
       }
@@ -1280,6 +1337,7 @@
   var lastError = null;
   var manualDisconnect = false;
   var sessionBindingStateMutationQueue = Promise.resolve();
+  var preserveHumanFocusDepth = 0;
   async function getConfig() {
     const stored = await chrome.storage.local.get([STORAGE_KEY_TOKEN, STORAGE_KEY_PORT, STORAGE_KEY_DEBUG_RICH_TEXT]);
     return {
@@ -1322,6 +1380,18 @@
       ws.send(JSON.stringify(payload));
     }
   }
+  function sendEvent(event, data) {
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      ws.send(
+        JSON.stringify({
+          type: "event",
+          event,
+          data,
+          ts: Date.now()
+        })
+      );
+    }
+  }
   function toError(code, message, data) {
     return { code, message, data };
   }
@@ -1409,6 +1479,26 @@
       delete stateMap[bindingId];
     });
   }
+  function toSessionBindingEventBrowser(state) {
+    if (!state) {
+      return null;
+    }
+    return {
+      windowId: state.windowId,
+      groupId: state.groupId,
+      tabIds: [...state.tabIds],
+      activeTabId: state.activeTabId,
+      primaryTabId: state.primaryTabId
+    };
+  }
+  function emitSessionBindingUpdated(bindingId, reason, state, extras = {}) {
+    sendEvent("sessionBinding.updated", {
+      bindingId,
+      reason,
+      browser: toSessionBindingEventBrowser(state),
+      ...extras
+    });
+  }
   var sessionBindingBrowser = {
     async getTab(tabId) {
       try {
@@ -1756,10 +1846,15 @@
       return action();
     }
     const focusContext = await captureFocusContext();
+    preserveHumanFocusDepth += 1;
     try {
       return await action();
     } finally {
-      await restoreFocusContext(focusContext);
+      try {
+        await restoreFocusContext(focusContext);
+      } finally {
+        preserveHumanFocusDepth = Math.max(0, preserveHumanFocusDepth - 1);
+      }
     }
   }
   function requireRpcEnvelope(method, value) {
@@ -2622,11 +2717,13 @@
           const result = await bindingManager.ensureBinding({
             bindingId: String(params.bindingId ?? ""),
             focus: params.focus === true,
-            initialUrl: typeof params.url === "string" ? params.url : void 0
+            initialUrl: typeof params.url === "string" ? params.url : void 0,
+            label: typeof params.label === "string" ? params.label : void 0
           });
           for (const tab of result.binding.tabs) {
             void ensureNetworkDebugger(tab.id).catch(() => void 0);
           }
+          emitSessionBindingUpdated(result.binding.id, "ensure", result.binding);
           return {
             browser: result.binding,
             created: result.created,
@@ -2647,11 +2744,13 @@
             bindingId: String(params.bindingId ?? ""),
             url: expectedUrl,
             active: params.active === true,
-            focus: params.focus === true
+            focus: params.focus === true,
+            label: typeof params.label === "string" ? params.label : void 0
           });
         });
         const finalized = await finalizeOpenedSessionBindingTab(opened, expectedUrl);
         void ensureNetworkDebugger(finalized.tab.id).catch(() => void 0);
+        emitSessionBindingUpdated(finalized.binding.id, "open-tab", finalized.binding);
         return {
           browser: finalized.binding,
           tab: finalized.tab
@@ -2674,6 +2773,7 @@
       case "sessionBinding.setActiveTab": {
         const result = await bindingManager.setActiveTab(Number(params.tabId), String(params.bindingId ?? ""));
         void ensureNetworkDebugger(result.tab.id).catch(() => void 0);
+        emitSessionBindingUpdated(result.binding.id, "set-active-tab", result.binding);
         return {
           browser: result.binding,
           tab: result.tab
@@ -2691,8 +2791,10 @@
           const result = await bindingManager.reset({
             bindingId: String(params.bindingId ?? ""),
             focus: params.focus === true,
-            initialUrl: typeof params.url === "string" ? params.url : void 0
+            initialUrl: typeof params.url === "string" ? params.url : void 0,
+            label: typeof params.label === "string" ? params.label : void 0
           });
+          emitSessionBindingUpdated(result.binding.id, "reset", result.binding);
           return {
             browser: result.binding,
             created: result.created,
@@ -2701,8 +2803,22 @@
           };
         });
       }
+      case "sessionBinding.closeTab": {
+        const bindingId = String(params.bindingId ?? "");
+        const result = await bindingManager.closeTab(bindingId, typeof params.tabId === "number" ? params.tabId : void 0);
+        emitSessionBindingUpdated(bindingId, "close-tab", result.binding, {
+          closedTabId: result.closedTabId
+        });
+        return {
+          browser: result.binding,
+          closedTabId: result.closedTabId
+        };
+      }
       case "sessionBinding.close": {
-        return await bindingManager.close(String(params.bindingId ?? ""));
+        const bindingId = String(params.bindingId ?? "");
+        const result = await bindingManager.close(bindingId);
+        emitSessionBindingUpdated(bindingId, "close", null);
+        return result;
       }
       case "page.goto": {
         return await preserveHumanFocus(typeof target.tabId !== "number", async () => {
@@ -3263,40 +3379,68 @@
   chrome.tabs.onRemoved.addListener((tabId) => {
     dropNetworkCapture(tabId);
     void mutateSessionBindingStateMap((stateMap) => {
+      const updates = [];
       for (const [bindingId, state] of Object.entries(stateMap)) {
         if (!state.tabIds.includes(tabId)) {
           continue;
         }
         const nextTabIds = state.tabIds.filter((id) => id !== tabId);
-        stateMap[bindingId] = {
+        const fallbackTabId = nextTabIds[0] ?? null;
+        const nextState = {
           ...state,
           tabIds: nextTabIds,
-          activeTabId: state.activeTabId === tabId ? null : state.activeTabId,
-          primaryTabId: state.primaryTabId === tabId ? null : state.primaryTabId
+          activeTabId: state.activeTabId === tabId ? fallbackTabId : state.activeTabId,
+          primaryTabId: state.primaryTabId === tabId ? fallbackTabId : state.primaryTabId
         };
+        stateMap[bindingId] = nextState;
+        updates.push({ bindingId, state: nextState });
+      }
+      return updates;
+    }).then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, "tab-removed", update.state, {
+          closedTabId: tabId
+        });
       }
     });
   });
   chrome.tabs.onActivated.addListener((activeInfo) => {
-    void mutateSessionBindingStateMap((stateMap) => {
-      for (const [bindingId, state] of Object.entries(stateMap)) {
-        if (state.windowId !== activeInfo.windowId || !state.tabIds.includes(activeInfo.tabId)) {
-          continue;
+    if (preserveHumanFocusDepth > 0) {
+      return;
+    }
+    void chrome.windows.get(activeInfo.windowId).then((window2) => window2.focused === true).catch(() => false).then((windowFocused) => {
+      if (!windowFocused) {
+        return [];
+      }
+      return mutateSessionBindingStateMap((stateMap) => {
+        const updates = [];
+        for (const [bindingId, state] of Object.entries(stateMap)) {
+          if (state.windowId !== activeInfo.windowId || !state.tabIds.includes(activeInfo.tabId)) {
+            continue;
+          }
+          const nextState = {
+            ...state,
+            activeTabId: activeInfo.tabId
+          };
+          stateMap[bindingId] = nextState;
+          updates.push({ bindingId, state: nextState });
         }
-        stateMap[bindingId] = {
-          ...state,
-          activeTabId: activeInfo.tabId
-        };
+        return updates;
+      });
+    }).then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, "tab-activated", update.state);
       }
     });
   });
   chrome.windows.onRemoved.addListener((windowId) => {
     void mutateSessionBindingStateMap((stateMap) => {
+      const updates = [];
       for (const [bindingId, state] of Object.entries(stateMap)) {
         if (state.windowId !== windowId) {
           continue;
         }
-        stateMap[bindingId] = {
+        const nextState = {
           ...state,
           windowId: null,
           groupId: null,
@@ -3304,6 +3448,13 @@
           activeTabId: null,
           primaryTabId: null
         };
+        stateMap[bindingId] = nextState;
+        updates.push({ bindingId, state: nextState });
+      }
+      return updates;
+    }).then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, "window-removed", update.state);
       }
     });
   });

package/dist/manifest.json

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

package/package.json

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

package/src/background.ts

@@ -116,6 +116,7 @@ let reconnectAttempt = 0;
 let lastError: RuntimeErrorDetails | null = null;
 let manualDisconnect = false;
 let sessionBindingStateMutationQueue: Promise<void> = Promise.resolve();
+let preserveHumanFocusDepth = 0;
 
 async function getConfig(): Promise<ExtensionConfig> {
   const stored = await chrome.storage.local.get([STORAGE_KEY_TOKEN, STORAGE_KEY_PORT, STORAGE_KEY_DEBUG_RICH_TEXT]);
@@ -158,11 +159,24 @@ function clearReconnectTimer(): void {
   nextReconnectInMs = null;
 }
 
-function sendResponse(payload: CliResponse): void {
-  if (ws && ws.readyState === WebSocket.OPEN) {
-    ws.send(JSON.stringify(payload));
-  }
-}
+function sendResponse(payload: CliResponse): void {
+  if (ws && ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify(payload));
+  }
+}
+
+function sendEvent(event: string, data: Record<string, unknown>): void {
+  if (ws && ws.readyState === WebSocket.OPEN) {
+    ws.send(
+      JSON.stringify({
+        type: 'event',
+        event,
+        data,
+        ts: Date.now()
+      })
+    );
+  }
+}
 
 function toError(code: string, message: string, data?: Record<string, unknown>): CliResponse['error'] {
   return { code, message, data };
@@ -265,6 +279,33 @@ async function deleteSessionBindingState(bindingId: string): Promise<void> {
     delete stateMap[bindingId];
   });
 }
+
+function toSessionBindingEventBrowser(state: SessionBindingRecord | null): Record<string, unknown> | null {
+  if (!state) {
+    return null;
+  }
+  return {
+    windowId: state.windowId,
+    groupId: state.groupId,
+    tabIds: [...state.tabIds],
+    activeTabId: state.activeTabId,
+    primaryTabId: state.primaryTabId
+  };
+}
+
+function emitSessionBindingUpdated(
+  bindingId: string,
+  reason: string,
+  state: SessionBindingRecord | null,
+  extras: Record<string, unknown> = {}
+): void {
+  sendEvent('sessionBinding.updated', {
+    bindingId,
+    reason,
+    browser: toSessionBindingEventBrowser(state),
+    ...extras
+  });
+}
 
 const sessionBindingBrowser: SessionBindingBrowser = {
   async getTab(tabId) {
@@ -673,18 +714,23 @@ async function restoreFocusContext(context: FocusContext): Promise<void> {
   }
 }
 
-async function preserveHumanFocus<T>(enabled: boolean, action: () => Promise<T>): Promise<T> {
-  if (!enabled) {
-    return action();
-  }
-
-  const focusContext = await captureFocusContext();
-  try {
-    return await action();
-  } finally {
-    await restoreFocusContext(focusContext);
-  }
-}
+async function preserveHumanFocus<T>(enabled: boolean, action: () => Promise<T>): Promise<T> {
+  if (!enabled) {
+    return action();
+  }
+
+  const focusContext = await captureFocusContext();
+  preserveHumanFocusDepth += 1;
+  try {
+    return await action();
+  } finally {
+    try {
+      await restoreFocusContext(focusContext);
+    } finally {
+      preserveHumanFocusDepth = Math.max(0, preserveHumanFocusDepth - 1);
+    }
+  }
+}
 
 function requireRpcEnvelope(
   method: string,
@@ -1686,11 +1732,13 @@ async function handleRequest(request: CliRequest): Promise<unknown> {
         const result = await bindingManager.ensureBinding({
           bindingId: String(params.bindingId ?? ''),
           focus: params.focus === true,
-          initialUrl: typeof params.url === 'string' ? params.url : undefined
+          initialUrl: typeof params.url === 'string' ? params.url : undefined,
+          label: typeof params.label === 'string' ? params.label : undefined
         });
         for (const tab of result.binding.tabs) {
           void ensureNetworkDebugger(tab.id).catch(() => undefined);
         }
+        emitSessionBindingUpdated(result.binding.id, 'ensure', result.binding);
         return {
           browser: result.binding,
           created: result.created,
@@ -1711,11 +1759,13 @@ async function handleRequest(request: CliRequest): Promise<unknown> {
           bindingId: String(params.bindingId ?? ''),
           url: expectedUrl,
           active: params.active === true,
-          focus: params.focus === true
+          focus: params.focus === true,
+          label: typeof params.label === 'string' ? params.label : undefined
         });
       });
       const finalized = await finalizeOpenedSessionBindingTab(opened, expectedUrl);
       void ensureNetworkDebugger(finalized.tab.id).catch(() => undefined);
+      emitSessionBindingUpdated(finalized.binding.id, 'open-tab', finalized.binding);
       return {
         browser: finalized.binding,
         tab: finalized.tab
@@ -1738,6 +1788,7 @@ async function handleRequest(request: CliRequest): Promise<unknown> {
     case 'sessionBinding.setActiveTab': {
       const result = await bindingManager.setActiveTab(Number(params.tabId), String(params.bindingId ?? ''));
       void ensureNetworkDebugger(result.tab.id).catch(() => undefined);
+      emitSessionBindingUpdated(result.binding.id, 'set-active-tab', result.binding);
       return {
         browser: result.binding,
         tab: result.tab
@@ -1755,8 +1806,10 @@ async function handleRequest(request: CliRequest): Promise<unknown> {
         const result = await bindingManager.reset({
           bindingId: String(params.bindingId ?? ''),
           focus: params.focus === true,
-          initialUrl: typeof params.url === 'string' ? params.url : undefined
+          initialUrl: typeof params.url === 'string' ? params.url : undefined,
+          label: typeof params.label === 'string' ? params.label : undefined
         });
+        emitSessionBindingUpdated(result.binding.id, 'reset', result.binding);
         return {
           browser: result.binding,
           created: result.created,
@@ -1765,8 +1818,22 @@ async function handleRequest(request: CliRequest): Promise<unknown> {
         };
       });
     }
+    case 'sessionBinding.closeTab': {
+      const bindingId = String(params.bindingId ?? '');
+      const result = await bindingManager.closeTab(bindingId, typeof params.tabId === 'number' ? params.tabId : undefined);
+      emitSessionBindingUpdated(bindingId, 'close-tab', result.binding, {
+        closedTabId: result.closedTabId
+      });
+      return {
+        browser: result.binding,
+        closedTabId: result.closedTabId
+      };
+    }
     case 'sessionBinding.close': {
-      return await bindingManager.close(String(params.bindingId ?? ''));
+      const bindingId = String(params.bindingId ?? '');
+      const result = await bindingManager.close(bindingId);
+      emitSessionBindingUpdated(bindingId, 'close', null);
+      return result;
     }
     case 'page.goto': {
       return await preserveHumanFocus(typeof target.tabId !== 'number', async () => {
@@ -2352,42 +2419,75 @@ async function connectWebSocket(): Promise<void> {
 chrome.tabs.onRemoved.addListener((tabId) => {
   dropNetworkCapture(tabId);
   void mutateSessionBindingStateMap((stateMap) => {
+    const updates: Array<{ bindingId: string; state: SessionBindingRecord }> = [];
     for (const [bindingId, state] of Object.entries(stateMap)) {
       if (!state.tabIds.includes(tabId)) {
         continue;
       }
       const nextTabIds = state.tabIds.filter((id) => id !== tabId);
-      stateMap[bindingId] = {
+      const fallbackTabId = nextTabIds[0] ?? null;
+      const nextState: SessionBindingRecord = {
         ...state,
         tabIds: nextTabIds,
-        activeTabId: state.activeTabId === tabId ? null : state.activeTabId,
-        primaryTabId: state.primaryTabId === tabId ? null : state.primaryTabId
+        activeTabId: state.activeTabId === tabId ? fallbackTabId : state.activeTabId,
+        primaryTabId: state.primaryTabId === tabId ? fallbackTabId : state.primaryTabId
       };
+      stateMap[bindingId] = nextState;
+      updates.push({ bindingId, state: nextState });
+    }
+    return updates;
+  }).then((updates) => {
+    for (const update of updates) {
+      emitSessionBindingUpdated(update.bindingId, 'tab-removed', update.state, {
+        closedTabId: tabId
+      });
     }
   });
 });
 
 chrome.tabs.onActivated.addListener((activeInfo) => {
-  void mutateSessionBindingStateMap((stateMap) => {
-    for (const [bindingId, state] of Object.entries(stateMap)) {
-      if (state.windowId !== activeInfo.windowId || !state.tabIds.includes(activeInfo.tabId)) {
-        continue;
+  if (preserveHumanFocusDepth > 0) {
+    return;
+  }
+  void chrome.windows
+    .get(activeInfo.windowId)
+    .then((window) => window.focused === true)
+    .catch(() => false)
+    .then((windowFocused) => {
+      if (!windowFocused) {
+        return [] as Array<{ bindingId: string; state: SessionBindingRecord }>;
       }
-      stateMap[bindingId] = {
-        ...state,
-        activeTabId: activeInfo.tabId
-      };
-    }
-  });
+      return mutateSessionBindingStateMap((stateMap) => {
+        const updates: Array<{ bindingId: string; state: SessionBindingRecord }> = [];
+        for (const [bindingId, state] of Object.entries(stateMap)) {
+          if (state.windowId !== activeInfo.windowId || !state.tabIds.includes(activeInfo.tabId)) {
+            continue;
+          }
+          const nextState: SessionBindingRecord = {
+            ...state,
+            activeTabId: activeInfo.tabId
+          };
+          stateMap[bindingId] = nextState;
+          updates.push({ bindingId, state: nextState });
+        }
+        return updates;
+      });
+    })
+    .then((updates) => {
+      for (const update of updates) {
+        emitSessionBindingUpdated(update.bindingId, 'tab-activated', update.state);
+      }
+    });
 });
 
 chrome.windows.onRemoved.addListener((windowId) => {
   void mutateSessionBindingStateMap((stateMap) => {
+    const updates: Array<{ bindingId: string; state: SessionBindingRecord }> = [];
     for (const [bindingId, state] of Object.entries(stateMap)) {
       if (state.windowId !== windowId) {
         continue;
       }
-      stateMap[bindingId] = {
+      const nextState: SessionBindingRecord = {
         ...state,
         windowId: null,
         groupId: null,
@@ -2395,6 +2495,13 @@ chrome.windows.onRemoved.addListener((windowId) => {
         activeTabId: null,
         primaryTabId: null
       };
+      stateMap[bindingId] = nextState;
+      updates.push({ bindingId, state: nextState });
+    }
+    return updates;
+  }).then((updates) => {
+    for (const update of updates) {
+      emitSessionBindingUpdated(update.bindingId, 'window-removed', update.state);
     }
   });
 });

package/src/session-binding.ts

@@ -88,18 +88,20 @@ interface SessionBindingWindowOwnership {
   foreignTabs: SessionBindingTab[];
 }
 
-export interface SessionBindingEnsureOptions {
-  bindingId?: string;
-  focus?: boolean;
-  initialUrl?: string;
-}
-
-export interface SessionBindingOpenTabOptions {
-  bindingId?: string;
-  url?: string;
-  active?: boolean;
-  focus?: boolean;
-}
+export interface SessionBindingEnsureOptions {
+  bindingId?: string;
+  focus?: boolean;
+  initialUrl?: string;
+  label?: string;
+}
+
+export interface SessionBindingOpenTabOptions {
+  bindingId?: string;
+  url?: string;
+  active?: boolean;
+  focus?: boolean;
+  label?: string;
+}
 
 export interface SessionBindingResolveTargetOptions {
   tabId?: number;
@@ -120,13 +122,13 @@ class SessionBindingManager {
     return this.inspectBinding(bindingId);
   }
 
-  async ensureBinding(options: SessionBindingEnsureOptions = {}): Promise<SessionBindingEnsureResult> {
-    const bindingId = this.normalizeBindingId(options.bindingId);
-    const repairActions: string[] = [];
-    const initialUrl = options.initialUrl ?? DEFAULT_SESSION_BINDING_URL;
-    const persisted = await this.storage.load(bindingId);
-    const created = !persisted;
-    let state = this.normalizeState(persisted, bindingId);
+  async ensureBinding(options: SessionBindingEnsureOptions = {}): Promise<SessionBindingEnsureResult> {
+    const bindingId = this.normalizeBindingId(options.bindingId);
+    const repairActions: string[] = [];
+    const initialUrl = options.initialUrl ?? DEFAULT_SESSION_BINDING_URL;
+    const persisted = await this.storage.load(bindingId);
+    const created = !persisted;
+    let state = this.normalizeState(persisted, bindingId, options.label);
 
     const originalWindowId = state.windowId;
     let window = state.windowId !== null ? await this.waitForWindow(state.windowId) : null;
@@ -266,14 +268,15 @@ class SessionBindingManager {
     };
   }
 
-  async openTab(options: SessionBindingOpenTabOptions = {}): Promise<{ binding: SessionBindingInfo; tab: SessionBindingTab }> {
-    const bindingId = this.normalizeBindingId(options.bindingId);
-    const hadBinding = (await this.loadBindingRecord(bindingId)) !== null;
-    const ensured = await this.ensureBinding({
-      bindingId,
-      focus: false,
-      initialUrl: hadBinding ? options.url ?? DEFAULT_SESSION_BINDING_URL : DEFAULT_SESSION_BINDING_URL
-    });
+  async openTab(options: SessionBindingOpenTabOptions = {}): Promise<{ binding: SessionBindingInfo; tab: SessionBindingTab }> {
+    const bindingId = this.normalizeBindingId(options.bindingId);
+    const hadBinding = (await this.loadBindingRecord(bindingId)) !== null;
+    const ensured = await this.ensureBinding({
+      bindingId,
+      focus: false,
+      initialUrl: hadBinding ? options.url ?? DEFAULT_SESSION_BINDING_URL : DEFAULT_SESSION_BINDING_URL,
+      label: options.label
+    });
     let state = { ...ensured.binding, tabIds: [...ensured.binding.tabIds], tabs: [...ensured.binding.tabs] };
     if (state.windowId !== null && state.tabs.length === 0) {
       const rebound = await this.rebindBindingWindow(state);
@@ -309,11 +312,12 @@ class SessionBindingManager {
       if (!this.isMissingWindowError(error)) {
         throw error;
       }
-      const repaired = await this.ensureBinding({
-        bindingId,
-        focus: false,
-        initialUrl: desiredUrl
-      });
+      const repaired = await this.ensureBinding({
+        bindingId,
+        focus: false,
+        initialUrl: desiredUrl,
+        label: options.label
+      });
       state = { ...repaired.binding };
       reusablePrimaryTab = await this.resolveReusablePrimaryTab(state, true);
       createdTab = reusablePrimaryTab
@@ -421,44 +425,107 @@ class SessionBindingManager {
     };
   }
 
-  async focus(bindingId: string): Promise<{ ok: true; binding: SessionBindingInfo }> {
-    const ensured = await this.ensureBinding({ bindingId, focus: false });
-    if (ensured.binding.activeTabId !== null) {
-      await this.browser.updateTab(ensured.binding.activeTabId, { active: true });
-    }
+  async focus(bindingId: string): Promise<{ ok: true; binding: SessionBindingInfo }> {
+    const ensured = await this.ensureBinding({ bindingId, focus: false });
+    if (ensured.binding.activeTabId !== null) {
+      await this.browser.updateTab(ensured.binding.activeTabId, { active: true });
+    }
     if (ensured.binding.windowId !== null) {
       await this.browser.updateWindow(ensured.binding.windowId, { focused: true });
     }
-    const refreshed = await this.ensureBinding({ bindingId, focus: false });
-    return { ok: true, binding: refreshed.binding };
-  }
-
-  async reset(options: SessionBindingEnsureOptions = {}): Promise<SessionBindingEnsureResult> {
-    const bindingId = this.normalizeBindingId(options.bindingId);
-    await this.close(bindingId);
+    const refreshed = await this.ensureBinding({ bindingId, focus: false });
+    return { ok: true, binding: refreshed.binding };
+  }
+
+  async closeTab(bindingId: string, tabId?: number): Promise<{ binding: SessionBindingInfo | null; closedTabId: number }> {
+    const ensured = await this.ensureBinding({ bindingId, focus: false });
+    const resolvedTabId =
+      typeof tabId === 'number'
+        ? tabId
+        : ensured.binding.activeTabId ?? ensured.binding.primaryTabId ?? ensured.binding.tabs[0]?.id;
+    if (typeof resolvedTabId !== 'number' || !ensured.binding.tabIds.includes(resolvedTabId)) {
+      throw new Error(`Tab ${tabId ?? 'active'} does not belong to binding ${bindingId}`);
+    }
+
+    await this.browser.closeTab(resolvedTabId);
+    const remainingTabIds = ensured.binding.tabIds.filter((candidate) => candidate !== resolvedTabId);
+
+    if (remainingTabIds.length === 0) {
+      const emptied: SessionBindingRecord = {
+        id: ensured.binding.id,
+        label: ensured.binding.label,
+        color: ensured.binding.color,
+        windowId: null,
+        groupId: null,
+        tabIds: [],
+        activeTabId: null,
+        primaryTabId: null
+      };
+      await this.storage.save(emptied);
+      return {
+        binding: {
+          ...emptied,
+          tabs: []
+        },
+        closedTabId: resolvedTabId
+      };
+    }
+
+    const tabs = await this.readLooseTrackedTabs(remainingTabIds);
+    const nextPrimaryTabId =
+      ensured.binding.primaryTabId === resolvedTabId ? tabs[0]?.id ?? null : ensured.binding.primaryTabId;
+    const nextActiveTabId =
+      ensured.binding.activeTabId === resolvedTabId
+        ? tabs.find((candidate) => candidate.active)?.id ?? nextPrimaryTabId ?? tabs[0]?.id ?? null
+        : ensured.binding.activeTabId;
+    const nextState: SessionBindingRecord = {
+      id: ensured.binding.id,
+      label: ensured.binding.label,
+      color: ensured.binding.color,
+      windowId: tabs[0]?.windowId ?? ensured.binding.windowId,
+      groupId: tabs[0]?.groupId ?? ensured.binding.groupId,
+      tabIds: tabs.map((candidate) => candidate.id),
+      activeTabId: nextActiveTabId,
+      primaryTabId: nextPrimaryTabId
+    };
+    await this.storage.save(nextState);
+    return {
+      binding: {
+        ...nextState,
+        tabs
+      },
+      closedTabId: resolvedTabId
+    };
+  }
+
+  async reset(options: SessionBindingEnsureOptions = {}): Promise<SessionBindingEnsureResult> {
+    const bindingId = this.normalizeBindingId(options.bindingId);
+    await this.close(bindingId);
     return this.ensureBinding({
       ...options,
       bindingId
     });
   }
 
-  async close(bindingId: string): Promise<{ ok: true }> {
-    const state = await this.loadBindingRecord(bindingId);
-    if (!state) {
-      await this.storage.delete(bindingId);
-      return { ok: true };
-    }
-    // Clear persisted state before closing the window so tab/window removal
-    // listeners cannot race and resurrect an empty binding record.
-    await this.storage.delete(bindingId);
-    if (state.windowId !== null) {
-      const existingWindow = await this.browser.getWindow(state.windowId);
-      if (existingWindow) {
-        await this.browser.closeWindow(state.windowId);
-      }
-    }
-    return { ok: true };
-  }
+  async close(bindingId: string): Promise<{ ok: true }> {
+    const state = await this.loadBindingRecord(bindingId);
+    if (!state) {
+      await this.storage.delete(bindingId);
+      return { ok: true };
+    }
+    // Clear persisted state before closing the window so tab/window removal
+    // listeners cannot race and resurrect an empty binding record.
+    await this.storage.delete(bindingId);
+    const trackedTabs = await this.readLooseTrackedTabs(this.collectCandidateTabIds(state));
+    for (const trackedTab of trackedTabs) {
+      try {
+        await this.browser.closeTab(trackedTab.id);
+      } catch {
+        // Ignore tabs that were already removed before explicit close.
+      }
+    }
+    return { ok: true };
+  }
 
   async resolveTarget(options: SessionBindingResolveTargetOptions = {}): Promise<SessionBindingTargetResolution> {
     if (typeof options.tabId === 'number') {
@@ -511,13 +578,13 @@ class SessionBindingManager {
     return candidate;
   }
 
-  private normalizeState(state: SessionBindingRecord | null, bindingId: string): SessionBindingRecord {
-    return {
-      id: bindingId,
-      label: state?.label ?? DEFAULT_SESSION_BINDING_LABEL,
-      color: state?.color ?? DEFAULT_SESSION_BINDING_COLOR,
-      windowId: state?.windowId ?? null,
-      groupId: state?.groupId ?? null,
+  private normalizeState(state: SessionBindingRecord | null, bindingId: string, label?: string): SessionBindingRecord {
+    return {
+      id: bindingId,
+      label: label?.trim() ? label.trim() : state?.label ?? DEFAULT_SESSION_BINDING_LABEL,
+      color: state?.color ?? DEFAULT_SESSION_BINDING_COLOR,
+      windowId: state?.windowId ?? null,
+      groupId: state?.groupId ?? null,
       tabIds: state?.tabIds ?? [],
       activeTabId: state?.activeTabId ?? null,
       primaryTabId: state?.primaryTabId ?? null
@@ -710,12 +777,16 @@ class SessionBindingManager {
       await this.browser.updateTab(nextActiveTabId, { active: true });
     }
 
-    state.windowId = window.id;
-    state.groupId = null;
-    state.tabIds = recreatedTabs.map((tab) => tab.id);
-    state.primaryTabId = nextPrimaryTabId;
-    state.activeTabId = nextActiveTabId;
-
+    state.windowId = window.id;
+    state.groupId = null;
+    state.tabIds = recreatedTabs.map((tab) => tab.id);
+    state.primaryTabId = nextPrimaryTabId;
+    state.activeTabId = nextActiveTabId;
+    await this.storage.save({
+      ...state,
+      tabIds: [...state.tabIds]
+    });
+
     for (const bindingTab of ownership.bindingTabs) {
       await this.browser.closeTab(bindingTab.id);
     }