fix: switch from chrome.storage.session to WXT local storage

chrome.storage.session and its onChanged listener may not work reliably across all extension page contexts in BrowserOS. Switched to local storage with WXT's storage.defineItem and .watch() which are proven to work in this codebase (used by stopAgentStorage, searchActionsStorage, etc). Simpler: single map, WXT handles cross-context change notifications.
fix: stabilize follower watcher — prevent effect re-runs
2026-05-14 08:03:58 +00:00 · 2026-03-19 00:48:29 +05:30 · 2026-03-19 00:44:21 +05:30 · 2026-03-19 00:41:36 +05:30 · 2026-03-19 00:22:47 +05:30 · 2026-03-19 00:00:29 +05:30
373 changed files with 6663 additions and 24051 deletions
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -5,7 +5,7 @@ on:
    branches:
      - main
    paths:
-      - "packages/browseros-agent/**"
+      - 'packages/browseros-agent/**'

 jobs:
  biome:
@@ -50,9 +50,6 @@ jobs:
      - name: Install dependencies
        run: bun ci

-      - name: Prepare wxt
-        run: VITE_PUBLIC_BROWSEROS_API=http://localhost:3000 bun run --cwd apps/agent wxt prepare
-
      - name: Run codegen
        run: bun run --cwd apps/agent codegen

--- a/.github/workflows/eval-weekly.yml
+++ b/.github/workflows/eval-weekly.yml
@@ -1,98 +0,0 @@
-name: Weekly Eval
-
-on:
-  schedule:
-    # Every Saturday at 06:00 UTC
-    - cron: '0 6 * * 6'
-  push:
-    branches: [main]
-    paths:
-      - 'packages/browseros-agent/apps/server/src/agent/**'
-      - 'packages/browseros-agent/apps/server/src/tools/**'
-  workflow_dispatch:
-    inputs:
-      config:
-        description: 'Eval config file (relative to apps/eval/)'
-        required: false
-        default: 'configs/browseros-agent-weekly.json'
-
-permissions:
-  contents: read
-
-jobs:
-  eval:
-    runs-on: ubuntu-latest
-    timeout-minutes: 360
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install BrowserOS
-        run: |
-          wget -q https://github.com/browseros-ai/BrowserOS/releases/download/v0.44.0.1/BrowserOS_v0.44.0.1_amd64.deb
-          sudo dpkg -i BrowserOS_v0.44.0.1_amd64.deb
-          browseros --version || echo "BrowserOS installed at $(which browseros)"
-
-      - name: Install Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-
-      - name: Install dependencies
-        working-directory: packages/browseros-agent
-        run: bun install --ignore-scripts && bun run build:agent-sdk
-
-      - name: Install xvfb
-        run: sudo apt-get update && sudo apt-get install -y xvfb
-
-      - name: Install captcha solver extension
-        working-directory: packages/browseros-agent/apps/eval
-        run: |
-          mkdir -p extensions
-          curl -sL -o /tmp/nopecha.zip https://github.com/NopeCHALLC/nopecha-extension/releases/latest/download/chromium_automation.zip
-          unzip -qo /tmp/nopecha.zip -d extensions/nopecha
-
-      - name: Run eval
-        working-directory: packages/browseros-agent/apps/eval
-        env:
-          FIREWORKS_API_KEY: ${{ secrets.FIREWORKS_API_KEY }}
-          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          NOPECHA_API_KEY: ${{ secrets.NOPECHA_API_KEY }}
-          BROWSEROS_BINARY: /usr/bin/browseros
-          EVAL_CONFIG: ${{ github.event.inputs.config || 'configs/browseros-agent-weekly.json' }}
-        run: |
-          echo "Running eval with config: $EVAL_CONFIG"
-          xvfb-run --auto-servernum --server-args="-screen 0 1440x900x24" bun run src/index.ts -c "$EVAL_CONFIG"
-
-      - name: Upload runs to R2
-        if: success()
-        working-directory: packages/browseros-agent/apps/eval
-        env:
-          EVAL_R2_ACCOUNT_ID: ${{ secrets.EVAL_R2_ACCOUNT_ID }}
-          EVAL_R2_ACCESS_KEY_ID: ${{ secrets.EVAL_R2_ACCESS_KEY_ID }}
-          EVAL_R2_SECRET_ACCESS_KEY: ${{ secrets.EVAL_R2_SECRET_ACCESS_KEY }}
-          EVAL_R2_BUCKET: ${{ secrets.EVAL_R2_BUCKET }}
-          EVAL_R2_CDN_BASE_URL: ${{ secrets.EVAL_R2_CDN_BASE_URL }}
-          EVAL_CONFIG: ${{ github.event.inputs.config || 'configs/browseros-agent-weekly.json' }}
-        run: |
-          CONFIG_NAME=$(basename "$EVAL_CONFIG" .json)
-          bun scripts/upload-run.ts "results/$CONFIG_NAME"
-
-      - name: Generate trend report
-        if: success()
-        working-directory: packages/browseros-agent
-        env:
-          EVAL_R2_ACCOUNT_ID: ${{ secrets.EVAL_R2_ACCOUNT_ID }}
-          EVAL_R2_ACCESS_KEY_ID: ${{ secrets.EVAL_R2_ACCESS_KEY_ID }}
-          EVAL_R2_SECRET_ACCESS_KEY: ${{ secrets.EVAL_R2_SECRET_ACCESS_KEY }}
-          EVAL_R2_BUCKET: ${{ secrets.EVAL_R2_BUCKET }}
-          EVAL_R2_CDN_BASE_URL: ${{ secrets.EVAL_R2_CDN_BASE_URL }}
-        run: bun apps/eval/scripts/weekly-report.ts /tmp/eval-report.html
-
-      - name: Upload report as artifact
-        if: success()
-        uses: actions/upload-artifact@v4
-        with:
-          name: eval-report-${{ github.run_id }}
-          path: /tmp/eval-report.html
--- a/.github/workflows/pr-title.yml
+++ b/.github/workflows/pr-title.yml
@@ -2,7 +2,7 @@ name: PR Conventional Commit Validation

 on:
  pull_request:
-    types: [opened, edited]
+    types: [opened, synchronize, reopened, edited]

 permissions:
  pull-requests: write
--- a/.github/workflows/release-agent-extension.yml
+++ b/.github/workflows/release-agent-extension.yml
@@ -1,148 +0,0 @@
-name: Release Agent Extension
-
-on:
-  workflow_dispatch:
-
-concurrency:
-  group: release-agent-extension
-  cancel-in-progress: false
-
-jobs:
-  release:
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    defaults:
-      run:
-        working-directory: packages/browseros-agent/apps/agent
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - uses: oven-sh/setup-bun@v2
-
-      - name: Install dependencies
-        run: bun ci
-        working-directory: packages/browseros-agent
-
-      - name: Build and zip extension
-        run: bun run codegen && bun run zip
-        env:
-          VITE_PUBLIC_BROWSEROS_API: https://api.browseros.com
-
-      - name: Get version and zip path
-        id: version
-        run: |
-          echo "version=$(node -p "require('./package.json').version")" >> "$GITHUB_OUTPUT"
-          echo "release_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-          ZIP_FILE=$(ls "$(pwd)/dist/"*-chrome.zip | head -n 1)
-          echo "zip_path=$ZIP_FILE" >> "$GITHUB_OUTPUT"
-          echo "zip_name=$(basename "$ZIP_FILE")" >> "$GITHUB_OUTPUT"
-
-      - name: Generate release notes
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          AGENT_PATH="packages/browseros-agent/apps/agent"
-          CURRENT_TAG="agent-extension-v${{ steps.version.outputs.version }}"
-          PREV_TAG=$(git tag -l "agent-extension-v*" --sort=-v:refname | grep -v "^${CURRENT_TAG}$" | head -n 1)
-
-          if [ -z "$PREV_TAG" ]; then
-            echo "Initial release" > /tmp/release-notes.md
-          else
-            COMMITS=$(git log "$PREV_TAG"..HEAD --pretty=format:"%H" -- "$AGENT_PATH")
-
-            if [ -z "$COMMITS" ]; then
-              echo "No notable changes." > /tmp/release-notes.md
-            else
-              echo "## What's Changed" > /tmp/release-notes.md
-              echo "" >> /tmp/release-notes.md
-
-              while IFS= read -r SHA; do
-                SUBJECT=$(git log -1 --pretty=format:"%s" "$SHA")
-                PR_NUM=$(gh api "/repos/${{ github.repository }}/commits/${SHA}/pulls" --jq '.[0].number // empty' 2>/dev/null)
-
-                # Skip PR number if already in the commit subject (squash merges include it)
-                if [ -n "$PR_NUM" ] && ! echo "$SUBJECT" | grep -qF "(#${PR_NUM})"; then
-                  echo "- ${SUBJECT} (#${PR_NUM})" >> /tmp/release-notes.md
-                else
-                  echo "- ${SUBJECT}" >> /tmp/release-notes.md
-                fi
-              done <<< "$COMMITS"
-            fi
-          fi
-        working-directory: ${{ github.workspace }}
-
-      - name: Create GitHub release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          TAG="agent-extension-v${{ steps.version.outputs.version }}"
-          RELEASE_SHA="${{ steps.version.outputs.release_sha }}"
-          TITLE="BrowserOS Agent Extension v${{ steps.version.outputs.version }}"
-
-          if git rev-parse "$TAG" >/dev/null 2>&1; then
-            echo "Tag $TAG already exists, skipping tag creation"
-          else
-            git tag "$TAG" "$RELEASE_SHA"
-          fi
-
-          if git ls-remote --tags origin "$TAG" | grep -q "$TAG"; then
-            echo "Tag $TAG already on remote, skipping push"
-          else
-            git push origin "$TAG"
-          fi
-
-          if gh release view "$TAG" >/dev/null 2>&1; then
-            echo "Release $TAG already exists, updating"
-            gh release edit "$TAG" --title "$TITLE" --notes-file /tmp/release-notes.md
-            gh release upload "$TAG" "${{ steps.version.outputs.zip_path }}" --clobber
-          else
-            gh release create "$TAG" \
-              --title "$TITLE" \
-              --notes-file /tmp/release-notes.md \
-              "${{ steps.version.outputs.zip_path }}"
-          fi
-        working-directory: ${{ github.workspace }}
-
-      - name: Update CHANGELOG.md via PR
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          DATE=$(date -u +"%Y-%m-%d")
-          BRANCH="docs/agent-extension-changelog-v${VERSION}"
-          CHANGELOG="packages/browseros-agent/apps/agent/CHANGELOG.md"
-
-          git checkout main
-
-          {
-            head -n 1 "$CHANGELOG"
-            echo ""
-            echo "## v${VERSION} (${DATE})"
-            echo ""
-            cat /tmp/release-notes.md
-            echo ""
-            tail -n +2 "$CHANGELOG"
-          } > /tmp/new-changelog.md
-          mv /tmp/new-changelog.md "$CHANGELOG"
-
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout -b "$BRANCH"
-          git add "$CHANGELOG"
-          git commit -m "docs: update agent extension changelog for v${VERSION}"
-          git push origin "$BRANCH"
-
-          gh pr create \
-            --title "docs: update agent extension changelog for v${VERSION}" \
-            --body "Auto-generated changelog update for BrowserOS Agent Extension v${VERSION}." \
-            --base main \
-            --head "$BRANCH"
-
-          gh pr merge "$BRANCH" --squash --auto || true
-        working-directory: ${{ github.workspace }}
--- a/.github/workflows/release-agent-sdk.yml
+++ b/.github/workflows/release-agent-sdk.yml
@@ -3,25 +3,16 @@ name: Release Agent SDK
 on:
  workflow_dispatch:

-concurrency:
-  group: release-agent-sdk
-  cancel-in-progress: false
-
 jobs:
  publish:
    if: github.ref == 'refs/heads/main'
    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
    defaults:
      run:
        working-directory: packages/browseros-agent/packages/agent-sdk

    steps:
      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0

      - uses: oven-sh/setup-bun@v2

@@ -40,129 +31,7 @@ jobs:
      - name: Test
        run: bun test

