feat: gate ChatGPT Pro and GitHub Copilot behind server version 0.0.77

Add CHATGPT_PRO_SUPPORT and GITHUB_COPILOT_SUPPORT feature flags gated
on minServerVersion 0.0.77. Hide template cards and provider type
dropdown options when the server doesn't support the OAuth endpoints.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.gitattributes

@@ -9,6 +9,4 @@ packages/browseros/chromium_patches/**/*.py linguist-generated
 scripts/*.py linguist-generated
 # Mark build directories as generated
 build/* linguist-generated
-# Mark eval/test framework as vendored so it's excluded from language stats
-packages/browseros-agent/apps/eval/** linguist-vendored
 docs/videos/** filter=lfs diff=lfs merge=lfs -text

.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

.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

.github/workflows/release-agent-extension.yml

@@ -1,148 +0,0 @@
-name: Release BrowserOS 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 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 Extension v${VERSION}." \
-            --base main \
-            --head "$BRANCH"
-
-          gh pr merge "$BRANCH" --squash --auto || true
-        working-directory: ${{ github.workspace }}

.github/workflows/release-agent-sdk.yml

@@ -1,27 +1,18 @@
-name: Release BrowserOS Agent SDK
+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 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 Agent SDK v${VERSION}." \
-            --base main \
-            --head "$BRANCH"
-
-          gh pr merge "$BRANCH" --squash --auto || true
-        working-directory: ${{ github.workspace }}

.github/workflows/release-cli.yml

@@ -1,161 +0,0 @@
-name: Release BrowserOS 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
-    environment: release-core
-    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
-
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: "1.3.6"
-
-      - name: Run tests
-        run: make test
-
-      - name: Run vet
-        run: make vet
-
-      - name: Build all platforms
-        run: make release VERSION=${{ inputs.version }} POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}
-
-      - name: Install dependencies
-        run: bun install
-        working-directory: packages/browseros-agent
-
-      - name: Upload to CDN
-        env:
-          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
-          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
-          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          R2_BUCKET: ${{ secrets.R2_BUCKET }}
-          R2_UPLOAD_PREFIX: cli
-          CLI_VERSION: ${{ inputs.version }}
-        run: |
-          bun scripts/build/cli.ts \
-            --release \
-            --version "$CLI_VERSION" \
-            --binaries-dir apps/cli/dist
-        working-directory: packages/browseros-agent
-
-      - 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`
-
-          ### npm / npx
-
-          ```bash
-          npx browseros-cli --help
-          npm install -g 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 }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Publish to npm
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          make npm-version VERSION=${{ inputs.version }}
-          cd npm
-          npm publish --access public

.github/workflows/release-server.yml

@@ -1,147 +0,0 @@
-name: Release BrowserOS Server
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Release version (e.g. 0.0.80)"
-        required: true
-        type: string
-
-concurrency:
-  group: release-server
-  cancel-in-progress: false
-
-jobs:
-  release:
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    environment: release-core
-    permissions:
-      contents: write
-    defaults:
-      run:
-        working-directory: packages/browseros-agent
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: "1.3.6"
-
-      - name: Install dependencies
-        run: bun ci
-
-      - name: Prepare production env file
-        run: cp apps/server/.env.production.example apps/server/.env.production
-
-      - name: Validate version
-        id: version
-        env:
-          REQUESTED_VERSION: ${{ inputs.version }}
-        run: |
-          PACKAGE_VERSION=$(node -p "require('./apps/server/package.json').version")
-          echo "package_version=$PACKAGE_VERSION" >> "$GITHUB_OUTPUT"
-          echo "release_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-
-          if [ "$PACKAGE_VERSION" != "$REQUESTED_VERSION" ]; then
-            echo "Requested version $REQUESTED_VERSION does not match apps/server/package.json ($PACKAGE_VERSION)"
-            exit 1
-          fi
-
-      - name: Build release artifacts
-        run: bun run build:server:ci
-
-      - name: Verify release artifacts
-        run: |
-          mapfile -t ZIP_FILES < <(find dist/prod/server -maxdepth 1 -type f -name 'browseros-server-resources-*.zip' | sort)
-
-          if [ "${#ZIP_FILES[@]}" -eq 0 ]; then
-            echo "No server release zip files were produced"
-            exit 1
-          fi
-
-          printf 'Found release artifacts:\n%s\n' "${ZIP_FILES[@]}"
-
-      - name: Generate release notes
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PACKAGE_VERSION: ${{ steps.version.outputs.package_version }}
-        run: |
-          SERVER_APP_PATH="packages/browseros-agent/apps/server"
-          SERVER_BUILD_DIR="packages/browseros-agent/scripts/build/server"
-          SERVER_BUILD_ENTRY="packages/browseros-agent/scripts/build/server.ts"
-          SERVER_RESOURCE_MANIFEST="packages/browseros-agent/scripts/build/config/server-prod-resources.json"
-          SERVER_WORKSPACE_PKG="packages/browseros-agent/package.json"
-          CURRENT_TAG="browseros-server-v$PACKAGE_VERSION"
-          PREV_TAG=$(git tag -l "browseros-server-v*" --sort=-v:refname | grep -v "^${CURRENT_TAG}$" | head -n 1)
-
-          if [ -z "$PREV_TAG" ]; then
-            echo "Initial release of browseros-server." > /tmp/release-notes.md
-          else
-            COMMITS=$(git log "$PREV_TAG"..HEAD --pretty=format:"%H" -- \
-              "$SERVER_APP_PATH" \
-              "$SERVER_BUILD_DIR" \
-              "$SERVER_BUILD_ENTRY" \
-              "$SERVER_RESOURCE_MANIFEST" \
-              "$SERVER_WORKSPACE_PKG")
-
-            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)
-
-                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 }}
-          PACKAGE_VERSION: ${{ steps.version.outputs.package_version }}
-          RELEASE_SHA: ${{ steps.version.outputs.release_sha }}
-        run: |
-          TAG="browseros-server-v$PACKAGE_VERSION"
-          TITLE="BrowserOS Server - v$PACKAGE_VERSION"
-          mapfile -t ZIP_FILES < <(find packages/browseros-agent/dist/prod/server -maxdepth 1 -type f -name 'browseros-server-resources-*.zip' | sort)
-
-          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
-            echo "Tag $TAG already exists, skipping tag creation"
-          else
-            git tag -a "$TAG" -m "browseros-server v$PACKAGE_VERSION" "$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" "${ZIP_FILES[@]}" --clobber
-          else
-            gh release create "$TAG" \
-              --title "$TITLE" \
-              --notes-file /tmp/release-notes.md \
-              "${ZIP_FILES[@]}"
-          fi
-        working-directory: ${{ github.workspace }}

.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

.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-  "terminal.integrated.tabs.title": "${sequence} ${process}",
-  "terminal.integrated.tabs.description": "${cwd}"
-}

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).
 
-Copyright &copy; 2026 Felafax, Inc.
+## 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>
+
+

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",

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 |

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.

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.

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.

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>

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>

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>

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

packages/browseros-agent/CLAUDE.md

@@ -32,7 +32,7 @@ Use **kebab-case** for all file and folder names:
 | Multi-word files | kebab-case | `gemini-agent.ts`, `mcp-context.ts` |
 | Single-word files | lowercase | `types.ts`, `browser.ts`, `index.ts` |
 | Test files | `.test.ts` suffix | `mcp-context.test.ts` |
-| Folders | kebab-case | `rate-limiter/`, `browser-tools/` |
+| Folders | kebab-case | `controller-server/`, `rate-limiter/` |
 
 Classes remain PascalCase in code, but live in kebab-case files:
 ```typescript
@@ -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
@@ -97,16 +94,21 @@ The main MCP server that exposes browser automation tools via HTTP/SSE.
 
 **Key components:**
 - `src/tools/` - MCP tool definitions, split into:
-  - `cdp-based/` - Tools using Chrome DevTools Protocol (navigation, DOM interaction, network, console, emulation, input, etc.)
+  - `cdp-based/` - Tools using Chrome DevTools Protocol (network, console, emulation, input, etc.)
+  - `controller-based/` - Tools using the browser extension (navigation, clicks, screenshots, tabs, history, bookmarks)
+- `src/controller-server/` - WebSocket server that bridges to the browser extension
+  - `ControllerBridge` handles WebSocket connections with extension clients
+  - `ControllerContext` wraps the bridge for tool handlers
 - `src/common/` - Shared utilities (McpContext, PageCollector, browser connection, identity, db)
 - `src/agent/` - AI agent functionality (Gemini adapter, rate limiting, session management)
 - `src/http/` - Hono HTTP server with MCP, health, and provider routes
 
 **Tool types:**
 - CDP tools require a direct CDP connection (`--cdp-port`)
+- Controller tools work via the browser extension over WebSocket
 
 ### Shared (`packages/shared`)
-Shared constants, types, and configuration used across packages. Avoids magic numbers.
+Shared constants, types, and configuration used by both server and extension. Avoids magic numbers.
 
 **Structure:**
 - `src/constants/` - Configuration values (ports, timeouts, limits, urls, paths)
@@ -114,12 +116,22 @@ Shared constants, types, and configuration used across packages. Avoids magic nu
 
 **Exports:** `@browseros/shared/constants/*`, `@browseros/shared/types/*`
 
+### Controller Extension (`apps/controller-ext`)
+Chrome extension that receives commands from the server via WebSocket.
+
+**Entry point:** `src/background/index.ts` → `BrowserOSController`
+
+**Structure:**
+- `src/actions/` - Action handlers organized by domain (browser/, tab/, bookmark/, history/)
+- `src/adapters/` - Chrome API adapters (TabAdapter, BookmarkAdapter, HistoryAdapter)
+- `src/websocket/` - WebSocket client that connects to the server
+
 ### Communication Flow
 
 ```
 AI Agent/MCP Client → HTTP Server (Hono) → Tool Handler
                                               ↓
-                                   CDP → BrowserOS / Chrome APIs
+                        CDP (direct) ←── or ──→ WebSocket → Extension → Chrome APIs
 ```
 
 ## Creating Packages

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,29 +10,24 @@ 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 |
-| `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
 
 - `apps/server`: Bun server which contains the agent loop and tools.
 - `apps/agent`: Agent UI (Chrome extension).
+- `apps/controller-ext`: BrowserOS Controller - a Chrome extension that bridges `chrome.*` APIs to the server. Controller tools within the server communicate with this extension via WebSocket.
 
 ```
 ┌──────────────────────────────────────────────────────────────────────────┐
@@ -48,19 +45,19 @@ packages/
 │   /health ─── Health check                                               │
 │                                                                          │
 │   Tools:                                                                 │
-│   └── CDP-backed browser tools (tabs, navigation, input, screenshots,   │
-│       bookmarks, history, console, DOM, tab groups, windows, ...)       │
+│   ├── CDP Tools (console, network, input, screenshot, ...)              │
+│   └── Controller Tools (tabs, navigation, clicks, bookmarks, history)   │
 └──────────────────────────────────────────────────────────────────────────┘
-                                    │
-                                    │ CDP (client)
-                                    ▼
-                         ┌─────────────────────┐
-                         │   Chromium CDP      │
-                         │  (cdpPort: 9000)    │
-                         │                     │
-                         │ Server connects     │
-                         │ TO this as client   │
-                         └─────────────────────┘
+          │                                         │
+          │ CDP (client)                            │ WebSocket (server)
+          ▼                                         ▼
+┌─────────────────────┐              ┌─────────────────────────────────────┐
+│   Chromium CDP      │              │   BrowserOS Controller Extension    │
+│  (cdpPort: 9000)    │              │     (extensionPort: 9300)           │
+│                     │              │                                     │
+│ Server connects     │              │ Bridges chrome.tabs, chrome.history │
+│ TO this as client   │              │ chrome.bookmarks to the server      │
+└─────────────────────┘              └─────────────────────────────────────┘
 ```
 
 ### Ports
@@ -69,7 +66,7 @@ packages/
 |------|--------------|---------|
 | 9100 | `BROWSEROS_SERVER_PORT` | HTTP server - MCP endpoints, agent chat, health |
 | 9000 | `BROWSEROS_CDP_PORT` | Chromium CDP server (BrowserOS Server connects as client) |
-| 9300 | `BROWSEROS_EXTENSION_PORT` | Legacy BrowserOS launch arg kept for compatibility; not used by the server |
+| 9300 | `BROWSEROS_EXTENSION_PORT` | WebSocket server for controller extension |
 
 ## Development
 
@@ -93,8 +90,9 @@ process-compose up
 
 The `process-compose up` command runs the following in order:
 1. `bun install` — installs dependencies
-2. `bun --cwd apps/agent codegen` — generates agent code
-3. `bun --cwd apps/server start` and `bun --cwd apps/agent dev` — starts server and agent in parallel
+2. `bun --cwd apps/controller-ext build` — builds the controller extension
+3. `bun --cwd apps/agent codegen` — generates agent code
+4. `bun --cwd apps/server start` and `bun --cwd apps/agent dev` — starts server and agent in parallel
 
 ### Environment Variables
 
@@ -110,7 +108,7 @@ Runtime uses `.env.development`, while production artifact builds use `.env.prod
 |----------|---------|-------------|
 | `BROWSEROS_SERVER_PORT` | 9100 | HTTP server port (MCP, chat, health) |
 | `BROWSEROS_CDP_PORT` | 9000 | Chromium CDP port (server connects as client) |
-| `BROWSEROS_EXTENSION_PORT` | 9300 | Legacy BrowserOS launch arg kept for compatibility |
+| `BROWSEROS_EXTENSION_PORT` | 9300 | WebSocket port for controller extension |
 | `BROWSEROS_CONFIG_URL` | - | Remote config endpoint for rate limits |
 | `BROWSEROS_INSTALL_ID` | - | Unique installation identifier (analytics) |
 | `BROWSEROS_CLIENT_ID` | - | Client identifier (analytics) |
@@ -142,7 +140,7 @@ Copy from `apps/server/.env.production.example` before running `build:server`.
 |----------|---------|-------------|
 | `BROWSEROS_SERVER_PORT` | 9100 | Passed to BrowserOS via CLI args |
 | `BROWSEROS_CDP_PORT` | 9000 | Passed to BrowserOS via CLI args |
-| `BROWSEROS_EXTENSION_PORT` | 9300 | Legacy BrowserOS CLI arg still passed for compatibility |
+| `BROWSEROS_EXTENSION_PORT` | 9300 | Passed to BrowserOS via CLI args |
 | `VITE_BROWSEROS_SERVER_PORT` | 9100 | Agent UI connects to server (must match `BROWSEROS_SERVER_PORT`) |
 | `BROWSEROS_BINARY` | - | Path to BrowserOS binary |
 | `USE_BROWSEROS_BINARY` | true | Use BrowserOS instead of default Chrome |
@@ -159,13 +157,15 @@ bun run start:server          # Start the server
 bun run start:agent           # Start agent extension (dev mode)
 
 # Build
-bun run build                 # Build server and agent
+bun run build                 # Build server, agent, and controller extension
 bun run build:server          # Build production server resource artifacts and upload zips to R2
 bun run build:agent           # Build agent extension
+bun run build:ext             # Build controller extension
 
 # Test
 bun run test                  # Run standard tests
 bun run test:cdp              # Run CDP-based tests
+bun run test:controller       # Run controller-based tests
 bun run test:integration      # Run integration tests
 
 # Quality

packages/browseros-agent/apps/agent/CHANGELOG.md

@@ -1,19 +0,0 @@
-# BrowserOS Agent Extension
-
-## v0.0.98 (2026-03-27)
-
-## What's Changed
-
-- chore: update agent version (#608)
-- chore: fix version number for extension (#606)
-- fix: improve chat history freshness and reduce query payload (#598)
-- feat: isolate new-tab agent navigation from origin tab (#593)
-- docs: overhaul READMEs across all major packages (#594)
-- fix(ui): resolve MCP promo banner dismiss button overlapping with text (#581)
-- docs: update agent extension changelog for v0.0.52 (#573)
-
-
-## v0.0.52 (2026-03-26)
-
-Initial release
-

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 |

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>
           ) : (

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>

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>
-  )
-}

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',

packages/browseros-agent/apps/agent/entrypoints/app/App.tsx

@@ -28,7 +28,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 } {
@@ -104,7 +103,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>
 

packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/AISettingsPage.tsx

@@ -1,5 +1,5 @@
 import { useQueryClient } from '@tanstack/react-query'
-import { type FC, useMemo, useState } from 'react'
+import { type FC, useEffect, useMemo, useRef, useState } from 'react'
 import { toast } from 'sonner'
 import {
   AlertDialog,
@@ -20,25 +20,21 @@ import {
   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'
 import { useGraphqlQuery } from '@/lib/graphql/useGraphqlQuery'
-import type { ProviderTemplate } from '@/lib/llm-providers/providerTemplates'
+import {
+  getProviderTemplate,
+  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 { useOAuthStatus } from '@/lib/llm-providers/useOAuthStatus'
 import { track } from '@/lib/metrics/track'
 import { ConfiguredProvidersList } from './ConfiguredProvidersList'
-import { DeviceCodeDialog } from './DeviceCodeDialog'
 import {
   DeleteRemoteLlmProviderDocument,
   GetRemoteLlmProvidersDocument,
@@ -46,51 +42,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 +91,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,57 +114,100 @@ 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,
-  )
+  // OAuth status for ChatGPT Plus/Pro
+  const {
+    status: chatgptProStatus,
+    startPolling: startChatGPTProPolling,
+    disconnect: disconnectChatGPTPro,
+  } = useOAuthStatus('chatgpt-pro')
 
-  const activeDeviceCode =
-    chatgptPro.pendingDeviceCode ??
-    copilot.pendingDeviceCode ??
-    qwenCode.pendingDeviceCode
-  const clearActiveDeviceCode = () => {
-    chatgptPro.clearDeviceCode()
-    copilot.clearDeviceCode()
-    qwenCode.clearDeviceCode()
-  }
+  // OAuth status for GitHub Copilot
+  const {
+    status: copilotStatus,
+    startPolling: startCopilotPolling,
+    disconnect: disconnectCopilot,
+  } = useOAuthStatus('github-copilot')
 
-  const oauthFlows: Record<
-    string,
-    {
-      startOAuthFlow: (url: string | undefined) => Promise<void>
-      disconnect: () => Promise<void>
-      disconnectedEvent: string
+  // Track whether user explicitly started an OAuth flow this session
+  const oauthFlowStartedRef = useRef(false)
+  const copilotOAuthStartedRef = useRef(false)
+
+  // Auto-create provider only when user actively completed OAuth,
+  // not on passive page load when server has old tokens
+  // biome-ignore lint/correctness/useExhaustiveDependencies: intentional — only trigger on auth status change
+  useEffect(() => {
+    if (!chatgptProStatus?.authenticated) return
+    if (!oauthFlowStartedRef.current) return
+
+    const exists = providers.some((p) => p.type === 'chatgpt-pro')
+    if (exists) return
+
+    const now = Date.now()
+    try {
+      const template = getProviderTemplate('chatgpt-pro')
+      saveProvider({
+        id: `chatgpt-pro-${now}`,
+        type: 'chatgpt-pro',
+        name: `ChatGPT Plus/Pro${chatgptProStatus.email ? ` (${chatgptProStatus.email})` : ''}`,
+        modelId: template?.defaultModelId ?? 'gpt-5.3-codex',
+        supportsImages: template?.supportsImages ?? true,
+        contextWindow: template?.contextWindow ?? 400000,
+        temperature: 0.2,
+        createdAt: now,
+        updatedAt: now,
+      })
+      track(CHATGPT_PRO_OAUTH_COMPLETED_EVENT, {
+        email: chatgptProStatus.email,
+      })
+      toast.success('ChatGPT Plus/Pro Connected', {
+        description: chatgptProStatus.email
+          ? `Authenticated as ${chatgptProStatus.email}`
+          : 'Successfully authenticated with ChatGPT Plus/Pro',
+      })
+    } catch (err) {
+      toast.error('Failed to create ChatGPT Plus/Pro provider', {
+        description: err instanceof Error ? err.message : 'Unknown error',
+      })
+    } finally {
+      oauthFlowStartedRef.current = false
     }
-  > = {
-    '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,
-    },
-  }
+  }, [chatgptProStatus?.authenticated])
+
+  // Auto-create GitHub Copilot provider on successful OAuth
+  // biome-ignore lint/correctness/useExhaustiveDependencies: intentional — only trigger on auth status change
+  useEffect(() => {
+    if (!copilotStatus?.authenticated) return
+    if (!copilotOAuthStartedRef.current) return
+
+    const exists = providers.some((p) => p.type === 'github-copilot')
+    if (exists) return
+
+    const now = Date.now()
+    try {
+      const template = getProviderTemplate('github-copilot')
+      saveProvider({
+        id: `github-copilot-${now}`,
+        type: 'github-copilot',
+        name: 'GitHub Copilot',
+        modelId: template?.defaultModelId ?? 'gpt-4o',
+        supportsImages: template?.supportsImages ?? true,
+        contextWindow: template?.contextWindow ?? 128000,
+        temperature: 0.2,
+        createdAt: now,
+        updatedAt: now,
+      })
+      track(GITHUB_COPILOT_OAUTH_COMPLETED_EVENT)
+      toast.success('GitHub Copilot Connected', {
+        description: 'Successfully authenticated with GitHub Copilot',
+      })
+    } catch (err) {
+      toast.error('Failed to create GitHub Copilot provider', {
+        description: err instanceof Error ? err.message : 'Unknown error',
+      })
+    } finally {
+      copilotOAuthStartedRef.current = false
+    }
+  }, [copilotStatus?.authenticated])
 
   const handleAddProvider = () => {
     setTemplateValues(undefined)
@@ -216,10 +215,13 @@ export const AISettingsPage: FC = () => {
   }
 
   const handleUseTemplate = (template: ProviderTemplate) => {
-    // OAuth providers: trigger OAuth flow
-    const oauthFlow = oauthFlows[template.id]
-    if (oauthFlow) {
-      oauthFlow.startOAuthFlow(agentServerUrl ?? undefined)
+    // OAuth providers: trigger OAuth flow instead of opening form dialog
+    if (template.id === 'chatgpt-pro') {
+      handleStartChatGPTProOAuth()
+      return
+    }
+    if (template.id === 'github-copilot') {
+      handleStartGitHubCopilotOAuth()
       return
     }
 
@@ -235,6 +237,68 @@ export const AISettingsPage: FC = () => {
     setIsNewDialogOpen(true)
   }
 
+  const handleStartChatGPTProOAuth = () => {
+    if (!agentServerUrl) {
+      toast.error('Server not available', {
+        description: 'Cannot start OAuth flow without server connection.',
+      })
+      return
+    }
+    oauthFlowStartedRef.current = true
+
+    const extensionSettingsUrl = chrome.runtime.getURL('app.html#/ai-settings')
+    const startUrl = `${agentServerUrl}/oauth/chatgpt-pro/start?redirect=${encodeURIComponent(extensionSettingsUrl)}`
+    window.open(startUrl, '_blank')
+
+    // Start polling for OAuth completion
+    startChatGPTProPolling()
+    track(CHATGPT_PRO_OAUTH_STARTED_EVENT)
+    toast.info('Authenticating with ChatGPT Plus/Pro', {
+      description: 'Complete the login in the opened tab.',
+    })
+  }
+
+  const handleStartGitHubCopilotOAuth = async () => {
+    if (!agentServerUrl) {
+      toast.error('Server not available', {
+        description: 'Cannot start OAuth flow without server connection.',
+      })
+      return
+    }
+    copilotOAuthStartedRef.current = true
+
+    try {
+      // Device Code flow: get user code from server, then open GitHub
+      const res = await fetch(`${agentServerUrl}/oauth/github-copilot/start`)
+      if (!res.ok) throw new Error(`Server returned ${res.status}`)
+
+      const data = (await res.json()) as {
+        userCode?: string
+        verificationUri?: string
+      }
+
+      if (!data.userCode || !data.verificationUri) {
+        throw new Error('Invalid response from server')
+      }
+
+      // Open GitHub device verification page
+      window.open(data.verificationUri, '_blank')
+
+      // Start polling for completion
+      startCopilotPolling()
+      track(GITHUB_COPILOT_OAUTH_STARTED_EVENT)
+      toast.info(`Enter code: ${data.userCode}`, {
+        description: 'Paste this code on the GitHub page that just opened.',
+        duration: 60_000,
+      })
+    } catch (err) {
+      copilotOAuthStartedRef.current = false
+      toast.error('Failed to start GitHub Copilot authentication', {
+        description: err instanceof Error ? err.message : 'Unknown error',
+      })
+    }
+  }
+
   const handleEditProvider = (provider: LlmProviderConfig) => {
     setEditingProvider(provider)
     setIsEditDialogOpen(true)
@@ -245,18 +309,20 @@ 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) {
+      // Clear OAuth tokens on server for OAuth-based providers
+      if (providerToDelete.type === 'chatgpt-pro') {
+        await disconnectChatGPTPro()
+        track(CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT)
+      }
+      if (providerToDelete.type === 'github-copilot') {
+        await disconnectCopilot()
+        track(GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT)
+      }
+      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 +425,6 @@ export const AISettingsPage: FC = () => {
         onAddProvider={handleAddProvider}
       />
 
-      <McpPromoBanner />
-
       <ProviderTemplatesSection onUseTemplate={handleUseTemplate} />
 
       <ConfiguredProvidersList
@@ -435,11 +499,6 @@ export const AISettingsPage: FC = () => {
           </AlertDialogFooter>
         </AlertDialogContent>
       </AlertDialog>
-
-      <DeviceCodeDialog
-        deviceCode={activeDeviceCode}
-        onClose={clearActiveDeviceCode}
-      />
     </div>
   )
 }

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>
-  )
-}

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>
-  )
-}

packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/NewProviderDialog.tsx

@@ -1,26 +1,10 @@
 import { zodResolver } from '@hookform/resolvers/zod'
-import Fuse from 'fuse.js'
-import {
-  Check,
-  CheckCircle2,
-  ChevronDown,
-  ExternalLink,
-  Loader2,
-  XCircle,
-} from 'lucide-react'
-import { type FC, useEffect, useMemo, 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'
 import { Checkbox } from '@/components/ui/checkbox'
-import {
-  Command,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-  CommandList,
-} from '@/components/ui/command'
 import {
   Dialog,
   DialogContent,
@@ -39,11 +23,6 @@ import {
   FormMessage,
 } from '@/components/ui/form'
 import { Input } from '@/components/ui/input'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@/components/ui/popover'
 import {
   Select,
   SelectContent,
@@ -56,10 +35,8 @@ import { useAgentServerUrl } from '@/lib/browseros/useBrowserOSProviders'
 import { useCapabilities } from '@/lib/browseros/useCapabilities'
 import {
   AI_PROVIDER_ADDED_EVENT,
-  AI_PROVIDER_UPDATED_EVENT,
   KIMI_API_KEY_CONFIGURED_EVENT,
   KIMI_API_KEY_GUIDE_CLICKED_EVENT,
-  MODEL_SELECTED_EVENT,
 } from '@/lib/constants/analyticsEvents'
 import { useKimiLaunch } from '@/lib/feature-flags/useKimiLaunch'
 import {
@@ -70,8 +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 } from './models'
+import { getModelContextLength, getModelOptions } from './models'
 
 const providerTypeEnum = z.enum([
   'moonshot',
@@ -87,7 +63,6 @@ const providerTypeEnum = z.enum([
   'browseros',
   'chatgpt-pro',
   'github-copilot',
-  'qwen-code',
 ])
 
 /**
@@ -158,11 +133,7 @@ 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'
-    ) {
+    else if (data.type === 'chatgpt-pro' || data.type === 'github-copilot') {
       // No validation needed — OAuth tokens are on the server
     }
     // Other providers: require baseUrl
@@ -187,13 +158,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}`
-}
-
 /**
  * Props for NewProviderDialog
  * @public
@@ -219,10 +183,9 @@ 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 [modelPickerOpen, setModelPickerOpen] = useState(false)
-  const [modelSearch, setModelSearch] = useState('')
   const { supports } = useCapabilities()
   const { baseUrl: agentServerUrl } = useAgentServerUrl()
   const kimiLaunch = useKimiLaunch()
@@ -232,7 +195,6 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
       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') {
@@ -293,21 +255,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
     watchedSessionToken,
   ])
 
-  const modelInfoList = getModelsForProvider(watchedType as ProviderType)
-
-  const modelFuse = useMemo(
-    () =>
-      new Fuse(modelInfoList, {
-        keys: ['modelId'],
-        threshold: 0.4,
-        distance: 100,
-      }),
-    [modelInfoList],
-  )
-
-  const filteredModels = modelSearch
-    ? modelFuse.search(modelSearch).map((r) => r.item)
-    : modelInfoList
+  // 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) => {
@@ -317,13 +266,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,
@@ -334,6 +284,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) {
@@ -358,6 +319,7 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
         reasoningEffort: initialValues.reasoningEffort || 'high',
         reasoningSummary: initialValues.reasoningSummary || 'auto',
       })
+      setIsCustomModel(false)
     }
   }, [initialValues, form])
 
@@ -384,6 +346,7 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
         reasoningEffort: 'high',
         reasoningSummary: 'auto',
       })
+      setIsCustomModel(false)
     }
     // Clear test result when dialog opens/closes
     setTestResult(null)
@@ -404,11 +367,6 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
         provider_type: values.type,
         model: values.modelId,
       })
-    } else {
-      track(AI_PROVIDER_UPDATED_EVENT, {
-        provider_type: values.type,
-        model: values.modelId,
-      })
     }
     if (values.type === 'moonshot') {
       track(KIMI_API_KEY_CONFIGURED_EVENT, {
@@ -425,11 +383,7 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
     if (!watchedModelId) return false
 
     // OAuth providers: always testable (server has the OAuth token)
-    if (
-      watchedType === 'chatgpt-pro' ||
-      watchedType === 'github-copilot' ||
-      watchedType === 'qwen-code'
-    )
+    if (watchedType === 'chatgpt-pro' || watchedType === 'github-copilot')
       return true
 
     if (watchedType === 'azure') {
@@ -513,12 +467,11 @@ 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'
+    // GitHub Copilot: OAuth credentials only
+    if (watchedType === 'github-copilot') {
       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.
+          Credentials are managed via GitHub OAuth. No API key needed.
         </div>
       )
     }
@@ -847,110 +800,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>
-                  ) : (
-                    <Popover
-                      open={modelPickerOpen}
-                      onOpenChange={(isOpen) => {
-                        setModelPickerOpen(isOpen)
-                        if (!isOpen) setModelSearch('')
-                      }}
-                    >
-                      <PopoverTrigger asChild>
-                        <button
+                  {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"
-                          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',
-                          )}
+                          variant="link"
+                          size="sm"
+                          className="h-auto p-0 text-xs"
+                          onClick={() => setIsCustomModel(false)}
                         >
-                          <span className="truncate">
-                            {field.value || 'Select a model...'}
-                          </span>
-                          <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                        </button>
-                      </PopoverTrigger>
-                      <PopoverContent
-                        className="w-[var(--radix-popover-trigger-width)] p-0"
-                        align="start"
-                      >
-                        <Command shouldFilter={false}>
-                          <CommandInput
-                            placeholder="Search models..."
-                            value={modelSearch}
-                            onValueChange={setModelSearch}
-                            onKeyDown={(e) => {
-                              if (
-                                e.key === 'Enter' &&
-                                modelSearch &&
-                                filteredModels.length === 0
-                              ) {
-                                e.preventDefault()
-                                form.setValue('modelId', modelSearch)
-                                track(MODEL_SELECTED_EVENT, {
-                                  provider_type: watchedType,
-                                  model_id: modelSearch,
-                                  is_custom_model: true,
-                                })
-                                setModelPickerOpen(false)
-                                setModelSearch('')
-                              }
-                            }}
-                          />
-                          <CommandList>
-                            <CommandEmpty>
-                              No models found. Press Enter to use &quot;
-                              {modelSearch}&quot;
-                            </CommandEmpty>
-                            <CommandGroup>
-                              {filteredModels.map((model) => (
-                                <CommandItem
-                                  key={model.modelId}
-                                  value={model.modelId}
-                                  onSelect={() => {
-                                    form.setValue('modelId', model.modelId)
-                                    track(MODEL_SELECTED_EVENT, {
-                                      provider_type: watchedType,
-                                      model_id: model.modelId,
-                                      context_window: model.contextLength,
-                                      is_custom_model: false,
-                                    })
-                                    setModelPickerOpen(false)
-                                    setModelSearch('')
-                                  }}
-                                >
-                                  <span className="flex-1 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>
-                                  {field.value === model.modelId && (
-                                    <Check className="ml-2 h-4 w-4 shrink-0" />
-                                  )}
-                                </CommandItem>
-                              ))}
-                            </CommandGroup>
-                          </CommandList>
-                        </Command>
-                      </PopoverContent>
-                    </Popover>
+                          ← Back to model list
+                        </Button>
+                      )}
+                    </>
+                  ) : (
+                    <Select
+                      onValueChange={handleModelChange}
+                      value={field.value}
+                    >
+                      <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>

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}

packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/ProviderTemplatesSection.tsx

@@ -30,7 +30,6 @@ export const ProviderTemplatesSection: FC<ProviderTemplatesSectionProps> = ({
       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 +57,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>

packages/browseros-agent/apps/agent/entrypoints/app/ai-settings/models.ts

@@ -1,21 +1,97 @@
-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 }],
+/**
+ * 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[]
+  'chatgpt-pro': ModelInfo[]
+  'github-copilot': 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.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 },
+  ],
   'openai-compatible': [],
-  ollama: [],
+  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 }],
   'chatgpt-pro': [
     { modelId: 'gpt-5.4', contextLength: 400000 },
     { modelId: 'gpt-5.3-codex', contextLength: 400000 },
@@ -26,31 +102,53 @@ const CUSTOM_PROVIDER_MODELS: Partial<Record<ProviderType, ModelInfo[]>> = {
     { modelId: 'gpt-5.1-codex-mini', contextLength: 400000 },
     { modelId: 'gpt-5.1', contextLength: 200000 },
   ],
-  '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 },
+  'github-copilot': [
+    // Free tier (unlimited with Pro)
+    { modelId: 'gpt-5-mini', contextLength: 128000 },
+    { modelId: 'claude-haiku-4.5', contextLength: 128000 },
+    { modelId: 'gpt-4o', contextLength: 64000 },
+    { modelId: 'gpt-4.1', contextLength: 64000 },
+    // Premium models (Pro: 300/mo, Pro+: 1500/mo)
+    { modelId: 'claude-sonnet-4.6', contextLength: 128000 },
+    { modelId: 'claude-sonnet-4.5', contextLength: 128000 },
+    { modelId: 'claude-sonnet-4', contextLength: 128000 },
+    { modelId: 'claude-opus-4.6', contextLength: 128000 },
+    { modelId: 'claude-opus-4.5', contextLength: 128000 },
+    { modelId: 'gemini-2.5-pro', contextLength: 128000 },
+    { modelId: 'gemini-3-pro-preview', contextLength: 128000 },
+    { modelId: 'gemini-3-flash-preview', contextLength: 128000 },
+    { modelId: 'gemini-3.1-pro-preview', contextLength: 128000 },
+    { modelId: 'gpt-5.4', contextLength: 272000 },
+    { modelId: 'gpt-5.4-mini', contextLength: 128000 },
+    { modelId: 'gpt-5.3-codex', contextLength: 272000 },
+    { modelId: 'gpt-5.2-codex', contextLength: 272000 },
+    { modelId: 'gpt-5.2', contextLength: 128000 },
+    { modelId: 'gpt-5.1-codex', contextLength: 128000 },
+    { modelId: 'gpt-5.1-codex-max', contextLength: 128000 },
+    { modelId: 'gpt-5.1', contextLength: 128000 },
+    { modelId: 'grok-code-fast-1', contextLength: 128000 },
   ],
 }
 
-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 +157,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)
+}

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.',

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 })
     }

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>

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}

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>
-  )
-}

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)
     }

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>
-  )
-}

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.',

packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTab.tsx

@@ -5,11 +5,8 @@ import {
   Folder,
   Globe,
   Layers,
-  Loader2,
-  Mic,
   PlugZap,
   Search,
-  Square,
   X,
 } from 'lucide-react'
 import { AnimatePresence, motion } from 'motion/react'
@@ -47,10 +44,6 @@ import {
   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'
@@ -60,7 +53,6 @@ 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'
@@ -108,36 +100,6 @@ export const NewTab = () => {
   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 connectedManagedServers = mcpServers.filter((s) => {
     if (s.type !== 'managed' || !s.managedServerName) return false
     return userMCPIntegrations?.integrations?.find(
@@ -468,89 +430,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

packages/browseros-agent/apps/agent/entrypoints/newtab/index/NewTabChat.tsx

@@ -169,15 +169,8 @@ 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">

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}
     />
   )
 }

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" />

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
           }

packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/Chat.tsx

@@ -36,7 +36,6 @@ export const Chat = () => {
     stop,
     agentUrlError,
     chatError,
-    selectedProvider,
     getActionForMessage,
     liked,
     onClickLike,
@@ -224,15 +223,8 @@ 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

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

packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/ChatHeader.tsx

@@ -3,27 +3,11 @@ 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[]
@@ -77,7 +61,6 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
             </span>
           </button>
         </ChatProviderSelector>
-        {selectedProvider.type === 'browseros' && <CreditsBadgeWrapper />}
       </div>
 
       <div className="flex items-center gap-1">

packages/browseros-agent/apps/agent/entrypoints/sidepanel/index/useChatSession.ts

@@ -21,7 +21,6 @@ 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'
@@ -76,6 +75,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 +86,6 @@ export const useChatSession = (options?: ChatSessionOptions) => {
     selectedLlmProvider,
     isLoadingProviders,
   } = useChatRefs()
-  const invalidateCredits = useInvalidateCredits()
 
   const { providers: llmProviders, setDefaultProvider } = useLlmProviders()
 
@@ -342,8 +342,12 @@ export const useChatSession = (options?: ChatSessionOptions) => {
             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,
@@ -477,14 +481,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<{
@@ -561,11 +559,9 @@ export const useChatSession = (options?: ChatSessionOptions) => {
   }, [])
 
   const handleSelectProvider = (provider: Provider) => {
-    const fullProvider = llmProviders.find((p) => p.id === provider.id)
     track(PROVIDER_SELECTED_EVENT, {
       provider_id: provider.id,
       provider_type: provider.type,
-      model_id: fullProvider?.modelId,
     })
     setDefaultProvider(provider.id)
   }

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()

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()
-}

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])
 

packages/browseros-agent/apps/agent/lib/browseros/capabilities.ts

@@ -49,10 +49,6 @@ export enum Feature {
   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',
 }
 
 /**
@@ -82,8 +78,6 @@ const FEATURE_CONFIG: { [K in Feature]: FeatureConfig } = {
   [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[] {

packages/browseros-agent/apps/agent/lib/constants/analyticsEvents.ts

@@ -29,12 +29,6 @@ export const CONVERSATION_RESET_EVENT = 'ui.conversation.reset'
 /** @public */
 export const AI_PROVIDER_ADDED_EVENT = 'settings.ai_provider.added'
 
