@@ -16,6 +16,10 @@
       "group": "desktop-inbox",
       "task": "ci:e2e-desktop-inbox"
     },
+    {
+      "group": "browser-extension",
+      "task": "ci:e2e-browser-extension"
+    },
     {
       "group": "seo",
       "task": "ci:e2e-seo"
 
@@ -3,7 +3,7 @@ query($base: String!, $head: String!) {
   affectedTasks(base: $base, head: $head, tasks: [
     "test", "build", "type-check", "ci:integration", "ci:desktop-live",
     "ci:e2e-scim", "ci:e2e-cli", "ci:e2e-stop-after", "ci:e2e-desktop-inbox",
-    "ci:e2e-project-files", "ci:e2e-mobile", "ci:e2e-seo"
+    "ci:e2e-browser-extension", "ci:e2e-project-files", "ci:e2e-mobile", "ci:e2e-seo"
   ]) {
     items {
       name
 
@@ -3,7 +3,7 @@
 # CI groups, which reuse the production build from `e2e-build`.
 # The job extracts it into apps/sim/.next before running these suites.
 #
-# Usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|project-files|mobile|seo>   (run from apps/sim)
+# Usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|browser-extension|project-files|mobile|seo>   (run from apps/sim)
 #
 # The job provides DATABASE_URL, BETTER_AUTH_SECRET and ENCRYPTION_KEY; each group sets the rest of
 # its app's environment here. Reports and server logs land in $RUNNER_TEMP/e2e.
@@ -20,7 +20,7 @@
 # telemetry flush runs detached and still writes .next/dev).
 set -euo pipefail
 
-group=${1:?usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|project-files|mobile|seo>}
+group=${1:?usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|browser-extension|project-files|mobile|seo>}
 report_dir="$RUNNER_TEMP/e2e"
 ready_timeout_seconds=600
 mkdir -p "$report_dir"
@@ -198,7 +198,7 @@ case "$group" in
     ;;
 
   # The desktop background executor's protocol: device registration, the SSE doorbell over Redis
-  # pub/sub, presence, leased claims, Stop and isolation. The only group whose app gets Redis.
+  # pub/sub, presence, leased claims, Stop and isolation.
   desktop-inbox)
     export REDIS_URL=redis://127.0.0.1:6379
     export NEXT_PUBLIC_FORCE_HOSTED=false
@@ -228,6 +228,31 @@ case "$group" in
       bun --no-env-file scripts/test-organization-search-e2e.ts
     ;;
 
+  browser-extension)
+    export REDIS_URL=redis://127.0.0.1:6379
+    export NEXT_PUBLIC_FORCE_HOSTED=false
+    export KNOWLEDGE_MEMBER_ACCESS=true CREDENTIAL_GROUPS=true ACCESS_CONTROL_ENABLED=true
+    export NEXT_PUBLIC_ACCESS_CONTROL_ENABLED=true
+    export API_ENCRYPTION_KEY="$ENCRYPTION_KEY"
+    bunx --no-install playwright install --with-deps chromium
+    extension_identity=$(bun - <<'JS'
+      import { generateKeyPairSync, createHash } from 'node:crypto'
+      const { publicKey } = generateKeyPairSync('rsa', { modulusLength: 2048 })
+      const der = publicKey.export({ type: 'spki', format: 'der' })
+      const id = [...createHash('sha256').update(der).digest('hex').slice(0, 32)]
+        .map(c => String.fromCharCode(97 + parseInt(c, 16))).join('')
+      process.stdout.write(`${der.toString('base64')}\n${id}`)
+JS
+    )
+    export SIM_EXTENSION_KEY="${extension_identity%%$'\n'*}"
+    export BROWSER_EXTENSION_IDS="${extension_identity#*$'\n'}"
+    start_app browser-extension 3007 'browser extension' record-http-status
+    EXTENSION_APP_E2E_BASE_URL="$local_app_url" \
+    EXTENSION_APP_E2E_DATABASE_URL="$DATABASE_URL" \
+    EXTENSION_APP_E2E_REPORT_PATH="$report_dir/browser-extension/report.json" \
+      bun run test:browser-extension:e2e
+    ;;
+
   project-files)
     PROJECT_FILES_E2E_ADMIN_DATABASE_URL=postgresql://postgres:postgres@127.0.0.1:5432/postgres \
     PROJECT_FILES_E2E_REDIS_URL=redis://127.0.0.1:6379 \
 
@@ -28,42 +28,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  browser:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    services:
-      postgres:
-        image: pgvector/pgvector:pg17
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: extension_test
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd "pg_isready -U postgres -d extension_test"
-          --health-interval 5s
-          --health-timeout 5s
-          --health-retries 10
-      redis:
-        image: redis:8.2-alpine
-        ports:
-          - 6379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 5s
-          --health-timeout 5s
-          --health-retries 10
-    env:
-      DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/extension_test
-      REDIS_URL: redis://127.0.0.1:6379
-      NEXT_PUBLIC_APP_URL: http://127.0.0.1:3007
-      BETTER_AUTH_URL: http://127.0.0.1:3007
-      BETTER_AUTH_SECRET: browser-extension-ci-auth-secret-32-characters
-      ENCRYPTION_KEY: '0000000000000000000000000000000000000000000000000000000000000000'
-      API_ENCRYPTION_KEY: '1111111111111111111111111111111111111111111111111111111111111111'
-      NEXT_TELEMETRY_DISABLED: '1'
-      DISABLE_AUTH: 'false'
+  transport:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
         with:
@@ -81,43 +48,9 @@ jobs:
         working-directory: apps/extension
         env:
           EXTENSION_REPORT_PATH: test-results/extension-report.json
-      - name: Provision the disposable app database
-        run: bun run --cwd packages/db db:migrate
-      - name: Generate the fixture extension identity
-        run: |
-          bun - <<'JS' >> "$GITHUB_ENV"
-            import { generateKeyPairSync, createHash } from "node:crypto";
-            const { publicKey } = generateKeyPairSync("rsa", { modulusLength: 2048 });
-            const der = publicKey.export({ type: "spki", format: "der" });
-            const id = [...createHash("sha256").update(der).digest("hex").slice(0, 32)]
-              .map(c => String.fromCharCode(97 + parseInt(c, 16))).join("");
-            process.stdout.write(`SIM_EXTENSION_KEY=${der.toString("base64")}\nBROWSER_EXTENSION_IDS=${id}\n`);
-          JS
-      - name: Start the real Sim app
-        working-directory: apps/sim
-        run: |
-          node "$(bun -p 'require.resolve("next/dist/bin/next")')" dev --hostname 127.0.0.1 --port 3007 > "$RUNNER_TEMP/extension-app.log" 2>&1 &
-          for ((attempt=0; attempt<60; attempt++)); do
-            if curl --fail --silent http://127.0.0.1:3007/api/auth/get-session > /dev/null; then exit 0; fi
-            sleep 2
-          done
-          exit 1
-      - name: Exercise authenticated app integration
-        working-directory: apps/sim
-        run: bun run test:browser-extension:e2e
-        env:
-          EXTENSION_APP_E2E_BASE_URL: http://127.0.0.1:3007
-          EXTENSION_APP_E2E_DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/extension_test
-          EXTENSION_APP_E2E_REPORT_PATH: ../extension/test-results/real-app-report.json
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         if: always()
         with:
           name: browser-extension-results
           path: apps/extension/test-results
           retention-days: 7
-      - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
-        if: failure()
-        with:
-          name: browser-extension-app-log
-          path: ${{ runner.temp }}/extension-app.log
-          retention-days: 7
@@ -217,9 +217,9 @@ jobs:
           --health-interval 5s
           --health-timeout 5s
           --health-retries 10
-      # Desktop inbox and Project Files use Redis.
+      # Desktop inbox, browser extension, and Project Files use Redis.
       redis:
-        image: ${{ (matrix.group == 'desktop-inbox' || matrix.group == 'project-files') && 'redis:8.2-alpine' || '' }}
+        image: ${{ (matrix.group == 'desktop-inbox' || matrix.group == 'browser-extension' || matrix.group == 'project-files') && 'redis:8.2-alpine' || '' }}
         ports:
           - 6379:6379
         options: >-
@@ -296,7 +296,9 @@ jobs:
         uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: e2e-reports-${{ matrix.group }}
-          path: ${{ runner.temp }}/e2e/**/*.json
+          path: |
+            ${{ runner.temp }}/e2e/**/*.json
+            ${{ runner.temp }}/e2e/browser-extension/**/*.png
           if-no-files-found: ignore
           retention-days: 7
 
 
@@ -1,6 +1,6 @@
 # Sim browser extension
 
-The Chrome extension attaches an explicitly captured page or selection to the existing Sim chat. The native side panel hosts the authenticated `/extension` app surface. Chat rendering, execution, permissions, billing, and history belong to Sim and Mothership.
+The Chrome extension attaches an explicitly captured page or selection to the existing Sim chat. The native side panel hosts the authenticated `/extension` app surface. Chat opens in the user's organization when available; choosing a workspace is optional. Members without access to Home use the organization's Assistant. Chat rendering, execution, permissions, billing, and history belong to Sim and Mothership.
 
 ## Build and load
 
@@ -48,7 +48,7 @@ The E2E suite uses real Chromium, the packaged extension, and a disposable HTTP
 
 Release verification must additionally exercise the native toolbar and shortcut, Chrome's real grant/revoke prompt, sign-in/SSO and expiry against the running Sim app, side-panel closing/reopening, workspace changes, narrow widths, and the real Mothership streaming response. The fixture suite does not establish those integrations. The design document records launch scope and release criteria.
 
-The authenticated acceptance suite runs against a real local app, Better Auth, and a disposable Postgres database whose name contains `test`:
+The authenticated acceptance suite runs against a real local app, Better Auth, and a disposable Postgres database whose name contains `test`. Enable `KNOWLEDGE_MEMBER_ACCESS`, `CREDENTIAL_GROUPS`, `ACCESS_CONTROL_ENABLED`, and `NEXT_PUBLIC_ACCESS_CONTROL_ENABLED` on that app to exercise restricted organization members:
 
 ```sh
 EXTENSION_APP_E2E_BASE_URL=http://127.0.0.1:3007 \
@@ -58,7 +58,7 @@ SIM_EXTENSION_KEY="$PUBLIC_EXTENSION_KEY" \
 bun run --cwd apps/sim test:browser-extension:e2e
 ```
 
-Configure the matching extension ID in the running app. The suite builds into a temporary directory, creates its own accounts/workspaces, and removes them afterward; it leaves the shipping `dist` untouched. It verifies real authentication, workspace denial, page limits, navigation, source links, clipboard writes, actual replay-recorder exclusion, themes, widths, and sign-out. CI provisions this isolated environment with `next dev`; the main checks workflow separately validates the production build. This keeps the disposable extension origin and identity independent of the shared app build. Set `EXTENSION_APP_E2E_LIVE_CHAT=1` when the app is connected to a working local Mothership instance to additionally verify live rendering, saved page context, queue editing, and drafts through chat admission. Provider credentials belong only in that server's environment. Reports and screenshots are written beside the supplied report path. Native toolbar/shortcut/context-menu and permission-prompt checks remain manual release checks.
+Configure the matching extension ID in the running app. The suite builds into a temporary directory, creates its own accounts/workspaces, and removes them afterward; it leaves the shipping `dist` untouched. It verifies real authentication, workspace denial, page limits, navigation, source links, clipboard writes, actual replay-recorder exclusion, themes, widths, and sign-out. CI provisions this isolated environment in the shared HTTP acceptance matrix, using the same production build as the other app suites. The packaged extension transport suite runs separately. Set `EXTENSION_APP_E2E_LIVE_CHAT=1` when the app is connected to a working local Mothership instance to additionally verify live rendering, saved page context, queue editing, and drafts through chat admission. Provider credentials belong only in that server's environment. Reports and screenshots are written beside the supplied report path. Native toolbar/shortcut/context-menu and permission-prompt checks remain manual release checks.
 
 ## Distribution
 
 
@@ -258,6 +258,20 @@ try {
     )
     await page.reload()
   })