-      - name: Get version
-        id: version
-        run: |
-          echo "version=$(node -p "require('./package.json').version")" >> "$GITHUB_OUTPUT"
-          echo "release_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: Generate release notes
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          SDK_PATH="packages/browseros-agent/packages/agent-sdk"
-          CURRENT_TAG="agent-sdk-v${{ steps.version.outputs.version }}"
-          # Find the previous tag, excluding the current version's tag
-          # (which may already exist from a prior failed run)
-          PREV_TAG=$(git tag -l "agent-sdk-v*" --sort=-v:refname | grep -v "^${CURRENT_TAG}$" | head -n 1)
-
-          if [ -z "$PREV_TAG" ]; then
-            echo "Initial release" > /tmp/release-notes.md
-          else
-            # Get commits scoped to the SDK directory
-            COMMITS=$(git log "$PREV_TAG"..HEAD --pretty=format:"%H" -- "$SDK_PATH")
-
-            if [ -z "$COMMITS" ]; then
-              echo "No notable changes." > /tmp/release-notes.md
-            else
-              echo "## What's Changed" > /tmp/release-notes.md
-              echo "" >> /tmp/release-notes.md
-
-              # For each commit, find the associated PR and format with author
-              CONTRIBUTORS=""
-              while IFS= read -r SHA; do
-                # Get commit subject and author
-                SUBJECT=$(git log -1 --pretty=format:"%s" "$SHA")
-                AUTHOR=$(git log -1 --pretty=format:"%an" "$SHA")
-                GITHUB_USER=$(gh api "/repos/${{ github.repository }}/commits/${SHA}" --jq '.author.login // empty' 2>/dev/null)
-
-                # Find associated PR number
-                PR_NUM=$(gh api "/repos/${{ github.repository }}/commits/${SHA}/pulls" --jq '.[0].number // empty' 2>/dev/null)
-
-                # Format line: skip PR number if already in the commit subject
-                # (squash merges include "(#123)" in the subject automatically)
-                if [ -n "$PR_NUM" ] && ! echo "$SUBJECT" | grep -qF "(#${PR_NUM})"; then
-                  echo "- ${SUBJECT} (#${PR_NUM})" >> /tmp/release-notes.md
-                else
-                  echo "- ${SUBJECT}" >> /tmp/release-notes.md
-                fi
-              done <<< "$COMMITS"
-            fi
-          fi
-        working-directory: ${{ github.workspace }}
-
      - name: Publish
        run: npm publish --access public
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Create GitHub release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          TAG="agent-sdk-v${{ steps.version.outputs.version }}"
-          RELEASE_SHA="${{ steps.version.outputs.release_sha }}"
-          TITLE="@browseros-ai/agent-sdk v${{ steps.version.outputs.version }}"
-
-          # Create or reuse tag (idempotent for re-runs)
-          if git rev-parse "$TAG" >/dev/null 2>&1; then
-            echo "Tag $TAG already exists, skipping tag creation"
-          else
-            git tag "$TAG" "$RELEASE_SHA"
-          fi
-
-          # Push tag (skip if already on remote)
-          if git ls-remote --tags origin "$TAG" | grep -q "$TAG"; then
-            echo "Tag $TAG already on remote, skipping push"
-          else
-            git push origin "$TAG"
-          fi
-
-          # Create or update release
-          if gh release view "$TAG" >/dev/null 2>&1; then
-            echo "Release $TAG already exists, updating"
-            gh release edit "$TAG" --title "$TITLE" --notes-file /tmp/release-notes.md
-          else
-            gh release create "$TAG" --title "$TITLE" --notes-file /tmp/release-notes.md
-          fi
-        working-directory: ${{ github.workspace }}
-
-      - name: Update CHANGELOG.md via PR
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          DATE=$(date -u +"%Y-%m-%d")
-          BRANCH="docs/agent-sdk-changelog-v${VERSION}"
-          CHANGELOG="packages/browseros-agent/packages/agent-sdk/CHANGELOG.md"
-
-          # Return to main before branching
-          git checkout main
-
-          # Use head/tail to safely insert without sed quoting issues
-          {
-            head -n 1 "$CHANGELOG"
-            echo ""
-            echo "## v${VERSION} (${DATE})"
-            echo ""
-            cat /tmp/release-notes.md
-            echo ""
-            tail -n +2 "$CHANGELOG"
-          } > /tmp/new-changelog.md
-          mv /tmp/new-changelog.md "$CHANGELOG"
-
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout -b "$BRANCH"
-          git add "$CHANGELOG"
-          git commit -m "docs: update agent-sdk changelog for v${VERSION}"
-          git push origin "$BRANCH"
-
-          gh pr create \
-            --title "docs: update agent-sdk changelog for v${VERSION}" \
-            --body "Auto-generated changelog update for @browseros-ai/agent-sdk v${VERSION}." \
-            --base main \
-            --head "$BRANCH"
-
-          gh pr merge "$BRANCH" --squash --auto || true
-        working-directory: ${{ github.workspace }}
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -1,143 +0,0 @@
-name: Release CLI
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Release version (e.g. 0.1.0)"
-        required: true
-        type: string
-
-concurrency:
-  group: release-cli
-  cancel-in-progress: false
-
-jobs:
-  release:
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    defaults:
-      run:
-        working-directory: packages/browseros-agent/apps/cli
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: packages/browseros-agent/apps/cli/go.mod
-
-      - name: Run tests
-        run: go test ./... -v
-
-      - name: Run vet
-        run: go vet ./...
-
-      - name: Build all platforms
-        run: |
-          VERSION="${{ inputs.version }}"
-          LDFLAGS="-s -w -X main.version=${VERSION}"
-          DIST="dist"
-          mkdir -p "$DIST"
-
-          for pair in darwin/amd64 darwin/arm64 linux/amd64 linux/arm64 windows/amd64 windows/arm64; do
-            OS="${pair%/*}"
-            ARCH="${pair#*/}"
-            BIN="browseros-cli"
-            EXT=""
-            if [ "$OS" = "windows" ]; then EXT=".exe"; fi
-
-            echo "Building ${OS}/${ARCH}..."
-            GOOS=$OS GOARCH=$ARCH CGO_ENABLED=0 go build -trimpath -ldflags "$LDFLAGS" -o "${DIST}/${BIN}${EXT}" .
-
-            ARCHIVE="browseros-cli_${VERSION}_${OS}_${ARCH}"
-            if [ "$OS" = "windows" ]; then
-              (cd "$DIST" && zip "${ARCHIVE}.zip" "${BIN}${EXT}")
-            else
-              (cd "$DIST" && tar czf "${ARCHIVE}.tar.gz" "${BIN}")
-            fi
-            rm "${DIST}/${BIN}${EXT}"
-          done
-
-          (cd "$DIST" && sha256sum *.tar.gz *.zip > checksums.txt)
-          echo "=== Built artifacts ==="
-          ls -lh "$DIST"
-
-      - name: Generate release notes
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          CLI_PATH="packages/browseros-agent/apps/cli"
-          TAG="browseros-cli-v${{ inputs.version }}"
-          CHANGELOG_FILE="/tmp/release-changelog.md"
-          PREV_TAG=$(git tag -l "browseros-cli-v*" --sort=-v:refname | grep -v "^${TAG}$" | head -n 1)
-
-          if [ -z "$PREV_TAG" ]; then
-            echo "Initial release of browseros-cli." > "$CHANGELOG_FILE"
-          else
-            COMMITS=$(git log "$PREV_TAG"..HEAD --pretty=format:"%H" -- "$CLI_PATH")
-
-            if [ -z "$COMMITS" ]; then
-              echo "No notable changes." > "$CHANGELOG_FILE"
-            else
-              echo "## What's Changed" > "$CHANGELOG_FILE"
-              echo "" >> "$CHANGELOG_FILE"
-
-              while IFS= read -r SHA; do
-                SUBJECT=$(git log -1 --pretty=format:"%s" "$SHA")
-                PR_NUM=$(gh api "/repos/${{ github.repository }}/commits/${SHA}/pulls" --jq '.[0].number // empty' 2>/dev/null)
-
-                if [ -n "$PR_NUM" ] && ! echo "$SUBJECT" | grep -qF "(#${PR_NUM})"; then
-                  echo "- ${SUBJECT} (#${PR_NUM})" >> "$CHANGELOG_FILE"
-                else
-                  echo "- ${SUBJECT}" >> "$CHANGELOG_FILE"
-                fi
-              done <<< "$COMMITS"
-            fi
-          fi
-
-          cat "$CHANGELOG_FILE" > /tmp/release-notes.md
-          cat >> /tmp/release-notes.md <<'EOF'
-
-          ## Install `browseros-cli`
-
-          ### macOS / Linux
-
-          ```bash
-          curl -fsSL https://cdn.browseros.com/cli/install.sh | bash
-          ```
-
-          ### Windows
-
-          ```powershell
-          irm https://cdn.browseros.com/cli/install.ps1 | iex
-          ```
-
-          After install, run `browseros-cli init` to point the CLI at your BrowserOS MCP server.
-          EOF
-        working-directory: ${{ github.workspace }}
-
-      - name: Create tag and release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          TAG="browseros-cli-v${{ inputs.version }}"
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-          if ! git rev-parse "$TAG" >/dev/null 2>&1; then
-            git tag -a "$TAG" -m "browseros-cli v${{ inputs.version }}"
-            git push origin "$TAG"
-          fi
-
-          CLI_DIST="packages/browseros-agent/apps/cli/dist"
-          gh release create "$TAG" \
-            --title "browseros-cli v${{ inputs.version }}" \
-            --notes-file /tmp/release-notes.md \
-            ${CLI_DIST}/*
-        working-directory: ${{ github.workspace }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,44 +1,15 @@
 name: Tests

-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-    paths:
-      - .github/workflows/test.yml
-      - packages/browseros-agent/**
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  BROWSEROS_APPIMAGE_URL: https://files.browseros.com/download/BrowserOS.AppImage
+on: []

 jobs:
  test:
-    name: Tests / ${{ matrix.suite }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
+    name: Run Tests
+    runs-on: macos-latest
+    timeout-minutes: 10
    defaults:
      run:
        working-directory: packages/browseros-agent
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - suite: tools
-            test_path: tests/tools
-            junit_path: test-results/tools.xml
-          - suite: integration
-            test_path: tests/server.integration.test.ts
-            junit_path: test-results/integration.xml
-          - suite: sdk
-            test_path: tests/sdk
-            junit_path: test-results/sdk.xml

    steps:
      - name: Checkout code
@@ -50,92 +21,7 @@ jobs:
      - name: Install dependencies
        run: bun ci

-      - name: Resolve BrowserOS cache key
-        id: browseros-cache-key
-        run: |
-          set -euo pipefail
-          headers="$(curl -fsSI "$BROWSEROS_APPIMAGE_URL")"
-          etag="$(printf '%s\n' "$headers" | awk 'BEGIN{IGNORECASE=1} /^etag:/ {sub(/\r$/, "", $2); gsub(/"/, "", $2); print $2; exit}')"
-          last_modified="$(printf '%s\n' "$headers" | awk 'BEGIN{IGNORECASE=1} /^last-modified:/ {$1=""; sub(/^ /, ""); sub(/\r$/, ""); print; exit}')"
-          raw_key="${etag:-$last_modified}"
-          if [ -z "$raw_key" ]; then
-            raw_key="$BROWSEROS_APPIMAGE_URL"
-          fi
-          cache_key="$(printf '%s' "$raw_key" | shasum -a 256 | awk '{print $1}')"
-          echo "key=browseros-appimage-${{ runner.os }}-$cache_key" >> "$GITHUB_OUTPUT"
-
-      - name: Restore BrowserOS cache
-        id: browseros-cache
-        uses: actions/cache@v4
-        with:
-          path: packages/browseros-agent/.ci/bin/BrowserOS.AppImage
-          key: ${{ steps.browseros-cache-key.outputs.key }}
-
-      - name: Download BrowserOS
-        if: steps.browseros-cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p .ci/bin
-          curl -fsSL "$BROWSEROS_APPIMAGE_URL" -o .ci/bin/BrowserOS.AppImage
-          chmod +x .ci/bin/BrowserOS.AppImage
-
-      - name: Prepare BrowserOS wrapper
-        run: |
-          mkdir -p .ci/bin
-          cat > .ci/bin/browseros <<'EOF'
-          #!/usr/bin/env bash
-          set -euo pipefail
-          export APPIMAGE_EXTRACT_AND_RUN=1
-          exec "$(dirname "$0")/BrowserOS.AppImage" "$@"
-          EOF
-          chmod +x .ci/bin/browseros
-
-      - name: Create server env file
-        working-directory: packages/browseros-agent/apps/server
-        run: cp .env.example .env.development
-
-      - name: Run ${{ matrix.suite }} tests
-        id: test
+      - name: Run all tests
+        run: bun test:all
        env:
-          BROWSEROS_BINARY: ${{ github.workspace }}/packages/browseros-agent/.ci/bin/browseros
-          BROWSEROS_TEST_HEADLESS: "true"
-          BROWSEROS_TEST_EXTRA_ARGS: --no-sandbox --disable-dev-shm-usage
-        run: |
-          set +e
-          mkdir -p test-results
-          cd apps/server
-          bun run test:cleanup
-          bun --env-file=.env.development test "${{ matrix.test_path }}" --reporter=junit --reporter-outfile="../../${{ matrix.junit_path }}"
-          exit_code=$?
-          cd ../..
-          if [ ! -f "${{ matrix.junit_path }}" ]; then
-            cat > "${{ matrix.junit_path }}" <<EOF
-          <?xml version="1.0" encoding="UTF-8"?>
-          <testsuites tests="1" failures="1">
-            <testsuite name="${{ matrix.suite }}" tests="1" failures="1">
-              <testcase classname="workflow" name="${{ matrix.suite }} setup">
-                <failure message="Test run failed before JUnit output was written">See workflow logs for details.</failure>
-              </testcase>
-            </testsuite>
-          </testsuites>
-          EOF
-          fi
-          echo "exit_code=$exit_code" >> "$GITHUB_OUTPUT"
-
-      - name: Upload JUnit XML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: junit-${{ matrix.suite }}
-          path: packages/browseros-agent/${{ matrix.junit_path }}
-
-      - name: Summarize suite result
-        if: always()
-        run: |
-          if [ "${{ steps.test.outputs.exit_code }}" = "0" ]; then
-            echo "### :white_check_mark: ${{ matrix.suite }} suite passed" >> "$GITHUB_STEP_SUMMARY"
-          else
-            echo "### :x: ${{ matrix.suite }} suite failed (exit code ${{ steps.test.outputs.exit_code }})" >> "$GITHUB_STEP_SUMMARY"
-            echo "" >> "$GITHUB_STEP_SUMMARY"
-            echo "See the uploaded \`junit-${{ matrix.suite }}\` artifact for details." >> "$GITHUB_STEP_SUMMARY"
-            exit 1
-          fi
+          PUPPETEER_EXECUTABLE_PATH: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +0,0 @@
-{
-  "terminal.integrated.tabs.title": "${sequence} ${process}",
-  "terminal.integrated.tabs.description": "${cwd}"
-}
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
 [![Slack](https://img.shields.io/badge/Slack-Join%20us-4A154B?logo=slack&logoColor=white)](https://dub.sh/browserOS-slack)
 [![Twitter](https://img.shields.io/twitter/follow/browserOS_ai?style=social)](https://twitter.com/browseros_ai)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
-[![Docs](https://img.shields.io/badge/Docs-docs.browseros.com-blue)](https://docs.browseros.com)
 <br></br>
 <a href="https://files.browseros.com/download/BrowserOS.dmg">
  <img src="https://img.shields.io/badge/Download-macOS-black?style=flat&logo=apple&logoColor=white" alt="Download for macOS (beta)" />
@@ -23,183 +22,146 @@
 <br />
 </div>

-BrowserOS is an open-source Chromium fork that runs AI agents natively. **The privacy-first alternative to ChatGPT Atlas, Perplexity Comet, and Dia.**
+##
+🌐 BrowserOS is an open-source Chromium fork that runs AI agents natively. **The privacy-first alternative to ChatGPT Atlas, Perplexity Comet, and Dia.**

-Use your own API keys or run local models with Ollama. Your data never leaves your machine.
+🔒 Use your own API keys or run local models with Ollama. Your data never leaves your machine.

-> **[Documentation](https://docs.browseros.com)** · **[Discord](https://discord.gg/YKwjt5vuKr)** · **[Slack](https://dub.sh/browserOS-slack)** · **[Twitter](https://x.com/browserOS_ai)** · **[Feature Requests](https://github.com/browseros-ai/BrowserOS/issues/99)**
+💡 Join our [Discord](https://discord.gg/YKwjt5vuKr) or [Slack](https://dub.sh/browserOS-slack) and help us build! Have feature requests? [Suggest here](https://github.com/browseros-ai/BrowserOS/issues/99).

-## Quick Start
+## Quick start

-1. **Download and install** BrowserOS — [macOS](https://files.browseros.com/download/BrowserOS.dmg) · [Windows](https://files.browseros.com/download/BrowserOS_installer.exe) · [Linux (AppImage)](https://files.browseros.com/download/BrowserOS.AppImage) · [Linux (Debian)](https://cdn.browseros.com/download/BrowserOS.deb)
-2. **Import your Chrome data** (optional) — bookmarks, passwords, extensions all carry over
-3. **Connect your AI provider** — Claude, OpenAI, Gemini, ChatGPT Pro via OAuth, or local models via Ollama/LM Studio
+1. Download and install BrowserOS:
+   - [macOS](https://files.browseros.com/download/BrowserOS.dmg)
+   - [Windows](https://files.browseros.com/download/BrowserOS_installer.exe)
+   - [Linux (AppImage)](https://files.browseros.com/download/BrowserOS.AppImage)
+   - [Linux (Debian)](https://cdn.browseros.com/download/BrowserOS.deb)

-## Features
+2. Import your Chrome data (optional)

-| Feature | Description | Docs |
-|---------|-------------|------|
-| **AI Agent** | 53+ browser automation tools — navigate, click, type, extract data, all with natural language | [Guide](https://docs.browseros.com/getting-started) |
-| **MCP Server** | Control the browser from Claude Code, Gemini CLI, or any MCP client | [Setup](https://docs.browseros.com/features/use-with-claude-code) |
-| **Workflows** | Build repeatable browser automations with a visual graph builder | [Docs](https://docs.browseros.com/features/workflows) |
-| **Cowork** | Combine browser automation with local file operations — research the web, save reports to your folder | [Docs](https://docs.browseros.com/features/cowork) |
-| **Scheduled Tasks** | Run agents on autopilot — daily, hourly, or every few minutes | [Docs](https://docs.browseros.com/features/scheduled-tasks) |
-| **Memory** | Persistent memory across conversations — your assistant remembers context over time | [Docs](https://docs.browseros.com/features/memory) |
-| **SOUL.md** | Define your AI's personality and instructions in a single markdown file | [Docs](https://docs.browseros.com/features/soul-md) |
-| **LLM Hub** | Compare Claude, ChatGPT, and Gemini responses side-by-side on any page | [Docs](https://docs.browseros.com/features/llm-chat-hub) |
-| **40+ App Integrations** | Gmail, Slack, GitHub, Linear, Notion, Figma, Salesforce, and more via MCP | [Docs](https://docs.browseros.com/features/connect-apps) |
-| **Vertical Tabs** | Side-panel tab management — stay organized even with 100+ tabs open | [Docs](https://docs.browseros.com/features/vertical-tabs) |
-| **Ad Blocking** | uBlock Origin + Manifest V2 support — [10x more protection](https://docs.browseros.com/features/ad-blocking) than Chrome | [Docs](https://docs.browseros.com/features/ad-blocking) |
-| **Cloud Sync** | Sync browser config and agent history across devices | [Docs](https://docs.browseros.com/features/sync) |
-| **Skills** | Custom instruction sets that shape how your AI assistant behaves | [Docs](https://docs.browseros.com/features/skills) |
-| **Smart Nudges** | Contextual suggestions to connect apps and use features at the right moment | [Docs](https://docs.browseros.com/features/smart-nudges) |
+3. Connect your AI provider — use Claude, OpenAI, Gemini, or local models via Ollama and LMStudio.
+
+4. Start automating!
+
+## What makes BrowserOS special
+- 🏠 Feels like home — same Chrome interface, all your extensions just work
+- 🤖 AI agents that run on YOUR browser, not in the cloud
+- 🔒 Privacy first — bring your own keys or run local models with Ollama. Your browsing history stays on your machine
+- 🤝 [BrowserOS as MCP server](https://docs.browseros.com/features/use-with-claude-code) — control the browser from `claude-code`, `gemini-cli`, or any MCP client (31 tools)
+- 🔄 [Workflows](https://docs.browseros.com/features/workflows) — build repeatable browser automations with a visual graph builder
+- 📂 [Cowork](https://docs.browseros.com/features/cowork) — combine browser automation with local file operations. Research the web, save reports to your folder
+- ⏰ [Scheduled Tasks](https://docs.browseros.com/features/scheduled-tasks) — run the agent on autopilot, daily or every few minutes
+- 💬 [LLM Hub](https://docs.browseros.com/features/llm-chat-hub) — compare Claude, ChatGPT, and Gemini side-by-side on any page
+- 🛡️ Built-in ad blocker — [10x more protection than Chrome](https://docs.browseros.com/features/ad-blocking) with uBlock Origin + Manifest V2 support
+- 🚀 100% open source under AGPL-3.0

 ## Demos

-### BrowserOS agent in action
+### 🤖 BrowserOS agent in action
 [![BrowserOS agent in action](docs/videos/browserOS-agent-in-action.gif)](https://www.youtube.com/watch?v=SoSFev5R5dI)
 <br/><br/>

-### Install [BrowserOS as MCP](https://docs.browseros.com/features/use-with-claude-code) and control it from `claude-code`
+### 🎇 Install [BrowserOS as MCP](https://docs.browseros.com/features/use-with-claude-code) and control it from `claude-code`

 https://github.com/user-attachments/assets/c725d6df-1a0d-40eb-a125-ea009bf664dc

 <br/><br/>

-### Use BrowserOS to chat
+### 💬 Use BrowserOS to chat

 https://github.com/user-attachments/assets/726803c5-8e36-420e-8694-c63a2607beca

 <br/><br/>

-### Use BrowserOS to scrape data
+### ⚡ Use BrowserOS to scrape data

 https://github.com/user-attachments/assets/9f038216-bc24-4555-abf1-af2adcb7ebc0

 <br/><br/>

-## Install `browseros-cli`
+## Why We're Building BrowserOS

-Use `browseros-cli` to launch and control BrowserOS from the terminal or from AI coding agents like Claude Code.
+For the first time since Netscape pioneered the web in 1994, AI gives us the chance to completely reimagine the browser. We've seen tools like Cursor deliver 10x productivity gains for developers—yet everyday browsing remains frustratingly archaic.

-**macOS / Linux:**
+You're likely juggling 70+ tabs, battling your browser instead of having it assist you. Routine tasks, like ordering something from amazon or filling a form should be handled seamlessly by AI agents.

-```bash
-curl -fsSL https://cdn.browseros.com/cli/install.sh | bash
-```
+At BrowserOS, we're convinced that AI should empower you by automating tasks locally and securely—keeping your data private. We are building the best browser for this future!

-**Windows:**
+## How we compare

-```powershell
-irm https://cdn.browseros.com/cli/install.ps1 | iex
-```
+<details>
+<summary><b>vs Chrome</b></summary>
+<br>
+While we're grateful for Google open-sourcing Chromium, but Chrome hasn't evolved much in 10 years. No AI features, no automation, no MCP support.
+</details>

-After install, run `browseros-cli init` to connect the CLI to your running BrowserOS instance.
+<details>
+<summary><b>vs Brave</b></summary>
+<br>
+We love what Brave started, but they've spread themselves too thin with crypto, search, VPNs. We're laser-focused on AI-powered browsing.
+</details>

-## LLM Providers
+<details>
+<summary><b>vs Arc/Dia</b></summary>
+<br>
+Many loved Arc, but it was closed source. When they abandoned users, there was no recourse. We're 100% open source - fork it anytime!
+</details>

-BrowserOS works with any LLM. Bring your own keys, use OAuth, or run models locally.
+<details>
+<summary><b>vs Perplexity Comet</b></summary>
+<br>
+They're a search/ad company. Your browser history becomes their product. We keep everything local.
+</details>

-| Provider | Type | Auth |
-|----------|------|------|
-| Kimi K2.5 | Cloud (default) | Built-in |
-| ChatGPT Pro/Plus | Cloud | [OAuth](https://docs.browseros.com/features/chatgpt) |
-| GitHub Copilot | Cloud | [OAuth](https://docs.browseros.com/features/github-copilot) |
-| Qwen Code | Cloud | [OAuth](https://docs.browseros.com/features/qwen-code) |
-| Claude (Anthropic) | Cloud | API key |
-| GPT-4o / o3 (OpenAI) | Cloud | API key |
-| Gemini (Google) | Cloud | API key |
-| Azure OpenAI | Cloud | API key |
-| AWS Bedrock | Cloud | IAM credentials |
-| OpenRouter | Cloud | API key |
-| Ollama | Local | [Setup](https://docs.browseros.com/features/ollama) |
-| LM Studio | Local | [Setup](https://docs.browseros.com/features/lm-studio) |
-
-## How We Compare
-
-| | BrowserOS | Chrome | Brave | Dia | Comet | Atlas |
-|---|:---:|:---:|:---:|:---:|:---:|:---:|
-| Open Source | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ |
-| AI Agent | ✅ | ❌ | ❌ | ❌ | ✅ | ✅ |
-| MCP Server | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Visual Workflows | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Cowork (files + browser) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Scheduled Tasks | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Bring Your Own Keys | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ |
-| Local Models (Ollama) | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ |
-| Local-first Privacy | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ |
-| Ad Blocking (MV2) | ✅ | ❌ | ✅ | ❌ | ✅ | ❌ |
-
-**Detailed comparisons:**
- [BrowserOS vs Chrome DevTools MCP](https://docs.browseros.com/comparisons/chrome-devtools-mcp) — developer-focused comparison for browser automation
- [BrowserOS vs Claude Cowork](https://docs.browseros.com/comparisons/claude-cowork) — getting real work done with AI
- [BrowserOS vs OpenClaw](https://docs.browseros.com/comparisons/openclaw) — everyday AI assistance
-
-## Architecture
-
-BrowserOS is a monorepo with two main subsystems: the **browser** (Chromium fork) and the **agent platform** (TypeScript/Go).
-
-```
-BrowserOS/
-├── packages/browseros/              # Chromium fork + build system (Python)
-│   ├── chromium_patches/            # Patches applied to Chromium source
-│   ├── build/                       # Build CLI and modules
-│   └── resources/                   # Icons, entitlements, signing
-│
-├── packages/browseros-agent/        # Agent platform (TypeScript/Go)
-│   ├── apps/
-│   │   ├── server/                  # MCP server + AI agent loop (Bun)
-│   │   ├── agent/                   # Browser extension UI (WXT + React)
-│   │   ├── cli/                     # CLI tool (Go)
-│   │   ├── eval/                    # Benchmark framework
-│   │   └── controller-ext/          # Chrome API bridge extension
-│   │
-│   └── packages/
-│       ├── agent-sdk/               # Node.js SDK (npm: @browseros-ai/agent-sdk)
-│       ├── cdp-protocol/            # CDP type bindings
-│       └── shared/                  # Shared constants
-```
-
-| Package | What it does |
-|---------|-------------|
-| [`packages/browseros`](packages/browseros/) | Chromium fork — patches, build system, signing |
-| [`apps/server`](packages/browseros-agent/apps/server/) | Bun server exposing 53+ MCP tools and running the AI agent loop |
-| [`apps/agent`](packages/browseros-agent/apps/agent/) | Browser extension — new tab, side panel chat, onboarding, settings |
-| [`apps/cli`](packages/browseros-agent/apps/cli/) | Go CLI — control BrowserOS from the terminal or AI coding agents |
-| [`apps/eval`](packages/browseros-agent/apps/eval/) | Benchmark framework — WebVoyager, Mind2Web evaluation |
-| [`agent-sdk`](packages/browseros-agent/packages/agent-sdk/) | Node.js SDK for browser automation with natural language |
-| [`cdp-protocol`](packages/browseros-agent/packages/cdp-protocol/) | Type-safe Chrome DevTools Protocol bindings |
+<details>
+<summary><b>vs ChatGPT Atlas</b></summary>
+<br>
+Your browsing data could be used for ads or to train their models. We keep your history and agent interactions strictly local.
+</details>

 ## Contributing

-We'd love your help making BrowserOS better! See our [Contributing Guide](CONTRIBUTING.md) for details.
+We'd love your help making BrowserOS better!

- [Report bugs](https://github.com/browseros-ai/BrowserOS/issues)
- [Suggest features](https://github.com/browseros-ai/BrowserOS/issues/99)
- [Join Discord](https://discord.gg/YKwjt5vuKr) · [Join Slack](https://dub.sh/browserOS-slack)
- [Follow on Twitter](https://x.com/browserOS_ai)
-
-**Agent development** (TypeScript/Go) — see the [agent monorepo README](packages/browseros-agent/README.md) for setup instructions.
-
-**Browser development** (C++/Python) — requires ~100GB disk space. See [`packages/browseros`](packages/browseros/) for build instructions.
-
-## Credits
-
- [ungoogled-chromium](https://github.com/ungoogled-software/ungoogled-chromium) — BrowserOS uses some patches for enhanced privacy. Thanks to everyone behind this project!
- [The Chromium Project](https://www.chromium.org/) — at the core of BrowserOS, making it possible to exist in the first place.
+- 🐛 [Report bugs](https://github.com/browseros-ai/BrowserOS/issues)
+- 💡 [Suggest features](https://github.com/browseros-ai/BrowserOS/issues/99)
+- 💬 [Join Discord](https://discord.gg/YKwjt5vuKr)
+- 🐦 [Follow on Twitter](https://x.com/browserOS_ai)

 ## License

 BrowserOS is open source under the [AGPL-3.0 license](LICENSE).

+## Credits
+
+- [ungoogled-chromium](https://github.com/ungoogled-software/ungoogled-chromium) - BrowserOS uses some patches for enhanced privacy. Thanks to everyone behind this project!
+- [The Chromium Project](https://www.chromium.org/) - At the core of BrowserOS, making it possible to exist in the first place.
+
+## Citation
+
+If you use BrowserOS in your research or project, please cite:
+
+```bibtex
+@software{browseros2025,
+  author = {Sonti, Nithin and Sonti, Nikhil and {BrowserOS-team}},
+  title = {BrowserOS: The open-source Agentic browser},
+  url = {https://github.com/browseros-ai/BrowserOS},
+  year = {2025},
+  publisher = {GitHub},
+  license = {AGPL-3.0},
+}
+```
+
 Copyright &copy; 2025 Felafax, Inc.

 ## Stargazers
-
 Thank you to all our supporters!

 [![Star History Chart](https://api.star-history.com/svg?repos=browseros-ai/BrowserOS&type=Date)](https://www.star-history.com/#browseros-ai/BrowserOS&Date)

+## 
 <p align="center">
 Built with ❤️ from San Francisco
 </p>
+
+
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -23,9 +23,6 @@
        "group": "Core Features",
        "pages": [
          "features/bring-your-own-llm",
-          "features/chatgpt-pro-oauth",
-          "features/github-copilot-oauth",
-          "features/qwen-code-oauth",
          "features/local-models",
          "features/workflows",
          "features/scheduled-tasks",
--- a/docs/features/bring-your-own-llm.mdx
+++ b/docs/features/bring-your-own-llm.mdx
@@ -13,33 +13,6 @@ See how to connect your own LLM in under a minute:
  src="https://pub-80f8a01e6e8b4239ae53a7652ef85877.r2.dev/resources/feature-videos/1-bring-your-own-LLM.mov"
 ></video>

-## Use Your Existing Subscription
-
-Already paying for ChatGPT Pro, GitHub Copilot, or Qwen Code? Connect your existing account to BrowserOS with a single sign-in — no API keys, no extra cost.
-
-<CardGroup cols={3}>
-  <Card href="/features/chatgpt-pro-oauth">
-    <svg fill="currentColor" fillRule="evenodd" height="24" width="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M9.205 8.658v-2.26c0-.19.072-.333.238-.428l4.543-2.616c.619-.357 1.356-.523 2.117-.523 2.854 0 4.662 2.212 4.662 4.566 0 .167 0 .357-.024.547l-4.71-2.759a.797.797 0 00-.856 0l-5.97 3.473zm10.609 8.8V12.06c0-.333-.143-.57-.429-.737l-5.97-3.473 1.95-1.118a.433.433 0 01.476 0l4.543 2.617c1.309.76 2.189 2.378 2.189 3.948 0 1.808-1.07 3.473-2.76 4.163zM7.802 12.703l-1.95-1.142c-.167-.095-.239-.238-.239-.428V5.899c0-2.545 1.95-4.472 4.591-4.472 1 0 1.927.333 2.712.928L8.23 5.067c-.285.166-.428.404-.428.737v6.898zM12 15.128l-2.795-1.57v-3.33L12 8.658l2.795 1.57v3.33L12 15.128zm1.796 7.23c-1 0-1.927-.332-2.712-.927l4.686-2.712c.285-.166.428-.404.428-.737v-6.898l1.974 1.142c.167.095.238.238.238.428v5.233c0 2.545-1.974 4.472-4.614 4.472zm-5.637-5.303l-4.544-2.617c-1.308-.761-2.188-2.378-2.188-3.948A4.482 4.482 0 014.21 6.327v5.423c0 .333.143.571.428.738l5.947 3.449-1.95 1.118a.432.432 0 01-.476 0zm-.262 3.9c-2.688 0-4.662-2.021-4.662-4.519 0-.19.024-.38.047-.57l4.686 2.71c.286.167.571.167.856 0l5.97-3.448v2.26c0 .19-.07.333-.237.428l-4.543 2.616c-.619.357-1.356.523-2.117.523zm5.899 2.83a5.947 5.947 0 005.827-4.756C22.287 18.339 24 15.84 24 13.296c0-1.665-.713-3.282-1.998-4.448.119-.5.19-.999.19-1.498 0-3.401-2.759-5.947-5.946-5.947-.642 0-1.26.095-1.88.31A5.962 5.962 0 0010.205 0a5.947 5.947 0 00-5.827 4.757C1.713 5.447 0 7.945 0 10.49c0 1.666.713 3.283 1.998 4.448-.119.5-.19 1-.19 1.499 0 3.401 2.759 5.946 5.946 5.946.642 0 1.26-.095 1.88-.309a5.96 5.96 0 004.162 1.713z"></path></svg>
-    **ChatGPT Pro / Plus**
-
-    Sign in with your OpenAI account. Access GPT-5 Codex, GPT-5.4, and the full Codex lineup with up to 400K context.
-  </Card>
-  <Card href="/features/github-copilot-oauth">
-    <svg fill="currentColor" fillRule="evenodd" height="24" width="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M19.245 5.364c1.322 1.36 1.877 3.216 2.11 5.817.622 0 1.2.135 1.592.654l.73.964c.21.278.323.61.323.955v2.62c0 .339-.173.669-.453.868C20.239 19.602 16.157 21.5 12 21.5c-4.6 0-9.205-2.583-11.547-4.258-.28-.2-.452-.53-.453-.868v-2.62c0-.345.113-.679.321-.956l.73-.963c.392-.517.974-.654 1.593-.654l.029-.297c.25-2.446.81-4.213 2.082-5.52 2.461-2.54 5.71-2.851 7.146-2.864h.198c1.436.013 4.685.323 7.146 2.864zm-7.244 4.328c-.284 0-.613.016-.962.05-.123.447-.305.85-.57 1.108-1.05 1.023-2.316 1.18-2.994 1.18-.638 0-1.306-.13-1.851-.464-.516.165-1.012.403-1.044.996a65.882 65.882 0 00-.063 2.884l-.002.48c-.002.563-.005 1.126-.013 1.69.002.326.204.63.51.765 2.482 1.102 4.83 1.657 6.99 1.657 2.156 0 4.504-.555 6.985-1.657a.854.854 0 00.51-.766c.03-1.682.006-3.372-.076-5.053-.031-.596-.528-.83-1.046-.996-.546.333-1.212.464-1.85.464-.677 0-1.942-.157-2.993-1.18-.266-.258-.447-.661-.57-1.108-.32-.032-.64-.049-.96-.05zm-2.525 4.013c.539 0 .976.426.976.95v1.753c0 .525-.437.95-.976.95a.964.964 0 01-.976-.95v-1.752c0-.525.437-.951.976-.951zm5 0c.539 0 .976.426.976.95v1.753c0 .525-.437.95-.976.95a.964.964 0 01-.976-.95v-1.752c0-.525.437-.951.976-.951zM7.635 5.087c-1.05.102-1.935.438-2.385.906-.975 1.037-.765 3.668-.21 4.224.405.394 1.17.657 1.995.657h.09c.649-.013 1.785-.176 2.73-1.11.435-.41.705-1.433.675-2.47-.03-.834-.27-1.52-.63-1.813-.39-.336-1.275-.482-2.265-.394zm6.465.394c-.36.292-.6.98-.63 1.813-.03 1.037.24 2.06.675 2.47.968.957 2.136 1.104 2.776 1.11h.044c.825 0 1.59-.263 1.995-.657.555-.556.765-3.187-.21-4.224-.45-.468-1.335-.804-2.385-.906-.99-.088-1.875.058-2.265.394zM12 7.615c-.24 0-.525.015-.84.044.03.16.045.336.06.526l-.001.159a2.94 2.94 0 01-.014.25c.225-.022.425-.027.612-.028h.366c.187 0 .387.006.612.028-.015-.146-.015-.277-.015-.409.015-.19.03-.365.06-.526a9.29 9.29 0 00-.84-.044z"></path></svg>
-    **GitHub Copilot**
-
-    Sign in with your GitHub account. Access 19+ models including Claude, GPT-5, and Gemini through one subscription.
-  </Card>
-  <Card href="/features/qwen-code-oauth">
-    <svg fill="currentColor" fillRule="evenodd" height="24" width="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12.604 1.34c.393.69.784 1.382 1.174 2.075a.18.18 0 00.157.091h5.552c.174 0 .322.11.446.327l1.454 2.57c.19.337.24.478.024.837-.26.43-.513.864-.76 1.3l-.367.658c-.106.196-.223.28-.04.512l2.652 4.637c.172.301.111.494-.043.77-.437.785-.882 1.564-1.335 2.34-.159.272-.352.375-.68.37-.777-.016-1.552-.01-2.327.016a.099.099 0 00-.081.05 575.097 575.097 0 01-2.705 4.74c-.169.293-.38.363-.725.364-.997.003-2.002.004-3.017.002a.537.537 0 01-.465-.271l-1.335-2.323a.09.09 0 00-.083-.049H4.982c-.285.03-.553-.001-.805-.092l-1.603-2.77a.543.543 0 01-.002-.54l1.207-2.12a.198.198 0 000-.197 550.951 550.951 0 01-1.875-3.272l-.79-1.395c-.16-.31-.173-.496.095-.965.465-.813.927-1.625 1.387-2.436.132-.234.304-.334.584-.335a338.3 338.3 0 012.589-.001.124.124 0 00.107-.063l2.806-4.895a.488.488 0 01.422-.246c.524-.001 1.053 0 1.583-.006L11.704 1c.341-.003.724.032.9.34zm-3.432.403a.06.06 0 00-.052.03L6.254 6.788a.157.157 0 01-.135.078H3.253c-.056 0-.07.025-.041.074l5.81 10.156c.025.042.013.062-.034.063l-2.795.015a.218.218 0 00-.2.116l-1.32 2.31c-.044.078-.021.118.068.118l5.716.008c.046 0 .08.02.104.061l1.403 2.454c.046.081.092.082.139 0l5.006-8.76.783-1.382a.055.055 0 01.096 0l1.424 2.53a.122.122 0 00.107.062l2.763-.02a.04.04 0 00.035-.02.041.041 0 000-.04l-2.9-5.086a.108.108 0 010-.113l.293-.507 1.12-1.977c.024-.041.012-.062-.035-.062H9.2c-.059 0-.073-.026-.043-.077l1.434-2.505a.107.107 0 000-.114L9.225 1.774a.06.06 0 00-.053-.031zm6.29 8.02c.046 0 .058.02.034.06l-.832 1.465-2.613 4.585a.056.056 0 01-.05.029.058.058 0 01-.05-.029L8.498 9.841c-.02-.034-.01-.052.028-.054l.216-.012 6.722-.012z"></path></svg>
-    **Qwen Code**
-
-    Sign in with your Qwen account. Access Qwen 3 Coder with a 1 million token context window.
-  </Card>
-</CardGroup>
-
---
-
 ## Which Model Should I Use?

 | Mode | What works | Recommendation |
--- a/docs/features/chatgpt-pro-oauth.mdx
+++ b/docs/features/chatgpt-pro-oauth.mdx
@@ -1,56 +0,0 @@
---
-title: "ChatGPT Pro / Plus"
-description: "Use your ChatGPT subscription to power BrowserOS"
---
-
-Connect your ChatGPT Pro or Plus subscription to BrowserOS and access GPT-5 Codex, GPT-5.4, and the full lineup of OpenAI's most advanced models — with up to 400K context. No API keys needed.
-
-## Setup
-
-**1.** Open BrowserOS and go to **Settings** (`chrome://browseros/settings`). You'll see the AI Providers section.
-
-![AI Settings screen](/images/setting-up-chatgpt/llm-screen.png)
-
-**2.** Click **USE** on the **ChatGPT Plus/Pro** card. You'll be prompted to sign in with your OpenAI account.
-
-![Login screen](/images/setting-up-chatgpt/login-screen.png)
-
-**3.** Sign in with the OpenAI account that has your ChatGPT Pro or Plus subscription active, and accept the authorization.
-
-![Accept authorization](/images/setting-up-chatgpt/accept-screen.png)
-
-**4.** Once authorized, ChatGPT will appear as a provider in your settings. Select a model and start using it.
-
-## Available Models
-
-| Model | Context Window |
-|-------|---------------|
-| `gpt-5.4` | 400K |
-| `gpt-5.3-codex` | 400K |
-| `gpt-5.2-codex` | 400K |
-| `gpt-5.2` | 200K |
-| `gpt-5.1-codex` | 400K |
-| `gpt-5.1-codex-max` | 400K |
-| `gpt-5.1-codex-mini` | 400K |
-| `gpt-5.1` | 200K |
-
-<Info>
-ChatGPT Pro subscribers have access to the full model lineup. ChatGPT Plus subscribers can access a subset of models depending on their plan. The available models will be shown automatically after you connect.
-</Info>
-
-<Tip>
-The Codex models (e.g., `gpt-5.3-codex`) are optimized for code and reasoning tasks — ideal for complex browser automation workflows that involve form filling, data extraction, and multi-step navigation.
-</Tip>
-
-## Reasoning Settings
-
-ChatGPT Pro includes additional settings for models that support reasoning:
-
- **Reasoning Effort** — Control how much the model "thinks" before responding. Options: none, low, medium, high.
- **Reasoning Summary** — Choose how reasoning is displayed. Options: auto, concise, detailed.
-
-These settings are available in the provider configuration after connecting.
-
-## Disconnecting
-
-To disconnect your OpenAI account, go to **Settings**, find the ChatGPT Plus/Pro provider, and click **Disconnect**. Your OAuth tokens will be immediately deleted from your machine.
--- a/docs/features/github-copilot-oauth.mdx
+++ b/docs/features/github-copilot-oauth.mdx
@@ -1,60 +0,0 @@
---
-title: "GitHub Copilot"
-description: "Use your GitHub Copilot subscription to power BrowserOS"
---
-
-Connect your GitHub Copilot subscription to BrowserOS and access 19+ models — including Claude, GPT-5, and Gemini — through a single GitHub sign-in. No API keys needed.
-
-<Info>
-**Free tier** includes GPT-5 Mini, Claude Haiku 4.5, GPT-4o, and GPT-4.1. **Copilot Pro** ($10/month) unlocks Claude Sonnet 4.6, Claude Opus 4.6, Gemini 3 Pro, GPT-5.4, and more.
-</Info>
-
-## Setup
-
-**1.** Open BrowserOS and go to **Settings** (`chrome://browseros/settings`). You'll see the AI Providers section.
-
-![AI Settings screen](/images/setting-up-copilot/llm-screen.png)
-
-**2.** Click **USE** on the **GitHub Copilot** card. A device code will appear — copy it, then click the link to open GitHub's device authorization page.
-
-![Device code displayed](/images/setting-up-copilot/device-code.png)
-
-**3.** Select your GitHub account to authorize.
-
-![Select GitHub account](/images/setting-up-copilot/select-account.png)
-
-**4.** Paste the device code and authorize BrowserOS to access your Copilot subscription.
-
-![Authorize device](/images/setting-up-copilot/authorize-device.png)
-
-**5.** Once authorized, GitHub Copilot will appear as a provider in your settings. Select a model and start using it.
-
-## Available Models
-
-### Free Tier
-| Model | Context Window |
-|-------|---------------|
-| `gpt-5-mini` | 128K |
-| `claude-haiku-4.5` | 128K |
-| `gpt-4o` | 64K |
-| `gpt-4.1` | 64K |
-
-### Copilot Pro / Pro+
-| Model | Context Window |
-|-------|---------------|
-| `claude-sonnet-4.6` | 200K |
-| `claude-opus-4.6` | 200K |
-| `gemini-2.5-pro` | 1M |
-| `gemini-3-pro-preview` | 1M |
-| `gpt-5.4` | 400K |
-| `gpt-5.3-codex` | 400K |
-| `gpt-5.2-codex` | 400K |
-| `grok-code-fast-1` | 128K |
-
-<Tip>
-GitHub Copilot is the most versatile provider — one subscription gives you access to models from OpenAI, Anthropic, Google, and xAI. Great if you want to switch between models for different tasks.
-</Tip>
-
-## Disconnecting
-
-To disconnect your GitHub account, go to **Settings**, find the GitHub Copilot provider, and click **Disconnect**. Your OAuth tokens will be immediately deleted from your machine.
--- a/docs/features/qwen-code-oauth.mdx
+++ b/docs/features/qwen-code-oauth.mdx
@@ -1,39 +0,0 @@
---
-title: "Qwen Code"
-description: "Use your Qwen Code account to power BrowserOS"
---
-
-Connect your Qwen Code account to BrowserOS and access Alibaba's coding models with up to a **1 million token context window** — the largest of any provider we support. No API keys needed.
-
-## Setup
-
-**1.** Open BrowserOS and go to **Settings** (`chrome://browseros/settings`). You'll see the AI Providers section.
-
-![AI Settings screen](/images/setting-up-qwen/llm-screen.png)
-
-**2.** Click **USE** on the **Qwen Code** card. You'll be prompted to sign in with your Qwen account.
-
-![Select Qwen Code](/images/setting-up-qwen/select-qwen.png)
-
-**3.** Sign in with your Alibaba Cloud / Qwen account to authorize BrowserOS.
-
-![Qwen sign in](/images/setting-up-qwen/qwen-signin.png)
-
-**4.** Once authorized, Qwen Code will appear as a provider in your settings. Select a model and start using it.
-
-## Available Models
-
-| Model | Context Window |
-|-------|---------------|
-| `coder-model` | 1M |
-| `qwen3-coder-plus` | 1M |
-| `qwen3-coder-flash` | 1M |
-| `qwen3.5-plus` | 1M |
-
-<Tip>
-Qwen Code's 1 million token context window is ideal for tasks that involve long documents, entire documentation sites, or working across many browser tabs simultaneously — the agent can hold everything in context at once.
-</Tip>
-
-## Disconnecting
-
-To disconnect your Qwen account, go to **Settings**, find the Qwen Code provider, and click **Disconnect**. Your OAuth tokens will be immediately deleted from your machine.
--- a/docs/images/icons/githubcopilot.svg
+++ b/docs/images/icons/githubcopilot.svg
@@ -1 +0,0 @@
-<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>GithubCopilot</title><path d="M19.245 5.364c1.322 1.36 1.877 3.216 2.11 5.817.622 0 1.2.135 1.592.654l.73.964c.21.278.323.61.323.955v2.62c0 .339-.173.669-.453.868C20.239 19.602 16.157 21.5 12 21.5c-4.6 0-9.205-2.583-11.547-4.258-.28-.2-.452-.53-.453-.868v-2.62c0-.345.113-.679.321-.956l.73-.963c.392-.517.974-.654 1.593-.654l.029-.297c.25-2.446.81-4.213 2.082-5.52 2.461-2.54 5.71-2.851 7.146-2.864h.198c1.436.013 4.685.323 7.146 2.864zm-7.244 4.328c-.284 0-.613.016-.962.05-.123.447-.305.85-.57 1.108-1.05 1.023-2.316 1.18-2.994 1.18-.638 0-1.306-.13-1.851-.464-.516.165-1.012.403-1.044.996a65.882 65.882 0 00-.063 2.884l-.002.48c-.002.563-.005 1.126-.013 1.69.002.326.204.63.51.765 2.482 1.102 4.83 1.657 6.99 1.657 2.156 0 4.504-.555 6.985-1.657a.854.854 0 00.51-.766c.03-1.682.006-3.372-.076-5.053-.031-.596-.528-.83-1.046-.996-.546.333-1.212.464-1.85.464-.677 0-1.942-.157-2.993-1.18-.266-.258-.447-.661-.57-1.108-.32-.032-.64-.049-.96-.05zm-2.525 4.013c.539 0 .976.426.976.95v1.753c0 .525-.437.95-.976.95a.964.964 0 01-.976-.95v-1.752c0-.525.437-.951.976-.951zm5 0c.539 0 .976.426.976.95v1.753c0 .525-.437.95-.976.95a.964.964 0 01-.976-.95v-1.752c0-.525.437-.951.976-.951zM7.635 5.087c-1.05.102-1.935.438-2.385.906-.975 1.037-.765 3.668-.21 4.224.405.394 1.17.657 1.995.657h.09c.649-.013 1.785-.176 2.73-1.11.435-.41.705-1.433.675-2.47-.03-.834-.27-1.52-.63-1.813-.39-.336-1.275-.482-2.265-.394zm6.465.394c-.36.292-.6.98-.63 1.813-.03 1.037.24 2.06.675 2.47.968.957 2.136 1.104 2.776 1.11h.044c.825 0 1.59-.263 1.995-.657.555-.556.765-3.187-.21-4.224-.45-.468-1.335-.804-2.385-.906-.99-.088-1.875.058-2.265.394zM12 7.615c-.24 0-.525.015-.84.044.03.16.045.336.06.526l-.001.159a2.94 2.94 0 01-.014.25c.225-.022.425-.027.612-.028h.366c.187 0 .387.006.612.028-.015-.146-.015-.277-.015-.409.015-.19.03-.365.06-.526a9.29 9.29 0 00-.84-.044z"></path></svg>
--- a/docs/images/icons/openai.svg
+++ b/docs/images/icons/openai.svg
@@ -1 +0,0 @@
-<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>OpenAI</title><path d="M9.205 8.658v-2.26c0-.19.072-.333.238-.428l4.543-2.616c.619-.357 1.356-.523 2.117-.523 2.854 0 4.662 2.212 4.662 4.566 0 .167 0 .357-.024.547l-4.71-2.759a.797.797 0 00-.856 0l-5.97 3.473zm10.609 8.8V12.06c0-.333-.143-.57-.429-.737l-5.97-3.473 1.95-1.118a.433.433 0 01.476 0l4.543 2.617c1.309.76 2.189 2.378 2.189 3.948 0 1.808-1.07 3.473-2.76 4.163zM7.802 12.703l-1.95-1.142c-.167-.095-.239-.238-.239-.428V5.899c0-2.545 1.95-4.472 4.591-4.472 1 0 1.927.333 2.712.928L8.23 5.067c-.285.166-.428.404-.428.737v6.898zM12 15.128l-2.795-1.57v-3.33L12 8.658l2.795 1.57v3.33L12 15.128zm1.796 7.23c-1 0-1.927-.332-2.712-.927l4.686-2.712c.285-.166.428-.404.428-.737v-6.898l1.974 1.142c.167.095.238.238.238.428v5.233c0 2.545-1.974 4.472-4.614 4.472zm-5.637-5.303l-4.544-2.617c-1.308-.761-2.188-2.378-2.188-3.948A4.482 4.482 0 014.21 6.327v5.423c0 .333.143.571.428.738l5.947 3.449-1.95 1.118a.432.432 0 01-.476 0zm-.262 3.9c-2.688 0-4.662-2.021-4.662-4.519 0-.19.024-.38.047-.57l4.686 2.71c.286.167.571.167.856 0l5.97-3.448v2.26c0 .19-.07.333-.237.428l-4.543 2.616c-.619.357-1.356.523-2.117.523zm5.899 2.83a5.947 5.947 0 005.827-4.756C22.287 18.339 24 15.84 24 13.296c0-1.665-.713-3.282-1.998-4.448.119-.5.19-.999.19-1.498 0-3.401-2.759-5.947-5.946-5.947-.642 0-1.26.095-1.88.31A5.962 5.962 0 0010.205 0a5.947 5.947 0 00-5.827 4.757C1.713 5.447 0 7.945 0 10.49c0 1.666.713 3.283 1.998 4.448-.119.5-.19 1-.19 1.499 0 3.401 2.759 5.946 5.946 5.946.642 0 1.26-.095 1.88-.309a5.96 5.96 0 004.162 1.713z"></path></svg>
--- a/docs/images/icons/qwen.svg
+++ b/docs/images/icons/qwen.svg
@@ -1 +0,0 @@
-<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Qwen</title><path d="M12.604 1.34c.393.69.784 1.382 1.174 2.075a.18.18 0 00.157.091h5.552c.174 0 .322.11.446.327l1.454 2.57c.19.337.24.478.024.837-.26.43-.513.864-.76 1.3l-.367.658c-.106.196-.223.28-.04.512l2.652 4.637c.172.301.111.494-.043.77-.437.785-.882 1.564-1.335 2.34-.159.272-.352.375-.68.37-.777-.016-1.552-.01-2.327.016a.099.099 0 00-.081.05 575.097 575.097 0 01-2.705 4.74c-.169.293-.38.363-.725.364-.997.003-2.002.004-3.017.002a.537.537 0 01-.465-.271l-1.335-2.323a.09.09 0 00-.083-.049H4.982c-.285.03-.553-.001-.805-.092l-1.603-2.77a.543.543 0 01-.002-.54l1.207-2.12a.198.198 0 000-.197 550.951 550.951 0 01-1.875-3.272l-.79-1.395c-.16-.31-.173-.496.095-.965.465-.813.927-1.625 1.387-2.436.132-.234.304-.334.584-.335a338.3 338.3 0 012.589-.001.124.124 0 00.107-.063l2.806-4.895a.488.488 0 01.422-.246c.524-.001 1.053 0 1.583-.006L11.704 1c.341-.003.724.032.9.34zm-3.432.403a.06.06 0 00-.052.03L6.254 6.788a.157.157 0 01-.135.078H3.253c-.056 0-.07.025-.041.074l5.81 10.156c.025.042.013.062-.034.063l-2.795.015a.218.218 0 00-.2.116l-1.32 2.31c-.044.078-.021.118.068.118l5.716.008c.046 0 .08.02.104.061l1.403 2.454c.046.081.092.082.139 0l5.006-8.76.783-1.382a.055.055 0 01.096 0l1.424 2.53a.122.122 0 00.107.062l2.763-.02a.04.04 0 00.035-.02.041.041 0 000-.04l-2.9-5.086a.108.108 0 010-.113l.293-.507 1.12-1.977c.024-.041.012-.062-.035-.062H9.2c-.059 0-.073-.026-.043-.077l1.434-2.505a.107.107 0 000-.114L9.225 1.774a.06.06 0 00-.053-.031zm6.29 8.02c.046 0 .058.02.034.06l-.832 1.465-2.613 4.585a.056.056 0 01-.05.029.058.058 0 01-.05-.029L8.498 9.841c-.02-.034-.01-.052.028-.054l.216-.012 6.722-.012z"></path></svg>
--- a/docs/images/setting-up-chatgpt/accept-screen.png
+++ b/docs/images/setting-up-chatgpt/accept-screen.png
--- a/docs/images/setting-up-chatgpt/llm-screen.png
+++ b/docs/images/setting-up-chatgpt/llm-screen.png
--- a/docs/images/setting-up-chatgpt/login-screen.png
+++ b/docs/images/setting-up-chatgpt/login-screen.png
--- a/docs/images/setting-up-copilot/authorize-device.png
+++ b/docs/images/setting-up-copilot/authorize-device.png
--- a/docs/images/setting-up-copilot/device-code.png
+++ b/docs/images/setting-up-copilot/device-code.png
--- a/docs/images/setting-up-copilot/llm-screen.png
+++ b/docs/images/setting-up-copilot/llm-screen.png
--- a/docs/images/setting-up-copilot/select-account.png
+++ b/docs/images/setting-up-copilot/select-account.png
--- a/docs/images/setting-up-qwen/llm-screen.png
+++ b/docs/images/setting-up-qwen/llm-screen.png
--- a/docs/images/setting-up-qwen/qwen-signin.png
+++ b/docs/images/setting-up-qwen/qwen-signin.png
--- a/docs/images/setting-up-qwen/select-qwen.png
+++ b/docs/images/setting-up-qwen/select-qwen.png
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -1,57 +0,0 @@
-commit-msg:
-  commands:
-    conventional:
-      run: |
-        msg=$(head -1 {1})
-        if [[ ! "$msg" =~ ^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert)(\(.+\))?\!?:\ .+ ]]; then
-          echo "Commit message must follow Conventional Commits format:"
-          echo "  <type>(<optional scope>): <description>"
-          echo "  Types: feat, fix, docs, style, refactor, perf, test, chore, ci, build, revert"
-          echo ""
-          echo "Examples:"
-          echo "  feat(auth): add OAuth2 support"
-          echo "  fix: resolve null pointer exception"
-          exit 1
-        fi
-
-pre-commit:
-  commands:
-    biome-check:
-      root: "packages/browseros-agent/"
-      glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}"
-      run: npx @biomejs/biome check --write --no-errors-on-unmatched --files-ignore-unknown=true --colors=off {staged_files}
-      stage_fixed: true
-
-    file-length:
-      root: "packages/browseros-agent/"
-      glob: "*.{ts,tsx}"
-      exclude: "*.{test,spec,d}.ts|*.{test,spec}.tsx|**/__tests__/**|**/tests/**|**/*.generated.*"
-      run: |
-        for file in {staged_files}; do
-          if [[ -f "$file" ]]; then
-            lines=$(wc -l < "$file" | tr -d ' ')
-            if [[ $lines -gt 400 ]]; then
-              echo "⚠️  Warning: $file has $lines lines (threshold: 400)"
-              echo "   Consider splitting this file if it has multiple responsibilities."
-            fi
-          fi
-        done
-
-pre-push:
-  commands:
-    branch-name:
-      run: |
-        branch=$(git rev-parse --abbrev-ref HEAD)
-        if [[ "$branch" == "main" || "$branch" == "master" ]]; then
-          exit 0
-        fi
-        if [[ ! "$branch" =~ ^(feat|fix|bugfix|hotfix|release|docs|refactor|test|chore|experiment)/[a-z0-9-]+$ ]]; then
-          echo "⚠️  Warning: Branch name '$branch' doesn't match recommended format."
-          echo "   Use: <type>/<short-description>"
-          echo "   Types: feat, fix, bugfix, hotfix, release, docs, refactor, test, chore, experiment"
-          echo "   Example: feat/add-auth, fix/login-crash"
-          echo ""
-          echo "   To rename your branch:"
-          echo "     git branch -m <new-name>"
-          echo "     git push -u origin <new-name>"
-        fi
--- a/packages/browseros-agent/.gitignore
+++ b/packages/browseros-agent/.gitignore
@@ -187,12 +187,7 @@ log.txt
 # Testing iteration temp files
 tmp/