-/** @public */
-export const AI_PROVIDER_UPDATED_EVENT = 'settings.ai_provider.updated'
-
-/** @public */
-export const MODEL_SELECTED_EVENT = 'settings.model.selected'
-
 /** @public */
 export const CHATGPT_PRO_OAUTH_STARTED_EVENT =
   'settings.chatgpt_pro.oauth_started'
@@ -59,24 +53,9 @@ export const GITHUB_COPILOT_OAUTH_COMPLETED_EVENT =
 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'

packages/browseros-agent/apps/agent/lib/credits/credit-colors.ts

@@ -1,13 +0,0 @@
-const LOW_THRESHOLD = 30
-
-export function getCreditTextColor(credits: number): string {
-  if (credits <= 0) return 'text-red-500'
-  if (credits <= LOW_THRESHOLD) return 'text-yellow-500'
-  return 'text-green-500'
-}
-
-export function getCreditBarColor(credits: number): string {
-  if (credits <= 0) return 'bg-red-500'
-  if (credits <= LOW_THRESHOLD) return 'bg-yellow-500'
-  return 'bg-green-500'
-}

packages/browseros-agent/apps/agent/lib/credits/useCredits.ts

@@ -1,33 +0,0 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { getAgentServerUrl } from '@/lib/browseros/helpers'
-
-export interface CreditsInfo {
-  credits: number
-  dailyLimit: number
-  lastResetAt?: string
-}
-
-const CREDITS_QUERY_KEY = ['credits']
-
-async function fetchCredits(): Promise<CreditsInfo> {
-  const baseUrl = await getAgentServerUrl()
-  const response = await fetch(`${baseUrl}/credits`)
-  if (!response.ok)
-    throw new Error(`Failed to fetch credits: ${response.status}`)
-  return response.json()
-}
-
-export function useCredits() {
-  return useQuery<CreditsInfo>({
-    queryKey: CREDITS_QUERY_KEY,
-    queryFn: fetchCredits,
-    refetchOnWindowFocus: true,
-    staleTime: 30_000,
-    retry: 1,
-  })
-}
-
-export function useInvalidateCredits() {
-  const queryClient = useQueryClient()
-  return () => queryClient.invalidateQueries({ queryKey: CREDITS_QUERY_KEY })
-}

