From e9441eda05dc24a7c4d2e85d499fdf932e65ca54 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 10 Sep 2026 15:11:55 -0700
Subject: [PATCH 1/4] feat(desktop): browser pages as resource tabs, agent
 works in the background

Each live desktop browser page is now its own resource tab in the Chat
panel, derived from the desktop app's tab list instead of a persisted
singleton "Browser" resource with a second tab strip inside it. The inner
browser tab strip, tab pinning, duplicate, reorder, the native tab context
menu, and the auto-replacement of a closed last tab are removed.

The agent drives its own tab (the desktop's automation cursor) without
moving the user's visible page: the renderer no longer force-activates the
browser on every tool call nor auto-switches the panel to the agent's tab.
The agent's tab is announced as resource activity, so the existing view
policy shows it or badges it depending on whether the user has taken over
selection. Mentions and attachments point at exact tabs; the chat row never
stores browser resources, and legacy rows are dropped on read.
---
 .../src/main/browser-agent/driver.test.ts     |   2 +-
 apps/desktop/src/main/browser-agent/driver.ts |  15 +-
 .../src/main/browser-agent/panel.test.ts      |  14 +-
 apps/desktop/src/main/browser-agent/panel.ts  |  12 +-
 .../src/main/browser-agent/session.test.ts    | 296 +++++-------------
 .../desktop/src/main/browser-agent/session.ts | 192 ++----------
 .../main/desktop-chat-session-store.test.ts   |  31 +-
 .../src/main/desktop-chat-session-store.ts    |  26 +-
 apps/desktop/src/main/ipc.test.ts             |  32 --
 apps/desktop/src/main/ipc.ts                  |  47 ---
 apps/desktop/src/preload/index.ts             |   9 -
 .../add-resource-dropdown.tsx                 |  24 +-
 .../browser-panel-occlusion.ts                |   1 -
 .../browser-session/browser-session.test.ts   |  16 -
 .../browser-session/browser-session.tsx       | 245 +--------------
 .../browser-session/browser-tab-strip.tsx     | 246 ---------------
 .../resource-content/resource-content.tsx     |   5 +-
 .../resource-registry/browser-tab-icon.tsx    |  83 +++++
 .../resource-registry/resource-registry.tsx   |   5 +-
 .../resource-tabs/resource-tabs.test.ts       |  15 +-
 .../resource-tabs/resource-tabs.tsx           |  45 ++-
 .../mothership-view/mothership-view.tsx       |  67 ++--
 .../user-input/components/constants.ts        |   6 +-
 .../plus-menu-dropdown.test.tsx               |  88 ++++--
 .../plus-menu-dropdown/plus-menu-dropdown.tsx |  10 +-
 .../resource-mention-items.test.ts            | 145 ++++-----
 .../resource-mention-items.ts                 |  68 ++--
 .../app/workspace/[workspaceId]/home/home.tsx |  11 +
 .../stream/handle-resource-event.test.ts      |  10 +-
 .../hooks/stream/handle-resource-event.ts     |   3 +
 .../home/hooks/use-browser-tab-resources.ts   | 129 ++++++++
 .../[workspaceId]/home/hooks/use-chat.ts      |  64 ++--
 .../sim/lib/browser-agent/attachments.test.ts |  43 ++-
 apps/sim/lib/browser-agent/attachments.ts     |  26 +-
 .../browser-agent/tab-label.test.ts}          |   5 +-
 .../browser-agent/tab-label.ts}               |   0
 apps/sim/lib/browser-agent/transport.test.ts  |  49 +--
 apps/sim/lib/browser-agent/transport.ts       |  51 ++-
 apps/sim/lib/copilot/chat/post.test.ts        |  10 +-
 apps/sim/lib/copilot/chat/post.ts             |   9 +-
 .../lib/copilot/chat/process-contents.test.ts |  10 +-
 apps/sim/lib/copilot/chat/process-contents.ts |  13 +-
 apps/sim/lib/copilot/resources/types.test.ts  |  27 +-
 apps/sim/lib/copilot/resources/types.ts       |  53 ++--
 apps/sim/stores/browser-session/store.test.ts |  44 ---
 apps/sim/stores/browser-session/store.ts      |  18 --
 packages/browser-protocol/src/index.ts        |  15 +-
 packages/desktop-bridge/contract-snapshot.ts  |  52 ++-
 packages/desktop-bridge/src/index.ts          |   6 -
 49 files changed, 833 insertions(+), 1560 deletions(-)
 delete mode 100644 apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts
 rename apps/sim/{app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.test.ts => lib/browser-agent/tab-label.test.ts} (85%)
 rename apps/sim/{app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label.ts => lib/browser-agent/tab-label.ts} (100%)