-# CI artifacts
-.ci/
-test-results/
-
 # Coding agent artifacts
 .agent/
 .llm/
 .grove/
-docs/plans/2026-03-24-models-dev-integration.md
--- a/packages/browseros-agent/CLAUDE.md
+++ b/packages/browseros-agent/CLAUDE.md
@@ -81,9 +81,6 @@ bun run dev:server               # Build server for development
 bun run dev:ext                  # Build extension for development
 bun run dist:server              # Build server for production (all targets)
 bun run dist:ext                 # Build extension for production
-
-# Refresh models.dev data
-bun run generate:models          # Fetches latest from models.dev/api.json
 ```

 ## Architecture
--- a/packages/browseros-agent/README.md
+++ b/packages/browseros-agent/README.md
@@ -1,6 +1,8 @@
 # BrowserOS Agent

-The agent platform powering [BrowserOS](https://github.com/browseros-ai/BrowserOS) — contains the MCP server, agent UI, CLI, evaluation framework, and SDK.
+Monorepo for the BrowserOS-agent -- contains 3 packages: agent-UI, server (which contains the agent loop) and controller-extension (which is used by the tools within the agent loop).
+
+> **⚠️ NOTE:** This is only a submodule, the main project is at -- https://github.com/browseros-ai/BrowserOS

 ## Monorepo Structure

@@ -8,25 +10,17 @@ The agent platform powering [BrowserOS](https://github.com/browseros-ai/BrowserO
 apps/
  server/          # Bun server - MCP endpoints + agent loop
  agent/           # Agent UI (Chrome extension)
-  cli/             # Go CLI for controlling BrowserOS from the terminal
-  eval/            # Evaluation framework for benchmarking agents
  controller-ext/  # BrowserOS Controller (Chrome extension for chrome.* APIs)

 packages/
-  agent-sdk/       # Node.js SDK (@browseros-ai/agent-sdk)
-  cdp-protocol/    # Type-safe Chrome DevTools Protocol bindings
  shared/          # Shared constants (ports, timeouts, limits)
 ```

 | Package | Description |
 |---------|-------------|
 | `apps/server` | Bun server exposing MCP tools and running the agent loop |
-| `apps/agent` | Agent UI — Chrome extension for the chat interface |
-| `apps/cli` | Go CLI — control BrowserOS from the terminal or AI coding agents |
-| `apps/eval` | Benchmark framework — WebVoyager, Mind2Web evaluation |
-| `apps/controller-ext` | BrowserOS Controller — bridges `chrome.*` APIs to the server via WebSocket |
-| `packages/agent-sdk` | Node.js SDK for browser automation with natural language |
-| `packages/cdp-protocol` | Auto-generated CDP type bindings used by the server |
+| `apps/agent` | Agent UI - Chrome extension for the chat interface |
+| `apps/controller-ext` | BrowserOS Controller - Chrome extension that bridges `chrome.*` APIs (tabs, bookmarks, history) to the server via WebSocket |
 | `packages/shared` | Shared constants used across packages |

 ## Architecture
--- a/packages/browseros-agent/apps/agent/CHANGELOG.md
+++ b/packages/browseros-agent/apps/agent/CHANGELOG.md
@@ -1,6 +0,0 @@
-# BrowserOS Agent Extension
-
-## v0.0.52 (2026-03-26)
-
-Initial release
-
--- a/packages/browseros-agent/apps/agent/README.md
+++ b/packages/browseros-agent/apps/agent/README.md
@@ -1,24 +1,16 @@
-# BrowserOS Agent Extension
+# BrowserOS Agent Chrome Extension