packages/browseros-agent/apps/agent/lib/graphql/QueryProvider.tsx

@@ -1,10 +1,7 @@
 import { createAsyncStoragePersister } from '@tanstack/query-async-storage-persister'
 import { QueryClient } from '@tanstack/react-query'
-import {
-  type AsyncStorage,
-  PersistQueryClientProvider,
-} from '@tanstack/react-query-persist-client'
-import { del, get, set } from 'idb-keyval'
+import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client'
+import localforage from 'localforage'
 import type { FC, ReactNode } from 'react'
 
 const queryClient = new QueryClient({
@@ -15,14 +12,8 @@ const queryClient = new QueryClient({
   },
 })
 
-const idbStorage: AsyncStorage<string> = {
-  getItem: (key: string) => get<string>(key).then((v) => v ?? null),
-  setItem: (key: string, value: string) => set(key, value),
-  removeItem: (key: string) => del(key),
-}
-
 const asyncStoragePersister = createAsyncStoragePersister({
-  storage: idbStorage,
+  storage: localforage,
 })
 
 export const QueryProvider: FC<{ children: ReactNode }> = ({ children }) => {

packages/browseros-agent/apps/agent/lib/llm-providers/client-oauth.ts

@@ -1,169 +0,0 @@
-/**
- * Client-side OAuth Device Code flow.
- * Used for providers where server-side fetch is blocked by WAF (e.g. Qwen).
- * The extension makes requests using Chrome's network stack which bypasses
- * TLS fingerprint-based WAF detection.
- */
-
-export interface ClientAuthConfig {
-  deviceCodeEndpoint: string
-  tokenEndpoint: string
-  clientId: string
-  scopes: string
-  requiresPKCE: boolean
-  contentType: 'json' | 'form'
-}
-
-interface DeviceCodeData {
-  device_code: string
-  user_code: string
-  verification_uri: string
-  verification_uri_complete?: string
-  expires_in: number
-  interval: number
-}
-
-export interface TokenResult {
-  accessToken: string
-  refreshToken: string
-  expiresIn: number
-}
-
-export async function requestDeviceCode(
-  auth: ClientAuthConfig,
-): Promise<{ deviceData: DeviceCodeData; codeVerifier?: string }> {
-  let codeVerifier: string | undefined
-  const params: Record<string, string> = {
-    client_id: auth.clientId,
-    scope: auth.scopes,
-  }
-
-  if (auth.requiresPKCE) {
-    codeVerifier = generateCodeVerifier()
-    params.code_challenge = await generateCodeChallenge(codeVerifier)
-    params.code_challenge_method = 'S256'
-  }
-
-  const res = await authFetch(auth.deviceCodeEndpoint, params, auth.contentType)
-
-  // WAF captcha detected — open the site for user to solve, then retry
-  const ct = res.headers.get('content-type') ?? ''
-  if (!ct.includes('application/json')) {
-    const baseUrl = new URL(auth.deviceCodeEndpoint).origin
-    window.open(baseUrl, '_blank')
-    throw new Error(
-      'Please complete the verification in the opened tab, then click USE again.',
-    )
-  }
-  if (!res.ok) throw new Error(`Device code request failed: ${res.status}`)
-
-  const deviceData = (await res.json()) as DeviceCodeData
-  if (!deviceData.device_code || !deviceData.user_code) {
-    throw new Error('Invalid device code response')
-  }
-
-  return { deviceData, codeVerifier }
-}
-
-export function startTokenPolling(
-  auth: ClientAuthConfig,
-  deviceData: DeviceCodeData,
-  codeVerifier: string | undefined,
-  onToken: (token: TokenResult) => void,
-): void {
-  let interval = deviceData.interval
-  const deadline = Date.now() + deviceData.expires_in * 1000
-  const safetyMargin = 3
-
-  const poll = async () => {
-    if (Date.now() > deadline) return
-
-    const params: Record<string, string> = {
-      client_id: auth.clientId,
-      device_code: deviceData.device_code,
-      grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
-    }
-    if (codeVerifier) params.code_verifier = codeVerifier
-
-    try {
-      const res = await authFetch(auth.tokenEndpoint, params, auth.contentType)
-
-      // WAF returned HTML — retry later
-      const ct = res.headers.get('content-type') ?? ''
-      if (!ct.includes('application/json')) {
-        setTimeout(poll, (interval + safetyMargin) * 1000)
-        return
-      }
-
-      const data = (await res.json()) as {
-        access_token?: string
-        refresh_token?: string
-        expires_in?: number
-        error?: string
-        interval?: number
-      }
-
-      if (data.access_token) {
-        onToken({
-          accessToken: data.access_token,
-          refreshToken: data.refresh_token ?? '',
-          expiresIn: data.expires_in ?? 0,
-        })
-        return
-      }
-
-      if (data.error === 'authorization_pending') {
-        setTimeout(poll, (interval + safetyMargin) * 1000)
-        return
-      }
-      if (data.error === 'slow_down') {
-        interval = (data.interval ?? interval) + 5
-        setTimeout(poll, (interval + safetyMargin) * 1000)
-        return
-      }
-    } catch {
-      setTimeout(poll, (interval + safetyMargin) * 1000)
-    }
-  }
-
-  setTimeout(poll, (interval + safetyMargin) * 1000)
-}
-
-function authFetch(
-  endpoint: string,
-  params: Record<string, string>,
-  contentType: 'json' | 'form',
-): Promise<Response> {
-  return fetch(endpoint, {
-    method: 'POST',
-    headers: {
-      'Content-Type':
-        contentType === 'form'
-          ? 'application/x-www-form-urlencoded'
-          : 'application/json',
-      Accept: 'application/json',
-    },
-    body:
-      contentType === 'form'
-        ? new URLSearchParams(params).toString()
-        : JSON.stringify(params),
-  })
-}
-
-function generateCodeVerifier(): string {
-  const bytes = crypto.getRandomValues(new Uint8Array(32))
-  return base64UrlEncode(bytes)
-}
-
-async function generateCodeChallenge(verifier: string): Promise<string> {
-  const digest = await crypto.subtle.digest(
-    'SHA-256',
-    new TextEncoder().encode(verifier),
-  )
-  return base64UrlEncode(new Uint8Array(digest))
-}
-
-function base64UrlEncode(bytes: Uint8Array): string {
-  const base64 = btoa(String.fromCharCode(...bytes))
-  return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
-}

packages/browseros-agent/apps/agent/lib/llm-providers/models-dev.ts

@@ -1,35 +0,0 @@
-import data from './models-dev-data.json'
-
-export interface ModelsDevModel {
-  id: string
-  name: string
-  contextWindow: number
-  maxOutput: number
-  supportsImages: boolean
-  supportsReasoning: boolean
-  supportsToolCall: boolean
-  inputCost?: number
-  outputCost?: number
-}
-
-export interface ModelsDevProvider {
-  name: string
-  api?: string
-  doc: string
-  models: ModelsDevModel[]
-}
-
-const modelsDevData: Record<string, ModelsDevProvider> = data as Record<
-  string,
-  ModelsDevProvider
->
-
-export function getModelsDevProvider(
-  providerId: string,
-): ModelsDevProvider | undefined {
-  return modelsDevData[providerId]
-}
-
-export function getModelsDevModels(providerId: string): ModelsDevModel[] {
-  return modelsDevData[providerId]?.models ?? []
-}

packages/browseros-agent/apps/agent/lib/llm-providers/providerIcons.tsx

@@ -8,7 +8,6 @@ import {
   Ollama,
   OpenAI,
   OpenRouter,
-  Qwen,
 } from '@lobehub/icons'
 import { Bot, Github } from 'lucide-react'
 import type { FC, SVGProps } from 'react'
@@ -35,7 +34,6 @@ const providerIconMap: Record<ProviderType, IconComponent | null> = {
   moonshot: Kimi,
   'chatgpt-pro': OpenAI,
   'github-copilot': Github,
-  'qwen-code': Qwen,
 }
 
 interface ProviderIconProps {

packages/browseros-agent/apps/agent/lib/llm-providers/providerTemplates.ts

@@ -1,4 +1,3 @@
-import { getModelsDevProvider } from './models-dev'
 import type { ProviderType } from './types'
 
 /**
@@ -16,30 +15,6 @@ export interface ProviderTemplate {
   apiKeyUrl?: string
 }
 
-function enrichTemplate(
-  providerId: ProviderType,
-  overrides: {
-    defaultModelId: string
-    defaultBaseUrl?: string
-    apiKeyUrl?: string
-    setupGuideUrl?: string
-  },
-): ProviderTemplate {
-  const provider = getModelsDevProvider(providerId)
-  const model = provider?.models.find((m) => m.id === overrides.defaultModelId)
-
-  return {
-    id: providerId,
-    name: provider?.name ?? providerId,
-    defaultBaseUrl: overrides.defaultBaseUrl ?? provider?.api ?? '',
-    defaultModelId: overrides.defaultModelId,
-    supportsImages: model?.supportsImages ?? true,
-    contextWindow: model?.contextWindow ?? 128000,
-    ...(overrides.apiKeyUrl && { apiKeyUrl: overrides.apiKeyUrl }),
-    ...(overrides.setupGuideUrl && { setupGuideUrl: overrides.setupGuideUrl }),
-  }
-}
-
 /**
  * Available provider templates for quick setup
  * @public
@@ -63,15 +38,6 @@ export const providerTemplates: ProviderTemplate[] = [
     contextWindow: 128000,
     setupGuideUrl: 'https://docs.browseros.com/features/github-copilot-oauth',
   },
-  {
-    id: 'qwen-code',
-    name: 'Qwen Code',
-    defaultBaseUrl: 'https://portal.qwen.ai/v1',
-    defaultModelId: 'coder-model',
-    supportsImages: true,
-    contextWindow: 1000000,
-    setupGuideUrl: 'https://docs.browseros.com/features/qwen-code-oauth',
-  },
   {
     id: 'moonshot',
     name: 'Moonshot AI',
@@ -82,12 +48,17 @@ export const providerTemplates: ProviderTemplate[] = [
     apiKeyUrl: 'https://platform.moonshot.ai/console/api-keys',
     setupGuideUrl: 'https://platform.moonshot.ai/console/api-keys',
   },
-  enrichTemplate('openai', {
-    defaultModelId: 'gpt-5',
+  {
+    id: 'openai',
+    name: 'OpenAI',
+    defaultBaseUrl: 'https://api.openai.com/v1',
+    defaultModelId: 'gpt-4',
+    supportsImages: true,
+    contextWindow: 128000,
     apiKeyUrl: 'https://platform.openai.com/api-keys',
     setupGuideUrl:
       'https://docs.browseros.com/features/bring-your-own-llm#openai',
-  }),
+  },
   {
     id: 'openai-compatible',
     name: 'OpenAI Compatible',
@@ -96,18 +67,28 @@ export const providerTemplates: ProviderTemplate[] = [
     supportsImages: true,
     contextWindow: 128000,
   },
-  enrichTemplate('anthropic', {
-    defaultModelId: 'claude-sonnet-4-6',
+  {
+    id: 'anthropic',
+    name: 'Anthropic',
+    defaultBaseUrl: 'https://api.anthropic.com/v1',
+    defaultModelId: 'claude-3-5-sonnet-20241022',
+    supportsImages: true,
+    contextWindow: 200000,
     apiKeyUrl: 'https://console.anthropic.com/settings/keys',
     setupGuideUrl:
       'https://docs.browseros.com/features/bring-your-own-llm#claude',
-  }),
-  enrichTemplate('google', {
-    defaultModelId: 'gemini-2.5-flash',
+  },
+  {
+    id: 'google',
+    name: 'Gemini',
+    defaultBaseUrl: 'https://generativelanguage.googleapis.com/v1beta',
+    defaultModelId: 'gemini-1.5-pro',
+    supportsImages: true,
+    contextWindow: 1000000,
     apiKeyUrl: 'https://aistudio.google.com/app/apikey',
     setupGuideUrl:
       'https://docs.browseros.com/features/bring-your-own-llm#gemini',
-  }),
+  },
   {
     id: 'ollama',
     name: 'Ollama',
@@ -118,28 +99,47 @@ export const providerTemplates: ProviderTemplate[] = [
     setupGuideUrl:
       'https://docs.browseros.com/features/bring-your-own-llm#ollama',
   },
-  enrichTemplate('openrouter', {
-    defaultModelId: 'anthropic/claude-sonnet-4.5',
+  {
+    id: 'openrouter',
+    name: 'OpenRouter',
+    defaultBaseUrl: 'https://openrouter.ai/api/v1',
+    defaultModelId: 'openai/gpt-4-turbo',
+    supportsImages: true,
+    contextWindow: 128000,
     apiKeyUrl: 'https://openrouter.ai/keys',
     setupGuideUrl:
       'https://docs.browseros.com/features/bring-your-own-llm#openrouter',
-  }),
-  enrichTemplate('lmstudio', {
-    defaultModelId: 'openai/gpt-oss-20b',
+  },
+  {
+    id: 'lmstudio',
+    name: 'LM Studio',
     defaultBaseUrl: 'http://localhost:1234/v1',
+    defaultModelId: 'local-model',
+    supportsImages: false,
+    contextWindow: 32000,
     setupGuideUrl:
       'https://docs.browseros.com/features/bring-your-own-llm#lmstudio',
-  }),
-  enrichTemplate('azure', {
+  },
+  {
+    id: 'azure',
+    name: 'Azure',
+    defaultBaseUrl: '',
     defaultModelId: '',
+    supportsImages: true,
+    contextWindow: 128000,
     apiKeyUrl:
       'https://portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/OpenAI',
-  }),
-  enrichTemplate('bedrock', {
-    defaultModelId: 'anthropic.claude-sonnet-4-6',
+  },
+  {
+    id: 'bedrock',
+    name: 'AWS Bedrock',
+    defaultBaseUrl: '',
+    defaultModelId: '',
+    supportsImages: true,
+    contextWindow: 200000,
     setupGuideUrl:
       'https://docs.aws.amazon.com/bedrock/latest/userguide/getting-started.html',
-  }),
+  },
 ]
 
 /**
@@ -149,7 +149,6 @@ export const providerTemplates: ProviderTemplate[] = [
 export const providerTypeOptions: { value: ProviderType; label: string }[] = [
   { value: 'chatgpt-pro', label: 'ChatGPT Plus/Pro' },
   { value: 'github-copilot', label: 'GitHub Copilot' },
-  { value: 'qwen-code', label: 'Qwen Code' },
   { value: 'moonshot', label: 'Moonshot AI' },
   { value: 'anthropic', label: 'Anthropic' },
   { value: 'openai', label: 'OpenAI' },
@@ -180,7 +179,6 @@ export const getProviderTemplate = (
 export const DEFAULT_BASE_URLS: Record<ProviderType, string> = {
   'chatgpt-pro': 'https://chatgpt.com/backend-api',
   'github-copilot': 'https://api.githubcopilot.com',
-  'qwen-code': 'https://portal.qwen.ai/v1',
   moonshot: 'https://api.moonshot.ai/v1',
   anthropic: 'https://api.anthropic.com/v1',
   openai: 'https://api.openai.com/v1',

packages/browseros-agent/apps/agent/lib/llm-providers/types.ts

@@ -16,7 +16,6 @@ export type ProviderType =
   | 'moonshot'
   | 'chatgpt-pro'
   | 'github-copilot'
-  | 'qwen-code'
 
 /**
  * LLM Provider configuration

packages/browseros-agent/apps/agent/lib/llm-providers/useOAuthProviderFlow.ts

@@ -1,182 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import { toast } from 'sonner'
-import { track } from '@/lib/metrics/track'
-import {
-  type ClientAuthConfig,
-  requestDeviceCode,
-  startTokenPolling,
-} from './client-oauth'
-import { getProviderTemplate } from './providerTemplates'
-import type { LlmProviderConfig, ProviderType } from './types'
-import { useOAuthStatus } from './useOAuthStatus'
-
-export interface OAuthProviderFlowConfig {
-  providerType: ProviderType
-  displayName: string
-  startedEvent: string
-  completedEvent: string
-  disconnectedEvent: string
-  /** Client-side auth for providers with WAF-protected endpoints */
-  clientAuth?: ClientAuthConfig
-}
-
-export interface PendingDeviceCode {
-  userCode: string
-  providerName: string
-  verificationUri: string
-}
-
-interface OAuthProviderFlowReturn {
-  status: { authenticated: boolean; email?: string } | null
-  disconnect: () => Promise<void>
-  startOAuthFlow: (agentServerUrl: string | undefined) => Promise<void>
-  pendingDeviceCode: PendingDeviceCode | null
-  clearDeviceCode: () => void
-}
-
-export function useOAuthProviderFlow(
-  config: OAuthProviderFlowConfig,
-  providers: LlmProviderConfig[],
-  saveProvider: (provider: LlmProviderConfig) => Promise<void> | void,
-): OAuthProviderFlowReturn {
-  const { status, startPolling, disconnect } = useOAuthStatus(
-    config.providerType,
-  )
-  const flowStartedRef = useRef(false)
-  const [pendingDeviceCode, setPendingDeviceCode] =
-    useState<PendingDeviceCode | null>(null)
-
-  // Auto-create provider when OAuth completes
-  // biome-ignore lint/correctness/useExhaustiveDependencies: intentional — only trigger on auth status change
-  useEffect(() => {
-    if (!status?.authenticated) return
-    if (!flowStartedRef.current) return
-    if (providers.some((p) => p.type === config.providerType)) return
-
-    const now = Date.now()
-    try {
-      const template = getProviderTemplate(config.providerType)
-      saveProvider({
-        id: `${config.providerType}-${now}`,
-        type: config.providerType,
-        name: `${config.displayName}${status.email ? ` (${status.email})` : ''}`,
-        modelId: template?.defaultModelId ?? '',
-        supportsImages: template?.supportsImages ?? true,
-        contextWindow: template?.contextWindow ?? 128000,
-        temperature: 0.2,
-        createdAt: now,
-        updatedAt: now,
-      })
-      setPendingDeviceCode(null)
-      track(config.completedEvent, { email: status.email })
-      toast.success(`${config.displayName} Connected`, {
-        description: status.email
-          ? `Authenticated as ${status.email}`
-          : `Successfully authenticated with ${config.displayName}`,
-      })
-    } catch (err) {
-      toast.error(`Failed to create ${config.displayName} provider`, {
-        description: err instanceof Error ? err.message : 'Unknown error',
-      })
-    } finally {
-      flowStartedRef.current = false
-    }
-  }, [status?.authenticated])
-
-  async function startOAuthFlow(agentServerUrl: string | undefined) {
-    if (!agentServerUrl) {
-      toast.error('Server not available', {
-        description: 'Cannot start OAuth flow without server connection.',
-      })
-      return
-    }
-
-    flowStartedRef.current = true
-
-    try {
-      if (config.clientAuth) {
-        await handleClientAuth(config.clientAuth, agentServerUrl)
-      } else {
-        await handleServerAuth(agentServerUrl)
-      }
-    } catch (err) {
-      flowStartedRef.current = false
-      toast.error(`Failed to start ${config.displayName} authentication`, {
-        description: err instanceof Error ? err.message : 'Unknown error',
-      })
-    }
-  }
-
-  // Client-side: extension handles device code + polling, sends token to server
-  async function handleClientAuth(auth: ClientAuthConfig, serverUrl: string) {
-    const { deviceData, codeVerifier } = await requestDeviceCode(auth)
-
-    const verificationUri =
-      deviceData.verification_uri_complete ?? deviceData.verification_uri
-    window.open(verificationUri, '_blank')
-    track(config.startedEvent)
-    setPendingDeviceCode({
-      userCode: deviceData.user_code,
-      providerName: config.displayName,
-      verificationUri,
-    })
-
-    startTokenPolling(auth, deviceData, codeVerifier, async (token) => {
-      await fetch(`${serverUrl}/oauth/${config.providerType}/token`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(token),
-      })
-      startPolling()
-    })
-  }
-
-  // Server-side: server handles device code + polling
-  async function handleServerAuth(agentServerUrl: string) {
-    const res = await fetch(
-      `${agentServerUrl}/oauth/${config.providerType}/start`,
-    )
-
-    if (res.headers.get('content-type')?.includes('application/json')) {
-      const data = (await res.json()) as {
-        userCode?: string
-        verificationUri?: string
-        error?: string
-      }
-
-      if (!res.ok || data.error) {
-        throw new Error(data.error || `Server returned ${res.status}`)
-      }
-      if (!data.userCode || !data.verificationUri) {
-        throw new Error('Invalid response from server')
-      }
-
-      window.open(data.verificationUri, '_blank')
-      startPolling()
-      track(config.startedEvent)
-      setPendingDeviceCode({
-        userCode: data.userCode,
-        providerName: config.displayName,
-        verificationUri: data.verificationUri,
-      })
-      return
-    }
-
-    // PKCE redirect flow
-    if (!res.ok) throw new Error(`Server returned ${res.status}`)
-    window.open(res.url, '_blank')
-    startPolling()
-    track(config.startedEvent)
-    toast.info(`Authenticating with ${config.displayName}`, {
-      description: 'Complete the login in the opened tab.',
-    })
-  }
-
-  return {
-    status,
-    disconnect,
-    startOAuthFlow,
-    pendingDeviceCode,
-    clearDeviceCode: () => setPendingDeviceCode(null),
-  }
-}

packages/browseros-agent/apps/agent/lib/schedules/scheduleStorage.ts

@@ -22,13 +22,6 @@ export const scheduledJobRunStorage = storage.defineItem<ScheduledJobRun[]>(
   },
 )
 