+  await check(
+    'An expired toolbar intent asks for a fresh capture without delivering content',
+    async () => {
+      const before = (await snapshots()).length
+      const intent = { ...(await pendingIntent()), createdAt: Date.now() - 60_000 }
+      await worker.evaluate(async (pending) => {
+        await chrome.storage.session.set({ [`captureIntent:${pending.windowId}:expired`]: pending })
+      }, intent)
+      await expect(panel.getByRole('status')).toHaveText(
+        'The capture expired. Attach the page again.'
+      )
+      assert((await snapshots()).length === before, 'Expired toolbar intent delivered content')
+    }
+  )
   await check('Page extraction excludes secrets and strips URL query and fragment', async () => {
     const [snapshot] = await snapshots()
     assert(snapshot.text.includes('visible-reference-482'), 'Visible page content missing')
 
@@ -152,8 +152,12 @@ function SidePanel({ origin }: SidePanelProps) {
             )
           return
         }
-        if (!disposed && intent && Date.now() - intent.createdAt <= CAPTURE_INTENT_TTL_MS)
-          await capture(intent.kind, intent)
+        if (disposed || !intent) return
+        if (Date.now() - intent.createdAt > CAPTURE_INTENT_TTL_MS) {
+          setStatus('The capture expired. Attach the page again.')
+          return
+        }
+        await capture(intent.kind, intent)
       } catch {
         if (!disposed) setStatus('Could not receive the capture request. Attach the page again.')
       } finally {
@@ -209,10 +213,18 @@ function SidePanel({ origin }: SidePanelProps) {
       }
       void consumeIntent()
     }, 5_000)