-[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](../../../../LICENSE)
-
-The built-in browser extension that powers BrowserOS's AI interface — new tab with unified search, side panel chat, onboarding, and settings. Built with [WXT](https://wxt.dev) and React.
-
-> For user-facing feature documentation, see [docs.browseros.com](https://docs.browseros.com).
+The official Chrome extension for BrowserOS Agent, providing the UI layer for interacting with BrowserOS Core and Controllers. This extension enables intelligent browser automation, AI-powered search, and seamless integration with multiple LLM providers.

 ## Features

 - **AI-Powered New Tab**: Custom new tab page with unified search across Google and AI assistants
- **Side Panel Chat**: Full-featured chat interface for interacting with BrowserOS
+- **Side Panel Chat**: Full-featured chat interface for interacting with BrowserOS Core
 - **Multi-Provider Support**: Connect to various LLM providers (OpenAI, Anthropic, Azure, Bedrock, and more)
 - **MCP Integration**: Model Context Protocol support for extending AI capabilities
 - **Visual Feedback**: Animated glow effect on tabs during AI agent operations
 - **Privacy-First**: Local data handling with configurable provider settings

-## How It Connects
-
-The extension communicates with the [BrowserOS Server](../../apps/server/) running locally. The server handles the AI agent loop, MCP tools, and CDP connections — the extension provides the UI layer.
-
 ## Project Structure

 ```
@@ -88,20 +80,47 @@ Settings dashboard with multiple sections:

 Content script that creates a visual indicator (pulsing orange glow) around the browser viewport when an AI agent is actively working on a tab.

+## How Tools Are Used
+
+### Bun
+
+Bun is the exclusive runtime and package manager:
+- All scripts use `bun run <script>` instead of npm
+- Package installation via `bun install`
+- Environment files automatically loaded (no dotenv needed)
+- Enforced via `engines` field in `package.json`
+
+```bash
+bun install          # Install dependencies
+bun run dev          # Development mode
+bun run build        # Production build
+bun run lint         # Run Biome linting
+```
+
+### Biome
+
+Unified linter and formatter configured in `biome.json`:
+- **Formatting**: 2-space indentation, single quotes, no semicolons
+- **Linting**: Recommended rules plus custom rules for unused imports/variables
+- **CSS Support**: Tailwind directives parsing enabled
+- **Import Organization**: Automatic import sorting via assist actions
+
+```bash
+bun run lint         # Check for issues
+bun run lint:fix     # Auto-fix issues
+```
+
 ## Development

 ### Prerequisites

 - [Bun](https://bun.sh) installed
 - Chrome or Chromium-based browser
- BrowserOS Server running locally (for full functionality)
+- BrowserOS Core running locally (for full functionality)

 ### Setup

 ```bash
-# Copy environment file
-cp .env.example .env.development
-
 # Install dependencies
 bun install

@@ -134,30 +153,12 @@ SENTRY_AUTH_TOKEN=your-token

 ### GraphQL Schema

-Codegen requires a GraphQL schema. By default it uses the bundled `schema/schema.graphql`, so no extra setup is needed. If you have access to the original API source, you can set the following environment variable:
+Codegen requires a GraphQL schema. By default it uses the bundled `schema/schema.graphql`, so no extra setup is needed. If you have access to the original API source, you can set the following environment variable

 ```env
 GRAPHQL_SCHEMA_PATH=/path/to/api-repo/.../schema.graphql
 ```

-## Development Tooling
-
-### Bun
-
-Bun is the exclusive runtime and package manager:
- All scripts use `bun run <script>` instead of npm
- Package installation via `bun install`
- Environment files automatically loaded (no dotenv needed)
- Enforced via `engines` field in `package.json`
-
-### Biome
-
-Unified linter and formatter configured in `biome.json`:
- **Formatting**: 2-space indentation, single quotes, no semicolons
- **Linting**: Recommended rules plus custom rules for unused imports/variables
- **CSS Support**: Tailwind directives parsing enabled
- **Import Organization**: Automatic import sorting via assist actions
-
 ## Scripts

 | Script | Description |
@@ -168,5 +169,4 @@ Unified linter and formatter configured in `biome.json`:
 | `bun run lint` | Run Biome linter |
 | `bun run lint:fix` | Auto-fix linting issues |
 | `bun run typecheck` | Run TypeScript type checking |
-| `bun run codegen` | Generate GraphQL types |
 | `bun run clean:cache` | Clear build caches |
--- a/packages/browseros-agent/apps/agent/biome.json
+++ b/packages/browseros-agent/apps/agent/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.8/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
  "root": false,
  "extends": "//",
  "vcs": {
--- a/packages/browseros-agent/apps/agent/components/ai-elements/run-result-dialog.tsx
+++ b/packages/browseros-agent/apps/agent/components/ai-elements/run-result-dialog.tsx
@@ -66,7 +66,7 @@ export const RunResultDialog: FC<RunResultDialogProps> = ({

  return (
    <Dialog open={!!run} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:w-[70vw] sm:max-w-4xl">
+      <DialogContent className="sm:max-w-2xl">
        <DialogHeader>
          <DialogTitle className="flex items-center gap-2">
            {run.status === 'completed' ? (
@@ -94,7 +94,7 @@ export const RunResultDialog: FC<RunResultDialogProps> = ({
              <p className="text-destructive text-sm">{run.result}</p>
            </div>
          ) : run.result ? (
-            <div className="prose prose-sm dark:prose-invert [&_[data-streamdown='code-block']]:!w-full [&_[data-streamdown='table-wrapper']]:!w-full max-w-none break-words rounded-lg border border-border bg-muted/50 p-4 [&_[data-streamdown='table-wrapper']]:overflow-x-auto">
+            <div className="prose prose-sm dark:prose-invert [&_[data-streamdown='code-block']]:!w-full [&_[data-streamdown='table-wrapper']]:!w-full max-w-none break-words rounded-lg border border-border bg-muted/50 p-4">
              <MessageResponse>{run.result}</MessageResponse>
            </div>
          ) : (
--- a/packages/browseros-agent/apps/agent/components/chat/ChatProviderSelector.tsx
+++ b/packages/browseros-agent/apps/agent/components/chat/ChatProviderSelector.tsx
@@ -1,4 +1,4 @@
-import { Check, Plus } from 'lucide-react'
+import { Check } from 'lucide-react'
 import type { FC, PropsWithChildren } from 'react'
 import { useState } from 'react'
 import {
@@ -77,19 +77,6 @@ export const ChatProviderSelector: FC<
                )
              })}
            </CommandGroup>
-            <div className="border-border border-t p-1">
-              <button
-                type="button"
-                className="flex w-full items-center gap-3 rounded-md p-2 text-muted-foreground text-sm transition-colors hover:bg-accent hover:text-foreground"
-                onClick={() => {
-                  window.open('/app.html#/settings/ai', '_blank')
-                  setOpen(false)
-                }}
-              >
-                <Plus className="h-4 w-4" />
-                Add Provider
-              </button>
-            </div>
          </CommandList>
        </Command>
      </PopoverContent>
--- a/packages/browseros-agent/apps/agent/components/credits/CreditBadge.tsx
+++ b/packages/browseros-agent/apps/agent/components/credits/CreditBadge.tsx
@@ -1,26 +0,0 @@
-import { Coins } from 'lucide-react'
-import type { FC } from 'react'
-import { getCreditTextColor } from '@/lib/credits/credit-colors'
-import { cn } from '@/lib/utils'
-
-interface CreditBadgeProps {
-  credits: number
-  onClick?: () => void
-}
-
-export const CreditBadge: FC<CreditBadgeProps> = ({ credits, onClick }) => {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      className={cn(
-        'inline-flex cursor-pointer items-center gap-1 rounded-md px-1.5 py-0.5 font-medium text-xs transition-colors hover:bg-muted/50',
-        getCreditTextColor(credits),
-      )}
-      title={`${credits} credits remaining`}
-    >
-      <Coins className="h-3.5 w-3.5" />
-      <span>{credits}</span>
-    </button>
-  )
-}
--- a/packages/browseros-agent/apps/agent/components/sidebar/SettingsSidebar.tsx
+++ b/packages/browseros-agent/apps/agent/components/sidebar/SettingsSidebar.tsx
@@ -3,7 +3,6 @@ import {
  BookOpen,
  Bot,
  Compass,
-  CreditCard,
  GitBranch,
  MessageSquare,
  Palette,
@@ -80,12 +79,6 @@ const primarySettingsSections: NavSection[] = [
        feature: Feature.CUSTOMIZATION_SUPPORT,
      },
      { name: 'BrowserOS as MCP', to: '/settings/mcp', icon: Server },
-      {
-        name: 'Usage & Billing',
-        to: '/settings/usage',
-        icon: CreditCard,
-        feature: Feature.CREDITS_SUPPORT,
-      },
      {
        name: 'Workflows',
        to: '/workflows',
--- a/packages/browseros-agent/apps/agent/components/ui/alert-dialog.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/alert-dialog.tsx
@@ -176,14 +176,14 @@ function AlertDialogCancel({

 export {
  AlertDialog,
+  AlertDialogPortal,
+  AlertDialogOverlay,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogHeader,
+  AlertDialogFooter,
+  AlertDialogTitle,
+  AlertDialogDescription,
  AlertDialogAction,
  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogOverlay,
-  AlertDialogPortal,
-  AlertDialogTitle,
-  AlertDialogTrigger,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/alert.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/alert.tsx
@@ -72,4 +72,4 @@ function AlertDescription({
  )
 }

-export { Alert, AlertDescription, AlertTitle }
+export { Alert, AlertTitle, AlertDescription }
--- a/packages/browseros-agent/apps/agent/components/ui/card.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/card.tsx
@@ -104,10 +104,10 @@ function CardFooter({ className, ...props }: React.ComponentProps<'div'>) {

 export {
  Card,
-  CardAction,
-  CardContent,
-  CardDescription,
-  CardFooter,
  CardHeader,
+  CardFooter,
  CardTitle,
+  CardAction,
+  CardDescription,
+  CardContent,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/carousel.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/carousel.tsx
@@ -251,10 +251,10 @@ function CarouselNext({
 }

 export {
-  Carousel,
  type CarouselApi,
+  Carousel,
  CarouselContent,
  CarouselItem,
-  CarouselNext,
  CarouselPrevious,
+  CarouselNext,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/collapsible.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/collapsible.tsx
@@ -39,4 +39,4 @@ function CollapsibleContent({
  )
 }

-export { Collapsible, CollapsibleContent, CollapsibleTrigger }
+export { Collapsible, CollapsibleTrigger, CollapsibleContent }
--- a/packages/browseros-agent/apps/agent/components/ui/command.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/command.tsx
@@ -198,11 +198,11 @@ function CommandShortcut({
 export {
  Command,
  CommandDialog,
+  CommandInput,
+  CommandList,
  CommandEmpty,
  CommandGroup,
-  CommandInput,
  CommandItem,
-  CommandList,
-  CommandSeparator,
  CommandShortcut,
+  CommandSeparator,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/dropdown-menu.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/dropdown-menu.tsx
@@ -283,18 +283,18 @@ function DropdownMenuSubContent({

 export {
  DropdownMenu,
-  DropdownMenuCheckboxItem,
+  DropdownMenuPortal,
+  DropdownMenuTrigger,
  DropdownMenuContent,
  DropdownMenuGroup,
-  DropdownMenuItem,
  DropdownMenuLabel,
-  DropdownMenuPortal,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
  DropdownMenuRadioGroup,
  DropdownMenuRadioItem,
  DropdownMenuSeparator,
  DropdownMenuShortcut,
  DropdownMenuSub,
-  DropdownMenuSubContent,
  DropdownMenuSubTrigger,
-  DropdownMenuTrigger,
+  DropdownMenuSubContent,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/form.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/form.tsx
@@ -179,12 +179,12 @@ function FormMessage({ className, ...props }: React.ComponentProps<'p'>) {
 }

 export {
+  useFormField,
  Form,
-  FormControl,
-  FormDescription,
-  FormField,
  FormItem,
  FormLabel,
+  FormControl,
+  FormDescription,
  FormMessage,
-  useFormField,
+  FormField,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/hover-card.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/hover-card.tsx
@@ -50,4 +50,4 @@ function HoverCardContent({
  )
 }

-export { HoverCard, HoverCardContent, HoverCardTrigger }
+export { HoverCard, HoverCardTrigger, HoverCardContent }
--- a/packages/browseros-agent/apps/agent/components/ui/input-group.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/input-group.tsx
@@ -184,7 +184,7 @@ export {
  InputGroup,
  InputGroupAddon,
  InputGroupButton,
-  InputGroupInput,
  InputGroupText,
+  InputGroupInput,
  InputGroupTextarea,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/popover.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/popover.tsx
@@ -55,4 +55,4 @@ function PopoverAnchor({
  return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />
 }

-export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger }
+export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }
--- a/packages/browseros-agent/apps/agent/components/ui/resizable.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/resizable.tsx
@@ -49,4 +49,4 @@ function ResizableHandle({
  )
 }

-export { ResizableHandle, ResizablePanel, ResizablePanelGroup }
+export { ResizablePanelGroup, ResizablePanel, ResizableHandle }
--- a/packages/browseros-agent/apps/agent/components/ui/sheet.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/sheet.tsx
@@ -129,11 +129,11 @@ function SheetDescription({

 export {
  Sheet,
+  SheetTrigger,
  SheetClose,
  SheetContent,
-  SheetDescription,
-  SheetFooter,
  SheetHeader,
+  SheetFooter,
  SheetTitle,
-  SheetTrigger,
+  SheetDescription,
 }
--- a/packages/browseros-agent/apps/agent/components/ui/sonner.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/sonner.tsx
@@ -18,7 +18,6 @@ const Toaster = ({ ...props }: ToasterProps) => {
    <Sonner
      theme={theme as ToasterProps['theme']}
      className="toaster group"
-      closeButton
      icons={{
        success: <CircleCheckIcon className="size-4" />,
        info: <InfoIcon className="size-4" />,
--- a/packages/browseros-agent/apps/agent/components/ui/tabs.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/tabs.tsx
@@ -86,4 +86,4 @@ function TabsContent({
  )
 }

-export { Tabs, TabsContent, TabsList, TabsTrigger, tabsListVariants }
+export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants }
--- a/packages/browseros-agent/apps/agent/components/ui/tooltip.tsx
+++ b/packages/browseros-agent/apps/agent/components/ui/tooltip.tsx
@@ -68,4 +68,4 @@ function TooltipContent({
  )
 }

-export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
--- a/packages/browseros-agent/apps/agent/entrypoints/app/App.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/App.tsx
@@ -2,7 +2,6 @@ import type { FC } from 'react'
 import { HashRouter, Navigate, Route, Routes, useParams } from 'react-router'

 import { NewTab } from '../newtab/index/NewTab'
-import { NewTabChat } from '../newtab/index/NewTabChat'
 import { NewTabLayout } from '../newtab/layout/NewTabLayout'
 import { Personalize } from '../newtab/personalize/Personalize'
 import { OnboardingDemo } from '../onboarding/demo/OnboardingDemo'
@@ -28,7 +27,6 @@ import { ScheduledTasksPage } from './scheduled-tasks/ScheduledTasksPage'
 import { SearchProviderPage } from './search-provider/SearchProviderPage'
 import { SkillsPage } from './skills/SkillsPage'
 import { SoulPage } from './soul/SoulPage'
-import { UsagePage } from './usage/UsagePage'
 import { WorkflowsPageWrapper } from './workflows/WorkflowsPageWrapper'

 function getSurveyParams(): { maxTurns?: number; experimentId?: string } {
@@ -81,7 +79,6 @@ export const App: FC = () => {
          {/* Home routes */}
          <Route path="home" element={<NewTabLayout />}>
            <Route index element={<NewTab />} />
-            <Route path="chat" element={<NewTabChat />} />
            <Route path="personalize" element={<Personalize />} />
            <Route path="soul" element={<SoulPage />} />
            <Route path="skills" element={<SkillsPage />} />
@@ -104,7 +101,6 @@ export const App: FC = () => {
            <Route path="customization" element={<CustomizationPage />} />
            <Route path="search" element={<SearchProviderPage />} />
            <Route path="survey" element={<SurveyPage {...surveyParams} />} />
-            <Route path="usage" element={<UsagePage />} />
          </Route>
        </Route>

--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/AISettingsPage.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/AISettingsPage.tsx
@@ -13,17 +13,6 @@ import {
 } from '@/components/ui/alert-dialog'
 import { useSessionInfo } from '@/lib/auth/sessionStorage'
 import { useAgentServerUrl } from '@/lib/browseros/useBrowserOSProviders'
-import {
-  CHATGPT_PRO_OAUTH_COMPLETED_EVENT,
-  CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT,
-  CHATGPT_PRO_OAUTH_STARTED_EVENT,
-  GITHUB_COPILOT_OAUTH_COMPLETED_EVENT,
-  GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT,
-  GITHUB_COPILOT_OAUTH_STARTED_EVENT,
-  QWEN_CODE_OAUTH_COMPLETED_EVENT,
-  QWEN_CODE_OAUTH_DISCONNECTED_EVENT,
-  QWEN_CODE_OAUTH_STARTED_EVENT,
-} from '@/lib/constants/analyticsEvents'
 import { GetProfileIdByUserIdDocument } from '@/lib/conversations/graphql/uploadConversationDocument'
 import { getQueryKeyFromDocument } from '@/lib/graphql/getQueryKeyFromDocument'
 import { useGraphqlMutation } from '@/lib/graphql/useGraphqlMutation'
@@ -32,13 +21,7 @@ import type { ProviderTemplate } from '@/lib/llm-providers/providerTemplates'
 import { testProvider } from '@/lib/llm-providers/testProvider'
 import type { LlmProviderConfig } from '@/lib/llm-providers/types'
 import { useLlmProviders } from '@/lib/llm-providers/useLlmProviders'
-import {
-  type OAuthProviderFlowConfig,
-  useOAuthProviderFlow,
-} from '@/lib/llm-providers/useOAuthProviderFlow'
-import { track } from '@/lib/metrics/track'
 import { ConfiguredProvidersList } from './ConfiguredProvidersList'
-import { DeviceCodeDialog } from './DeviceCodeDialog'
 import {
  DeleteRemoteLlmProviderDocument,
  GetRemoteLlmProvidersDocument,
@@ -46,51 +29,9 @@ import {
 import type { IncompleteProvider } from './IncompleteProviderCard'
 import { IncompleteProvidersList } from './IncompleteProvidersList'
 import { LlmProvidersHeader } from './LlmProvidersHeader'
-import { McpPromoBanner } from './McpPromoBanner'
 import { NewProviderDialog } from './NewProviderDialog'
 import { ProviderTemplatesSection } from './ProviderTemplatesSection'

-// All OAuth providers share the same flow via useOAuthProviderFlow
-const OAUTH_PROVIDERS_CONFIG: Record<string, OAuthProviderFlowConfig> = {
-  'chatgpt-pro': {
-    providerType: 'chatgpt-pro',
-    displayName: 'ChatGPT Plus/Pro',
-    startedEvent: CHATGPT_PRO_OAUTH_STARTED_EVENT,
-    completedEvent: CHATGPT_PRO_OAUTH_COMPLETED_EVENT,
-    disconnectedEvent: CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT,
-  },
-  'github-copilot': {
-    providerType: 'github-copilot',
-    displayName: 'GitHub Copilot',
-    startedEvent: GITHUB_COPILOT_OAUTH_STARTED_EVENT,
-    completedEvent: GITHUB_COPILOT_OAUTH_COMPLETED_EVENT,
-    disconnectedEvent: GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT,
-    clientAuth: {
-      deviceCodeEndpoint: 'https://github.com/login/device/code',
-      tokenEndpoint: 'https://github.com/login/oauth/access_token',
-      clientId: 'Ov23li8tweQw6odWQebz',
-      scopes: 'read:user',
-      requiresPKCE: false,
-      contentType: 'json',
-    },
-  },
-  'qwen-code': {
-    providerType: 'qwen-code',
-    displayName: 'Qwen Code',
-    startedEvent: QWEN_CODE_OAUTH_STARTED_EVENT,
-    completedEvent: QWEN_CODE_OAUTH_COMPLETED_EVENT,
-    disconnectedEvent: QWEN_CODE_OAUTH_DISCONNECTED_EVENT,
-    clientAuth: {
-      deviceCodeEndpoint: 'https://chat.qwen.ai/api/v1/oauth2/device/code',
-      tokenEndpoint: 'https://chat.qwen.ai/api/v1/oauth2/token',
-      clientId: 'f0304373b74a44d2b584a3fb70ca9e56',
-      scopes: 'openid profile email model.completion',
-      requiresPKCE: true,
-      contentType: 'form',
-    },
-  },
-}
-
 /**
 * AI Settings page for managing LLM providers
 * @public
@@ -137,7 +78,9 @@ export const AISettingsPage: FC = () => {

  const incompleteProviders = useMemo<IncompleteProvider[]>(() => {
    if (!remoteProvidersData?.llmProviders?.nodes) return []
+
    const localProviderIds = new Set(providers.map((p) => p.id))
+
    return remoteProvidersData.llmProviders.nodes
      .filter((node): node is NonNullable<typeof node> => node !== null)
      .filter((node) => !localProviderIds.has(node.rowId))
@@ -158,71 +101,12 @@ export const AISettingsPage: FC = () => {
    null,
  )

-  // OAuth flows — shared hook eliminates per-provider duplication
-  const chatgptPro = useOAuthProviderFlow(
-    OAUTH_PROVIDERS_CONFIG['chatgpt-pro'],
-    providers,
-    saveProvider,
-  )
-  const copilot = useOAuthProviderFlow(
-    OAUTH_PROVIDERS_CONFIG['github-copilot'],
-    providers,
-    saveProvider,
-  )
-  const qwenCode = useOAuthProviderFlow(
-    OAUTH_PROVIDERS_CONFIG['qwen-code'],
-    providers,
-    saveProvider,
-  )
-
-  const activeDeviceCode =
-    chatgptPro.pendingDeviceCode ??
-    copilot.pendingDeviceCode ??
-    qwenCode.pendingDeviceCode
-  const clearActiveDeviceCode = () => {
-    chatgptPro.clearDeviceCode()
-    copilot.clearDeviceCode()
-    qwenCode.clearDeviceCode()
-  }
-
-  const oauthFlows: Record<
-    string,
-    {
-      startOAuthFlow: (url: string | undefined) => Promise<void>
-      disconnect: () => Promise<void>
-      disconnectedEvent: string
-    }
-  > = {
-    'chatgpt-pro': {
-      startOAuthFlow: chatgptPro.startOAuthFlow,
-      disconnect: chatgptPro.disconnect,
-      disconnectedEvent: CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT,
-    },
-    'github-copilot': {
-      startOAuthFlow: copilot.startOAuthFlow,
-      disconnect: copilot.disconnect,
-      disconnectedEvent: GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT,
-    },
-    'qwen-code': {
-      startOAuthFlow: qwenCode.startOAuthFlow,
-      disconnect: qwenCode.disconnect,
-      disconnectedEvent: QWEN_CODE_OAUTH_DISCONNECTED_EVENT,
-    },
-  }
-
  const handleAddProvider = () => {
    setTemplateValues(undefined)
    setIsNewDialogOpen(true)
  }

  const handleUseTemplate = (template: ProviderTemplate) => {
-    // OAuth providers: trigger OAuth flow
-    const oauthFlow = oauthFlows[template.id]
-    if (oauthFlow) {
-      oauthFlow.startOAuthFlow(agentServerUrl ?? undefined)
-      return
-    }
-
    setTemplateValues({
      type: template.id,
      name: template.name,
@@ -245,18 +129,11 @@ export const AISettingsPage: FC = () => {
  }

  const confirmDeleteProvider = async () => {
-    if (!providerToDelete) return
-
-    // Clear OAuth tokens on server for OAuth-based providers
-    const oauthFlow = oauthFlows[providerToDelete.type]
-    if (oauthFlow) {
-      await oauthFlow.disconnect()
-      track(oauthFlow.disconnectedEvent)
+    if (providerToDelete) {
+      await deleteProvider(providerToDelete.id)
+      deleteRemoteProviderMutation.mutate({ rowId: providerToDelete.id })
+      setProviderToDelete(null)
    }
-
-    await deleteProvider(providerToDelete.id)
-    deleteRemoteProviderMutation.mutate({ rowId: providerToDelete.id })
-    setProviderToDelete(null)
  }

  const handleAddKeysToIncomplete = (provider: IncompleteProvider) => {
@@ -359,8 +236,6 @@ export const AISettingsPage: FC = () => {
        onAddProvider={handleAddProvider}
      />

-      <McpPromoBanner />
-
      <ProviderTemplatesSection onUseTemplate={handleUseTemplate} />

      <ConfiguredProvidersList
@@ -435,11 +310,6 @@ export const AISettingsPage: FC = () => {
          </AlertDialogFooter>
        </AlertDialogContent>
      </AlertDialog>
-
-      <DeviceCodeDialog
-        deviceCode={activeDeviceCode}
-        onClose={clearActiveDeviceCode}
-      />
    </div>
  )
 }
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/DeviceCodeDialog.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/DeviceCodeDialog.tsx
@@ -1,81 +0,0 @@
-import { Check, Copy, ExternalLink } from 'lucide-react'
-import { type FC, useState } from 'react'
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import type { PendingDeviceCode } from '@/lib/llm-providers/useOAuthProviderFlow'
-
-interface DeviceCodeDialogProps {
-  deviceCode: PendingDeviceCode | null
-  onClose: () => void
-}
-
-export const DeviceCodeDialog: FC<DeviceCodeDialogProps> = ({
-  deviceCode,
-  onClose,
-}) => {
-  const [copied, setCopied] = useState(false)
-
-  const handleCopy = async () => {
-    if (!deviceCode) return
-    try {
-      await navigator.clipboard.writeText(deviceCode.userCode)
-      setCopied(true)
-      setTimeout(() => setCopied(false), 2000)
-    } catch {
-      // Clipboard API failed
-    }
-  }
-
-  return (
-    <Dialog open={!!deviceCode} onOpenChange={(open) => !open && onClose()}>
-      <DialogContent className="sm:max-w-md">
-        <DialogHeader>
-          <DialogTitle>Connect to {deviceCode?.providerName}</DialogTitle>
-          <DialogDescription>
-            Paste this code on the {deviceCode?.providerName} page that just
-            opened in your browser.
-          </DialogDescription>
-        </DialogHeader>
-        <div className="flex flex-col items-center gap-4 py-4">
-          <div className="flex items-center gap-3 rounded-xl border-2 border-[var(--accent-orange)]/40 border-dashed bg-[var(--accent-orange)]/5 px-6 py-4">
-            <code className="font-bold font-mono text-2xl text-foreground tracking-widest">
-              {deviceCode?.userCode}
-            </code>
-            <Button
-              variant="ghost"
-              size="icon"
-              onClick={handleCopy}
-              className="shrink-0"
-            >
-              {copied ? (
-                <Check className="h-4 w-4 text-green-600" />
-              ) : (
-                <Copy className="h-4 w-4" />
-              )}
-            </Button>
-          </div>
-          <p className="text-center text-muted-foreground text-xs">
-            This dialog will close automatically once authentication completes.
-          </p>
-          {deviceCode?.verificationUri && (
-            <a
-              href={deviceCode.verificationUri}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="flex items-center gap-1 text-[var(--accent-orange)] text-xs transition-colors hover:underline"
-            >
-              Open verification page
-              <ExternalLink className="h-3 w-3" />
-            </a>
-          )}
-        </div>
-      </DialogContent>
-    </Dialog>
-  )
-}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/McpPromoBanner.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/McpPromoBanner.tsx
@@ -1,57 +0,0 @@
-import { ArrowRight, Server, X } from 'lucide-react'
-import { type FC, useState } from 'react'
-import { useNavigate } from 'react-router'
-import { Button } from '@/components/ui/button'
-import { MCP_PROMO_BANNER_CLICKED_EVENT } from '@/lib/constants/analyticsEvents'
-import { track } from '@/lib/metrics/track'
-
-export const McpPromoBanner: FC = () => {
-  const [dismissed, setDismissed] = useState(false)
-  const navigate = useNavigate()
-
-  if (dismissed) return null
-
-  const handleClick = () => {
-    track(MCP_PROMO_BANNER_CLICKED_EVENT)
-    navigate('/settings/mcp')
-  }
-
-  return (
-    <div className="flex items-center gap-4 rounded-xl border border-border bg-card p-4 shadow-sm transition-all hover:shadow-md">
-      <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-[var(--accent-orange)]/10">
-        <Server className="h-5 w-5 text-[var(--accent-orange)]" />
-      </div>
-      <div className="min-w-0 flex-1">
-        <p className="flex items-center gap-2 font-semibold text-sm">
-          Use BrowserOS with Claude Code, Cursor & more
-          <span className="text-[var(--accent-orange)] text-xs">
-            (66+ tools)
-          </span>
-          <span className="inline-flex items-center gap-1 rounded-full bg-[var(--accent-orange)]/10 px-2.5 py-1 font-semibold text-[var(--accent-orange)] text-xs">
-            <span className="h-1.5 w-1.5 rounded-full bg-[var(--accent-orange)]" />
-            New
-          </span>
-        </p>
-        <p className="text-muted-foreground text-xs">
-          Connect your favorite coding tools to BrowserOS as an MCP server
-        </p>
-      </div>
-      <Button
-        variant="outline"
-        size="sm"
-        onClick={handleClick}
-        className="shrink-0 border-[var(--accent-orange)] bg-[var(--accent-orange)]/10 text-[var(--accent-orange)] hover:bg-[var(--accent-orange)]/20 hover:text-[var(--accent-orange)]"
-      >
-        Set up
-        <ArrowRight className="ml-1 h-3 w-3" />
-      </Button>
-      <button
-        type="button"
-        onClick={() => setDismissed(true)}
-        className="shrink-0 rounded-sm p-1 text-muted-foreground opacity-50 transition-opacity hover:opacity-100"
-      >
-        <X className="h-3.5 w-3.5" />
-      </button>
-    </div>
-  )
-}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/NewProviderDialog.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/NewProviderDialog.tsx
@@ -1,13 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod'
-import {
-  CheckCircle2,
-  ChevronDown,
-  ExternalLink,
-  Loader2,
-  SearchIcon,
-  XCircle,
-} from 'lucide-react'
-import { type FC, useEffect, useRef, useState } from 'react'
+import { CheckCircle2, ExternalLink, Loader2, XCircle } from 'lucide-react'
+import { type FC, useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { z } from 'zod/v3'
 import { Button } from '@/components/ui/button'
@@ -54,12 +47,7 @@ import {
 import { type TestResult, testProvider } from '@/lib/llm-providers/testProvider'
 import type { LlmProviderConfig, ProviderType } from '@/lib/llm-providers/types'
 import { track } from '@/lib/metrics/track'
-import { cn } from '@/lib/utils'
-import {
-  getModelContextLength,
-  getModelsForProvider,
-  type ModelInfo,
-} from './models'
+import { getModelContextLength, getModelOptions } from './models'

 const providerTypeEnum = z.enum([
  'moonshot',
@@ -73,9 +61,6 @@ const providerTypeEnum = z.enum([
  'lmstudio',
  'bedrock',
  'browseros',
-  'chatgpt-pro',
-  'github-copilot',
-  'qwen-code',
 ])

 /**
@@ -99,9 +84,6 @@ export const providerFormSchema = z
    secretAccessKey: z.string().optional(),
    region: z.string().optional(),
    sessionToken: z.string().optional(),
-    // ChatGPT Pro (Codex)
-    reasoningEffort: z.enum(['none', 'low', 'medium', 'high']).optional(),
-    reasoningSummary: z.enum(['auto', 'concise', 'detailed']).optional(),
  })
  .superRefine((data, ctx) => {
    // Azure: require either resourceName or baseUrl
@@ -145,14 +127,6 @@ export const providerFormSchema = z
        })
      }
    }
-    // OAuth providers: no credentials needed (server-managed)
-    else if (
-      data.type === 'chatgpt-pro' ||
-      data.type === 'github-copilot' ||
-      data.type === 'qwen-code'
-    ) {
-      // No validation needed — OAuth tokens are on the server
-    }
    // Other providers: require baseUrl
    else if (!data.baseUrl) {
      ctx.addIssue({
@@ -175,107 +149,6 @@ export const providerFormSchema = z
 */
 export type ProviderFormValues = z.infer<typeof providerFormSchema>

-function formatContextWindow(tokens: number): string {
-  if (tokens >= 1000000)
-    return `${(tokens / 1000000).toFixed(tokens % 1000000 === 0 ? 0 : 1)}M`
-  if (tokens >= 1000) return `${Math.round(tokens / 1000)}K`
-  return `${tokens}`
-}
-
-function ModelPickerList({
-  models,
-  selectedModelId,
-  onSelect,
-  onCustomSubmit,
-  onClose,
-}: {
-  models: ModelInfo[]
-  selectedModelId: string
-  onSelect: (modelId: string) => void
-  onCustomSubmit: (modelId: string) => void
-  onClose: () => void
-}) {
-  const [search, setSearch] = useState('')
-  const inputRef = useRef<HTMLInputElement>(null)
-  const containerRef = useRef<HTMLDivElement>(null)
-
-  useEffect(() => {
-    inputRef.current?.focus()
-  }, [])
-
-  useEffect(() => {
-    const handleClickOutside = (e: MouseEvent) => {
-      if (
-        containerRef.current &&
-        !containerRef.current.contains(e.target as Node)
-      ) {
-        onClose()
-      }
-    }
-    document.addEventListener('mousedown', handleClickOutside)
-    return () => document.removeEventListener('mousedown', handleClickOutside)
-  }, [onClose])
-
-  const query = search.toLowerCase()
-  const filtered = query
-    ? models.filter((m) => m.modelId.toLowerCase().includes(query))
-    : models
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Enter' && search) {
-      e.preventDefault()
-      onCustomSubmit(search)
-    }
-    if (e.key === 'Escape') {
-      onClose()
-    }
-  }
-
-  return (
-    <div ref={containerRef} className="rounded-md border">
-      <div className="flex items-center gap-2 border-b px-3">
-        <SearchIcon className="h-4 w-4 shrink-0 text-muted-foreground opacity-50" />
-        <input
-          ref={inputRef}
-          type="text"
-          value={search}
-          onChange={(e) => setSearch(e.target.value)}
-          onKeyDown={handleKeyDown}
-          placeholder="Search or type a custom model ID..."
-          className="flex h-9 w-full bg-transparent py-2 text-sm outline-none placeholder:text-muted-foreground"
-        />
-      </div>
-      <div className="max-h-[200px] overflow-y-auto">
-        {filtered.length > 0 ? (
-          filtered.map((model) => {
-            const isSelected = selectedModelId === model.modelId
-            return (
-              <button
-                key={model.modelId}
-                type="button"
-                onClick={() => onSelect(model.modelId)}
-                className={cn(
-                  'flex w-full items-center justify-between px-3 py-2 text-left text-sm transition-colors hover:bg-accent',
-                  isSelected && 'bg-accent font-medium',
-                )}
-              >
-                <span className="truncate">{model.modelId}</span>
-                <span className="ml-2 shrink-0 rounded-md bg-muted px-1.5 py-0.5 font-mono text-[10px] text-muted-foreground">
-                  {formatContextWindow(model.contextLength)}
-                </span>
-              </button>
-            )
-          })
-        ) : (
-          <div className="px-3 py-6 text-center text-muted-foreground text-sm">
-            No models match. Press Enter to use &quot;{search}&quot;
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
-
 /**
 * Props for NewProviderDialog
 * @public
@@ -301,19 +174,14 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
  initialValues,
  onSave,
 }) => {
+  const [isCustomModel, setIsCustomModel] = useState(false)
  const [isTesting, setIsTesting] = useState(false)
  const [testResult, setTestResult] = useState<TestResult | null>(null)
-  const [modelListOpen, setModelListOpen] = useState(false)
  const { supports } = useCapabilities()
  const { baseUrl: agentServerUrl } = useAgentServerUrl()
  const kimiLaunch = useKimiLaunch()

  const filteredProviderTypeOptions = providerTypeOptions.filter((opt) => {
-    if (opt.value === 'chatgpt-pro')
-      return supports(Feature.CHATGPT_PRO_SUPPORT)
-    if (opt.value === 'github-copilot')
-      return supports(Feature.GITHUB_COPILOT_SUPPORT)
-    if (opt.value === 'qwen-code') return supports(Feature.QWEN_CODE_SUPPORT)
    if (opt.value === 'moonshot')
      return kimiLaunch || initialValues?.type === 'moonshot'
    if (opt.value === 'openai-compatible') {
@@ -341,8 +209,6 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
      secretAccessKey: initialValues?.secretAccessKey || '',
      region: initialValues?.region || '',
      sessionToken: initialValues?.sessionToken || '',
-      reasoningEffort: initialValues?.reasoningEffort || 'high',
-      reasoningSummary: initialValues?.reasoningSummary || 'auto',
    },
  })

@@ -374,7 +240,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
    watchedSessionToken,
  ])

-  const modelInfoList = getModelsForProvider(watchedType as ProviderType)
+  // Get model options for current provider type
+  const modelOptions = getModelOptions(watchedType as ProviderType)

  // Handle provider type change (user-initiated via Select)
  const handleTypeChange = (newType: ProviderType) => {
@@ -384,13 +251,14 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
      form.setValue('baseUrl', defaultUrl)
    }
    form.setValue('modelId', '')
+    setIsCustomModel(false)
  }

  // Auto-fill context window when model changes (only for new providers)
  useEffect(() => {
    if (initialValues?.id) return

-    if (watchedModelId) {
+    if (watchedModelId && watchedModelId !== 'custom') {
      const contextLength = getModelContextLength(
        watchedType as ProviderType,
        watchedModelId,
@@ -401,6 +269,17 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
    }
  }, [watchedModelId, watchedType, form, initialValues?.id])

+  // Handle model selection (including custom option)
+  const handleModelChange = (value: string) => {
+    if (value === 'custom') {
+      setIsCustomModel(true)
+      form.setValue('modelId', '')
+    } else {
+      setIsCustomModel(false)
+      form.setValue('modelId', value)
+    }
+  }
+
  // Reset form when initialValues change
  useEffect(() => {
    if (initialValues) {
@@ -422,9 +301,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
        secretAccessKey: initialValues.secretAccessKey || '',
        region: initialValues.region || '',
        sessionToken: initialValues.sessionToken || '',
-        reasoningEffort: initialValues.reasoningEffort || 'high',
-        reasoningSummary: initialValues.reasoningSummary || 'auto',
      })
+      setIsCustomModel(false)
    }
  }, [initialValues, form])

@@ -448,9 +326,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
        secretAccessKey: '',
        region: '',
        sessionToken: '',
-        reasoningEffort: 'high',
-        reasoningSummary: 'auto',
      })
+      setIsCustomModel(false)
    }
    // Clear test result when dialog opens/closes
    setTestResult(null)
@@ -486,14 +363,6 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
  const canTest = (): boolean => {
    if (!watchedModelId) return false

-    // OAuth providers: always testable (server has the OAuth token)
-    if (
-      watchedType === 'chatgpt-pro' ||
-      watchedType === 'github-copilot' ||
-      watchedType === 'qwen-code'
-    )
-      return true
-
    if (watchedType === 'azure') {
      return !!(watchedResourceName || watchedBaseUrl) && !!watchedApiKey
    }
@@ -575,85 +444,6 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
  }

  const renderProviderSpecificFields = () => {
-    // OAuth-only providers (no API key needed)
-    if (watchedType === 'github-copilot' || watchedType === 'qwen-code') {
-      const name = watchedType === 'github-copilot' ? 'GitHub' : 'Qwen Code'
-      return (
-        <div className="rounded-lg border border-green-200 bg-green-50 p-3 text-green-700 text-sm dark:border-green-800 dark:bg-green-950 dark:text-green-300">
-          Credentials are managed via {name} OAuth. No API key needed.
-        </div>
-      )
-    }
-    // ChatGPT Pro: OAuth credentials + Codex reasoning settings
-    if (watchedType === 'chatgpt-pro') {
-      return (
-        <>
-          <div className="rounded-lg border border-green-200 bg-green-50 p-3 text-green-700 text-sm dark:border-green-800 dark:bg-green-950 dark:text-green-300">
-            Credentials are managed via OAuth. No API key needed.
-          </div>
-          <div className="grid gap-4 sm:grid-cols-2">
-            <FormField
-              control={form.control}
-              name="reasoningEffort"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Reasoning Effort</FormLabel>
-                  <Select
-                    onValueChange={field.onChange}
-                    value={field.value || 'high'}
-                  >
-                    <FormControl>
-                      <SelectTrigger className="w-full">
-                        <SelectValue />
-                      </SelectTrigger>
-                    </FormControl>
-                    <SelectContent>
-                      <SelectItem value="none">None</SelectItem>
-                      <SelectItem value="low">Low</SelectItem>
-                      <SelectItem value="medium">Medium</SelectItem>
-                      <SelectItem value="high">High</SelectItem>
-                    </SelectContent>
-                  </Select>
-                  <FormDescription>
-                    How much the model thinks before responding
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name="reasoningSummary"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Reasoning Summary</FormLabel>
-                  <Select
-                    onValueChange={field.onChange}
-                    value={field.value || 'auto'}
-                  >
-                    <FormControl>
-                      <SelectTrigger className="w-full">
-                        <SelectValue />
-                      </SelectTrigger>
-                    </FormControl>
-                    <SelectContent>
-                      <SelectItem value="auto">Auto</SelectItem>
-                      <SelectItem value="concise">Concise</SelectItem>
-                      <SelectItem value="detailed">Detailed</SelectItem>
-                    </SelectContent>
-                  </Select>
-                  <FormDescription>
-                    Detail level of visible thinking steps
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </div>
-        </>
-      )
-    }
-
    if (watchedType === 'azure') {
      return (
        <>
@@ -909,51 +699,52 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
              control={form.control}
              name="modelId"
              render={({ field }) => (
-                <FormItem className="flex flex-col">
+                <FormItem>
                  <FormLabel>Model *</FormLabel>
-                  {modelInfoList.length === 0 ? (
-                    <FormControl>
-                      <Input
-                        placeholder={
-                          watchedType === 'azure'
-                            ? 'Enter your deployment name'
-                            : watchedType === 'bedrock'
-                              ? 'e.g., anthropic.claude-3-5-sonnet-20241022-v2:0'
-                              : 'Enter model ID'
-                        }
-                        {...field}
-                      />
-                    </FormControl>
-                  ) : modelListOpen ? (
-                    <ModelPickerList
-                      models={modelInfoList}
-                      selectedModelId={field.value}
-                      onSelect={(modelId) => {
-                        form.setValue('modelId', modelId)
-                        setModelListOpen(false)
-                      }}
-                      onCustomSubmit={(modelId) => {
-                        form.setValue('modelId', modelId)
-                        setModelListOpen(false)
-                      }}
-                      onClose={() => setModelListOpen(false)}
-                    />
-                  ) : (
-                    <button
-                      type="button"
-                      onClick={() => setModelListOpen(true)}
-                      className={cn(
-                        'flex h-9 w-full items-center justify-between rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-xs',
-                        field.value
-                          ? 'text-foreground'
-                          : 'text-muted-foreground',
+                  {isCustomModel || modelOptions.length === 1 ? (
+                    <>
+                      <FormControl>
+                        <Input
+                          placeholder={
+                            watchedType === 'azure'
+                              ? 'Enter your deployment name'
+                              : watchedType === 'bedrock'
+                                ? 'e.g., anthropic.claude-3-5-sonnet-20241022-v2:0'
+                                : 'Enter custom model ID'
+                          }
+                          {...field}
+                        />
+                      </FormControl>
+                      {modelOptions.length > 1 && (
+                        <Button
+                          type="button"
+                          variant="link"
+                          size="sm"
+                          className="h-auto p-0 text-xs"
+                          onClick={() => setIsCustomModel(false)}
+                        >
+                          ← Back to model list
+                        </Button>
                      )}
+                    </>
+                  ) : (
+                    <Select
+                      onValueChange={handleModelChange}
+                      value={field.value}
                    >
-                      <span className="truncate">
-                        {field.value || 'Select a model...'}
-                      </span>
-                      <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                    </button>
+                      <FormControl>
+                        <SelectTrigger className="w-full">
+                          <SelectValue placeholder="Select a model" />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        {modelOptions.map((modelId) => (
+                          <SelectItem key={modelId} value={modelId}>
+                            {modelId === 'custom' ? '+ Custom model' : modelId}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
                  )}
                  <FormMessage />
                </FormItem>
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderCard.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderCard.tsx
@@ -103,10 +103,8 @@ export const ProviderCard: FC<ProviderCardProps> = ({
                for better performance.
              </>
            )
-          ) : provider.baseUrl ? (
-            `${provider.modelId} • ${provider.baseUrl}`
          ) : (
-            provider.modelId
+            `${provider.modelId} • ${provider.baseUrl}`
          )}
        </p>
      </div>
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderTemplateCard.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderTemplateCard.tsx
@@ -7,14 +7,12 @@ import { cn } from '@/lib/utils'
 interface ProviderTemplateCardProps {
  template: ProviderTemplate
  highlighted?: boolean
-  isNew?: boolean
  onUseTemplate: (template: ProviderTemplate) => void
 }

 export const ProviderTemplateCard: FC<ProviderTemplateCardProps> = ({
  template,
  highlighted = false,
-  isNew = false,
  onUseTemplate,
 }) => {
  return (
@@ -22,19 +20,12 @@ export const ProviderTemplateCard: FC<ProviderTemplateCardProps> = ({
      type="button"
      onClick={() => onUseTemplate(template)}
      className={cn(
-        'group relative flex w-full items-center gap-3 rounded-lg border bg-background p-4 text-left transition-all hover:border-[var(--accent-orange)] hover:shadow-md',
+        'group flex w-full items-center gap-3 rounded-lg border bg-background p-4 text-left transition-all hover:border-[var(--accent-orange)] hover:shadow-md',
        highlighted
          ? 'border-orange-300/80 bg-orange-50/30 shadow-sm ring-1 ring-orange-300/45 dark:bg-orange-500/5'
-          : isNew
-            ? 'border-2 border-[var(--accent-orange)]/50'
-            : 'border-border',
+          : 'border-border',
      )}
    >
-      {isNew && (
-        <span className="absolute -top-2 left-3 rounded-full bg-[var(--accent-orange)] px-2 py-0.5 font-semibold text-[9px] text-white uppercase tracking-wider">
-          New
-        </span>
-      )}
      <div className="flex min-w-0 flex-1 items-center gap-3">
        <ProviderIcon
          type={template.id}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderTemplatesSection.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderTemplatesSection.tsx
@@ -26,11 +26,6 @@ export const ProviderTemplatesSection: FC<ProviderTemplatesSectionProps> = ({
  const kimiLaunch = useKimiLaunch()

  const filteredTemplates = providerTemplates.filter((template) => {
-    if (template.id === 'chatgpt-pro')
-      return supports(Feature.CHATGPT_PRO_SUPPORT)
-    if (template.id === 'github-copilot')
-      return supports(Feature.GITHUB_COPILOT_SUPPORT)
-    if (template.id === 'qwen-code') return supports(Feature.QWEN_CODE_SUPPORT)
    if (template.id === 'moonshot') return kimiLaunch
    if (template.id === 'openai-compatible') {
      return supports(Feature.OPENAI_COMPATIBLE_SUPPORT)
@@ -58,21 +53,14 @@ export const ProviderTemplatesSection: FC<ProviderTemplatesSectionProps> = ({

        <CollapsibleContent>
          <div className="mt-4 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
-            {filteredTemplates.map((template) => {
-              const isNew =
-                template.id === 'chatgpt-pro' ||
-                template.id === 'github-copilot' ||
-                template.id === 'qwen-code'
-              return (
-                <ProviderTemplateCard
-                  key={template.id}
-                  template={template}
-                  highlighted={template.id === 'moonshot'}
-                  isNew={isNew}
-                  onUseTemplate={onUseTemplate}
-                />
-              )
-            })}
+            {filteredTemplates.map((template) => (
+              <ProviderTemplateCard
+                key={template.id}
+                template={template}
+                highlighted={template.id === 'moonshot'}
+                onUseTemplate={onUseTemplate}
+              />
+            ))}
          </div>
        </CollapsibleContent>
      </div>
--- a/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/models.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/models.ts
@@ -1,56 +1,116 @@
-import {
-  getModelsDevModels,
-  type ModelsDevModel,
-} from '@/lib/llm-providers/models-dev'
 import type { ProviderType } from '@/lib/llm-providers/types'

+/**
+ * Model information with context length
+ */
 export interface ModelInfo {
  modelId: string
  contextLength: number
-  supportsImages?: boolean
-  supportsReasoning?: boolean
-  supportsToolCall?: boolean
 }

-const CUSTOM_PROVIDER_MODELS: Partial<Record<ProviderType, ModelInfo[]>> = {
-  browseros: [{ modelId: 'browseros-auto', contextLength: 200000 }],
-  'openai-compatible': [],
-  ollama: [],
-  'chatgpt-pro': [
-    { modelId: 'gpt-5.4', contextLength: 400000 },
-    { modelId: 'gpt-5.3-codex', contextLength: 400000 },
-    { modelId: 'gpt-5.2-codex', contextLength: 400000 },
+/**
+ * Models data organized by provider type (matches backend AIProvider enum)
+ */
+export interface ModelsData {
+  anthropic: ModelInfo[]
+  openai: ModelInfo[]
+  'openai-compatible': ModelInfo[]
+  google: ModelInfo[]
+  openrouter: ModelInfo[]
+  azure: ModelInfo[]
+  ollama: ModelInfo[]
+  lmstudio: ModelInfo[]
+  bedrock: ModelInfo[]
+  browseros: ModelInfo[]
+  moonshot: ModelInfo[]
+}
+
+/**
+ * Available models per provider with context lengths
+ * Based on: https://github.com/browseros-ai/BrowserOS-agent/blob/main/src/options/data/models.ts
+ */
+export const MODELS_DATA: ModelsData = {
+  moonshot: [{ modelId: 'kimi-k2.5', contextLength: 200000 }],
+  anthropic: [
+    { modelId: 'claude-opus-4-5-20251101', contextLength: 200000 },
+    { modelId: 'claude-haiku-4-5-20251001', contextLength: 200000 },
+    { modelId: 'claude-sonnet-4-5-20250929', contextLength: 200000 },
+    { modelId: 'claude-sonnet-4-20250514', contextLength: 200000 },
+    { modelId: 'claude-opus-4-20250514', contextLength: 200000 },
+    { modelId: 'claude-3-7-sonnet-20250219', contextLength: 200000 },
+    { modelId: 'claude-3-5-haiku-20241022', contextLength: 200000 },
+  ],
+  openai: [
    { modelId: 'gpt-5.2', contextLength: 200000 },
-    { modelId: 'gpt-5.1-codex', contextLength: 400000 },
-    { modelId: 'gpt-5.1-codex-max', contextLength: 400000 },
-    { modelId: 'gpt-5.1-codex-mini', contextLength: 400000 },
-    { modelId: 'gpt-5.1', contextLength: 200000 },
+    { modelId: 'gpt-5.2-pro', contextLength: 200000 },
+    { modelId: 'gpt-5', contextLength: 200000 },
+    { modelId: 'gpt-5-mini', contextLength: 200000 },
+    { modelId: 'gpt-5-nano', contextLength: 200000 },
+    { modelId: 'gpt-4.1', contextLength: 200000 },
+    { modelId: 'gpt-4.1-mini', contextLength: 200000 },
+    { modelId: 'o4-mini', contextLength: 200000 },
+    { modelId: 'o3-mini', contextLength: 200000 },
+    { modelId: 'gpt-4o', contextLength: 128000 },
+    { modelId: 'gpt-4o-mini', contextLength: 128000 },
  ],
-  'qwen-code': [
-    { modelId: 'coder-model', contextLength: 1000000 },
-    { modelId: 'qwen3-coder-plus', contextLength: 1000000 },
-    { modelId: 'qwen3-coder-flash', contextLength: 1000000 },
-    { modelId: 'qwen3.5-plus', contextLength: 1000000 },
+  'openai-compatible': [],
+  google: [
+    { modelId: 'gemini-3-pro-preview', contextLength: 1048576 },
+    { modelId: 'gemini-3-flash-preview', contextLength: 1048576 },
+    { modelId: 'gemini-2.5-flash', contextLength: 1048576 },
+    { modelId: 'gemini-2.5-pro', contextLength: 1048576 },
  ],
+  openrouter: [
+    { modelId: 'google/gemini-3-pro-preview', contextLength: 1048576 },
+    { modelId: 'google/gemini-3-flash-preview', contextLength: 1048576 },
+    { modelId: 'google/gemini-2.5-flash', contextLength: 1048576 },
+    { modelId: 'anthropic/claude-opus-4.5', contextLength: 200000 },
+    { modelId: 'anthropic/claude-haiku-4.5', contextLength: 200000 },
+    { modelId: 'anthropic/claude-sonnet-4.5', contextLength: 200000 },
+    { modelId: 'anthropic/claude-sonnet-4', contextLength: 200000 },
+    { modelId: 'anthropic/claude-3.7-sonnet', contextLength: 200000 },
+    { modelId: 'openai/gpt-4o', contextLength: 128000 },
+    { modelId: 'openai/gpt-oss-120b', contextLength: 128000 },
+    { modelId: 'openai/gpt-oss-20b', contextLength: 128000 },
+    { modelId: 'qwen/qwen3-14b', contextLength: 131072 },
+    { modelId: 'qwen/qwen3-8b', contextLength: 131072 },
+  ],
+  azure: [],
+  ollama: [
+    { modelId: 'qwen3:4b', contextLength: 262144 },
+    { modelId: 'qwen3:8b', contextLength: 40960 },
+    { modelId: 'qwen3:14b', contextLength: 40960 },
+    { modelId: 'gpt-oss:20b', contextLength: 128000 },
+    { modelId: 'gpt-oss:120b', contextLength: 128000 },
+  ],
+  lmstudio: [
+    { modelId: 'openai/gpt-oss-20b', contextLength: 128000 },
+    { modelId: 'openai/gpt-oss-120b', contextLength: 128000 },
+    { modelId: 'qwen/qwen3-vl-8b', contextLength: 131072 },
+  ],
+  bedrock: [],
+  browseros: [{ modelId: 'browseros-auto', contextLength: 200000 }],
 }

-function fromModelsDevModel(m: ModelsDevModel): ModelInfo {
-  return {
-    modelId: m.id,
-    contextLength: m.contextWindow,
-    supportsImages: m.supportsImages,
-    supportsReasoning: m.supportsReasoning,
-    supportsToolCall: m.supportsToolCall,
-  }
-}
-
+/**
+ * Get models for a specific provider type
+ */
 export function getModelsForProvider(providerType: ProviderType): ModelInfo[] {
-  const custom = CUSTOM_PROVIDER_MODELS[providerType]
-  if (custom !== undefined) return custom
-
-  return getModelsDevModels(providerType).map(fromModelsDevModel)
+  return MODELS_DATA[providerType] || []
 }

+/**
+ * Get model options for select dropdown (model IDs + custom option)
+ */
+export function getModelOptions(providerType: ProviderType): string[] {
+  const models = getModelsForProvider(providerType)
+  const modelIds = models.map((m) => m.modelId)
+  return modelIds.length > 0 ? [...modelIds, 'custom'] : ['custom']
+}
+
+/**
+ * Get context length for a specific model
+ */
 export function getModelContextLength(
  providerType: ProviderType,
  modelId: string,
@@ -59,3 +119,14 @@ export function getModelContextLength(
  const model = models.find((m) => m.modelId === modelId)
  return model?.contextLength
 }
+
+/**
+ * Check if model ID is a custom (user-entered) value
+ */
+export function isCustomModel(
+  providerType: ProviderType,
+  modelId: string,
+): boolean {
+  const models = getModelsForProvider(providerType)
+  return !models.some((m) => m.modelId === modelId)
+}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/connect-mcp/useGetUserMCPIntegrations.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/connect-mcp/useGetUserMCPIntegrations.tsx
@@ -24,7 +24,6 @@ export const useGetUserMCPIntegrations = () => {

  const query = useQuery({
    queryKey: [INTEGRATIONS_QUERY_KEY, agentServerUrl],
-    // biome-ignore lint/style/noNonNullAssertion: guarded by enabled
    queryFn: () => getUserMCPIntegrations(agentServerUrl!),
    enabled: !!agentServerUrl,
    refetchOnWindowFocus: true,
--- a/packages/browseros-agent/apps/agent/entrypoints/app/create-graph/CreateGraph.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/create-graph/CreateGraph.tsx
@@ -259,23 +259,11 @@ export const CreateGraph: FC = () => {
  })

  const onClickTest = async () => {
-    let backgroundWindow: chrome.windows.Window | undefined
-    try {
-      backgroundWindow = await chrome.windows.create({
-        url: 'chrome://newtab',
-        focused: true,
-        type: 'normal',
-      })
-    } catch {
-      // Fallback when no window context is available (e.g. all windows closed)
-      const tab = await chrome.tabs.create({
-        url: 'chrome://newtab',
-        active: true,
-      })
-      if (tab.windowId) {
-        backgroundWindow = await chrome.windows.get(tab.windowId)
-      }
-    }
+    const backgroundWindow = await chrome.windows.create({
+      url: 'chrome://newtab',
+      focused: true,
+      type: 'normal',
+    })

    sendMessage({
      text: 'Run a test of the graph you just created.',
--- a/packages/browseros-agent/apps/agent/entrypoints/app/layout/SettingsSidebarLayout.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/layout/SettingsSidebarLayout.tsx
@@ -17,9 +17,12 @@ export const SettingsSidebarLayout: FC = () => {

  useEffect(() => {
    track(SETTINGS_PAGE_VIEWED_EVENT, { page: location.pathname })
-    setMobileOpen(false)
  }, [location.pathname])

+  useEffect(() => {
+    setMobileOpen(false)
+  }, [])
+
  if (isMobile) {
    return (
      <RpcClientProvider>
--- a/packages/browseros-agent/apps/agent/entrypoints/app/layout/SidebarLayout.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/layout/SidebarLayout.tsx
@@ -7,6 +7,8 @@ import { Button } from '@/components/ui/button'
 import { Sheet, SheetContent } from '@/components/ui/sheet'
 import { ShortcutsDialog } from '@/entrypoints/newtab/index/ShortcutsDialog'
 import { useIsMobile } from '@/hooks/use-mobile'
+import { SETTINGS_PAGE_VIEWED_EVENT } from '@/lib/constants/analyticsEvents'
+import { track } from '@/lib/metrics/track'
 import { RpcClientProvider } from '@/lib/rpc/RpcClientProvider'

 const COLLAPSE_DELAY = 150
@@ -23,6 +25,10 @@ export const SidebarLayout: FC = () => {
    setShortcutsDialogOpen(true)
  }, [])

+  useEffect(() => {
+    track(SETTINGS_PAGE_VIEWED_EVENT, { page: location.pathname })
+  }, [location.pathname])
+
  useEffect(() => {
    setMobileOpen(false)
  }, [])
@@ -97,17 +103,11 @@ export const SidebarLayout: FC = () => {
        </div>

        {/* Main content - full width, centered */}
-        {location.pathname === '/home/chat' ? (
-          <main className="relative h-dvh overflow-hidden">
+        <main className="min-h-screen overflow-y-auto">
+          <div className="mx-auto max-w-4xl px-4 py-8 sm:px-6 lg:px-8">
            <Outlet />
-          </main>
-        ) : (
-          <main className="min-h-screen overflow-y-auto">
-            <div className="mx-auto max-w-4xl px-4 py-8 sm:px-6 lg:px-8">
-              <Outlet />
-            </div>
-          </main>
-        )}
+          </div>
+        </main>
      </div>
      <ShortcutsDialog
        open={shortcutsDialogOpen}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/login/LogoutPage.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/login/LogoutPage.tsx
@@ -1,5 +1,5 @@
 import { useQueryClient } from '@tanstack/react-query'
-import { clear } from 'idb-keyval'
+import localforage from 'localforage'
 import { Loader2 } from 'lucide-react'
 import type { FC } from 'react'
 import { useEffect } from 'react'
@@ -10,7 +10,6 @@ import {
  CardHeader,
  CardTitle,
 } from '@/components/ui/card'
-import { resetIdentity } from '@/lib/analytics/identify'
 import { signOut } from '@/lib/auth/auth-client'
 import { providersStorage } from '@/lib/llm-providers/storage'
 import { scheduledJobStorage } from '@/lib/schedules/scheduleStorage'
@@ -25,9 +24,8 @@ export const LogoutPage: FC = () => {
      await providersStorage.removeValue()
      await scheduledJobStorage.removeValue()
      queryClient.clear()
-      await clear()
+      await localforage.clear()

-      resetIdentity()
      await signOut()
      navigate('/home', { replace: true })
    }
--- a/packages/browseros-agent/apps/agent/entrypoints/app/mcp-settings/MCPServerHeader.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/mcp-settings/MCPServerHeader.tsx
@@ -1,40 +1,31 @@
-import {
-  Check,
-  Copy,
-  ExternalLink,
-  Loader2,
-  RefreshCw,
-  Server,
-} from 'lucide-react'
-import { type FC, useCallback, useState } from 'react'
-import { toast } from 'sonner'
+import { Check, Copy, ExternalLink, Globe, Server } from 'lucide-react'
+import { type FC, useState } from 'react'
 import { Button } from '@/components/ui/button'
-import { MCP_SERVER_RESTARTED_EVENT } from '@/lib/constants/analyticsEvents'
-import { sendServerMessage } from '@/lib/messaging/server/serverMessages'
-import { track } from '@/lib/metrics/track'

 interface MCPServerHeaderProps {
  serverUrl: string | null
  isLoading: boolean
  error: string | null
-  onServerRestart?: () => void
+  title?: string
+  description?: string
+  remoteAccessEnabled?: boolean
 }

 const DOCS_URL = 'https://docs.browseros.com/features/use-with-claude-code'
-const HEALTH_CHECK_TIMEOUT_MS = 60_000
-const HEALTH_CHECK_INTERVAL_MS = 2_000

 export const MCPServerHeader: FC<MCPServerHeaderProps> = ({
  serverUrl,
  isLoading,
  error,
-  onServerRestart,
+  title = 'BrowserOS MCP Server',
+  description = 'Connect BrowserOS to MCP clients like claude code, gemini and others.',
+  remoteAccessEnabled = false,
 }) => {
  const [isCopied, setIsCopied] = useState(false)
-  const [isRestarting, setIsRestarting] = useState(false)

  const handleCopy = async () => {
    if (!serverUrl) return
+
    try {
      await navigator.clipboard.writeText(serverUrl)
      setIsCopied(true)
@@ -44,57 +35,6 @@ export const MCPServerHeader: FC<MCPServerHeaderProps> = ({
    }
  }

-  const checkServerHealth = useCallback(async (): Promise<boolean> => {
-    try {
-      const result = await sendServerMessage('checkHealth', undefined)
-      return result.healthy
-    } catch {
-      return false
-    }
-  }, [])
-
-  const handleRestart = async () => {
-    setIsRestarting(true)
-    try {
-      const { getBrowserOSAdapter } = await import('@/lib/browseros/adapter')
-      const { BROWSEROS_PREFS } = await import('@/lib/browseros/prefs')
-      const adapter = getBrowserOSAdapter()
-      await adapter.setPref(BROWSEROS_PREFS.RESTART_SERVER, true)
-
-      const startTime = Date.now()
-      const waitForHealth = (): Promise<boolean> =>
-        new Promise((resolve) => {
-          const check = async () => {
-            if (Date.now() - startTime >= HEALTH_CHECK_TIMEOUT_MS) {
-              resolve(false)
-              return
-            }
-            if (await checkServerHealth()) {
-              resolve(true)
-              return
-            }
-            setTimeout(check, HEALTH_CHECK_INTERVAL_MS)
-          }
-          setTimeout(check, HEALTH_CHECK_INTERVAL_MS)
-        })
-
-      const healthy = await waitForHealth()
-      if (healthy) {
-        track(MCP_SERVER_RESTARTED_EVENT)
-        toast.success('Server restarted successfully')
-        onServerRestart?.()
-      } else {
-        toast.error('Server did not respond. Try restarting the browser.')
-      }
-    } catch (err) {
-      toast.error(
-        err instanceof Error ? err.message : 'Failed to restart server',
-      )
-    } finally {
-      setIsRestarting(false)
-    }
-  }
-
  return (
    <div className="rounded-xl border border-border bg-card p-6 shadow-sm transition-all hover:shadow-md">
      <div className="flex items-start gap-4">
@@ -103,21 +43,18 @@ export const MCPServerHeader: FC<MCPServerHeaderProps> = ({
        </div>
        <div className="flex-1">
          <div className="mb-1 flex items-center justify-between">
-            <h2 className="font-semibold text-xl">BrowserOS MCP Server</h2>
+            <h2 className="font-semibold text-xl">{title}</h2>
            <a
              href={DOCS_URL}
              target="_blank"
              rel="noopener noreferrer"
              className="flex items-center gap-1 text-muted-foreground text-sm transition-colors hover:text-[var(--accent-orange)]"
            >
-              Docs
+              Setup a client
              <ExternalLink className="h-3.5 w-3.5" />
            </a>
          </div>
-          <p className="mb-6 text-muted-foreground text-sm">
-            Connect BrowserOS to MCP clients like Claude Code, Gemini CLI and
-            others.
-          </p>
+          <p className="mb-6 text-muted-foreground text-sm">{description}</p>

          <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
            <span className="whitespace-nowrap font-medium text-sm">
@@ -139,7 +76,6 @@ export const MCPServerHeader: FC<MCPServerHeaderProps> = ({
                onClick={handleCopy}
                disabled={!serverUrl || isLoading}
                className="shrink-0"
-                title="Copy URL"
              >
                {isCopied ? (
                  <Check className="h-4 w-4 text-green-600" />
@@ -147,22 +83,19 @@ export const MCPServerHeader: FC<MCPServerHeaderProps> = ({
                  <Copy className="h-4 w-4" />
                )}
              </Button>
-              <Button
-                variant="outline"
-                size="icon"
-                onClick={handleRestart}
-                disabled={isLoading || isRestarting}
-                className="shrink-0"
-                title="Restart server"
-              >
-                {isRestarting ? (
-                  <Loader2 className="h-4 w-4 animate-spin" />
-                ) : (
-                  <RefreshCw className="h-4 w-4" />
-                )}
-              </Button>
            </div>
          </div>
+
+          {remoteAccessEnabled && serverUrl && !isLoading && (
+            <div className="mt-3 flex items-start gap-2 rounded-lg bg-muted/50 px-3 py-2">
+              <Globe className="mt-0.5 h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+              <p className="text-muted-foreground text-xs">
+                External access is enabled. To connect from another device,
+                replace <span className="font-mono">127.0.0.1</span> with this
+                machine's IP address.
+              </p>
+            </div>
+          )}
        </div>
      </div>
    </div>
--- a/packages/browseros-agent/apps/agent/entrypoints/app/mcp-settings/MCPSettingsPage.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/mcp-settings/MCPSettingsPage.tsx
@@ -4,7 +4,7 @@ import type { McpTool } from '@/lib/mcp/client'
 import { sendServerMessage } from '@/lib/messaging/server/serverMessages'
 import { MCPServerHeader } from './MCPServerHeader'
 import { MCPToolsSection } from './MCPToolsSection'
-import { QuickSetupSection } from './QuickSetupSection'
+import { ServerSettingsCard } from './ServerSettingsCard'

 /** @public */
 export const MCPSettingsPage: FC = () => {
@@ -12,6 +12,8 @@ export const MCPSettingsPage: FC = () => {
  const [urlLoading, setUrlLoading] = useState(true)
  const [urlError, setUrlError] = useState<string | null>(null)

+  const [remoteAccessEnabled, setRemoteAccessEnabled] = useState(false)
+
  const [tools, setTools] = useState<McpTool[]>([])
  const [toolsLoading, setToolsLoading] = useState(false)
  const [toolsError, setToolsError] = useState<string | null>(null)
@@ -80,10 +82,13 @@ export const MCPSettingsPage: FC = () => {
        serverUrl={serverUrl}
        isLoading={urlLoading}
        error={urlError}
-        onServerRestart={loadServerUrlAndTools}
+        remoteAccessEnabled={remoteAccessEnabled}
      />

-      <QuickSetupSection serverUrl={serverUrl} />
+      <ServerSettingsCard
+        onServerRestart={loadServerUrlAndTools}
+        onRemoteAccessChange={setRemoteAccessEnabled}
+      />

      <MCPToolsSection
        tools={tools}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/mcp-settings/QuickSetupSection.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/mcp-settings/QuickSetupSection.tsx
@@ -1,162 +0,0 @@
-import { Check, Copy, Terminal } from 'lucide-react'
-import { type FC, useState } from 'react'
-import { Button } from '@/components/ui/button'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
-
-interface QuickSetupSectionProps {
-  serverUrl: string | null
-}
-
-interface ClientConfig {
-  id: string
-  name: string
-  type: 'command' | 'json'
-  getSnippet: (url: string) => string
-  fileName?: string
-}
-
-const clients: ClientConfig[] = [
-  {
-    id: 'claude-code',
-    name: 'Claude Code',
-    type: 'command',
-    getSnippet: (url) =>
-      `claude mcp add --transport http browseros ${url} --scope user`,
-  },
-  {
-    id: 'gemini-cli',
-    name: 'Gemini CLI',
-    type: 'command',
-    getSnippet: (url) =>
-      `gemini mcp add local-server ${url} --transport http --scope user`,
-  },
-  {
-    id: 'codex',
-    name: 'Codex',
-    type: 'command',
-    getSnippet: (url) => `codex mcp add browseros ${url}`,
-  },
-  {
-    id: 'claude-desktop',
-    name: 'Claude Desktop',
-    type: 'json',
-    fileName: 'claude_desktop_config.json',
-    getSnippet: (url) =>
-      JSON.stringify(
-        {
-          mcpServers: {
-            browserOS: {
-              command: 'npx',
-              args: ['mcp-remote', url],
-            },
-          },
-        },
-        null,
-        2,
-      ),
-  },
-  {
-    id: 'openclaw',
-    name: 'OpenClaw',
-    type: 'json',
-    fileName: 'openclaw.json',
-    getSnippet: (url) =>
-      JSON.stringify(
-        {
-          mcpServers: {
-            browseros: { url },
-          },
-        },
-        null,
-        2,
-      ),
-  },
-]
-
-const CopyButton: FC<{ text: string }> = ({ text }) => {
-  const [copied, setCopied] = useState(false)
-
-  const handleCopy = async () => {
-    try {
-      await navigator.clipboard.writeText(text)
-      setCopied(true)
-      setTimeout(() => setCopied(false), 2000)
-    } catch {
-      // Clipboard API failed
-    }
-  }
-
-  return (
-    <Button
-      variant="ghost"
-      size="icon-sm"
-      onClick={handleCopy}
-      className="shrink-0 text-muted-foreground hover:text-foreground"
-    >
-      {copied ? (
-        <Check className="h-3.5 w-3.5 text-green-600" />
-      ) : (
-        <Copy className="h-3.5 w-3.5" />
-      )}
-    </Button>
-  )
-}
-
-export const QuickSetupSection: FC<QuickSetupSectionProps> = ({
-  serverUrl,
-}) => {
-  if (!serverUrl) return null
-
-  return (
-    <div className="rounded-xl border border-border bg-card p-6 shadow-sm transition-all hover:shadow-md">
-      <div className="flex items-start gap-4">
-        <div className="flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-[var(--accent-orange)]/10">
-          <Terminal className="h-6 w-6 text-[var(--accent-orange)]" />
-        </div>
-        <div className="flex-1">
-          <h2 className="mb-1 font-semibold text-xl">Quick Setup</h2>
-          <p className="mb-4 text-muted-foreground text-sm">
-            Copy and run the command for your tool
-          </p>
-
-          <Tabs defaultValue="claude-code">
-            <TabsList className="mb-3 flex-wrap">
-              {clients.map((client) => (
-                <TabsTrigger key={client.id} value={client.id}>
-                  {client.name}
-                </TabsTrigger>
-              ))}
-            </TabsList>
-
-            {clients.map((client) => {
-              const snippet = client.getSnippet(serverUrl)
-              return (
-                <TabsContent key={client.id} value={client.id}>
-                  <div className="space-y-3">
-                    {client.fileName && (
-                      <p className="text-muted-foreground text-xs">
-                        Add to{' '}
-                        <code className="rounded bg-muted px-1 py-0.5 font-mono text-xs">
-                          {client.fileName}
-                        </code>
-                      </p>
-                    )}
-                    <div className="flex items-start gap-2 rounded-lg border border-border bg-background px-3 py-2.5">
-                      <pre className="flex-1 overflow-x-auto whitespace-pre-wrap break-all font-mono text-xs">
-                        {client.type === 'command' && (
-                          <span className="mr-1 text-muted-foreground">$</span>
-                        )}
-                        {snippet}
-                      </pre>
-                      <CopyButton text={snippet} />
-                    </div>
-                  </div>
-                </TabsContent>
-              )
-            })}
-          </Tabs>
-        </div>
-      </div>
-    </div>
-  )
-}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/scheduled-tasks/NewScheduledTaskDialog.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/scheduled-tasks/NewScheduledTaskDialog.tsx
@@ -3,7 +3,6 @@ import { ChevronDown, Loader2, Sparkles, Undo2 } from 'lucide-react'
 import type { FC } from 'react'
 import { useEffect, useRef, useState } from 'react'
 import { useForm } from 'react-hook-form'
-import { toast } from 'sonner'
 import { z } from 'zod/v3'
 import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
 import type { Provider } from '@/components/chat/chatComponentTypes'
@@ -35,15 +34,16 @@ import {
  SelectValue,
 } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
-import { SCHEDULED_TASK_PROMPT_REFINED_EVENT } from '@/lib/constants/analyticsEvents'
 import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
 import {
  defaultProviderIdStorage,
  providersStorage,
 } from '@/lib/llm-providers/storage'
 import type { LlmProviderConfig, ProviderType } from '@/lib/llm-providers/types'
+import { SCHEDULED_TASK_PROMPT_REFINED_EVENT } from '@/lib/constants/analyticsEvents'
 import { track } from '@/lib/metrics/track'
 import { refinePrompt } from '@/lib/schedules/refine-prompt'
+import { toast } from 'sonner'
 import type { ScheduledJob } from './types'

 const formSchema = z
@@ -117,7 +117,6 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
  const [isRefining, setIsRefining] = useState(false)
  const originalPromptRef = useRef<string | null>(null)
  const refineRequestIdRef = useRef(0)
-  const isProgrammaticChange = useRef(false)

  // Load providers from storage
  useEffect(() => {
@@ -180,24 +179,6 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
    type: p.type,
  }))

-  // Replace textarea content via execCommand so the browser's native undo
-  // stack (Cmd+Z / Ctrl+Z) records the change. Falls back to form.setValue
-  // if the textarea element can't be found.
-  const setQueryWithUndo = (value: string) => {
-    const textarea = document.querySelector(
-      'textarea[name="query"]',
-    ) as HTMLTextAreaElement
-    if (textarea) {
-      isProgrammaticChange.current = true
-      textarea.focus()
-      textarea.select()
-      document.execCommand('insertText', false, value)
-      isProgrammaticChange.current = false
-    } else {
-      form.setValue('query', value)
-    }
-  }
-
  const handleRefinePrompt = async () => {
    const currentQuery = form.getValues('query').trim()
    const currentName = form.getValues('name').trim()
@@ -214,7 +195,7 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
        providerId: form.getValues('providerId'),
      })
      if (requestId !== refineRequestIdRef.current) return
-      setQueryWithUndo(refined)
+      form.setValue('query', refined)
      track(SCHEDULED_TASK_PROMPT_REFINED_EVENT)
    } catch {
      if (requestId !== refineRequestIdRef.current) return
@@ -229,7 +210,7 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({

  const handleUndoRefine = () => {
    if (originalPromptRef.current !== null) {
-      setQueryWithUndo(originalPromptRef.current)
+      form.setValue('query', originalPromptRef.current)
      originalPromptRef.current = null
    }
  }
@@ -291,7 +272,7 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
                      type="button"
                      variant="ghost"
                      size="sm"
-                      className="h-auto gap-1 px-2 py-1 text-muted-foreground text-xs"
+                      className="h-auto gap-1 px-2 py-1 text-xs text-muted-foreground"
                      disabled={!queryValue?.trim() || isRefining}
                      onClick={handleRefinePrompt}
                    >
@@ -310,10 +291,7 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
                      {...field}
                      onChange={(e) => {
                        field.onChange(e)
-                        if (
-                          !isProgrammaticChange.current &&
-                          originalPromptRef.current !== null
-                        ) {
+                        if (originalPromptRef.current !== null) {
                          originalPromptRef.current = null
                        }
                      }}
@@ -322,7 +300,7 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
                  {!isRefining && originalPromptRef.current !== null ? (
                    <button
                      type="button"
-                      className="flex items-center gap-1 text-muted-foreground text-xs hover:text-foreground"
+                      className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
                      onClick={handleUndoRefine}
                    >
                      <Undo2 className="h-3 w-3" />
--- a/packages/browseros-agent/apps/agent/entrypoints/app/scheduled-tasks/ScheduledTasksPage.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/scheduled-tasks/ScheduledTasksPage.tsx
@@ -22,7 +22,9 @@ import {
  SCHEDULED_TASK_TOGGLED_EVENT,
  SCHEDULED_TASK_VIEW_RESULTS_EVENT,
 } from '@/lib/constants/analyticsEvents'
+import { useGraphqlMutation } from '@/lib/graphql/useGraphqlMutation'
 import { track } from '@/lib/metrics/track'
+import { DeleteScheduledJobDocument } from '@/lib/schedules/graphql/syncSchedulesDocument'
 import {
  scheduledJobRunStorage,
  useScheduledJobRuns,
@@ -44,6 +46,8 @@ export const ScheduledTasksPage: FC = () => {
    useScheduledJobs()
  const { jobRuns, cancelJobRun } = useScheduledJobRuns()

+  const deleteRemoteJobMutation = useGraphqlMutation(DeleteScheduledJobDocument)
+
  const [activeTab, setActiveTab] = useState<string | null>(null)
  const [isDialogOpen, setIsDialogOpen] = useState(false)
  const [editingJob, setEditingJob] = useState<ScheduledJob | null>(null)
@@ -98,6 +102,7 @@ export const ScheduledTasksPage: FC = () => {
  const confirmDelete = async () => {
    if (deleteJobId) {
      await removeJob(deleteJobId)
+      deleteRemoteJobMutation.mutate({ rowId: deleteJobId })
      setDeleteJobId(null)
      track(SCHEDULED_TASK_DELETED_EVENT)
    }
--- a/packages/browseros-agent/apps/agent/entrypoints/app/skills/SkillsPage.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/skills/SkillsPage.tsx
@@ -1,6 +1,5 @@
-import { AlertCircle, Eye, Pencil, Plus, Trash2, Wand2 } from 'lucide-react'
+import { AlertCircle, Pencil, Plus, Trash2, Wand2 } from 'lucide-react'
 import { type FC, useEffect, useState } from 'react'
-import Markdown from 'react-markdown'
 import { toast } from 'sonner'
 import {
  AlertDialog,
@@ -109,19 +108,23 @@ export const SkillsPage: FC = () => {
      ) : null}

      {!isLoading && !error && skills.length > 0 ? (
-        <SkillSections
-          skills={skills}
-          onEdit={handleEdit}
-          onDelete={(skill) => setSkillToDelete(skill)}
-          onToggle={handleToggle}
-        />
+        <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-3">
+          {skills.map((skill) => (
+            <SkillCard
+              key={skill.id}
+              skill={skill}
+              onEdit={() => handleEdit(skill)}
+              onDelete={() => setSkillToDelete(skill)}
+              onToggle={(enabled) => handleToggle(skill, enabled)}
+            />
+          ))}
+        </div>
      ) : null}

      <SkillDialog
        open={isDialogOpen}
        onOpenChange={setIsDialogOpen}
        editingSkill={editingSkill}
-        readOnly={editingSkill?.builtIn}
        onSave={async (data) => {
          try {
            if (editingSkill) {
@@ -248,50 +251,6 @@ const EmptyState: FC<{ onCreateClick: () => void }> = ({ onCreateClick }) => (
  </Card>
 )

-const SkillGrid: FC<{ children: React.ReactNode }> = ({ children }) => (
-  <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-3">
-    {children}
-  </div>
-)
-
-const SkillSections: FC<{
-  skills: SkillMeta[]
-  onEdit: (skill: SkillMeta) => void
-  onDelete: (skill: SkillMeta) => void
-  onToggle: (skill: SkillMeta, enabled: boolean) => void
-}> = ({ skills, onEdit, onDelete, onToggle }) => {
-  const userSkills = skills.filter((s) => !s.builtIn)
-  const builtInSkills = skills.filter((s) => s.builtIn)
-
-  const renderCard = (skill: SkillMeta) => (
-    <SkillCard
-      key={skill.id}
-      skill={skill}
-      onEdit={() => onEdit(skill)}
-      onDelete={() => onDelete(skill)}
-      onToggle={(enabled) => onToggle(skill, enabled)}
-    />
-  )
-
-  return (
-    <div className="space-y-6">
-      {userSkills.length > 0 ? (
-        <div className="space-y-3">
-          <h3 className="font-semibold text-sm">My Skills</h3>
-          <SkillGrid>{userSkills.map(renderCard)}</SkillGrid>
-        </div>
-      ) : null}
-
-      {builtInSkills.length > 0 ? (
-        <div className="space-y-3">
-          <h3 className="font-semibold text-sm">BrowserOS Skills</h3>
-          <SkillGrid>{builtInSkills.map(renderCard)}</SkillGrid>
-        </div>
-      ) : null}
-    </div>
-  )
-}
-
 const SkillCard: FC<{
  skill: SkillMeta
  onEdit: () => void
@@ -301,14 +260,7 @@ const SkillCard: FC<{
  <Card className="h-full py-0 shadow-sm">
    <CardContent className="flex h-full flex-col p-4">
      <div className="flex items-start justify-between gap-3">
-        <div className="flex items-center gap-2">
-          <h2 className="font-semibold text-sm leading-5">{skill.name}</h2>
-          {skill.builtIn ? (
-            <Badge variant="secondary" className="px-1.5 py-0 text-[10px]">
-              Built-in
-            </Badge>
-          ) : null}
-        </div>
+        <h2 className="font-semibold text-sm leading-5">{skill.name}</h2>
        <Switch
          checked={skill.enabled}
          onCheckedChange={onToggle}
@@ -329,29 +281,18 @@ const SkillCard: FC<{
          onClick={onEdit}
          className="-ml-2 h-7 px-2 text-muted-foreground hover:bg-transparent hover:text-foreground"
        >
-          {skill.builtIn ? (
-            <>
-              <Eye className="size-3.5" />
-              View
-            </>
-          ) : (
-            <>
-              <Pencil className="size-3.5" />
-              Edit
-            </>
-          )}
+          <Pencil className="size-3.5" />
+          Edit
+        </Button>
+        <Button
+          variant="ghost"
+          size="icon-sm"
+          onClick={onDelete}
+          className="size-7 text-muted-foreground hover:bg-transparent hover:text-destructive"
+          aria-label={`Delete ${skill.name}`}
+        >
+          <Trash2 className="size-4" />
        </Button>
-        {!skill.builtIn ? (
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            onClick={onDelete}
-            className="size-7 text-muted-foreground hover:bg-transparent hover:text-destructive"
-            aria-label={`Delete ${skill.name}`}
-          >
-            <Trash2 className="size-4" />
-          </Button>
-        ) : null}
      </div>
    </CardContent>
  </Card>
@@ -361,13 +302,12 @@ const SkillDialog: FC<{
  open: boolean
  onOpenChange: (open: boolean) => void
  editingSkill: SkillDetail | null
-  readOnly?: boolean
  onSave: (data: {
    name: string
    description: string
    content: string
  }) => Promise<void>
-}> = ({ open, onOpenChange, editingSkill, readOnly, onSave }) => {
+}> = ({ open, onOpenChange, editingSkill, onSave }) => {
  const [name, setName] = useState('')
  const [description, setDescription] = useState('')
  const [content, setContent] = useState('')
@@ -414,18 +354,12 @@ const SkillDialog: FC<{
      <DialogContent className="flex max-h-[90vh] flex-col gap-0 overflow-hidden p-0 sm:max-w-5xl">
        <DialogHeader className="border-b px-6 py-5">
          <DialogTitle>
-            {readOnly
-              ? 'View Skill'
-              : editingSkill
-                ? 'Edit Skill'
-                : 'Create Skill'}
+            {editingSkill ? 'Edit Skill' : 'Create Skill'}
          </DialogTitle>
          <DialogDescription>
-            {readOnly
-              ? 'This skill is managed by BrowserOS and updated automatically.'
-              : editingSkill
-                ? 'Refine when the agent should use this skill and how it should execute it.'
-                : 'Define a reusable instruction set your agent can apply when a request matches.'}
+            {editingSkill
+              ? 'Refine when the agent should use this skill and how it should execute it.'
+              : 'Define a reusable instruction set your agent can apply when a request matches.'}
          </DialogDescription>
        </DialogHeader>

@@ -439,7 +373,6 @@ const SkillDialog: FC<{
                value={name}
                onChange={(event) => setName(event.target.value)}
                maxLength={100}
-                readOnly={readOnly}
              />
              <p className="text-muted-foreground text-xs leading-5">
                Keep it short and recognizable in the skills list.
@@ -455,22 +388,19 @@ const SkillDialog: FC<{
                onChange={(event) => setDescription(event.target.value)}
                maxLength={500}
                className="min-h-28 resize-none bg-background"
-                readOnly={readOnly}
              />
              <p className="text-muted-foreground text-xs leading-5">
                This is the trigger summary the agent uses to pick the skill.
              </p>
            </div>

-            {!readOnly ? (
-              <div className="mt-auto rounded-lg border border-border/60 border-dashed bg-muted/30 px-3 py-2.5">
-                <p className="font-medium text-muted-foreground text-xs">Tip</p>
-                <ul className="mt-1.5 list-disc space-y-1 pl-4 text-muted-foreground text-xs leading-5">
-                  <li>List the ordered steps the agent should follow.</li>
-                  <li>Close with the output or formatting you expect back.</li>
-                </ul>
-              </div>
-            ) : null}
+            <div className="mt-auto rounded-lg border border-border/60 border-dashed bg-muted/30 px-3 py-2.5">
+              <p className="font-medium text-muted-foreground text-xs">Tip</p>
+              <ul className="mt-1.5 list-disc space-y-1 pl-4 text-muted-foreground text-xs leading-5">
+                <li>List the ordered steps the agent should follow.</li>
+                <li>Close with the output or formatting you expect back.</li>
+              </ul>
+            </div>
          </div>

          <div className="flex min-h-0 flex-col px-6 py-5">
@@ -481,52 +411,36 @@ const SkillDialog: FC<{
              </Badge>
            </div>

-            {readOnly ? (
-              <div className="prose prose-sm dark:prose-invert mt-4 min-h-[320px] max-w-none flex-1 overflow-y-auto rounded-md border p-4 text-sm">
-                <Markdown>{content}</Markdown>
-              </div>
-            ) : (
-              <MarkdownEditor
-                id="skill-content"
-                value={content}
-                onChange={setContent}
-                onKeyDown={handleContentKeyDown}
-                placeholder="Write instructions for the agent. Use markdown for structure."
-                className="mt-4 min-h-[320px] flex-1 overflow-y-auto text-sm"
-              />
-            )}
+            <MarkdownEditor
+              id="skill-content"
+              value={content}
+              onChange={setContent}
+              onKeyDown={handleContentKeyDown}
+              placeholder="Write instructions for the agent. Use markdown for structure."
+              className="mt-4 min-h-[320px] flex-1 overflow-y-auto text-sm"
+            />
          </div>
        </div>

        <div className="flex flex-col gap-3 border-t px-6 py-4 sm:flex-row sm:items-center sm:justify-between">
          <p className="text-muted-foreground text-xs">
-            {readOnly
-              ? 'This skill is managed by BrowserOS and updated automatically.'
-              : 'Saved locally and available to your agent immediately.'}
+            Saved locally and available to your agent immediately.
          </p>
          <div className="flex flex-col-reverse gap-2 sm:flex-row">
-            {readOnly ? (
-              <Button variant="outline" onClick={() => onOpenChange(false)}>
-                Close
-              </Button>
-            ) : (
-              <>
-                <Button
-                  variant="outline"
-                  onClick={() => onOpenChange(false)}
-                  disabled={saving}
-                >
-                  Cancel
-                </Button>
-                <Button onClick={handleSubmit} disabled={!isValid || saving}>
-                  {saving
-                    ? 'Saving...'
-                    : editingSkill
-                      ? 'Update Skill'
-                      : 'Create Skill'}
-                </Button>
-              </>
-            )}
+            <Button
+              variant="outline"
+              onClick={() => onOpenChange(false)}
+              disabled={saving}
+            >
+              Cancel
+            </Button>
+            <Button onClick={handleSubmit} disabled={!isValid || saving}>
+              {saving
+                ? 'Saving...'
+                : editingSkill
+                  ? 'Update Skill'
+                  : 'Create Skill'}
+            </Button>
          </div>
        </div>
      </DialogContent>
--- a/packages/browseros-agent/apps/agent/entrypoints/app/skills/useSkills.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/skills/useSkills.ts
@@ -7,7 +7,6 @@ export type SkillMeta = {
  description: string
  location: string
  enabled: boolean
-  builtIn: boolean
 }

 export type SkillDetail = SkillMeta & {
--- a/packages/browseros-agent/apps/agent/entrypoints/app/usage/UsagePage.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/usage/UsagePage.tsx
@@ -1,147 +0,0 @@
-import { AlertCircle, Clock, Coins, CreditCard, Zap } from 'lucide-react'
-import type { FC } from 'react'
-import { Button } from '@/components/ui/button'
-import {
-  getCreditBarColor,
-  getCreditTextColor,
-} from '@/lib/credits/credit-colors'
-import { useCredits } from '@/lib/credits/useCredits'
-import { BrowserOSIcon } from '@/lib/llm-providers/providerIcons'
-import { cn } from '@/lib/utils'
-
-export const UsagePage: FC = () => {
-  const { data, isLoading, error } = useCredits()
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center p-12 text-muted-foreground text-sm">
-        Loading usage data...
-      </div>
-    )
-  }
-
-  if (error) {
-    return (
-      <div className="space-y-6 p-6">
-        <div className="flex items-center gap-4 rounded-xl border p-5">
-          <BrowserOSIcon size={40} />
-          <div>
-            <h2 className="font-semibold text-lg">Usage & Billing</h2>
-            <p className="text-muted-foreground text-sm">
-              Monitor your BrowserOS AI credit usage
-            </p>
-          </div>
-        </div>
-        <div className="flex flex-col items-center gap-3 rounded-xl border border-destructive/30 bg-destructive/5 p-8">
-          <AlertCircle className="h-6 w-6 text-muted-foreground" />
-          <p className="text-muted-foreground text-sm">
-            Unable to load credit information
-          </p>
-        </div>
-      </div>
-    )
-  }
-
-  const credits = data?.credits ?? 0
-  const total = data?.dailyLimit ?? 100
-  const percentage = Math.min((credits / total) * 100, 100)
-
-  return (
-    <div className="space-y-6 p-6">
-      <div className="flex items-center gap-4 rounded-xl border p-5">
-        <BrowserOSIcon size={40} />
-        <div>
-          <h2 className="font-semibold text-lg">Usage & Billing</h2>
-          <p className="text-muted-foreground text-sm">
-            Monitor your BrowserOS AI credit usage
-          </p>
-        </div>
-      </div>
-
-      <div className="rounded-xl border p-5">
-        <div className="mb-4 flex items-center justify-between">
-          <div className="flex items-center gap-2">
-            <Coins className="h-5 w-5 text-muted-foreground" />
-            <span className="font-semibold text-sm">Daily Credits</span>
-          </div>
-          <span
-            className={cn('font-bold text-2xl', getCreditTextColor(credits))}
-          >
-            {credits}
-            <span className="ml-1 font-normal text-muted-foreground text-sm">
-              / {total}
-            </span>
-          </span>
-        </div>
-
-        <div className="mb-5 h-2.5 w-full overflow-hidden rounded-full bg-muted">
-          <div
-            className={cn(
-              'h-full rounded-full transition-all duration-500',
-              getCreditBarColor(credits),
-            )}
-            style={{ width: `${percentage}%` }}
-          />
-        </div>
-
-        <div className="grid grid-cols-2 gap-3">
-          <div className="flex items-center gap-2.5 rounded-lg bg-muted/50 px-3 py-2.5">
-            <Clock className="h-4 w-4 shrink-0 text-muted-foreground" />
-            <div>
-              <p className="font-medium text-xs">Resets daily</p>
-              <p className="text-muted-foreground text-xs">Midnight UTC</p>
-            </div>
-          </div>
-          <div className="flex items-center gap-2.5 rounded-lg bg-muted/50 px-3 py-2.5">
-            <Zap className="h-4 w-4 shrink-0 text-muted-foreground" />
-            <div>
-              <p className="font-medium text-xs">Credits used today</p>
-              <p className="text-muted-foreground text-xs">
-                {total - credits} of {total}
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div className="rounded-xl border p-5">
-        <div className="flex items-center gap-3">
-          <CreditCard className="h-5 w-5 text-muted-foreground" />
-          <div>
-            <p className="flex items-center gap-2 font-semibold text-sm">
-              Need more credits?
-              <span className="rounded-full bg-muted px-2 py-0.5 font-medium text-[10px] text-muted-foreground uppercase tracking-wide">
-                Coming soon
-              </span>
-            </p>
-            <p className="text-muted-foreground text-xs">
-              Additional credit packages will be available soon
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <div className="rounded-xl border border-[var(--accent-orange)]/30 bg-[var(--accent-orange)]/5 p-5">
-        <div className="flex items-center justify-between">
-          <div className="flex items-center gap-3">
-            <Zap className="h-5 w-5 text-[var(--accent-orange)]" />
-            <div>
-              <p className="font-semibold text-sm">Want unlimited usage?</p>
-              <p className="text-muted-foreground text-xs">
-                Add your own LLM provider — no credit limits
-              </p>
-            </div>
-          </div>
-          <Button
-            variant="outline"
-            size="sm"
-            className="border-[var(--accent-orange)] bg-[var(--accent-orange)]/10 text-[var(--accent-orange)] hover:bg-[var(--accent-orange)]/20"
-            asChild
-          >
-            <a href="/app.html#/settings/ai">Add Provider</a>
-          </Button>
-        </div>
-      </div>
-    </div>
-  )
-}
--- a/packages/browseros-agent/apps/agent/entrypoints/app/workflows/useRunWorkflow.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/app/workflows/useRunWorkflow.ts
@@ -101,23 +101,11 @@ export const useRunWorkflow = () => {
    setMessages([])
    setWasCancelled(false)

-    let backgroundWindow: chrome.windows.Window | undefined
-    try {
-      backgroundWindow = await chrome.windows.create({
-        url: 'chrome://newtab',
-        focused: true,
-        type: 'normal',
-      })
-    } catch {
-      // Fallback when no window context is available (e.g. all windows closed)
-      const tab = await chrome.tabs.create({
-        url: 'chrome://newtab',
-        active: true,
-      })
-      if (tab.windowId) {
-        backgroundWindow = await chrome.windows.get(tab.windowId)
-      }
-    }
+    const backgroundWindow = await chrome.windows.create({
+      url: 'chrome://newtab',
+      focused: true,
+      type: 'normal',
+    })

    sendMessage({
      text: 'Run the workflow.',
--- a/packages/browseros-agent/apps/agent/entrypoints/background/index.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/background/index.ts
@@ -1,3 +1,4 @@
+import { activeStreamsStorage } from '@/lib/active-stream/active-stream-storage'
 import { sessionStorage } from '@/lib/auth/sessionStorage'
 import { Capabilities } from '@/lib/browseros/capabilities'
 import { getHealthCheckUrl, getMcpServerUrl } from '@/lib/browseros/helpers'
@@ -18,7 +19,6 @@ import {
  syncScheduledJobs,
 } from '@/lib/schedules/scheduleStorage'
 import { searchActionsStorage } from '@/lib/search-actions/searchActionsStorage'
-import { selectedTextStorage } from '@/lib/selected-text/selectedTextStorage'
 import { stopAgentStorage } from '@/lib/stop-agent/stop-agent-storage'
 import { scheduledJobRuns } from './scheduledJobRuns'

@@ -67,12 +67,7 @@ export default defineBackground(() => {
    }
  })

-  chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-    if (message?.type === 'get-tab-id') {
-      sendResponse({ tabId: sender.tab?.id })
-      return true
-    }
-
+  chrome.runtime.onMessage.addListener((message, sender) => {
    if (message?.type === 'AUTH_SUCCESS' && sender.tab?.id) {
      const tabId = sender.tab.id
      authRedirectPathStorage
@@ -99,15 +94,28 @@ export default defineBackground(() => {
    }
  })

-  // Clean up selected text storage when a tab is closed
-  chrome.tabs.onRemoved.addListener((tabId) => {
-    const key = String(tabId)
-    selectedTextStorage.getValue().then((map) => {
-      if (map[key]) {
-        const { [key]: _, ...rest } = map
-        selectedTextStorage.setValue(rest)
+  // Auto-open side panel on tabs the agent interacts with during streaming.
+  const openedFollowerTabs = new Set<number>()
+  activeStreamsStorage.watch((map) => {
+    const streams = Object.values(map)
+    if (streams.length === 0) {
+      openedFollowerTabs.clear()
+      return
+    }
+    for (const state of streams) {
+      const isActive =
+        state.status === 'streaming' || state.status === 'submitted'
+      if (!isActive || !state.followerTabIds?.length) continue
+
+      for (const tabId of state.followerTabIds) {
+        if (openedFollowerTabs.has(tabId)) continue
+        openedFollowerTabs.add(tabId)
+        openSidePanel(tabId).catch(() => {})
      }
-    })
+    }
+  })
+  chrome.tabs.onRemoved.addListener((tabId) => {
+    openedFollowerTabs.delete(tabId)
  })

  sessionStorage.watch(async (newSession) => {
--- a/packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTab.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTab.tsx
@@ -5,17 +5,12 @@ import {
  Folder,
  Globe,
  Layers,
-  Loader2,
-  Mic,
  PlugZap,
  Search,
-  Square,
  X,
 } from 'lucide-react'
 import { AnimatePresence, motion } from 'motion/react'
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { useNavigate } from 'react-router'
-import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
 import { AppSelector } from '@/components/elements/AppSelector'
 import {
  GlowingBorder,
@@ -41,26 +36,20 @@ import {
 import {
  NEWTAB_AI_TRIGGERED_EVENT,
  NEWTAB_APPS_OPENED_EVENT,
+  NEWTAB_CHAT_RESET_EVENT,
  NEWTAB_CHAT_STARTED_EVENT,
  NEWTAB_OPENED_EVENT,
  NEWTAB_SEARCH_EXECUTED_EVENT,
  NEWTAB_TAB_REMOVED_EVENT,
  NEWTAB_TAB_TOGGLED_EVENT,
  NEWTAB_TABS_OPENED_EVENT,
-  NEWTAB_VOICE_ERROR_EVENT,
-  NEWTAB_VOICE_RECORDING_STARTED_EVENT,
-  NEWTAB_VOICE_RECORDING_STOPPED_EVENT,
-  NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT,
  NEWTAB_WORKSPACE_OPENED_EVENT,
 } from '@/lib/constants/analyticsEvents'
-import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
-import type { ProviderType } from '@/lib/llm-providers/types'
 import { useMcpServers } from '@/lib/mcp/mcpServerStorage'
 import { useSyncRemoteIntegrations } from '@/lib/mcp/useSyncRemoteIntegrations'
 import { openSidePanelWithSearch } from '@/lib/messaging/sidepanel/openSidepanelWithSearch'
 import { track } from '@/lib/metrics/track'
 import { cn } from '@/lib/utils'
-import { useVoiceInput } from '@/lib/voice/useVoiceInput'
 import { useWorkspace } from '@/lib/workspace/use-workspace'
 import { ImportDataHint } from './ImportDataHint'
 import type { SuggestionItem } from './lib/suggestions/types'
@@ -69,6 +58,7 @@ import {
  useSuggestions,
 } from './lib/suggestions/useSuggestions'
 import { NewTabBranding } from './NewTabBranding'
+import { NewTabChat } from './NewTabChat'
 import { NewTabTip } from './NewTabTip'
 import { ScheduleResults } from './ScheduleResults'
 import { SearchSuggestions } from './SearchSuggestions'
@@ -88,13 +78,13 @@ interface MentionState {
 */
 export const NewTab = () => {
  const activeHint = useActiveHint()
-  const navigate = useNavigate()
  const [inputValue, setInputValue] = useState('')
  const [mounted, setMounted] = useState(false)
  const inputRef = useRef<HTMLInputElement>(null)
  const tabsDropdownRef = useRef<HTMLDivElement>(null)
  const [selectedTabs, setSelectedTabs] = useState<chrome.tabs.Tab[]>([])
  const [shortcutsDialogOpen, setShortcutsDialogOpen] = useState(false)
+  const [chatActive, setChatActive] = useState(false)
  const [mentionState, setMentionState] = useState<MentionState>({
    isOpen: false,
    filterText: '',
@@ -102,41 +92,12 @@ export const NewTab = () => {
  })
  const { selectedFolder } = useWorkspace()
  const { supports } = useCapabilities()
-  const { providers, selectedProvider, handleSelectProvider } =
-    useChatSessionContext()
  const { servers: mcpServers } = useMcpServers()
  const { data: userMCPIntegrations } = useGetUserMCPIntegrations()
  useSyncRemoteIntegrations()

-  const voice = useVoiceInput()
-
-  // Voice transcript → populate search input
-  // biome-ignore lint/correctness/useExhaustiveDependencies: only trigger on transcript/transcribing change
-  useEffect(() => {
-    if (voice.transcript && !voice.isTranscribing) {
-      setComboboxInputValue(voice.transcript)
-      track(NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT)
-      voice.clearTranscript()
-    }
-  }, [voice.transcript, voice.isTranscribing])
-
-  useEffect(() => {
-    if (voice.error) {
-      track(NEWTAB_VOICE_ERROR_EVENT, { error: voice.error })
-    }
-  }, [voice.error])
-
-  const handleStartRecording = async () => {
-    const started = await voice.startRecording()
-    if (started) {
-      track(NEWTAB_VOICE_RECORDING_STARTED_EVENT)
-    }
-  }
-
-  const handleStopRecording = async () => {
-    await voice.stopRecording()
-    track(NEWTAB_VOICE_RECORDING_STOPPED_EVENT)
-  }
+  const { messages, sendMessage, setMode, resetConversation } =
+    useChatSessionContext()

  const connectedManagedServers = mcpServers.filter((s) => {
    if (s.type !== 'managed' || !s.managedServerName) return false
@@ -314,28 +275,17 @@ export const NewTab = () => {

  const startInlineChat = (
    message: string,
-    chatMode: 'chat' | 'agent',
-    aiTab?: { name: string; description: string },
+    mode: 'chat' | 'agent',
+    action?: ReturnType<
+      typeof createBrowserOSAction | typeof createAITabAction
+    >,
  ) => {
-    track(NEWTAB_CHAT_STARTED_EVENT, {
-      mode: chatMode,
-      tabs_count: selectedTabs.length,
-    })
-    const tabIds = selectedTabs
-      .map((t) => t.id)
-      .filter((id): id is number => id !== undefined)
+    track(NEWTAB_CHAT_STARTED_EVENT, { mode, tabs_count: selectedTabs.length })
+    setMode(mode)
+    setChatActive(true)
+    sendMessage({ text: message, action })
    reset()
    setSelectedTabs([])
-    const params = new URLSearchParams({ q: message, mode: chatMode })
-    if (tabIds.length > 0) {
-      params.set('tabs', tabIds.join(','))
-    }
-    if (aiTab) {
-      params.set('actionType', 'ai-tab')
-      params.set('tabName', aiTab.name)
-      params.set('tabDescription', aiTab.description)
-    }
-    navigate(`/home/chat?${params.toString()}`)
  }

  const runSelectedAction = (item: SuggestionItem | undefined) => {
@@ -356,18 +306,15 @@ export const NewTab = () => {
          mode: 'agent',
          tabs_count: selectedTabs.length,
        })
+        const action = createAITabAction({
+          name: item.name,
+          description: item.description,
+          tabs: selectedTabs,
+        })
        const searchQuery = `${item.name}${item.description ? ` - ${item.description}` : ''}}`
        if (supports(Feature.NEWTAB_CHAT_SUPPORT)) {
-          startInlineChat(searchQuery, 'agent', {
-            name: item.name,
-            description: item.description,
-          })
+          startInlineChat(searchQuery, 'agent', action)
        } else {
-          const action = createAITabAction({
-            name: item.name,
-            description: item.description,
-            tabs: selectedTabs,
-          })
          openSidePanelWithSearch('open', {
            query: searchQuery,
            mode: 'agent',
@@ -383,14 +330,14 @@ export const NewTab = () => {
          mode: item.mode,
          tabs_count: selectedTabs.length,
        })
+        const action = createBrowserOSAction({
+          mode: item.mode,
+          message: item.message,
+          tabs: selectedTabs,
+        })
        if (supports(Feature.NEWTAB_CHAT_SUPPORT)) {
-          startInlineChat(item.message, item.mode)
+          startInlineChat(item.message, item.mode, action)
        } else {
-          const action = createBrowserOSAction({
-            mode: item.mode,
-            message: item.message,
-            tabs: selectedTabs,
-          })
          openSidePanelWithSearch('open', {
            query: item.message,
            mode: item.mode,
@@ -404,6 +351,12 @@ export const NewTab = () => {
    }
  }

+  const handleBackToSearch = () => {
+    track(NEWTAB_CHAT_RESET_EVENT, { message_count: messages.length })
+    resetConversation()
+    setChatActive(false)
+  }
+
  const isSuggestionsVisible =
    !mentionState.isOpen &&
    ((isOpen && inputValue.length) ||
@@ -415,6 +368,10 @@ export const NewTab = () => {
    track(NEWTAB_OPENED_EVENT)
  }, [])

+  if (chatActive) {
+    return <NewTabChat onBackToSearch={handleBackToSearch} />
+  }
+
  return (
    <div className="pt-[max(25vh,16px)]">
      {/* Main content */}
@@ -468,89 +425,32 @@ export const NewTab = () => {
                anchorRef={inputRef}
                side="bottom"
              />
-              {voice.isRecording ? (
-                <div className="flex min-h-[40px] flex-1 items-center justify-center gap-1.5">
-                  {voice.audioLevels.map((level, i) => (
-                    <div
-                      key={i.toString()}
-                      className="w-1.5 rounded-full bg-red-500 transition-all duration-75"
-                      style={{
-                        height: `${Math.max(6, Math.min(28, level * 0.7))}px`,
-                      }}
-                    />
-                  ))}
-                </div>
-              ) : (
-                <input
-                  type="text"
-                  placeholder={
-                    voice.isTranscribing ? 'Transcribing...' : searchPlaceholder
-                  }
-                  disabled={voice.isTranscribing}
-                  className="flex-1 border-none bg-transparent text-base text-foreground outline-none placeholder:text-muted-foreground disabled:opacity-60"
-                  {...getInputProps({
-                    ref: inputRef,
-                    onChange: (e) => handleInputChange(e.currentTarget.value),
-                    onKeyDown: (e) => {
-                      if (!mentionStateRef.current.isOpen) return
-                      if (e.key === 'Tab') {
-                        e.preventDefault()
-                        closeMention()
-                      }
-                    },
-                  })}
-                />
-              )}
+              <input
+                type="text"
+                placeholder={searchPlaceholder}
+                className="flex-1 border-none bg-transparent text-base text-foreground outline-none placeholder:text-muted-foreground"
+                {...getInputProps({
+                  ref: inputRef,
+                  onChange: (e) => handleInputChange(e.currentTarget.value),
+                  onKeyDown: (e) => {
+                    if (!mentionStateRef.current.isOpen) return
+                    if (e.key === 'Tab') {
+                      e.preventDefault()
+                      closeMention()
+                    }
+                  },
+                })}
+              />

-              <div className="flex items-center gap-1.5">
-                {voice.isRecording ? (
-                  <Button
-                    type="button"
-                    size="icon"
-                    onClick={handleStopRecording}
-                    className="h-10 w-10 flex-shrink-0 rounded-xl bg-red-600 text-white hover:bg-red-700"
-                  >
-                    <Square className="h-4 w-4" />
-                  </Button>
-                ) : voice.isTranscribing ? (
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon"
-                    disabled
-                    className="h-10 w-10 flex-shrink-0 rounded-xl"
-                  >
-                    <Loader2 className="h-5 w-5 animate-spin" />
-                  </Button>
-                ) : (
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon"
-                    onClick={handleStartRecording}
-                    className="h-10 w-10 flex-shrink-0 rounded-xl text-muted-foreground transition-colors hover:text-foreground"
-                    title="Voice input"
-                  >
-                    <Mic className="h-5 w-5" />
-                  </Button>
-                )}
-                <Button
-                  onClick={handleSend}
-                  size="icon"
-                  disabled={voice.isRecording || voice.isTranscribing}
-                  className="h-10 w-10 flex-shrink-0 rounded-xl bg-primary text-primary-foreground hover:bg-primary/90"
-                >
-                  <ArrowRight className="h-5 w-5" />
-                </Button>
-              </div>
+              <Button
+                onClick={handleSend}
+                size="icon"
+                className="h-10 w-10 flex-shrink-0 rounded-xl bg-primary text-primary-foreground hover:bg-primary/90"
+              >
+                <ArrowRight className="h-5 w-5" />
+              </Button>
            </div>

-            {voice.error && (
-              <div className="px-5 pb-2 text-destructive text-xs">
-                {voice.error}
-              </div>
-            )}
-
            <AnimatePresence>
              {selectedTabs.length > 0 && (
                <motion.div
@@ -624,34 +524,6 @@ export const NewTab = () => {
            {mounted && (
              <div className="flex items-center justify-between border-border/50 border-t px-5 py-3">
                <div className="flex items-center gap-1">
-                  {selectedProvider && (
-                    <ChatProviderSelector
-                      providers={providers}
-                      selectedProvider={selectedProvider}
-                      onSelectProvider={handleSelectProvider}
-                    >
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        title={selectedProvider.name}
-                        className={cn(
-                          'h-8 w-8 rounded-lg transition-all',
-                          'text-muted-foreground hover:bg-accent hover:text-accent-foreground',
-                          'data-[state=open]:bg-accent',
-                        )}
-                      >
-                        {selectedProvider.type === 'browseros' ? (
-                          <BrowserOSIcon size={16} />
-                        ) : (
-                          <ProviderIcon
-                            type={selectedProvider.type as ProviderType}
-                            size={16}
-                          />
-                        )}
-                      </Button>
-                    </ChatProviderSelector>
-                  )}
-
                  {supports(Feature.WORKSPACE_FOLDER_SUPPORT) && (
                    <WorkspaceSelector>
                      <Button
--- a/packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTabChat.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTabChat.tsx
@@ -1,41 +1,35 @@
 import { Loader2 } from 'lucide-react'
-import { type FC, useEffect, useRef } from 'react'
-import { useSearchParams } from 'react-router'
+import { type FC, useEffect, useState } from 'react'
 import { ChatEmptyState } from '@/entrypoints/sidepanel/index/ChatEmptyState'
 import { ChatError } from '@/entrypoints/sidepanel/index/ChatError'
 import { ChatFooter } from '@/entrypoints/sidepanel/index/ChatFooter'
-import { ChatHeader } from '@/entrypoints/sidepanel/index/ChatHeader'
 import { ChatMessages } from '@/entrypoints/sidepanel/index/ChatMessages'
+import type { ChatMode } from '@/entrypoints/sidepanel/index/chatTypes'
+import { useChatSessionContext } from '@/entrypoints/sidepanel/layout/ChatSessionContext'
+import { createBrowserOSAction } from '@/lib/chat-actions/types'
 import {
-  createAITabAction,
-  createBrowserOSAction,
-} from '@/lib/chat-actions/types'
-import { useChatActions } from '@/lib/chat-actions/useChatActions'
-import {
-  NEWTAB_AI_TRIGGERED_EVENT,
  NEWTAB_CHAT_MODE_CHANGED_EVENT,
  NEWTAB_CHAT_RESET_EVENT,
  NEWTAB_CHAT_STOPPED_EVENT,
  NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT,
  NEWTAB_TAB_REMOVED_EVENT,
  NEWTAB_TAB_TOGGLED_EVENT,
-  NEWTAB_VOICE_ERROR_EVENT,
-  NEWTAB_VOICE_RECORDING_STARTED_EVENT,
-  NEWTAB_VOICE_RECORDING_STOPPED_EVENT,
-  NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT,
 } from '@/lib/constants/analyticsEvents'
 import { track } from '@/lib/metrics/track'
+import { NewTabChatHeader } from './NewTabChatHeader'

-export const NewTabChat: FC = () => {
-  const [searchParams, setSearchParams] = useSearchParams()
-  const hasSentInitialRef = useRef(false)
+interface NewTabChatProps {
+  onBackToSearch: () => void
+}

+export const NewTabChat: FC<NewTabChatProps> = ({ onBackToSearch }) => {
  const {
    mode,
    setMode,
    messages,
    sendMessage,
    status,
+    stop,
    agentUrlError,
    chatError,
    getActionForMessage,
@@ -48,81 +42,72 @@ export const NewTabChat: FC = () => {
    selectedProvider,
    handleSelectProvider,
    resetConversation,
-    input,
-    setInput,
-    attachedTabs,
-    mounted,
-    voiceState,
-    handleModeChange,
-    handleStop,
-    toggleTabSelection,
-    removeTab,
-    handleSubmit,
-    handleSuggestionClick,
-  } = useChatActions({
-    events: {
-      modeChanged: NEWTAB_CHAT_MODE_CHANGED_EVENT,
-      stopClicked: NEWTAB_CHAT_STOPPED_EVENT,
-      suggestionClicked: NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT,
-      tabToggled: NEWTAB_TAB_TOGGLED_EVENT,
-      tabRemoved: NEWTAB_TAB_REMOVED_EVENT,
-      aiTriggered: NEWTAB_AI_TRIGGERED_EVENT,
-      voiceRecordingStarted: NEWTAB_VOICE_RECORDING_STARTED_EVENT,
-      voiceRecordingStopped: NEWTAB_VOICE_RECORDING_STOPPED_EVENT,
-      voiceTranscriptionCompleted: NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT,
-      voiceError: NEWTAB_VOICE_ERROR_EVENT,
-    },
-  })
+  } = useChatSessionContext()
+
+  const [input, setInput] = useState('')
+  const [attachedTabs, setAttachedTabs] = useState<chrome.tabs.Tab[]>([])
+  const [mounted, setMounted] = useState(false)

-  // Send the initial message from URL query params (from /home search bar).
-  // Guarded by ref to prevent double-fire in React Strict Mode.
-  // biome-ignore lint/correctness/useExhaustiveDependencies: must only run once on mount
  useEffect(() => {
-    if (hasSentInitialRef.current) return
-    const query = searchParams.get('q')
-    const chatMode = searchParams.get('mode')
-    const tabIdsParam = searchParams.get('tabs')
-    if (!query) return
-
-    hasSentInitialRef.current = true
-    if (chatMode === 'chat' || chatMode === 'agent') {
-      setMode(chatMode)
-    }
-    setSearchParams({}, { replace: true })
-
-    const actionType = searchParams.get('actionType')
-    const tabName = searchParams.get('tabName')
-    const tabDescription = searchParams.get('tabDescription')
-
-    if (tabIdsParam) {
-      const tabIds = tabIdsParam.split(',').map(Number).filter(Boolean)
-      chrome.tabs.query({}).then((allTabs) => {
-        const matchedTabs = allTabs.filter(
-          (t) => t.id !== undefined && tabIds.includes(t.id),
-        )
-        if (matchedTabs.length > 0) {
-          const action =
-            actionType === 'ai-tab' && tabName
-              ? createAITabAction({
-                  name: tabName,
-                  description: tabDescription ?? '',
-                  tabs: matchedTabs,
-                })
-              : createBrowserOSAction({
-                  mode: (chatMode as 'chat' | 'agent') ?? 'agent',
-                  message: query,
-                  tabs: matchedTabs,
-                })
-          sendMessage({ text: query, action })
-        } else {
-          sendMessage({ text: query })
-        }
-      })
-    } else {
-      sendMessage({ text: query })
-    }
+    setMounted(true)
  }, [])

+  const handleModeChange = (newMode: ChatMode) => {
+    track(NEWTAB_CHAT_MODE_CHANGED_EVENT, { from: mode, to: newMode })
+    setMode(newMode)
+  }
+
+  const handleStop = () => {
+    track(NEWTAB_CHAT_STOPPED_EVENT)
+    stop()
+  }
+
+  const toggleTabSelection = (tab: chrome.tabs.Tab) => {
+    setAttachedTabs((prev) => {
+      const isSelected = prev.some((t) => t.id === tab.id)
+      track(NEWTAB_TAB_TOGGLED_EVENT, {
+        action: isSelected ? 'removed' : 'added',
+      })
+      if (isSelected) {
+        return prev.filter((t) => t.id !== tab.id)
+      }
+      return [...prev, tab]
+    })
+  }
+
+  const removeTab = (tabId?: number) => {
+    track(NEWTAB_TAB_REMOVED_EVENT)
+    setAttachedTabs((prev) => prev.filter((t) => t.id !== tabId))
+  }
+
+  const executeMessage = (customMessageText?: string) => {
+    const messageText = customMessageText ? customMessageText : input.trim()
+    if (!messageText) return
+
+    if (attachedTabs.length) {
+      const action = createBrowserOSAction({
+        mode,
+        message: messageText,
+        tabs: attachedTabs,
+      })
+      sendMessage({ text: messageText, action })
+    } else {
+      sendMessage({ text: messageText })
+    }
+    setInput('')
+    setAttachedTabs([])
+  }
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault()
+    executeMessage()
+  }
+
+  const handleSuggestionClick = (suggestion: string) => {
+    track(NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT, { mode })
+    executeMessage(suggestion)
+  }
+
  const handleNewConversation = () => {
    track(NEWTAB_CHAT_RESET_EVENT, { message_count: messages.length })
    resetConversation()
@@ -131,19 +116,17 @@ export const NewTabChat: FC = () => {
  if (!selectedProvider) return null

  return (
-    <div className="absolute inset-0 flex flex-col overflow-hidden">
-      <div className="mx-auto w-full max-w-3xl">
-        <ChatHeader
-          selectedProvider={selectedProvider}
-          providers={providers}
-          onSelectProvider={handleSelectProvider}
-          onNewConversation={handleNewConversation}
-          hasMessages={messages.length > 0}
-          hideHistory
-        />
-      </div>
+    <div className="flex h-[calc(100vh-2rem)] flex-col">
+      <NewTabChatHeader
+        selectedProvider={selectedProvider}
+        providers={providers}
+        onSelectProvider={handleSelectProvider}
+        onNewConversation={handleNewConversation}
+        onBackToSearch={onBackToSearch}
+        hasMessages={messages.length > 0}
+      />

-      <main className="styled-scrollbar [&_[data-streamdown='code-block']]:!max-w-full [&_[data-streamdown='code-block']]:!w-auto [&_[data-streamdown='table-wrapper']]:!max-w-full [&_[data-streamdown='table-wrapper']]:!w-auto mx-auto flex min-h-0 w-full max-w-3xl flex-1 flex-col space-y-4 overflow-y-auto overflow-x-hidden px-4 pt-4 [&_[data-streamdown='code-block']]:overflow-x-auto [&_[data-streamdown='table-wrapper']]:overflow-x-auto">
+      <main className="mx-auto flex w-full max-w-3xl flex-1 flex-col space-y-4 overflow-y-auto px-4 pt-4">
        {isRestoringConversation ? (
          <div className="flex flex-1 items-center justify-center">
            <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
@@ -169,18 +152,11 @@ export const NewTabChat: FC = () => {
            onDismissJtbdPopup={() => {}}
          />
        )}
-        {agentUrlError && (
-          <ChatError
-            error={agentUrlError}
-            providerType={selectedProvider?.type}
-          />
-        )}
-        {chatError && (
-          <ChatError error={chatError} providerType={selectedProvider?.type} />
-        )}
+        {agentUrlError && <ChatError error={agentUrlError} />}
+        {chatError && <ChatError error={chatError} />}
      </main>

-      <div className="mx-auto w-full max-w-3xl flex-shrink-0 px-4 pb-2">
+      <div className="mx-auto w-full max-w-3xl px-4">
        <ChatFooter
          mode={mode}
          onModeChange={handleModeChange}
@@ -192,7 +168,6 @@ export const NewTabChat: FC = () => {
          attachedTabs={attachedTabs}
          onToggleTab={toggleTabSelection}
          onRemoveTab={removeTab}
-          voice={voiceState}
        />
      </div>
    </div>
--- a/packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTabChatHeader.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTabChatHeader.tsx
@@ -0,0 +1,78 @@
+import { ArrowLeft, Plus } from 'lucide-react'
+import type { FC } from 'react'
+import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
+import type { Provider } from '@/components/chat/chatComponentTypes'
+import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
+import type { ProviderType } from '@/lib/llm-providers/types'
+
+interface NewTabChatHeaderProps {
+  selectedProvider: Provider
+  providers: Provider[]
+  onSelectProvider: (provider: Provider) => void
+  onNewConversation: () => void
+  onBackToSearch: () => void
+  hasMessages: boolean
+}
+
+export const NewTabChatHeader: FC<NewTabChatHeaderProps> = ({
+  selectedProvider,
+  providers,
+  onSelectProvider,
+  onNewConversation,
+  onBackToSearch,
+  hasMessages,
+}) => {
+  return (
+    <header className="flex items-center justify-between border-border/40 border-b bg-background/80 px-4 py-2.5 backdrop-blur-md">
+      <div className="flex items-center gap-2">
+        {/* Back to search */}
+        <button
+          type="button"
+          onClick={onBackToSearch}
+          className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+          title="Back to search"
+        >
+          <ArrowLeft className="h-4 w-4" />
+        </button>
+
+        {/* Provider selector */}
+        <ChatProviderSelector
+          providers={providers}
+          selectedProvider={selectedProvider}
+          onSelectProvider={onSelectProvider}
+        >
+          <button
+            type="button"
+            className="group relative inline-flex cursor-pointer items-center gap-2 rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground data-[state=open]:bg-accent"
+            title="Change AI Provider"
+          >
+            {selectedProvider.type === 'browseros' ? (
+              <BrowserOSIcon size={18} />
+            ) : (
+              <ProviderIcon
+                type={selectedProvider.type as ProviderType}
+                size={18}
+              />
+            )}
+            <span className="font-semibold text-base">
+              {selectedProvider.name}
+            </span>
+          </button>
+        </ChatProviderSelector>
+      </div>
+
+      <div className="flex items-center gap-1">
+        {hasMessages && (
+          <button
+            type="button"
+            onClick={onNewConversation}
+            className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+            title="New conversation"
+          >
+            <Plus className="h-4 w-4" />
+          </button>
+        )}
+      </div>
+    </header>
+  )
+}
--- a/packages/browseros-agent/apps/agent/entrypoints/newtab/layout/NewTabLayout.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/newtab/layout/NewTabLayout.tsx
@@ -3,19 +3,14 @@ import { Outlet, useLocation } from 'react-router'
 import { ChatSessionProvider } from '@/entrypoints/sidepanel/layout/ChatSessionContext'
 import { NewTabFocusGrid } from './NewTabFocusGrid'

-const HIDE_FOCUS_GRID_PATHS = new Set([
-  '/home/soul',
-  '/home/memory',
-  '/home/skills',
-  '/home/chat',
-])
-
 export const NewTabLayout: FC = () => {
  const location = useLocation()

  return (
    <ChatSessionProvider origin="newtab">
-      {!HIDE_FOCUS_GRID_PATHS.has(location.pathname) && <NewTabFocusGrid />}
+      {location.pathname !== '/home/soul' &&
+        location.pathname !== '/home/memory' &&
+        location.pathname !== '/home/skills' && <NewTabFocusGrid />}
      <Outlet />
    </ChatSessionProvider>
  )
--- a/packages/browseros-agent/apps/agent/entrypoints/selection.content.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/selection.content.ts
@@ -1,42 +0,0 @@
-import { selectedTextStorage } from '@/lib/selected-text/selectedTextStorage'
-
-const MAX_SELECTED_TEXT_LENGTH = 5000
-
-export default defineContentScript({
-  matches: ['*://*/*'],
-  runAt: 'document_idle',
-  async main() {
-    const response = await chrome.runtime.sendMessage({ type: 'get-tab-id' })
-    const tabId: number | undefined = response?.tabId
-    if (!tabId) return
-
-    const key = String(tabId)
-
-    document.addEventListener('mouseup', () => {
-      const text = window.getSelection()?.toString().trim()
-
-      if (text && text.length > 0) {
-        selectedTextStorage.getValue().then((map) => {
-          selectedTextStorage.setValue({
-            ...map,
-            [key]: {
-              text: text.slice(0, MAX_SELECTED_TEXT_LENGTH),
-              pageUrl: window.location.href,
-              pageTitle: document.title,
-              tabId,
-              timestamp: Date.now(),
-            },
-          })
-        })
-      } else {
-        // User clicked without selecting — clear this tab's entry only
-        selectedTextStorage.getValue().then((map) => {
-          if (map[key]) {
-            const { [key]: _, ...rest } = map
-            selectedTextStorage.setValue(rest)
-          }
-        })
-      }
-    })
-  },
-})
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/history/ChatHistory.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/history/ChatHistory.tsx
@@ -32,7 +32,6 @@ const RemoteChatHistory: FC<{ userId: string }> = ({ userId }) => {
  const {
    data: graphqlData,
    isLoading: isLoadingConversations,
-    isFetching,
    hasNextPage,
    isFetchingNextPage,
    fetchNextPage,
@@ -113,7 +112,6 @@ const RemoteChatHistory: FC<{ userId: string }> = ({ userId }) => {
      hasNextPage={hasNextPage}
      isFetchingNextPage={isFetchingNextPage}
      onLoadMore={fetchNextPage}
-      isRefreshing={isFetching && !isLoadingConversations}
    />
  )
 }
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/history/components/ConversationList.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/history/components/ConversationList.tsx
@@ -12,7 +12,6 @@ interface ConversationListProps {
  hasNextPage?: boolean
  isFetchingNextPage?: boolean
  onLoadMore?: () => void
-  isRefreshing?: boolean
 }

 export const ConversationList: FC<ConversationListProps> = ({
@@ -22,7 +21,6 @@ export const ConversationList: FC<ConversationListProps> = ({
  hasNextPage,
  isFetchingNextPage,
  onLoadMore,
-  isRefreshing,
 }) => {
  const loadMoreRef = useRef<HTMLDivElement>(null)

@@ -59,12 +57,6 @@ export const ConversationList: FC<ConversationListProps> = ({
  return (
    <main className="mt-4 flex h-full flex-1 flex-col space-y-4 overflow-y-auto">
      <div className="w-full p-3">
-        {isRefreshing && (
-          <div className="flex items-center justify-center gap-2 pb-3 text-muted-foreground text-xs">
-            <Loader2 className="h-3 w-3 animate-spin" />
-            <span>Fetching latest conversations</span>
-          </div>
-        )}
        {!hasConversations ? (
          <div className="flex flex-col items-center justify-center py-12 text-center">
            <MessageSquare className="mb-3 h-10 w-10 text-muted-foreground/50" />
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/history/graphql/chatHistoryDocument.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/history/graphql/chatHistoryDocument.ts
@@ -11,7 +11,7 @@ export const GetConversationsForHistoryDocument = graphql(`
      nodes {
        rowId
        lastMessagedAt
-        conversationMessages(first: 2, orderBy: ORDER_INDEX_DESC) {
+        conversationMessages(last: 5, orderBy: ORDER_INDEX_ASC) {
          nodes {
            message
          }
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/Chat.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/Chat.tsx
@@ -36,13 +36,13 @@ export const Chat = () => {
    stop,
    agentUrlError,
    chatError,
-    selectedProvider,
    getActionForMessage,
    liked,
    onClickLike,
    disliked,
    onClickDislike,
    isRestoringConversation,
+    isFollowing,
  } = useChatSessionContext()

  const {
@@ -203,7 +203,7 @@ export const Chat = () => {
          <div className="flex flex-1 items-center justify-center">
            <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
          </div>
-        ) : messages.length === 0 ? (
+        ) : messages.length === 0 && !isFollowing ? (
          <ChatEmptyState
            mode={mode}
            mounted={mounted}
@@ -224,30 +224,40 @@ export const Chat = () => {
            onDismissJtbdPopup={onDismissJtbdPopup}
          />
        )}
-        {agentUrlError && (
-          <ChatError
-            error={agentUrlError}
-            providerType={selectedProvider?.type}
-          />
-        )}
-        {chatError && (
-          <ChatError error={chatError} providerType={selectedProvider?.type} />
-        )}
+        {agentUrlError && <ChatError error={agentUrlError} />}
+        {chatError && <ChatError error={chatError} />}
      </main>

-      <ChatFooter
-        mode={mode}
-        onModeChange={handleModeChange}
-        input={input}
-        onInputChange={setInput}
-        onSubmit={handleSubmit}
-        status={status}
-        onStop={handleStop}
-        attachedTabs={attachedTabs}
-        onToggleTab={toggleTabSelection}
-        onRemoveTab={removeTab}
-        voice={voiceState}
-      />
+      {isFollowing ? (
+        <footer className="border-border/40 border-t bg-background/80 backdrop-blur-md">
+          <div className="flex items-center justify-between p-3">
+            <span className="text-muted-foreground text-sm">
+              Following active task...
+            </span>
+            <button
+              type="button"
+              onClick={handleStop}
+              className="cursor-pointer rounded-full bg-red-600 px-3 py-1.5 font-medium text-white text-xs shadow-sm transition-all duration-200 hover:bg-red-900"
+            >
+              Stop
+            </button>
+          </div>
+        </footer>
+      ) : (
+        <ChatFooter
+          mode={mode}
+          onModeChange={handleModeChange}
+          input={input}
+          onInputChange={setInput}
+          onSubmit={handleSubmit}
+          status={status}
+          onStop={handleStop}
+          attachedTabs={attachedTabs}
+          onToggleTab={toggleTabSelection}
+          onRemoveTab={removeTab}
+          voice={voiceState}
+        />
+      )}
    </>
  )
 }
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatError.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatError.tsx
@@ -2,6 +2,11 @@ import { AlertCircle, RefreshCw } from 'lucide-react'
 import type { FC } from 'react'
 // import { useMemo } from 'react'
 import { Button } from '@/components/ui/button'
+import {
+  KIMI_RATE_LIMIT_DOCS_CLICKED_EVENT,
+  KIMI_RATE_LIMIT_PLATFORM_CLICKED_EVENT,
+} from '@/lib/constants/analyticsEvents'
+import { track } from '@/lib/metrics/track'

 // --- Commented out for Kimi partnership launch (restore after) ---
 // const SURVEY_DIRECTIONS = [
@@ -19,24 +24,19 @@ import { Button } from '@/components/ui/button'
 interface ChatErrorProps {
  error: Error
  onRetry?: () => void
-  providerType?: string
 }

-function parseErrorMessage(
-  message: string,
-  providerType?: string,
-): {
+function parseErrorMessage(message: string): {
  text: string
  url?: string
  isRateLimit?: boolean
-  isCreditsExhausted?: boolean
  isConnectionError?: boolean
 } {
-  const isBrowserosProvider = providerType === 'browseros'
-
-  // All chat requests go through the local BrowserOS agent server, so any
-  // fetch failure is always a local connection issue.
-  if (message.includes('Failed to fetch') || message.includes('fetch failed')) {
+  // Detect MCP server connection failures
+  if (
+    (message.includes('Failed to fetch') || message.includes('fetch failed')) &&
+    message.includes('127.0.0.1')
+  ) {
    return {
      text: 'Unable to connect to BrowserOS agent. Follow below instructions.',
      url: 'https://docs.browseros.com/troubleshooting/connection-issues',
@@ -44,26 +44,8 @@ function parseErrorMessage(
    }
  }

-  // Detect credit exhaustion from gateway (BrowserOS provider only)
-  if (
-    isBrowserosProvider &&
-    (message.includes('CREDITS_EXHAUSTED') ||
-      message.includes('Credits exhausted') ||
-      message.includes('Daily credits exhausted'))
-  ) {
-    return {
-      text: 'Daily credits exhausted. Credits reset at midnight UTC.',
-      url: '/app.html#/settings/usage',
-      isRateLimit: true,
-      isCreditsExhausted: true,
-    }
-  }
-
-  // Detect BrowserOS rate limit (BrowserOS provider only)
-  if (
-    isBrowserosProvider &&
-    message.includes('BrowserOS LLM daily limit reached')
-  ) {
+  // Detect BrowserOS rate limit (unique pattern, no provider uses this)
+  if (message.includes('BrowserOS LLM daily limit reached')) {
    return {
      text: 'Add your own API key for unlimited usage.',
      url: 'https://dub.sh/browseros-usage-limit',
@@ -87,13 +69,10 @@ function parseErrorMessage(
  return { text: text || 'An unexpected error occurred', url }
 }

-export const ChatError: FC<ChatErrorProps> = ({
-  error,
-  onRetry,
-  providerType,
-}) => {
-  const { text, url, isRateLimit, isCreditsExhausted, isConnectionError } =
-    parseErrorMessage(error.message, providerType)
+export const ChatError: FC<ChatErrorProps> = ({ error, onRetry }) => {
+  const { text, url, isRateLimit, isConnectionError } = parseErrorMessage(
+    error.message,
+  )

  // --- Commented out for Kimi partnership launch (restore after) ---
  // const surveyUrl = useMemo(
@@ -149,25 +128,31 @@ export const ChatError: FC<ChatErrorProps> = ({
        </p>
      )}
      --- End commented out survey code --- */}
-      {isCreditsExhausted && url && (
-        <a
-          href={url}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="text-muted-foreground text-xs underline hover:text-foreground"
-        >
-          View Usage & Billing
-        </a>
-      )}
-      {isRateLimit && providerType === 'browseros' && (
-        <a
-          href="/app.html#/settings/ai"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="inline-flex items-center gap-1.5 rounded-md border border-[var(--accent-orange)] bg-[var(--accent-orange)]/10 px-3 py-1.5 font-medium text-[var(--accent-orange)] text-xs transition-colors hover:bg-[var(--accent-orange)]/20"
-        >
-          Add your own provider for unlimited usage
-        </a>
+      {isRateLimit && (
+        <div className="flex flex-col items-center gap-1">
+          <p className="text-muted-foreground text-xs">
+            {/* biome-ignore lint/a11y/useValidAnchor: link with click tracking */}
+            <a
+              href="https://docs.browseros.com/features/bring-your-own-llm#kimi-k2-5-%E2%80%94-in-partnership-with-moonshot-ai"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="underline hover:text-foreground"
+              onClick={() => track(KIMI_RATE_LIMIT_DOCS_CLICKED_EVENT)}
+            >
+              Learn how to get a Kimi API key
+            </a>
+            {' or '}
+            <a
+              href="https://platform.moonshot.ai"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="underline hover:text-foreground"
+              onClick={() => track(KIMI_RATE_LIMIT_PLATFORM_CLICKED_EVENT)}
+            >
+              get your API key
+            </a>
+          </p>
+        </div>
      )}
      {onRetry && (
        <Button
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatFooter.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatFooter.tsx
@@ -8,17 +8,12 @@ import { useGetUserMCPIntegrations } from '@/entrypoints/app/connect-mcp/useGetU
 import { Feature } from '@/lib/browseros/capabilities'
 import { useCapabilities } from '@/lib/browseros/useCapabilities'
 import { useMcpServers } from '@/lib/mcp/mcpServerStorage'
-import {
-  type SelectedTextData,
-  selectedTextStorage,
-} from '@/lib/selected-text/selectedTextStorage'
 import { cn } from '@/lib/utils'
 import type { VoiceInputState } from '@/lib/voice/useVoiceInput'
 import { useWorkspace } from '@/lib/workspace/use-workspace'
 import { ChatAttachedTabs } from './ChatAttachedTabs'
 import { ChatInput, type ChatInputHandle } from './ChatInput'
 import { ChatModeToggle } from './ChatModeToggle'
-import { ChatSelectedText } from './ChatSelectedText'
 import type { ChatMode } from './chatTypes'

 interface ChatFooterProps {
@@ -53,33 +48,6 @@ export const ChatFooter: FC<ChatFooterProps> = ({
  const { servers: mcpServers } = useMcpServers()
  const { data: userMCPIntegrations } = useGetUserMCPIntegrations()
  const chatInputRef = useRef<ChatInputHandle>(null)
-  const [selectionMap, setSelectionMap] = useState<
-    Record<string, SelectedTextData>
-  >({})
-  const [activeTabId, setActiveTabId] = useState<number | undefined>()
-
-  // Track active tab for tab-scoped selection display
-  useEffect(() => {
-    chrome.tabs
-      .query({ active: true, currentWindow: true })
-      .then((tabs) => setActiveTabId(tabs[0]?.id))
-    const listener = (activeInfo: { tabId: number }) => {
-      setActiveTabId(activeInfo.tabId)
-    }
-    chrome.tabs.onActivated.addListener(listener)
-    return () => chrome.tabs.onActivated.removeListener(listener)
-  }, [])
-
-  // Watch selected text storage (per-tab map)
-  useEffect(() => {
-    selectedTextStorage.getValue().then(setSelectionMap)
-    const unwatch = selectedTextStorage.watch(setSelectionMap)
-    return () => unwatch()
-  }, [])
-
-  const visibleSelectedText = activeTabId
-    ? (selectionMap[String(activeTabId)] ?? null)
-    : null
  const [isTabMentionOpen, setIsTabMentionOpen] = useState(false)

  useEffect(() => {
@@ -113,19 +81,6 @@ export const ChatFooter: FC<ChatFooterProps> = ({
  return (
    <footer className="border-border/40 border-t bg-background/80 backdrop-blur-md">
      <ChatAttachedTabs tabs={attachedTabs} onRemoveTab={onRemoveTab} />
-      {visibleSelectedText && (
-        <ChatSelectedText
-          selectedText={visibleSelectedText}
-          onDismiss={() => {
-            if (!activeTabId) return
-            const key = String(activeTabId)
-            selectedTextStorage.getValue().then((map) => {
-              const { [key]: _, ...rest } = map
-              selectedTextStorage.setValue(rest)
-            })
-          }}
-        />
-      )}

      <div className="p-3">
        <div className="flex items-center gap-2">
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatHeader.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatHeader.tsx
@@ -3,34 +3,17 @@ import type { FC } from 'react'
 import { Link, useLocation, useNavigate } from 'react-router'
 import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
 import type { Provider } from '@/components/chat/chatComponentTypes'
-import { CreditBadge } from '@/components/credits/CreditBadge'
 import { ThemeToggle } from '@/components/elements/theme-toggle'
-import { Feature } from '@/lib/browseros/capabilities'
-import { useCapabilities } from '@/lib/browseros/useCapabilities'
 import { productRepositoryUrl } from '@/lib/constants/productUrls'
-import { useCredits } from '@/lib/credits/useCredits'
 import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
 import type { ProviderType } from '@/lib/llm-providers/types'

-const CreditsBadgeWrapper: FC = () => {
-  const { supports } = useCapabilities()
-  const { data } = useCredits()
-  if (!supports(Feature.CREDITS_SUPPORT) || data === undefined) return null
-  return (
-    <CreditBadge
-      credits={data.credits}
-      onClick={() => window.open('/app.html#/settings/usage', '_blank')}
-    />
-  )
-}
-
 interface ChatHeaderProps {
  selectedProvider: Provider
  providers: Provider[]
  onSelectProvider: (provider: Provider) => void
  onNewConversation: () => void
  hasMessages: boolean
-  hideHistory?: boolean
 }

 export const ChatHeader: FC<ChatHeaderProps> = ({
@@ -39,7 +22,6 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
  onSelectProvider,
  onNewConversation,
  hasMessages,
-  hideHistory,
 }) => {
  const location = useLocation()
  const navigate = useNavigate()
@@ -77,7 +59,6 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
            </span>
          </button>
        </ChatProviderSelector>
-        {selectedProvider.type === 'browseros' && <CreditsBadgeWrapper />}
      </div>

      <div className="flex items-center gap-1">
@@ -92,25 +73,24 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
          </button>
        )}

-        {!hideHistory &&
-          (isHistoryPage ? (
-            <button
-              type="button"
-              onClick={handleNewConversationFromHistory}
-              className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-              title="New conversation"
-            >
-              <Plus className="h-4 w-4" />
-            </button>
-          ) : (
-            <Link
-              to="/history"
-              className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-              title="Chat history"
-            >
-              <History className="h-4 w-4" />
-            </Link>
-          ))}
+        {isHistoryPage ? (
+          <button
+            type="button"
+            onClick={handleNewConversationFromHistory}
+            className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+            title="New conversation"
+          >
+            <Plus className="h-4 w-4" />
+          </button>
+        ) : (
+          <Link
+            to="/history"
+            className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+            title="Chat history"
+          >
+            <History className="h-4 w-4" />
+          </Link>
+        )}

        <a
          href={productRepositoryUrl}
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatInput.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatInput.tsx
@@ -280,11 +280,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(

      if (voice.isTranscribing) {
        return (
-          <button
-            type="button"
-            disabled
-            className="rounded-full p-2 text-muted-foreground"
-          >
+          <button type="button" disabled className="rounded-full p-2 text-muted-foreground">
            <Loader2 className="h-3.5 w-3.5 animate-spin" />
            <span className="sr-only">Transcribing</span>
          </button>
@@ -321,9 +317,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
      return (
        <button
          type="submit"
-          disabled={
-            !input.trim() || voice?.isRecording || voice?.isTranscribing
-          }
+          disabled={!input.trim() || voice?.isRecording || voice?.isTranscribing}
          className="cursor-pointer rounded-full bg-[var(--accent-orange)] p-2 text-white shadow-sm transition-all duration-200 hover:bg-[var(--accent-orange-bright)] disabled:cursor-not-allowed disabled:opacity-50"
        >
          <Send className="h-3.5 w-3.5" />
@@ -347,10 +341,12 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
          anchorRef={textareaRef}
        />
        {voice?.isRecording ? (
-          <div className="flex min-h-[42px] flex-1 items-center justify-center gap-1 rounded-2xl border border-red-500/50 bg-muted/50 px-4 py-2.5 pr-[4.5rem]">
+          <div
+            className="flex min-h-[42px] flex-1 items-center justify-center gap-1 rounded-2xl border border-red-500/50 bg-muted/50 px-4 py-2.5 pr-[4.5rem]"
+          >
            {voice.audioLevels.map((level, i) => (
              <div
-                key={i.toString()}
+                key={i}
                className="w-1 rounded-full bg-red-500 transition-all duration-75"
                style={{
                  height: `${Math.max(4, Math.min(20, level * 0.6))}px`,
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatSelectedText.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatSelectedText.tsx
@@ -1,46 +0,0 @@
-import { FileText, X } from 'lucide-react'
-import type { FC } from 'react'
-import type { SelectedTextData } from '@/lib/selected-text/selectedTextStorage'
-
-const MAX_DISPLAY_LENGTH = 200
-
-interface ChatSelectedTextProps {
-  selectedText: SelectedTextData
-  onDismiss: () => void
-}
-
-export const ChatSelectedText: FC<ChatSelectedTextProps> = ({
-  selectedText,
-  onDismiss,
-}) => {
-  const truncated =
-    selectedText.text.length > MAX_DISPLAY_LENGTH
-      ? `${selectedText.text.slice(0, MAX_DISPLAY_LENGTH)}...`
-      : selectedText.text
-
-  return (
-    <div className="px-3 pt-2">
-      <div className="relative rounded-lg border border-[var(--accent-orange)]/30 bg-accent/30">
-        <div className="flex items-start gap-2 px-3 py-2">
-          <FileText className="mt-0.5 h-3.5 w-3.5 flex-shrink-0 text-[var(--accent-orange)]" />
-          <div className="min-w-0 flex-1">
-            <div className="mb-0.5 truncate font-medium text-[10px] text-muted-foreground">
-              {selectedText.pageTitle}
-            </div>
-            <div className="line-clamp-3 text-foreground text-xs leading-relaxed">
-              &ldquo;{truncated}&rdquo;
-            </div>
-          </div>
-          <button
-            type="button"
-            onClick={onDismiss}
-            className="flex-shrink-0 rounded p-0.5 transition-colors hover:bg-background"
-            title="Remove selected text"
-          >
-            <X className="h-3 w-3 text-muted-foreground" />
-          </button>
-        </div>
-      </div>
-    </div>
-  )
-}
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/useChatSession.ts
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/useChatSession.ts
@@ -1,10 +1,17 @@
 import { useChat } from '@ai-sdk/react'
-import { DefaultChatTransport, type UIMessage } from 'ai'
+import { type ChatStatus, DefaultChatTransport, type UIMessage } from 'ai'
 import { compact } from 'es-toolkit/array'
 import { useEffect, useRef, useState } from 'react'
 import { useSearchParams } from 'react-router'
 import useDeepCompareEffect from 'use-deep-compare-effect'
 import type { Provider } from '@/components/chat/chatComponentTypes'
+import {
+  activeStreamsStorage,
+  clearActiveStream,
+  extractToolTabIds,
+  getAllActiveStreams,
+  setActiveStream,
+} from '@/lib/active-stream/active-stream-storage'
 import { Capabilities, Feature } from '@/lib/browseros/capabilities'
 import { useAgentServerUrl } from '@/lib/browseros/useBrowserOSProviders'
 import type { ChatAction } from '@/lib/chat-actions/types'
@@ -21,14 +28,12 @@ import {
  useConversations,
 } from '@/lib/conversations/conversationStorage'
 import { formatConversationHistory } from '@/lib/conversations/formatConversationHistory'
-import { useInvalidateCredits } from '@/lib/credits/useCredits'
 import { declinedAppsStorage } from '@/lib/declined-apps/storage'
 import { useGraphqlQuery } from '@/lib/graphql/useGraphqlQuery'
 import { createDefaultBrowserOSProvider } from '@/lib/llm-providers/storage'
 import { useLlmProviders } from '@/lib/llm-providers/useLlmProviders'
 import { track } from '@/lib/metrics/track'
 import { searchActionsStorage } from '@/lib/search-actions/searchActionsStorage'
-import { selectedTextStorage } from '@/lib/selected-text/selectedTextStorage'
 import { stopAgentStorage } from '@/lib/stop-agent/stop-agent-storage'
 import { selectedWorkspaceStorage } from '@/lib/workspace/workspace-storage'
 import type { ChatMode } from './chatTypes'
@@ -76,6 +81,8 @@ export interface ChatSessionOptions {
  isIntegrationsSynced?: boolean
 }

+const NEWTAB_SYSTEM_PROMPT = `IMPORTANT: The user is chatting from the New Tab page. When performing browser actions, ALWAYS open content in a NEW TAB rather than navigating the current tab. The user's new tab page should remain accessible.`
+
 export const useChatSession = (options?: ChatSessionOptions) => {
  const {
    selectedLlmProviderRef,
@@ -85,7 +92,6 @@ export const useChatSession = (options?: ChatSessionOptions) => {
    selectedLlmProvider,
    isLoadingProviders,
  } = useChatRefs()
-  const invalidateCredits = useInvalidateCredits()

  const { providers: llmProviders, setDefaultProvider } = useLlmProviders()

@@ -130,6 +136,14 @@ export const useChatSession = (options?: ChatSessionOptions) => {
    conversationIdRef.current = conversationId
  }, [conversationId])

+  // Multi-tab stream sync: leader broadcasts, followers display
+  const isLeaderRef = useRef(false)
+  const isFollowingRef = useRef(false)
+  const optedOutRef = useRef(false)
+  const [isFollowing, setIsFollowing] = useState(false)
+  const [followedMessages, setFollowedMessages] = useState<UIMessage[]>([])
+  const [followedStatus, setFollowedStatus] = useState<ChatStatus>('ready')
+
  const onClickLike = (messageId: string) => {
    const { responseText, queryText } = getResponseAndQueryFromMessageId(
      messages,
@@ -166,34 +180,8 @@ export const useChatSession = (options?: ChatSessionOptions) => {
  const modeRef = useRef<ChatMode>(mode)
  const textToActionRef = useRef<Map<string, ChatAction>>(textToAction)
  const workingDirRef = useRef<string | undefined>(undefined)
-  const selectionMapRef = useRef<
-    Record<string, { text: string; url: string; title: string }>
-  >({})
-  const pendingSelectionTabKeyRef = useRef<string | null>(null)
  const messagesRef = useRef<UIMessage[]>([])

-  useEffect(() => {
-    const toRef = (
-      map: Record<string, { text: string; pageUrl: string; pageTitle: string }>,
-    ) => {
-      const result: Record<
-        string,
-        { text: string; url: string; title: string }
-      > = {}
-      for (const [k, v] of Object.entries(map)) {
-        result[k] = { text: v.text, url: v.pageUrl, title: v.pageTitle }
-      }
-      return result
-    }
-    selectedTextStorage.getValue().then((map) => {
-      selectionMapRef.current = toRef(map)
-    })
-    const unwatchText = selectedTextStorage.watch((map) => {
-      selectionMapRef.current = toRef(map)
-    })
-    return () => unwatchText()
-  }, [])
-
  useEffect(() => {
    selectedWorkspaceStorage.getValue().then((folder) => {
      workingDirRef.current = folder?.path
@@ -237,9 +225,6 @@ export const useChatSession = (options?: ChatSessionOptions) => {
          currentWindow: true,
        })
        const activeTab = activeTabsList?.[0] ?? undefined
-        const activeTabSelection = activeTab?.id
-          ? (selectionMapRef.current[String(activeTab.id)] ?? null)
-          : null
        const message = getLastMessageText(messages)
        const provider =
          selectedLlmProviderRef.current ?? createDefaultBrowserOSProvider()
@@ -317,7 +302,7 @@ export const useChatSession = (options?: ChatSessionOptions) => {
            : history.map((m) => `${m.role}: ${m.content}`).join('\n')
          : undefined

-        const result = {
+        return {
          api: `${agentUrlRef.current}/chat`,
          body: {
            message,
@@ -338,31 +323,19 @@ export const useChatSession = (options?: ChatSessionOptions) => {
            secretAccessKey: provider?.secretAccessKey,
            region: provider?.region,
            sessionToken: provider?.sessionToken,
-            // ChatGPT Pro (Codex)
-            reasoningEffort: provider?.reasoningEffort,
-            reasoningSummary: provider?.reasoningSummary,
            browserContext,
-            origin: options?.origin ?? 'sidepanel',
-            userSystemPrompt: personalizationRef.current,
+            userSystemPrompt:
+              options?.origin === 'newtab'
+                ? [personalizationRef.current, NEWTAB_SYSTEM_PROMPT]
+                    .filter(Boolean)
+                    .join('\n\n')
+                : personalizationRef.current,
            userWorkingDir: workingDirRef.current,
            supportsImages: provider?.supportsImages,
            previousConversation,
            declinedApps: declinedApps.length > 0 ? declinedApps : undefined,
-            selectedText: activeTabSelection?.text,
-            selectedTextSource: activeTabSelection
-              ? {
-                  url: activeTabSelection.url,
-                  title: activeTabSelection.title,
-                }
-              : undefined,
          },
        }
-
-        // Track which tab's selection was sent so we can clear it on success
-        pendingSelectionTabKeyRef.current =
-          activeTabSelection && activeTab?.id ? String(activeTab.id) : null
-
-        return result
      },
    }),
  })
@@ -377,11 +350,139 @@ export const useChatSession = (options?: ChatSessionOptions) => {
  }, [messages, status, setMessages])

  useNotifyActiveTab({
-    messages,
-    status,
+    messages: isFollowing ? followedMessages : messages,
+    status: isFollowing ? followedStatus : status,
    conversationId: conversationIdRef.current,
  })

+  // Leader: broadcast stream state to shared storage (debounced)
+  const writeTimeoutRef = useRef<ReturnType<typeof setTimeout>>()
+  useEffect(() => {
+    if (!isLeaderRef.current) return
+
+    const isStreaming = status === 'streaming' || status === 'submitted'
+    const isFinished = status === 'ready' || status === 'error'
+    const followerTabIds = extractToolTabIds(messages)
+
+    if (isStreaming) {
+      clearTimeout(writeTimeoutRef.current)
+      writeTimeoutRef.current = setTimeout(() => {
+        setActiveStream({
+          conversationId,
+          messages,
+          status,
+          lastUpdated: Date.now(),
+          followerTabIds,
+        })
+      }, 300)
+      return () => clearTimeout(writeTimeoutRef.current)
+    }
+
+    if (isFinished && messages.length > 0) {
+      clearTimeout(writeTimeoutRef.current)
+      setActiveStream({
+        conversationId,
+        messages,
+        status,
+        lastUpdated: Date.now(),
+        followerTabIds,
+      })
+      isLeaderRef.current = false
+      // Clean up after followers have had time to read the final state
+      setTimeout(() => {
+        clearActiveStream(conversationId)
+      }, 2000)
+    }
+  }, [messages, status, conversationId])
+
+  // Follower: if this panel opened with no messages and there's an active
+  // stream, follow it. Background only opens side panels on agent-interacted
+  // tabs, so any fresh panel during streaming is a follower.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: must run once — re-runs tear down the watcher
+  useEffect(() => {
+    const STALE_THRESHOLD_MS = 10_000
+    let staleCheckTimer: ReturnType<typeof setTimeout> | undefined
+
+    const check = async () => {
+      if (isLeaderRef.current || optedOutRef.current) return
+
+      const streams = await getAllActiveStreams()
+
+      // Find an active stream, or if we're already following, find the
+      // completed stream we were following (to adopt its final messages)
+      const activeStream = streams.find(
+        (s) => s.status === 'streaming' || s.status === 'submitted',
+      )
+      const completedStream =
+        !activeStream && isFollowingRef.current
+          ? streams.find(
+              (s) =>
+                s.status === 'ready' &&
+                s.conversationId === conversationIdRef.current,
+            )
+          : undefined
+
+      const state = activeStream ?? completedStream
+
+      if (!state) {
+        if (isFollowingRef.current) {
+          isFollowingRef.current = false
+          setIsFollowing(false)
+        }
+        clearTimeout(staleCheckTimer)
+        return
+      }
+
+      // Stream completed — adopt final messages and exit follower mode
+      if (state.status === 'ready') {
+        isFollowingRef.current = false
+        setIsFollowing(false)
+        setMessages(state.messages)
+        setConversationId(
+          state.conversationId as ReturnType<typeof crypto.randomUUID>,
+        )
+        clearTimeout(staleCheckTimer)
+        return
+      }
+
+      // Stale leader detection
+      if (Date.now() - state.lastUpdated > STALE_THRESHOLD_MS) {
+        if (isFollowingRef.current) {
+          isFollowingRef.current = false
+          setIsFollowing(false)
+        }
+        clearTimeout(staleCheckTimer)
+        return
+      }
+
+      isFollowingRef.current = true
+      setIsFollowing(true)
+      setFollowedMessages(state.messages)
+      setFollowedStatus(state.status)
+      setConversationId(
+        state.conversationId as ReturnType<typeof crypto.randomUUID>,
+      )
+      clearTimeout(staleCheckTimer)
+      staleCheckTimer = setTimeout(check, STALE_THRESHOLD_MS + 500)
+    }
+
+    // Only auto-follow if this panel has no conversation of its own
+    if (messagesRef.current.length === 0) {
+      check()
+    }
+
+    const unwatchStreams = activeStreamsStorage.watch(() => {
+      if (isFollowingRef.current || messagesRef.current.length === 0) {
+        check()
+      }
+    })
+
+    return () => {
+      unwatchStreams()
+      clearTimeout(staleCheckTimer)
+    }
+  }, [])
+
  const {
    data: remoteConversationData,
    isFetched: isRemoteConversationFetched,
@@ -456,19 +557,6 @@ export const useChatSession = (options?: ChatSessionOptions) => {

    if (!justFinished) return

-    // Clear the selected text that was sent with this request
-    const tabKey = pendingSelectionTabKeyRef.current
-    if (tabKey) {
-      pendingSelectionTabKeyRef.current = null
-      delete selectionMapRef.current[tabKey]
-      selectedTextStorage.getValue().then((map) => {
-        if (map[tabKey]) {
-          const { [tabKey]: _, ...rest } = map
-          selectedTextStorage.setValue(rest)
-        }
-      })
-    }
-
    const messagesToSave = messages.filter((m) => m.parts?.length > 0)
    if (messagesToSave.length === 0) return

@@ -477,14 +565,8 @@ export const useChatSession = (options?: ChatSessionOptions) => {
    } else {
      saveLocalConversation(conversationIdRef.current, messagesToSave)
    }
-
-    invalidateCredits()
  }, [status])

-  useEffect(() => {
-    if (chatError) invalidateCredits()
-  }, [chatError, invalidateCredits])
-
  const isIntegrationsSynced = options?.isIntegrationsSynced ?? true
  const isIntegrationsSyncedRef = useRef(isIntegrationsSynced)
  const pendingMessageRef = useRef<{
@@ -504,7 +586,6 @@ export const useChatSession = (options?: ChatSessionOptions) => {
      if (pending.action) {
        setTextToAction((prev) => {
          const next = new Map(prev)
-          // biome-ignore lint/style/noNonNullAssertion: guarded by if (pending.action) above
          next.set(pending.text, pending.action!)
          return next
        })
@@ -514,6 +595,11 @@ export const useChatSession = (options?: ChatSessionOptions) => {
  }, [isIntegrationsSynced, baseSendMessage])

  const sendMessage = (params: { text: string; action?: ChatAction }) => {
+    isLeaderRef.current = true
+    isFollowingRef.current = false
+    optedOutRef.current = false
+    setIsFollowing(false)
+
    track(MESSAGE_SENT_EVENT, {
      mode,
      provider_type: selectedLlmProvider?.type,
@@ -580,6 +666,14 @@ export const useChatSession = (options?: ChatSessionOptions) => {
  const resetConversation = () => {
    track(CONVERSATION_RESET_EVENT, { message_count: messages.length })
    stop()
+    if (isLeaderRef.current) {
+      clearActiveStream(conversationIdRef.current)
+      isLeaderRef.current = false
+    }
+    isFollowingRef.current = false
+    optedOutRef.current = true
+    setIsFollowing(false)
+    setFollowedMessages([])
    setConversationId(crypto.randomUUID())
    setMessages([])
    setTextToAction(new Map())
@@ -592,18 +686,26 @@ export const useChatSession = (options?: ChatSessionOptions) => {
  const isRestoringConversation =
    !!conversationIdParam && restoredConversationId !== conversationIdParam

+  const stopFollowedStream = () => {
+    stopAgentStorage.setValue({
+      conversationId: conversationIdRef.current,
+      timestamp: Date.now(),
+    })
+  }
+
  return {
    mode,
    setMode,
-    messages,
+    messages: isFollowing ? followedMessages : messages,
    sendMessage,
-    status,
-    stop,
+    status: isFollowing ? followedStatus : status,
+    stop: isFollowing ? stopFollowedStream : stop,
    providers,
    selectedProvider,
    isLoading: isLoadingProviders || isLoadingAgentUrl,
    isSyncing: !isIntegrationsSynced,
    isRestoringConversation,
+    isFollowing,
    agentUrlError,
    chatError,
    handleSelectProvider,
--- a/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/useNotifyActiveTab.tsx
+++ b/packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/useNotifyActiveTab.tsx
@@ -19,10 +19,6 @@ function extractTabId(toolPart: ToolUIPart | null): number | undefined {
  return input?.tabId
 }

-function sendGlow(tabId: number, message: GlowMessage): void {
-  chrome.tabs.sendMessage(tabId, message).catch(() => {})
-}
-
 export const useNotifyActiveTab = ({
  messages,
  status,
@@ -32,10 +28,7 @@ export const useNotifyActiveTab = ({
  status: ChatStatus
  conversationId: string
 }) => {
-  // Track the single tab currently glowing
-  const activeTabIdRef = useRef<number | null>(null)
-  // Track all tabs that have been glowed during this stream (for cleanup)
-  const allGlowedTabsRef = useRef<Set<number>>(new Set())
+  const lastTabIdRef = useRef<number | null>(null)

  const lastMessage = messages?.[messages.length - 1]

@@ -48,35 +41,27 @@ export const useNotifyActiveTab = ({

  useEffect(() => {
    const isStreaming = status === 'streaming'
+    const previousTabId = lastTabIdRef.current

    if (!isStreaming) {
-      // Deactivate ALL tabs that were glowed during this stream
-      const allGlowed = allGlowedTabsRef.current
-      if (allGlowed.size > 0) {
+      if (previousTabId) {
        const deactivate = async () => {
-          // Capture tab IDs before any async work to avoid race with clear()
-          const tabIds = Array.from(allGlowed)
-          allGlowed.clear()
-
          const alreadyShown = await firstRunConfettiShownStorage.getValue()
-          let showConfetti = !alreadyShown
-
-          for (const tabId of tabIds) {
-            sendGlow(tabId, {
-              conversationId,
-              isActive: false,
-              showConfetti,
-            })
-            showConfetti = false
+          const deactivateMessage: GlowMessage = {
+            conversationId,
+            isActive: false,
+            showConfetti: !alreadyShown,
          }
-
+          chrome.tabs
+            .sendMessage(previousTabId, deactivateMessage)
+            .catch(() => {})
          if (!alreadyShown) {
            await firstRunConfettiShownStorage.setValue(true)
          }
        }
        deactivate()
+        lastTabIdRef.current = null
      }
-      activeTabIdRef.current = null
      return
    }

@@ -85,41 +70,34 @@ export const useNotifyActiveTab = ({
    let cancelled = false

    const activate = async () => {
-      let targetTabId = toolTabId ?? undefined
+      let targetTabId = toolTabId ?? previousTabId ?? undefined

      if (!targetTabId) {
-        // Fallback: use the currently active tab, or query browser
-        if (activeTabIdRef.current) {
-          targetTabId = activeTabIdRef.current
-        } else {
-          const tabs = await chrome.tabs.query({
-            active: true,
-            currentWindow: true,
-          })
-          targetTabId = tabs[0]?.id
-        }
+        const tabs = await chrome.tabs.query({
+          active: true,
+          currentWindow: true,
+        })
+        targetTabId = tabs[0]?.id
      }

      if (cancelled || !targetTabId) return

-      const previousTabId = activeTabIdRef.current
-
-      // If the agent moved to a different tab, deactivate the previous one
      if (previousTabId && previousTabId !== targetTabId) {
-        sendGlow(previousTabId, {
+        const deactivateMessage: GlowMessage = {
          conversationId,
          isActive: false,
-        })
+        }
+        chrome.tabs
+          .sendMessage(previousTabId, deactivateMessage)
+          .catch(() => {})
      }

-      // Activate glow on the target tab
-      sendGlow(targetTabId, {
+      const activateMessage: GlowMessage = {
        conversationId,
        isActive: true,
-      })
-
-      activeTabIdRef.current = targetTabId
-      allGlowedTabsRef.current.add(targetTabId)
+      }
+      chrome.tabs.sendMessage(targetTabId, activateMessage).catch(() => {})
+      lastTabIdRef.current = targetTabId
    }

    activate()
--- a/packages/browseros-agent/apps/agent/lib/active-stream/active-stream-storage.ts
+++ b/packages/browseros-agent/apps/agent/lib/active-stream/active-stream-storage.ts
@@ -0,0 +1,65 @@
+import { storage } from '@wxt-dev/storage'
+import type { ChatStatus, UIMessage } from 'ai'
+
+export interface ActiveStreamState {
+  conversationId: string
+  messages: UIMessage[]
+  status: ChatStatus
+  lastUpdated: number
+  followerTabIds: number[]
+}
+
+/**
+ * Single storage item holding the active stream state.
+ * Uses local storage for reliable cross-context access (background + sidepanel).
+ * Keyed by conversationId inside the map for parallel agent support.
+ */
+export type ActiveStreamsMap = Record<string, ActiveStreamState>
+
+export const activeStreamsStorage = storage.defineItem<ActiveStreamsMap>(
+  'local:active-streams',
+  { fallback: {} },
+)
+
+/** Write a conversation's stream state. */
+export async function setActiveStream(state: ActiveStreamState): Promise<void> {
+  const map = await activeStreamsStorage.getValue()
+  map[state.conversationId] = state
+  await activeStreamsStorage.setValue(map)
+}
+
+/** Remove a conversation's stream state. */
+export async function clearActiveStream(conversationId: string): Promise<void> {
+  const map = await activeStreamsStorage.getValue()
+  delete map[conversationId]
+  await activeStreamsStorage.setValue(map)
+}
+
+/** Read all active streams. */
+export async function getAllActiveStreams(): Promise<ActiveStreamState[]> {
+  const map = await activeStreamsStorage.getValue()
+  return Object.values(map)
+}
+
+/**
+ * Extract all unique tabIds from tool output metadata in messages.
+ * The server attaches metadata.tabId to every tool that operates on or creates a page.
+ */
+export function extractToolTabIds(messages: UIMessage[]): number[] {
+  const tabIds = new Set<number>()
+  for (const message of messages) {
+    if (!message.parts) continue
+    for (const part of message.parts) {
+      const typedPart = part as { type?: string; output?: unknown }
+      if (!typedPart.type?.startsWith('tool-')) continue
+
+      const output = typedPart.output as
+        | { metadata?: { tabId?: number } }
+        | undefined
+      if (output?.metadata?.tabId) {
+        tabIds.add(output.metadata.tabId)
+      }
+    }
+  }
+  return [...tabIds]
+}
--- a/packages/browseros-agent/apps/agent/lib/analytics/identify.ts
+++ b/packages/browseros-agent/apps/agent/lib/analytics/identify.ts
@@ -1,23 +0,0 @@
-import { sentry } from '../sentry/sentry'
-import { posthog } from './posthog'
-
-/**
- * Identify the current user across all analytics and error tracking services.
- * Call this when the user logs in or when a stored session is restored.
- */
-export function identify(user: { id: string; email?: string; name?: string }) {
-  sentry.setUser({ id: user.id, email: user.email })
-  posthog.identify(user.id, {
-    email: user.email,
-    name: user.name,
-  })
-}
-
-/**
- * Clear user identity across all services.
- * Call this when the user logs out.
- */
-export function resetIdentity() {
-  sentry.setUser(null)
-  posthog.reset()
-}
--- a/packages/browseros-agent/apps/agent/lib/auth/AuthProvider.tsx
+++ b/packages/browseros-agent/apps/agent/lib/auth/AuthProvider.tsx
@@ -1,6 +1,5 @@
 import type { FC, PropsWithChildren } from 'react'
 import { useEffect } from 'react'
-import { identify, resetIdentity } from '@/lib/analytics/identify'
 import { useSession } from './auth-client'
 import { useSessionInfo } from './sessionStorage'

@@ -15,16 +14,6 @@ export const AuthProvider: FC<PropsWithChildren> = ({ children }) => {
        session: data?.session,
        user: data?.user,
      })
-
-      if (data?.user?.id) {
-        identify({
-          id: data.user.id,
-          email: data.user.email,
-          name: data.user.name || undefined,
-        })
-      } else {
-        resetIdentity()
-      }
    }
  }, [data, isPending])

--- a/packages/browseros-agent/apps/agent/lib/browseros/capabilities.ts
+++ b/packages/browseros-agent/apps/agent/lib/browseros/capabilities.ts
@@ -45,14 +45,6 @@ export enum Feature {
  MEMORY_SUPPORT = 'MEMORY_SUPPORT',
  // Skills page: agent skills viewer and editor
  SKILLS_SUPPORT = 'SKILLS_SUPPORT',
-  // ChatGPT Pro OAuth LLM provider
-  CHATGPT_PRO_SUPPORT = 'CHATGPT_PRO_SUPPORT',
-  // GitHub Copilot OAuth LLM provider
-  GITHUB_COPILOT_SUPPORT = 'GITHUB_COPILOT_SUPPORT',
-  // Qwen Code OAuth LLM provider
-  QWEN_CODE_SUPPORT = 'QWEN_CODE_SUPPORT',
-  // Credit-based usage tracking
-  CREDITS_SUPPORT = 'CREDITS_SUPPORT',
 }

 /**
@@ -80,10 +72,6 @@ const FEATURE_CONFIG: { [K in Feature]: FeatureConfig } = {
  [Feature.VERTICAL_TABS_SUPPORT]: { minBrowserOSVersion: '0.42.0.0' },
  [Feature.MEMORY_SUPPORT]: { minServerVersion: '0.0.73' },
  [Feature.SKILLS_SUPPORT]: { minBrowserOSVersion: '0.43.0.0' },
-  [Feature.CHATGPT_PRO_SUPPORT]: { minServerVersion: '0.0.77' },
-  [Feature.GITHUB_COPILOT_SUPPORT]: { minServerVersion: '0.0.77' },
-  [Feature.QWEN_CODE_SUPPORT]: { minServerVersion: '0.0.77' },
-  [Feature.CREDITS_SUPPORT]: { minServerVersion: '0.0.78' },
 }

 function parseVersion(version: string): number[] {
--- a/packages/browseros-agent/apps/agent/lib/chat-actions/useChatActions.ts
+++ b/packages/browseros-agent/apps/agent/lib/chat-actions/useChatActions.ts
@@ -1,172 +0,0 @@
-import { useEffect, useState } from 'react'
-import type { ChatMode } from '@/entrypoints/sidepanel/index/chatTypes'
-import { useChatSessionContext } from '@/entrypoints/sidepanel/layout/ChatSessionContext'
-import { track } from '@/lib/metrics/track'
-import { useVoiceInput } from '@/lib/voice/useVoiceInput'
-import { createBrowserOSAction } from './types'
-
-interface ChatActionsConfig {
-  /** Analytics event names scoped to the origin */
-  events: {
-    modeChanged: string
-    stopClicked: string
-    suggestionClicked: string
-    tabToggled: string
-    tabRemoved: string
-    aiTriggered: string
-    voiceRecordingStarted: string
-    voiceRecordingStopped: string
-    voiceTranscriptionCompleted: string
-    voiceError: string
-  }
-  /** Auto-attach current active tab on mount (sidepanel only) */
-  autoAttachActiveTab?: boolean
-}
-
-export function useChatActions(config: ChatActionsConfig) {
-  const session = useChatSessionContext()
-  const { mode, setMode, sendMessage, stop, messages } = session
-
-  const voice = useVoiceInput()
-
-  const [input, setInput] = useState('')
-  const [attachedTabs, setAttachedTabs] = useState<chrome.tabs.Tab[]>([])
-  const [mounted, setMounted] = useState(false)
-
-  useEffect(() => {
-    setMounted(true)
-  }, [])
-
-  // Auto-attach current tab on mount (sidepanel)
-  useEffect(() => {
-    if (!config.autoAttachActiveTab) return
-    ;(async () => {
-      const currentTab = (
-        await chrome.tabs.query({ active: true, currentWindow: true })
-      ).filter((tab) => tab.url?.startsWith('http'))
-      setAttachedTabs(currentTab)
-    })()
-  }, [config.autoAttachActiveTab])
-
-  // Voice transcript → input
-  // biome-ignore lint/correctness/useExhaustiveDependencies: only trigger on transcript/transcribing change
-  useEffect(() => {
-    if (voice.transcript && !voice.isTranscribing) {
-      setInput((prev) => {
-        const separator = prev.trim() ? ' ' : ''
-        return prev + separator + voice.transcript
-      })
-      track(config.events.voiceTranscriptionCompleted)
-      voice.clearTranscript()
-    }
-  }, [voice.transcript, voice.isTranscribing])
-
-  // Track voice errors
-  useEffect(() => {
-    if (voice.error) {
-      track(config.events.voiceError, { error: voice.error })
-    }
-  }, [voice.error, config.events.voiceError])
-
-  const handleModeChange = (newMode: ChatMode) => {
-    track(config.events.modeChanged, { from: mode, to: newMode })
-    setMode(newMode)
-  }
-
-  const handleStop = () => {
-    track(config.events.stopClicked)
-    stop()
-  }
-
-  const toggleTabSelection = (tab: chrome.tabs.Tab) => {
-    setAttachedTabs((prev) => {
-      const isSelected = prev.some((t) => t.id === tab.id)
-      track(config.events.tabToggled, {
-        action: isSelected ? 'removed' : 'added',
-      })
-      if (isSelected) {
-        return prev.filter((t) => t.id !== tab.id)
-      }
-      return [...prev, tab]
-    })
-  }
-
-  const removeTab = (tabId?: number) => {
-    track(config.events.tabRemoved)
-    setAttachedTabs((prev) => prev.filter((t) => t.id !== tabId))
-  }
-
-  const executeMessage = (customMessageText?: string) => {
-    const messageText = customMessageText ? customMessageText : input.trim()
-    if (!messageText) return
-
-    if (attachedTabs.length) {
-      const action = createBrowserOSAction({
-        mode,
-        message: messageText,
-        tabs: attachedTabs,
-      })
-      sendMessage({ text: messageText, action })
-    } else {
-      sendMessage({ text: messageText })
-    }
-    setInput('')
-    setAttachedTabs([])
-  }
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault()
-    if (messages.length === 0) {
-      track(config.events.aiTriggered, {
-        mode,
-        tabs_count: attachedTabs.length,
-      })
-    }
-    executeMessage()
-  }
-
-  const handleSuggestionClick = (suggestion: string) => {
-    track(config.events.suggestionClicked, { mode })
-    executeMessage(suggestion)
-  }
-
-  const handleStartRecording = async () => {
-    const started = await voice.startRecording()
-    if (started) {
-      track(config.events.voiceRecordingStarted)
-    }
-  }
-
-  const handleStopRecording = async () => {
-    await voice.stopRecording()
-    track(config.events.voiceRecordingStopped)
-  }
-
-  const voiceState = {
-    isRecording: voice.isRecording,
-    isTranscribing: voice.isTranscribing,
-    audioLevels: voice.audioLevels,
-    error: voice.error,
-    onStartRecording: handleStartRecording,
-    onStopRecording: handleStopRecording,
-  }
-
-  const { stop: _stop, ...restSession } = session
-
-  return {
-    ...restSession,
-    input,
-    setInput,
-    attachedTabs,
-    setAttachedTabs,
-    mounted,
-    voiceState,
-    handleModeChange,
-    handleStop,
-    toggleTabSelection,
-    removeTab,
-    executeMessage,
-    handleSubmit,
-    handleSuggestionClick,
-  }
-}
--- a/packages/browseros-agent/apps/agent/lib/constants/analyticsEvents.ts
+++ b/packages/browseros-agent/apps/agent/lib/constants/analyticsEvents.ts
@@ -29,48 +29,9 @@ export const CONVERSATION_RESET_EVENT = 'ui.conversation.reset'
 /** @public */
 export const AI_PROVIDER_ADDED_EVENT = 'settings.ai_provider.added'

-/** @public */
-export const CHATGPT_PRO_OAUTH_STARTED_EVENT =
-  'settings.chatgpt_pro.oauth_started'
-
-/** @public */
-export const CHATGPT_PRO_OAUTH_COMPLETED_EVENT =
-  'settings.chatgpt_pro.oauth_completed'
-
-/** @public */
-export const CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT =
-  'settings.chatgpt_pro.oauth_disconnected'
-
-/** @public */
-export const GITHUB_COPILOT_OAUTH_STARTED_EVENT =
-  'settings.github_copilot.oauth_started'
-
-/** @public */
-export const GITHUB_COPILOT_OAUTH_COMPLETED_EVENT =
-  'settings.github_copilot.oauth_completed'
-
-/** @public */
-export const GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT =
-  'settings.github_copilot.oauth_disconnected'
-
-/** @public */
-export const QWEN_CODE_OAUTH_STARTED_EVENT = 'settings.qwen_code.oauth_started'
-
-/** @public */
-export const QWEN_CODE_OAUTH_COMPLETED_EVENT =
-  'settings.qwen_code.oauth_completed'
-
-/** @public */
-export const QWEN_CODE_OAUTH_DISCONNECTED_EVENT =
-  'settings.qwen_code.oauth_disconnected'
-
 /** @public */
 export const HUB_PROVIDER_ADDED_EVENT = 'settings.hub_provider.added'

-/** @public */
-export const MCP_PROMO_BANNER_CLICKED_EVENT =
-  'settings.mcp_promo_banner.clicked'
-
 /** @public */
 export const MCP_EXTERNAL_ACCESS_ENABLED_EVENT =
  'settings.mcp_external_access.enabled'
@@ -157,21 +118,6 @@ export const NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT =
 /** @public */
 export const NEWTAB_CHAT_MODE_CHANGED_EVENT = 'newtab.chat.mode_changed'

-/** @public */
-export const NEWTAB_VOICE_RECORDING_STARTED_EVENT =
-  'newtab.voice.recording_started'
-
-/** @public */
-export const NEWTAB_VOICE_RECORDING_STOPPED_EVENT =
-  'newtab.voice.recording_stopped'
-
-/** @public */
-export const NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT =
-  'newtab.voice.transcription_completed'
-
-/** @public */
-export const NEWTAB_VOICE_ERROR_EVENT = 'newtab.voice.error'
-
 /** @public */
 export const WORKFLOW_DELETED_EVENT = 'settings.workflow.deleted'

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shivammittal274	d9e249bb23	fix: switch from chrome.storage.session to WXT local storage chrome.storage.session and its onChanged listener may not work reliably across all extension page contexts in BrowserOS. Switched to local storage with WXT's storage.defineItem and .watch() which are proven to work in this codebase (used by stopAgentStorage, searchActionsStorage, etc). Simpler: single map, WXT handles cross-context change notifications.	2026-03-19 00:48:29 +05:30
shivammittal274	9c949a3014	fix: stabilize follower watcher — prevent effect re-runs The linter had added [setMessages] as a dependency which caused the effect to tear down and re-setup on re-renders, creating windows where the storage watcher was disconnected. Fixed with empty deps array and biome-ignore — this effect must run exactly once on mount.	2026-03-19 00:44:21 +05:30
shivammittal274	ef2be606af	fix: follower adopts final messages when stream completes When the stream finishes (status: 'ready'), the follower now finds the completed stream by conversationId and calls setMessages() to adopt the final conversation. Previously it only searched for active streams, missed the completed one, and reverted to empty state.	2026-03-19 00:41:36 +05:30
shivammittal274	f29d596c6d	fix: simplify follower detection — no tab ID resolution needed The follower no longer tries to resolve its own tab ID via chrome.tabs.query (which returned the wrong tab when the agent had already moved on). Instead: any fresh side panel (zero messages) that opens during an active stream automatically follows it. This works because the background script only opens side panels on tabs from followerTabIds — so a fresh panel IS a follower.	2026-03-19 00:22:47 +05:30
shivammittal274	30178d6e07	fix: address review feedback — storage races, stale leader, null guard - Per-conversation storage keys: each leader writes its own `session:stream:<id>` key instead of a shared map, eliminating read-modify-write races for parallel agents. - Stale leader detection: follower schedules a re-check timer (STALE_THRESHOLD + 500ms) so it exits following mode even when the leader tab closes and stops writing. - Null guard: findStreamForTab is now async and reads storage internally, never receives a raw map that could be null. - Tab ID race: sequenced initial storage read after chrome.tabs.query resolves, so ownTabIdRef is set before the first follower check. - Added .catch() on all chrome.storage.session writes to surface quota errors.	2026-03-19 00:00:29 +05:30
shivammittal274	092003c90c	feat: multi-tab stream sync for agent side panel When the agent opens multiple tabs during a task, all tabs now show the same streaming conversation in their side panels instead of independent empty conversations. Server: framework.ts resolves tabId from structuredContent.pageId in addition to args.page, so new_page and new_hidden_page tools now get tabId in their output metadata. Client: leader panel extracts followerTabIds from tool output metadata and writes them to shared session storage (keyed by conversationId for parallel execution support). Background script watches for new followerTabIds and auto-opens side panels on those tabs. Follower panels detect their tab in the list and sync messages in real-time. Handles edge cases: follower opt-out on reset, stale leader detection (10s timeout), cleanup after completion, and stop signal forwarding.	2026-03-18 23:07:59 +05:30
				`@@ -1 +0,0 @@`
				<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>GithubCopilot</title><path d="M19.245 5.364c1.322 1.36 1.877 3.216 2.11 5.817.622 0 1.2.135 1.592.654l.73.964c.21.278.323.61.323.955v2.62c0 .339-.173.669-.453.868C20.239 19.602 16.157 21.5 12 21.5c-4.6 0-9.205-2.583-11.547-4.258-.28-.2-.452-.53-.453-.868v-2.62c0-.345.113-.679.321-.956l.73-.963c.392-.517.974-.654 1.593-.654l.029-.297c.25-2.446.81-4.213 2.082-5.52 2.461-2.54 5.71-2.851 7.146-2.864h.198c1.436.013 4.685.323 7.146 2.864zm-7.244 4.328c-.284 0-.613.016-.962.05-.123.447-.305.85-.57 1.108-1.05 1.023-2.316 1.18-2.994 1.18-.638 0-1.306-.13-1.851-.464-.516.165-1.012.403-1.044.996a65.882 65.882 0 00-.063 2.884l-.002.48c-.002.563-.005 1.126-.013 1.69.002.326.204.63.51.765 2.482 1.102 4.83 1.657 6.99 1.657 2.156 0 4.504-.555 6.985-1.657a.854.854 0 00.51-.766c.03-1.682.006-3.372-.076-5.053-.031-.596-.528-.83-1.046-.996-.546.333-1.212.464-1.85.464-.677 0-1.942-.157-2.993-1.18-.266-.258-.447-.661-.57-1.108-.32-.032-.64-.049-.96-.05zm-2.525 4.013c.539 0 .976.426.976.95v1.753c0 .525-.437.95-.976.95a.964.964 0 01-.976-.95v-1.752c0-.525.437-.951.976-.951zm5 0c.539 0 .976.426.976.95v1.753c0 .525-.437.95-.976.95a.964.964 0 01-.976-.95v-1.752c0-.525.437-.951.976-.951zM7.635 5.087c-1.05.102-1.935.438-2.385.906-.975 1.037-.765 3.668-.21 4.224.405.394 1.17.657 1.995.657h.09c.649-.013 1.785-.176 2.73-1.11.435-.41.705-1.433.675-2.47-.03-.834-.27-1.52-.63-1.813-.39-.336-1.275-.482-2.265-.394zm6.465.394c-.36.292-.6.98-.63 1.813-.03 1.037.24 2.06.675 2.47.968.957 2.136 1.104 2.776 1.11h.044c.825 0 1.59-.263 1.995-.657.555-.556.765-3.187-.21-4.224-.45-.468-1.335-.804-2.385-.906-.99-.088-1.875.058-2.265.394zM12 7.615c-.24 0-.525.015-.84.044.03.16.045.336.06.526l-.001.159a2.94 2.94 0 01-.014.25c.225-.022.425-.027.612-.028h.366c.187 0 .387.006.612.028-.015-.146-.015-.277-.015-.409.015-.19.03-.365.06-.526a9.29 9.29 0 00-.84-.044z"></path></svg>