-export const pendingDeletionStorage = storage.defineItem<string[]>(
-  'local:scheduledJobsPendingDeletion',
-  {
-    fallback: [],
-  },
-)
-
 export function useScheduledJobs() {
   const [jobs, setJobs] = useState<ScheduledJob[]>([])
 
@@ -61,11 +54,6 @@ export function useScheduledJobs() {
   const removeJob = async (id: string) => {
     await chrome.alarms.clear(getAlarmName(id))
 
-    const pending = (await pendingDeletionStorage.getValue()) ?? []
-    if (!pending.includes(id)) {
-      await pendingDeletionStorage.setValue([...pending, id])
-    }
-
     const currentJobs = (await scheduledJobStorage.getValue()) ?? []
     await scheduledJobStorage.setValue(currentJobs.filter((j) => j.id !== id))
 

packages/browseros-agent/apps/agent/lib/schedules/syncSchedulesToBackend.ts

@@ -5,11 +5,10 @@ import { sentry } from '@/lib/sentry/sentry'
 import { createAlarmFromJob } from './createAlarmFromJob'
 import {
   CreateScheduledJobDocument,
-  DeleteScheduledJobDocument,
   GetScheduledJobsByProfileIdDocument,
   UpdateScheduledJobDocument,
 } from './graphql/syncSchedulesDocument'
-import { pendingDeletionStorage, scheduledJobStorage } from './scheduleStorage'
+import { scheduledJobStorage } from './scheduleStorage'
 import type { ScheduledJob } from './scheduleTypes'
 
 type RemoteScheduledJob = {
@@ -100,32 +99,6 @@ export async function syncSchedulesToBackend(
     }
   }
 
-  const pendingDeletions = new Set(
-    (await pendingDeletionStorage.getValue()) ?? [],
-  )
-  const resolvedDeletions = new Set<string>()
-
-  for (const rowId of pendingDeletions) {
-    if (remoteJobs.has(rowId)) {
-      try {
-        await execute(DeleteScheduledJobDocument, { rowId })
-        remoteJobs.delete(rowId)
-        resolvedDeletions.add(rowId)
-      } catch (error) {
-        sentry.captureException(error, {
-          extra: { jobId: rowId, context: 'sync-pending-deletion' },
-        })
-      }
-    } else {
-      resolvedDeletions.add(rowId)
-    }
-  }
-
-  const latestPending = (await pendingDeletionStorage.getValue()) ?? []
-  await pendingDeletionStorage.setValue(
-    latestPending.filter((id) => !resolvedDeletions.has(id)),
-  )
-
   const localJobsMap = new Map(localJobs.map((j) => [j.id, j]))
   const jobsToAddLocally: ScheduledJob[] = []
   const jobsToUpdateLocally: ScheduledJob[] = []

packages/browseros-agent/apps/agent/lib/sentry/sanitize.ts

@@ -1,77 +0,0 @@
-/**
- * Sanitize Sentry event data by redacting values at keys that match known
- * sensitive patterns. Used in `beforeSend` to prevent credentials from
- * leaking into error reports.
- */
-
-const REDACTED = '[REDACTED]'
-
-const SENSITIVE_KEY_PATTERNS = [
-  'apikey',
-  'api_key',
-  'accesskeyid',
-  'secretaccesskey',
-  'sessiontoken',
-  'authorization',
-  'token',
-  'password',
-  'secret',
-  'credential',
-]
-
-function isSensitiveKey(key: string): boolean {
-  const lower = key.toLowerCase()
-  return SENSITIVE_KEY_PATTERNS.some((p) => lower.includes(p))
-}
-
-function sanitize<T>(obj: T): T {
-  if (obj === null || obj === undefined) return obj
-  if (
-    typeof obj === 'string' ||
-    typeof obj === 'number' ||
-    typeof obj === 'boolean'
-  ) {
-    return obj
-  }
-  if (Array.isArray(obj)) {
-    return obj.map(sanitize) as T
-  }
-  if (typeof obj === 'object') {
-    const result: Record<string, unknown> = {}
-    for (const [key, value] of Object.entries(obj)) {
-      result[key] = isSensitiveKey(key) ? REDACTED : sanitize(value)
-    }
-    return result as T
-  }
-  return obj
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Sentry event type varies by SDK
-export function sanitizeEvent<E>(event: E): E {
-  const e = event as Record<string, any>
-
-  if (Array.isArray(e.breadcrumbs)) {
-    e.breadcrumbs = e.breadcrumbs.map((b: Record<string, unknown>) => ({
-      ...b,
-      data: b.data ? sanitize(b.data) : b.data,
-    }))
-  }
-
-  if (e.contexts) {
-    e.contexts = sanitize(e.contexts)
-  }
-
-  if (e.extra) {
-    e.extra = sanitize(e.extra)
-  }
-
-  for (const value of e.exception?.values ?? []) {
-    for (const frame of value.stacktrace?.frames ?? []) {
-      if (frame.vars) {
-        frame.vars = sanitize(frame.vars)
-      }
-    }
-  }
-
-  return event
-}

packages/browseros-agent/apps/agent/lib/sentry/sentry.ts

@@ -1,21 +1,6 @@
 import * as Sentry from '@sentry/react'
 import { getBrowserOSAdapter } from '../browseros/adapter'
 import { env } from '../env'
-import { sanitizeEvent } from './sanitize'
-
-/** Errors that are expected during normal operation and should not be reported */
-const SUPPRESSED_ERRORS = ['The browser is shutting down', 'No current window']
-
-function getExtensionPage(): string {
-  try {
-    const url = new URL(location.href)
-    // Extract the entry point name from the extension URL pathname
-    // e.g. chrome-extension://<id>/sidepanel.html -> sidepanel
-    return url.pathname.replace(/^\//, '').replace(/\.html$/, '') || 'unknown'
-  } catch {
-    return 'unknown'
-  }
-}
 
 if (env.VITE_PUBLIC_SENTRY_DSN) {
   Sentry.init({
@@ -25,29 +10,6 @@ if (env.VITE_PUBLIC_SENTRY_DSN) {
     sendDefaultPii: true,
     environment: env.PROD ? 'production' : 'development',
     release: chrome.runtime.getManifest().version,
-
-    beforeSend(event) {
-      const message = event.exception?.values?.[0]?.value ?? ''
-      if (SUPPRESSED_ERRORS.some((s) => message.includes(s))) {
-        return null
-      }
-
-      event.tags = {
-        ...event.tags,
-        extensionPage: getExtensionPage(),
-      }
-
-      return sanitizeEvent(event)
-    },
-
-    integrations: [
-      Sentry.breadcrumbsIntegration({
-        console: true,
-        dom: true,
-        fetch: true,
-        xhr: true,
-      }),
-    ],
   })
 
   ;(async () => {

packages/browseros-agent/apps/agent/lib/voice/transcribe-audio.ts

@@ -1,29 +0,0 @@
-const GATEWAY_URL = 'https://llm.browseros.com'
-
-interface TranscribeResponse {
-  text: string
-}
-
-export async function transcribeAudio(audioBlob: Blob): Promise<string> {
-  const formData = new FormData()
-  formData.append('file', audioBlob, 'recording.webm')
-  formData.append('response_format', 'json')
-
-  const response = await fetch(`${GATEWAY_URL}/api/transcribe`, {
-    method: 'POST',
-    body: formData,
-    signal: AbortSignal.timeout(30_000),
-  })
-
-  if (!response.ok) {
-    const errorBody: { error?: string } = await response
-      .json()
-      .catch(() => ({ error: 'Transcription failed' }))
-    throw new Error(
-      errorBody.error || `Transcription failed: ${response.status}`,
-    )
-  }
-
-  const result: TranscribeResponse = await response.json()
-  return result.text || ''
-}

packages/browseros-agent/apps/agent/lib/voice/useVoiceInput.ts

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react'
-import { transcribeAudio } from './transcribe-audio'
 
+const GATEWAY_URL = 'https://llm.browseros.com'
 const WAVEFORM_BAND_COUNT = 5
 
 export interface VoiceInputState {
@@ -26,6 +26,34 @@ export interface UseVoiceInputReturn {
 
 const EMPTY_LEVELS = Array(WAVEFORM_BAND_COUNT).fill(0)
 
+interface TranscribeResponse {
+  text: string
+}
+
+async function transcribeAudio(audioBlob: Blob): Promise<string> {
+  const formData = new FormData()
+  formData.append('file', audioBlob, 'recording.webm')
+  formData.append('response_format', 'json')
+
+  const response = await fetch(`${GATEWAY_URL}/api/transcribe`, {
+    method: 'POST',
+    body: formData,
+    signal: AbortSignal.timeout(30_000),
+  })
+
+  if (!response.ok) {
+    const errorBody: { error?: string } = await response
+      .json()
+      .catch(() => ({ error: 'Transcription failed' }))
+    throw new Error(
+      errorBody.error || `Transcription failed: ${response.status}`,
+    )
+  }
+
+  const result: TranscribeResponse = await response.json()
+  return result.text || ''
+}
+
 export function useVoiceInput(): UseVoiceInputReturn {
   const [isRecording, setIsRecording] = useState(false)
   const [isTranscribing, setIsTranscribing] = useState(false)

packages/browseros-agent/apps/agent/package.json

@@ -2,7 +2,7 @@
   "name": "@browseros/agent",
   "description": "manifest.json description",
   "private": true,
-  "version": "0.0.98",
+  "version": "0.0.52",
   "type": "module",
   "scripts": {
     "dev": "test -d generated/graphql || bun run codegen; mkdir -p /tmp/browseros-dev; bun --env-file=.env.development wxt",
@@ -44,9 +44,9 @@
     "@radix-ui/react-use-controllable-state": "^1.2.2",
     "@sentry/react": "^10.31.0",
     "@sentry/vite-plugin": "^4.6.1",
-    "@tanstack/query-async-storage-persister": "^5.95.2",
-    "@tanstack/react-query": "^5.95.2",
-    "@tanstack/react-query-persist-client": "^5.95.2",
+    "@tanstack/query-async-storage-persister": "^5.90.21",
+    "@tanstack/react-query": "^5.90.19",
+    "@tanstack/react-query-persist-client": "^5.90.21",
     "@types/cytoscape": "^3.31.0",
     "@types/dompurify": "^3.2.0",
     "@webext-core/messaging": "^2.3.0",
@@ -67,11 +67,10 @@
     "embla-carousel-react": "^8.6.0",
     "es-toolkit": "^1.42.0",
     "eventsource-parser": "^3.0.6",
-    "fuse.js": "^7.1.0",
     "graphql": "^16.12.0",
     "hono": "^4.12.3",
-    "idb-keyval": "^6.2.2",
     "klavis": "^2.15.0",
+    "localforage": "^1.10.0",
     "lucide-react": "^0.562.0",
     "motion": "^12.23.24",
     "nanoid": "^5.1.6",

packages/browseros-agent/apps/agent/web-ext.config.ts

@@ -1,13 +1,19 @@
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { defineWebExtConfig } from 'wxt'
 
 // biome-ignore lint/style/noProcessEnv: config file needs env access
 const env = process.env
 
+const MONOREPO_ROOT = join(dirname(fileURLToPath(import.meta.url)), '../..')
+const CONTROLLER_EXT_DIR = join(MONOREPO_ROOT, 'apps/controller-ext/dist')
+
 const chromiumArgs = [
   '--use-mock-keychain',
   '--show-component-extension-options',
   '--disable-browseros-server',
   '--disable-browseros-extensions',
+  `--load-extension=${CONTROLLER_EXT_DIR}`,
 ]
 
 if (env.BROWSEROS_CDP_PORT) {

packages/browseros-agent/apps/agent/wxt.config.ts

@@ -54,18 +54,11 @@ export default defineConfig({
     },
     permissions: [
       'topSites',
-      'storage',
-      'unlimitedStorage',
-      'scripting',
       'tabs',
-      'tabGroups',
+      'storage',
       'sidePanel',
-      'bookmarks',
-      'history',
       'browserOS',
       'alarms',
-      'webNavigation',
-      'downloads',
     ],
     host_permissions: [
       'http://127.0.0.1/*',

packages/browseros-agent/apps/cli/.env.production.example

@@ -1,10 +0,0 @@
-# Production build env for CLI
-
-POSTHOG_API_KEY=
-
-# Upload env for CLI installer scripts
-R2_ACCOUNT_ID=
-R2_ACCESS_KEY_ID=
-R2_SECRET_ACCESS_KEY=
-R2_BUCKET=browseros
-R2_UPLOAD_PREFIX=cli

packages/browseros-agent/apps/cli/.gitignore

@@ -1,2 +1 @@
 browseros-cli
-dist

packages/browseros-agent/apps/cli/CHANGELOG.md

@@ -1 +0,0 @@
-# BrowserOS CLI

packages/browseros-agent/apps/cli/Makefile

@@ -1,69 +1,20 @@
 BINARY := browseros-cli
 SOURCES := $(shell find . -name '*.go')
 VERSION ?= dev
-POSTHOG_API_KEY ?=
-DIST := dist
-LDFLAGS := -X main.version=$(VERSION) -X browseros-cli/analytics.posthogAPIKey=$(POSTHOG_API_KEY)
-HOST_OS := $(shell go env GOOS)
-HOST_ARCH := $(shell go env GOARCH)
-HOST_EXT := $(if $(filter windows,$(HOST_OS)),.exe,)
-HOST_BINARY = $(DIST)/$(BINARY)_$(HOST_OS)_$(HOST_ARCH)$(HOST_EXT)
 
 $(BINARY): $(SOURCES)
-	go build -ldflags "$(LDFLAGS)" -o $(BINARY) .
+	go build -ldflags "-X main.version=$(VERSION)" -o $(BINARY) .
 
-PLATFORMS := darwin/amd64 darwin/arm64 linux/amd64 linux/arm64 windows/amd64 windows/arm64
-
-.PHONY: install clean vet test release
+.PHONY: install clean vet test
 
 install:
-	go install -ldflags "$(LDFLAGS)" .
+	go install -ldflags "-X main.version=$(VERSION)" .
 
 clean:
 	rm -f $(BINARY)
-	rm -rf $(DIST)
 
 vet:
 	go vet ./...
 
 test:
 	go test -tags integration -v -timeout 120s ./...
-
-release:
-	@if [ "$(VERSION)" = "dev" ]; then echo "Error: VERSION required (e.g. make release VERSION=0.1.0)" >&2; exit 1; fi
-	@rm -rf $(DIST) && mkdir -p $(DIST)
-	@for pair in $(PLATFORMS); do \
-		OS=$${pair%/*}; \
-		ARCH=$${pair#*/}; \
-		EXT=""; \
-		if [ "$$OS" = "windows" ]; then EXT=".exe"; fi; \
-		echo "Building $$OS/$$ARCH..."; \
-		GOOS=$$OS GOARCH=$$ARCH CGO_ENABLED=0 go build -trimpath \
-			-ldflags "-s -w $(LDFLAGS)" \
-			-o "$(DIST)/$(BINARY)$$EXT" .; \
-		ARCHIVE="$(BINARY)_$(VERSION)_$${OS}_$${ARCH}"; \
-		if [ "$$OS" = "windows" ]; then \
-			(cd $(DIST) && zip "$${ARCHIVE}.zip" "$(BINARY)$$EXT"); \
-		else \
-			(cd $(DIST) && tar czf "$${ARCHIVE}.tar.gz" "$(BINARY)"); \
-		fi; \
-		mv "$(DIST)/$(BINARY)$$EXT" "$(DIST)/$(BINARY)_$${OS}_$${ARCH}$$EXT"; \
-	done
-	@ACTUAL_VERSION=$$($(HOST_BINARY) --version | awk '{print $$3}'); \
-		if [ "$$ACTUAL_VERSION" != "$(VERSION)" ]; then \
-			echo "Error: expected $(HOST_BINARY) to report version $(VERSION), got $$ACTUAL_VERSION" >&2; \
-			exit 1; \
-		fi
-	@cd $(DIST) && (command -v sha256sum >/dev/null 2>&1 && sha256sum *.tar.gz *.zip || shasum -a 256 *.tar.gz *.zip) > checksums.txt
-	@echo "=== Built artifacts ==="
-	@ls -lh $(DIST)
-
-.PHONY: npm-version npm-publish
-
-npm-version:
-	@if [ "$(VERSION)" = "dev" ]; then echo "Error: VERSION required" >&2; exit 1; fi
-	@node -e "const p=require('./npm/package.json');p.version='$(VERSION)';require('fs').writeFileSync('./npm/package.json',JSON.stringify(p,null,2)+'\n')"
-	@echo "npm/package.json version set to $(VERSION)"
-
-npm-publish: npm-version
-	cd npm && npm publish

packages/browseros-agent/apps/cli/README.md

@@ -1,68 +1,25 @@
 # browseros-cli
 
-[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](../../../../LICENSE)
+Command-line interface for controlling BrowserOS via MCP. Talks to the BrowserOS MCP server over JSON-RPC 2.0 / StreamableHTTP.
 
-Command-line interface for controlling BrowserOS — launch and automate the browser from the terminal or from AI coding agents like Claude Code and Gemini CLI.
-
-Communicates with the BrowserOS MCP server over JSON-RPC 2.0 / StreamableHTTP. All 53+ MCP tools are mapped to CLI commands.
-
-## Install
-
-### macOS / Linux
-
-```bash
-curl -fsSL https://cdn.browseros.com/cli/install.sh | bash
-```
-
-### Windows
-
-```powershell
-irm https://cdn.browseros.com/cli/install.ps1 | iex
-```
-
-### Build from Source
+## Setup
 
 Requires Go 1.25+.
 
 ```bash
-make            # Build binary
-make install    # Install to $GOPATH/bin
+# Build
+make
+
+# First run — configure server connection
+./browseros-cli init
 ```
 
-## Quick Start
+The `init` command prompts for your MCP server URL. Find it in:
+**BrowserOS → Settings → BrowserOS MCP → Server URL**
 
-```bash
-# If BrowserOS is not installed yet
-browseros-cli install                # downloads BrowserOS for your platform
+The port varies per installation (e.g., `http://127.0.0.1:9004/mcp`).
 
-# If BrowserOS is installed but not running
-browseros-cli launch                 # opens BrowserOS, waits for server
-
-# Configure the CLI (auto-discovers running BrowserOS)
-browseros-cli init --auto            # detects server URL and saves config
-
-# Verify connection
-browseros-cli health
-```
-
-### Other init modes
-
-```bash
-browseros-cli init <url>             # non-interactive — pass URL directly
-browseros-cli init                   # interactive — prompts for URL
-```
-
-Config is saved to `~/.config/browseros-cli/config.yaml`. The CLI also auto-discovers the server from `~/.browseros/server.json` (written by BrowserOS on startup).
-
-### CLI updates
-
-The CLI checks for a newer BrowserOS CLI release in the background about once per day and will suggest an update on a later run when one is available.
-
-```bash
-browseros-cli update         # check and apply the latest CLI release
-browseros-cli update --check # check only
-browseros-cli update --yes   # apply without prompting
-```
+Config is saved to `~/.config/browseros-cli/config.yaml`.
 
 ## Usage
 
@@ -110,12 +67,6 @@ browseros-cli history recent
 browseros-cli group list
 ```
 
-## Use as MCP Server
-
-BrowserOS exposes an MCP server that AI coding agents can connect to directly. The CLI is the easiest way to verify the connection and interact with tools from the terminal.
-
-To connect Claude Code, Gemini CLI, or any MCP client, see the [MCP setup guide](https://docs.browseros.com/features/use-with-claude-code).
-
 ## Global Flags
 
 | Flag | Env Var | Description |
@@ -126,9 +77,9 @@ To connect Claude Code, Gemini CLI, or any MCP client, see the [MCP setup guide]
 | `--debug` | `BOS_DEBUG=1` | Debug output |
 | `--timeout, -t` | | Request timeout (default: 2m) |
 
-Priority for server URL: `--server` flag > `BROWSEROS_URL` env > `~/.browseros/server.json` > config file
+Priority for server URL: `--server` flag > `BROWSEROS_URL` env > config file
 
-If no server URL is configured, the CLI exits with setup instructions pointing to `install`, `launch`, and `init`.
+If no server URL is configured, the CLI exits with setup instructions instead of assuming a localhost port.
 
 ## Testing
 
@@ -179,9 +130,7 @@ apps/cli/
 │   └── config.go       # Config file (~/.config/browseros-cli/config.yaml)
 ├── cmd/
 │   ├── root.go         # Root command, global flags
-│   ├── init.go         # Server URL configuration (URL arg, --auto, interactive)
-│   ├── install.go      # install (download BrowserOS for current platform)
-│   ├── launch.go       # launch (find and start BrowserOS, wait for server)
+│   ├── init.go         # Server URL configuration
 │   ├── open.go         # open (new_page / new_hidden_page)
 │   ├── nav.go          # nav, back, forward, reload
 │   ├── pages.go        # pages, active, close
@@ -214,8 +163,4 @@ The CLI communicates with BrowserOS via two HTTP POST requests per command:
 1. `initialize` — MCP handshake
 2. `tools/call` — execute the actual tool
 
-## Links
-
-- [Documentation](https://docs.browseros.com)
-- [MCP Setup Guide](https://docs.browseros.com/features/use-with-claude-code)
-- [Changelog](./CHANGELOG.md)
+All 54 MCP tools are mapped to CLI commands.

packages/browseros-agent/apps/cli/analytics/analytics.go

@@ -1,129 +0,0 @@
-package analytics
-
-import (
-	"crypto/rand"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-
-	"browseros-cli/config"
-
-	"github.com/posthog/posthog-go"
-)
-
-var (
-	posthogAPIKey string // set via ldflags
-	posthogHost   = "https://us.i.posthog.com"
-)
-
-const eventPrefix = "browseros.cli."
-
-var svc *service
-
-type service struct {
-	client    posthog.Client
-	distinctID string
-}
-
-func Init(version string) {
-	if posthogAPIKey == "" {
-		return
-	}
-
-	distinctID := resolveDistinctID()
-	if distinctID == "" {
-		return
-	}
-
-	client, err := posthog.NewWithConfig(posthogAPIKey, posthog.Config{
-		Endpoint:        posthogHost,
-		BatchSize:       10,
-		ShutdownTimeout: 3 * time.Second,
-		DefaultEventProperties: posthog.NewProperties().
-			Set("cli_version", version).
-			Set("os", runtime.GOOS).
-			Set("arch", runtime.GOARCH),
-	})
-	if err != nil {
-		return
-	}
-
-	svc = &service{client: client, distinctID: distinctID}
-}
-
-func Track(command string, success bool, duration time.Duration) {
-	if svc == nil {
-		return
-	}
-	svc.client.Enqueue(posthog.Capture{
-		DistinctId: svc.distinctID,
-		Event:      eventPrefix + "command_executed",
-		Properties: posthog.NewProperties().
-			Set("command", command).
-			Set("success", success).
-			Set("duration_ms", duration.Milliseconds()).
-			Set("$process_person_profile", false),
-	})
-}
-
-func Close() {
-	if svc == nil {
-		return
-	}
-	svc.client.Close()
-	svc = nil
-}
-
-func resolveDistinctID() string {
-	if id := loadBrowserosID(); id != "" {
-		return id
-	}
-	return loadOrCreateInstallID()
-}
-
-func loadBrowserosID() string {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return ""
-	}
-	data, err := os.ReadFile(filepath.Join(home, ".browseros", "server.json"))
-	if err != nil {
-		return ""
-	}
-	var sc struct {
-		BrowserosID string `json:"browseros_id"`
-	}
-	if json.Unmarshal(data, &sc) != nil {
-		return ""
-	}
-	return sc.BrowserosID
-}
-
-func loadOrCreateInstallID() string {
-	dir := config.Dir()
-	idPath := filepath.Join(dir, "install_id")
-
-	data, err := os.ReadFile(idPath)
-	if err == nil {
-		if id := strings.TrimSpace(string(data)); id != "" {
-			return id
-		}
-	}
-
-	id := generateUUID()
-	os.MkdirAll(dir, 0755)
-	os.WriteFile(idPath, []byte(id), 0644)
-	return id
-}
-
-func generateUUID() string {
-	var b [16]byte
-	rand.Read(b[:])
-	b[6] = (b[6] & 0x0f) | 0x40 // version 4
-	b[8] = (b[8] & 0x3f) | 0x80 // variant 2
-	return fmt.Sprintf("%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
-}

packages/browseros-agent/apps/cli/analytics/analytics_test.go

@@ -1,132 +0,0 @@
-package analytics
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"regexp"
-	"testing"
-	"time"
-)
-
-func TestGenerateUUID(t *testing.T) {
-	id := generateUUID()
-	uuidRe := regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`)
-	if !uuidRe.MatchString(id) {
-		t.Errorf("generateUUID() = %q, does not match UUID v4 pattern", id)
-	}
-
-	id2 := generateUUID()
-	if id == id2 {
-		t.Error("generateUUID() returned the same value twice")
-	}
-}
-
-func TestLoadBrowserosID(t *testing.T) {
-	tmp := t.TempDir()
-	t.Setenv("HOME", tmp)
-
-	// No server.json → empty
-	if got := loadBrowserosID(); got != "" {
-		t.Errorf("loadBrowserosID() = %q, want empty", got)
-	}
-
-	// server.json without browseros_id → empty
-	dir := filepath.Join(tmp, ".browseros")
-	os.MkdirAll(dir, 0755)
-	data, _ := json.Marshal(map[string]any{"server_port": 9100, "url": "http://127.0.0.1:9100"})
-	os.WriteFile(filepath.Join(dir, "server.json"), data, 0644)
-
-	if got := loadBrowserosID(); got != "" {
-		t.Errorf("loadBrowserosID() = %q, want empty (no browseros_id field)", got)
-	}
-
-	// server.json with browseros_id → returns it
-	data, _ = json.Marshal(map[string]any{
-		"server_port":  9100,
-		"url":          "http://127.0.0.1:9100",
-		"browseros_id": "test-uuid-1234",
-	})
-	os.WriteFile(filepath.Join(dir, "server.json"), data, 0644)
-
-	if got := loadBrowserosID(); got != "test-uuid-1234" {
-		t.Errorf("loadBrowserosID() = %q, want %q", got, "test-uuid-1234")
-	}
-}
-
-func TestLoadOrCreateInstallID(t *testing.T) {
-	tmp := t.TempDir()
-	configDir := filepath.Join(tmp, "browseros-cli")
-	t.Setenv("XDG_CONFIG_HOME", tmp)
-
-	// First call creates the file
-	id := loadOrCreateInstallID()
-	if id == "" {
-		t.Fatal("loadOrCreateInstallID() returned empty string")
-	}
-
-	// File was persisted
-	data, err := os.ReadFile(filepath.Join(configDir, "install_id"))
-	if err != nil {
-		t.Fatalf("install_id file not created: %v", err)
-	}
-	if string(data) != id {
-		t.Errorf("persisted id = %q, want %q", string(data), id)
-	}
-
-	// Second call returns the same ID
-	id2 := loadOrCreateInstallID()
-	if id2 != id {
-		t.Errorf("loadOrCreateInstallID() = %q, want stable %q", id2, id)
-	}
-}
-
-func TestResolveDistinctID_PrefersBrowserosID(t *testing.T) {
-	tmp := t.TempDir()
-	t.Setenv("HOME", tmp)
-	t.Setenv("XDG_CONFIG_HOME", tmp)
-
-	// Write server.json with browseros_id
-	dir := filepath.Join(tmp, ".browseros")
-	os.MkdirAll(dir, 0755)
-	data, _ := json.Marshal(map[string]any{"browseros_id": "server-uuid"})
-	os.WriteFile(filepath.Join(dir, "server.json"), data, 0644)
-
-	got := resolveDistinctID()
-	if got != "server-uuid" {
-		t.Errorf("resolveDistinctID() = %q, want %q", got, "server-uuid")
-	}
-}
-
-func TestResolveDistinctID_FallsBackToInstallID(t *testing.T) {
-	tmp := t.TempDir()
-	t.Setenv("HOME", tmp)
-	t.Setenv("XDG_CONFIG_HOME", tmp)
-
-	// No server.json → should generate install_id
-	got := resolveDistinctID()
-	if got == "" {
-		t.Error("resolveDistinctID() returned empty string")
-	}
-}
-
-func TestInitNoopsWithoutAPIKey(t *testing.T) {
-	old := posthogAPIKey
-	posthogAPIKey = ""
-	defer func() { posthogAPIKey = old }()
-
-	Init("1.0.0")
-	if svc != nil {
-		t.Error("Init() created service without API key")
-	}
-}
-
-func TestTrackAndCloseNoopWithoutInit(t *testing.T) {
-	old := svc
-	svc = nil
-	defer func() { svc = old }()
-
-	// Should not panic
-	Track("test", true, time.Second)
-	Close()
-}

packages/browseros-agent/apps/cli/cmd/health.go

@@ -49,7 +49,7 @@ func init() {
 	statusCmd := &cobra.Command{
 		Use:         "status",
 		Annotations: map[string]string{"group": "Setup:"},
-		Short:       "Check BrowserOS runtime status",
+		Short:       "Check extension connection status",
 		Args:        cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
 			c := newClient()
@@ -64,12 +64,12 @@ func init() {
 			green := color.New(color.FgGreen).SprintFunc()
 			red := color.New(color.FgRed).SprintFunc()
 
-			cdp := data["cdpConnected"]
-			cdpStr := red("disconnected")
-			if b, ok := cdp.(bool); ok && b {
-				cdpStr = green("connected")
+			ext := data["extensionConnected"]
+			extStr := red("disconnected")
+			if b, ok := ext.(bool); ok && b {
+				extStr = green("connected")
 			}
-			fmt.Printf("Browser: %s\n", cdpStr)
+			fmt.Printf("Extension: %s\n", extStr)
 		},
 	}
 

packages/browseros-agent/apps/cli/cmd/init.go

@@ -17,75 +17,42 @@ import (
 )
 
 func init() {
-	var autoDiscover bool
-
 	cmd := &cobra.Command{
-		Use:   "init [url]",
+		Use:   "init",
 		Short: "Configure the BrowserOS server connection",
 		Long: `Set up the CLI by providing the MCP server URL from BrowserOS.
 
 Open BrowserOS → Settings → BrowserOS MCP to find your Server URL.
-The URL looks like: http://127.0.0.1:9000/mcp
+The URL looks like: http://127.0.0.1:9004/mcp
 
 The port varies per installation, so this step is required on first use.
-Run again if your port changes.
-
-You can provide the full URL or just the port number:
-  browseros-cli init http://127.0.0.1:9000/mcp
-  browseros-cli init 9000
-
-Three modes:
-  browseros-cli init <url>    Non-interactive (full URL or port number)
-  browseros-cli init --auto   Auto-discover from ~/.browseros/server.json
-  browseros-cli init          Interactive prompt`,
+Run again if your port changes.`,
 		Annotations: map[string]string{"group": "Setup:"},
-		Args:        cobra.MaximumNArgs(1),
+		Args:        cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
 			bold := color.New(color.Bold)
 			green := color.New(color.FgGreen)
 			dim := color.New(color.Faint)
 
-			var input string
+			fmt.Println()
+			bold.Println("BrowserOS CLI Setup")
+			fmt.Println()
+			fmt.Println("Open BrowserOS → Settings → BrowserOS MCP")
+			fmt.Println("Copy the Server URL shown there.")
+			fmt.Println()
+			dim.Println("It looks like: http://127.0.0.1:9004/mcp")
+			fmt.Println()
 
-			switch {
-			case len(args) == 1:
-				// Non-interactive: URL provided as argument
-				input = args[0]
+			reader := bufio.NewReader(os.Stdin)
+			fmt.Print("Server URL: ")
+			input, err := reader.ReadString('\n')
+			if err != nil {
+				output.Error("failed to read input", 1)
+			}
+			input = strings.TrimSpace(input)
 
-			case autoDiscover:
-				// Auto-discover: server.json → config → probe common ports
-				discovered := probeRunningServer()
-				if discovered == "" {
-					output.Error("auto-discovery failed: no running BrowserOS found.\n\n"+
-						"  If not running:    browseros-cli launch\n"+
-						"  If not installed:  browseros-cli install", 1)
-				}
-				input = discovered
-				fmt.Printf("Auto-discovered server at %s\n", input)
-
-			default:
-				// Interactive prompt (original behavior)
-				fmt.Println()
-				bold.Println("BrowserOS CLI Setup")
-				fmt.Println()
-				fmt.Println("Open BrowserOS → Settings → BrowserOS MCP")
-				fmt.Println("Copy the Server URL or port number shown there.")
-				fmt.Println()
-				dim.Println("Examples:  http://127.0.0.1:9000/mcp")
-				dim.Println("           9000")
-				fmt.Println()
-
-				reader := bufio.NewReader(os.Stdin)
-				fmt.Print("Server URL or port: ")
-				line, err := reader.ReadString('\n')
-				if err != nil {
-					output.Error("failed to read input", 1)
-				}
-				input = strings.TrimSpace(line)
-
-				if input == "" {
-					output.Error("no URL provided", 1)
-				}
+			if input == "" {
+				output.Error("no URL provided", 1)
 			}
 
 			baseURL := normalizeServerURL(input)
@@ -121,6 +88,5 @@ Three modes:
 		},
 	}
 
-	cmd.Flags().BoolVar(&autoDiscover, "auto", false, "Auto-discover server URL from ~/.browseros/server.json")
 	rootCmd.AddCommand(cmd)
 }

packages/browseros-agent/apps/cli/cmd/install.go

@@ -1,247 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"time"
-
-	"browseros-cli/output"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-)
-
-func init() {
-	cmd := &cobra.Command{
-		Use:   "install",
-		Short: "Download and install BrowserOS for the current platform",
-		Long: `Download BrowserOS for your platform and start the installation.
-
-macOS:   Downloads .dmg, mounts it, and copies BrowserOS to /Applications
-Windows: Downloads installer .exe and launches it
-Linux:   Downloads AppImage (or .deb with --deb flag)
-
-After installation:
-  browseros-cli launch        # start BrowserOS
-  browseros-cli init --auto   # configure the CLI`,
-		Annotations: map[string]string{"group": "Setup:"},
-		Args:        cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			dir, _ := cmd.Flags().GetString("dir")
-			deb, _ := cmd.Flags().GetBool("deb")
-
-			if deb && runtime.GOOS != "linux" {
-				output.Error("--deb is only available on Linux", 1)
-			}
-
-			downloadURL, filename := resolveDownload(deb)
-			destPath := filepath.Join(dir, filename)
-
-			bold := color.New(color.Bold)
-			green := color.New(color.FgGreen)
-			dim := color.New(color.Faint)
-
-			bold.Printf("Downloading BrowserOS for %s...\n", platformDisplayName())
-			dim.Printf("  %s\n", downloadURL)
-			fmt.Println()
-
-			client := &http.Client{Timeout: 10 * time.Minute}
-			resp, err := client.Get(downloadURL)
-			if err != nil {
-				output.Errorf(1, "download failed: %v", err)
-			}
-			defer resp.Body.Close()
-
-			if resp.StatusCode != http.StatusOK {
-				output.Errorf(1, "download failed: HTTP %d", resp.StatusCode)
-			}
-
-			file, err := os.Create(destPath)
-			if err != nil {
-				output.Errorf(1, "create file: %v", err)
-			}
-
-			written, err := io.Copy(file, resp.Body)
-			file.Close()
-			if err != nil {
-				os.Remove(destPath)
-				output.Errorf(1, "download interrupted: %v", err)
-			}
-
-			green.Printf("Downloaded %s (%.1f MB)\n", filename, float64(written)/(1024*1024))
-			fmt.Println()
-
-			runPostInstall(destPath, deb, dim)
-
-			fmt.Println()
-			bold.Println("Next steps:")
-			dim.Println("  browseros-cli launch        # start BrowserOS")
-			dim.Println("  browseros-cli init --auto   # configure the CLI")
-		},
-	}
-
-	cmd.Flags().String("dir", ".", "Directory to download the installer to")
-	cmd.Flags().Bool("deb", false, "Download .deb package instead of AppImage (Linux only)")
-
-	rootCmd.AddCommand(cmd)
-}
-
-func resolveDownload(deb bool) (url, filename string) {
-	switch runtime.GOOS {
-	case "darwin":
-		return "https://files.browseros.com/download/BrowserOS.dmg", "BrowserOS.dmg"
-	case "windows":
-		return "https://files.browseros.com/download/BrowserOS_installer.exe", "BrowserOS_installer.exe"
-	case "linux":
-		if deb {
-			return "https://cdn.browseros.com/download/BrowserOS.deb", "BrowserOS.deb"
-		}
-		return "https://files.browseros.com/download/BrowserOS.AppImage", "BrowserOS.AppImage"
-	default:
-		output.Errorf(1, "unsupported platform: %s/%s\n  Download manually from https://browseros.com", runtime.GOOS, runtime.GOARCH)
-		return "", ""
-	}
-}
-
-func platformDisplayName() string {
-	switch runtime.GOOS {
-	case "darwin":
-		return "macOS"
-	case "windows":
-		return "Windows"
-	case "linux":
-		return "Linux"
-	default:
-		return runtime.GOOS
-	}
-}
-
-func runPostInstall(path string, deb bool, dim *color.Color) {
-	switch runtime.GOOS {
-	case "darwin":
-		installMacOS(path, dim)
-
-	case "linux":
-		if deb {
-			dim.Println("Install the .deb package:")
-			fmt.Printf("  sudo dpkg -i %s\n", path)
-		} else {
-			os.Chmod(path, 0755)
-			dim.Printf("AppImage is ready to run: ./%s\n", filepath.Base(path))
-		}
-
-	case "windows":
-		fmt.Println("Launching installer...")
-		if err := exec.Command("cmd", "/c", "start", "", path).Run(); err != nil {
-			dim.Printf("Could not launch installer automatically. Run: %s\n", path)
-		} else {
-			dim.Println("Follow the installer prompts to complete setup.")
-		}
-	}
-}
-
-// installMacOS mounts the DMG and copies BrowserOS.app to /Applications.
-func installMacOS(dmgPath string, dim *color.Color) {
-	fmt.Println("Mounting disk image...")
-	mountOut, err := exec.Command("hdiutil", "attach", dmgPath, "-nobrowse").Output()
-	if err != nil {
-		dim.Println("Could not mount DMG automatically.")
-		dim.Printf("  Open it manually: open %s\n", dmgPath)
-		return
-	}
-
-	// Find the mount point (last field of last line of hdiutil output)
-	mountPoint := ""
-	for _, line := range splitLines(string(mountOut)) {
-		fields := splitTabs(line)
-		if len(fields) > 0 {
-			mountPoint = fields[len(fields)-1]
-		}
-	}
-
-	if mountPoint == "" {
-		dim.Println("DMG mounted but could not determine mount point.")
-		dim.Printf("  Open it manually: open %s\n", dmgPath)
-		return
-	}
-
-	// Look for BrowserOS.app in the mounted volume
-	appSrc := filepath.Join(mountPoint, "BrowserOS.app")
-	if _, err := os.Stat(appSrc); err != nil {
-		dim.Printf("DMG mounted at %s but BrowserOS.app not found inside.\n", mountPoint)
-		dim.Printf("  Check the volume manually: open %s\n", mountPoint)
-		exec.Command("hdiutil", "detach", mountPoint, "-quiet").Run()
-		return
-	}
-
-	appDest := "/Applications/BrowserOS.app"
-	fmt.Printf("Installing to %s...\n", appDest)
-
-	// Remove existing installation if present
-	os.RemoveAll(appDest)
-
-	// Copy using cp -R (preserves code signatures, symlinks, etc.)
-	if err := exec.Command("cp", "-R", appSrc, appDest).Run(); err != nil {
-		dim.Printf("Could not copy to /Applications (may need sudo).\n")
-		dim.Printf("  Try: sudo cp -R \"%s\" /Applications/\n", appSrc)
-		exec.Command("hdiutil", "detach", mountPoint, "-quiet").Run()
-		return
-	}
-
-	// Unmount
-	exec.Command("hdiutil", "detach", mountPoint, "-quiet").Run()
-
-	// Clean up DMG
-	os.Remove(dmgPath)
-
-	fmt.Println("BrowserOS installed to /Applications/BrowserOS.app")
-}
-
-func splitLines(s string) []string {
-	var lines []string
-	for _, line := range filepath.SplitList(s) {
-		lines = append(lines, line)
-	}
-	// filepath.SplitList uses : on unix, not newlines — use manual split
-	result := []string{}
-	start := 0
-	for i := 0; i < len(s); i++ {
-		if s[i] == '\n' {
-			line := s[start:i]
-			if len(line) > 0 {
-				result = append(result, line)
-			}
-			start = i + 1
-		}
-	}
-	if start < len(s) {
-		result = append(result, s[start:])
-	}
-	return result
-}
-
-func splitTabs(s string) []string {
-	result := []string{}
-	start := 0
-	for i := 0; i < len(s); i++ {
-		if s[i] == '\t' {
-			field := s[start:i]
-			if len(field) > 0 {
-				result = append(result, field)
-			}
-			start = i + 1
-		}
-	}
-	if start < len(s) {
-		field := s[start:]
-		if len(field) > 0 {
-			result = append(result, field)
-		}
-	}
-	return result
-}

packages/browseros-agent/apps/cli/cmd/launch.go

@@ -1,287 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-
-	"browseros-cli/output"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-)
-
-// macOS bundle identifier — verified from BrowserOS.app/Contents/Info.plist
-const browserOSBundleID = "com.browseros.BrowserOS"
-
-func init() {
-	cmd := &cobra.Command{
-		Use:   "launch",
-		Short: "Launch the BrowserOS application",
-		Long: `Find and launch the BrowserOS application.
-
-Uses platform-native detection to find BrowserOS, launches it,
-and waits for the server to become ready.
-
-If BrowserOS is already running, reports the server URL.`,
-		Annotations: map[string]string{"group": "Setup:"},
-		Args:        cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			green := color.New(color.FgGreen)
-			dim := color.New(color.Faint)
-			waitSecs, _ := cmd.Flags().GetInt("wait")
-
-			if url := probeRunningServer(); url != "" {
-				green.Printf("BrowserOS is already running at %s\n", url)
-				return
-			}
-
-			if !isBrowserOSInstalled() {
-				output.Error("BrowserOS is not installed.\n\n"+
-					"  To install:  browseros-cli install", 1)
-			}
-
-			fmt.Println("Launching BrowserOS...")
-			if err := startBrowserOS(); err != nil {
-				output.Errorf(1, "failed to launch: %v", err)
-			}
-
-			fmt.Print("Waiting for server")
-			url, ok := waitForServer(time.Duration(waitSecs) * time.Second)
-			fmt.Println()
-
-			if !ok {
-				output.Error("BrowserOS launched but server didn't respond within "+
-					fmt.Sprintf("%d seconds.\n", waitSecs)+
-					"  Check if BrowserOS is fully loaded, then retry.", 1)
-			}
-
-			green.Printf("BrowserOS is ready at %s\n", url)
-			fmt.Println()
-			dim.Println("Next: browseros-cli init --auto")
-		},
-	}
-
-	cmd.Flags().Int("wait", 30, "Seconds to wait for server to start")
-	rootCmd.AddCommand(cmd)
-}
-
-// ---------------------------------------------------------------------------
-// Server probing
-// ---------------------------------------------------------------------------
-
-// probeRunningServer checks server.json, config, and common ports for a running server.
-func probeRunningServer() string {
-	check := func(baseURL string) bool {
-		client := &http.Client{Timeout: 2 * time.Second}
-		resp, err := client.Get(baseURL + "/health")
-		if err != nil {
-			return false
-		}
-		resp.Body.Close()
-		return resp.StatusCode == 200
-	}
-
-	// 1. server.json — written by BrowserOS on startup with the actual port
-	if url := loadBrowserosServerURL(); url != "" && check(url) {
-		return url
-	}
-
-	// 2. Saved config / env var
-	if url := defaultServerURL(); url != "" && check(url) {
-		return url
-	}
-
-	// 3. Probe common BrowserOS ports as last resort
-	for _, port := range []int{9100, 9200, 9300} {
-		url := fmt.Sprintf("http://127.0.0.1:%d", port)
-		if check(url) {
-			return url
-		}
-	}
-
-	return ""
-}
-
-// ---------------------------------------------------------------------------
-// Platform-native installation detection
-// ---------------------------------------------------------------------------
-
-// isBrowserOSInstalled checks if BrowserOS is installed using platform-native methods.
-//
-// macOS:   `open -Ra "BrowserOS"` — queries Launch Services (finds apps anywhere)
-// Linux:   checks /usr/bin/browseros (.deb), browseros.desktop, or AppImage files
-// Windows: checks executable at %LOCALAPPDATA%\BrowserOS\Application\BrowserOS.exe
-//          and registry uninstall key (per-user Chromium install pattern)
-func isBrowserOSInstalled() bool {
-	switch runtime.GOOS {
-	case "darwin":
-		// open -Ra checks if Launch Services knows about the app without launching it.
-		// Works regardless of where the app is installed.
-		return exec.Command("open", "-Ra", "BrowserOS").Run() == nil
-
-	case "linux":
-		// .deb install puts `browseros` in /usr/bin/
-		if _, err := exec.LookPath("browseros"); err == nil {
-			return true
-		}
-		// .deb also creates browseros.desktop
-		for _, dir := range []string{
-			"/usr/share/applications",
-			filepath.Join(userHomeDir(), ".local/share/applications"),
-		} {
-			if _, err := os.Stat(filepath.Join(dir, "browseros.desktop")); err == nil {
-				return true
-			}
-		}
-		// AppImage — user may have it in ~/Downloads, ~/Applications, etc.
-		return findLinuxAppImage() != ""
-
-	case "windows":
-		// Chromium per-user install: %LOCALAPPDATA%\BrowserOS\Application\BrowserOS.exe
-		if exePath := windowsBrowserOSExe(); exePath != "" {
-			if _, err := os.Stat(exePath); err == nil {
-				return true
-			}
-		}
-		// Fallback: check uninstall registry (per-user install uses HKCU)
-		for _, root := range []string{"HKCU", "HKLM"} {
-			key := root + `\Software\Microsoft\Windows\CurrentVersion\Uninstall\BrowserOS`
-			if exec.Command("reg", "query", key, "/v", "DisplayName").Run() == nil {
-				return true
-			}
-		}
-		return false
-	}
-
-	return false
-}
-
-// ---------------------------------------------------------------------------
-// Platform-native launch
-// ---------------------------------------------------------------------------
-
-// startBrowserOS launches BrowserOS using platform-native methods.
-//
-// macOS:   `open -b com.browseros.BrowserOS` — launches by bundle ID
-// Linux:   runs `browseros` binary or AppImage directly
-// Windows: runs BrowserOS.exe from the known install path
-func startBrowserOS() error {
-	switch runtime.GOOS {
-	case "darwin":
-		// Launch by bundle ID via Launch Services — no hardcoded paths needed.
-		return exec.Command("open", "-b", browserOSBundleID).Run()
-
-	case "linux":
-		// .deb install: browseros is in PATH
-		if p, err := exec.LookPath("browseros"); err == nil {
-			return startDetached(p)
-		}
-		// AppImage: run it directly
-		if appImage := findLinuxAppImage(); appImage != "" {
-			return startDetached(appImage)
-		}
-		// .desktop file: use gtk-launch (not xdg-open, which opens by MIME type)
-		if _, err := exec.LookPath("gtk-launch"); err == nil {
-			return exec.Command("gtk-launch", "browseros").Run()
-		}
-		return fmt.Errorf("BrowserOS found but could not determine how to launch it")
-
-	case "windows":
-		if exePath := windowsBrowserOSExe(); exePath != "" {
-			if _, err := os.Stat(exePath); err == nil {
-				return startDetached(exePath)
-			}
-		}
-		return fmt.Errorf("BrowserOS.exe not found at expected location")
-
-	default:
-		return fmt.Errorf("unsupported platform: %s", runtime.GOOS)
-	}
-}
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-// startDetached starts a process in the background without inheriting stdio.
-func startDetached(path string, args ...string) error {
-	cmd := exec.Command(path, args...)
-	cmd.Stdout = nil
-	cmd.Stderr = nil
-	cmd.Stdin = nil
-	return cmd.Start()
-}
-
-// windowsBrowserOSExe returns the expected BrowserOS.exe path on Windows.
-// Chromium per-user installs go to %LOCALAPPDATA%\<base_app_name>\Application\<binary>.
-// base_app_name = "BrowserOS" (from chromium_install_modes.h)
-func windowsBrowserOSExe() string {
-	localAppData := os.Getenv("LOCALAPPDATA")
-	if localAppData == "" {
-		return ""
-	}
-	return filepath.Join(localAppData, "BrowserOS", "Application", "BrowserOS.exe")
-}
-
-// findLinuxAppImage searches common locations for a BrowserOS AppImage.
-func findLinuxAppImage() string {
-	home := userHomeDir()
-	if home == "" {
-		return ""
-	}
-	for _, dir := range []string{
-		home,
-		filepath.Join(home, "Applications"),
-		filepath.Join(home, "Downloads"),
-		"/opt",
-	} {
-		entries, err := os.ReadDir(dir)
-		if err != nil {
-			continue
-		}
-		for _, e := range entries {
-			name := e.Name()
-			if strings.HasPrefix(name, "BrowserOS") && strings.HasSuffix(name, ".AppImage") {
-				return filepath.Join(dir, name)
-			}
-		}
-	}
-	return ""
-}
-
-// userHomeDir returns the home directory or empty string.
-func userHomeDir() string {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return ""
-	}
-	return home
-}
-
-// waitForServer polls until a BrowserOS server responds or timeout.
-func waitForServer(maxWait time.Duration) (string, bool) {
-	client := &http.Client{Timeout: 2 * time.Second}
-	deadline := time.Now().Add(maxWait)
-
-	for time.Now().Before(deadline) {
-		// server.json is written by BrowserOS on startup with the actual port
-		if url := loadBrowserosServerURL(); url != "" {
-			resp, err := client.Get(url + "/health")
-			if err == nil {
-				resp.Body.Close()
-				if resp.StatusCode == 200 {
-					return url, true
-				}
-			}
-		}
-		fmt.Print(".")
-		time.Sleep(1 * time.Second)
-	}
-	return "", false
-}

packages/browseros-agent/apps/cli/cmd/root.go

@@ -1,20 +1,15 @@
 package cmd
 
 import (
-	"context"
-	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
-	"browseros-cli/analytics"
 	"browseros-cli/config"
 	"browseros-cli/mcp"
 	"browseros-cli/output"
-	"browseros-cli/update"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
@@ -30,11 +25,8 @@ var (
 	version   = "dev"
 )
 
-const automaticUpdateDrainTimeout = 150 * time.Millisecond
-
 func SetVersion(v string) {
 	version = v
-	rootCmd.Version = v
 }
 
 var (
@@ -119,40 +111,11 @@ var rootCmd = &cobra.Command{
 }
 
 func Execute() {
-	automaticUpdater := newAutomaticUpdateManager(os.Args[1:])
-	automaticNotice := ""
-	var automaticCheckDone <-chan struct{}
-	if automaticUpdater != nil {
-		automaticNotice = automaticUpdater.CachedNotice()
-		automaticCheckDone = automaticUpdater.StartBackgroundCheck(context.Background())
-	}
-
-	analytics.Init(version)
-	start := time.Now()
-
-	err := rootCmd.Execute()
-
-	if automaticNotice != "" && err == nil {
-		fmt.Fprintln(os.Stderr, automaticNotice)
-	}
-	drainAutomaticUpdateCheck(automaticCheckDone)
-
-	analytics.Track(commandName(os.Args[1:]), err == nil, time.Since(start))
-	analytics.Close()
-
-	if err != nil {
+	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}
 }
 
-func commandName(args []string) string {
-	cmd, _, err := rootCmd.Find(args)
-	if err != nil || cmd == rootCmd {
-		return "unknown"
-	}
-	return cmd.CommandPath()
-}
-
 func init() {
 	cobra.AddTemplateFunc("helpHeader", helpHeader)
 	cobra.AddTemplateFunc("helpCmdCol", helpCmdCol)
@@ -201,165 +164,25 @@ func envBool(key string) bool {
 	return v == "1" || v == "true"
 }
 
-func newAutomaticUpdateManager(args []string) *update.Manager {
-	if shouldSkipAutomaticUpdates(args) {
-		return nil
-	}
-
-	return update.NewManager(update.Options{
-		CurrentVersion: version,
-		JSONOutput:     requestedBoolFlag(args, "--json", jsonOut),
-		Debug:          requestedBoolFlag(args, "--debug", debug),
-		Automatic:      true,
-	})
-}
-
-func shouldSkipAutomaticUpdates(args []string) bool {
-	if hasHelpFlag(args) || requestedBoolFlag(args, "--version", false) {
-		return true
-	}
-
-	switch primaryCommand(args) {
-	case "help", "completion", "update", "self-update", "upgrade":
-		return true
-	default:
-		return false
-	}
-}
-
-func hasHelpFlag(args []string) bool {
-	if requestedBoolFlag(args, "--help", false) {
-		return true
-	}
-
-	for _, arg := range args {
-		if arg == "-h" {
-			return true
-		}
-	}
-
-	return false
-}
-
-func primaryCommand(args []string) string {
-	for _, arg := range args {
-		if strings.HasPrefix(arg, "-") {
-			continue
-		}
-		return arg
-	}
-	return ""
-}
-
-func requestedBoolFlag(args []string, flagName string, current bool) bool {
-	if current {
-		return true
-	}
-
-	prefix := flagName + "="
-	for _, arg := range args {
-		if arg == flagName {
-			return true
-		}
-		if strings.HasPrefix(arg, prefix) {
-			value, err := strconv.ParseBool(strings.TrimPrefix(arg, prefix))
-			return err == nil && value
-		}
-	}
-
-	return false
-}
-
-func drainAutomaticUpdateCheck(done <-chan struct{}) {
-	drainAutomaticUpdateCheckWithTimeout(done, automaticUpdateDrainTimeout)
-}
-
-func drainAutomaticUpdateCheckWithTimeout(done <-chan struct{}, timeout time.Duration) {
-	if done == nil {
-		return
-	}
-
-	timer := time.NewTimer(timeout)
-	defer timer.Stop()
-
-	select {
-	case <-done:
-	case <-timer.C:
-	}
-}
-
 func defaultServerURL() string {
-	// 1. Explicit env var always wins
 	if env := normalizeServerURL(os.Getenv("BROWSEROS_URL")); env != "" {
 		return env
 	}
 
-	// 2. Live discovery file from running BrowserOS (most current)
-	if url := loadBrowserosServerURL(); url != "" {
-		return url
-	}
-
-	// 3. Saved config (may be stale if port changed)
 	cfg, err := config.Load()
-	if err == nil {
-		if url := normalizeServerURL(cfg.ServerURL); url != "" {
-			return url
-		}
-	}
-
-	return ""
-}
-
-type serverDiscoveryConfig struct {
-	ServerPort       int    `json:"server_port"`
-	URL              string `json:"url"`
-	ServerVersion    string `json:"server_version"`
-	BrowserOSVersion string `json:"browseros_version,omitempty"`
-	ChromiumVersion  string `json:"chromium_version,omitempty"`
-}
-
-func loadBrowserosServerURL() string {
-	home, err := os.UserHomeDir()
 	if err != nil {
 		return ""
 	}
 
-	data, err := os.ReadFile(filepath.Join(home, ".browseros", "server.json"))
-	if err != nil {
-		return ""
-	}
-
-	var sc serverDiscoveryConfig
-	if err := json.Unmarshal(data, &sc); err != nil {
-		return ""
-	}
-
-	return normalizeServerURL(sc.URL)
+	return normalizeServerURL(cfg.ServerURL)
 }
 
 func normalizeServerURL(raw string) string {
 	normalized := strings.TrimSpace(raw)
-
-	if isPortOnly(normalized) {
-		normalized = "http://127.0.0.1:" + normalized
-	}
-
 	normalized = strings.TrimSuffix(normalized, "/mcp")
 	return strings.TrimSuffix(normalized, "/")
 }
 
-func isPortOnly(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, c := range s {
-		if c < '0' || c > '9' {
-			return false
-		}
-	}
-	return true
-}
-
 func validateServerURL(raw string) (string, error) {
 	baseURL := normalizeServerURL(raw)
 	if baseURL != "" {
@@ -367,9 +190,6 @@ func validateServerURL(raw string) (string, error) {
 	}
 
 	return "", fmt.Errorf(
-		"BrowserOS server URL is not configured.\n\n" +
-			"  If BrowserOS is running:  browseros-cli init --auto\n" +
-			"  If BrowserOS is closed:   browseros-cli launch\n" +
-			"  If not installed:         browseros-cli install",
+		"BrowserOS server URL is not configured.\n  Open BrowserOS -> Settings -> BrowserOS MCP and copy the Server URL.\n  Then run: browseros-cli init",
 	)
 }

packages/browseros-agent/apps/cli/cmd/root_test.go

@@ -1,146 +0,0 @@
-package cmd
-
-import (
-	"testing"
-	"time"
-)
-
-func TestSetVersionUpdatesRootCommand(t *testing.T) {
-	originalVersion := version
-	originalRootVersion := rootCmd.Version
-	t.Cleanup(func() {
-		version = originalVersion
-		rootCmd.Version = originalRootVersion
-	})
-
-	SetVersion("1.2.3")
-
-	if version != "1.2.3" {
-		t.Fatalf("version = %q, want %q", version, "1.2.3")
-	}
-	if rootCmd.Version != "1.2.3" {
-		t.Fatalf("rootCmd.Version = %q, want %q", rootCmd.Version, "1.2.3")
-	}
-}
-
-func TestCommandName(t *testing.T) {
-	tests := []struct {
-		name string
-		args []string
-		want string
-	}{
-		{"empty args", nil, "unknown"},
-		{"known command", []string{"health"}, "browseros-cli health"},
-		{"unknown command", []string{"nonexistent"}, "unknown"},
-		{"subcommand", []string{"bookmark", "search"}, "browseros-cli bookmark search"},
-		{"known with extra args", []string{"snap", "--enhanced"}, "browseros-cli snap"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := commandName(tt.args)
-			if got != tt.want {
-				t.Errorf("commandName(%v) = %q, want %q", tt.args, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestPrimaryCommand(t *testing.T) {
-	tests := []struct {
-		name string
-		args []string
-		want string
-	}{
-		{"empty", nil, ""},
-		{"root flag then command", []string{"--json", "update"}, "update"},
-		{"subcommand", []string{"bookmark", "update"}, "bookmark"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := primaryCommand(tt.args); got != tt.want {
-				t.Fatalf("primaryCommand(%v) = %q, want %q", tt.args, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestRequestedBoolFlag(t *testing.T) {
-	if !requestedBoolFlag([]string{"--json"}, "--json", false) {
-		t.Fatal("requestedBoolFlag() = false, want true")
-	}
-	if !requestedBoolFlag([]string{"--debug=true"}, "--debug", false) {
-		t.Fatal("requestedBoolFlag() with assignment = false, want true")
-	}
-	if requestedBoolFlag([]string{"--debug=false"}, "--debug", false) {
-		t.Fatal("requestedBoolFlag() with false assignment = true, want false")
-	}
-}
-
-func TestShouldSkipAutomaticUpdates(t *testing.T) {
-	tests := []struct {
-		name string
-		args []string
-		want bool
-	}{
-		{"short help flag", []string{"-h"}, true},
-		{"help flag", []string{"--help"}, true},
-		{"version flag", []string{"--version"}, true},
-		{"update command", []string{"update"}, true},
-		{"bookmark update subcommand", []string{"bookmark", "update"}, false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := shouldSkipAutomaticUpdates(tt.args); got != tt.want {
-				t.Fatalf("shouldSkipAutomaticUpdates(%v) = %t, want %t", tt.args, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestDrainAutomaticUpdateCheckWithTimeoutWaitsForCompletion(t *testing.T) {
-	done := make(chan struct{})
-	returned := make(chan struct{})
-
-	go func() {
-		drainAutomaticUpdateCheckWithTimeout(done, time.Second)
-		close(returned)
-	}()
-
-	select {
-	case <-returned:
-		t.Fatal("drainAutomaticUpdateCheckWithTimeout() returned before check completed")
-	case <-time.After(10 * time.Millisecond):
-	}
-
-	close(done)
-
-	select {
-	case <-returned:
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("drainAutomaticUpdateCheckWithTimeout() did not return after check completed")
-	}
-}
-
-func TestDrainAutomaticUpdateCheckWithTimeoutStopsWaiting(t *testing.T) {
-	done := make(chan struct{})
-	returned := make(chan struct{})
-
-	go func() {
-		drainAutomaticUpdateCheckWithTimeout(done, 20*time.Millisecond)
-		close(returned)
-	}()
-
-	select {
-	case <-returned:
-		t.Fatal("drainAutomaticUpdateCheckWithTimeout() returned before timeout elapsed")
-	case <-time.After(5 * time.Millisecond):
-	}
-
-	select {
-	case <-returned:
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("drainAutomaticUpdateCheckWithTimeout() did not return after timeout")
-	}
-}

packages/browseros-agent/apps/cli/cmd/update.go

@@ -1,179 +0,0 @@
-package cmd
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"browseros-cli/output"
-	"browseros-cli/update"
-
-	"github.com/spf13/cobra"
-)
-
-type updateManager interface {
-	CheckNow(context.Context) (*update.CheckResult, error)
-	Apply(context.Context, *update.CheckResult) error
-}
-
-type updateOutcome struct {
-	result   *update.CheckResult
-	applied  bool
-	canceled bool
-}
-
-func init() {
-	cmd := &cobra.Command{
-		Use:         "update",
-		Aliases:     []string{"self-update", "upgrade"},
-		Annotations: map[string]string{"group": "Setup:"},
-		Short:       "Check for and apply CLI updates",
-		Args:        cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			checkOnly, _ := cmd.Flags().GetBool("check")
-			yes, _ := cmd.Flags().GetBool("yes")
-
-			manager := update.NewManager(update.Options{
-				CurrentVersion: version,
-				JSONOutput:     jsonOut,
-				Debug:          debug,
-				Automatic:      false,
-			})
-			outcome, err := runUpdateCommand(
-				cmd.Context(),
-				manager,
-				checkOnly,
-				yes,
-				stdinIsInteractive(os.Stdin),
-				os.Stdin,
-				os.Stderr,
-			)
-			if err != nil {
-				output.Error(err.Error(), 1)
-			}
-			printUpdateOutcome(outcome)
-		},
-	}
-
-	cmd.Flags().Bool("check", false, "Check for updates without applying them")
-	cmd.Flags().Bool("yes", false, "Apply update without prompting")
-
-	rootCmd.AddCommand(cmd)
-}
-
-func runUpdateCommand(
-	ctx context.Context,
-	manager updateManager,
-	checkOnly bool,
-	yes bool,
-	interactive bool,
-	stdin io.Reader,
-	stderr io.Writer,
-) (*updateOutcome, error) {
-	result, err := manager.CheckNow(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	outcome := &updateOutcome{result: result}
-	if checkOnly || !result.UpdateAvailable {
-		return outcome, nil
-	}
-	if !yes {
-		if !interactive {
-			return nil, fmt.Errorf("update requires confirmation; rerun with --yes")
-		}
-
-		confirmed, err := confirmUpdate(stdin, stderr, result)
-		if err != nil {
-			return nil, err
-		}
-		if !confirmed {
-			outcome.canceled = true
-			return outcome, nil
-		}
-	}
-	if err := manager.Apply(ctx, result); err != nil {
-		return nil, err
-	}
-	outcome.applied = true
-
-	return outcome, nil
-}
-
-func printUpdateOutcome(outcome *updateOutcome) {
-	if jsonOut {
-		output.JSONRaw(updateOutcomePayload(outcome))
-		return
-	}
-
-	switch {
-	case outcome.applied:
-		fmt.Printf("Updated browseros-cli to v%s\n", outcome.result.LatestVersion)
-	case outcome.canceled:
-		fmt.Println("Update canceled.")
-	case outcome.result.UpdateAvailable:
-		fmt.Println(update.FormatNotice(outcome.result.CurrentVersion, outcome.result.LatestVersion))
-	case outcome.result != nil:
-		fmt.Printf("browseros-cli is up to date (v%s)\n", outcome.result.CurrentVersion)
-	}
-}
-
-func updateOutcomePayload(outcome *updateOutcome) map[string]any {
-	payload := map[string]any{
-		"applied": outcome.applied,
-	}
-	if outcome.canceled {
-		payload["canceled"] = true
-	}
-	if outcome.result == nil {
-		return payload
-	}
-
-	payload["currentVersion"] = outcome.result.CurrentVersion
-	payload["latestVersion"] = outcome.result.LatestVersion
-	payload["updateAvailable"] = outcome.result.UpdateAvailable
-	if outcome.result.Asset != nil {
-		payload["asset"] = map[string]any{
-			"filename":      outcome.result.Asset.Filename,
-			"url":           outcome.result.Asset.URL,
-			"archiveFormat": outcome.result.Asset.ArchiveFormat,
-		}
-	}
-
-	return payload
-}
-
-func confirmUpdate(
-	stdin io.Reader,
-	stderr io.Writer,
-	result *update.CheckResult,
-) (bool, error) {
-	if _, err := fmt.Fprintf(
-		stderr,
-		"Install browseros-cli v%s over v%s? [y/N]: ",
-		result.LatestVersion,
-		result.CurrentVersion,
-	); err != nil {
-		return false, err
-	}
-
-	line, err := bufio.NewReader(stdin).ReadString('\n')
-	if err != nil && err != io.EOF {
-		return false, err
-	}
-	answer := strings.ToLower(strings.TrimSpace(line))
-
-	return answer == "y" || answer == "yes", nil
-}
-
-func stdinIsInteractive(file *os.File) bool {
-	info, err := file.Stat()
-	if err != nil {
-		return false
-	}
-	return info.Mode()&os.ModeCharDevice != 0
-}