+    const tabUpdated = (
+      _tabId: number,
+      change: chrome.tabs.OnUpdatedInfo,
+      tab: chrome.tabs.Tab
+    ) => {
+      if (!tab.active || (change.url === undefined && change.status === undefined)) return
+      update()
+    }
     window.addEventListener('message', message)
     chrome.storage.onChanged.addListener(storageChanged)
     chrome.tabs.onActivated.addListener(update)
-    chrome.tabs.onUpdated.addListener(update)
+    chrome.tabs.onUpdated.addListener(tabUpdated)
     chrome.permissions.onAdded.addListener(update)
     chrome.permissions.onRemoved.addListener(update)
     update()
@@ -227,7 +239,7 @@ function SidePanel({ origin }: SidePanelProps) {
       window.removeEventListener('message', message)
       chrome.storage.onChanged.removeListener(storageChanged)
       chrome.tabs.onActivated.removeListener(update)
-      chrome.tabs.onUpdated.removeListener(update)
+      chrome.tabs.onUpdated.removeListener(tabUpdated)
       chrome.permissions.onAdded.removeListener(update)
       chrome.permissions.onRemoved.removeListener(update)
     }
@@ -271,9 +283,8 @@ function SidePanel({ origin }: SidePanelProps) {
         <ChipModalHeader onClose={() => setAccessOpen(false)}>Site access</ChipModalHeader>
         <ChipModalBody>
           {site ? (
-            <Chip onClick={() => void toggleSite()}>
-              {site.allowed ? 'Remove access to' : 'Allow access to'}{' '}
-              {new URL(site.origin).hostname}
+            <Chip className='max-w-full' onClick={() => void toggleSite()}>
+              {`${site.allowed ? 'Remove access to' : 'Allow access to'} ${new URL(site.origin).hostname}`}
             </Chip>
           ) : (
             <p className='text-[var(--text-muted)] text-small'>