diff --git a/apps/desktop/src/main/browser-agent/driver.test.ts b/apps/desktop/src/main/browser-agent/driver.test.ts
index 5c268072838..170d02a4c80 100644
--- a/apps/desktop/src/main/browser-agent/driver.test.ts
+++ b/apps/desktop/src/main/browser-agent/driver.test.ts
@@ -1395,7 +1395,7 @@ describe('executeTool', () => {
   it('keeps activation lazy, then restores and disposes through the driver API', async () => {
     const snapshot: BrowserSessionSnapshot = {
       v: 1,
-      tabs: [{ url: 'https://restored.example/', pinned: false }],
+      tabs: [{ url: 'https://restored.example/' }],
       activeIndex: 0,
       downloads: [],
     }
diff --git a/apps/desktop/src/main/browser-agent/driver.ts b/apps/desktop/src/main/browser-agent/driver.ts
index 62f3fda318d..cea058ca05f 100644
--- a/apps/desktop/src/main/browser-agent/driver.ts
+++ b/apps/desktop/src/main/browser-agent/driver.ts
@@ -905,7 +905,7 @@ export async function clearBrowserProfile(
   retireAllDriverScopeStates()
   const settingsCleared = knownSessions?.clear() !== false
   const outcomes = await Promise.allSettled([session.clearProfileStorage(), clearCredentials()])
-  // Last, covering the pinned-tab list `clearProfileStorage` just emptied.
+  // Last, covering the saved tab list `clearProfileStorage` just emptied.
   // Settings writes coalesce, and an erasure that is still sitting in that
   // window when the process dies leaves the previous account's data on disk
   // after sign-out already told the user it was gone.
@@ -2368,8 +2368,7 @@ async function executeToolInner(
         }
       }
       assertCurrentExecution()
-      // The agent chose to open this page to work in, so the panel follows it.
-      const tab = session.addAutomationTab({ reveal: true })
+      const tab = session.addAutomationTab()
       const contents = tab.view.webContents
       if (url) {
         assertCurrentExecution()
@@ -4782,16 +4781,6 @@ export async function handlePanelAction(
       }
       return
     }
-    if (action.action === 'new-tab') {
-      session.addTab()
-      return
-    }
-    if (action.action === 'duplicate-tab') {
-      if (typeof action.tabId === 'string') {
-        session.duplicateTab(action.tabId)
-      }
-      return
-    }
     if (action.action === 'switch-tab') {
       if (typeof action.tabId === 'string') {
         session.switchTab(action.tabId)
diff --git a/apps/desktop/src/main/browser-agent/panel.test.ts b/apps/desktop/src/main/browser-agent/panel.test.ts
index d8d04665315..5aa024772c7 100644
--- a/apps/desktop/src/main/browser-agent/panel.test.ts
+++ b/apps/desktop/src/main/browser-agent/panel.test.ts
@@ -20,7 +20,7 @@ function freshPanel(): PanelModule {
     getMainWindow: () => null,
     activeTab: () => null,
     backgroundColor: () => '#ffffff',
-    ensureInitialTab: () => {},
+    restoreActiveScope: () => {},
     onViewDetached: () => {},
   })
   panelModule.activatePanelScope('chat-test')
@@ -33,12 +33,12 @@ const PANEL_RECT = { x: 400, y: 64, width: 600, height: 800 }
 function showPanel(panel: PanelModule) {
   const win = new BrowserWindow()
   const view = new WebContentsView()
-  const active = { id: 'tab-1', scopeId: 'chat-test', view, pinned: false }
+  const active = { id: 'tab-1', scopeId: 'chat-test', view }
   panel.initPanel({
     getMainWindow: () => win,
     activeTab: () => active,
     backgroundColor: () => '#0c0c0c',
-    ensureInitialTab: () => {},
+    restoreActiveScope: () => {},
     onViewDetached: () => {},
   })
   panel.activatePanelScope('chat-test')
@@ -56,13 +56,13 @@ describe('panel chat scope', () => {
   it('returns keyboard focus to the renderer when attaching a view steals it mid-typing', () => {
     const win = new BrowserWindow()
     const view = new WebContentsView()
-    const active = { id: 'tab-1', scopeId: 'chat-test', view, pinned: false }
+    const active = { id: 'tab-1', scopeId: 'chat-test', view }
     vi.mocked(win.webContents.isFocused).mockReturnValue(true)
     panel.initPanel({
       getMainWindow: () => win,
       activeTab: () => active,
       backgroundColor: () => '#0c0c0c',
-      ensureInitialTab: () => {},
+      restoreActiveScope: () => {},
       onViewDetached: () => {},
     })
     panel.activatePanelScope('chat-test')
@@ -327,12 +327,12 @@ describe('panel chat scope', () => {
   it('applies a forced hide before the panel reports its first bounds', () => {
     const win = new BrowserWindow()
     const view = new WebContentsView()
-    const active = { id: 'tab-1', scopeId: 'chat-test', view, pinned: false }
+    const active = { id: 'tab-1', scopeId: 'chat-test', view }
     panel.initPanel({
       getMainWindow: () => win,
       activeTab: () => active,
       backgroundColor: () => '#0c0c0c',
-      ensureInitialTab: () => {},
+      restoreActiveScope: () => {},
       onViewDetached: () => {},
     })
     panel.activatePanelScope('chat-test')
diff --git a/apps/desktop/src/main/browser-agent/panel.ts b/apps/desktop/src/main/browser-agent/panel.ts
index 207448ffba4..42ca72e4f89 100644
--- a/apps/desktop/src/main/browser-agent/panel.ts
+++ b/apps/desktop/src/main/browser-agent/panel.ts
@@ -41,12 +41,8 @@ export interface PanelHost {
   activeTab: () => AgentTab | null
   /** Native backdrop used by a blank tab before its first page paint. */
   backgroundColor: () => string
-  /**
-   * Materializes the initial tab when the panel first becomes visible: a
-   * visible browser resource always represents one open browser window, and
-   * the tab strip, omnibox, and native session must not disagree about that.
-   */
-  ensureInitialTab: () => void
+  /** Hydrates the active scope's saved pages when the panel first becomes visible. */
+  restoreActiveScope: () => void
   /** Lets the session drop focus tracking for a view that is no longer attached. */
   onViewDetached: (view: WebContentsView | null) => void
 }
@@ -55,7 +51,7 @@ let host: PanelHost = {
   getMainWindow: () => null,
   activeTab: () => null,
   backgroundColor: () => '#ffffff',
-  ensureInitialTab: () => {},
+  restoreActiveScope: () => {},
   onViewDetached: () => {},
 }
 
@@ -834,7 +830,7 @@ export function setPanelBounds(
   panelBounds = bounds
   panelAnchor = bounds === null ? null : (anchor ?? null)
   if (bounds !== null) {
-    host.ensureInitialTab()
+    host.restoreActiveScope()
   } else {
     resetOcclusion()
   }
diff --git a/apps/desktop/src/main/browser-agent/session.test.ts b/apps/desktop/src/main/browser-agent/session.test.ts
index b7f62e74266..84564d409e6 100644
--- a/apps/desktop/src/main/browser-agent/session.test.ts
+++ b/apps/desktop/src/main/browser-agent/session.test.ts
@@ -505,7 +505,7 @@ describe('browser-agent session', () => {
   it('preserves a persisted destination behind a lazy activation', () => {
     const existingSnapshot: BrowserSessionSnapshot = {
       v: 1,
-      tabs: [{ url: 'https://existing.example/', pinned: false }],
+      tabs: [{ url: 'https://existing.example/' }],
       activeIndex: 0,
       downloads: [],
     }
@@ -607,10 +607,7 @@ describe('browser-agent session', () => {
     vi.mocked((second.view as unknown as MockView).webContents.getURL).mockReturnValue(
       'https://two.example/'
     )
-    session.withBrowserScope('chat-a', () => {
-      session.setTabPinned(first.id, true)
-      session.switchTab(second.id)
-    })
+    session.withBrowserScope('chat-a', () => session.switchTab(second.id))
 
     session = freshSession(win, {}, persistence)
     vi.mocked(persistence.load).mockClear()
@@ -629,8 +626,8 @@ describe('browser-agent session', () => {
       scopeId: 'chat-a',
       activeTabId: '2',
       tabs: [
-        { tabId: '1', url: 'https://one.example/', pinned: true, active: false },
-        { tabId: '2', url: 'https://two.example/', pinned: false, active: true },
+        { tabId: '1', url: 'https://one.example/', active: false },
+        { tabId: '2', url: 'https://two.example/', active: true },
       ],
     })
     expect(session.withBrowserScope('chat-a', () => session.activeTab()?.view)).not.toBe(
@@ -641,7 +638,6 @@ describe('browser-agent session', () => {
   it('selects and starts the active restore before three bounded background loads', async () => {
     const tabs = Array.from({ length: 7 }, (_, index) => ({
       url: `https://restore-${index}.example/`,
-      pinned: index < 2,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-restore-order': {
@@ -677,13 +673,13 @@ describe('browser-agent session', () => {
     ).toMatchObject({
       activeTabId: '6',
       tabs: [
-        { tabId: '1', pinned: true },
-        { tabId: '2', pinned: true },
-        { tabId: '3', pinned: false },
-        { tabId: '4', pinned: false },
-        { tabId: '5', pinned: false },
-        { tabId: '6', pinned: false, active: true },
-        { tabId: '7', pinned: false },
+        { tabId: '1' },
+        { tabId: '2' },
+        { tabId: '3' },
+        { tabId: '4' },
+        { tabId: '5' },
+        { tabId: '6', active: true },
+        { tabId: '7' },
       ],
     })
     expect(createdContents[5].loadURL).toHaveBeenCalledWith(tabs[5].url)
@@ -704,7 +700,6 @@ describe('browser-agent session', () => {
   it('preempts a background restore for a user-selected queued tab', async () => {
     const tabs = Array.from({ length: 7 }, (_, index) => ({
       url: `https://priority-${index}.example/`,
-      pinned: false,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-restore-priority': {
@@ -760,7 +755,6 @@ describe('browser-agent session', () => {
   it('keeps a deferred restore intact when Back and Forward cannot move', () => {
     const tabs = Array.from({ length: 6 }, (_, index) => ({
       url: `https://deferred-history-${index}.example/`,
-      pinned: false,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-deferred-history': { v: 1, tabs, activeIndex: 0, downloads: [] },
@@ -794,7 +788,6 @@ describe('browser-agent session', () => {
     try {
       const tabs = Array.from({ length: 7 }, (_, index) => ({
         url: `https://model-restore-${index}.example/`,
-        pinned: false,
       }))
       const { persistence } = memoryBrowserPersistence({
         'chat-model-restore': { v: 1, tabs, activeIndex: 0, downloads: [] },
@@ -853,7 +846,6 @@ describe('browser-agent session', () => {
     try {
       const tabs = Array.from({ length: 4 }, (_, index) => ({
         url: `https://active-restore-${index}.example/`,
-        pinned: false,
       }))
       const { persistence } = memoryBrowserPersistence({
         'chat-active-restore': { v: 1, tabs, activeIndex: 0, downloads: [] },
@@ -903,7 +895,7 @@ describe('browser-agent session', () => {
         `chat-foreground-${index}`,
         {
           v: 1 as const,
-          tabs: [{ url: `https://foreground-${index}.example/`, pinned: false }],
+          tabs: [{ url: `https://foreground-${index}.example/` }],
           activeIndex: 0,
           downloads: [],
         },
@@ -952,11 +944,9 @@ describe('browser-agent session', () => {
     try {
       const firstTabs = Array.from({ length: 6 }, (_, index) => ({
         url: `https://hung-a-${index}.example/`,
-        pinned: false,
       }))
       const secondTabs = Array.from({ length: 2 }, (_, index) => ({
         url: `https://waiting-b-${index}.example/`,
-        pinned: false,
       }))
       const { persistence } = memoryBrowserPersistence({
         'chat-hung-a': { v: 1, tabs: firstTabs, activeIndex: 0, downloads: [] },
@@ -1002,7 +992,7 @@ describe('browser-agent session', () => {
       const { persistence } = memoryBrowserPersistence({
         'chat-throwing-stop': {
           v: 1,
-          tabs: [{ url: restoredUrl, pinned: false }],
+          tabs: [{ url: restoredUrl }],
           activeIndex: 0,
           downloads: [],
         },
@@ -1045,8 +1035,8 @@ describe('browser-agent session', () => {
     vi.useFakeTimers()
     try {
       const tabs = [
-        { url: 'http://127.0.0.1:4601/active', pinned: false },
-        { url: 'http://127.0.0.1:4601/background', pinned: false },
+        { url: 'http://127.0.0.1:4601/active' },
+        { url: 'http://127.0.0.1:4601/background' },
       ]
       const { persistence } = memoryBrowserPersistence({
         'chat-stale-restore-prompt': { v: 1, tabs, activeIndex: 0, downloads: [] },
@@ -1107,8 +1097,8 @@ describe('browser-agent session', () => {
     vi.useFakeTimers()
     try {
       const tabs = [
-        { url: 'http://127.0.0.1:4611/active', pinned: false },
-        { url: 'http://127.0.0.1:4611/background', pinned: false },
+        { url: 'http://127.0.0.1:4611/active' },
+        { url: 'http://127.0.0.1:4611/background' },
       ]
       const { persistence } = memoryBrowserPersistence({
         'chat-bounded-restore-prompt': { v: 1, tabs, activeIndex: 0, downloads: [] },
@@ -1166,7 +1156,6 @@ describe('browser-agent session', () => {
   it('discards a queued restore before an explicit replacement navigation can race it', async () => {
     const tabs = Array.from({ length: 6 }, (_, index) => ({
       url: `https://stale-restore-${index}.example/`,
-      pinned: false,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-replace-restore': { v: 1, tabs, activeIndex: 0, downloads: [] },
@@ -1209,7 +1198,6 @@ describe('browser-agent session', () => {
   it('does not start queued restores after their task browser is suspended', async () => {
     const tabs = Array.from({ length: 6 }, (_, index) => ({
       url: `https://suspended-${index}.example/`,
-      pinned: false,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-restore-suspended': {
@@ -1257,7 +1245,6 @@ describe('browser-agent session', () => {
   it('restores more than eight persisted tabs', () => {
     const tabs = Array.from({ length: 12 }, (_, index) => ({
       url: `https://tab-${index}.example/`,
-      pinned: index < 2,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-many-tabs': {
@@ -1282,10 +1269,9 @@ describe('browser-agent session', () => {
     })
   })
 
-  it('bounds restored tabs while retaining pinned tabs and the active page', () => {
+  it('bounds restored tabs while retaining the active page', () => {
     const tabs = Array.from({ length: 40 }, (_, index) => ({
       url: `https://tab-${index}.example/`,
-      pinned: index < 5,
     }))
     const { persistence } = memoryBrowserPersistence({
       'chat-bounded-tabs': {
@@ -1303,7 +1289,6 @@ describe('browser-agent session', () => {
     })
 
     expect(restored.tabs).toHaveLength(32)
-    expect(restored.tabs.filter((tab) => tab.pinned)).toHaveLength(5)
     expect(restored.tabs.find((tab) => tab.active)?.url).toBe('https://tab-39.example/')
   })
 
@@ -1329,10 +1314,7 @@ describe('browser-agent session', () => {
   })
 
   it('does not truncate a saved browser session while the global tab budget is occupied', () => {
-    const savedTabs = [
-      { url: 'https://saved-one.example/', pinned: false },
-      { url: 'https://saved-two.example/', pinned: false },
-    ]
+    const savedTabs = [{ url: 'https://saved-one.example/' }, { url: 'https://saved-two.example/' }]
     const { persistence, snapshots } = memoryBrowserPersistence({
       'chat-pending-restore': {
         v: 1,
@@ -1373,9 +1355,9 @@ describe('browser-agent session', () => {
       'chat-retry': {
         v: 1,
         tabs: [
-          { url: 'https://one.example/', pinned: false },
-          { url: 'https://two.example/', pinned: true },
-          { url: 'https://three.example/', pinned: false },
+          { url: 'https://one.example/' },
+          { url: 'https://two.example/' },
+          { url: 'https://three.example/' },
         ],
         activeIndex: 2,
         downloads: [],
@@ -1399,9 +1381,9 @@ describe('browser-agent session', () => {
     expect(session.withBrowserScope('chat-retry', () => session.getTabsState())).toMatchObject({
       activeTabId: '3',
       tabs: [
-        { tabId: '2', url: 'https://two.example/', pinned: true, active: false },
-        { tabId: '1', url: 'https://one.example/', pinned: false, active: false },
-        { tabId: '3', url: 'https://three.example/', pinned: false, active: true },
+        { tabId: '1', url: 'https://one.example/', active: false },
+        { tabId: '2', url: 'https://two.example/', active: false },
+        { tabId: '3', url: 'https://three.example/', active: true },
       ],
     })
 
@@ -1414,7 +1396,7 @@ describe('browser-agent session', () => {
     const onSessionClosed = vi.fn()
     const lazySnapshot: BrowserSessionSnapshot = {
       v: 1,
-      tabs: [{ url: 'https://lazy.example/', pinned: false }],
+      tabs: [{ url: 'https://lazy.example/' }],
       activeIndex: 0,
       downloads: [],
     }
@@ -1453,7 +1435,7 @@ describe('browser-agent session', () => {
   it('migrates a persisted pending snapshot without hydrating either scope', () => {
     const snapshot: BrowserSessionSnapshot = {
       v: 1,
-      tabs: [{ url: 'https://pending.example/', pinned: false }],
+      tabs: [{ url: 'https://pending.example/' }],
       activeIndex: 0,
       downloads: [],
     }
@@ -1513,7 +1495,7 @@ describe('browser-agent session', () => {
     expect(persistence.disposeScope).not.toHaveBeenCalled()
     expect(snapshots.get('chat-deleted')).toEqual({
       v: 1,
-      tabs: [{ url: 'https://retained.example/', pinned: false }],
+      tabs: [{ url: 'https://retained.example/' }],
       activeIndex: 0,
       downloads: [],
     })
@@ -1577,7 +1559,7 @@ describe('browser-agent session', () => {
 
   it('handles browser shortcuts from a focused native tab', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     const firstContents = (first.view as unknown as MockView).webContents
     const beforeInput = firstContents.on.mock.calls.find(
       ([eventName]) => eventName === 'before-input-event'
@@ -1625,9 +1607,10 @@ describe('browser-agent session', () => {
     expect(session.listTabs()).toHaveLength(1)
     expect(firstContents.focus).toHaveBeenCalled()
 
+    // Closing the last tab leaves the strip empty; the renderer drops the
+    // browser panel with it, so the omnibox is handed back cleared.
     beforeInput?.(event, { ...input, key: 'w' })
-    expect(session.listTabs()).toHaveLength(1)
-    expect(session.listTabs()[0].tabId).not.toBe(first.id)
+    expect(session.listTabs()).toHaveLength(0)
     expect(win.webContents.send).toHaveBeenLastCalledWith(
       'browser-agent:focus-omnibox',
       'clear',
@@ -1637,7 +1620,7 @@ describe('browser-agent session', () => {
 
   it('opens the renderer find bar when the page takes Mod+F', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
     const beforeInput = contents.on.mock.calls.find(
       ([eventName]) => eventName === 'before-input-event'
@@ -1664,7 +1647,7 @@ describe('browser-agent session', () => {
 
   it('restarts the search while typing and steps without restarting on next/previous', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
 
     session.findInActiveTab({ query: 'needle', newSession: true, forward: true })
@@ -1691,7 +1674,7 @@ describe('browser-agent session', () => {
 
   it('forwards match counts only for the tab the find is running on', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     const second = session.addTab()
     const firstContents = (first.view as unknown as MockView).webContents
     const secondContents = (second.view as unknown as MockView).webContents
@@ -1728,7 +1711,7 @@ describe('browser-agent session', () => {
 
   it('drops late match counts from an older request on the active tab', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
     const found = contents.on.mock.calls.find(
       ([eventName]) => eventName === 'found-in-page'
@@ -1752,7 +1735,7 @@ describe('browser-agent session', () => {
 
   it('drops the find when its page navigates away, but not on a same-document change', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
     const navigate = contents.on.mock.calls.find(
       ([eventName]) => eventName === 'did-start-navigation'
@@ -1778,7 +1761,7 @@ describe('browser-agent session', () => {
     // counting matches on a page that no longer exists, and nothing clears it
     // until the user happens to type a new query.
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    session.requireTab()
+    session.ensureTab()
     const second = session.addTab()
     session.switchTab(second.id)
     session.findInActiveTab({ query: 'needle', newSession: true, forward: true })
@@ -1791,7 +1774,7 @@ describe('browser-agent session', () => {
 
   it('drops the find when the tab it is running on crashes', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     session.addTab()
     session.switchTab(first.id)
     session.findInActiveTab({ query: 'needle', newSession: true, forward: true })
@@ -1952,7 +1935,7 @@ describe('browser-agent session', () => {
 
   it('drops the find when the user switches to another tab', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     const second = session.addTab()
     const firstContents = (first.view as unknown as MockView).webContents
 
@@ -1967,7 +1950,7 @@ describe('browser-agent session', () => {
 
   it('returns focus to the page only when the user dismissed the bar', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
 
     // Panel teardown: the bar unmounts under a user who has already moved on,
@@ -1985,7 +1968,7 @@ describe('browser-agent session', () => {
 
   it('returns focus to the page even when no search was running', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
 
     // Opened and closed without typing. Focus still has to leave the bar: it is
@@ -2005,7 +1988,7 @@ describe('browser-agent session', () => {
 
   it('closes only the native browser tab targeted by the application menu accelerator', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     const second = session.addTab()
     const firstContents = (first.view as unknown as MockView).webContents
     const secondContents = (second.view as unknown as MockView).webContents
@@ -2030,25 +2013,17 @@ describe('browser-agent session', () => {
     // Focus ownership transfers with the close, so a repeated Mod+W closes
     // the newly active tab even if Electron has not emitted its focus event.
     expect(session.handleFocusedShortcut('close-tab')).toBe(true)
-    expect(session.listTabs()).toHaveLength(1)
-    expect(session.listTabs()[0].tabId).not.toBe(first.id)
-
-    // The replacement is an untouched about:blank tab. It still owns the
-    // browser context, so it must not require a page load or another click.
-    const blankTabId = session.listTabs()[0].tabId
-    expect(session.handleFocusedShortcut('close-tab')).toBe(true)
-    expect(session.listTabs()).toHaveLength(1)
-    expect(session.listTabs()[0].tabId).not.toBe(blankTabId)
+    expect(session.listTabs()).toHaveLength(0)
 
     session.setPanelFocused(false)
     panel.setPanelBounds(null)
     expect(session.handleFocusedShortcut('close-tab')).toBe(false)
-    expect(session.listTabs()).toHaveLength(1)
+    expect(session.listTabs()).toHaveLength(0)
   })
 
   it('keeps close-tab routed to a visible browser through a transient focus loss', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     const second = session.addTab()
 
     session.setPanelFocused(true)
@@ -2059,7 +2034,7 @@ describe('browser-agent session', () => {
 
     session.setPanelFocused(false)
     expect(session.handleFocusedShortcut('close-tab')).toBe(true)
-    expect(session.listTabs()).toHaveLength(1)
+    expect(session.listTabs()).toHaveLength(0)
 
     panel.setPanelBounds(null)
     expect(session.handleFocusedShortcut('close-tab')).toBe(false)
@@ -2067,7 +2042,7 @@ describe('browser-agent session', () => {
 
   it('keeps browser tab shortcuts routed while the visible panel has no DOM focus', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    session.requireTab()
+    session.ensureTab()
     session.setPanelFocused(false)
     const before = session.listTabs().length
 
@@ -2094,7 +2069,7 @@ describe('browser-agent session', () => {
 
   it('reloads only the focused browser tab', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const first = session.requireTab()
+    const first = session.ensureTab()
     const second = session.addTab()
     const firstContents = (first.view as unknown as MockView).webContents
     const secondContents = (second.view as unknown as MockView).webContents
@@ -2121,7 +2096,7 @@ describe('browser-agent session', () => {
   it('does not reload a browser tab owned by another app window', () => {
     const otherWindow = mainWindowMock()
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 }, win)
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
 
     session.setPanelFocused(true, win)
@@ -2134,7 +2109,7 @@ describe('browser-agent session', () => {
 
   it('zooms only the focused browser tab', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    const tab = session.requireTab()
+    const tab = session.ensureTab()
     const contents = (tab.view as unknown as MockView).webContents
     contents.getZoomFactor.mockReturnValue(1)
 
@@ -2382,7 +2357,7 @@ describe('browser-agent session', () => {
 
   it('claims reopen while focused even when there is no closed tab', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
-    session.requireTab()
+    session.ensureTab()
     session.setPanelFocused(true)
 
     expect(session.handleFocusedShortcut('reopen-closed-tab')).toBe(true)
@@ -2403,76 +2378,11 @@ describe('browser-agent session', () => {
     expect(session.handleFocusedShortcut('close-tab', win)).toBe(true)
   })
 
-  it('reorders tabs while preserving the pinned-tab boundary', () => {
-    const first = session.ensureTab()
-    const second = session.addTab()
-    const third = session.addTab()
-
-    session.reorderTab(third.id, 0)
-    expect(session.listTabs().map((tab) => tab.tabId)).toEqual([third.id, first.id, second.id])
-
-    session.setTabPinned(first.id, true)
-    session.reorderTab(second.id, 0)
-    expect(session.listTabs().map((tab) => tab.tabId)).toEqual([first.id, second.id, third.id])
-
-    session.reorderTab(first.id, 2)
-    expect(session.listTabs().map((tab) => tab.tabId)).toEqual([first.id, second.id, third.id])
-    expect(() => session.reorderTab('999', 0)).toThrow(/No tab with id 999/)
-  })
-
-  it('moves pinned tabs left and requires unpinning before any close path', async () => {
-    const { persistence, snapshots } = memoryBrowserPersistence()
-    const pinnedSession = freshSession(win, {}, persistence)
-    const first = pinnedSession.ensureTab()
-    const second = pinnedSession.addTab()
-
-    pinnedSession.setTabPinned(second.id, true)
-
-    expect(pinnedSession.listTabs()).toEqual([
-      expect.objectContaining({ tabId: second.id, pinned: true }),
-      expect.objectContaining({ tabId: first.id, pinned: false }),
-    ])
-    expect(snapshots.get('chat-test')?.tabs).toEqual([
-      { url: 'https://example.com/', pinned: true },
-      { url: 'https://example.com/', pinned: false },
-    ])
-    expect(() => pinnedSession.closeTab(second.id)).toThrow(/Pinned tabs cannot be closed/)
-
-    pinnedSession.setTabPinned(second.id, false)
-    pinnedSession.closeTab(second.id)
-    expect(pinnedSession.listTabs().map((tab) => tab.tabId)).toEqual([first.id])
-    expect(snapshots.get('chat-test')?.tabs).toEqual([
-      { url: 'https://example.com/', pinned: false },
-    ])
-  })
-
-  it('opens native tab actions and keeps them bound to the right-clicked chat', () => {
-    const first = session.withBrowserScope('chat-a', () => session.ensureTab())
-    session.withBrowserScope('chat-b', () => session.ensureTab())
-    vi.mocked(Menu.buildFromTemplate).mockClear()
-
-    session.withBrowserScope('chat-a', () => session.showTabContextMenu(first.id))
-    const template = vi.mocked(Menu.buildFromTemplate).mock.calls[0]?.[0] as
-      | MenuItemConstructorOptions[]
-      | undefined
-    expect(template?.filter((item) => item.type !== 'separator').map((item) => item.label)).toEqual(
-      ['Pin Tab', 'Duplicate Tab', 'Close Tab']
-    )
-
-    session.activateBrowserScope('chat-b')
-    const duplicate = template?.find((item) => item.label === 'Duplicate Tab')
-    const clickDuplicate = duplicate?.click as (() => void) | undefined
-    clickDuplicate?.()
-
-    expect(session.withBrowserScope('chat-a', () => session.listTabs())).toHaveLength(2)
-    expect(session.withBrowserScope('chat-b', () => session.listTabs())).toHaveLength(1)
-  })
-
-  it('restores pinned tabs when the browser resource opens again', async () => {
+  it('restores saved tabs when the browser panel opens again', async () => {
     const { persistence } = memoryBrowserPersistence({
       'chat-test': {
         v: 1,
-        tabs: [{ url: 'https://docs.sim.ai/guide', pinned: true }],
+        tabs: [{ url: 'https://docs.sim.ai/guide' }],
         activeIndex: 0,
         downloads: [],
       },
@@ -2482,31 +2392,28 @@ describe('browser-agent session', () => {
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
 
     const [restored] = restoredSession.listTabs()
-    expect(restored).toMatchObject({ pinned: true, active: true })
+    expect(restored).toMatchObject({ active: true })
     const contents = (restoredSession.requireTab().view as unknown as MockView).webContents
     expect(contents.loadURL).toHaveBeenCalledWith('https://docs.sim.ai/guide')
-    expect(() => restoredSession.closeTab(restored.tabId)).toThrow(/Pinned tabs cannot be closed/)
 
     const regular = restoredSession.addTab()
     expect(restoredSession.listTabs()).toEqual([
-      expect.objectContaining({ tabId: restored.tabId, pinned: true }),
-      expect.objectContaining({ tabId: regular.id, pinned: false, active: true }),
+      expect.objectContaining({ tabId: restored.tabId, active: false }),
+      expect.objectContaining({ tabId: regular.id, active: true }),
     ])
   })
 
-  it('allows creation, duplication, and reopening beyond eight browser tabs', () => {
-    const first = session.ensureTab()
+  it('allows creation and reopening beyond eight browser tabs', () => {
+    session.ensureTab()
     for (let index = 1; index < 12; index++) {
       session.addTab()
     }
 
     expect(session.listTabs()).toHaveLength(12)
-    const duplicate = session.duplicateTab(first.id)
-    expect(duplicate).not.toBeNull()
+    const extra = session.addTab()
     expect(session.listTabs()).toHaveLength(13)
-    if (!duplicate) throw new Error('expected the tab to be duplicated')
 
-    session.closeTab(duplicate.id)
+    session.closeTab(extra.id)
     expect(session.listTabs()).toHaveLength(12)
     expect(session.reopenClosedTab()).not.toBeNull()
     expect(session.listTabs()).toHaveLength(13)
@@ -2700,18 +2607,17 @@ describe('browser-agent session', () => {
     ).toHaveBeenCalledWith('resize', onResize)
   })
 
-  it('creates one real default tab when the browser panel becomes visible', () => {
+  it('never invents a tab for a visible panel, and closing the last tab leaves none', () => {
     expect(session.listTabs()).toHaveLength(0)
 
     panel.setPanelBounds({ x: 100, y: 50, width: 800, height: 600 })
+    expect(session.listTabs()).toHaveLength(0)
 
-    expect(session.listTabs()).toHaveLength(1)
-    expect(session.getTabsState().activeTabId).toBe(session.listTabs()[0].tabId)
-
-    const firstTabId = session.listTabs()[0].tabId
-    session.closeTab(firstTabId)
-    expect(session.listTabs()).toHaveLength(1)
-    expect(session.listTabs()[0].tabId).not.toBe(firstTabId)
+    const tab = session.ensureTab()
+    expect(session.getTabsState().activeTabId).toBe(tab.id)
+    session.closeTab(tab.id)
+    expect(session.listTabs()).toHaveLength(0)
+    expect(session.getTabsState().activeTabId).toBeNull()
   })
 
   it('clears a stale attachment without touching a destroyed host window', () => {
@@ -2813,19 +2719,19 @@ describe('browser-agent session', () => {
     expect(contents.loadURL).not.toHaveBeenCalled()
   })
 
-  it('brings an agent-opened working tab into view, unless the user claimed the visible one', () => {
-    // browser_open_tab is the agent choosing a page to work in — the panel
-    // follows it so the work is visible, which a popup deliberately does not.
+  it('opens agent working tabs behind the visible page', () => {
+    // browser_open_tab is the agent choosing a page to work in. Which page is
+    // shown is the renderer's decision, so the native selection never moves.
     const first = session.ensureTab()
-    const working = session.addAutomationTab({ reveal: true })
-    expect(session.activeTab()).toBe(working)
+    const working = session.addAutomationTab()
     expect(working.id).not.toBe(first.id)
+    expect(session.activeTab()).toBe(first)
+    expect(session.automationTab()).toBe(working)
 
-    // Once the user claims what they are looking at, the next agent tab opens
-    // behind it rather than yanking the page out from under them.
     session.claimActiveTabForUser()
-    const background = session.addAutomationTab({ reveal: true })
-    expect(session.activeTab()).not.toBe(background)
+    const background = session.addAutomationTab()
+    expect(session.activeTab()).toBe(first)
+    expect(session.automationTab()).toBe(background)
   })
 
   it('keeps agent popups in the background and context-menu links user-owned', () => {
@@ -3384,7 +3290,7 @@ describe('browser-agent session', () => {
     const { persistence } = memoryBrowserPersistence({
       'chat-test': {
         v: 1,
-        tabs: [{ url: restoredUrl, pinned: true }],
+        tabs: [{ url: restoredUrl }],
         activeIndex: 0,
         downloads: [],
       },
@@ -3515,7 +3421,7 @@ describe('browser-agent session', () => {
     expect(clearCache).toHaveBeenCalled()
   })
 
-  it('does not rewrite the settings file when the pinned tabs have not changed', async () => {
+  it('does not rewrite the settings file when the saved tabs have not changed', async () => {
     const { persistence } = memoryBrowserPersistence()
     session = freshSession(win, {}, persistence)
     const tab = session.ensureTab()
@@ -3535,19 +3441,22 @@ describe('browser-agent session', () => {
     expect(persistence.save).not.toHaveBeenCalled()
   })
 
-  it('persists once when a tab actually becomes pinned', async () => {
+  it('persists once when the saved strip actually changes', async () => {
     const { persistence } = memoryBrowserPersistence()
     session = freshSession(win, {}, persistence)
     const tab = session.ensureTab()
-    ;(tab.view as unknown as MockView).webContents.getURL.mockReturnValue('https://example.com/')
     vi.mocked(persistence.save).mockClear()
+    ;(tab.view as unknown as MockView).webContents.getURL.mockReturnValue(
+      'https://example.com/changed'
+    )
 
-    session.setTabPinned(tab.id, true)
+    session.switchTab(tab.id)
+    session.switchTab(tab.id)
 
     expect(persistence.save).toHaveBeenCalledTimes(1)
     expect(persistence.save).toHaveBeenLastCalledWith(
       'chat-test',
-      expect.objectContaining({ tabs: [{ url: 'https://example.com/', pinned: true }] })
+      expect.objectContaining({ tabs: [{ url: 'https://example.com/changed' }] })
     )
   })
 
@@ -4615,39 +4524,6 @@ describe('reopening a closed tab', () => {
     expect((reopened?.view as unknown as MockView).webContents.loadURL).not.toHaveBeenCalled()
   })
 
-  it('duplicates a tab by loading the same URL in a new one', () => {
-    session.ensureTab()
-    const source = session.addTab()
-    ;(source.view as unknown as MockView).webContents.getURL.mockReturnValue(
-      'https://example.com/inbox'
-    )
-
-    const copy = session.duplicateTab(source.id)
-
-    expect(copy?.id).not.toBe(source.id)
-    expect((copy?.view as unknown as MockView).webContents.loadURL).toHaveBeenCalledWith(
-      'https://example.com/inbox'
-    )
-  })
-
-  it('never copies a URL carrying embedded credentials into a duplicate', () => {
-    session.ensureTab()
-    const source = session.addTab()
-    ;(source.view as unknown as MockView).webContents.getURL.mockReturnValue(
-      'https://user:pass@example.com/'
-    )
-
-    const copy = session.duplicateTab(source.id)
-
-    // Falls back to a blank tab rather than re-sending the credentials.
-    expect((copy?.view as unknown as MockView).webContents.loadURL).not.toHaveBeenCalled()
-  })
-
-  it('returns null when duplicating a tab that is not open', () => {
-    session.ensureTab()
-    expect(session.duplicateTab('no-such-tab')).toBeNull()
-  })
-
   it('drops a non-http scheme from the reopen list', () => {
     session.ensureTab()
     const closing = session.addTab()
diff --git a/apps/desktop/src/main/browser-agent/session.ts b/apps/desktop/src/main/browser-agent/session.ts
index 2d3807af204..923089d3a46 100644
--- a/apps/desktop/src/main/browser-agent/session.ts
+++ b/apps/desktop/src/main/browser-agent/session.ts
@@ -90,7 +90,6 @@ export interface AgentTab {
   id: string
   scopeId: string
   view: WebContentsView
-  pinned: boolean
   pendingRestoreUrl?: string
   pendingRestore?: PendingTabRestore
   pageIssue?: BrowserPageIssue
@@ -828,7 +827,7 @@ export function showBrowserDownloadInFolder(scopeId: string, downloadId: string)
  *
  * {@link initSession} names itself as the session boundary but set three of
  * these fields and left the rest, so a second call would inherit the first
- * session's tab id counter, theme, pinned-restore latch and persisted-list
+ * session's tab id counter, theme, restore latch and persisted-list
  * digest — the last of which would then suppress the new session's first save
  * as an unchanged write. Nothing re-inits in production today, which is
  * exactly why the gap stayed invisible, and why the tests had to reset the
@@ -877,15 +876,10 @@ export function initSession(
       return scopeId ? withBrowserScope(scopeId, activeTab) : null
     },
     backgroundColor: browserBackgroundColor,
-    ensureInitialTab: () => {
+    restoreActiveScope: () => {
       const scopeId = getActiveBrowserScopeId()
       if (!scopeId) return
-      withBrowserScope(scopeId, () => {
-        restoreBrowserSession()
-        if (!hasSession()) {
-          ensureTab()
-        }
-      })
+      withBrowserScope(scopeId, restoreBrowserSession)
     },
     onViewDetached: (view) => {
       if (!view) return
@@ -946,7 +940,6 @@ function isActivationOnlyBrowserScope(scopeId: string): boolean {
     state.activeTabId === null &&
     state.automationTabId === null &&
     state.nextTabId === 1 &&
-    !state.restored &&
     !state.restoring
   )
 }
@@ -1128,7 +1121,7 @@ function browserSessionSnapshot(): BrowserSessionSnapshot {
     .map(({ interruptionReason: _interruptionReason, ...download }) => ({ ...download }))
   return {
     v: 1,
-    tabs: liveTabs.map((tab) => ({ url: tabUrl(tab), pinned: tab.pinned })),
+    tabs: liveTabs.map((tab) => ({ url: tabUrl(tab) })),
     activeIndex,
     downloads,
   }
@@ -2427,8 +2420,8 @@ function initializeTabView(view: WebContentsView, scopeId: string): WebContentsV
       if (tab) dismissFind(tab.id)
     })
   )
-  // A pinned tab persists its latest top-level location, including
-  // user-driven navigations that do not pass through the driver.
+  // A tab persists its latest top-level location, including user-driven
+  // navigations that do not pass through the driver.
   contents.on(
     'did-navigate',
     bindToBrowserScope(scopeId, () => {
@@ -2649,26 +2642,11 @@ export function requireTab(): AgentTab {
 }
 
 interface AddTabOptions {
-  pinned?: boolean
   activate?: boolean
   notify?: boolean
 }
 
-/** Pinned tabs join the stable group at the far left; regular tabs append. */
-function insertPinnedAware(tab: AgentTab): void {
-  if (tab.pinned) {
-    const firstRegularTab = tabs.findIndex((entry) => !entry.pinned)
-    tabs.splice(firstRegularTab < 0 ? tabs.length : firstRegularTab, 0, tab)
-  } else {
-    tabs.push(tab)
-  }
-}
-
-function addTabInternal({
-  pinned = false,
-  activate = true,
-  notify = true,
-}: AddTabOptions = {}): AgentTab {
+function addTabInternal({ activate = true, notify = true }: AddTabOptions = {}): AgentTab {
   assertTabCapacity()
   const previousActiveTab = activeTab()
   const transferBrowserFocus =
@@ -2679,9 +2657,8 @@ function addTabInternal({
     id: String(currentScope.nextTabId++),
     scopeId: getBrowserScopeId(),
     view: createTabView(),
-    pinned,
   }
-  insertPinnedAware(tab)
+  tabs.push(tab)
   if (currentScope.automationTabId === null) currentScope.automationTabId = tab.id
   if (activate || currentScope.activeTabId === null) {
     if (previousActiveTab && previousActiveTab.id !== tab.id) {
@@ -2995,7 +2972,6 @@ export function restoreBrowserSession(): void {
     throw new SessionError('This task browser is suspended until the task is reopened.')
   }
   if (currentScope.restored) return
-  currentScope.activationOnly = false
 
   const scopeId = getBrowserScopeId()
   let snapshot: BrowserSessionSnapshot | null = null
@@ -3008,19 +2984,14 @@ export function restoreBrowserSession(): void {
       })
     }
   }
+  // Every chat is hydrated as soon as it is opened so its pages can be listed
+  // as tabs. Only a chat that actually had pages holds browser state of its
+  // own; one without stays replaceable by a pending chat adopting its id.
+  if (snapshot) currentScope.activationOnly = false
 
   const selectedIndexes = new Set<number>()
   if (snapshot) {
-    for (
-      let index = 0;
-      index < snapshot.tabs.length && selectedIndexes.size < MAX_LIVE_TABS_PER_SCOPE;
-      index++
-    ) {
-      if (snapshot.tabs[index]?.pinned) selectedIndexes.add(index)
-    }
-    if (selectedIndexes.size < MAX_LIVE_TABS_PER_SCOPE && snapshot.tabs[snapshot.activeIndex]) {
-      selectedIndexes.add(snapshot.activeIndex)
-    }
+    if (snapshot.tabs[snapshot.activeIndex]) selectedIndexes.add(snapshot.activeIndex)
     for (
       let index = 0;
       index < snapshot.tabs.length && selectedIndexes.size < MAX_LIVE_TABS_PER_SCOPE;
@@ -3062,7 +3033,7 @@ export function restoreBrowserSession(): void {
         snapshot.downloads.map((download) => ({ ...download }))
       )
       for (const { entry } of selectedEntries) {
-        const tab = addTabInternal({ pinned: entry.pinned, activate: false, notify: false })
+        const tab = addTabInternal({ activate: false, notify: false })
         tab.pendingRestoreUrl = entry.url
         const restoredOrigin = mediaOrigin(entry.url)
         if (restoredOrigin) grantSiteOrigin(state, restoredOrigin)
@@ -3122,23 +3093,13 @@ export function addTab(): AgentTab {
 }
 
 /**
- * Opens a tab for agent work.
- *
- * `reveal` is for the agent deliberately opening a page to work in
- * (`browser_open_tab`): the panel follows it, so the user watches the work
- * instead of staring at a page where nothing is happening. It is NOT set when a
- * page spawns a tab on its own (popups, `target="_blank"`) — that is the site
- * grabbing the view, not the agent choosing a workspace.
- *
- * Even with `reveal`, a tab the user claimed themselves wins: pulling the view
- * off the page they are reading is the same interruption as a window stealing
- * focus mid-sentence. The work still starts, just in the background, and the
- * tab strip shows it arriving.
+ * Opens a tab for agent work in the background. Which page is visible is the
+ * renderer's decision: every page is a resource tab there, and it shows the
+ * agent's tab or badges it depending on what the user is doing.
  */
-export function addAutomationTab({ reveal = false }: { reveal?: boolean } = {}): AgentTab {
+export function addAutomationTab(): AgentTab {
   restoreBrowserSession()
-  const followTheWork = reveal && !currentScope.visibleTabUserSelected
-  const tab = addTabInternal({ activate: followTheWork, notify: false })
+  const tab = addTabInternal({ activate: false, notify: false })
   currentScope.automationTabId = tab.id
   applyActiveTabThrottling()
   persistBrowserSession()
@@ -3191,29 +3152,6 @@ export function reopenClosedTab(): AgentTab | null {
   return tab
 }
 
-/**
- * Opens a copy of a tab at the same URL. A duplicate is a fresh load rather
- * than a clone of the original's session history: the history belongs to the
- * WebContents, and there is no way to fork it.
- */
-export function duplicateTab(tabId: string): AgentTab | null {
-  restoreBrowserSession()
-  const source = tabs.find((entry) => entry.id === tabId)
-  if (!source) return null
-
-  const url = sanitizeRestorableUrl(source.view.webContents.getURL())
-  currentScope.visibleTabUserSelected = true
-  const tab = addTabInternal()
-  if (url && url !== 'about:blank') {
-    // Sanitized to http(s) without embedded credentials above, and the
-    // partition's onBeforeRequest still runs the full SSRF check on the load —
-    // same reasoning as reopenClosedTab, and this is likewise a user action.
-    grantSiteOriginForUserNavigation(tab.view.webContents, url)
-    void tab.view.webContents.loadURL(url).catch(() => {})
-  }
-  return tab
-}
-
 export function switchTab(tabId: string): AgentTab {
   restoreBrowserSession()
   const tab = tabs.find((entry) => entry.id === tabId)
@@ -3254,40 +3192,10 @@ export function switchAutomationTab(tabId: string): AgentTab {
   return tab
 }
 
-/**
- * Moves a tab to a final list index while preserving the pinned/regular
- * boundary. Dragging across that boundary moves to its nearest valid edge.
- */
-export function reorderTab(tabId: string, targetIndex: number): AgentTab {
-  restoreBrowserSession()
-  if (!Number.isFinite(targetIndex)) {
-    throw new SessionError('Browser tab target index must be a finite number.')
-  }
-  const currentIndex = tabs.findIndex((entry) => entry.id === tabId)
-  if (currentIndex < 0) {
-    throw new SessionError(`No tab with id ${tabId} — call browser_list_tabs.`)
-  }
-  const tab = tabs[currentIndex]
-  const pinnedCount = tabs.filter((entry) => entry.pinned).length
-  const minIndex = tab.pinned ? 0 : pinnedCount
-  const maxIndex = tab.pinned ? pinnedCount - 1 : tabs.length - 1
-  const nextIndex = Math.max(minIndex, Math.min(maxIndex, Math.trunc(targetIndex)))
-  if (nextIndex === currentIndex) return tab
-
-  tabs.splice(currentIndex, 1)
-  tabs.splice(nextIndex, 0, tab)
-  persistBrowserSession()
-  events?.onTabsChanged()
-  return tab
-}
-
 export function closeTab(tabId: string): void {
   restoreBrowserSession()
   const index = tabs.findIndex((entry) => entry.id === tabId)
   if (index < 0) throw new SessionError(`No tab with id ${tabId} — call browser_list_tabs.`)
-  if (tabs[index].pinned) {
-    throw new SessionError('Pinned tabs cannot be closed. Unpin the tab first.')
-  }
   // Before the splice, while the tab is still resolvable, stop page-owned UI.
   dismissFind(tabId)
   clearAutomationIndicatorsForTab(tabId)
@@ -3316,13 +3224,6 @@ export function closeTab(tabId: string): void {
     currentScope.automationTabId = (tabs[index] ?? tabs[index - 1])?.id ?? null
     applyActiveTabThrottling()
   }
-  // Closing the last tab must not leave a visible browser resource with an
-  // empty strip. Replace it with a fresh New tab, matching normal browser UI.
-  if (!hasSession() && getBrowserScopeId() === getActiveBrowserScopeId() && isPanelVisible()) {
-    addTab()
-    if (transferBrowserFocus) currentScope.focusedBrowserTabId = currentScope.activeTabId
-    return
-  }
   if (transferBrowserFocus) currentScope.focusedBrowserTabId = currentScope.activeTabId
   persistBrowserSession()
   events?.onTabsChanged()
@@ -3342,48 +3243,6 @@ export function closeAutomationTab(tabId: string): void {
   closeTab(tabId)
 }
 
-/**
- * Pins or unpins a live tab. Pinned tabs form a stable group at the far left,
- * and their latest URLs are persisted locally for the next browser opening.
- */
-export function setTabPinned(tabId: string, pinned: boolean): AgentTab {
-  restoreBrowserSession()
-  const index = tabs.findIndex((entry) => entry.id === tabId)
-  if (index < 0) throw new SessionError(`No tab with id ${tabId} — call browser_list_tabs.`)
-  const tab = tabs[index]
-  if (tab.pinned === pinned) return tab
-
-  tabs.splice(index, 1)
-  tab.pinned = pinned
-  insertPinnedAware(tab)
-  persistBrowserSession()
-  events?.onTabsChanged()
-  return tab
-}
-
-/** Opens tab actions as a native menu so the embedded page never has to be hidden. */
-export function showTabContextMenu(tabId: string): void {
-  const scopeId = getBrowserScopeId()
-  const tab = tabs.find((entry) => entry.id === tabId)
-  if (!tab || tab.view.webContents.isDestroyed()) return
-
-  const inOwningScope = (action: () => void) => () => withBrowserScope(scopeId, action)
-
-  Menu.buildFromTemplate([
-    {
-      label: tab.pinned ? 'Unpin Tab' : 'Pin Tab',
-      click: inOwningScope(() => setTabPinned(tabId, !tab.pinned)),
-    },
-    { label: 'Duplicate Tab', click: inOwningScope(() => duplicateTab(tabId)) },
-    { type: 'separator' },
-    {
-      label: 'Close Tab',
-      enabled: !tab.pinned,
-      click: inOwningScope(() => closeTab(tabId)),
-    },
-  ]).popup()
-}
-
 /** The live page whose browser surface owns a menu accelerator. */
 function focusedTabForShortcut(ownerWindow?: BrowserWindow | null): AgentTab | null {
   if (!isPanelVisible() || !panelUpdateAllowed(ownerWindow ?? undefined, getBrowserScopeId())) {
@@ -3510,10 +3369,6 @@ function clearFocusedBrowserTab(tabId?: string): void {
 }
 
 function closeTabFromUser(tabId: string): void {
-  if (tabs.find((tab) => tab.id === tabId)?.pinned) {
-    shell.beep()
-    return
-  }
   const closingLastTab = listTabs().length === 1
   closeTab(tabId)
   const active = activeTab()
@@ -3566,7 +3421,7 @@ export function quiesceBrowserSessions(): void {
 }
 
 /**
- * Ends the live session without touching the profile or the pinned-tab list on
+ * Ends the live session without touching the profile or the saved tab list on
  * disk, so the strip comes back intact next time. Turning the agent browser
  * off in settings runs this; a sign-out wipe runs {@link clearProfileStorage}.
  */
@@ -3587,10 +3442,10 @@ export function closeSession(): void {
 
 /**
  * Wipes the embedded browser's profile: open tabs, the in-memory list behind
- * Reopen Closed Tab, the persisted pinned tabs, and all site data and cache in
+ * Reopen Closed Tab, the saved tab lists, and all site data and cache in
  * the agent partition. Sim sign-out runs this so the next account signing in
  * on this machine cannot inherit the previous user's authenticated sessions,
- * pinned tabs, or browsing trail.
+ * saved tabs, or browsing trail.
  */
 export async function clearProfileStorage(): Promise<void> {
   // Cached DNS verdicts are part of the browsing trail: without this a wipe
@@ -3642,7 +3497,7 @@ const SITE_DATA_STORAGES = [
 /**
  * Erases selected kinds of browsing data without ending the session.
  *
- * Unlike {@link clearProfileStorage} this leaves tabs open and the pinned strip
+ * Unlike {@link clearProfileStorage} this leaves tabs open and the saved strip
  * intact: the user asked to clear data, not to close their browser. Saved
  * passwords live in a separate vault and are never touched here.
  */
@@ -3674,7 +3529,6 @@ export function listTabs(): BrowserTabState[] {
         url: issue?.url || tab.pendingRestoreUrl || tab.view.webContents.getURL(),
         loading: issue ? false : tab.view.webContents.isLoadingMainFrame(),
         active: tab.id === currentScope.activeTabId,
-        pinned: tab.pinned,
         ...(issue ? { issue } : {}),
       }
     })
diff --git a/apps/desktop/src/main/desktop-chat-session-store.test.ts b/apps/desktop/src/main/desktop-chat-session-store.test.ts
index 094ab4484e9..e74d93e7390 100644
--- a/apps/desktop/src/main/desktop-chat-session-store.test.ts
+++ b/apps/desktop/src/main/desktop-chat-session-store.test.ts
@@ -35,10 +35,7 @@ function encryption(available = true): DesktopChatSessionEncryptionProvider {
 const ORIGIN = 'https://www.sim.ai'
 const BROWSER: BrowserSessionSnapshot = {
   v: 1,
-  tabs: [
-    { url: 'https://example.com/inbox', pinned: true },
-    { url: 'about:blank', pinned: false },
-  ],
+  tabs: [{ url: 'https://example.com/inbox' }, { url: 'about:blank' }],
   activeIndex: 1,
   downloads: [
     {
@@ -224,7 +221,7 @@ describe('DesktopChatSessionStore', () => {
     const store = open()
     const existingBrowser: BrowserSessionSnapshot = {
       v: 1,
-      tabs: [{ url: 'https://existing.example/', pinned: true }],
+      tabs: [{ url: 'https://existing.example/' }],
       activeIndex: 0,
       downloads: [],
     }
@@ -246,7 +243,7 @@ describe('DesktopChatSessionStore', () => {
     store.setBrowser(ORIGIN, 'chat-a', BROWSER)
     store.setBrowser('https://self-hosted.example/path', 'chat-a', {
       v: 1,
-      tabs: [{ url: 'https://other.example/', pinned: false }],
+      tabs: [{ url: 'https://other.example/' }],
       activeIndex: 0,
       downloads: [],
     })
@@ -264,7 +261,6 @@ describe('DesktopChatSessionStore', () => {
       v: 1,
       tabs: Array.from({ length: 12 }, (_, index) => ({
         url: `https://tab-${index}.example/`,
-        pinned: index < 2,
       })),
       activeIndex: 99,
       downloads: [],
@@ -285,11 +281,10 @@ describe('DesktopChatSessionStore', () => {
     expect(terminal?.activeIndex).toBe(11)
   })
 
-  it('bounds persisted browser tabs while retaining pinned and active entries', () => {
+  it('bounds persisted browser tabs while retaining the active entry', () => {
     const store = open()
     const tabs = Array.from({ length: 40 }, (_, index) => ({
       url: `https://tab-${index}.example/`,
-      pinned: index < 4,
     }))
 
     expect(
@@ -303,7 +298,6 @@ describe('DesktopChatSessionStore', () => {
 
     const snapshot = store.getBrowser(ORIGIN, 'chat-bounded')
     expect(snapshot?.tabs).toHaveLength(32)
-    expect(snapshot?.tabs.filter((tab) => tab.pinned)).toHaveLength(4)
     expect(snapshot?.tabs[snapshot.activeIndex]?.url).toBe('https://tab-39.example/')
   })
 
@@ -319,12 +313,12 @@ describe('DesktopChatSessionStore', () => {
           browser: {
             v: 1,
             tabs: [
-              { url: 'https://user:password@example.com/private', pinned: false },
-              { url: 'file:///Users/ada/.ssh/id_ed25519', pinned: false },
-              { url: 'javascript:alert(1)', pinned: true },
-              { url: 'about:blank', pinned: false },
-              { url: 'http://localhost:3000/path', pinned: true },
-              { url: `https://example.com/${'x'.repeat(8_200)}`, pinned: false },
+              { url: 'https://user:password@example.com/private' },
+              { url: 'file:///Users/ada/.ssh/id_ed25519' },
+              { url: 'javascript:alert(1)' },
+              { url: 'about:blank' },
+              { url: 'http://localhost:3000/path' },
+              { url: `https://example.com/${'x'.repeat(8_200)}` },
             ],
             activeIndex: 20,
             downloads: [],
@@ -360,10 +354,7 @@ describe('DesktopChatSessionStore', () => {
     expect(store.initialize()).toBe(true)
     expect(store.getBrowser(ORIGIN, 'chat-valid')).toEqual({
       v: 1,
-      tabs: [
-        { url: 'about:blank', pinned: false },
-        { url: 'http://localhost:3000/path', pinned: true },
-      ],
+      tabs: [{ url: 'about:blank' }, { url: 'http://localhost:3000/path' }],
       activeIndex: 1,
       downloads: [],
     })
diff --git a/apps/desktop/src/main/desktop-chat-session-store.ts b/apps/desktop/src/main/desktop-chat-session-store.ts
index 71b3b663a25..418ff73493f 100644
--- a/apps/desktop/src/main/desktop-chat-session-store.ts
+++ b/apps/desktop/src/main/desktop-chat-session-store.ts
@@ -23,7 +23,6 @@ export interface BrowserSessionSnapshot {
   v: typeof SNAPSHOT_VERSION
   tabs: Array<{
     url: string
-    pinned: boolean
   }>
   activeIndex: number
   downloads: Array<{
@@ -155,31 +154,18 @@ function normalizeBrowserSnapshot(value: unknown): BrowserSessionSnapshot | null
     tab: BrowserSessionSnapshot['tabs'][number]
     sourceIndex: number
   }> = []
-  const replaceableTabIndex = (): number => {
-    for (let index = selectedTabs.length - 1; index >= 0; index--) {
-      const entry = selectedTabs[index]
-      if (entry.sourceIndex !== activeSourceIndex && !entry.tab.pinned) return index
-    }
-    return -1
-  }
+  // The cap keeps the first tabs, always making room for the active one. A
+  // `pinned` flag from older snapshots is ignored.
   for (let sourceIndex = 0; sourceIndex < value.tabs.length; sourceIndex++) {
     const candidate = value.tabs[sourceIndex]
-    if (!isRecordLike(candidate) || typeof candidate.pinned !== 'boolean') continue
+    if (!isRecordLike(candidate)) continue
     const url = normalizeBrowserUrl(candidate.url)
     if (url === null) continue
-    const next = { tab: { url, pinned: candidate.pinned }, sourceIndex }
+    const next = { tab: { url }, sourceIndex }
     if (selectedTabs.length < MAX_BROWSER_TABS) {
       selectedTabs.push(next)
-      continue
-    }
-    if (sourceIndex === activeSourceIndex) {
-      const replacementIndex = replaceableTabIndex()
-      selectedTabs[replacementIndex >= 0 ? replacementIndex : selectedTabs.length - 1] = next
-      continue
-    }
-    if (candidate.pinned) {
-      const replacementIndex = replaceableTabIndex()
-      if (replacementIndex >= 0) selectedTabs[replacementIndex] = next
+    } else if (sourceIndex === activeSourceIndex) {
+      selectedTabs[selectedTabs.length - 1] = next
     }
   }
   selectedTabs.sort((left, right) => left.sourceIndex - right.sourceIndex)
diff --git a/apps/desktop/src/main/ipc.test.ts b/apps/desktop/src/main/ipc.test.ts
index 519c9a9cf46..5b912715e61 100644
--- a/apps/desktop/src/main/ipc.test.ts
+++ b/apps/desktop/src/main/ipc.test.ts
@@ -1146,36 +1146,6 @@ describe('registerIpcHandlers', () => {
     expect(() => handler?.(appEvent, { action: 'reload' })).not.toThrow()
   })
 
-  it('restricts browser-tab pinning to typed app-origin messages', () => {
-    const { on } = collectHandlers()
-    const handler = on.get('browser-agent:set-tab-pinned')
-
-    expect(() => handler?.(evilEvent, '1', true)).not.toThrow()
-    expect(() => handler?.(appEvent, 1, true)).not.toThrow()
-    expect(() => handler?.(appEvent, '1', 'yes')).not.toThrow()
-    expect(() => handler?.(appEvent, '1', true)).not.toThrow()
-  })
-
-  it('restricts browser-tab context menus to typed app-origin messages', () => {
-    const { on } = collectHandlers()
-    const handler = on.get('browser-agent:show-tab-context-menu')
-
-    expect(() => handler?.(evilEvent, '1')).not.toThrow()
-    expect(() => handler?.(appEvent, 1)).not.toThrow()
-    expect(() => handler?.(appEvent, '1')).not.toThrow()
-  })
-
-  it('restricts browser-tab reordering to typed app-origin messages', () => {
-    const { on } = collectHandlers()
-    const handler = on.get('browser-agent:reorder-tab')
-
-    expect(() => handler?.(evilEvent, '1', 0)).not.toThrow()
-    expect(() => handler?.(appEvent, 1, 0)).not.toThrow()
-    expect(() => handler?.(appEvent, '1', '0')).not.toThrow()
-    expect(() => handler?.(appEvent, '1', Number.NaN)).not.toThrow()
-    expect(() => handler?.(appEvent, '1', 0)).not.toThrow()
-  })
-
   it('restricts browser-panel focus updates to boolean app-origin messages', () => {
     const { on } = collectHandlers()
     const handler = on.get('browser-agent:set-panel-focused')
@@ -1337,7 +1307,6 @@ describe('registerIpcHandlers', () => {
           title: 'Restored',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
       activeTabId: '1',
@@ -1369,7 +1338,6 @@ describe('registerIpcHandlers', () => {
           title: '',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
       activeTabId: '2',
diff --git a/apps/desktop/src/main/ipc.ts b/apps/desktop/src/main/ipc.ts
index c4f9fd51662..2cf75d7626c 100644
--- a/apps/desktop/src/main/ipc.ts
+++ b/apps/desktop/src/main/ipc.ts
@@ -54,12 +54,9 @@ import {
   getBrowserDownloadsState,
   grantSiteOriginForUserNavigation,
   peekTabsState,
-  reorderTab,
   setBrowserAppTheme,
-  setTabPinned,
   showBrowserDownloadInFolder,
   showBrowserDownloadsMenu,
-  showTabContextMenu,
   stopFindInActiveTab,
   withBrowserScope,
 } from '@/main/browser-agent/session'
@@ -1174,50 +1171,6 @@ export function registerIpcHandlers(deps: IpcDeps): void {
         void handlePanelAction(scope, panelAction).catch(() => {})
       },
     },
-    'browser-agent:set-tab-pinned': {
-      kind: 'send',
-      gate: 'app-origin',
-      requires: 'browser',
-      passSender: true,
-      handler: (sender, tabId, pinned, rawScope) => {
-        const scope = activeRendererScope(browserScopeBySender, sender as WebContents, rawScope)
-        if (!scope || typeof tabId !== 'string' || typeof pinned !== 'boolean') return
-        try {
-          withBrowserScope(scope, () => setTabPinned(tabId, pinned))
-        } catch {}
-      },
-    },
-    'browser-agent:show-tab-context-menu': {
-      kind: 'send',
-      gate: 'app-origin',
-      requires: 'browser',
-      passSender: true,
-      handler: (sender, tabId, rawScope) => {
-        const scope = activeRendererScope(browserScopeBySender, sender as WebContents, rawScope)
-        if (!scope || typeof tabId !== 'string') return
-        withBrowserScope(scope, () => showTabContextMenu(tabId))
-      },
-    },
-    'browser-agent:reorder-tab': {
-      kind: 'send',
-      gate: 'app-origin',
-      requires: 'browser',
-      passSender: true,
-      handler: (sender, tabId, targetIndex, rawScope) => {
-        const scope = activeRendererScope(browserScopeBySender, sender as WebContents, rawScope)
-        if (
-          !scope ||
-          typeof tabId !== 'string' ||
-          typeof targetIndex !== 'number' ||
-          !Number.isFinite(targetIndex)
-        ) {
-          return
-        }
-        try {
-          withBrowserScope(scope, () => reorderTab(tabId, targetIndex))
-        } catch {}
-      },
-    },
     'browser-agent:set-panel-bounds': {
       kind: 'send',
       gate: 'app-origin',
diff --git a/apps/desktop/src/preload/index.ts b/apps/desktop/src/preload/index.ts
index 484bc2d26bd..05bdc84f441 100644
--- a/apps/desktop/src/preload/index.ts
+++ b/apps/desktop/src/preload/index.ts
@@ -228,15 +228,6 @@ const api: SimDesktopApi = {
       ipcRenderer.invoke('browser-agent:dispose-scope', scopeId),
     suspendScope: (scopeId: string): Promise<boolean> =>
       ipcRenderer.invoke('browser-agent:suspend-scope', scopeId),
-    setTabPinned: (tabId: string, pinned: boolean, scopeId: string): void => {
-      ipcRenderer.send('browser-agent:set-tab-pinned', tabId, pinned, scopeId)
-    },
-    showTabContextMenu: (tabId: string, scopeId: string): void => {
-      ipcRenderer.send('browser-agent:show-tab-context-menu', tabId, scopeId)
-    },
-    reorderTab: (tabId: string, targetIndex: number, scopeId: string): void => {
-      ipcRenderer.send('browser-agent:reorder-tab', tabId, targetIndex, scopeId)
-    },
     setPanelBounds: (
       bounds: BrowserPanelBounds | null,
       anchor: BrowserPanelAnchor | null,
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
index fc5a1efb684..f90203afeac 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
@@ -18,10 +18,7 @@ import {
 } from '@sim/emcn'
 import { Folder, Plus } from '@sim/emcn/icons'
 import { isBrowserAgentAvailable } from '@/lib/browser-agent/transport'
-import {
-  BROWSER_SESSION_RESOURCE_ID,
-  TERMINAL_SESSION_RESOURCE_ID,
-} from '@/lib/copilot/resources/types'
+import { TERMINAL_SESSION_RESOURCE_ID } from '@/lib/copilot/resources/types'
 import { subscribeDesktopPreferences } from '@/lib/desktop'
 import { isTerminalAvailable } from '@/lib/terminal/transport'
 import {
@@ -53,6 +50,12 @@ import { useWorkflows } from '@/hooks/queries/workflows'
 import { useWorkspaceFileFolders } from '@/hooks/queries/workspace-file-folders'
 import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
 
+/**
+ * Placeholder id for the Browser launcher row. It never names a resource: the
+ * page the desktop app creates becomes the browser tab, keyed by its own id.
+ */
+export const BROWSER_LAUNCHER_ID = 'browser'
+
 export interface AddResourceDropdownProps {
   workspaceId: string
   existingKeys: Set<string>
@@ -303,14 +306,14 @@ export function useAvailableResources(
         }),
       },
     ]
-    // The live browser panel — desktop app only (needs the agent-browser
-    // bridge). There is one top-level panel; repeated launches open inner tabs.
+    // A new browser tab — desktop app only (needs the agent-browser bridge).
+    // Every launch opens another page; the strip lists each as its own tab.
     if (browserAvailable) {
       groups.push({
         type: 'browser' as const,
         items: [
           {
-            id: BROWSER_SESSION_RESOURCE_ID,
+            id: BROWSER_LAUNCHER_ID,
             name: 'Browser',
           },
         ],
@@ -541,9 +544,10 @@ export function ResourceMenuSections({
         const Icon = config.icon
         const section = sectionByType.get(type)
 
-        // Browser and terminal each have one top-level panel — a flat launcher
-        // here creates inner tabs when that panel already exists.
-        if (!section && (type === 'browser' || type === 'terminal')) {
+        // The Browser launcher and the Terminal panel are flat rows: one opens
+        // a new page, the other the terminal and its inner shells. Live browser
+        // pages offered as context are an ordinary picker submenu.
+        if (!section && (type === 'terminal' || items[0]?.id === BROWSER_LAUNCHER_ID)) {
           const item = items[0]
           return (
             <DropdownMenuItem key={type} onClick={() => onSelect(resourceFromItem(type, item))}>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-panel-occlusion.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-panel-occlusion.ts
index 0b593280917..8d386e2156b 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-panel-occlusion.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-panel-occlusion.ts
@@ -32,7 +32,6 @@ export type BrowserPanelOverlay =
   | 'downloads'
   | 'resources'
   | 'suggestions'
-  | 'tab'
   | 'toolbar'
 
 export interface BrowserPanelOverlayController {
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.test.ts
index e9fa882f8d7..3275c93b6ba 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.test.ts
@@ -13,12 +13,10 @@ import {
   claimPermissionResponse,
   clearOmniboxSelection,
   exceededOmniboxDragThreshold,
-  hasConfirmedBrowserTabCreation,
   initialUrlSuggestionIndex,
   resolveUrlBarInput,
   selectFocusedOmniboxOnNextFrame,
   shouldOpenUrlSuggestions,
-  shouldRemoveBrowserResource,
   shouldReportBrowserBounds,
   shouldShowBrowserPermissionRequest,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session'
@@ -424,21 +422,7 @@ describe('initialUrlSuggestionIndex', () => {
   })
 })
 
-describe('hasConfirmedBrowserTabCreation', () => {
-  it('requires both a larger strip and a distinct active tab', () => {
-    expect(hasConfirmedBrowserTabCreation('tab-1', 1, 'tab-2', 2)).toBe(true)
-    expect(hasConfirmedBrowserTabCreation('tab-1', 1, 'tab-1', 2)).toBe(false)
-    expect(hasConfirmedBrowserTabCreation('tab-1', 1, 'tab-2', 1)).toBe(false)
-    expect(hasConfirmedBrowserTabCreation('tab-1', 1, null, 2)).toBe(false)
-  })
-})
-
 describe('suspended browser resource lifecycle', () => {
-  it('does not remove a resource when administrative suspension clears its tabs', () => {
-    expect(shouldRemoveBrowserResource(false, true, true)).toBe(false)
-    expect(shouldRemoveBrowserResource(false, true, false)).toBe(true)
-  })
-
   it('reports native bounds only while visible and unsuspended', () => {
     expect(shouldReportBrowserBounds(true, false)).toBe(true)
     expect(shouldReportBrowserBounds(true, true)).toBe(false)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
index d6a9aa5af31..d9e00fc2652 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
@@ -8,7 +8,6 @@ import type {
   BrowserPanelBounds,
   BrowserPanelSnapshot,
   BrowserSitePermissionRequest,
-  BrowserTabState,
 } from '@sim/browser-protocol'
 import { isBrowserTheme } from '@sim/browser-protocol'
 import type {
@@ -33,7 +32,6 @@ import {
   PopoverAnchor,
   PopoverContent,
   PopoverItem,
-  toast,
 } from '@sim/emcn'
 import { ArrowLeft, ArrowRight, Globe, Key, Link, RefreshCw, Search } from '@sim/emcn/icons'
 import { useTheme } from 'next-themes'
@@ -53,20 +51,15 @@ import {
   onBrowserFindOpen,
   onBrowserOmniboxFocus,
   onBrowserToolbarCommand,
-  openBrowserTab,
-  reorderBrowserTab,
   reportBrowserPanelBounds,
   reportBrowserPanelFocused,
   reportBrowserTheme,
   sendBrowserPanelAction,
   setBrowserPanelOccluded,
-  setBrowserTabPinned,
   showBrowserCredentialChooser,
-  showBrowserTabContextMenu,
   showBrowserToolbarMenu,
   supportsAtomicBrowserPanelOcclusion,
 } from '@/lib/browser-agent/transport'
-import { BROWSER_SESSION_RESOURCE_ID } from '@/lib/copilot/resources/types'
 import { faviconUrl } from '@/lib/core/utils/favicon'
 import { getDesktopBridge } from '@/lib/desktop'
 import {
@@ -75,7 +68,6 @@ import {
 } from '@/lib/desktop/appearance'
 import { trackPanelFocus } from '@/lib/desktop/panel-focus'
 import { addMothershipContext } from '@/lib/mothership/events'
-import { useMothershipResources } from '@/app/workspace/[workspaceId]/home/components/mothership-resources-context'
 import { BrowserDownloads } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-downloads'
 import { BrowserFindBar } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-find-bar'
 import { BrowserLoadingBar } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-loading-bar'
@@ -89,7 +81,6 @@ import {
   mutationsTouchNativeSurfaceOcclusion,
   useBrowserPanelOcclusion,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-panel-occlusion'
-import { BrowserTabStrip } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip'
 import { BrowserThemeNotice } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-theme-notice'
 import {
   buildOmniboxSuggestions,
@@ -110,9 +101,7 @@ import type { ChatContext } from '@/stores/panel'
 /** Ties the omnibox to its listbox for assistive tech. */
 const SUGGESTIONS_LIST_ID = 'browser-url-suggestions'
 const SEARCH_SUGGESTIONS_DEBOUNCE_MS = 160
-const NEW_TAB_CONFIRM_TIMEOUT_MS = 10_000
 const OMNIBOX_DRAG_THRESHOLD_PX = 4
-const EMPTY_BROWSER_TABS: BrowserTabState[] = []
 
 const suggestionRowId = (index: number) => `${SUGGESTIONS_LIST_ID}-${index}`
 
@@ -368,15 +357,6 @@ interface BrowserSessionProps {
   onOverlayControllerChange?: (controller: BrowserPanelOverlayController | null) => void
 }
 
-/** Administrative suspension retains the resource even though live tabs are gone. */
-export function shouldRemoveBrowserResource(
-  sessionAlive: boolean,
-  observedLiveSession: boolean,
-  suspended: boolean
-): boolean {
-  return !suspended && !sessionAlive && observedLiveSession
-}
-
 /** A suspended scope never leases native compositor bounds. */
 export function shouldReportBrowserBounds(visible: boolean, suspended: boolean): boolean {
   return visible && !suspended
@@ -421,23 +401,6 @@ export function initialUrlSuggestionIndex(
   return query.trim() || !pageUrl || pageUrl === 'about:blank' ? 0 : null
 }
 
-/** A new-tab request is complete only after the authoritative strip grows and activates a new id. */
-export function hasConfirmedBrowserTabCreation(
-  previousActiveTabId: string | null,
-  previousTabCount: number,
-  activeTabId: string | null,
-  tabCount: number
-): boolean {
-  return tabCount > previousTabCount && activeTabId !== null && activeTabId !== previousActiveTabId
-}
-
-interface PendingNewTabFocus {
-  scopeId: string
-  previousActiveTabId: string | null
-  previousTabCount: number
-  timeoutId: number
-}
-
 interface OmniboxPointerSelection {
   pointerId: number
   originX: number
@@ -461,27 +424,9 @@ export function BrowserSession({
   // panel. Direct selection prevents that one render from showing or acting on
   // another chat's tabs.
   const pageState = useBrowserSessionStore((state) => state.sessions[scopeId]?.pageState ?? null)
-  const tabs = useBrowserSessionStore(
-    (state) => state.sessions[scopeId]?.tabs ?? EMPTY_BROWSER_TABS
-  )
   const activeTabId = useBrowserSessionStore(
     (state) => state.sessions[scopeId]?.activeTabId ?? null
   )
-  const automationTabId = useBrowserSessionStore(
-    (state) => state.sessions[scopeId]?.automationTabId ?? null
-  )
-  const automationActive = useBrowserSessionStore(
-    (state) => state.sessions[scopeId]?.automationActive ?? false
-  )
-  const automationNeedsAttention = useBrowserSessionStore(
-    (state) => state.sessions[scopeId]?.automationNeedsAttention ?? false
-  )
-  const browserAgentActive = useBrowserSessionStore(
-    (state) => (state.sessions[scopeId]?.agentRunIds.length ?? 0) > 0
-  )
-  const sessionAlive = useBrowserSessionStore(
-    (state) => state.sessions[scopeId]?.sessionAlive ?? true
-  )
   const suspended = useBrowserSessionStore((state) => state.sessions[scopeId]?.suspended ?? false)
   const showEmptyState = Boolean(
     pageState &&
@@ -507,42 +452,14 @@ export function BrowserSession({
   const toolbarMenuButtonRef = useRef<HTMLButtonElement>(null)
   const omniboxFocusRafRef = useRef<number | null>(null)
   const omniboxPointerSelectionRef = useRef<OmniboxPointerSelection | null>(null)
-  const pendingNewTabFocusRef = useRef<PendingNewTabFocus | null>(null)
   const handledPermissionRequestIdsRef = useRef<Set<string>>(new Set())
   const [answeredPermissionRequestId, setAnsweredPermissionRequestId] = useState<string | null>(
     null
   )
   const visibleRef = useRef(visible)
   visibleRef.current = visible
-  const { removeResource } = useMothershipResources()
   const { navigateToSettings } = useSettingsNavigation()
 
-  // The browser session ending closes the panel, the way the terminal panel
-  // goes when its last shell does. What it leaves otherwise is a tab whose
-  // only content explains that there is nothing to show and that starting
-  // again has to happen from somewhere else — the agent reopens the panel on
-  // its next browser action anyway. Guarded on having seen a live session so
-  // that opening the panel while the store still remembers a closed one does
-  // not immediately close it again.
-  const observedLiveSession = useRef(false)
-  useEffect(() => {
-    if (suspended) {
-      observedLiveSession.current = false
-      return
-    }
-    if (sessionAlive) {
-      // A new scope starts optimistically alive until the desktop answers.
-      // Only a real tab proves that this panel observed a live session;
-      // otherwise the expected empty response from lazy activation would look
-      // like a user closing the last tab and delete the persisted resource
-      // before its encrypted descriptor gets a chance to hydrate.
-      if (tabs.length > 0) observedLiveSession.current = true
-      return
-    }
-    if (!shouldRemoveBrowserResource(sessionAlive, observedLiveSession.current, suspended)) return
-    observedLiveSession.current = false
-    removeResource('browser', BROWSER_SESSION_RESOURCE_ID)
-  }, [sessionAlive, suspended, tabs.length, removeResource])
   const pageUrlRef = useRef(pageState?.url ?? '')
   pageUrlRef.current = pageState?.url ?? ''
   /** Non-null while the user is editing the URL bar; otherwise it mirrors the page. */
@@ -734,61 +651,18 @@ export function BrowserSession({
     })
   }, [])
 
-  const clearPendingNewTabFocus = useCallback((pending?: PendingNewTabFocus): boolean => {
-    const current = pendingNewTabFocusRef.current
-    if (!current || (pending && current !== pending)) return false
-    window.clearTimeout(current.timeoutId)
-    pendingNewTabFocusRef.current = null
-    return true
-  }, [])
-
-  // New shells acknowledge tab creation directly; older installed shells only
-  // publish the resulting strip. Both paths land here so neither clears the
-  // current page's omnibox before a distinct tab actually exists.
-  useEffect(() => {
-    const pending = pendingNewTabFocusRef.current
-    if (
-      !pending ||
-      pending.scopeId !== scopeId ||
-      !hasConfirmedBrowserTabCreation(
-        pending.previousActiveTabId,
-        pending.previousTabCount,
-        activeTabId,
-        tabs.length
-      )
-    ) {
-      return
-    }
-    if (!clearPendingNewTabFocus(pending)) return
-    if (visible) focusOmnibox('clear')
-  }, [activeTabId, clearPendingNewTabFocus, focusOmnibox, scopeId, tabs.length, visible])
-
-  useEffect(() => {
-    return () => {
-      const pending = pendingNewTabFocusRef.current
-      if (pending?.scopeId === scopeId) clearPendingNewTabFocus(pending)
-    }
-  }, [clearPendingNewTabFocus, scopeId])
-
   useEffect(() => onBrowserOmniboxFocus(focusOmnibox, scopeId), [focusOmnibox, scopeId])
 
-  // Follow the agent's tab. The panel already marks the automated tab in the
-  // strip; this makes it the VISIBLE one, so watching the agent never means
-  // hunting for which tab it moved to. Keyed on the automation target
-  // CHANGING, not on it merely being set — the user can still browse a
-  // different tab mid-run and is only pulled along when the agent itself
-  // moves to another tab.
-  const followedAutomationTabRef = useRef<string | null>(null)
+  // A fresh blank tab coming on screen — opened from the resource strip, by
+  // Cmd+T, or by the shell replacing a closed last tab — gets the omnibox, the
+  // way Chrome's new-tab page does. A tab with a page keeps its content.
+  const focusedBlankTabIdRef = useRef<string | null>(null)
   useEffect(() => {
-    if (!automationActive || !automationTabId) {
-      if (!automationActive) followedAutomationTabRef.current = null
-      return
-    }
-    if (followedAutomationTabRef.current === automationTabId) return
-    followedAutomationTabRef.current = automationTabId
-    if (automationTabId === activeTabId) return
-    sendBrowserPanelAction('switch-tab', { tabId: automationTabId }, scopeId)
-  }, [activeTabId, automationActive, automationTabId, scopeId])
+    if (!visible || !activeTabId || !showEmptyState) return
+    if (focusedBlankTabIdRef.current === activeTabId) return
+    focusedBlankTabIdRef.current = activeTabId
+    focusOmnibox('clear')
+  }, [activeTabId, focusOmnibox, showEmptyState, visible])
 
   // Sim owns keyboard events while its renderer has focus. Claim Cmd+L here
   // before the workspace's global "Go to Logs" command can navigate away.
@@ -1128,46 +1002,6 @@ export function BrowserSession({
     urlInputRef.current?.blur()
   }
 
-  const handleNewTab = useCallback(() => {
-    setSuggestionsVisible(false)
-    setSuggestionQuery(null)
-    setActiveSuggestion(null)
-    setSuggestionOriginUrl('')
-    clearPendingNewTabFocus()
-    const pending: PendingNewTabFocus = {
-      scopeId,
-      previousActiveTabId: activeTabId,
-      previousTabCount: tabs.length,
-      timeoutId: 0,
-    }
-    pending.timeoutId = window.setTimeout(() => {
-      if (clearPendingNewTabFocus(pending)) {
-        toast.error('Could not open a new browser tab. Please try again.')
-      }
-    }, NEW_TAB_CONFIRM_TIMEOUT_MS)
-    pendingNewTabFocusRef.current = pending
-    void openBrowserTab(scopeId)
-      .then((state) => {
-        // Older shells resolve null and confirm through the tab-state effect.
-        if (!state) return
-        if (
-          !hasConfirmedBrowserTabCreation(
-            pending.previousActiveTabId,
-            pending.previousTabCount,
-            state.activeTabId,
-            state.tabs.length
-          )
-        ) {
-          throw new Error('The desktop browser did not create a distinct tab.')
-        }
-      })
-      .catch(() => {
-        if (clearPendingNewTabFocus(pending)) {
-          toast.error('Could not open a new browser tab. Please try again.')
-        }
-      })
-  }, [activeTabId, clearPendingNewTabFocus, scopeId, tabs.length])
-
   /**
    * Opens the shell's native account chooser under the key icon. Called
    * directly from the click so the page still has an active user gesture,
@@ -1196,70 +1030,9 @@ export function BrowserSession({
     showBrowserToolbarMenu({ x: rect.left, y: rect.bottom }, scopeId)
   }, [scopeId])
 
-  const handleSwitchTab = useCallback(
-    (tabId: string) => {
-      setSuggestionsVisible(false)
-      setSuggestionQuery(null)
-      setUrlDraft(null)
-      urlInputRef.current?.blur()
-      sendBrowserPanelAction('switch-tab', { tabId }, scopeId)
-    },
-    [scopeId]
-  )
-
-  const handleCloseTab = useCallback(
-    (tabId: string) => {
-      setSuggestionsVisible(false)
-      setSuggestionQuery(null)
-      setUrlDraft(null)
-      urlInputRef.current?.blur()
-      sendBrowserPanelAction('close-tab', { tabId }, scopeId)
-    },
-    [scopeId]
-  )
-
-  const handleDuplicateTab = useCallback(
-    (tabId: string) => {
-      sendBrowserPanelAction('duplicate-tab', { tabId }, scopeId)
-    },
-    [scopeId]
-  )
-
-  const handleSetTabPinned = useCallback(
-    (tabId: string, pinned: boolean) => {
-      setBrowserTabPinned(tabId, pinned, scopeId)
-    },
-    [scopeId]
-  )
-
-  const handleReorderTab = useCallback(
-    (tabId: string, targetIndex: number) => {
-      reorderBrowserTab(tabId, targetIndex, scopeId)
-    },
-    [scopeId]
-  )
-
   return (
     <div ref={panelRef} className='flex h-full flex-col overflow-hidden'>
       <div className='relative shrink-0 border-[var(--border)] border-b bg-[var(--bg)]'>
-        <BrowserTabStrip
-          tabs={tabs}
-          activeTabId={activeTabId}
-          automationTabId={automationTabId}
-          automationActive={automationActive || browserAgentActive}
-          automationNeedsAttention={automationNeedsAttention}
-          onNewTab={handleNewTab}
-          onSwitchTab={handleSwitchTab}
-          onCloseTab={handleCloseTab}
-          onDuplicateTab={handleDuplicateTab}
-          onSetTabPinned={handleSetTabPinned}
-          onOpenTabMenu={(tabId) =>
-            requestOverlay('tab', () => showBrowserTabContextMenu(tabId, scopeId))
-          }
-          onCloseTabMenu={() => void closeOverlay('tab')}
-          onReorderTab={handleReorderTab}
-          contextMenuOpen={activeOverlay === 'tab'}
-        />
         <div className='flex items-center gap-1 px-2.5 py-1.5'>
           <Button
             type='button'
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.tsx
deleted file mode 100644
index 13689869dce..00000000000
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-'use client'
-
-import {
-  type DragEvent as ReactDragEvent,
-  type MouseEvent as ReactMouseEvent,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
-import type { BrowserTabState } from '@sim/browser-protocol'
-import { cn, TabStrip, type TabStripItem, toast } from '@sim/emcn'
-import { CircleAlert, Globe, Loader } from '@sim/emcn/icons'
-import { ThinkingLoader } from '@/components/ui'
-import { SIM_RESOURCE_DRAG_TYPE } from '@/lib/copilot/resource-types'
-import { faviconUrl } from '@/lib/core/utils/favicon'
-import { getDesktopBridge } from '@/lib/desktop'
-import {
-  browserTabHostname,
-  browserTabTitle,
-  shouldShowBrowserTabSpinner,
-} from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label'
-import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
-
-interface BrowserTabStripProps {
-  tabs: BrowserTabState[]
-  activeTabId: string | null
-  automationTabId: string | null
-  automationActive: boolean
-  automationNeedsAttention: boolean
-  onNewTab: () => void
-  onSwitchTab: (tabId: string) => void
-  onCloseTab: (tabId: string) => void
-  onDuplicateTab: (tabId: string) => void
-  onSetTabPinned: (tabId: string, pinned: boolean) => void
-  /** Resolves true only when the renderer context menu may safely open. */
-  onOpenTabMenu: (tabId: string) => Promise<boolean>
-  onCloseTabMenu: () => void
-  onReorderTab: (tabId: string, targetIndex: number) => void
-  contextMenuOpen: boolean
-}
-
-function BrowserTabIcon({ tab }: { tab: BrowserTabState }) {
-  const hostname = browserTabHostname(tab.url)
-  const [loadedHostname, setLoadedHostname] = useState<string | null>(null)
-  const [failedHostname, setFailedHostname] = useState<string | null>(null)
-  const faviconLoaded = Boolean(hostname && loadedHostname === hostname)
-  const faviconFailed = Boolean(hostname && failedHostname === hostname)
-  const showSpinner = shouldShowBrowserTabSpinner(tab.loading, hostname, loadedHostname)
-
-  if (tab.issue) {
-    return (
-      <span className='flex size-[16px] shrink-0 items-center justify-center'>
-        <CircleAlert className='size-[12px] text-[var(--text-icon)]' />
-      </span>
-    )
-  }
-
-  return (
-    <span className='relative flex size-[16px] shrink-0 items-center justify-center'>
-      {hostname && !faviconFailed && (
-        <img
-          key={hostname}
-          src={faviconUrl(hostname, 32)}
-          alt=''
-          className={cn(
-            'size-[16px] rounded-[3px]',
-            !faviconLoaded && 'pointer-events-none absolute opacity-0'
-          )}
-          onLoad={() => setLoadedHostname(hostname)}
-          onError={() => setFailedHostname(hostname)}
-        />
-      )}
-      {showSpinner ? (
-        <Loader
-          animate
-          className='size-[14px] text-[var(--text-icon)]'
-          strokeWidth={2}
-          style={{ animationDuration: '650ms' }}
-        />
-      ) : !faviconLoaded || faviconFailed ? (
-        <Globe className='size-[12px] text-[var(--text-icon)]' />
-      ) : null}
-    </span>
-  )
-}
-
-/**
- * The browser panel's tab strip: the shared {@link TabStrip} plus the two
- * things only the browser has — favicons, and a Sim context menu carrying
- * pin/unpin alongside duplicate and close. The menu is opened only after the
- * panel swaps its native browser surface for a captured frame, so it can render
- * above the page without falling back to Electron's native menu styling. The
- * active Electron view remains the only native view attached over the panel;
- * selecting a tab switches which live view is attached.
- */
-export function BrowserTabStrip({
-  tabs,
-  activeTabId,
-  automationTabId,
-  automationActive,
-  automationNeedsAttention,
-  onNewTab,
-  onSwitchTab,
-  onCloseTab,
-  onDuplicateTab,
-  onSetTabPinned,
-  onOpenTabMenu,
-  onCloseTabMenu,
-  onReorderTab,
-  contextMenuOpen,
-}: BrowserTabStripProps) {
-  const [contextTabId, setContextTabId] = useState<string | null>(null)
-  const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 })
-  const contextMenuRef = useRef<HTMLDivElement>(null)
-  const contextRequestRef = useRef(0)
-  const contextTab = tabs.find((tab) => tab.tabId === contextTabId)
-
-  const items = useMemo<TabStripItem[]>(
-    () =>
-      tabs.map((tab) => {
-        const isAutomationRunning = automationActive && tab.tabId === automationTabId
-        return {
-          id: tab.tabId,
-          title: browserTabTitle(tab),
-          icon: (
-            <span className='relative flex size-[16px] shrink-0 items-center justify-center'>
-              <span className={cn(isAutomationRunning && 'invisible')}>
-                <BrowserTabIcon tab={tab} />
-              </span>
-              {isAutomationRunning && (
-                <span className='absolute inset-0 flex items-center justify-center'>
-                  <ThinkingLoader size={14} startVariant='corners' />
-                </span>
-              )}
-            </span>
-          ),
-          active: tab.tabId === activeTabId,
-          attention:
-            !automationActive &&
-            automationNeedsAttention &&
-            tab.tabId === automationTabId &&
-            tab.tabId !== activeTabId,
-          ...(tab.pinned ? { pinned: true } : {}),
-        }
-      }),
-    [tabs, activeTabId, automationTabId, automationActive, automationNeedsAttention]
-  )
-
-  // Dragging a tab into the chat attaches it as context. `copyMove` because
-  // the strip already set `move` for its own reordering, and a drop target
-  // asking for `copy` is refused outright unless copying is allowed too.
-  const startTabDrag = useCallback(
-    (event: ReactDragEvent<HTMLDivElement>, tabId: string) => {
-      const tab = tabs.find((entry) => entry.tabId === tabId)
-      if (!tab) return
-      event.dataTransfer.effectAllowed = 'copyMove'
-      event.dataTransfer.setData(
-        SIM_RESOURCE_DRAG_TYPE,
-        JSON.stringify({ type: 'browser', id: tab.tabId, title: browserTabTitle(tab) })
-      )
-    },
-    [tabs]
-  )
-
-  const openTabContextMenu = useCallback(
-    (event: ReactMouseEvent<HTMLDivElement>, tabId: string) => {
-      event.preventDefault()
-      event.stopPropagation()
-      window.getSelection()?.removeAllRanges()
-      const request = ++contextRequestRef.current
-      const position = { x: event.clientX, y: event.clientY }
-      void onOpenTabMenu(tabId).then((opened) => {
-        if (!opened || request !== contextRequestRef.current) return
-        setContextTabId(tabId)
-        setContextMenuPosition(position)
-      })
-    },
-    [onOpenTabMenu]
-  )
-
-  const closeTabContextMenu = useCallback(() => {
-    contextRequestRef.current++
-    setContextTabId(null)
-    onCloseTabMenu()
-  }, [onCloseTabMenu])
-
-  // An agent action can remove a background tab while its menu is open. The
-  // Radix menu then has no item to render, so explicitly release the browser
-  // surface instead of leaving its captured frame in place indefinitely.
-  useEffect(() => {
-    if (contextMenuOpen && contextTabId && !contextTab) closeTabContextMenu()
-  }, [closeTabContextMenu, contextMenuOpen, contextTab, contextTabId])
-
-  const openTabInExternalBrowser = useCallback(() => {
-    const url = contextTab?.url
-    const bridge = getDesktopBridge()
-    if (!url || url === 'about:blank' || !bridge) return
-
-    void bridge.openExternal(url).then(
-      (opened) => {
-        if (!opened) toast.error('Could not open this page in your browser.')
-      },
-      () => toast.error('Could not open this page in your browser.')
-    )
-  }, [contextTab?.url])
-
-  return (
-    <TabStrip
-      tabs={items}
-      onSelect={onSwitchTab}
-      onClose={onCloseTab}
-      onNew={onNewTab}
-      onTabContextMenu={openTabContextMenu}
-      onTabDragStart={startTabDrag}
-      onReorder={onReorderTab}
-      overlays={
-        <ContextMenu
-          isOpen={contextMenuOpen && Boolean(contextTab)}
-          position={contextMenuPosition}
-          menuRef={contextMenuRef}
-          onClose={closeTabContextMenu}
-          onOpenInNewTab={openTabInExternalBrowser}
-          openInNewTabLabel='Open in External Browser'
-          openInNewTabPosition='last'
-          showOpenInNewTab={Boolean(contextTab?.url && contextTab.url !== 'about:blank')}
-          onTogglePin={
-            contextTab ? () => onSetTabPinned(contextTab.tabId, !contextTab.pinned) : undefined
-          }
-          onDuplicate={contextTab ? () => onDuplicateTab(contextTab.tabId) : undefined}
-          // Pinned tabs are durable and deliberately have no close action.
-          {...(contextTab && !contextTab.pinned
-            ? { onCloseTab: () => onCloseTab(contextTab.tabId), showCloseTab: true }
-            : {})}
-          onDelete={() => {}}
-          showPin={Boolean(contextTab)}
-          isPinned={Boolean(contextTab?.pinned)}
-          showRename={false}
-          showDuplicate={Boolean(contextTab)}
-          showDelete={false}
-        />
-      }
-    />
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
index 55433ace1b0..c06afcbdd37 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
@@ -334,9 +334,12 @@ export const ResourceContent = memo(function ResourceContent({
       )
 
     case 'browser':
+      // One panel serves every browser tab of the chat: the desktop app
+      // composites whichever page is selected, so switching tabs must not
+      // remount it.
       return (
         <BrowserSession
-          key={resource.id}
+          key={desktopScopeId}
           scopeId={desktopScopeId}
           visible={visible}
           onOverlayControllerChange={onBrowserOverlayControllerChange}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
new file mode 100644
index 00000000000..cd27d8609f6
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
@@ -0,0 +1,83 @@
+'use client'
+
+import { useState } from 'react'
+import { cn } from '@sim/emcn'
+import { CircleAlert, Globe, Loader } from '@sim/emcn/icons'
+import { ThinkingLoader } from '@/components/ui'
+import { browserTabHostname, shouldShowBrowserTabSpinner } from '@/lib/browser-agent/tab-label'
+import { faviconUrl } from '@/lib/core/utils/favicon'
+import { useBrowserSessionStore } from '@/stores/browser-session/store'
+
+interface BrowserTabIconProps {
+  /** Native tab id, which is also the browser resource's id. */
+  tabId: string
+  className?: string
+}
+
+/**
+ * Resource-strip icon for one live browser page: its favicon while it has
+ * one, a spinner while it is still loading without one, the globe otherwise.
+ * While the agent is working in this tab the favicon gives way to the
+ * thinking loader, so the strip shows where the agent is without pulling the
+ * user's selection there.
+ */
+export function BrowserTabIcon({ tabId, className }: BrowserTabIconProps) {
+  const tab = useBrowserSessionStore((state) => {
+    const scopeId = state.activeScopeId
+    return scopeId
+      ? state.sessions[scopeId]?.tabs.find((entry) => entry.tabId === tabId)
+      : undefined
+  })
+  const agentWorking = useBrowserSessionStore((state) => {
+    const scopeId = state.activeScopeId
+    const session = scopeId ? state.sessions[scopeId] : undefined
+    return Boolean(
+      session &&
+        session.automationTabId === tabId &&
+        (session.automationActive || session.agentRunIds.length > 0)
+    )
+  })
+  const [loadedHostname, setLoadedHostname] = useState<string | null>(null)
+  const [failedHostname, setFailedHostname] = useState<string | null>(null)
+
+  const hostname = tab ? browserTabHostname(tab.url) : null
+  const faviconLoaded = Boolean(hostname && loadedHostname === hostname)
+  const faviconFailed = Boolean(hostname && failedHostname === hostname)
+  const showSpinner = shouldShowBrowserTabSpinner(tab?.loading ?? false, hostname, loadedHostname)
+
+  return (
+    <span className={cn('relative flex items-center justify-center', className)}>
+      {agentWorking ? (
+        <ThinkingLoader size={14} startVariant='corners' />
+      ) : tab?.issue ? (
+        <CircleAlert className='size-[12px] text-[var(--text-icon)]' />
+      ) : (
+        <>
+          {hostname && !faviconFailed && (
+            <img
+              key={hostname}
+              src={faviconUrl(hostname, 32)}
+              alt=''
+              className={cn(
+                'size-[16px] rounded-[3px]',
+                !faviconLoaded && 'pointer-events-none absolute opacity-0'
+              )}
+              onLoad={() => setLoadedHostname(hostname)}
+              onError={() => setFailedHostname(hostname)}
+            />
+          )}
+          {showSpinner ? (
+            <Loader
+              animate
+              className='size-[14px] text-[var(--text-icon)]'
+              strokeWidth={2}
+              style={{ animationDuration: '650ms' }}
+            />
+          ) : !faviconLoaded || faviconFailed ? (
+            <Globe className='size-[12px] text-[var(--text-icon)]' />
+          ) : null}
+        </>
+      )}
+    </span>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
index 324a728871d..058101af999 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
@@ -16,6 +16,7 @@ import {
 } from '@sim/emcn/icons'
 import type { QueryClient } from '@tanstack/react-query'
 import { getDocumentIcon } from '@/components/icons/document-icons'
+import { BrowserTabIcon } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon'
 import type {
   MothershipResource,
   MothershipResourceType,
@@ -233,8 +234,8 @@ export const RESOURCE_REGISTRY: Record<MothershipResourceType, ResourceTypeConfi
     type: 'browser',
     label: 'Browser',
     icon: Globe,
-    renderTabIcon: (_resource, className) => (
-      <Globe className={cn(className, 'text-[var(--text-icon)]')} />
+    renderTabIcon: (resource, className) => (
+      <BrowserTabIcon tabId={resource.id} className={className} />
     ),
     renderDropdownItem: (props) => <IconDropdownItem {...props} icon={Globe} />,
   },
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.test.ts
index 53610f9c531..6a872d25f33 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.test.ts
@@ -7,6 +7,7 @@ const { mockOpenTerminal, mockSendBrowserPanelAction } = vi.hoisted(() => ({
 
 vi.mock('@/lib/browser-agent/transport', () => ({
   isBrowserAgentAvailable: vi.fn(() => true),
+  openBrowserTab: vi.fn(),
   sendBrowserPanelAction: mockSendBrowserPanelAction,
 }))
 
@@ -22,20 +23,6 @@ describe('openExistingResourceTab', () => {
     vi.clearAllMocks()
   })
 
-  it('selects an existing browser resource and opens a new browser tab', () => {
-    const selectResource = vi.fn()
-
-    openExistingResourceTab(
-      { type: 'browser', id: 'browser-session', title: 'Browser' },
-      'chat-1',
-      selectResource
-    )
-
-    expect(selectResource).toHaveBeenCalledWith('browser-session')
-    expect(mockSendBrowserPanelAction).toHaveBeenCalledWith('new-tab', {}, 'chat-1')
-    expect(mockOpenTerminal).not.toHaveBeenCalled()
-  })
-
   it('selects an existing terminal resource and opens a new terminal tab', () => {
     const selectResource = vi.fn()
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
index 490467861e3..95d3f12324a 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
@@ -18,9 +18,11 @@ import {
   type TabStripSelectionSource,
   Tooltip,
   tabStripItemSelector,
+  toast,
 } from '@sim/emcn'
 import { Columns3, Eye, Pencil } from '@sim/emcn/icons'
-import { sendBrowserPanelAction } from '@/lib/browser-agent/transport'
+import { browserTabTitle } from '@/lib/browser-agent/tab-label'
+import { openBrowserTab, sendBrowserPanelAction } from '@/lib/browser-agent/transport'
 import { SIM_RESOURCE_DRAG_TYPE, SIM_RESOURCES_DRAG_TYPE } from '@/lib/copilot/resource-types'
 import { isEphemeralResource } from '@/lib/copilot/resources/types'
 import { openTerminal } from '@/lib/terminal/transport'
@@ -47,17 +49,16 @@ import {
 import { useTablesList } from '@/hooks/queries/tables'
 import { useWorkflows } from '@/hooks/queries/workflows'
 import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
+import { useBrowserSessionStore } from '@/stores/browser-session/store'
 
-/** Opens another inner tab when a singleton desktop resource already exists. */
+/** Opens another inner tab when the singleton terminal resource already exists. */
 export function openExistingResourceTab(
   resource: MothershipResource,
   desktopScopeId: string,
   selectResource: (id: string) => void
 ): void {
   selectResource(resource.id)
-  if (resource.type === 'browser') {
-    sendBrowserPanelAction('new-tab', {}, desktopScopeId)
-  } else if (resource.type === 'terminal') {
+  if (resource.type === 'terminal') {
     void openTerminal(undefined, desktopScopeId)
   }
 }
@@ -251,21 +252,41 @@ export function ResourceTabs({
     [resources]
   )
 
+  // A browser tab's title is the live page title, owned by the desktop app.
+  const browserTabs = useBrowserSessionStore((state) => state.sessions[desktopScopeId]?.tabs)
+  const browserTitles = useMemo(
+    () => new Map(browserTabs?.map((tab) => [tab.tabId, browserTabTitle(tab)])),
+    [browserTabs]
+  )
+
   const tabs = useMemo<TabStripItem[]>(
     () =>
       resources.map((resource) => ({
         id: resource.id,
-        title: nameLookup.get(`${resource.type}:${resource.id}`) ?? resource.title,
+        title:
+          (resource.type === 'browser'
+            ? browserTitles.get(resource.id)
+            : nameLookup.get(`${resource.type}:${resource.id}`)) ?? resource.title,
         icon: getResourceConfig(resource.type).renderTabIcon(resource, 'size-[16px] shrink-0'),
         active: activeId === resource.id,
         selected: selectedIds.size > 1 && selectedIds.has(resource.id),
         attention: activityIds?.has(resource.id) ?? false,
       })),
-    [resources, nameLookup, activeId, selectedIds, activityIds]
+    [resources, nameLookup, browserTitles, activeId, selectedIds, activityIds]
   )
 
   const handleAdd = useCallback(
     (resource: MothershipResource) => {
+      // A browser tab is a live page the desktop app creates; it joins the
+      // strip through the tab list rather than as a resource of its own.
+      if (resource.type === 'browser') {
+        void openBrowserTab(desktopScopeId)
+          .then((state) => {
+            if (state?.activeTabId) selectResource(state.activeTabId)
+          })
+          .catch(() => toast.error('Could not open a new browser tab. Please try again.'))
+        return
+      }
       // Opening a resource before the first message is sent is allowed: there
       // is simply no chat to attach it to yet. `onAddResource` queues it and
       // persists once the chat exists, so only the server call is conditional.
@@ -276,7 +297,7 @@ export function ResourceTabs({
       onAddResource(resource)
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [chatId, onAddResource]
+    [chatId, desktopScopeId, onAddResource, selectResource]
   )
 
   const handleOpenExisting = useCallback(
@@ -343,9 +364,13 @@ export function ResourceTabs({
       if (!resource) return
       const isMulti = selectedIds.has(resource.id) && selectedIds.size > 1
       const targets = isMulti ? resources.filter((r) => selectedIds.has(r.id)) : [resource]
-      // Update parent state immediately for all targets
+      // Update parent state immediately for all targets. A browser tab's page
+      // is closed natively too; the tab list then confirms the removal.
       for (const r of targets) {
         onRemoveResource(r.type, r.id)
+        if (r.type === 'browser') {
+          sendBrowserPanelAction('close-tab', { tabId: r.id }, desktopScopeId)
+        }
       }
       // Clear stale selection and anchor for all removed targets
       const removedIds = new Set(targets.map((r) => r.id))
@@ -368,7 +393,7 @@ export function ResourceTabs({
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [chatId, onRemoveResource, resources, selectedIds]
+    [chatId, desktopScopeId, onRemoveResource, resources, selectedIds]
   )
 
   const handleTabDragStart = useCallback(
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx
index 0139a2fd237..c135470c8a9 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx
@@ -26,16 +26,35 @@ import { ResourceActions, ResourceContent, ResourceTabs } from './components'
 /**
  * Panels that are kept mounted across resource switches rather than rebuilt.
  *
- * These two are singletons wrapping live state the renderer does not own: the
- * browser's page is a native view the main process positions from a measured
- * rect, and each terminal is an xterm fed from a pty whose scrollback has to
- * be replayed to rebuild it. Everything else re-renders from data that is
- * already in memory and is cheap to mount on demand.
+ * Both wrap live state the renderer does not own: a browser page is a native
+ * view the main process positions from a measured rect, and each terminal is
+ * an xterm fed from a pty whose scrollback has to be replayed to rebuild it.
+ * Everything else re-renders from data that is already in memory and is cheap
+ * to mount on demand.
  */
 function isPersistentPanel(resource: MothershipResource): boolean {
   return resource.type === 'browser' || resource.type === 'terminal'
 }
 
+/**
+ * The live panels to keep mounted. Every browser tab shares one panel — the
+ * desktop app shows whichever page is selected — so the first browser
+ * resource stands in for all of them; the terminal panel is a singleton.
+ */
+function persistentPanelResources(resources: MothershipResource[]): MothershipResource[] {
+  const panels: MothershipResource[] = []
+  let browserSeen = false
+  for (const resource of resources) {
+    if (!isPersistentPanel(resource)) continue
+    if (resource.type === 'browser') {
+      if (browserSeen) continue
+      browserSeen = true
+    }
+    panels.push(resource)
+  }
+  return panels
+}
+
 const PREVIEW_CYCLE: Record<PreviewMode, PreviewMode> = {
   editor: 'split',
   split: 'preview',
@@ -129,7 +148,7 @@ export const MothershipView = memo(
       return browserOverlayControllerRef.current?.closeOverlay('resources') ?? Promise.resolve()
     }, [])
 
-    const persistentResources = useMemo(() => resources.filter(isPersistentPanel), [resources])
+    const persistentResources = useMemo(() => persistentPanelResources(resources), [resources])
 
     const previewForActive =
       previewSession && active && shouldShowStreamingFilePanel(previewSession, active)
@@ -221,27 +240,33 @@ export const MothershipView = memo(
               screen": the browser reports no bounds and its native view hides
               itself, and the terminals stop being measured.
             */}
-            {persistentResources.map((resource) => (
-              <div
-                key={`${desktopScopeId}:${resource.id}`}
-                className={cn('absolute inset-0', resource.id !== active?.id && 'hidden')}
-              >
-                {/*
+            {persistentResources.map((resource) => {
+              const panelVisible =
+                resource.type === 'browser'
+                  ? active?.type === 'browser'
+                  : resource.id === active?.id
+              return (
+                <div
+                  key={`${desktopScopeId}:${resource.type === 'browser' ? 'browser' : resource.id}`}
+                  className={cn('absolute inset-0', !panelVisible && 'hidden')}
+                >
+                  {/*
                   A hidden persistent panel can otherwise only INFER it is off
                   screen by measuring itself, which is enough to pause xterm and
                   hide the native view but not to switch off document-wide
                   observers the panel installs. The explicit flag lets it stand
                   those down while hidden.
                 */}
-                <ResourceContent
-                  workspaceId={workspaceId}
-                  desktopScopeId={desktopScopeId}
-                  resource={resource}
-                  visible={resource.id === active?.id}
-                  onBrowserOverlayControllerChange={registerBrowserOverlayController}
-                />
-              </div>
-            ))}
+                  <ResourceContent
+                    workspaceId={workspaceId}
+                    desktopScopeId={desktopScopeId}
+                    resource={resource}
+                    visible={panelVisible}
+                    onBrowserOverlayControllerChange={registerBrowserOverlayController}
+                  />
+                </div>
+              )
+            })}
             {active && !isPersistentPanel(active) && (
               <ResourceContent
                 workspaceId={workspaceId}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts
index 15c8be8df73..4f73444d513 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts
@@ -109,9 +109,9 @@ export const SPEECH_RECOGNITION_LANG = 'en-US'
  * so adding a new resource type fails compilation here until a conversion is
  * supplied — preventing silent drift between the two taxonomies.
  */
-// Browser/terminal resources may name either the singleton panel or one live
-// inner tab. The singleton ids ask the agent to inspect the whole resource;
-// every other id is a precise live-tab pointer.
+// A browser resource is one live page, so its id is a precise tab pointer. A
+// terminal resource names either the singleton panel, which asks the agent to
+// inspect the whole resource, or one live shell.
 const RESOURCE_TO_CONTEXT: Record<
   MothershipResourceType,
   (resource: MothershipResource) => ChatContext
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx
index bfe0e129bf0..09d5988fa6d 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx
@@ -23,6 +23,13 @@ const fixtures = vi.hoisted(() => ({
     isPending: false,
   },
   tabs: [],
+  browserTabs: [] as Array<{
+    tabId: string
+    title: string
+    url: string
+    loading: boolean
+    active: boolean
+  }>,
   logs: {
     data: {
       pages: [{ logs: [{ id: 'log-1', createdAt: '2026-01-01T12:00:00Z', status: 'success' }] }],
@@ -63,13 +70,12 @@ vi.mock('@/blocks/integration-matcher', () => ({
     { blockType: 'example', name: 'Example integration', icon: () => null },
   ],
 }))
-vi.mock('@/stores/browser-session/store', () => ({ useBrowserSessionStore: () => fixtures.tabs }))
+vi.mock('@/stores/browser-session/store', () => ({
+  useBrowserSessionStore: () => fixtures.browserTabs,
+}))
 vi.mock('@/stores/copilot-terminal/store', () => ({ useCopilotTerminalStore: () => fixtures.tabs }))
 
-import {
-  BROWSER_SESSION_RESOURCE_ID,
-  TERMINAL_SESSION_RESOURCE_ID,
-} from '@/lib/copilot/resources/types'
+import { TERMINAL_SESSION_RESOURCE_ID } from '@/lib/copilot/resources/types'
 import { setDesktopPreferencesSnapshot } from '@/lib/desktop'
 import {
   mapResourceToContext,
@@ -146,6 +152,7 @@ describe('PlusMenuDropdown desktop resources', () => {
     }
     fixtures.browserAvailable.mockReturnValue(true)
     fixtures.terminalAvailable.mockReturnValue(true)
+    fixtures.browserTabs.length = 0
     setDesktopPreferencesSnapshot(PREFERENCES)
     Object.defineProperty(Element.prototype, 'scrollIntoView', {
       configurable: true,
@@ -168,6 +175,13 @@ describe('PlusMenuDropdown desktop resources', () => {
   })
 
   it('keeps shared categories in the same order in browse and mention modes', () => {
+    fixtures.browserTabs.push({
+      tabId: '7',
+      title: 'Sim Docs',
+      url: 'https://docs.sim.ai',
+      loading: false,
+      active: true,
+    })
     const { ref } = openMenu()
     const browseOrder = menuItems().map((item) => item.textContent)
     expect(browseOrder).toEqual([
@@ -186,36 +200,59 @@ describe('PlusMenuDropdown desktop resources', () => {
     expect(headings).toEqual(['Integrations', ...browseOrder])
   })
 
-  it.each([false, true])('selects the same whole Browser in mention=%s mode', (mention) => {
-    const { onResourceSelect } = openMenu(mention)
-    selectItem('Browser')
+  it('lists a live page under the Browser category in browse mode', () => {
+    fixtures.browserTabs.push({
+      tabId: '7',
+      title: 'Sim Docs',
+      url: 'https://docs.sim.ai',
+      loading: false,
+      active: true,
+    })
+    openMenu()
+    expect(menuItems().map((item) => item.textContent)).toContain('Browser')
+  })
+
+  it('offers each live browser tab as itself in mention mode', () => {
+    fixtures.browserTabs.push({
+      tabId: '7',
+      title: 'Sim Docs',
+      url: 'https://docs.sim.ai',
+      loading: false,
+      active: true,
+    })
+    const { onResourceSelect } = openMenu(true)
+    expect(menuItems().map((item) => item.textContent)).not.toContain('Browser')
+    selectItem('Sim Docs')
 
     expect(onResourceSelect).toHaveBeenCalledExactlyOnceWith({
       type: 'browser',
-      id: BROWSER_SESSION_RESOURCE_ID,
-      title: 'Browser',
+      id: '7',
+      title: 'Sim Docs',
     })
     expect(mapResourceToContext(onResourceSelect.mock.calls[0][0])).toEqual({
       kind: 'browser_tab',
-      tabId: BROWSER_SESSION_RESOURCE_ID,
-      label: 'Browser',
+      tabId: '7',
+      label: 'Sim Docs',
     })
   })
 
   it.each([false, true])(
-    'updates mounted desktop rows when preferences change in mention=%s mode',
+    'offers no browser row without a live page in mention=%s mode',
     (mention) => {
       openMenu(mention)
-      expect(menuItems().map((item) => item.textContent)).toContain('Browser')
-
-      fixtures.browserAvailable.mockReturnValue(false)
-      act(() => setDesktopPreferencesSnapshot({ ...PREFERENCES, browserEnabled: false }))
       expect(menuItems().map((item) => item.textContent)).not.toContain('Browser')
       expect(menuItems().map((item) => item.textContent)).toContain('Terminal')
     }
   )
 
-  it('finds Browser through plus-menu search and selects it with Enter', () => {
+  it('finds a browser tab through plus-menu search by its family and selects it with Enter', () => {
+    fixtures.browserTabs.push({
+      tabId: '7',
+      title: 'Sim Docs',
+      url: 'https://docs.sim.ai',
+      loading: false,
+      active: true,
+    })
     const { onResourceSelect } = openMenu()
     const search = document.querySelector<HTMLInputElement>(
       'input[placeholder="Search resources..."]'
@@ -226,19 +263,26 @@ describe('PlusMenuDropdown desktop resources', () => {
       valueSetter.call(search, 'browser')
       search.dispatchEvent(new Event('input', { bubbles: true }))
     })
-    expect(menuItems().map((item) => item.textContent)).toEqual(['Browser'])
+    expect(menuItems().map((item) => item.textContent)).toEqual(['Sim Docs'])
     act(() => search.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })))
     expect(onResourceSelect).toHaveBeenCalledExactlyOnceWith({
       type: 'browser',
-      id: BROWSER_SESSION_RESOURCE_ID,
-      title: 'Browser',
+      id: '7',
+      title: 'Sim Docs',
     })
   })
 
   it.each([false, true])('keeps unavailable Browser hidden in mention=%s mode', (mention) => {
     fixtures.browserAvailable.mockReturnValue(false)
+    fixtures.browserTabs.push({
+      tabId: '7',
+      title: 'Sim Docs',
+      url: 'https://docs.sim.ai',
+      loading: false,
+      active: true,
+    })
     const { onResourceSelect } = openMenu(mention)
-    expect(menuItems().some((item) => item.textContent === 'Browser')).toBe(false)
+    expect(menuItems().some((item) => item.textContent === 'Sim Docs')).toBe(false)
     selectItem('Terminal')
     expect(onResourceSelect).toHaveBeenCalledExactlyOnceWith({
       type: 'terminal',
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
index e3b23f6c662..446a6d2564b 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
@@ -24,8 +24,9 @@ import type { PlusMenuHandle } from '@/app/workspace/[workspaceId]/home/componen
 import {
   buildMentionPreview,
   resourceMentionMatches,
-  withDesktopTabMentions,
+  withBrowserTabMentions,
   withFolderMentions,
+  withTerminalTabMentions,
 } from '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items'
 import type {
   MothershipResource,
@@ -123,9 +124,12 @@ export const PlusMenuDropdown = React.memo(
     }, [])
 
     const visibleResources = useMemo(() => {
-      const resources = withFolderMentions(availableResources, structureFolders)
+      const resources = withBrowserTabMentions(
+        withFolderMentions(availableResources, structureFolders),
+        browserTabs
+      )
       if (isMention) {
-        return withDesktopTabMentions(resources, browserTabs, terminalTabs)
+        return withTerminalTabMentions(resources, terminalTabs)
       }
       return resources.filter(({ type }) => !MENTION_ONLY_RESOURCE_TYPES.has(type))
     }, [availableResources, structureFolders, browserTabs, isMention, terminalTabs])
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.test.ts
index 90343353cf3..3ba69a834dd 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.test.ts
@@ -1,22 +1,20 @@
 import { describe, expect, it } from 'vitest'
-import {
-  BROWSER_SESSION_RESOURCE_ID,
-  TERMINAL_SESSION_RESOURCE_ID,
-} from '@/lib/copilot/resources/types'
+import { TERMINAL_SESSION_RESOURCE_ID } from '@/lib/copilot/resources/types'
 import type { AvailableItem } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree'
 import { byResourceMenuOrder } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
 import {
   buildMentionPreview,
   resourceMentionMatches,
-  withDesktopTabMentions,
+  withBrowserTabMentions,
   withFolderMentions,
+  withTerminalTabMentions,
 } from '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items'
 
 const groups = [
   { type: 'workflow' as const, items: [{ id: 'wf-1', name: 'Deploy' }] },
   {
     type: 'browser' as const,
-    items: [{ id: BROWSER_SESSION_RESOURCE_ID, name: 'Browser' }],
+    items: [{ id: 'browser', name: 'Browser' }],
   },
   {
     type: 'terminal' as const,
@@ -24,86 +22,40 @@ const groups = [
   },
 ]
 
-describe('withDesktopTabMentions', () => {
-  it('keeps Browser and Terminal as flat resource mentions with no live tabs', () => {
-    const result = withDesktopTabMentions(groups, [], [])
+describe('withBrowserTabMentions', () => {
+  it('drops the Browser launcher when no page is open', () => {
+    const result = withBrowserTabMentions(groups, [])
 
-    expect(result.find((group) => group.type === 'browser')?.items).toEqual([
-      expect.objectContaining({
-        id: BROWSER_SESSION_RESOURCE_ID,
-        name: 'Browser',
-        mentionLevel: 'resource',
-      }),
-    ])
-    expect(result.find((group) => group.type === 'terminal')?.items).toEqual([
-      expect.objectContaining({
-        id: TERMINAL_SESSION_RESOURCE_ID,
-        name: 'Terminal',
-        mentionLevel: 'resource',
-      }),
-    ])
+    expect(result.find((group) => group.type === 'browser')?.items).toEqual([])
+    expect(result.find((group) => group.type === 'workflow')).toBe(groups[0])
   })
 
-  it('offers the whole resources first and every live tab after them', () => {
-    const result = withDesktopTabMentions(
-      groups,
-      [
-        {
-          tabId: 'browser-1',
-          title: 'Sim Docs',
-          url: 'https://docs.sim.ai',
-          loading: false,
-          active: true,
-          pinned: false,
-        },
-        {
-          tabId: 'browser-2',
-          title: '',
-          url: 'https://github.com/simstudioai/sim',
-          loading: false,
-          active: false,
-          pinned: false,
-        },
-      ],
-      [
-        {
-          terminalId: 'terminal-1',
-          title: 'sim',
-          cwd: '/code/sim',
-          running: null,
-          interactive: false,
-          active: true,
-        },
-        {
-          terminalId: 'terminal-2',
-          title: 'sim',
-          cwd: '/tmp/sim',
-          running: null,
-          interactive: false,
-          active: false,
-        },
-      ]
-    )
-
-    expect(result.find((group) => group.type === 'browser')?.items).toMatchObject([
-      { id: BROWSER_SESSION_RESOURCE_ID, name: 'Browser', mentionLevel: 'resource' },
-      { id: 'browser-1', name: 'Sim Docs', mentionLevel: 'tab' },
-      { id: 'browser-2', name: 'github.com', mentionLevel: 'tab' },
+  it('offers every live page as its own Browser mention', () => {
+    const result = withBrowserTabMentions(groups, [
+      {
+        tabId: 'browser-1',
+        title: 'Sim Docs',
+        url: 'https://docs.sim.ai',
+        loading: false,
+        active: true,
+      },
+      {
+        tabId: 'browser-2',
+        title: '',
+        url: 'https://github.com/simstudioai/sim',
+        loading: false,
+        active: false,
+      },
     ])
-    expect(result.find((group) => group.type === 'terminal')?.items).toMatchObject([
-      { id: TERMINAL_SESSION_RESOURCE_ID, name: 'Terminal', mentionLevel: 'resource' },
-      { id: 'terminal-1', name: 'sim 1', mentionLevel: 'tab' },
-      { id: 'terminal-2', name: 'sim 2', mentionLevel: 'tab' },
+
+    expect(result.find((group) => group.type === 'browser')?.items).toEqual([
+      { id: 'browser-1', name: 'Sim Docs', mentionFamily: 'Browser' },
+      { id: 'browser-2', name: 'github.com', mentionFamily: 'Browser' },
     ])
   })
 
   it('keeps specific tabs discoverable by either their title or resource family', () => {
-    const tab = {
-      id: 'browser-1',
-      name: 'Sim Docs',
-      mentionFamily: 'Browser',
-      mentionLevel: 'tab',
-    }
+    const tab = { id: 'browser-1', name: 'Sim Docs', mentionFamily: 'Browser' }
 
     expect(resourceMentionMatches(tab, 'docs')).toBe(true)
     expect(resourceMentionMatches(tab, 'browser')).toBe(true)
@@ -111,6 +63,43 @@ describe('withDesktopTabMentions', () => {
   })
 })
 
+describe('withTerminalTabMentions', () => {
+  it('keeps Terminal as a flat resource mention with no live shells', () => {
+    const result = withTerminalTabMentions(groups, [])
+
+    expect(result.find((group) => group.type === 'terminal')?.items).toEqual([
+      expect.objectContaining({ id: TERMINAL_SESSION_RESOURCE_ID, name: 'Terminal' }),
+    ])
+  })
+
+  it('offers the whole Terminal first and every live shell after it', () => {
+    const result = withTerminalTabMentions(groups, [
+      {
+        terminalId: 'terminal-1',
+        title: 'sim',
+        cwd: '/code/sim',
+        running: null,
+        interactive: false,
+        active: true,
+      },
+      {
+        terminalId: 'terminal-2',
+        title: 'sim',
+        cwd: '/tmp/sim',
+        running: null,
+        interactive: false,
+        active: false,
+      },
+    ])
+
+    expect(result.find((group) => group.type === 'terminal')?.items).toMatchObject([
+      { id: TERMINAL_SESSION_RESOURCE_ID, name: 'Terminal' },
+      { id: 'terminal-1', name: 'sim 1' },
+      { id: 'terminal-2', name: 'sim 2' },
+    ])
+  })
+})
+
 describe('buildMentionPreview', () => {
   const item = (id: string): AvailableItem => ({ id, name: id })
   const many = (n: number) => Array.from({ length: n }, (_, i) => item(`i${i}`))
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts
index 13fcd892752..1ba78aed760 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts
@@ -1,11 +1,8 @@
 import type { BrowserTabState } from '@sim/browser-protocol'
 import type { TerminalTabState } from '@sim/terminal-protocol'
-import {
-  BROWSER_SESSION_RESOURCE_ID,
-  TERMINAL_SESSION_RESOURCE_ID,
-} from '@/lib/copilot/resources/types'
+import { browserTabTitle } from '@/lib/browser-agent/tab-label'
+import { TERMINAL_SESSION_RESOURCE_ID } from '@/lib/copilot/resources/types'
 import type { AvailableItem } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree'
-import { browserTabTitle } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label'
 import type { MothershipResourceType } from '@/app/workspace/[workspaceId]/home/types'
 
 export interface ResourceMentionGroup {
@@ -35,8 +32,6 @@ export function withFolderMentions(
   )
 }
 
-export type ResourceMentionLevel = 'resource' | 'tab'
-
 /** A family query such as "browser" keeps that resource's live tabs visible. */
 export function resourceMentionMatches(item: AvailableItem, query: string): boolean {
   const normalized = query.toLowerCase().trim()
@@ -61,52 +56,53 @@ function uniqueTabNames<T>(tabs: readonly T[], nameOf: (tab: T) => string): stri
   })
 }
 
-function resourceItem(id: string, name: string, existing?: AvailableItem): AvailableItem {
-  return {
-    ...existing,
-    id,
-    name,
-    mentionFamily: name,
-    mentionLevel: 'resource' satisfies ResourceMentionLevel,
-  }
+/**
+ * Replaces the Browser launcher row with the live pages, which are the only
+ * browser things that can be attached or mentioned. With no page open the
+ * family disappears from the menu.
+ */
+export function withBrowserTabMentions(
+  groups: readonly ResourceMentionGroup[],
+  browserTabs: readonly BrowserTabState[]
+): ResourceMentionGroup[] {
+  const browserNames = uniqueTabNames(browserTabs, browserTabTitle)
+  return groups.map((group) =>
+    group.type === 'browser'
+      ? {
+          ...group,
+          items: browserTabs.map((tab, index) => ({
+            id: tab.tabId,
+            name: browserNames[index],
+            mentionFamily: 'Browser',
+          })),
+        }
+      : group
+  )
 }
 
-/** Adds live inner tabs after each always-present desktop resource mention. */
-export function withDesktopTabMentions(
+/** Adds live shells after the always-present Terminal mention. */
+export function withTerminalTabMentions(
   groups: readonly ResourceMentionGroup[],
-  browserTabs: readonly BrowserTabState[],
   terminalTabs: readonly TerminalTabState[]
 ): ResourceMentionGroup[] {
-  const browserNames = uniqueTabNames(browserTabs, browserTabTitle)
   const terminalNames = uniqueTabNames(terminalTabs, (tab) => tab.title.trim() || 'Terminal')
 
   return groups.map((group) => {
-    if (group.type === 'browser') {
-      const existing = group.items.find((item) => item.id === BROWSER_SESSION_RESOURCE_ID)
-      return {
-        ...group,
-        items: [
-          resourceItem(BROWSER_SESSION_RESOURCE_ID, 'Browser', existing),
-          ...browserTabs.map((tab, index) => ({
-            id: tab.tabId,
-            name: browserNames[index],
-            mentionFamily: 'Browser',
-            mentionLevel: 'tab' satisfies ResourceMentionLevel,
-          })),
-        ],
-      }
-    }
     if (group.type === 'terminal') {
       const existing = group.items.find((item) => item.id === TERMINAL_SESSION_RESOURCE_ID)
       return {
         ...group,
         items: [
-          resourceItem(TERMINAL_SESSION_RESOURCE_ID, 'Terminal', existing),
+          {
+            ...existing,
+            id: TERMINAL_SESSION_RESOURCE_ID,
+            name: 'Terminal',
+            mentionFamily: 'Terminal',
+          },
           ...terminalTabs.map((tab, index) => ({
             id: tab.terminalId,
             name: terminalNames[index],
             mentionFamily: 'Terminal',
-            mentionLevel: 'tab' satisfies ResourceMentionLevel,
           })),
         ],
       }
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 68b925f26c0..433e20142d9 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -45,6 +45,7 @@ import { persistImportedWorkflow } from '@/lib/workflows/operations/import-expor
 import { KnowledgeSearchResults } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results'
 import { RESOURCE_HEADER_CLASSES } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 import { SuggestedActions } from '@/app/workspace/[workspaceId]/home/components/suggested-actions'
+import { useBrowserTabResources } from '@/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources'
 import { useMothershipMode } from '@/app/workspace/[workspaceId]/home/hooks/use-mothership-mode'
 import { resolveWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
 import {
@@ -369,6 +370,16 @@ export function Home({ chatId, userName, userId }: HomeProps) {
     [setActiveResourceId, clearResourceActivity]
   )
 
+  useBrowserTabResources({
+    scopeId: desktopScopeId,
+    resources,
+    activeResourceId,
+    addResource,
+    removeResource,
+    selectResource: selectResourceFromUser,
+    onResourceEvent: handleResourceEvent,
+  })
+
   const addResourceFromUser = useCallback(
     (resource: MothershipResource) => {
       resourceCollapseOwnedByUserRef.current = false
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts
index 3bd6a2e6f25..fac03a8f98c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts
@@ -86,7 +86,7 @@ describe('handleResourceEvent removal', () => {
     )
   })
 
-  it('normalizes a page-shaped browser event into the singleton Browser panel', () => {
+  it('ignores browser events because browser tabs come from the desktop tab list', () => {
     const onResourceEvent = vi.fn()
     const deps = makeStreamLoopDeps({
       onResourceEventRef: { current: onResourceEvent },
@@ -98,13 +98,9 @@ describe('handleResourceEvent removal', () => {
       browserUpsertEvent('browser-session:slack-tab', 'mship-todo (Channel) - sim - Slack')
     )
 
-    expect(deps.addResource).toHaveBeenCalledWith({
-      type: 'browser',
-      id: 'browser-session',
-      title: 'Browser',
-    })
+    expect(deps.addResource).not.toHaveBeenCalled()
     expect(deps.setActiveResourceId).not.toHaveBeenCalled()
-    expect(onResourceEvent).toHaveBeenCalledWith('browser-session')
+    expect(onResourceEvent).not.toHaveBeenCalled()
   })
 })
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts
index 5f17c4b057a..0e507ee3513 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts
@@ -46,6 +46,9 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
   if (!workspaceId) return
   const onResourceEvent = onResourceEventRef.current
   const payload = parsed.payload
+  // Browser tabs are projected from the desktop app's live page list, never
+  // from the stream; older servers announced them as resources.
+  if (payload.resource.type === 'browser') return
   const shouldClearViewId =
     payload.resource.type === 'table' && payload.resource.clearViewId === true
   // A saved view the agent just created or edited: the table opens on it, and
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts
new file mode 100644
index 00000000000..b47758d9038
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts
@@ -0,0 +1,129 @@
+import { useEffect, useRef } from 'react'
+import type { BrowserTabState } from '@sim/browser-protocol'
+import { browserTabTitle } from '@/lib/browser-agent/tab-label'
+import { sendBrowserPanelAction } from '@/lib/browser-agent/transport'
+import type { MothershipResource, MothershipResourceType } from '@/lib/copilot/resources/types'
+import type { ResourceEventHandler } from '@/app/workspace/[workspaceId]/home/hooks/use-chat'
+import { useBrowserSessionStore } from '@/stores/browser-session/store'
+
+const EMPTY_BROWSER_TABS: BrowserTabState[] = []
+
+interface UseBrowserTabResourcesOptions {
+  /** Desktop browser scope whose pages back this chat's browser tabs. */
+  scopeId: string
+  resources: readonly MothershipResource[]
+  activeResourceId: string | null
+  /** Adds a tab without activating it; activation goes through {@link onResourceEvent}. */
+  addResource: (resource: MothershipResource) => void
+  removeResource: (resourceType: MothershipResourceType, resourceId: string) => void
+  /** Explicit user selection, which claims the visible tab. */
+  selectResource: (resourceId: string) => void
+  /** Agent activity on a tab, subject to the panel's user-ownership policy. */
+  onResourceEvent: ResourceEventHandler
+}
+
+/**
+ * Keeps the chat's `browser` resource tabs equal to the desktop app's live
+ * page list, one resource per native tab.
+ *
+ * The desktop app owns the pages, so its tab list is the source of truth: a
+ * page appearing there (agent, `+ Browser`, popup, restore) gains a resource
+ * tab and a page leaving it loses one. Closing a browser resource tab closes
+ * its page at the strip, which then comes back through the same list. Visible
+ * selection is routed the same way — choosing a browser resource tab switches
+ * the native page, and a native switch (Ctrl+Tab in the page, a popup the user
+ * opened) follows into the strip while the user is on the browser.
+ *
+ * The agent never moves the visible page itself. Its tab is announced as
+ * resource activity, so the existing view policy decides whether to show it or
+ * only badge it while the user is reading something else.
+ */
+export function useBrowserTabResources({
+  scopeId,
+  resources,
+  activeResourceId,
+  addResource,
+  removeResource,
+  selectResource,
+  onResourceEvent,
+}: UseBrowserTabResourcesOptions): void {
+  const tabs = useBrowserSessionStore(
+    (state) => state.sessions[scopeId]?.tabs ?? EMPTY_BROWSER_TABS
+  )
+  const activeTabId = useBrowserSessionStore(
+    (state) => state.sessions[scopeId]?.activeTabId ?? null
+  )
+  const automationTabId = useBrowserSessionStore((state) => {
+    const session = state.sessions[scopeId]
+    if (!session) return null
+    return session.automationActive || session.agentRunIds.length > 0
+      ? session.automationTabId
+      : null
+  })
+  /** Tab ids this hook has projected into the strip for the current scope. */
+  const knownTabIdsRef = useRef<Set<string> | null>(null)
+  knownTabIdsRef.current ??= new Set()
+  const knownScopeRef = useRef(scopeId)
+  const resourcesRef = useRef(resources)
+  resourcesRef.current = resources
+  const activeResourceIdRef = useRef(activeResourceId)
+  activeResourceIdRef.current = activeResourceId
+  const selectResourceRef = useRef(selectResource)
+  selectResourceRef.current = selectResource
+  const onResourceEventRef = useRef(onResourceEvent)
+  onResourceEventRef.current = onResourceEvent
+
+  useEffect(() => {
+    const known = knownTabIdsRef.current
+    if (!known) return
+    if (knownScopeRef.current !== scopeId) {
+      knownScopeRef.current = scopeId
+      known.clear()
+    }
+    const liveTabIds = new Set(tabs.map((tab) => tab.tabId))
+    const resourceTabIds = new Set(
+      resources.filter((resource) => resource.type === 'browser').map((resource) => resource.id)
+    )
+
+    for (const tab of tabs) {
+      // A known tab without a resource is a close still in flight natively.
+      if (known.has(tab.tabId)) continue
+      known.add(tab.tabId)
+      if (!resourceTabIds.has(tab.tabId)) {
+        addResource({ type: 'browser', id: tab.tabId, title: browserTabTitle(tab) })
+      }
+    }
+
+    for (const tabId of known) {
+      if (liveTabIds.has(tabId)) continue
+      known.delete(tabId)
+      if (resourceTabIds.has(tabId)) removeResource('browser', tabId)
+    }
+  }, [addResource, removeResource, resources, scopeId, tabs])
+
+  // Selecting a browser resource tab shows its native page.
+  useEffect(() => {
+    if (!activeResourceId || activeResourceId === activeTabId) return
+    if (!tabs.some((tab) => tab.tabId === activeResourceId)) return
+    sendBrowserPanelAction('switch-tab', { tabId: activeResourceId }, scopeId)
+  }, [activeResourceId, activeTabId, scopeId, tabs])
+
+  // A native switch while the user is on the browser follows into the strip.
+  const followedActiveTabIdRef = useRef(activeTabId)
+  useEffect(() => {
+    if (followedActiveTabIdRef.current === activeTabId) return
+    followedActiveTabIdRef.current = activeTabId
+    const activeResource = resourcesRef.current.find(
+      (resource) => resource.id === activeResourceIdRef.current
+    )
+    if (!activeTabId || activeResource?.type !== 'browser' || activeResource.id === activeTabId) {
+      return
+    }
+    selectResourceRef.current(activeTabId)
+  }, [activeTabId])
+
+  // The agent's tab surfaces like any other agent activity.
+  useEffect(() => {
+    if (automationTabId) onResourceEventRef.current(automationTabId, { activate: true })
+  }, [automationTabId])
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
index dfe600df579..51cee6d699b 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -73,7 +73,6 @@ import type { StreamBatchEvent } from '@/lib/copilot/request/session/types'
 import { canDisplayResource } from '@/lib/copilot/resources/availability'
 import { ResourcePersistenceQueue } from '@/lib/copilot/resources/client-persistence-queue'
 import {
-  BROWSER_SESSION_RESOURCE_ID,
   isAddressableResource,
   isEphemeralResource,
   type MothershipResourceUpdate,
@@ -2128,17 +2127,6 @@ export function useChat(
     [workspaceId, organizationId, scopeKey]
   )
 
-  const openBrowserResource = useCallback(() => {
-    // Browser work surfaces like any other agent activity: the panel follows
-    // the agent to the browser whether or not the session was already open.
-    addResource({
-      type: 'browser',
-      id: BROWSER_SESSION_RESOURCE_ID,
-      title: 'Browser',
-    })
-    onResourceEventRef.current?.(BROWSER_SESSION_RESOURCE_ID, { activate: true })
-  }, [addResource])
-
   const getResourceActivityTracker = useCallback(
     (generation: number, targetChatId?: string) => {
       let tracker = resourceActivityTrackerRef.current
@@ -2213,12 +2201,13 @@ export function useChat(
       if (!isCurrentBrowserToolName(toolName)) {
         return
       }
-      openBrowserResource()
-      // Replay/exactly-once guarding lives in executeBrowserToolOnClient
-      // (sessionStorage-backed, so reloads cannot re-run an action).
+      // The agent's tab reaches the resource strip through the desktop tab
+      // list, so nothing is opened here. Replay/exactly-once guarding lives in
+      // executeBrowserToolOnClient (sessionStorage-backed, so reloads cannot
+      // re-run an action).
       executeBrowserToolOnClient(toolCallId, toolName, toolArgs, scopeId, eventTs, signal)
     },
-    [openBrowserResource]
+    []
   )
 
   const openTerminalResource = useCallback(() => {
@@ -2249,18 +2238,25 @@ export function useChat(
     [openTerminalResource]
   )
 
-  // Chat links clicked in the desktop app open in the embedded browser panel
-  // (message components dispatch the request; this hook owns the resource).
+  // Chat links clicked in the desktop app open in a new browser tab. The user
+  // asked to see it, so it is selected outright rather than offered through
+  // the agent-activity policy (message components dispatch the request; the
+  // tab list adds the resource).
   useEffect(() => {
     return onOpenInBrowserPanel((url) => {
-      openBrowserResource()
-      void openUrlInNewBrowserTab(url, desktopScopeIdRef.current).catch((error) => {
-        logger.warn('Failed to open chat link in a new browser tab', {
-          error: getErrorMessage(error),
+      void openUrlInNewBrowserTab(url, desktopScopeIdRef.current)
+        .then((tabId) => {
+          if (!tabId) return
+          activeResourceIdRef.current = tabId
+          setActiveResourceId(tabId)
+        })
+        .catch((error) => {
+          logger.warn('Failed to open chat link in a new browser tab', {
+            error: getErrorMessage(error),
+          })
         })
-      })
     })
-  }, [openBrowserResource])
+  }, [])
 
   const recoverPendingClientWorkflowTools = useCallback(
     async (nextMessages: ChatMessage[]) => {
@@ -2508,9 +2504,8 @@ export function useChat(
 
     flushPendingResources(chatHistory.id)
 
-    // Older clients persisted each live browser page as a top-level resource
-    // during new-chat creation. Collapse those legacy rows into the one
-    // restorable Browser panel so page titles never appear beside Browser.
+    // Browser rows stored by older clients are dropped: the live tab list is
+    // what puts browser tabs in the strip now.
     const persistedResources = sanitizeChatResources(
       chatHistory.resources.filter((r) => r.id !== 'streaming-file')
     )
@@ -2575,13 +2570,13 @@ export function useChat(
     }
 
     // Live-panel counterpart of the workflow-run recovery above: returning to
-    // a chat whose turn is mid browser-action or mid-command re-focuses that
-    // tab and re-expands a collapsed panel. Runs after the resource hydration
-    // so it wins over the "last resource" active fallback.
+    // a chat whose turn is mid-command re-focuses the terminal and re-expands
+    // a collapsed panel. Runs after the resource hydration so it wins over the
+    // "last resource" active fallback. A mid-action browser tab announces
+    // itself through the desktop's automation state instead, and a browser
+    // action in flight after the command keeps the terminal from taking over.
     if (shouldReconnectActiveStream) {
-      const panel = panelForExecutingClientTool(mappedMessages)
-      if (panel === 'browser') openBrowserResource()
-      else if (panel === 'terminal') openTerminalResource()
+      if (panelForExecutingClientTool(mappedMessages) === 'terminal') openTerminalResource()
     }
 
     const snapshotPreviewSessions = Array.isArray(chatHistory.streamSnapshot?.previewSessions)
@@ -2649,7 +2644,6 @@ export function useChat(
     cancelActiveStreamReader,
     cancelActiveStreamRecovery,
     flushPendingResources,
-    openBrowserResource,
     openTerminalResource,
     reconcileHydratedWorkflowResources,
     recoverPendingClientWorkflowTools,
@@ -2679,7 +2673,6 @@ export function useChat(
       )
       const activityScopeId = () => activityTracker.currentScopeId
       const startBrowserAgentRunForStream = (runId: string) => {
-        openBrowserResource()
         const scopeId = activityScopeId()
         setTrackedBrowserRun(activityTracker, scopeId, runId, true)
       }
@@ -2853,7 +2846,6 @@ export function useChat(
       startClientTerminalTool,
       getResourceActivityTracker,
       clearResourceActivity,
-      openBrowserResource,
       adoptResolvedChatId,
       upsertChatHistory,
       onPreviewPhase,
diff --git a/apps/sim/lib/browser-agent/attachments.test.ts b/apps/sim/lib/browser-agent/attachments.test.ts
index 4d23aaa27a7..267593cd47f 100644
--- a/apps/sim/lib/browser-agent/attachments.test.ts
+++ b/apps/sim/lib/browser-agent/attachments.test.ts
@@ -3,11 +3,8 @@ import { buildResourceAttachments } from '@/lib/browser-agent/attachments'
 import type { MothershipResource } from '@/lib/copilot/resources/types'
 import { useBrowserSessionStore } from '@/stores/browser-session/store'
 
-const BROWSER_RESOURCE: MothershipResource = {
-  type: 'browser',
-  id: 'browser-session',
-  title: 'Browser',
-}
+const DOCS_TAB: MothershipResource = { type: 'browser', id: '1', title: 'Docs' }
+const DASHBOARD_TAB: MothershipResource = { type: 'browser', id: '2', title: 'Dashboard' }
 
 describe('buildResourceAttachments', () => {
   beforeEach(() => {
@@ -29,7 +26,7 @@ describe('buildResourceAttachments', () => {
     })
   })
 
-  it('adds every live browser tab and marks only the selected tab active', () => {
+  it('enriches every browser tab resource and marks only the selected tab active', () => {
     const store = useBrowserSessionStore.getState()
     store.setTabsState({
       scopeId: 'chat-test',
@@ -41,7 +38,6 @@ describe('buildResourceAttachments', () => {
           url: 'https://docs.sim.ai',
           loading: false,
           active: false,
-          pinned: false,
         },
         {
           tabId: '2',
@@ -49,22 +45,23 @@ describe('buildResourceAttachments', () => {
           url: 'https://sim.ai/workspace',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
 
-    expect(buildResourceAttachments([BROWSER_RESOURCE], BROWSER_RESOURCE.id, 'chat-test')).toEqual([
+    expect(
+      buildResourceAttachments([DOCS_TAB, DASHBOARD_TAB], DASHBOARD_TAB.id, 'chat-test')
+    ).toEqual([
       {
         type: 'browser',
-        id: 'browser-session:1',
+        id: '1',
         title: 'Docs',
         active: false,
         url: 'https://docs.sim.ai',
       },
       {
         type: 'browser',
-        id: 'browser-session:2',
+        id: '2',
         title: 'Dashboard',
         active: true,
         url: 'https://sim.ai/workspace',
@@ -72,7 +69,7 @@ describe('buildResourceAttachments', () => {
     ])
   })
 
-  it('keeps all browser tabs open rather than active when another resource is selected', () => {
+  it('keeps a browser tab open rather than active when another resource is selected', () => {
     const store = useBrowserSessionStore.getState()
     store.setTabsState({
       scopeId: 'chat-test',
@@ -84,14 +81,13 @@ describe('buildResourceAttachments', () => {
           url: 'https://docs.sim.ai',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
 
-    const attachments = buildResourceAttachments([BROWSER_RESOURCE], 'workflow-1', 'chat-test')
+    const attachments = buildResourceAttachments([DOCS_TAB], 'workflow-1', 'chat-test')
 
-    expect(attachments?.[0]).toMatchObject({ id: 'browser-session:1', active: false })
+    expect(attachments?.[0]).toMatchObject({ id: '1', active: false })
   })
 
   it('reads attachments only from the requested chat scope', () => {
@@ -106,7 +102,6 @@ describe('buildResourceAttachments', () => {
           url: 'https://a.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -120,16 +115,18 @@ describe('buildResourceAttachments', () => {
           url: 'https://b.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
 
-    expect(
-      buildResourceAttachments([BROWSER_RESOURCE], BROWSER_RESOURCE.id, 'chat-a')?.[0]
-    ).toMatchObject({ title: 'A', url: 'https://a.example' })
-    expect(
-      buildResourceAttachments([BROWSER_RESOURCE], BROWSER_RESOURCE.id, 'chat-b')?.[0]
-    ).toMatchObject({ title: 'B', url: 'https://b.example' })
+    const sameIdTab: MothershipResource = { type: 'browser', id: 'same-id', title: 'Tab' }
+    expect(buildResourceAttachments([sameIdTab], sameIdTab.id, 'chat-a')?.[0]).toMatchObject({
+      title: 'A',
+      url: 'https://a.example',
+    })
+    expect(buildResourceAttachments([sameIdTab], sameIdTab.id, 'chat-b')?.[0]).toMatchObject({
+      title: 'B',
+      url: 'https://b.example',
+    })
   })
 })
diff --git a/apps/sim/lib/browser-agent/attachments.ts b/apps/sim/lib/browser-agent/attachments.ts
index d6c540657a8..ca11bc45ab5 100644
--- a/apps/sim/lib/browser-agent/attachments.ts
+++ b/apps/sim/lib/browser-agent/attachments.ts
@@ -2,12 +2,13 @@
  * Maps the chat's open resources to request attachments.
  *
  * This is deliberately the ONLY place shared chat code reads the
- * browser-session store: the live browser panel's page state is client-held
- * (the desktop app's embedded browser), so its attachment is enriched here
- * with the current URL and title for the server to inject as
- * `@active_tab`/`@open_tab` context. A browser panel with no page loaded has
+ * browser-session store: a browser tab's page state is client-held (the
+ * desktop app's embedded browser), so its attachment is enriched here with
+ * the current URL and title for the server to inject as
+ * `@active_tab`/`@open_tab` context. A browser tab with no page loaded has
  * nothing to say and is dropped.
  */
+import { browserTabTitle } from '@/lib/browser-agent/tab-label'
 import type { MothershipResource } from '@/lib/copilot/resources/types'
 import { getBrowserSession } from '@/stores/browser-session/store'
 
@@ -26,6 +27,7 @@ export function buildResourceAttachments(
   scopeId: string
 ): ResourceAttachment[] | undefined {
   const { tabs } = getBrowserSession(scopeId)
+  const tabsById = new Map(tabs.map((tab) => [tab.tabId, tab]))
   const attachments = resources.flatMap<ResourceAttachment>((resource) => {
     // The terminal panel is not addressable context: unlike a browser tab it
     // carries no URL to reference, and the shell's state reaches the model
@@ -43,15 +45,17 @@ export function buildResourceAttachments(
       ]
     }
 
-    return tabs
-      .filter((tab) => Boolean(tab.url))
-      .map((tab) => ({
+    const tab = tabsById.get(resource.id)
+    if (!tab?.url) return []
+    return [
+      {
         type: resource.type,
-        id: `${resource.id}:${tab.tabId}`,
-        title: tab.title.trim() || resource.title,
-        active: resource.id === activeResourceId && tab.active,
+        id: resource.id,
+        title: browserTabTitle(tab),
+        active: resource.id === activeResourceId,
         url: tab.url,
-      }))
+      },
+    ]
   })
 
   if (attachments.length === 0) {
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.test.ts b/apps/sim/lib/browser-agent/tab-label.test.ts
similarity index 85%
rename from apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.test.ts
rename to apps/sim/lib/browser-agent/tab-label.test.ts
index 4afac4a57e9..7e5f83845fd 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-strip.test.ts
+++ b/apps/sim/lib/browser-agent/tab-label.test.ts
@@ -3,11 +3,8 @@ import {
   browserTabHostname,
   browserTabTitle,
   shouldShowBrowserTabSpinner,
-} from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label'
+} from '@/lib/browser-agent/tab-label'
 
-// Drop-index and title-truncation behaviour moved to the shared TabStrip in
-// @sim/emcn along with the component; see its own tests. Only the browser's
-// favicon lookup stays here.
 describe('browserTabHostname', () => {
   it('extracts hostnames from browser URLs', () => {
     expect(browserTabHostname('https://docs.sim.ai/guides')).toBe('docs.sim.ai')
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label.ts b/apps/sim/lib/browser-agent/tab-label.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label.ts
rename to apps/sim/lib/browser-agent/tab-label.ts
diff --git a/apps/sim/lib/browser-agent/transport.test.ts b/apps/sim/lib/browser-agent/transport.test.ts
index b384cea87a9..9cd09177094 100644
--- a/apps/sim/lib/browser-agent/transport.test.ts
+++ b/apps/sim/lib/browser-agent/transport.test.ts
@@ -28,8 +28,6 @@ const {
   openUrl,
   openUrlAvailable,
   panelAction,
-  reorderTab,
-  reorderStoreTab,
   registerSitePermissionPromptSupport,
   restoreScope,
   nativeSuspendScope,
@@ -38,9 +36,7 @@ const {
   setPanelFocused,
   setPanelOccluded,
   setSessionAlive,
-  setTabPinned,
   showCredentialChooser,
-  showTabContextMenu,
   showToolbarMenu,
   setTheme,
   setTabsState,
@@ -72,19 +68,15 @@ const {
   openUrl: vi.fn(),
   openUrlAvailable: { current: true },
   panelAction: vi.fn(),
-  reorderTab: vi.fn(),
-  reorderStoreTab: vi.fn(),
   registerSitePermissionPromptSupport: vi.fn(),
-  restoreScope: vi.fn(),
+  restoreScope: vi.fn(async (scopeId: string) => ({ scopeId, tabs: [], activeTabId: null })),
   nativeSuspendScope: vi.fn(async () => true),
   setPageState: vi.fn(),
   setPanelBounds: vi.fn(),
   setPanelFocused: vi.fn(),
   setPanelOccluded: vi.fn(),
   setSessionAlive: vi.fn(),
-  setTabPinned: vi.fn(),
   showCredentialChooser: vi.fn(async () => true),
-  showTabContextMenu: vi.fn(),
   showToolbarMenu: vi.fn(),
   setTheme: vi.fn(),
   setTabsState: vi.fn(),
@@ -116,14 +108,11 @@ vi.mock('@/lib/desktop', () => ({
       openUrl: openUrlAvailable.current ? openUrl : undefined,
       panelAction,
       registerSitePermissionPromptSupport,
-      reorderTab,
       restoreScope,
       suspendScope: nativeSuspendScope,
       setPanelBounds,
       setPanelFocused,
       setPanelOccluded,
-      setTabPinned,
-      showTabContextMenu,
       showToolbarMenu,
       setTheme,
     },
@@ -143,7 +132,6 @@ vi.mock('@/stores/browser-session/store', () => ({
       activateScope,
       discardScope,
       migrateScope: migrateStoreScope,
-      reorderTab: reorderStoreTab,
       suspendScope: markScopeSuspended,
       setPageState,
       setSessionAlive,
@@ -172,15 +160,12 @@ import {
   onBrowserToolbarCommand,
   openBrowserTab,
   openUrlInNewBrowserTab,
-  reorderBrowserTab,
   reportBrowserPanelBounds,
   reportBrowserPanelFocused,
   reportBrowserTheme,
   restoreBrowserScope,
   setBrowserPanelOccluded,
-  setBrowserTabPinned,
   showBrowserCredentialChooser,
-  showBrowserTabContextMenu,
   showBrowserToolbarMenu,
   supportsAtomicBrowserPanelOcclusion,
   suspendBrowserScope,
@@ -196,9 +181,7 @@ describe('browser panel transport', () => {
     setPageState.mockClear()
     setSessionAlive.mockClear()
     setTabsState.mockClear()
-    reorderTab.mockClear()
-    reorderStoreTab.mockClear()
-    restoreScope.mockReset()
+    restoreScope.mockClear()
     nativeSuspendScope.mockReset()
     nativeSuspendScope.mockResolvedValue(true)
     markScopeSuspended.mockClear()
@@ -213,8 +196,6 @@ describe('browser panel transport', () => {
     openTab.mockReset()
     openUrl.mockReset()
     openUrlAvailable.current = true
-    setTabPinned.mockClear()
-    showTabContextMenu.mockClear()
     showToolbarMenu.mockClear()
     onToolbarCommand.mockClear()
     onAddToChat.mockClear()
@@ -241,7 +222,6 @@ describe('browser panel transport', () => {
           url: 'https://example.com',
           loading: false,
           active: false,
-          pinned: false,
         },
         {
           tabId: '2',
@@ -249,7 +229,6 @@ describe('browser panel transport', () => {
           url: '',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     }
@@ -358,22 +337,6 @@ describe('browser panel transport', () => {
     expect(supportsAtomicBrowserPanelOcclusion()).toBe(true)
   })
 
-  it('forwards tab pinning to the native browser', () => {
-    setBrowserTabPinned('tab-2', true)
-    setBrowserTabPinned('tab-2', false)
-
-    expect(setTabPinned.mock.calls).toEqual([
-      ['tab-2', true, 'chat-test'],
-      ['tab-2', false, 'chat-test'],
-    ])
-  })
-
-  it('opens the native tab menu in the matching browser scope', () => {
-    showBrowserTabContextMenu('tab-2', 'chat-a')
-
-    expect(showTabContextMenu).toHaveBeenCalledWith('tab-2', 'chat-a')
-  })
-
   it('opens and scopes the native browser toolbar menu', () => {
     showBrowserToolbarMenu({ x: 10, y: 20 }, 'chat-a')
     expect(showToolbarMenu).toHaveBeenCalledWith({ x: 10, y: 20 }, 'chat-a')
@@ -451,13 +414,6 @@ describe('browser panel transport', () => {
     expect(showCredentialChooser).toHaveBeenCalledWith({ x: 10, y: 20 }, 'chat-a')
   })
 
-  it('forwards tab reordering to the native browser', () => {
-    reorderBrowserTab('tab-3', 1)
-
-    expect(reorderStoreTab).toHaveBeenCalledWith('chat-test', 'tab-3', 1)
-    expect(reorderTab).toHaveBeenCalledWith('tab-3', 1, 'chat-test')
-  })
-
   it('forgets an abandoned provisional browser scope on both sides', async () => {
     await discardBrowserScope('pending:new')
 
@@ -700,7 +656,6 @@ describe('browser panel transport', () => {
           title: 'Restored',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
       activeTabId: '1',
diff --git a/apps/sim/lib/browser-agent/transport.ts b/apps/sim/lib/browser-agent/transport.ts
index b599012d19a..d6e0da1a7ed 100644
--- a/apps/sim/lib/browser-agent/transport.ts
+++ b/apps/sim/lib/browser-agent/transport.ts
@@ -100,7 +100,12 @@ export function initBrowserAgentTransport(): void {
   agent.registerSitePermissionPromptSupport?.()
 }
 
-/** Makes one chat's browser set active in both renderer and desktop. */
+/**
+ * Makes one chat's browser set active in both renderer and desktop, then
+ * materializes its persisted pages. Each live page is a resource tab, so the
+ * tab list has to exist before any browser panel is mounted rather than being
+ * hydrated by the panel reporting its bounds.
+ */
 export async function activateBrowserScope(scopeId: string): Promise<void> {
   activeScopeId = scopeId
   useBrowserSessionStore.getState().activateScope(scopeId)
@@ -108,11 +113,12 @@ export async function activateBrowserScope(scopeId: string): Promise<void> {
   if (!agent) return
   const tabs = await agent.activateScope(scopeId)
   useBrowserSessionStore.getState().setTabsState(tabs)
+  if (tabs.tabs.length === 0 && activeScopeId === scopeId) await restoreBrowserScope(scopeId)
 }
 
 /**
- * Materializes persisted tabs for a lazily activated scope without waiting for
- * its React panel to mount and report native-view bounds.
+ * Materializes persisted tabs for a lazily activated scope. Safe to repeat: a
+ * scope that already hydrated answers with its live list.
  */
 export async function restoreBrowserScope(scopeId: string): Promise<boolean> {
   const agent = bridge()
@@ -353,11 +359,15 @@ export async function openBrowserTab(
   return state
 }
 
-/** Opens a distinct browser tab and navigates it after the shell accepts it. */
+/**
+ * Opens a distinct browser tab and navigates it after the shell accepts it.
+ * Resolves with the new tab's id, or null on older shells that only confirm
+ * through a later tab-state push.
+ */
 export async function openUrlInNewBrowserTab(
   url: string,
   scopeId = currentBrowserScopeId()
-): Promise<void> {
+): Promise<string | null> {
   const agent = bridge()
   if (!agent) throw new Error('The Sim desktop browser agent is unavailable.')
   if (agent.openUrl) {
@@ -366,36 +376,11 @@ export async function openUrlInNewBrowserTab(
       throw new Error('The desktop browser did not confirm the new tab.')
     }
     useBrowserSessionStore.getState().setTabsState(state)
-    return
+    return state.activeTabId
   }
-  await openBrowserTab(scopeId)
+  const state = await openBrowserTab(scopeId)
   sendBrowserPanelAction('navigate', { url }, scopeId)
-}
-
-/** Pins or unpins a live browser tab. */
-export function setBrowserTabPinned(
-  tabId: string,
-  pinned: boolean,
-  scopeId = currentBrowserScopeId()
-): void {
-  bridge()?.setTabPinned(tabId, pinned, scopeId)
-}
-
-/** Opens the desktop shell's native menu for one browser tab. */
-export function showBrowserTabContextMenu(tabId: string, scopeId = currentBrowserScopeId()): void {
-  bridge()?.showTabContextMenu(tabId, scopeId)
-}
-
-/** Moves a live browser tab to its final list index. */
-export function reorderBrowserTab(
-  tabId: string,
-  targetIndex: number,
-  scopeId = currentBrowserScopeId()
-): void {
-  const agent = bridge()
-  if (!agent) return
-  useBrowserSessionStore.getState().reorderTab(scopeId, tabId, targetIndex)
-  agent.reorderTab(tabId, targetIndex, scopeId)
+  return state?.activeTabId ?? null
 }
 
 /** Mirrors Sim's raw light/dark/system preference into embedded pages. */
diff --git a/apps/sim/lib/copilot/chat/post.test.ts b/apps/sim/lib/copilot/chat/post.test.ts
index 8ea9c27ca2c..6a0d6914736 100644
--- a/apps/sim/lib/copilot/chat/post.test.ts
+++ b/apps/sim/lib/copilot/chat/post.test.ts
@@ -601,7 +601,7 @@ describe('handleUnifiedChatPost', () => {
     )
   })
 
-  it('persists browser page attachments as one canonical Browser panel', async () => {
+  it('never persists browser tab attachments, which the desktop app restores itself', async () => {
     const response = await handleUnifiedChatPost(
       new NextRequest('http://localhost/api/copilot/chat', {
         method: 'POST',
@@ -612,14 +612,14 @@ describe('handleUnifiedChatPost', () => {
           resourceAttachments: [
             {
               type: 'browser',
-              id: 'browser-session:slack-tab',
+              id: '3',
               title: 'mship-todo (Channel) - sim - Slack',
               active: true,
               url: 'https://app.slack.com/client/workspace/channel',
             },
             {
               type: 'browser',
-              id: 'browser-session:docs-tab',
+              id: '4',
               title: 'Docs',
               url: 'https://docs.example.com',
             },
@@ -629,9 +629,7 @@ describe('handleUnifiedChatPost', () => {
     )
 
     expect(response.status).toBe(200)
-    expect(persistChatResources).toHaveBeenCalledWith('chat-1', [
-      { type: 'browser', id: 'browser-session', title: 'Browser' },
-    ])
+    expect(persistChatResources).not.toHaveBeenCalled()
   })
 
   it('forwards the desktop local filesystem capability into payload construction', async () => {
diff --git a/apps/sim/lib/copilot/chat/post.ts b/apps/sim/lib/copilot/chat/post.ts
index 4ad175e095e..ba2f04f7afe 100644
--- a/apps/sim/lib/copilot/chat/post.ts
+++ b/apps/sim/lib/copilot/chat/post.ts
@@ -155,8 +155,8 @@ const GENERIC_RESOURCE_TITLE: Record<z.infer<typeof ResourceAttachmentSchema>['t
 
 /**
  * Synthetic client-side panels are context-only: never persisted to the chat.
- * Browser tab attachments are normalized to the singleton Browser panel before
- * persistence; their page title and URL remain request context only.
+ * Browser tabs are among them — the desktop app restores its own pages — so
+ * their page title and URL remain request context only.
  */
 function isPersistableAttachment(resource: z.infer<typeof ResourceAttachmentSchema>): boolean {
   return !isEphemeralResource({
@@ -1336,9 +1336,8 @@ export async function handleUnifiedChatPost(req: NextRequest) {
         actualChatId &&
         body.resourceAttachments?.length
       ) {
-        // Canonicalizes here, not just inside `persistChatResources`: several
-        // browser tabs collapse onto the one Browser panel before they are
-        // stored, so the chat reopens with a single tab rather than one per page.
+        // Canonicalizes here, not just inside `persistChatResources`, so the
+        // singleton terminal panel is stored once however it was attached.
         const persistable = sanitizeChatResources(
           body.resourceAttachments.filter(isPersistableAttachment).map((resource) => ({
             type: resource.type,
diff --git a/apps/sim/lib/copilot/chat/process-contents.test.ts b/apps/sim/lib/copilot/chat/process-contents.test.ts
index 3d35d408e0d..7bb3629eff7 100644
--- a/apps/sim/lib/copilot/chat/process-contents.test.ts
+++ b/apps/sim/lib/copilot/chat/process-contents.test.ts
@@ -529,10 +529,10 @@ describe('processContextsServer - MCP contexts', () => {
 })
 
 describe('processContextsServer - browser and terminal selections', () => {
-  it('describes whole Browser and Terminal mentions without inventing tab ids', async () => {
+  it('points every browser mention at its exact tab and describes the whole Terminal', async () => {
     const result = await processContextsServer(
       [
-        { kind: 'browser_tab', tabId: 'browser-session', label: 'Browser' },
+        { kind: 'browser_tab', tabId: '3', label: 'Sim Docs' },
         { kind: 'terminal_tab', terminalId: 'terminal-session', label: 'Terminal' },
       ],
       'user-1'
@@ -541,8 +541,8 @@ describe('processContextsServer - browser and terminal selections', () => {
     expect(result).toMatchObject([
       {
         type: 'browser_tab',
-        tag: '@Browser',
-        content: expect.stringContaining('resource as a whole'),
+        tag: '@Sim Docs',
+        content: expect.stringContaining('tabId 3'),
       },
       {
         type: 'terminal_tab',
@@ -550,7 +550,7 @@ describe('processContextsServer - browser and terminal selections', () => {
         content: expect.stringContaining('resource as a whole'),
       },
     ])
-    expect(result[0].content).toContain('browser_list_tabs')
+    expect(result[0].content).toContain('browser_switch_tab')
     expect(result[1].content).toContain('terminal list operation')
   })
 
diff --git a/apps/sim/lib/copilot/chat/process-contents.ts b/apps/sim/lib/copilot/chat/process-contents.ts
index 4240df5ac17..64ee4492775 100644
--- a/apps/sim/lib/copilot/chat/process-contents.ts
+++ b/apps/sim/lib/copilot/chat/process-contents.ts
@@ -19,10 +19,7 @@ import {
   truncateSelectionText,
 } from '@/lib/copilot/chat/selection-context'
 import { QueryLogs } from '@/lib/copilot/generated/tool-catalog-v1'
-import {
-  BROWSER_SESSION_RESOURCE_ID,
-  TERMINAL_SESSION_RESOURCE_ID,
-} from '@/lib/copilot/resources/types'
+import { TERMINAL_SESSION_RESOURCE_ID } from '@/lib/copilot/resources/types'
 import {
   canonicalBlockVfsPath,
   canonicalKnowledgeBaseVfsDir,
@@ -226,14 +223,6 @@ export async function processContextsServer(
       // additionally carries the quoted snapshot they chose, while the pointer
       // lets the agent inspect or act on the current page/shell when needed.
       if (ctx.kind === 'browser_tab' && ctx.tabId) {
-        if (ctx.tabId === BROWSER_SESSION_RESOURCE_ID) {
-          return {
-            type: 'browser_tab',
-            tag: ctx.label ? `@${ctx.label}` : '@Browser',
-            content:
-              'The user tagged the Browser resource as a whole, not a specific tab. Inspect the live tabs with browser_list_tabs and choose the relevant one from their request. If no browser tab is open yet, open or navigate one as needed.',
-          }
-        }
         const pointer = `The user pointed at an open browser tab: "${ctx.label}" (tabId ${ctx.tabId}). Act on THIS tab — switch to it with browser_switch_tab and read it with browser_snapshot rather than assuming which tab they meant.`
         return {
           type: 'browser_tab',
diff --git a/apps/sim/lib/copilot/resources/types.test.ts b/apps/sim/lib/copilot/resources/types.test.ts
index 7510ad5d36a..737f4628659 100644
--- a/apps/sim/lib/copilot/resources/types.test.ts
+++ b/apps/sim/lib/copilot/resources/types.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { addCopilotChatResourceBodySchema } from '@/lib/api/contracts/copilot'
 import {
-  BROWSER_SESSION_RESOURCE_ID,
   canonicalizeDesktopSessionResource,
   isAddressableResource,
   isDesktopOnlyResource,
@@ -21,12 +20,7 @@ function resource(overrides: Partial<MothershipResource> = {}): MothershipResour
 }
 
 describe('isEphemeralResource', () => {
-  it('persists the desktop panels so their tabs survive reopening the chat', () => {
-    expect(
-      isEphemeralResource(
-        resource({ type: 'browser', id: BROWSER_SESSION_RESOURCE_ID, title: 'Browser' })
-      )
-    ).toBe(false)
+  it('persists the terminal panel so its tab survives reopening the chat', () => {
     expect(
       isEphemeralResource(
         resource({ type: 'terminal', id: TERMINAL_SESSION_RESOURCE_ID, title: 'Terminal' })
@@ -34,6 +28,10 @@ describe('isEphemeralResource', () => {
     ).toBe(false)
   })
 
+  it('keeps browser tabs client-only because the desktop app restores its own pages', () => {
+    expect(isEphemeralResource(resource({ type: 'browser', id: '3', title: 'Slack' }))).toBe(true)
+  })
+
   it('keeps synthetic panels client-only', () => {
     expect(isEphemeralResource(resource({ type: 'generic', id: 'results' }))).toBe(true)
     expect(isEphemeralResource(resource({ type: 'file', id: 'streaming-file' }))).toBe(true)
@@ -57,7 +55,7 @@ describe('isDesktopOnlyResource', () => {
 })
 
 describe('desktop session resource identity', () => {
-  it('keeps browser pages as inner tabs of one canonical Browser resource', () => {
+  it('drops stored browser rows, which older clients persisted per page or as one panel', () => {
     expect(
       sanitizeChatResources([
         resource({
@@ -65,9 +63,10 @@ describe('desktop session resource identity', () => {
           id: 'browser-session:slack-tab',
           title: 'mship-todo (Channel) - sim - Slack',
         }),
-        resource({ type: 'browser', id: BROWSER_SESSION_RESOURCE_ID, title: 'Browser' }),
+        resource({ type: 'browser', id: 'browser-session', title: 'Browser' }),
+        resource({ type: 'file', id: 'file-1', title: 'report.csv' }),
       ])
-    ).toEqual([{ type: 'browser', id: BROWSER_SESSION_RESOURCE_ID, title: 'Browser' }])
+    ).toEqual([{ type: 'file', id: 'file-1', title: 'report.csv' }])
   })
 
   it('canonicalizes terminal inner-tab metadata without changing regular resources', () => {
@@ -161,15 +160,11 @@ describe('unaddressable resources', () => {
     ])
   })
 
-  it('keeps the desktop panels, which are given their ids by canonicalization', () => {
+  it('keeps the terminal panel, which is given its id by canonicalization', () => {
     const sanitized = sanitizeChatResources([
-      resource({ type: 'browser', id: '', title: 'Browser' }),
       resource({ type: 'terminal', id: '', title: 'Terminal' }),
     ])
-    expect(sanitized.map((r) => r.id)).toEqual([
-      BROWSER_SESSION_RESOURCE_ID,
-      TERMINAL_SESSION_RESOURCE_ID,
-    ])
+    expect(sanitized.map((r) => r.id)).toEqual([TERMINAL_SESSION_RESOURCE_ID])
   })
 
   it('refuses a blank id at the write boundary, matching the send path', () => {
diff --git a/apps/sim/lib/copilot/resources/types.ts b/apps/sim/lib/copilot/resources/types.ts
index b437f686901..6f40c59dc6d 100644
--- a/apps/sim/lib/copilot/resources/types.ts
+++ b/apps/sim/lib/copilot/resources/types.ts
@@ -86,7 +86,10 @@ const RESOURCE_POLICY: Record<MothershipResourceType, ResourcePolicy> = {
   integration: { persisted: true },
   // A synthetic panel with no addressable entity behind it to reopen.
   generic: { persisted: false },
-  browser: { persisted: true, desktopOnly: true },
+  // One tab per live desktop browser page, keyed by the native tab id. The
+  // desktop app owns the page list and restores it itself, so the chat row
+  // never stores these; they are re-derived from the live tab list on open.
+  browser: { persisted: false, desktopOnly: true },
   terminal: { persisted: true, desktopOnly: true },
 }
 
@@ -117,32 +120,20 @@ export function isEphemeralResource(resource: MothershipResource): boolean {
 }
 
 /**
- * Singleton id for the live browser-session panel, which hosts the desktop
- * app's natively embedded browser view. Only this metadata is stored with the
- * chat: reopening restores the tab, while the page and browser profile stay
- * owned by the desktop app.
- */
-export const BROWSER_SESSION_RESOURCE_ID = 'browser-session'
-
-/**
- * Singleton id for the live terminal panel. As with the browser, only the
- * metadata is stored — reopening the chat brings the panel back with a fresh
- * shell, since the pty and its scrollback belong to the desktop app and do not
- * outlive it.
+ * Singleton id for the live terminal panel. Only the metadata is stored —
+ * reopening the chat brings the panel back with a fresh shell, since the pty
+ * and its scrollback belong to the desktop app and do not outlive it.
  */
 export const TERMINAL_SESSION_RESOURCE_ID = 'terminal-session'
 
 /**
- * Collapses page/shell-shaped metadata onto the one top-level desktop panel
- * each chat can restore. Browser pages and terminal tabs are inner tabs, not
- * independently addressable Mothership resources.
+ * Collapses shell-shaped metadata onto the one top-level terminal panel each
+ * chat can restore. Terminal tabs are inner tabs, not independently
+ * addressable Mothership resources.
  */
 export function canonicalizeDesktopSessionResource(
   resource: MothershipResource
 ): MothershipResource {
-  if (resource.type === 'browser') {
-    return { type: 'browser', id: BROWSER_SESSION_RESOURCE_ID, title: 'Browser' }
-  }
   if (resource.type === 'terminal') {
     return { type: 'terminal', id: TERMINAL_SESSION_RESOURCE_ID, title: 'Terminal' }
   }
@@ -174,20 +165,23 @@ export function isAddressableResource(resource: MothershipResource): boolean {
 }
 
 /**
- * Canonicalizes and deduplicates the singleton desktop panels in display order.
+ * Canonicalizes and deduplicates the singleton terminal panel in display
+ * order, and drops browser rows: older clients stored one per page, but the
+ * live tab list is derived from the desktop app rather than the chat row.
  * Module-private: callers want {@link sanitizeChatResources}, which also drops
  * unaddressable resources.
  */
 function canonicalizeDesktopSessionResources(
   resources: readonly MothershipResource[]
 ): MothershipResource[] {
-  const seenDesktopTypes = new Set<'browser' | 'terminal'>()
+  let seenTerminal = false
   const canonical: MothershipResource[] = []
 
   for (const resource of resources) {
-    if (resource.type === 'browser' || resource.type === 'terminal') {
-      if (seenDesktopTypes.has(resource.type)) continue
-      seenDesktopTypes.add(resource.type)
+    if (resource.type === 'browser') continue
+    if (resource.type === 'terminal') {
+      if (seenTerminal) continue
+      seenTerminal = true
     }
     canonical.push(canonicalizeDesktopSessionResource(resource))
   }
@@ -196,11 +190,12 @@ function canonicalizeDesktopSessionResources(
 }
 
 /**
- * The canonical form of a chat's resource list: singleton desktop panels
- * collapsed, unaddressable resources dropped. Every path that reads or writes
- * stored resources goes through this, which is what heals chats that already
- * hold one. Canonicalization runs first, so the browser and terminal panels —
- * which are given their ids there — are never dropped for arriving without one.
+ * The canonical form of a chat's resource list: the terminal panel collapsed,
+ * legacy browser rows and unaddressable resources dropped. Every path that
+ * reads or writes stored resources goes through this, which is what heals
+ * chats that already hold one. Canonicalization runs first, so the terminal
+ * panel — which is given its id there — is never dropped for arriving without
+ * one.
  */
 export function sanitizeChatResources(
   resources: readonly MothershipResource[]
diff --git a/apps/sim/stores/browser-session/store.test.ts b/apps/sim/stores/browser-session/store.test.ts
index 50efa8e2efa..467dc9ed14a 100644
--- a/apps/sim/stores/browser-session/store.test.ts
+++ b/apps/sim/stores/browser-session/store.test.ts
@@ -33,7 +33,6 @@ describe('browser session store', () => {
           url: 'https://docs.sim.ai',
           loading: false,
           active: false,
-          pinned: false,
         },
         {
           tabId: '2',
@@ -41,7 +40,6 @@ describe('browser session store', () => {
           url: 'https://sim.ai/workspace',
           loading: true,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -193,38 +191,6 @@ describe('browser session store', () => {
     expect(getBrowserSession('chat-test').pageState?.sitePermissionRequest).toBeUndefined()
   })
 
-  it('reorders tabs optimistically without changing the active page', () => {
-    const store = useBrowserSessionStore.getState()
-    store.setTabsState({
-      scopeId: 'chat-test',
-      activeTabId: '2',
-      tabs: [
-        {
-          tabId: '1',
-          title: 'One',
-          url: 'https://one.example',
-          loading: false,
-          active: false,
-          pinned: false,
-        },
-        {
-          tabId: '2',
-          title: 'Two',
-          url: 'https://two.example',
-          loading: false,
-          active: true,
-          pinned: false,
-        },
-      ],
-    })
-
-    store.reorderTab('chat-test', '2', 0)
-
-    expect(getBrowserSession('chat-test').tabs.map((tab) => tab.tabId)).toEqual(['2', '1'])
-    expect(getBrowserSession('chat-test').activeTabId).toBe('2')
-    expect(getBrowserSession('chat-test').pageState?.tabId).toBe('2')
-  })
-
   it('retains a settled tab title when opening a new tab pushes a temporary blank title', () => {
     const store = useBrowserSessionStore.getState()
     store.setTabsState({
@@ -237,7 +203,6 @@ describe('browser session store', () => {
           url: 'https://example.com/docs',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -264,7 +229,6 @@ describe('browser session store', () => {
           url: 'https://example.com/docs',
           loading: false,
           active: false,
-          pinned: false,
         },
         {
           tabId: '2',
@@ -272,7 +236,6 @@ describe('browser session store', () => {
           url: '',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -296,7 +259,6 @@ describe('browser session store', () => {
           url: 'https://a.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -312,7 +274,6 @@ describe('browser session store', () => {
           url: 'https://b.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -371,7 +332,6 @@ describe('browser session store', () => {
           url: 'https://example.com',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -420,7 +380,6 @@ describe('browser session store', () => {
           url: 'https://example.com',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -483,7 +442,6 @@ describe('browser session store', () => {
           url: 'https://a.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -499,7 +457,6 @@ describe('browser session store', () => {
           url: 'https://stale.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
@@ -529,7 +486,6 @@ describe('browser session store', () => {
           url: 'https://fresh.example',
           loading: false,
           active: true,
-          pinned: false,
         },
       ],
     })
diff --git a/apps/sim/stores/browser-session/store.ts b/apps/sim/stores/browser-session/store.ts
index dd69f9f8eae..d536e18424b 100644
--- a/apps/sim/stores/browser-session/store.ts
+++ b/apps/sim/stores/browser-session/store.ts
@@ -47,7 +47,6 @@ interface BrowserSessionState {
     runIds: readonly string[],
     options?: { hardResetScopeIds?: readonly string[] }
   ) => void
-  reorderTab: (scopeId: string, tabId: string, targetIndex: number) => void
   setSessionAlive: (alive: boolean, scopeId: string) => void
 }
 
@@ -141,7 +140,6 @@ function tabFieldsEqual(a: BrowserTabState, b: BrowserTabState): boolean {
     a.title === b.title &&
     a.loading === b.loading &&
     a.active === b.active &&
-    a.pinned === b.pinned &&
     pageIssueEqual(a.issue, b.issue)
   )
 }
@@ -429,22 +427,6 @@ export const useBrowserSessionStore = create<BrowserSessionState>()(
           )
           return changed ? { sessions } : {}
         }),
-      reorderTab: (scopeId, tabId, targetIndex) =>
-        set((state) =>
-          withSession(state, scopeId, (current) => {
-            const currentIndex = current.tabs.findIndex((tab) => tab.tabId === tabId)
-            if (currentIndex < 0 || !Number.isFinite(targetIndex)) return current
-            const nextIndex = Math.max(
-              0,
-              Math.min(current.tabs.length - 1, Math.trunc(targetIndex))
-            )
-            if (currentIndex === nextIndex) return current
-            const tabs = [...current.tabs]
-            const [tab] = tabs.splice(currentIndex, 1)
-            tabs.splice(nextIndex, 0, tab)
-            return { ...current, tabs }
-          })
-        ),
       setSessionAlive: (alive, scopeId) =>
         set((state) => {
           return withSession(state, scopeId, (current) => {
diff --git a/packages/browser-protocol/src/index.ts b/packages/browser-protocol/src/index.ts
index 5096378a687..8179a662cad 100644
--- a/packages/browser-protocol/src/index.ts
+++ b/packages/browser-protocol/src/index.ts
@@ -215,10 +215,11 @@ export interface BrowserPanelSnapshot {
 
 /**
  * Browser-chrome commands from the panel header (URL bar, back/forward,
- * reload) plus the legacy `takeover-done` action retained for persisted
- * `browser_request_takeover` cards. Page interactions need no protocol — the
- * user acts on the real embedded page directly, and its right-click menu is
- * native and lives entirely in the shell.
+ * reload), the resource tab strip (`switch-tab`, `close-tab`), plus the legacy
+ * `takeover-done` action retained for persisted `browser_request_takeover`
+ * cards. Page interactions need no protocol — the user acts on the real
+ * embedded page directly, and its right-click menu is native and lives
+ * entirely in the shell.
  */
 export interface BrowserPanelAction {
   action:
@@ -226,8 +227,8 @@ export interface BrowserPanelAction {
     | 'reload'
     | 'back'
     | 'forward'
+    /** Fallback for installed shells that predate the acknowledged `openTab` bridge call. */
     | 'new-tab'
-    | 'duplicate-tab'
     | 'switch-tab'
     | 'close-tab'
     | 'print'
@@ -239,7 +240,7 @@ export interface BrowserPanelAction {
     | 'takeover-done'
   /** Absolute URL for `navigate` (typed into the panel's URL bar). */
   url?: string
-  /** Stable tab id for `duplicate-tab`, `switch-tab`, and `close-tab`. */
+  /** Stable tab id for `switch-tab` and `close-tab`. */
   tabId?: string
   /** Optional free-text instruction submitted with `takeover-done`. */
   takeoverResponse?: string
@@ -351,8 +352,6 @@ export interface BrowserTabState {
   active: boolean
   /** Recoverable problem currently replacing this tab's native page surface. */
   issue?: BrowserPageIssue
-  /** Pinned tabs are ordered before regular tabs and cannot be closed. */
-  pinned: boolean
 }
 
 /** Complete live tab list pushed by the desktop shell. */
diff --git a/packages/desktop-bridge/contract-snapshot.ts b/packages/desktop-bridge/contract-snapshot.ts
index e044e056469..36bb3d1a7cf 100644
--- a/packages/desktop-bridge/contract-snapshot.ts
+++ b/packages/desktop-bridge/contract-snapshot.ts
@@ -40,25 +40,31 @@ export const CURRENT_BROWSER_TOOL_NAMES = [
   'browser_open_url',
   'browser_go_back',
   'browser_go_forward',
+  'browser_reload',
   'browser_open_tab',
   'browser_switch_tab',
   'browser_close_tab',
   'browser_list_tabs',
   'browser_list_sessions',
+  'browser_list_downloads',
   'browser_wait_for',
   'browser_snapshot',
+  'browser_find',
   'browser_read_text',
   'browser_screenshot',
   'browser_extract',
   'browser_click',
   'browser_click_at',
   'browser_type',
+  'browser_fill_form',
   'browser_insert_text',
   'browser_press_key',
   'browser_scroll',
   'browser_select_option',
+  'browser_set_checked',
   'browser_hover',
   'browser_drag',
+  'browser_zoom',
 ] as const
 
 export type CurrentBrowserToolName = (typeof CURRENT_BROWSER_TOOL_NAMES)[number]
@@ -100,6 +106,31 @@ export function normalizeBrowserWaitForTimeoutMs(value: unknown): number {
   return Math.min(parsed, BROWSER_WAIT_FOR_MAX_TIMEOUT_MS)
 }
 
+/** Client execution budget, including authorization, native queueing, and result delivery. */
+export function browserToolRendererTimeoutMs(
+  tool: CurrentBrowserToolName,
+  params: Record<string, unknown> = {}
+): number {
+  switch (tool) {
+    case 'browser_navigate':
+    case 'browser_open_url':
+    case 'browser_go_back':
+    case 'browser_go_forward':
+    case 'browser_reload':
+    case 'browser_open_tab':
+    case 'browser_switch_tab':
+      return BROWSER_NAVIGATION_RENDERER_TIMEOUT_MS
+    case 'browser_wait_for':
+      return (
+        BROWSER_TOOL_QUEUE_WAIT_TIMEOUT_MS +
+        normalizeBrowserWaitForTimeoutMs(params.timeoutMs) +
+        BROWSER_WAIT_FOR_RENDERER_GRACE_MS
+      )
+    default:
+      return BROWSER_TOOL_QUEUE_WAIT_TIMEOUT_MS + 30_000
+  }
+}
+
 export const BROWSER_THEMES = ['system', 'light', 'dark'] as const
 
 /** Sim appearance preference mirrored into browser-tab media queries. */
@@ -199,10 +230,11 @@ export interface BrowserPanelSnapshot {
 
 /**
  * Browser-chrome commands from the panel header (URL bar, back/forward,
- * reload) plus the legacy `takeover-done` action retained for persisted
- * `browser_request_takeover` cards. Page interactions need no protocol — the
- * user acts on the real embedded page directly, and its right-click menu is
- * native and lives entirely in the shell.
+ * reload), the resource tab strip (`switch-tab`, `close-tab`), plus the legacy
+ * `takeover-done` action retained for persisted `browser_request_takeover`
+ * cards. Page interactions need no protocol — the user acts on the real
+ * embedded page directly, and its right-click menu is native and lives
+ * entirely in the shell.
  */
 export interface BrowserPanelAction {
   action:
@@ -210,8 +242,6 @@ export interface BrowserPanelAction {
     | 'reload'
     | 'back'
     | 'forward'
-    | 'new-tab'
-    | 'duplicate-tab'
     | 'switch-tab'
     | 'close-tab'
     | 'print'
@@ -223,7 +253,7 @@ export interface BrowserPanelAction {
     | 'takeover-done'
   /** Absolute URL for `navigate` (typed into the panel's URL bar). */
   url?: string
-  /** Stable tab id for `duplicate-tab`, `switch-tab`, and `close-tab`. */
+  /** Stable tab id for `switch-tab` and `close-tab`. */
   tabId?: string
   /** Optional free-text instruction submitted with `takeover-done`. */
   takeoverResponse?: string
@@ -335,8 +365,6 @@ export interface BrowserTabState {
   active: boolean
   /** Recoverable problem currently replacing this tab's native page surface. */
   issue?: BrowserPageIssue
-  /** Pinned tabs are ordered before regular tabs and cannot be closed. */
-  pinned: boolean
 }
 
 /** Complete live tab list pushed by the desktop shell. */
@@ -1049,12 +1077,6 @@ export interface SimDesktopBrowserAgentApi {
   disposeScope(scopeId: string): Promise<boolean>
   /** Closes a soft-deleted chat's live pages while retaining its restart descriptor. */
   suspendScope(scopeId: string): Promise<boolean>
-  /** Pin or unpin a live browser tab. */
-  setTabPinned(tabId: string, pinned: boolean, scopeId: string): void
-  /** Opens the native tab actions menu without covering the embedded page. */
-  showTabContextMenu(tabId: string, scopeId: string): void
-  /** Move a live tab to a final list index. */
-  reorderTab(tabId: string, targetIndex: number, scopeId: string): void
   /**
    * Report where the browser panel sits in the window (CSS pixels relative
    * to the viewport), or null when the panel is hidden/unmounted. The main
diff --git a/packages/desktop-bridge/src/index.ts b/packages/desktop-bridge/src/index.ts
index cb8dc0926bf..bd577ab91af 100644
--- a/packages/desktop-bridge/src/index.ts
+++ b/packages/desktop-bridge/src/index.ts
@@ -177,12 +177,6 @@ export interface SimDesktopBrowserAgentApi {
   disposeScope(scopeId: string): Promise<boolean>
   /** Closes a soft-deleted chat's live pages while retaining its restart descriptor. */
   suspendScope(scopeId: string): Promise<boolean>
-  /** Pin or unpin a live browser tab. */
-  setTabPinned(tabId: string, pinned: boolean, scopeId: string): void
-  /** Opens the native tab actions menu without covering the embedded page. */
-  showTabContextMenu(tabId: string, scopeId: string): void
-  /** Move a live tab to a final list index. */
-  reorderTab(tabId: string, targetIndex: number, scopeId: string): void
   /**
    * Report where the browser panel sits in the window (CSS pixels relative
    * to the viewport), or null when the panel is hidden/unmounted. The main

From bf40b95f062a4b3e8b19325083e04d1047be89ce Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 10 Sep 2026 15:51:59 -0700
Subject: [PATCH 2/4] fix(desktop): settle browser tab sync edge cases and ease
 the tab width cap

Review and in-app verification of the resource-tab browser model found
five problems, all fixed here with tests:

- The strip's switch and follow effects could trade `switch-tab` calls
  forever after a native switch; the switch effect is now keyed on the
  selection alone and ignores the switch it requested itself.
- Migrating a pending chat onto its durable id briefly removed and re-added
  every browser tab; a missing store bucket is no longer read as closed.
- Chat hydration could replace the resource list underneath a fresh add,
  dropping restored tabs on return; a tab stays projected until its
  resource is seen. Hydration also falls back to the last server-held
  resource instead of whichever tab happened to land first.
- Strip-driven `switch-tab` no longer claims the page for the user
  (`claim: false`), so the agent can still close or adopt it; a user
  closing the agent's tab leaves the agent cursor unset rather than
  announcing the neighbour as agent activity.
- The driver marked every restored scope as material, refusing pending
  chat migration after an empty restore; only a restore that yields pages
  does now, matching the session layer. The bridge snapshot is regenerated
  with the documented `'new-tab'` fallback.

Resource tab titles ellipsize at 200px for one or two tabs, 180px for
three, and 160px from four on, one small step at a time.
---
 .../src/main/browser-agent/driver.test.ts     |  12 +
 apps/desktop/src/main/browser-agent/driver.ts |   9 +-
 .../desktop/src/main/browser-agent/session.ts |  25 +-
 .../hero-resource-panel.tsx                   |   3 +-
 .../browser-session/browser-session.tsx       |   6 +-
 .../resource-registry/browser-tab-icon.tsx    |  35 +--
 .../resource-registry/resource-registry.tsx   |  11 +-
 .../resource-tab-controls.test.ts             |  14 +-
 .../resource-tabs/resource-tab-controls.ts    |  19 +-
 .../resource-tabs/resource-tabs.tsx           |  40 ++--
 .../mothership-view/mothership-view.tsx       |   4 +-
 .../hooks/use-browser-tab-resources.test.tsx  | 222 ++++++++++++++++++
 .../home/hooks/use-browser-tab-resources.ts   |  84 +++++--
 .../[workspaceId]/home/hooks/use-chat.ts      |  96 +++-----
 apps/sim/lib/browser-agent/tab-label.test.ts  |   1 -
 packages/browser-protocol/src/index.ts        |   6 +
 packages/desktop-bridge/contract-snapshot.ts  |   8 +
 17 files changed, 465 insertions(+), 130 deletions(-)
 create mode 100644 apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.test.tsx

diff --git a/apps/desktop/src/main/browser-agent/driver.test.ts b/apps/desktop/src/main/browser-agent/driver.test.ts
index 170d02a4c80..bd5763cd810 100644
--- a/apps/desktop/src/main/browser-agent/driver.test.ts
+++ b/apps/desktop/src/main/browser-agent/driver.test.ts
@@ -1277,6 +1277,18 @@ describe('executeTool', () => {
     expect(driver.migrateBrowserScope('pending:other-chat', 'chat-occupied')).toBe(false)
   })
 
+  it('keeps a durable destination adoptable after an empty restore', async () => {
+    await driver.executeTool('pending:new-chat', 'browser_open_tab', {})
+    driver.activateBrowserScope('chat-real')
+    expect(driver.restoreBrowserScope('chat-real')).toMatchObject({ tabs: [] })
+
+    expect(driver.migrateBrowserScope('pending:new-chat', 'chat-real')).toBe(true)
+    await expect(driver.executeTool('chat-real', 'browser_list_tabs', {})).resolves.toMatchObject({
+      ok: true,
+      result: { scopeId: 'chat-real', tabs: [{ tabId: '1' }] },
+    })
+  })
+
   it('cancels only the replaced destination authorizations during migration', async () => {
     await driver.executeTool('pending:new-chat', 'browser_open_tab', {})
     driver.activateBrowserScope('chat-real')
diff --git a/apps/desktop/src/main/browser-agent/driver.ts b/apps/desktop/src/main/browser-agent/driver.ts
index cea058ca05f..83d06102de3 100644
--- a/apps/desktop/src/main/browser-agent/driver.ts
+++ b/apps/desktop/src/main/browser-agent/driver.ts
@@ -794,10 +794,13 @@ export function restoreBrowserScope(scopeId: string): BrowserTabsState {
     return session.withBrowserScope(resolved, () => session.peekTabsState())
   }
   const state = driverScopeState(resolved)
-  state.activationOnly = false
   return session.withBrowserScope(resolved, () => {
     session.restoreBrowserSession()
-    return session.peekTabsState()
+    const tabs = session.peekTabsState()
+    // Only a scope that actually holds pages is material; one restored empty
+    // stays adoptable by a pending chat migrating onto its id.
+    if (tabs.tabs.length > 0) state.activationOnly = false
+    return tabs
   })
 }
 
@@ -4783,7 +4786,7 @@ export async function handlePanelAction(
     }
     if (action.action === 'switch-tab') {
       if (typeof action.tabId === 'string') {
-        session.switchTab(action.tabId)
+        session.switchTab(action.tabId, { claim: action.claim !== false })
       }
       return
     }
diff --git a/apps/desktop/src/main/browser-agent/session.ts b/apps/desktop/src/main/browser-agent/session.ts
index 923089d3a46..05c5a7aff55 100644
--- a/apps/desktop/src/main/browser-agent/session.ts
+++ b/apps/desktop/src/main/browser-agent/session.ts
@@ -3152,7 +3152,12 @@ export function reopenClosedTab(): AgentTab | null {
   return tab
 }
 
-export function switchTab(tabId: string): AgentTab {
+/**
+ * Shows a tab. `claim` records the visible page as the user's own; a switch
+ * that only mirrors the renderer's strip selection passes false so the agent
+ * can still close or adopt the page as its own.
+ */
+export function switchTab(tabId: string, { claim = true }: { claim?: boolean } = {}): AgentTab {
   restoreBrowserSession()
   const tab = tabs.find((entry) => entry.id === tabId)
   if (!tab) throw new SessionError(`No tab with id ${tabId} — call browser_list_tabs.`)
@@ -3168,7 +3173,7 @@ export function switchTab(tabId: string): AgentTab {
     revokeTabMediaPermissions(previousActiveTab, false)
   }
   currentScope.activeTabId = tab.id
-  currentScope.visibleTabUserSelected = true
+  if (claim) currentScope.visibleTabUserSelected = true
   promotePendingTabRestore(tab)
   // Visible selection does not move the automation exemption; the user may
   // inspect another page while a tool continues in its background tab.
@@ -3192,7 +3197,15 @@ export function switchAutomationTab(tabId: string): AgentTab {
   return tab
 }
 
-export function closeTab(tabId: string): void {
+/**
+ * Closes a tab. When the agent closes its own working tab it moves on to the
+ * neighbour so its next page tool has a target; a close the user made leaves
+ * the agent cursor unset instead of announcing a page the agent never chose.
+ */
+export function closeTab(
+  tabId: string,
+  { adoptNeighborForAgent = false }: { adoptNeighborForAgent?: boolean } = {}
+): void {
   restoreBrowserSession()
   const index = tabs.findIndex((entry) => entry.id === tabId)
   if (index < 0) throw new SessionError(`No tab with id ${tabId} — call browser_list_tabs.`)
@@ -3221,7 +3234,9 @@ export function closeTab(tabId: string): void {
     }
   }
   if (currentScope.automationTabId === tab.id) {
-    currentScope.automationTabId = (tabs[index] ?? tabs[index - 1])?.id ?? null
+    currentScope.automationTabId = adoptNeighborForAgent
+      ? ((tabs[index] ?? tabs[index - 1])?.id ?? null)
+      : null
     applyActiveTabThrottling()
   }
   if (transferBrowserFocus) currentScope.focusedBrowserTabId = currentScope.activeTabId
@@ -3240,7 +3255,7 @@ export function closeAutomationTab(tabId: string): void {
       'That tab is currently being used by the user. Switch to another agent tab instead of closing it.'
     )
   }
-  closeTab(tabId)
+  closeTab(tabId, { adoptNeighborForAgent: true })
 }
 
 /** The live page whose browser surface owns a menu accelerator. */
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/hero-resource-panel.tsx b/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/hero-resource-panel.tsx
index d6bdb2a11a7..bb8d64f5d8f 100644
--- a/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/hero-resource-panel.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/hero-resource-panel.tsx
@@ -27,6 +27,7 @@ import {
   RESOURCE_HEADER_CLASSES,
   RESOURCE_TAB_ICON_BUTTON_CLASS,
   RESOURCE_TAB_ICON_CLASS,
+  resourceTabWidthClass,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 
 export type HeroResourceId = 'workflow' | 'table' | 'brief'
@@ -155,7 +156,7 @@ export function HeroResourcePanel({
         onSelect={(id) => onActiveChange(id as HeroResourceId)}
         onClose={(id) => onCloseResource(id as HeroResourceId)}
         variant='floating'
-        className={RESOURCE_HEADER_CLASSES.stripGeometry}
+        className={cn(RESOURCE_HEADER_CLASSES.stripGeometry, resourceTabWidthClass(tabs.length))}
         newTabControl={
           <DropdownMenu>
             <Tooltip.Root>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
index d9e00fc2652..f3aa734a126 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
@@ -653,9 +653,9 @@ export function BrowserSession({
 
   useEffect(() => onBrowserOmniboxFocus(focusOmnibox, scopeId), [focusOmnibox, scopeId])
 
-  // A fresh blank tab coming on screen — opened from the resource strip, by
-  // Cmd+T, or by the shell replacing a closed last tab — gets the omnibox, the
-  // way Chrome's new-tab page does. A tab with a page keeps its content.
+  // A fresh blank tab coming on screen — opened from the resource strip or by
+  // Cmd+T — gets the omnibox, the way Chrome's new-tab page does. A tab with a
+  // page keeps its content.
   const focusedBlankTabIdRef = useRef<string | null>(null)
   useEffect(() => {
     if (!visible || !activeTabId || !showEmptyState) return
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
index cd27d8609f6..f162768d12a 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
@@ -11,6 +11,8 @@ import { useBrowserSessionStore } from '@/stores/browser-session/store'
 interface BrowserTabIconProps {
   /** Native tab id, which is also the browser resource's id. */
   tabId: string
+  /** Desktop browser scope the tab lives in; without one the icon is a plain globe. */
+  scopeId?: string
   className?: string
 }
 
@@ -21,15 +23,11 @@ interface BrowserTabIconProps {
  * thinking loader, so the strip shows where the agent is without pulling the
  * user's selection there.
  */
-export function BrowserTabIcon({ tabId, className }: BrowserTabIconProps) {
-  const tab = useBrowserSessionStore((state) => {
-    const scopeId = state.activeScopeId
-    return scopeId
-      ? state.sessions[scopeId]?.tabs.find((entry) => entry.tabId === tabId)
-      : undefined
-  })
+export function BrowserTabIcon({ tabId, scopeId, className }: BrowserTabIconProps) {
+  const tab = useBrowserSessionStore((state) =>
+    scopeId ? state.sessions[scopeId]?.tabs.find((entry) => entry.tabId === tabId) : undefined
+  )
   const agentWorking = useBrowserSessionStore((state) => {
-    const scopeId = state.activeScopeId
     const session = scopeId ? state.sessions[scopeId] : undefined
     return Boolean(
       session &&
@@ -37,13 +35,20 @@ export function BrowserTabIcon({ tabId, className }: BrowserTabIconProps) {
         (session.automationActive || session.agentRunIds.length > 0)
     )
   })
-  const [loadedHostname, setLoadedHostname] = useState<string | null>(null)
-  const [failedHostname, setFailedHostname] = useState<string | null>(null)
+  /** Outcome of the favicon request for one hostname; the image remounts per host. */
+  const [favicon, setFavicon] = useState<{ hostname: string; status: 'loaded' | 'failed' } | null>(
+    null
+  )
 
   const hostname = tab ? browserTabHostname(tab.url) : null
-  const faviconLoaded = Boolean(hostname && loadedHostname === hostname)
-  const faviconFailed = Boolean(hostname && failedHostname === hostname)
-  const showSpinner = shouldShowBrowserTabSpinner(tab?.loading ?? false, hostname, loadedHostname)
+  const faviconStatus = hostname && favicon?.hostname === hostname ? favicon.status : null
+  const faviconLoaded = faviconStatus === 'loaded'
+  const faviconFailed = faviconStatus === 'failed'
+  const showSpinner = shouldShowBrowserTabSpinner(
+    tab?.loading ?? false,
+    hostname,
+    faviconLoaded ? hostname : null
+  )
 
   return (
     <span className={cn('relative flex items-center justify-center', className)}>
@@ -62,8 +67,8 @@ export function BrowserTabIcon({ tabId, className }: BrowserTabIconProps) {
                 'size-[16px] rounded-[3px]',
                 !faviconLoaded && 'pointer-events-none absolute opacity-0'
               )}
-              onLoad={() => setLoadedHostname(hostname)}
-              onError={() => setFailedHostname(hostname)}
+              onLoad={() => setFavicon({ hostname, status: 'loaded' })}
+              onError={() => setFavicon({ hostname, status: 'failed' })}
             />
           )}
           {showSpinner ? (
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
index 058101af999..71ea6e7ac65 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
@@ -40,7 +40,12 @@ export interface ResourceTypeConfig {
   type: MothershipResourceType
   label: string
   icon: ElementType
-  renderTabIcon: (resource: MothershipResource, className: string) => ReactNode
+  /** `desktopScopeId` names the desktop browser scope a browser tab belongs to. */
+  renderTabIcon: (
+    resource: MothershipResource,
+    className: string,
+    desktopScopeId?: string
+  ) => ReactNode
   renderDropdownItem: (props: DropdownItemRenderProps) => ReactNode
   /**
    * How many of this family's candidates an unfiltered `@` list shows, overriding
@@ -234,8 +239,8 @@ export const RESOURCE_REGISTRY: Record<MothershipResourceType, ResourceTypeConfi
     type: 'browser',
     label: 'Browser',
     icon: Globe,
-    renderTabIcon: (resource, className) => (
-      <BrowserTabIcon tabId={resource.id} className={className} />
+    renderTabIcon: (resource, className, desktopScopeId) => (
+      <BrowserTabIcon tabId={resource.id} scopeId={desktopScopeId} className={className} />
     ),
     renderDropdownItem: (props) => <IconDropdownItem {...props} icon={Globe} />,
   },
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.test.ts
index e13ef20c308..657c00a6ad2 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.test.ts
@@ -1,5 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { RESOURCE_HEADER_CLASSES } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
+import {
+  RESOURCE_HEADER_CLASSES,
+  resourceTabWidthClass,
+} from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 
 describe('resource header geometry', () => {
   it('moves the action cluster beside the collapse target without moving the toggle', () => {
@@ -9,4 +12,13 @@ describe('resource header geometry', () => {
     expect(RESOURCE_HEADER_CLASSES.layout).toContain('[--resource-header-toggle-size:30px]')
     expect(RESOURCE_HEADER_CLASSES.endPosition).toBe('right-[var(--resource-header-end-inset)]')
   })
+
+  it('tightens the title cap one small step per added tab down to the floor', () => {
+    expect(RESOURCE_HEADER_CLASSES.stripGeometry).not.toContain('--tab-strip-max-tab-width')
+    expect(resourceTabWidthClass(1)).toBe('[--tab-strip-max-tab-width:200px]')
+    expect(resourceTabWidthClass(2)).toBe('[--tab-strip-max-tab-width:200px]')
+    expect(resourceTabWidthClass(3)).toBe('[--tab-strip-max-tab-width:180px]')
+    expect(resourceTabWidthClass(4)).toBe('[--tab-strip-max-tab-width:160px]')
+    expect(resourceTabWidthClass(9)).toBe('[--tab-strip-max-tab-width:160px]')
+  })
 })
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.ts
index a8e83c0f8b4..43931efbff9 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls.ts
@@ -27,9 +27,13 @@ export const RESOURCE_HEADER_CLASSES = {
    * keeps: a tab paints a fill, so its box is visible and wants air around it,
    * where the toggle and the action buttons are bare glyphs whose box only shows
    * on hover.
+   *
+   * The tab width cap is chosen per strip from the tab count (see
+   * {@link resourceTabWidthClass}), so a title can breathe while the strip is
+   * roomy and only tightens once the tabs start competing for the width.
    */
   stripGeometry:
-    '[--tab-strip-height:calc(var(--resource-header-controls-height)_+_1px)] [--tab-strip-band:26px] [--tab-strip-max-tab-width:160px] [--tab-strip-inline-start:var(--resource-header-end-inset)] [--tab-strip-inline-end:var(--resource-header-fixed-reserve)]',
+    '[--tab-strip-height:calc(var(--resource-header-controls-height)_+_1px)] [--tab-strip-band:26px] [--tab-strip-inline-start:var(--resource-header-end-inset)] [--tab-strip-inline-end:var(--resource-header-fixed-reserve)]',
   /**
    * Centred, matching the `floating` strip: its tabs and controls sit centred in
    * the header band rather than hanging from the top, so an overlaid control has
@@ -45,3 +49,16 @@ export const RESOURCE_HEADER_CLASSES = {
     'right-[calc(var(--resource-header-end-inset)_+_var(--resource-header-toggle-hit-size)_+_1px)]',
   emptyAddOffset: '-translate-x-1.5',
 } as const
+
+/**
+ * Width cap for the strip's tabs, from the tab count. A couple of tabs have
+ * the room to show more of their titles; each added tab tightens the cap by a
+ * step small enough to pass unnoticed, down to the floor a full strip needs so
+ * every tab stays visible for longer before the strip scrolls. Only the
+ * ellipsis point moves — a title that already fits never changes width.
+ */
+export function resourceTabWidthClass(tabCount: number): string {
+  if (tabCount <= 2) return '[--tab-strip-max-tab-width:200px]'
+  if (tabCount === 3) return '[--tab-strip-max-tab-width:180px]'
+  return '[--tab-strip-max-tab-width:160px]'
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
index 95d3f12324a..99705217a63 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
@@ -34,6 +34,7 @@ import {
   RESOURCE_HEADER_CLASSES,
   RESOURCE_TAB_ICON_BUTTON_CLASS,
   RESOURCE_TAB_ICON_CLASS,
+  resourceTabWidthClass,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 import type {
   MothershipResource,
@@ -254,26 +255,25 @@ export function ResourceTabs({
 
   // A browser tab's title is the live page title, owned by the desktop app.
   const browserTabs = useBrowserSessionStore((state) => state.sessions[desktopScopeId]?.tabs)
-  const browserTitles = useMemo(
-    () => new Map(browserTabs?.map((tab) => [tab.tabId, browserTabTitle(tab)])),
-    [browserTabs]
-  )
 
-  const tabs = useMemo<TabStripItem[]>(
-    () =>
-      resources.map((resource) => ({
-        id: resource.id,
-        title:
-          (resource.type === 'browser'
-            ? browserTitles.get(resource.id)
-            : nameLookup.get(`${resource.type}:${resource.id}`)) ?? resource.title,
-        icon: getResourceConfig(resource.type).renderTabIcon(resource, 'size-[16px] shrink-0'),
-        active: activeId === resource.id,
-        selected: selectedIds.size > 1 && selectedIds.has(resource.id),
-        attention: activityIds?.has(resource.id) ?? false,
-      })),
-    [resources, nameLookup, browserTitles, activeId, selectedIds, activityIds]
-  )
+  const tabs = useMemo<TabStripItem[]>(() => {
+    const browserTitles = new Map(browserTabs?.map((tab) => [tab.tabId, browserTabTitle(tab)]))
+    return resources.map((resource) => ({
+      id: resource.id,
+      title:
+        (resource.type === 'browser'
+          ? browserTitles.get(resource.id)
+          : nameLookup.get(`${resource.type}:${resource.id}`)) ?? resource.title,
+      icon: getResourceConfig(resource.type).renderTabIcon(
+        resource,
+        'size-[16px] shrink-0',
+        desktopScopeId
+      ),
+      active: activeId === resource.id,
+      selected: selectedIds.size > 1 && selectedIds.has(resource.id),
+      attention: activityIds?.has(resource.id) ?? false,
+    }))
+  }, [resources, nameLookup, browserTabs, desktopScopeId, activeId, selectedIds, activityIds])
 
   const handleAdd = useCallback(
     (resource: MothershipResource) => {
@@ -478,7 +478,7 @@ export function ResourceTabs({
       onReorder={handleReorder}
       onTabDragStart={handleTabDragStart}
       variant='floating'
-      className={RESOURCE_HEADER_CLASSES.stripGeometry}
+      className={cn(RESOURCE_HEADER_CLASSES.stripGeometry, resourceTabWidthClass(resources.length))}
       newTabControl={
         // Offered before the chat exists too: a resource opened while composing
         // the first prompt is context for that prompt, and gating on a chat id
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx
index c135470c8a9..5ce12c39a5a 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { forwardRef, memo, useCallback, useMemo, useRef, useState } from 'react'
+import { forwardRef, memo, useCallback, useRef, useState } from 'react'
 import { cn } from '@sim/emcn'
 import type { FilePreviewSession } from '@/lib/copilot/request/session'
 import type { FileDownloadSource } from '@/lib/uploads/client/download'
@@ -148,7 +148,7 @@ export const MothershipView = memo(
       return browserOverlayControllerRef.current?.closeOverlay('resources') ?? Promise.resolve()
     }, [])
 
-    const persistentResources = useMemo(() => persistentPanelResources(resources), [resources])
+    const persistentResources = persistentPanelResources(resources)
 
     const previewForActive =
       previewSession && active && shouldShowStreamingFilePanel(previewSession, active)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.test.tsx
new file mode 100644
index 00000000000..2563e158eac
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.test.tsx
@@ -0,0 +1,222 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { MothershipResource } from '@/lib/copilot/resources/types'
+import { useBrowserTabResources } from '@/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources'
+import { useBrowserSessionStore } from '@/stores/browser-session/store'
+
+const { sendBrowserPanelAction, openUrlInNewBrowserTab, openInPanelListeners } = vi.hoisted(() => ({
+  sendBrowserPanelAction: vi.fn(),
+  openUrlInNewBrowserTab: vi.fn(),
+  openInPanelListeners: new Set<(url: string) => void>(),
+}))
+
+vi.mock('@/lib/browser-agent/transport', () => ({
+  sendBrowserPanelAction,
+  openUrlInNewBrowserTab,
+}))
+vi.mock('@/lib/browser-agent/open-in-panel', () => ({
+  onOpenInBrowserPanel: (listener: (url: string) => void) => {
+    openInPanelListeners.add(listener)
+    return () => openInPanelListeners.delete(listener)
+  },
+}))
+
+const SCOPE = 'chat-1'
+
+function tab(tabId: string, active = false, title = `Page ${tabId}`) {
+  return { tabId, url: `https://example.com/${tabId}`, title, loading: false, active }
+}
+
+function pushTabs(scopeId: string, tabs: ReturnType<typeof tab>[], activeTabId: string | null) {
+  act(() => {
+    useBrowserSessionStore.getState().setTabsState({ scopeId, tabs, activeTabId })
+  })
+}
+
+interface HostProps {
+  scopeId: string
+  resources: MothershipResource[]
+  activeResourceId: string | null
+  addResource: (resource: MothershipResource) => void
+  removeResource: (type: MothershipResource['type'], id: string) => void
+  selectResource: (id: string) => void
+  onResourceEvent: (id: string, options?: { activate?: boolean }) => void
+}
+
+function Host(props: HostProps) {
+  useBrowserTabResources(props)
+  return null
+}
+
+describe('useBrowserTabResources', () => {
+  let root: Root
+  let container: HTMLDivElement
+  const addResource = vi.fn()
+  const removeResource = vi.fn()
+  const selectResource = vi.fn()
+  const onResourceEvent = vi.fn()
+
+  function render(overrides: Partial<HostProps> = {}) {
+    const props: HostProps = {
+      scopeId: SCOPE,
+      resources: [],
+      activeResourceId: null,
+      addResource,
+      removeResource,
+      selectResource,
+      onResourceEvent,
+      ...overrides,
+    }
+    act(() => root.render(<Host {...props} />))
+    return (next: Partial<HostProps>) => act(() => root.render(<Host {...props} {...next} />))
+  }
+
+  beforeEach(() => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+    vi.clearAllMocks()
+    openInPanelListeners.clear()
+    useBrowserSessionStore.setState({ activeScopeId: SCOPE, sessions: {} })
+    act(() => useBrowserSessionStore.getState().activateScope(SCOPE))
+    container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+  })
+
+  afterEach(() => {
+    act(() => root.unmount())
+    container.remove()
+    vi.unstubAllGlobals()
+  })
+
+  it('projects each native page into a browser resource and removes closed pages', () => {
+    const rerender = render()
+    pushTabs(SCOPE, [tab('1', true), tab('2')], '1')
+
+    expect(addResource.mock.calls.map(([resource]) => resource)).toEqual([
+      { type: 'browser', id: '1', title: 'Page 1' },
+      { type: 'browser', id: '2', title: 'Page 2' },
+    ])
+
+    rerender({
+      resources: [
+        { type: 'browser', id: '1', title: 'Page 1' },
+        { type: 'browser', id: '2', title: 'Page 2' },
+      ],
+    })
+    pushTabs(SCOPE, [tab('1', true)], '1')
+    expect(removeResource).toHaveBeenCalledExactlyOnceWith('browser', '2')
+  })
+
+  it('keeps projecting a tab until its resource lands, then treats absence as a close', () => {
+    const rerender = render()
+    pushTabs(SCOPE, [tab('1', true)], '1')
+    expect(addResource).toHaveBeenCalledTimes(1)
+
+    // Chat hydration replaced the list before the add committed: project again.
+    rerender({ resources: [{ type: 'file', id: 'f', title: 'notes.md' }] })
+    expect(addResource).toHaveBeenCalledTimes(2)
+
+    rerender({
+      resources: [
+        { type: 'file', id: 'f', title: 'notes.md' },
+        { type: 'browser', id: '1', title: 'Page 1' },
+      ],
+    })
+    addResource.mockClear()
+
+    // The user closed the strip tab; the native close has not landed yet.
+    rerender({ resources: [{ type: 'file', id: 'f', title: 'notes.md' }] })
+    expect(addResource).not.toHaveBeenCalled()
+  })
+
+  it('keeps the tabs through a pending-to-durable scope migration', () => {
+    const resources: MothershipResource[] = [{ type: 'browser', id: '1', title: 'Page 1' }]
+    const rerender = render({ scopeId: 'pending:new', resources })
+    act(() => useBrowserSessionStore.getState().activateScope('pending:new'))
+    pushTabs('pending:new', [tab('1', true)], '1')
+
+    // The store migrates first; the hook still points at the pending scope.
+    act(() => useBrowserSessionStore.getState().migrateScope('pending:new', SCOPE))
+    expect(removeResource).not.toHaveBeenCalled()
+
+    rerender({ scopeId: SCOPE, resources })
+    expect(removeResource).not.toHaveBeenCalled()
+    expect(addResource).not.toHaveBeenCalled()
+  })
+
+  it('switches the native page when a browser tab is selected, without claiming it', () => {
+    const resources: MothershipResource[] = [
+      { type: 'browser', id: '1', title: 'Page 1' },
+      { type: 'browser', id: '2', title: 'Page 2' },
+    ]
+    const rerender = render({ resources, activeResourceId: '1' })
+    pushTabs(SCOPE, [tab('1', true), tab('2')], '1')
+    expect(sendBrowserPanelAction).not.toHaveBeenCalled()
+
+    rerender({ activeResourceId: '2' })
+    expect(sendBrowserPanelAction).toHaveBeenCalledExactlyOnceWith(
+      'switch-tab',
+      { tabId: '2', claim: false },
+      SCOPE
+    )
+
+    // The requested switch landing is not a native change to follow.
+    pushTabs(SCOPE, [tab('1'), tab('2', true)], '2')
+    expect(selectResource).not.toHaveBeenCalled()
+  })
+
+  it('follows a native switch into the strip only while the user is on the browser', () => {
+    const resources: MothershipResource[] = [
+      { type: 'browser', id: '1', title: 'Page 1' },
+      { type: 'browser', id: '2', title: 'Page 2' },
+      { type: 'file', id: 'f', title: 'notes.md' },
+    ]
+    const rerender = render({ resources, activeResourceId: '1' })
+    pushTabs(SCOPE, [tab('1', true), tab('2')], '1')
+
+    pushTabs(SCOPE, [tab('1'), tab('2', true)], '2')
+    expect(selectResource).toHaveBeenCalledExactlyOnceWith('2')
+    expect(sendBrowserPanelAction).not.toHaveBeenCalled()
+
+    selectResource.mockClear()
+    rerender({ activeResourceId: 'f' })
+    pushTabs(SCOPE, [tab('1', true), tab('2')], '1')
+    expect(selectResource).not.toHaveBeenCalled()
+  })
+
+  it('announces the agent tab as activity without moving the native page', () => {
+    render({
+      resources: [{ type: 'browser', id: '1', title: 'Page 1' }],
+      activeResourceId: '1',
+    })
+    pushTabs(SCOPE, [tab('1', true)], '1')
+    act(() => {
+      useBrowserSessionStore.getState().setTabsState({
+        scopeId: SCOPE,
+        tabs: [tab('1', true), tab('2')],
+        activeTabId: '1',
+        automationTabId: '2',
+        automationActive: true,
+      })
+    })
+
+    expect(onResourceEvent).toHaveBeenCalledExactlyOnceWith('2', { activate: true })
+    expect(sendBrowserPanelAction).not.toHaveBeenCalled()
+  })
+
+  it('selects a chat link tab as the user own choice', async () => {
+    render()
+    openUrlInNewBrowserTab.mockResolvedValue('9')
+
+    await act(async () => {
+      for (const listener of openInPanelListeners) listener('https://docs.sim.ai')
+    })
+
+    expect(openUrlInNewBrowserTab).toHaveBeenCalledWith('https://docs.sim.ai', SCOPE)
+    expect(selectResource).toHaveBeenCalledExactlyOnceWith('9')
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts
index b47758d9038..3bac91ec5cc 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-browser-tab-resources.ts
@@ -1,11 +1,16 @@
 import { useEffect, useRef } from 'react'
 import type { BrowserTabState } from '@sim/browser-protocol'
+import { createLogger } from '@sim/logger'
+import { getErrorMessage } from '@sim/utils/errors'
+import { onOpenInBrowserPanel } from '@/lib/browser-agent/open-in-panel'
 import { browserTabTitle } from '@/lib/browser-agent/tab-label'
-import { sendBrowserPanelAction } from '@/lib/browser-agent/transport'
+import { openUrlInNewBrowserTab, sendBrowserPanelAction } from '@/lib/browser-agent/transport'
 import type { MothershipResource, MothershipResourceType } from '@/lib/copilot/resources/types'
 import type { ResourceEventHandler } from '@/app/workspace/[workspaceId]/home/hooks/use-chat'
 import { useBrowserSessionStore } from '@/stores/browser-session/store'
 
+const logger = createLogger('BrowserTabResources')
+
 const EMPTY_BROWSER_TABS: BrowserTabState[] = []
 
 interface UseBrowserTabResourcesOptions {
@@ -16,7 +21,7 @@ interface UseBrowserTabResourcesOptions {
   /** Adds a tab without activating it; activation goes through {@link onResourceEvent}. */
   addResource: (resource: MothershipResource) => void
   removeResource: (resourceType: MothershipResourceType, resourceId: string) => void
-  /** Explicit user selection, which claims the visible tab. */
+  /** Explicit user selection, which claims the strip's selection for the user. */
   selectResource: (resourceId: string) => void
   /** Agent activity on a tab, subject to the panel's user-ownership policy. */
   onResourceEvent: ResourceEventHandler
@@ -47,6 +52,9 @@ export function useBrowserTabResources({
   selectResource,
   onResourceEvent,
 }: UseBrowserTabResourcesOptions): void {
+  // A missing bucket means the scope has not been activated yet or was just
+  // migrated to its durable id; it says nothing about the pages themselves.
+  const hasSession = useBrowserSessionStore((state) => state.sessions[scopeId] !== undefined)
   const tabs = useBrowserSessionStore(
     (state) => state.sessions[scopeId]?.tabs ?? EMPTY_BROWSER_TABS
   )
@@ -60,10 +68,23 @@ export function useBrowserTabResources({
       ? session.automationTabId
       : null
   })
-  /** Tab ids this hook has projected into the strip for the current scope. */
+  /**
+   * Tab ids whose resource has been seen in the strip for the current scope.
+   * A tab is projected until its resource shows up — chat hydration can
+   * replace the list underneath a fresh add — and once it has been seen, its
+   * absence means the user closed it and the native close is in flight.
+   */
   const knownTabIdsRef = useRef<Set<string> | null>(null)
   knownTabIdsRef.current ??= new Set()
   const knownScopeRef = useRef(scopeId)
+  /** The native switch this hook asked for and has not seen land yet. */
+  const requestedTabIdRef = useRef<string | null>(null)
+  const scopeIdRef = useRef(scopeId)
+  scopeIdRef.current = scopeId
+  const tabsRef = useRef(tabs)
+  tabsRef.current = tabs
+  const activeTabIdRef = useRef(activeTabId)
+  activeTabIdRef.current = activeTabId
   const resourcesRef = useRef(resources)
   resourcesRef.current = resources
   const activeResourceIdRef = useRef(activeResourceId)
@@ -79,40 +100,52 @@ export function useBrowserTabResources({
     if (knownScopeRef.current !== scopeId) {
       knownScopeRef.current = scopeId
       known.clear()
+      requestedTabIdRef.current = null
     }
-    const liveTabIds = new Set(tabs.map((tab) => tab.tabId))
     const resourceTabIds = new Set(
       resources.filter((resource) => resource.type === 'browser').map((resource) => resource.id)
     )
 
     for (const tab of tabs) {
-      // A known tab without a resource is a close still in flight natively.
-      if (known.has(tab.tabId)) continue
-      known.add(tab.tabId)
-      if (!resourceTabIds.has(tab.tabId)) {
+      if (resourceTabIds.has(tab.tabId)) {
+        known.add(tab.tabId)
+        continue
+      }
+      if (!known.has(tab.tabId)) {
         addResource({ type: 'browser', id: tab.tabId, title: browserTabTitle(tab) })
       }
     }
 
+    if (!hasSession) return
+    const liveTabIds = new Set(tabs.map((tab) => tab.tabId))
     for (const tabId of known) {
       if (liveTabIds.has(tabId)) continue
       known.delete(tabId)
       if (resourceTabIds.has(tabId)) removeResource('browser', tabId)
     }
-  }, [addResource, removeResource, resources, scopeId, tabs])
+  }, [addResource, hasSession, removeResource, resources, scopeId, tabs])
 
-  // Selecting a browser resource tab shows its native page.
+  // Selecting a browser resource tab shows its native page. Keyed on the
+  // selection alone: a native push must not re-assert a selection it just
+  // moved away from, or the two sides would trade switches forever.
   useEffect(() => {
-    if (!activeResourceId || activeResourceId === activeTabId) return
-    if (!tabs.some((tab) => tab.tabId === activeResourceId)) return
-    sendBrowserPanelAction('switch-tab', { tabId: activeResourceId }, scopeId)
-  }, [activeResourceId, activeTabId, scopeId, tabs])
+    if (!activeResourceId || activeResourceId === activeTabIdRef.current) return
+    if (!tabsRef.current.some((tab) => tab.tabId === activeResourceId)) return
+    requestedTabIdRef.current = activeResourceId
+    sendBrowserPanelAction(
+      'switch-tab',
+      { tabId: activeResourceId, claim: false },
+      scopeIdRef.current
+    )
+  }, [activeResourceId])
 
   // A native switch while the user is on the browser follows into the strip.
-  const followedActiveTabIdRef = useRef(activeTabId)
+  // The switch this hook requested itself is not a native change of mind.
   useEffect(() => {
-    if (followedActiveTabIdRef.current === activeTabId) return
-    followedActiveTabIdRef.current = activeTabId
+    if (requestedTabIdRef.current === activeTabId) {
+      requestedTabIdRef.current = null
+      return
+    }
     const activeResource = resourcesRef.current.find(
       (resource) => resource.id === activeResourceIdRef.current
     )
@@ -126,4 +159,21 @@ export function useBrowserTabResources({
   useEffect(() => {
     if (automationTabId) onResourceEventRef.current(automationTabId, { activate: true })
   }, [automationTabId])
+
+  // Chat links clicked in the desktop app open in a new browser tab. The user
+  // asked to see it, so it is selected as their own choice rather than offered
+  // through the agent-activity policy.
+  useEffect(() => {
+    return onOpenInBrowserPanel((url) => {
+      void openUrlInNewBrowserTab(url, scopeIdRef.current)
+        .then((tabId) => {
+          if (tabId) selectResourceRef.current(tabId)
+        })
+        .catch((error) => {
+          logger.warn('Failed to open chat link in a new browser tab', {
+            error: getErrorMessage(error),
+          })
+        })
+    })
+  }, [])
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
index 51cee6d699b..0cafff340c1 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -31,12 +31,7 @@ import {
 } from '@/lib/api/contracts/mothership-chats'
 import { cancelWorkflowExecutionContract } from '@/lib/api/contracts/workflows'
 import { buildResourceAttachments } from '@/lib/browser-agent/attachments'
-import { onOpenInBrowserPanel } from '@/lib/browser-agent/open-in-panel'
-import {
-  cancelActiveBrowserTools,
-  initBrowserAgentTransport,
-  openUrlInNewBrowserTab,
-} from '@/lib/browser-agent/transport'
+import { cancelActiveBrowserTools, initBrowserAgentTransport } from '@/lib/browser-agent/transport'
 import { getMothershipAttachmentPreviewUrl } from '@/lib/copilot/chat/attachment-preview'
 import { toDisplayMessage } from '@/lib/copilot/chat/display-message'
 import { getLiveAssistantMessageId } from '@/lib/copilot/chat/effective-transcript'
@@ -1154,12 +1149,12 @@ export function getReplayCompletedWorkflowToolCallIds(events: StreamBatchEvent[]
 /**
  * Which live panel the transcript is mid-action on, or null for neither.
  *
- * Used on reconnect to restore that panel, the way workflow-run recovery
- * restores workflows. A completed browser or terminal call is suppressed on
- * replay, so it never re-opens its own panel — without this, returning to a
- * chat mid-turn lands on whichever resource happened to be persisted last
- * while the agent is driving a different one. When calls against both are in
- * flight the later one wins, being the one the user was watching.
+ * Used on reconnect the way workflow-run recovery restores workflows: a
+ * mid-command terminal is re-focused, while a mid-action browser tab announces
+ * itself through the desktop's automation state and only needs to keep the
+ * terminal from taking over. A completed browser or terminal call is
+ * suppressed on replay, so it never re-opens its own panel. When calls against
+ * both are in flight the later one wins, being the one the user was watching.
  */
 export function panelForExecutingClientTool(
   messages: ChatMessage[]
@@ -1176,6 +1171,24 @@ export function panelForExecutingClientTool(
   return panel
 }
 
+/**
+ * Runs a browser tool on the desktop client. The agent's tab reaches the
+ * resource strip through the desktop tab list, so nothing is opened here.
+ * Replay/exactly-once guarding lives in executeBrowserToolOnClient
+ * (sessionStorage-backed, so reloads cannot re-run an action).
+ */
+function startClientBrowserTool(
+  toolCallId: string,
+  toolName: string,
+  toolArgs: Record<string, unknown>,
+  scopeId: string,
+  eventTs?: string,
+  signal?: AbortSignal
+): void {
+  if (!isCurrentBrowserToolName(toolName)) return
+  executeBrowserToolOnClient(toolCallId, toolName, toolArgs, scopeId, eventTs, signal)
+}
+
 function buildRecoverySubjectKey(
   chatId: string | undefined,
   selectedChatId: string | undefined
@@ -1453,6 +1466,8 @@ export function useChat(
 
   const activeResourceIdRef = useRef(effectiveActiveResourceId)
   activeResourceIdRef.current = effectiveActiveResourceId
+  const selectedResourceIdRef = useRef(activeResourceId)
+  selectedResourceIdRef.current = activeResourceId
   const {
     previewSession,
     previewSessionRef,
@@ -2189,27 +2204,6 @@ export function useChat(
     [workspaceId, organizationId, scopeKey]
   )
 
-  const startClientBrowserTool = useCallback(
-    (
-      toolCallId: string,
-      toolName: string,
-      toolArgs: Record<string, unknown>,
-      scopeId: string,
-      eventTs?: string,
-      signal?: AbortSignal
-    ) => {
-      if (!isCurrentBrowserToolName(toolName)) {
-        return
-      }
-      // The agent's tab reaches the resource strip through the desktop tab
-      // list, so nothing is opened here. Replay/exactly-once guarding lives in
-      // executeBrowserToolOnClient (sessionStorage-backed, so reloads cannot
-      // re-run an action).
-      executeBrowserToolOnClient(toolCallId, toolName, toolArgs, scopeId, eventTs, signal)
-    },
-    []
-  )
-
   const openTerminalResource = useCallback(() => {
     addResource({
       type: 'terminal',
@@ -2238,26 +2232,6 @@ export function useChat(
     [openTerminalResource]
   )
 
-  // Chat links clicked in the desktop app open in a new browser tab. The user
-  // asked to see it, so it is selected outright rather than offered through
-  // the agent-activity policy (message components dispatch the request; the
-  // tab list adds the resource).
-  useEffect(() => {
-    return onOpenInBrowserPanel((url) => {
-      void openUrlInNewBrowserTab(url, desktopScopeIdRef.current)
-        .then((tabId) => {
-          if (!tabId) return
-          activeResourceIdRef.current = tabId
-          setActiveResourceId(tabId)
-        })
-        .catch((error) => {
-          logger.warn('Failed to open chat link in a new browser tab', {
-            error: getErrorMessage(error),
-          })
-        })
-    })
-  }, [])
-
   const recoverPendingClientWorkflowTools = useCallback(
     async (nextMessages: ChatMessage[]) => {
       const pending: ToolCallInfo[] = []
@@ -2543,11 +2517,18 @@ export function useChat(
       )
 
     if (mergedResources.length > 0) {
+      // An explicit selection wins. Otherwise fall back to the last resource
+      // the server holds, not the last on screen: local-only browser tabs can
+      // land before the history does, and which side arrives first must not
+      // decide which tab the chat opens on.
+      const selectedResourceId = selectedResourceIdRef.current
       const hydratedActiveResourceId =
-        activeResourceIdRef.current &&
-        mergedResources.some((resource) => resource.id === activeResourceIdRef.current)
-          ? activeResourceIdRef.current
-          : mergedResources[mergedResources.length - 1].id
+        selectedResourceId && mergedResources.some((resource) => resource.id === selectedResourceId)
+          ? selectedResourceId
+          : (
+              restorableResources[restorableResources.length - 1] ??
+              mergedResources[mergedResources.length - 1]
+            ).id
       // Replacing the array with an identical one still re-renders the tab
       // strip and panel — skip the no-op so open panels don't flash.
       if (!resourcesUnchanged) {
@@ -2842,7 +2823,6 @@ export function useChat(
       removeResource,
       startClientWorkflowTool,
       startClientLocalFilesystemTool,
-      startClientBrowserTool,
       startClientTerminalTool,
       getResourceActivityTracker,
       clearResourceActivity,
diff --git a/apps/sim/lib/browser-agent/tab-label.test.ts b/apps/sim/lib/browser-agent/tab-label.test.ts
index 7e5f83845fd..2cd9c7ac070 100644
--- a/apps/sim/lib/browser-agent/tab-label.test.ts
+++ b/apps/sim/lib/browser-agent/tab-label.test.ts
@@ -25,7 +25,6 @@ describe('browserTabTitle', () => {
     url: 'https://docs.sim.ai/guides',
     loading: false,
     active: false,
-    pinned: false,
   }
 
   it('never labels a settled blank-title page as loading', () => {
diff --git a/packages/browser-protocol/src/index.ts b/packages/browser-protocol/src/index.ts
index 8179a662cad..91195dc6a84 100644
--- a/packages/browser-protocol/src/index.ts
+++ b/packages/browser-protocol/src/index.ts
@@ -242,6 +242,12 @@ export interface BrowserPanelAction {
   url?: string
   /** Stable tab id for `switch-tab` and `close-tab`. */
   tabId?: string
+  /**
+   * `switch-tab` only: false when the switch mirrors a selection made outside
+   * the page (the resource strip), so it must not count as the user claiming
+   * the page from the agent. Older shells treat every switch as a claim.
+   */
+  claim?: boolean
   /** Optional free-text instruction submitted with `takeover-done`. */
   takeoverResponse?: string
   /** Exact pending permission request being answered. */
diff --git a/packages/desktop-bridge/contract-snapshot.ts b/packages/desktop-bridge/contract-snapshot.ts
index 36bb3d1a7cf..f09ba71ac81 100644
--- a/packages/desktop-bridge/contract-snapshot.ts
+++ b/packages/desktop-bridge/contract-snapshot.ts
@@ -242,6 +242,8 @@ export interface BrowserPanelAction {
     | 'reload'
     | 'back'
     | 'forward'
+    /** Fallback for installed shells that predate the acknowledged `openTab` bridge call. */
+    | 'new-tab'
     | 'switch-tab'
     | 'close-tab'
     | 'print'
@@ -255,6 +257,12 @@ export interface BrowserPanelAction {
   url?: string
   /** Stable tab id for `switch-tab` and `close-tab`. */
   tabId?: string
+  /**
+   * `switch-tab` only: false when the switch mirrors a selection made outside
+   * the page (the resource strip), so it must not count as the user claiming
+   * the page from the agent. Older shells treat every switch as a claim.
+   */
+  claim?: boolean
   /** Optional free-text instruction submitted with `takeover-done`. */
   takeoverResponse?: string
   /** Exact pending permission request being answered. */

From 43d26eb43786fdbb1f9797139b0c2e30e3904bc1 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 10 Sep 2026 16:06:30 -0700
Subject: [PATCH 3/4] fix(desktop): mirror strip order into native tabs and
 drag live tab titles

Reordering a browser tab in the resource strip now reorders the desktop's
native tab list too, so restore and the agent's tab list keep the strip's
order (`reorderTab` returns as an optional bridge method). Dragging a tab
into the chat carries the strip's live title rather than the title captured
when the tab was added. The fork route test follows the new policy that
stored browser rows are dropped.
---
 .../src/main/browser-agent/session.test.ts    | 13 ++++++++
 .../desktop/src/main/browser-agent/session.ts | 22 ++++++++++++++
 apps/desktop/src/main/ipc.test.ts             | 11 +++++++
 apps/desktop/src/main/ipc.ts                  | 21 +++++++++++++
 apps/desktop/src/preload/index.ts             |  3 ++
 .../chats/[chatId]/fork/route.test.ts         |  5 ++--
 .../resource-tabs/resource-tabs.tsx           | 30 +++++++++++++++----
 apps/sim/lib/browser-agent/transport.test.ts  | 10 +++++++
 apps/sim/lib/browser-agent/transport.ts       | 12 ++++++++
 packages/desktop-bridge/contract-snapshot.ts  |  5 ++++
 packages/desktop-bridge/src/index.ts          |  5 ++++
 11 files changed, 130 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/main/browser-agent/session.test.ts b/apps/desktop/src/main/browser-agent/session.test.ts
index 84564d409e6..2a0a48e58fd 100644
--- a/apps/desktop/src/main/browser-agent/session.test.ts
+++ b/apps/desktop/src/main/browser-agent/session.test.ts
@@ -2403,6 +2403,19 @@ describe('browser-agent session', () => {
     ])
   })
 
+  it('reorders tabs to the order the resource strip asks for', () => {
+    const first = session.ensureTab()
+    const second = session.addTab()
+    const third = session.addTab()
+
+    session.reorderTab(third.id, 0)
+    expect(session.listTabs().map((tab) => tab.tabId)).toEqual([third.id, first.id, second.id])
+
+    session.reorderTab(third.id, 99)
+    expect(session.listTabs().map((tab) => tab.tabId)).toEqual([first.id, second.id, third.id])
+    expect(() => session.reorderTab('999', 0)).toThrow(/No tab with id 999/)
+  })
+
   it('allows creation and reopening beyond eight browser tabs', () => {
     session.ensureTab()
     for (let index = 1; index < 12; index++) {
diff --git a/apps/desktop/src/main/browser-agent/session.ts b/apps/desktop/src/main/browser-agent/session.ts
index 05c5a7aff55..bbfe654b6c9 100644
--- a/apps/desktop/src/main/browser-agent/session.ts
+++ b/apps/desktop/src/main/browser-agent/session.ts
@@ -3197,6 +3197,28 @@ export function switchAutomationTab(tabId: string): AgentTab {
   return tab
 }
 
+/**
+ * Moves a tab to a final list index. The renderer's resource strip owns tab
+ * order; this keeps the native list — what restore and `browser_list_tabs`
+ * report — in the same order.
+ */
+export function reorderTab(tabId: string, targetIndex: number): AgentTab {
+  restoreBrowserSession()
+  const currentIndex = tabs.findIndex((entry) => entry.id === tabId)
+  if (currentIndex < 0) {
+    throw new SessionError(`No tab with id ${tabId} — call browser_list_tabs.`)
+  }
+  const tab = tabs[currentIndex]
+  const nextIndex = Math.max(0, Math.min(tabs.length - 1, Math.trunc(targetIndex)))
+  if (nextIndex === currentIndex) return tab
+
+  tabs.splice(currentIndex, 1)
+  tabs.splice(nextIndex, 0, tab)
+  persistBrowserSession()
+  events?.onTabsChanged()
+  return tab
+}
+
 /**
  * Closes a tab. When the agent closes its own working tab it moves on to the
  * neighbour so its next page tool has a target; a close the user made leaves
diff --git a/apps/desktop/src/main/ipc.test.ts b/apps/desktop/src/main/ipc.test.ts
index 5b912715e61..959fb436fcf 100644
--- a/apps/desktop/src/main/ipc.test.ts
+++ b/apps/desktop/src/main/ipc.test.ts
@@ -1146,6 +1146,17 @@ describe('registerIpcHandlers', () => {
     expect(() => handler?.(appEvent, { action: 'reload' })).not.toThrow()
   })
 
+  it('restricts browser-tab reordering to typed app-origin messages', () => {
+    const { on } = collectHandlers()
+    const handler = on.get('browser-agent:reorder-tab')
+
+    expect(() => handler?.(evilEvent, '1', 0)).not.toThrow()
+    expect(() => handler?.(appEvent, 1, 0)).not.toThrow()
+    expect(() => handler?.(appEvent, '1', '0')).not.toThrow()
+    expect(() => handler?.(appEvent, '1', Number.NaN)).not.toThrow()
+    expect(() => handler?.(appEvent, '1', 0)).not.toThrow()
+  })
+
   it('restricts browser-panel focus updates to boolean app-origin messages', () => {
     const { on } = collectHandlers()
     const handler = on.get('browser-agent:set-panel-focused')
diff --git a/apps/desktop/src/main/ipc.ts b/apps/desktop/src/main/ipc.ts
index 2cf75d7626c..049527f5d1a 100644
--- a/apps/desktop/src/main/ipc.ts
+++ b/apps/desktop/src/main/ipc.ts
@@ -54,6 +54,7 @@ import {
   getBrowserDownloadsState,
   grantSiteOriginForUserNavigation,
   peekTabsState,
+  reorderTab,
   setBrowserAppTheme,
   showBrowserDownloadInFolder,
   showBrowserDownloadsMenu,
@@ -1171,6 +1172,26 @@ export function registerIpcHandlers(deps: IpcDeps): void {
         void handlePanelAction(scope, panelAction).catch(() => {})
       },
     },
+    'browser-agent:reorder-tab': {
+      kind: 'send',
+      gate: 'app-origin',
+      requires: 'browser',
+      passSender: true,
+      handler: (sender, tabId, targetIndex, rawScope) => {
+        const scope = activeRendererScope(browserScopeBySender, sender as WebContents, rawScope)
+        if (
+          !scope ||
+          typeof tabId !== 'string' ||
+          typeof targetIndex !== 'number' ||
+          !Number.isFinite(targetIndex)
+        ) {
+          return
+        }
+        try {
+          withBrowserScope(scope, () => reorderTab(tabId, targetIndex))
+        } catch {}
+      },
+    },
     'browser-agent:set-panel-bounds': {
       kind: 'send',
       gate: 'app-origin',
diff --git a/apps/desktop/src/preload/index.ts b/apps/desktop/src/preload/index.ts
index 05bdc84f441..c3714f0f3f4 100644
--- a/apps/desktop/src/preload/index.ts
+++ b/apps/desktop/src/preload/index.ts
@@ -228,6 +228,9 @@ const api: SimDesktopApi = {
       ipcRenderer.invoke('browser-agent:dispose-scope', scopeId),
     suspendScope: (scopeId: string): Promise<boolean> =>
       ipcRenderer.invoke('browser-agent:suspend-scope', scopeId),
+    reorderTab: (tabId: string, targetIndex: number, scopeId: string): void => {
+      ipcRenderer.send('browser-agent:reorder-tab', tabId, targetIndex, scopeId)
+    },
     setPanelBounds: (
       bounds: BrowserPanelBounds | null,
       anchor: BrowserPanelAnchor | null,
diff --git a/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts b/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts
index db78d250fec..a5eaa19c66e 100644
--- a/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts
+++ b/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts
@@ -307,7 +307,7 @@ describe('POST /api/mothership/chats/[chatId]/fork', () => {
     expect(dbChainMockFns.values.mock.calls[0][0].title).toBe('Fork | Generate Logs')
   })
 
-  it('repairs legacy page-level browser resources while forking', async () => {
+  it('drops legacy browser rows while forking, since the desktop app owns those pages', async () => {
     dbChainMockFns.limit.mockResolvedValue([
       {
         ...parentRow,
@@ -318,6 +318,7 @@ describe('POST /api/mothership/chats/[chatId]/fork', () => {
             title: 'mship-todo (Channel) - sim - Slack',
           },
           { type: 'browser', id: 'browser-session', title: 'Browser' },
+          { type: 'file', id: 'file-1', title: 'report.csv' },
         ],
       },
     ])
@@ -326,7 +327,7 @@ describe('POST /api/mothership/chats/[chatId]/fork', () => {
 
     expect(res.status).toBe(200)
     expect(dbChainMockFns.values.mock.calls[0][0].resources).toEqual([
-      { type: 'browser', id: 'browser-session', title: 'Browser' },
+      { type: 'file', id: 'file-1', title: 'report.csv' },
     ])
   })
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
index 99705217a63..dc1adc0e509 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
@@ -22,7 +22,11 @@ import {
 } from '@sim/emcn'
 import { Columns3, Eye, Pencil } from '@sim/emcn/icons'
 import { browserTabTitle } from '@/lib/browser-agent/tab-label'
-import { openBrowserTab, sendBrowserPanelAction } from '@/lib/browser-agent/transport'
+import {
+  openBrowserTab,
+  reorderBrowserTab,
+  sendBrowserPanelAction,
+} from '@/lib/browser-agent/transport'
 import { SIM_RESOURCE_DRAG_TYPE, SIM_RESOURCES_DRAG_TYPE } from '@/lib/copilot/resource-types'
 import { isEphemeralResource } from '@/lib/copilot/resources/types'
 import { openTerminal } from '@/lib/terminal/transport'
@@ -396,11 +400,20 @@ export function ResourceTabs({
     [chatId, desktopScopeId, onRemoveResource, resources, selectedIds]
   )
 
+  /** The strip's own title for a resource — a browser tab's is its live page title. */
+  const withStripTitle = useCallback(
+    (resource: MothershipResource): MothershipResource => {
+      const title = tabs.find((tab) => tab.id === resource.id)?.title
+      return title && title !== resource.title ? { ...resource, title } : resource
+    },
+    [tabs]
+  )
+
   const handleTabDragStart = useCallback(
     (e: ReactDragEvent<HTMLDivElement>, id: string, drag: TabStripDragContext) => {
       const resource = resources.find((r) => r.id === id)
       if (!resource) return
-      const selected = resources.filter((r) => selectedIds.has(r.id))
+      const selected = resources.filter((r) => selectedIds.has(r.id)).map(withStripTitle)
       const isMultiDrag = selected.length > 1 && selectedIds.has(resource.id)
       if (isMultiDrag) {
         e.dataTransfer.effectAllowed = 'copy'
@@ -424,12 +437,13 @@ export function ResourceTabs({
       // and a drop target asking for `copy` is refused outright unless copying
       // is allowed too.
       e.dataTransfer.effectAllowed = 'copyMove'
+      const { type, id: resourceId, title } = withStripTitle(resource)
       e.dataTransfer.setData(
         SIM_RESOURCE_DRAG_TYPE,
-        JSON.stringify({ type: resource.type, id: resource.id, title: resource.title })
+        JSON.stringify({ type, id: resourceId, title })
       )
     },
-    [resources, selectedIds]
+    [resources, selectedIds, withStripTitle]
   )
 
   const handleReorder = useCallback(
@@ -440,6 +454,12 @@ export function ResourceTabs({
       const [moved] = reordered.splice(fromIndex, 1)
       reordered.splice(targetIndex, 0, moved)
       onReorderResources(reordered)
+      // Browser tabs are not stored with the chat; their order lives in the
+      // desktop's native list, which restore and the agent read back.
+      if (moved.type === 'browser') {
+        const browserIndex = reordered.filter((r) => r.type === 'browser').indexOf(moved)
+        reorderBrowserTab(moved.id, browserIndex, desktopScopeId)
+      }
       if (chatId) {
         const persistable = reordered.filter((r) => !isEphemeralResource(r))
         if (persistable.length > 0) {
@@ -448,7 +468,7 @@ export function ResourceTabs({
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [chatId, resources, onReorderResources]
+    [chatId, desktopScopeId, resources, onReorderResources]
   )
 
   const previewToggle =
diff --git a/apps/sim/lib/browser-agent/transport.test.ts b/apps/sim/lib/browser-agent/transport.test.ts
index 9cd09177094..8775e04a457 100644
--- a/apps/sim/lib/browser-agent/transport.test.ts
+++ b/apps/sim/lib/browser-agent/transport.test.ts
@@ -29,6 +29,7 @@ const {
   openUrlAvailable,
   panelAction,
   registerSitePermissionPromptSupport,
+  reorderTab,
   restoreScope,
   nativeSuspendScope,
   setPageState,
@@ -69,6 +70,7 @@ const {
   openUrlAvailable: { current: true },
   panelAction: vi.fn(),
   registerSitePermissionPromptSupport: vi.fn(),
+  reorderTab: vi.fn(),
   restoreScope: vi.fn(async (scopeId: string) => ({ scopeId, tabs: [], activeTabId: null })),
   nativeSuspendScope: vi.fn(async () => true),
   setPageState: vi.fn(),
@@ -108,6 +110,7 @@ vi.mock('@/lib/desktop', () => ({
       openUrl: openUrlAvailable.current ? openUrl : undefined,
       panelAction,
       registerSitePermissionPromptSupport,
+      reorderTab,
       restoreScope,
       suspendScope: nativeSuspendScope,
       setPanelBounds,
@@ -160,6 +163,7 @@ import {
   onBrowserToolbarCommand,
   openBrowserTab,
   openUrlInNewBrowserTab,
+  reorderBrowserTab,
   reportBrowserPanelBounds,
   reportBrowserPanelFocused,
   reportBrowserTheme,
@@ -337,6 +341,12 @@ describe('browser panel transport', () => {
     expect(supportsAtomicBrowserPanelOcclusion()).toBe(true)
   })
 
+  it('mirrors a strip reorder into the native tab list', () => {
+    reorderBrowserTab('tab-3', 1)
+
+    expect(reorderTab).toHaveBeenCalledWith('tab-3', 1, 'chat-test')
+  })
+
   it('opens and scopes the native browser toolbar menu', () => {
     showBrowserToolbarMenu({ x: 10, y: 20 }, 'chat-a')
     expect(showToolbarMenu).toHaveBeenCalledWith({ x: 10, y: 20 }, 'chat-a')
diff --git a/apps/sim/lib/browser-agent/transport.ts b/apps/sim/lib/browser-agent/transport.ts
index d6e0da1a7ed..fccf71880f5 100644
--- a/apps/sim/lib/browser-agent/transport.ts
+++ b/apps/sim/lib/browser-agent/transport.ts
@@ -383,6 +383,18 @@ export async function openUrlInNewBrowserTab(
   return state?.activeTabId ?? null
 }
 
+/**
+ * Mirrors a resource-strip reorder into the native tab list, so restore and
+ * the agent's tab list keep the strip's order. Older shells keep native order.
+ */
+export function reorderBrowserTab(
+  tabId: string,
+  targetIndex: number,
+  scopeId = currentBrowserScopeId()
+): void {
+  bridge()?.reorderTab?.(tabId, targetIndex, scopeId)
+}
+
 /** Mirrors Sim's raw light/dark/system preference into embedded pages. */
 export function reportBrowserTheme(theme: BrowserTheme): void {
   bridge()?.setTheme(theme)
diff --git a/packages/desktop-bridge/contract-snapshot.ts b/packages/desktop-bridge/contract-snapshot.ts
index f09ba71ac81..f402810285a 100644
--- a/packages/desktop-bridge/contract-snapshot.ts
+++ b/packages/desktop-bridge/contract-snapshot.ts
@@ -1085,6 +1085,11 @@ export interface SimDesktopBrowserAgentApi {
   disposeScope(scopeId: string): Promise<boolean>
   /** Closes a soft-deleted chat's live pages while retaining its restart descriptor. */
   suspendScope(scopeId: string): Promise<boolean>
+  /**
+   * Move a live tab to a final list index, mirroring the resource strip.
+   * Optional for compatibility with installed shells that predate strip-owned order.
+   */
+  reorderTab?(tabId: string, targetIndex: number, scopeId: string): void
   /**
    * Report where the browser panel sits in the window (CSS pixels relative
    * to the viewport), or null when the panel is hidden/unmounted. The main
diff --git a/packages/desktop-bridge/src/index.ts b/packages/desktop-bridge/src/index.ts
index bd577ab91af..f1be676d39c 100644
--- a/packages/desktop-bridge/src/index.ts
+++ b/packages/desktop-bridge/src/index.ts
@@ -177,6 +177,11 @@ export interface SimDesktopBrowserAgentApi {
   disposeScope(scopeId: string): Promise<boolean>
   /** Closes a soft-deleted chat's live pages while retaining its restart descriptor. */
   suspendScope(scopeId: string): Promise<boolean>
+  /**
+   * Move a live tab to a final list index, mirroring the resource strip.
+   * Optional for compatibility with installed shells that predate strip-owned order.
+   */
+  reorderTab?(tabId: string, targetIndex: number, scopeId: string): void
   /**
    * Report where the browser panel sits in the window (CSS pixels relative
    * to the viewport), or null when the panel is hidden/unmounted. The main

From c8cec17e7c11bce8f29de4764e93b70390e71725 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 10 Sep 2026 16:13:33 -0700
Subject: [PATCH 4/4] fix(emcn): drive the loader spin period from a CSS
 variable instead of an inline style

---
 .../components/resource-registry/browser-tab-icon.tsx        | 3 +--
 packages/emcn/src/icons/animate/loader.module.css            | 5 ++++-
 packages/emcn/src/icons/loader.tsx                           | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
index f162768d12a..cb0d6042c20 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
@@ -74,9 +74,8 @@ export function BrowserTabIcon({ tabId, scopeId, className }: BrowserTabIconProp
           {showSpinner ? (
             <Loader
               animate
-              className='size-[14px] text-[var(--text-icon)]'
+              className='size-[14px] text-[var(--text-icon)] [--loader-duration:650ms]'
               strokeWidth={2}
-              style={{ animationDuration: '650ms' }}
             />
           ) : !faviconLoaded || faviconFailed ? (
             <Globe className='size-[12px] text-[var(--text-icon)]' />
diff --git a/packages/emcn/src/icons/animate/loader.module.css b/packages/emcn/src/icons/animate/loader.module.css
index ebe4f368f54..5610cc63865 100644
--- a/packages/emcn/src/icons/animate/loader.module.css
+++ b/packages/emcn/src/icons/animate/loader.module.css
@@ -2,6 +2,9 @@
  * Loader icon animation
  * Continuous spinning animation for loading states
  * Uses GPU acceleration for smooth performance
+ * The period is read from `--loader-duration` so a consumer can set it from a
+ * utility class (`[--loader-duration:650ms]`); the module's own `animation`
+ * shorthand is unlayered and would otherwise beat any Tailwind override.
  */
 
 @keyframes spin {
@@ -14,7 +17,7 @@
 }
 
 .animated-loader-svg {
-  animation: spin 1s linear infinite;
+  animation: spin var(--loader-duration, 1s) linear infinite;
   transform-origin: center center;
   will-change: transform;
 }
diff --git a/packages/emcn/src/icons/loader.tsx b/packages/emcn/src/icons/loader.tsx
index 1b702c19e2a..c5d2367e30b 100644
--- a/packages/emcn/src/icons/loader.tsx
+++ b/packages/emcn/src/icons/loader.tsx
@@ -14,7 +14,9 @@ export interface LoaderProps extends SVGProps<SVGSVGElement> {
  * Loader icon component with optional CSS-based spinning animation
  * Based on refresh-cw but without the arrows, just the circular arcs.
  * When animate is false, this is a lightweight static icon with no animation overhead.
- * When animate is true, CSS module animations are applied for continuous spin.
+ * When animate is true, CSS module animations are applied for continuous spin;
+ * the period defaults to 1s and follows `--loader-duration` when a consumer sets it
+ * (for example `className='[--loader-duration:650ms]'`).
  * @param props - SVG properties including className, animate, etc.
  */
 export function Loader({ animate = false, className, ...props }: LoaderProps) {