feat: gate credits UI behind CREDITS_SUPPORT feature flag (server >= 0.0.78)

* feat: updated multitab workflow

* fix: updated prompt with fix for test cases

* fix: active agent glow

* fix: review comments

.github/workflows/audit.yml

@@ -9,6 +9,9 @@ on:
 jobs:
   security-audit:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/browseros-agent
 
     steps:
       - name: Checkout code

.github/workflows/cla.yml

@@ -1,11 +1,11 @@
-name: 'CLA Assistant'
+name: CLA Assistant
+
 on:
   issue_comment:
     types: [created]
   pull_request_target:
     types: [opened, closed, synchronize]
 
-# Explicitly configure permissions
 permissions:
   actions: write
   contents: write
@@ -13,47 +13,46 @@ permissions:
   statuses: write
 
 jobs:
-  CLAAssistant:
+  cla:
     runs-on: ubuntu-latest
+    if: |
+      (github.event_name == 'pull_request_target') ||
+      (github.event_name == 'issue_comment' && github.event.issue.pull_request &&
+       (github.event.comment.body == 'recheck' ||
+        github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA'))
     steps:
-      - name: 'CLA Assistant'
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+      - name: CLA Assistant
         uses: contributor-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_SIGNATURES_TOKEN }}
         with:
-          # Path where signatures will be stored
-          path-to-signatures: 'signatures/version1/cla.json'
-
-          # Path to your CLA document
-          path-to-document: 'https://github.com/browseros-ai/BrowserOS/blob/main/CLA.md'
-
-          # Branch to store signatures (should not be protected)
+          path-to-signatures: 'cla-signatures.json'
+          path-to-document: 'https://github.com/${{ github.repository }}/blob/main/CLA.md'
           branch: 'main'
-
-          # Allowlist for users who don't need to sign (bots, core team members)
-          allowlist: shadowfax92,felarof99,dependabot[bot],renovate[bot],github-actions[bot]
-
-          # Optional: Custom messages
+          remote-organization-name: 'browseros-ai'
+          remote-repository-name: 'cla-signatures'
+          allowlist: 'shadowfax92,felarof99,bot*,*[bot],dependabot,renovate,github-actions,snyk-bot,imgbot,greenkeeper,semantic-release-bot,allcontributors'
+          lock-pullrequest-aftermerge: false
           custom-notsigned-prcomment: |
-            **CLA Assistant Lite bot** Thank you for your submission! We require contributors to sign our [Contributor License Agreement](https://github.com/browseros-ai/BrowserOS/blob/main/CLA.md) before we can accept your contribution.
+            Thank you for your contribution! Before we can merge this PR, we need you to sign our [Contributor License Agreement](https://github.com/${{ github.repository }}/blob/main/CLA.md).
 
-            By signing the CLA, you confirm that:
-            - You have read and agree to the AGPL-3.0 license terms
-            - Your contribution is your original work
-            - You grant us the rights to use your contribution under the AGPL-3.0 license
+            **To sign the CLA**, please add a comment to this PR with the following text:
 
-            **To sign the CLA, please comment on this PR with:**
-            `I have read the CLA Document and I hereby sign the CLA`
+            ```
+            I have read the CLA Document and I hereby sign the CLA
+            ```
 
+            You only need to sign once. After signing, this check will pass automatically.
+
+            ---
+            <details>
+            <summary>Troubleshooting</summary>
+
+            - **Already signed but still failing?** Comment `recheck` to trigger a re-verification.
+            - **Signed with a different email?** Make sure your commit email matches your GitHub account email, or add your commit email to your GitHub account.
+
+            </details>
           custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
-
           custom-allsigned-prcomment: |
-            **CLA Assistant Lite bot** ✅ All contributors have signed the CLA. Thank you for helping make BrowserOS better!
-
-          # Lock PR after merge to prevent signature tampering
-          lock-pullrequest-aftermerge: true
-
-          # Custom commit messages
-          create-file-commit-message: 'docs: Create CLA signatures file'
-          signed-commit-message: 'docs: $contributorName signed the CLA in $owner/$repo#$pullRequestNo'
+            All contributors have signed the CLA. Thank you!

.github/workflows/claude.yml

@@ -22,11 +22,11 @@ jobs:
       (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
     runs-on: ubuntu-latest
     permissions:
-      contents: write        # Can push branches and create commits
-      pull-requests: write   # Can create and update PRs
+      contents: write
+      pull-requests: write
       issues: read
       id-token: write
-      actions: read          # Required for Claude to read CI results on PRs
+      actions: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -38,11 +38,5 @@ jobs:
         uses: anthropics/claude-code-action@v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
           additional_permissions: |
             actions: read
-
-          # Allow all tools - branch protection rules at repo level prevent direct pushes to main/master
-          # Omitting --allowedTools means all tools are available by default
-

.github/workflows/code-quality.yml

@@ -4,11 +4,16 @@ on:
   pull_request:
     branches:
       - main
+    paths:
+      - "packages/browseros-agent/**"
 
 jobs:
   biome:
     name: runner / Biome
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/browseros-agent
     permissions:
       contents: read
     steps:
@@ -28,6 +33,9 @@ jobs:
   typecheck:
     name: runner / Typecheck
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/browseros-agent
     permissions:
       contents: read
     steps:
@@ -42,6 +50,9 @@ jobs:
       - name: Install dependencies
         run: bun ci
 
+      - name: Prepare wxt
+        run: VITE_PUBLIC_BROWSEROS_API=http://localhost:3000 bun run --cwd apps/agent wxt prepare
+
       - name: Run codegen
         run: bun run --cwd apps/agent codegen
 

.github/workflows/pr-title.yml

@@ -5,9 +5,9 @@ on:
     types: [opened, synchronize, reopened, edited]
 
 permissions:
-  pull-requests: write  # Read PR details and add labels
-  issues: write         # Labels are managed via issues API
-  contents: read        # Read repository content
+  pull-requests: write
+  issues: write
+  contents: read
 
 jobs:
   validate-pr-title:

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

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: packages/agent-sdk
+        working-directory: packages/browseros-agent/packages/agent-sdk
 
     steps:
       - uses: actions/checkout@v6
@@ -23,7 +23,7 @@ jobs:
 
       - name: Install dependencies
         run: bun ci
-        working-directory: .
+        working-directory: packages/browseros-agent
 
       - name: Build
         run: bun run build

.github/workflows/test.yml

@@ -7,18 +7,21 @@ jobs:
     name: Run Tests
     runs-on: macos-latest
     timeout-minutes: 10
+    defaults:
+      run:
+        working-directory: packages/browseros-agent
 
     steps:
-      - name: 📥 Checkout code
+      - name: Checkout code
         uses: actions/checkout@v6
 
-      - name: 🧰 Setup Bun
+      - name: Setup Bun
         uses: oven-sh/setup-bun@v2
 
-      - name: 📦 Install dependencies
+      - name: Install dependencies
         run: bun ci
 
-      - name: 🧪 Run all tests
+      - name: Run all tests
         run: bun test:all
         env:
           PUPPETEER_EXECUTABLE_PATH: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome

.gitignore

@@ -26,3 +26,6 @@ gclient.json
 **/resources/binaries/
 
 packages/browseros/build/tools/
+
+# AI SDK DevTools traces
+.devtools/

.vscode/settings.json

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

lefthook.yml

@@ -0,0 +1,57 @@
+commit-msg:
+  commands:
+    conventional:
+      run: |
+        msg=$(head -1 {1})
+        if [[ ! "$msg" =~ ^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert)(\(.+\))?\!?:\ .+ ]]; then
+          echo "Commit message must follow Conventional Commits format:"
+          echo "  <type>(<optional scope>): <description>"
+          echo "  Types: feat, fix, docs, style, refactor, perf, test, chore, ci, build, revert"
+          echo ""
+          echo "Examples:"
+          echo "  feat(auth): add OAuth2 support"
+          echo "  fix: resolve null pointer exception"
+          exit 1
+        fi
+
+pre-commit:
+  commands:
+    biome-check:
+      root: "packages/browseros-agent/"
+      glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}"
+      run: npx @biomejs/biome check --write --no-errors-on-unmatched --files-ignore-unknown=true --colors=off {staged_files}
+      stage_fixed: true
+
+    file-length:
+      root: "packages/browseros-agent/"
+      glob: "*.{ts,tsx}"
+      exclude: "*.{test,spec,d}.ts|*.{test,spec}.tsx|**/__tests__/**|**/tests/**|**/*.generated.*"
+      run: |
+        for file in {staged_files}; do
+          if [[ -f "$file" ]]; then
+            lines=$(wc -l < "$file" | tr -d ' ')
+            if [[ $lines -gt 400 ]]; then
+              echo "⚠️  Warning: $file has $lines lines (threshold: 400)"
+              echo "   Consider splitting this file if it has multiple responsibilities."
+            fi
+          fi
+        done
+
+pre-push:
+  commands:
+    branch-name:
+      run: |
+        branch=$(git rev-parse --abbrev-ref HEAD)
+        if [[ "$branch" == "main" || "$branch" == "master" ]]; then
+          exit 0
+        fi
+        if [[ ! "$branch" =~ ^(feat|fix|bugfix|hotfix|release|docs|refactor|test|chore|experiment)/[a-z0-9-]+$ ]]; then
+          echo "⚠️  Warning: Branch name '$branch' doesn't match recommended format."
+          echo "   Use: <type>/<short-description>"
+          echo "   Types: feat, fix, bugfix, hotfix, release, docs, refactor, test, chore, experiment"
+          echo "   Example: feat/add-auth, fix/login-crash"
+          echo ""
+          echo "   To rename your branch:"
+          echo "     git branch -m <new-name>"
+          echo "     git push -u origin <new-name>"
+        fi

packages/browseros-agent/.claude/skills/test-ui/SKILL.md

@@ -0,0 +1,286 @@
+---
+name: test-ui
+description: Test the BrowserOS agent extension UI by starting the dev environment and visually verifying changes via CDP. Covers the new tab page (left sidebar — Home, Scheduled Tasks, Settings, etc.) and the right side panel (chat interface). Use after making UI changes to apps/agent/.
+argument-hint: [what to test, e.g. "verify the new settings page renders correctly"]
+---
+
+# Test Agent UI
+
+Visually test the BrowserOS agent extension UI — both the new tab page (left sidebar) and the right side panel (chat) — by starting the dev environment and inspecting via CDP.
+
+## When to use
+
+After making code changes to `apps/agent/` (the Chrome extension), use this skill to:
+- Verify new UI components render correctly
+- Check navigation between views works
+- Confirm layout/styling changes look right
+- Test interactive elements (buttons, inputs, forms)
+
+## Prerequisites
+
+- **Go** must be installed (`brew install go`) — the dev tool is written in Go
+- **BrowserOS.app** must be installed at `/Applications/BrowserOS.app/`
+- The `scripts/dev/inspect-ui.ts` utility must exist (CDP inspector script)
+
+## Step 1: Start the dev environment
+
+```bash
+bun run dev:watch -- --new
+```
+
+This single command handles everything:
+- Builds the Go dev CLI tool
+- Picks random available ports (avoids conflicts)
+- Creates a fresh browser profile
+- Builds controller-ext
+- Runs GraphQL codegen if `apps/agent/generated/graphql/` doesn't exist
+- Starts the agent extension with WXT HMR (hot module replacement)
+- Waits for CDP to be ready
+- Starts the MCP server
+
+Run it in the background and **read the output to find the CDP port**:
+
+```
+[info] Ports: CDP=9552 Server=9065 Extension=9929
+```
+
+The CDP port is randomized. You MUST extract it from the output and set it for all subsequent commands:
+
+```bash
+export BROWSEROS_CDP_PORT=<port from output>
+```
+
+Wait for these messages before proceeding:
+1. `[server] CDP ready`
+2. `[server] HTTP server listening`
+
+## Step 2: Discover targets
+
+```bash
+bun scripts/dev/inspect-ui.ts targets
+```
+
+You will see targets like:
+- `[service_worker]` — extension background scripts (not directly testable for UI)
+- `[page] chrome-extension://bflpfmnmnokmjhmgnolecpppdbdophmk/app.html#/...` — **New tab page (left sidebar)**
+- `[page] sidepanel.html` — **Right side panel (chat)**
+
+The two main testable surfaces:
+- **`app.html`** — the new tab page with left sidebar (Home, Connect Apps, Scheduled Tasks, Skills, Memory, Soul, Settings)
+- **`sidepanel.html`** — the right side panel chat interface
+
+## Step 3: Navigate to the main UI
+
+A fresh profile opens the **onboarding page** (`app.html#/onboarding`). Navigate to the home page first:
+
+```bash
+bun scripts/dev/inspect-ui.ts eval app.html "window.location.hash = '#/home'"
+```
+
+Verify with a snapshot (not screenshot — snapshot is faster and sufficient for structural checks):
+```bash
+bun scripts/dev/inspect-ui.ts snapshot app.html
+```
+
+## Snapshot vs Screenshot
+
+**Prefer `snapshot` for most checks** — it's fast, text-based, and tells you what elements exist, their text, and their IDs. Use it after every navigation or interaction to verify state.
+
+**Use `screenshot` only when you need visual verification** — layout changes, CSS/styling, colors, images, or a final "does it look right" check. Screenshots are expensive (capture → save → read image).
+
+| Check | Use |
+|-------|-----|
+| Did the page navigate? | `snapshot` — look for new elements |
+| Does my new component render? | `snapshot` — look for its text/role |
+| Did a click change state? | `snapshot` — check element names/values |
+| Is the layout correct? | `screenshot` — visual check needed |
+| Do CSS changes look right? | `screenshot` — visual check needed |
+| Final verification before committing | `screenshot` — one visual confirmation |
+
+## Step 4: Test the new tab page (left sidebar)
+
+### Get element IDs
+
+```bash
+bun scripts/dev/inspect-ui.ts snapshot app.html
+```
+
+Output shows interactive elements with IDs:
+```
+[52] link "Home"
+[57] link "Connect Apps"
+[65] link "Scheduled Tasks"
+[74] link "Skills"
+[103] link "Settings"
+```
+
+### Navigate via click or hash routing
+
+**Click-based** (use element IDs from snapshot):
+```bash
+bun scripts/dev/inspect-ui.ts click app.html 65    # Click "Scheduled Tasks"
+```
+
+**Hash routing** (faster, no snapshot needed):
+```bash
+bun scripts/dev/inspect-ui.ts eval app.html "window.location.hash = '#/settings'"
+bun scripts/dev/inspect-ui.ts eval app.html "window.location.hash = '#/scheduled-tasks'"
+bun scripts/dev/inspect-ui.ts eval app.html "window.location.hash = '#/home'"
+```
+
+### Verify navigation
+
+```bash
+# Snapshot to confirm the page changed (fast, preferred)
+bun scripts/dev/inspect-ui.ts snapshot app.html
+
+# Screenshot only if you need to check visual layout
+bun scripts/dev/inspect-ui.ts screenshot app.html /tmp/settings.png
+```
+
+### CRITICAL: Re-snapshot after every navigation
+
+React re-renders change element IDs. **Always run snapshot again** before clicking/filling after navigating to a new view. Using stale IDs will fail.
+
+## Step 5: Open and test the right side panel
+
+The side panel starts **disabled** in a fresh profile. Open it using BrowserOS-specific APIs:
+
+```bash
+bun scripts/dev/inspect-ui.ts open-sidepanel
+```
+
+Wait 2 seconds for it to appear as a target, then:
+
+```bash
+bun scripts/dev/inspect-ui.ts screenshot sidepanel /tmp/panel.png
+bun scripts/dev/inspect-ui.ts snapshot sidepanel
+```
+
+### Interact with the side panel
+
+```bash
+# Get element IDs
+bun scripts/dev/inspect-ui.ts snapshot sidepanel
+# Output: [37] textbox "What should I do?"
+#         [124] button "Send"
+#         [60] link "Chat history"
+#         [99] button "Agent Mode ON"
+
+# Fill the chat input and press Enter to send
+bun scripts/dev/inspect-ui.ts fill sidepanel 37 "Hello world"
+bun scripts/dev/inspect-ui.ts press_key sidepanel Enter
+
+# Or click the Send button
+bun scripts/dev/inspect-ui.ts click sidepanel 124
+
+# Wait for a response to appear
+bun scripts/dev/inspect-ui.ts wait_for sidepanel text "response text"
+
+# Scroll down to see more content
+bun scripts/dev/inspect-ui.ts scroll sidepanel down 3
+
+# Hover over an element to test hover states
+bun scripts/dev/inspect-ui.ts hover sidepanel 99
+
+# Snapshot to verify state changed (fast, preferred)
+bun scripts/dev/inspect-ui.ts snapshot sidepanel
+
+# Screenshot only for visual/layout verification
+bun scripts/dev/inspect-ui.ts screenshot sidepanel /tmp/result.png
+```
+
+## Step 6: Verify and iterate
+
+### The core loop
+
+```
+snapshot → identify element IDs → click/fill/press_key → snapshot → verify
+```
+
+Use `screenshot` only when visual layout verification is needed (CSS changes, final check).
+
+### After making code changes
+
+1. Fix the code in `apps/agent/`
+2. WXT HMR will hot-reload the extension automatically (watch mode)
+3. Wait 2-3 seconds for the reload to complete
+4. **Re-snapshot** — element IDs WILL change after HMR reload
+5. Verify the fix with snapshot (or screenshot if visual)
+
+### Check server logs
+
+The dev server output (running in background) contains useful diagnostics:
+- `[agent]` — WXT build/HMR status, compilation errors
+- `[server]` — MCP server logs, tool execution, errors
+- `[build]` — Extension build output
+
+If the UI isn't rendering, check for build errors in the `[agent]` output.
+
+### Check for JavaScript errors
+
+```bash
+bun scripts/dev/inspect-ui.ts eval sidepanel "JSON.stringify(window.__errors || 'no errors')"
+```
+
+Or check the console for React errors:
+```bash
+bun scripts/dev/inspect-ui.ts eval app.html "document.querySelector('#root')?.innerHTML?.substring(0, 200)"
+```
+
+### Verify API connectivity
+
+The extension talks to the MCP server. Verify the server is reachable:
+```bash
+bun scripts/dev/inspect-ui.ts eval sidepanel "fetch('http://127.0.0.1:<serverPort>/health').then(r => r.ok).catch(() => false)"
+```
+
+### Common issues
+
+| Symptom | Cause | Fix |
+|---------|-------|-----|
+| Blank page after navigation | React render error | Check `eval` for JS errors |
+| Element IDs don't match | Page re-rendered (HMR/navigation) | Re-run `snapshot` before interacting |
+| `open-sidepanel` fails | Extension not fully loaded | Wait longer after dev server starts |
+| Click does nothing | Element not visible (below fold) | Use `scroll` first, then re-snapshot |
+| `wait_for` times out | Content hasn't loaded yet | Check server logs for API errors |
+
+## Available commands reference
+
+| Command | Description |
+|---------|-------------|
+| `targets` | List all CDP targets, marks extension pages with `[EXTENSION]` |
+| `screenshot <target> [file]` | Capture PNG screenshot (default: `screenshot.png`) |
+| `snapshot <target>` | Print accessibility tree with `[elementId] role "name"` |
+| `click <target> <elementId>` | Click element by ID (3-tier coordinate fallback + JS click) |
+| `fill <target> <elementId> <text>` | Focus element, clear, type text |
+| `press_key <target> <key>` | Press key or combo: `Enter`, `Escape`, `Tab`, `Control+A`, `Meta+Shift+P` |
+| `scroll <target> <dir> [amount]` | Scroll `up`/`down`/`left`/`right`, amount in ticks (default 3) |
+| `hover <target> <elementId>` | Hover over element (for tooltips, hover states) |
+| `select_option <target> <id> <val>` | Select dropdown option by value or visible text |
+| `wait_for <target> text\|selector <v>` | Wait up to 10s for text or CSS selector to appear |
+| `eval <target> <expression>` | Run JavaScript in the target's context |
+| `open-sidepanel` | Enable and open the right side panel |
+
+`<target>` is a URL substring (e.g., `sidepanel`, `app.html`) or numeric index from `targets` output.
+
+## Known app.html routes
+
+These can be used with `eval app.html "window.location.hash = '#/<route>'"`:
+
+| Route | View |
+|-------|------|
+| `/home` | Home page with search bar and top sites |
+| `/settings` | Settings (LLM providers, customization, workflows, MCP) |
+| `/scheduled-tasks` | Scheduled Tasks management |
+| `/onboarding` | Onboarding flow (first-run experience) |
+
+## Gotchas learned from real testing
+
+1. **Ports are randomized** with `--new` — always extract from dev server output
+2. **Fresh profile = onboarding page** — navigate to `#/home` to see the main UI
+3. **Element IDs change after navigation** — always re-snapshot before clicking
+4. **Side panel starts disabled** — `open-sidepanel` handles the BrowserOS-specific enable + toggle API
+5. **`Input.enable` does not exist** — the CDP Input domain has no enable method (already handled in the script)
+6. **`DOM.getDocument` required** — must be called before DOM operations like `pushNodesByBackendIdsToFrontend` (already handled in the script)
+7. **Settings sub-navigation** — the settings page has its own left sidebar (BrowserOS AI, Chat & Council Provider, Search Provider, Customize BrowserOS, BrowserOS as MCP, Workflows) — use snapshot + click to navigate within settings

packages/browseros-agent/.github/dependabot.yml

@@ -1,41 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: bun
-    directory: /
-    schedule:
-      interval: weekly
-      day: 'sunday'
-      time: '02:00'
-      timezone: Europe/Berlin
-    open-pull-requests-limit: 10
-    groups:
-      dependencies:
-        applies-to: security-updates
-        dependency-type: production
-        exclude-patterns:
-          - 'puppeteer*'
-        patterns:
-          - '*'
-      dev-dependencies:
-        applies-to: security-updates
-        dependency-type: development
-        exclude-patterns:
-          - 'puppeteer*'
-        patterns:
-          - '*'
-      puppeteer:
-        patterns:
-          - 'puppeteer*'
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-      day: 'sunday'
-      time: '04:00'
-      timezone: Europe/Berlin
-    open-pull-requests-limit: 10
-    groups:
-      all:
-        applies-to: security-updates
-        patterns:
-          - '*'

packages/browseros-agent/.github/workflows/cla.yml

@@ -1,58 +0,0 @@
-name: CLA Assistant
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened, closed, synchronize]
-
-permissions:
-  actions: write
-  contents: write
-  pull-requests: write
-  statuses: write
-
-jobs:
-  cla:
-    runs-on: ubuntu-latest
-    if: |
-      (github.event_name == 'pull_request_target') ||
-      (github.event_name == 'issue_comment' && github.event.issue.pull_request &&
-       (github.event.comment.body == 'recheck' ||
-        github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA'))
-    steps:
-      - name: CLA Assistant
-        uses: contributor-assistant/github-action@v2.6.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_SIGNATURES_TOKEN }}
-        with:
-          path-to-signatures: 'cla-signatures.json'
-          path-to-document: 'https://github.com/${{ github.repository }}/blob/main/CLA.md'
-          branch: 'main'
-          remote-organization-name: 'browseros-ai'
-          remote-repository-name: 'cla-signatures'
-          allowlist: 'bot*,*[bot],dependabot,renovate,github-actions,snyk-bot,imgbot,greenkeeper,semantic-release-bot,allcontributors'
-          lock-pullrequest-aftermerge: false
-          custom-notsigned-prcomment: |
-            Thank you for your contribution! Before we can merge this PR, we need you to sign our [Contributor License Agreement](https://github.com/${{ github.repository }}/blob/main/CLA.md).
-
-            **To sign the CLA**, please add a comment to this PR with the following text:
-
-            ```
-            I have read the CLA Document and I hereby sign the CLA
-            ```
-
-            You only need to sign once. After signing, this check will pass automatically.
-
-            ---
-            <details>
-            <summary>Troubleshooting</summary>
-
-            - **Already signed but still failing?** Comment `recheck` to trigger a re-verification.
-            - **Signed with a different email?** Make sure your commit email matches your GitHub account email, or add your commit email to your GitHub account.
-
-            </details>
-          custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
-          custom-allsigned-prcomment: |
-            All contributors have signed the CLA. Thank you!

packages/browseros-agent/CLAUDE.md

@@ -165,3 +165,68 @@ Tests are in `apps/server/tests/`:
 - `agent/` - Agent tests (compaction, rate limiter)
 - `sdk/` - Agent SDK tests
 - `__helpers__/` - Test utilities and fixtures
+
+## Self-Testing UI Changes
+
+After making UI changes to the agent extension (`apps/agent/`), you can visually verify them using the CDP inspector script. This connects directly to the browser via Chrome DevTools Protocol and can inspect extension pages (side panel, new tab, etc.) that the agent's own tools cannot see.
+
+### Prerequisites
+
+The dev server must be running:
+```bash
+bun run dev:watch -- --new
+```
+Read the output to find the randomized CDP port, then:
+```bash
+export BROWSEROS_CDP_PORT=<port from output>
+```
+
+### Workflow
+
+1. **List all targets** to see what's available:
+   ```bash
+   bun scripts/dev/inspect-ui.ts targets
+   ```
+
+2. **Open the side panel** if it's not already open:
+   ```bash
+   bun scripts/dev/inspect-ui.ts open-sidepanel
+   ```
+
+3. **Take a screenshot** of the side panel:
+   ```bash
+   bun scripts/dev/inspect-ui.ts screenshot sidepanel /tmp/panel.png
+   ```
+   Then read `/tmp/panel.png` to view the result.
+
+4. **Get the accessibility tree** for structural verification:
+   ```bash
+   bun scripts/dev/inspect-ui.ts snapshot sidepanel
+   ```
+
+5. **Click an element** by its ID from the snapshot:
+   ```bash
+   bun scripts/dev/inspect-ui.ts click sidepanel 142
+   ```
+
+6. **Fill a text input** by its ID from the snapshot:
+   ```bash
+   bun scripts/dev/inspect-ui.ts fill sidepanel 85 "search query"
+   ```
+
+7. **Evaluate JavaScript** in the extension context:
+   ```bash
+   bun scripts/dev/inspect-ui.ts eval sidepanel "document.title"
+   ```
+
+### Interaction workflow
+
+The typical loop is: snapshot → identify element IDs → click/fill → screenshot to verify.
+Element IDs come from the `[number]` in snapshot output (these are `backendDOMNodeId` values).
+This uses the same element resolution as the server's MCP tools — no coordinate guessing.
+
+### Target selection
+
+The `<target>` argument can be:
+- An **index** from the `targets` output (e.g., `3`)
+- A **URL substring** (e.g., `sidepanel`, `newtab`, `chrome-extension://`)

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.8/schema.json",
   "root": false,
   "extends": "//",
   "vcs": {

packages/browseros-agent/apps/agent/components/credits/CreditBadge.tsx

@@ -0,0 +1,26 @@
+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 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,6 +3,7 @@ import {
   BookOpen,
   Bot,
   Compass,
+  CreditCard,
   GitBranch,
   MessageSquare,
   Palette,
@@ -79,6 +80,12 @@ 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/components/ui/alert-dialog.tsx

@@ -176,14 +176,14 @@ function AlertDialogCancel({
 
 export {
   AlertDialog,
-  AlertDialogPortal,
-  AlertDialogOverlay,
-  AlertDialogTrigger,
-  AlertDialogContent,
-  AlertDialogHeader,
-  AlertDialogFooter,
-  AlertDialogTitle,
-  AlertDialogDescription,
   AlertDialogAction,
   AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogOverlay,
+  AlertDialogPortal,
+  AlertDialogTitle,
+  AlertDialogTrigger,
 }

packages/browseros-agent/apps/agent/components/ui/alert.tsx

@@ -72,4 +72,4 @@ function AlertDescription({
   )
 }
 
-export { Alert, AlertTitle, AlertDescription }
+export { Alert, AlertDescription, AlertTitle }

packages/browseros-agent/apps/agent/components/ui/card.tsx

@@ -104,10 +104,10 @@ function CardFooter({ className, ...props }: React.ComponentProps<'div'>) {
 
 export {
   Card,
-  CardHeader,
-  CardFooter,
-  CardTitle,
   CardAction,
-  CardDescription,
   CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
 }

packages/browseros-agent/apps/agent/components/ui/carousel.tsx

@@ -251,10 +251,10 @@ function CarouselNext({
 }
 
 export {
-  type CarouselApi,
   Carousel,
+  type CarouselApi,
   CarouselContent,
   CarouselItem,
-  CarouselPrevious,
   CarouselNext,
+  CarouselPrevious,
 }

packages/browseros-agent/apps/agent/components/ui/collapsible.tsx

@@ -39,4 +39,4 @@ function CollapsibleContent({
   )
 }
 
-export { Collapsible, CollapsibleTrigger, CollapsibleContent }
+export { Collapsible, CollapsibleContent, CollapsibleTrigger }

packages/browseros-agent/apps/agent/components/ui/command.tsx

@@ -198,11 +198,11 @@ function CommandShortcut({
 export {
   Command,
   CommandDialog,
-  CommandInput,
-  CommandList,
   CommandEmpty,
   CommandGroup,
+  CommandInput,
   CommandItem,
-  CommandShortcut,
+  CommandList,
   CommandSeparator,
+  CommandShortcut,
 }

packages/browseros-agent/apps/agent/components/ui/dropdown-menu.tsx

@@ -283,18 +283,18 @@ function DropdownMenuSubContent({
 
 export {
   DropdownMenu,
-  DropdownMenuPortal,
-  DropdownMenuTrigger,
+  DropdownMenuCheckboxItem,
   DropdownMenuContent,
   DropdownMenuGroup,
-  DropdownMenuLabel,
   DropdownMenuItem,
-  DropdownMenuCheckboxItem,
+  DropdownMenuLabel,
+  DropdownMenuPortal,
   DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
   DropdownMenuSeparator,
   DropdownMenuShortcut,
   DropdownMenuSub,
-  DropdownMenuSubTrigger,
   DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+  DropdownMenuTrigger,
 }

packages/browseros-agent/apps/agent/components/ui/form.tsx

@@ -179,12 +179,12 @@ function FormMessage({ className, ...props }: React.ComponentProps<'p'>) {
 }
 
 export {
-  useFormField,
   Form,
-  FormItem,
-  FormLabel,
   FormControl,
   FormDescription,
-  FormMessage,
   FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useFormField,
 }

packages/browseros-agent/apps/agent/components/ui/hover-card.tsx

@@ -50,4 +50,4 @@ function HoverCardContent({
   )
 }
 
-export { HoverCard, HoverCardTrigger, HoverCardContent }
+export { HoverCard, HoverCardContent, HoverCardTrigger }

packages/browseros-agent/apps/agent/components/ui/input-group.tsx

@@ -184,7 +184,7 @@ export {
   InputGroup,
   InputGroupAddon,
   InputGroupButton,
-  InputGroupText,
   InputGroupInput,
+  InputGroupText,
   InputGroupTextarea,
 }

packages/browseros-agent/apps/agent/components/ui/popover.tsx

@@ -55,4 +55,4 @@ function PopoverAnchor({
   return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />
 }
 
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }
+export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger }

packages/browseros-agent/apps/agent/components/ui/resizable.tsx

@@ -49,4 +49,4 @@ function ResizableHandle({
   )
 }
 
-export { ResizablePanelGroup, ResizablePanel, ResizableHandle }
+export { ResizableHandle, ResizablePanel, ResizablePanelGroup }

packages/browseros-agent/apps/agent/components/ui/sheet.tsx

@@ -129,11 +129,11 @@ function SheetDescription({
 
 export {
   Sheet,
-  SheetTrigger,
   SheetClose,
   SheetContent,
-  SheetHeader,
-  SheetFooter,
-  SheetTitle,
   SheetDescription,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
 }

packages/browseros-agent/apps/agent/components/ui/sonner.tsx

@@ -18,6 +18,7 @@ const Toaster = ({ ...props }: ToasterProps) => {
     <Sonner
       theme={theme as ToasterProps['theme']}
       className="toaster group"
+      closeButton
       icons={{
         success: <CircleCheckIcon className="size-4" />,
         info: <InfoIcon className="size-4" />,

packages/browseros-agent/apps/agent/components/ui/tabs.tsx

@@ -86,4 +86,4 @@ function TabsContent({
   )
 }
 
-export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants }
+export { Tabs, TabsContent, TabsList, TabsTrigger, tabsListVariants }

packages/browseros-agent/apps/agent/components/ui/tooltip.tsx

@@ -68,4 +68,4 @@ function TooltipContent({
   )
 }
 
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }

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

@@ -2,6 +2,7 @@ import type { FC } from 'react'
 import { HashRouter, Navigate, Route, Routes, useParams } from 'react-router'
 
 import { NewTab } from '../newtab/index/NewTab'
+import { NewTabChat } from '../newtab/index/NewTabChat'
 import { NewTabLayout } from '../newtab/layout/NewTabLayout'
 import { Personalize } from '../newtab/personalize/Personalize'
 import { OnboardingDemo } from '../onboarding/demo/OnboardingDemo'
@@ -27,6 +28,7 @@ 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 } {
@@ -79,6 +81,7 @@ export const App: FC = () => {
           {/* Home routes */}
           <Route path="home" element={<NewTabLayout />}>
             <Route index element={<NewTab />} />
+            <Route path="chat" element={<NewTabChat />} />
             <Route path="personalize" element={<Personalize />} />
             <Route path="soul" element={<SoulPage />} />
             <Route path="skills" element={<SkillsPage />} />
@@ -101,6 +104,7 @@ 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

@@ -13,6 +13,17 @@ import {
 } from '@/components/ui/alert-dialog'
 import { useSessionInfo } from '@/lib/auth/sessionStorage'
 import { useAgentServerUrl } from '@/lib/browseros/useBrowserOSProviders'
+import {
+  CHATGPT_PRO_OAUTH_COMPLETED_EVENT,
+  CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT,
+  CHATGPT_PRO_OAUTH_STARTED_EVENT,
+  GITHUB_COPILOT_OAUTH_COMPLETED_EVENT,
+  GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT,
+  GITHUB_COPILOT_OAUTH_STARTED_EVENT,
+  QWEN_CODE_OAUTH_COMPLETED_EVENT,
+  QWEN_CODE_OAUTH_DISCONNECTED_EVENT,
+  QWEN_CODE_OAUTH_STARTED_EVENT,
+} from '@/lib/constants/analyticsEvents'
 import { GetProfileIdByUserIdDocument } from '@/lib/conversations/graphql/uploadConversationDocument'
 import { getQueryKeyFromDocument } from '@/lib/graphql/getQueryKeyFromDocument'
 import { useGraphqlMutation } from '@/lib/graphql/useGraphqlMutation'
@@ -21,6 +32,11 @@ import type { ProviderTemplate } from '@/lib/llm-providers/providerTemplates'
 import { testProvider } from '@/lib/llm-providers/testProvider'
 import type { LlmProviderConfig } from '@/lib/llm-providers/types'
 import { useLlmProviders } from '@/lib/llm-providers/useLlmProviders'
+import {
+  type OAuthProviderFlowConfig,
+  useOAuthProviderFlow,
+} from '@/lib/llm-providers/useOAuthProviderFlow'
+import { track } from '@/lib/metrics/track'
 import { ConfiguredProvidersList } from './ConfiguredProvidersList'
 import {
   DeleteRemoteLlmProviderDocument,
@@ -32,6 +48,47 @@ import { LlmProvidersHeader } from './LlmProvidersHeader'
 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
@@ -78,9 +135,7 @@ 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))
@@ -101,12 +156,61 @@ export const AISettingsPage: FC = () => {
     null,
   )
 
+  // OAuth flows — shared hook eliminates per-provider duplication
+  const chatgptPro = useOAuthProviderFlow(
+    OAUTH_PROVIDERS_CONFIG['chatgpt-pro'],
+    providers,
+    saveProvider,
+  )
+  const copilot = useOAuthProviderFlow(
+    OAUTH_PROVIDERS_CONFIG['github-copilot'],
+    providers,
+    saveProvider,
+  )
+  const qwenCode = useOAuthProviderFlow(
+    OAUTH_PROVIDERS_CONFIG['qwen-code'],
+    providers,
+    saveProvider,
+  )
+
+  const oauthFlows: Record<
+    string,
+    {
+      startOAuthFlow: (url: string | undefined) => Promise<void>
+      disconnect: () => Promise<void>
+      disconnectedEvent: string
+    }
+  > = {
+    'chatgpt-pro': {
+      startOAuthFlow: chatgptPro.startOAuthFlow,
+      disconnect: chatgptPro.disconnect,
+      disconnectedEvent: CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT,
+    },
+    'github-copilot': {
+      startOAuthFlow: copilot.startOAuthFlow,
+      disconnect: copilot.disconnect,
+      disconnectedEvent: GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT,
+    },
+    'qwen-code': {
+      startOAuthFlow: qwenCode.startOAuthFlow,
+      disconnect: qwenCode.disconnect,
+      disconnectedEvent: QWEN_CODE_OAUTH_DISCONNECTED_EVENT,
+    },
+  }
+
   const handleAddProvider = () => {
     setTemplateValues(undefined)
     setIsNewDialogOpen(true)
   }
 
   const handleUseTemplate = (template: ProviderTemplate) => {
+    // OAuth providers: trigger OAuth flow
+    const oauthFlow = oauthFlows[template.id]
+    if (oauthFlow) {
+      oauthFlow.startOAuthFlow(agentServerUrl ?? undefined)
+      return
+    }
+
     setTemplateValues({
       type: template.id,
       name: template.name,
@@ -129,11 +233,18 @@ export const AISettingsPage: FC = () => {
   }
 
   const confirmDeleteProvider = async () => {
-    if (providerToDelete) {
-      await deleteProvider(providerToDelete.id)
-      deleteRemoteProviderMutation.mutate({ rowId: providerToDelete.id })
-      setProviderToDelete(null)
+    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)
     }
+
+    await deleteProvider(providerToDelete.id)
+    deleteRemoteProviderMutation.mutate({ rowId: providerToDelete.id })
+    setProviderToDelete(null)
   }
 
   const handleAddKeysToIncomplete = (provider: IncompleteProvider) => {

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

@@ -61,6 +61,9 @@ const providerTypeEnum = z.enum([
   'lmstudio',
   'bedrock',
   'browseros',
+  'chatgpt-pro',
+  'github-copilot',
+  'qwen-code',
 ])
 
 /**
@@ -84,6 +87,9 @@ export const providerFormSchema = z
     secretAccessKey: z.string().optional(),
     region: z.string().optional(),
     sessionToken: z.string().optional(),
+    // ChatGPT Pro (Codex)
+    reasoningEffort: z.enum(['none', 'low', 'medium', 'high']).optional(),
+    reasoningSummary: z.enum(['auto', 'concise', 'detailed']).optional(),
   })
   .superRefine((data, ctx) => {
     // Azure: require either resourceName or baseUrl
@@ -127,6 +133,14 @@ export const providerFormSchema = z
         })
       }
     }
+    // OAuth providers: no credentials needed (server-managed)
+    else if (
+      data.type === 'chatgpt-pro' ||
+      data.type === 'github-copilot' ||
+      data.type === 'qwen-code'
+    ) {
+      // No validation needed — OAuth tokens are on the server
+    }
     // Other providers: require baseUrl
     else if (!data.baseUrl) {
       ctx.addIssue({
@@ -182,6 +196,11 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
   const kimiLaunch = useKimiLaunch()
 
   const filteredProviderTypeOptions = providerTypeOptions.filter((opt) => {
+    if (opt.value === 'chatgpt-pro')
+      return supports(Feature.CHATGPT_PRO_SUPPORT)
+    if (opt.value === 'github-copilot')
+      return supports(Feature.GITHUB_COPILOT_SUPPORT)
+    if (opt.value === 'qwen-code') return supports(Feature.QWEN_CODE_SUPPORT)
     if (opt.value === 'moonshot')
       return kimiLaunch || initialValues?.type === 'moonshot'
     if (opt.value === 'openai-compatible') {
@@ -209,6 +228,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
       secretAccessKey: initialValues?.secretAccessKey || '',
       region: initialValues?.region || '',
       sessionToken: initialValues?.sessionToken || '',
+      reasoningEffort: initialValues?.reasoningEffort || 'high',
+      reasoningSummary: initialValues?.reasoningSummary || 'auto',
     },
   })
 
@@ -301,6 +322,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
         secretAccessKey: initialValues.secretAccessKey || '',
         region: initialValues.region || '',
         sessionToken: initialValues.sessionToken || '',
+        reasoningEffort: initialValues.reasoningEffort || 'high',
+        reasoningSummary: initialValues.reasoningSummary || 'auto',
       })
       setIsCustomModel(false)
     }
@@ -326,6 +349,8 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
         secretAccessKey: '',
         region: '',
         sessionToken: '',
+        reasoningEffort: 'high',
+        reasoningSummary: 'auto',
       })
       setIsCustomModel(false)
     }
@@ -363,6 +388,14 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
   const canTest = (): boolean => {
     if (!watchedModelId) return false
 
+    // OAuth providers: always testable (server has the OAuth token)
+    if (
+      watchedType === 'chatgpt-pro' ||
+      watchedType === 'github-copilot' ||
+      watchedType === 'qwen-code'
+    )
+      return true
+
     if (watchedType === 'azure') {
       return !!(watchedResourceName || watchedBaseUrl) && !!watchedApiKey
     }
@@ -444,6 +477,85 @@ export const NewProviderDialog: FC<NewProviderDialogProps> = ({
   }
 
   const renderProviderSpecificFields = () => {
+    // OAuth-only providers (no API key needed)
+    if (watchedType === 'github-copilot' || watchedType === 'qwen-code') {
+      const name = watchedType === 'github-copilot' ? 'GitHub' : 'Qwen Code'
+      return (
+        <div className="rounded-lg border border-green-200 bg-green-50 p-3 text-green-700 text-sm dark:border-green-800 dark:bg-green-950 dark:text-green-300">
+          Credentials are managed via {name} OAuth. No API key needed.
+        </div>
+      )
+    }
+    // ChatGPT Pro: OAuth credentials + Codex reasoning settings
+    if (watchedType === 'chatgpt-pro') {
+      return (
+        <>
+          <div className="rounded-lg border border-green-200 bg-green-50 p-3 text-green-700 text-sm dark:border-green-800 dark:bg-green-950 dark:text-green-300">
+            Credentials are managed via OAuth. No API key needed.
+          </div>
+          <div className="grid gap-4 sm:grid-cols-2">
+            <FormField
+              control={form.control}
+              name="reasoningEffort"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Reasoning Effort</FormLabel>
+                  <Select
+                    onValueChange={field.onChange}
+                    value={field.value || 'high'}
+                  >
+                    <FormControl>
+                      <SelectTrigger className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectContent>
+                      <SelectItem value="none">None</SelectItem>
+                      <SelectItem value="low">Low</SelectItem>
+                      <SelectItem value="medium">Medium</SelectItem>
+                      <SelectItem value="high">High</SelectItem>
+                    </SelectContent>
+                  </Select>
+                  <FormDescription>
+                    How much the model thinks before responding
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="reasoningSummary"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Reasoning Summary</FormLabel>
+                  <Select
+                    onValueChange={field.onChange}
+                    value={field.value || 'auto'}
+                  >
+                    <FormControl>
+                      <SelectTrigger className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectContent>
+                      <SelectItem value="auto">Auto</SelectItem>
+                      <SelectItem value="concise">Concise</SelectItem>
+                      <SelectItem value="detailed">Detailed</SelectItem>
+                    </SelectContent>
+                  </Select>
+                  <FormDescription>
+                    Detail level of visible thinking steps
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+        </>
+      )
+    }
+
     if (watchedType === 'azure') {
       return (
         <>

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

@@ -103,8 +103,10 @@ export const ProviderCard: FC<ProviderCardProps> = ({
                 for better performance.
               </>
             )
-          ) : (
+          ) : provider.baseUrl ? (
             `${provider.modelId} • ${provider.baseUrl}`
+          ) : (
+            provider.modelId
           )}
         </p>
       </div>

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

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

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

@@ -23,6 +23,9 @@ export interface ModelsData {
   bedrock: ModelInfo[]
   browseros: ModelInfo[]
   moonshot: ModelInfo[]
+  'chatgpt-pro': ModelInfo[]
+  'github-copilot': ModelInfo[]
+  'qwen-code': ModelInfo[]
 }
 
 /**
@@ -90,6 +93,48 @@ export const MODELS_DATA: ModelsData = {
   ],
   bedrock: [],
   browseros: [{ modelId: 'browseros-auto', contextLength: 200000 }],
+  'chatgpt-pro': [
+    { modelId: 'gpt-5.4', contextLength: 400000 },
+    { modelId: 'gpt-5.3-codex', contextLength: 400000 },
+    { modelId: 'gpt-5.2-codex', contextLength: 400000 },
+    { modelId: 'gpt-5.2', contextLength: 200000 },
+    { modelId: 'gpt-5.1-codex', contextLength: 400000 },
+    { modelId: 'gpt-5.1-codex-max', contextLength: 400000 },
+    { modelId: 'gpt-5.1-codex-mini', contextLength: 400000 },
+    { modelId: 'gpt-5.1', contextLength: 200000 },
+  ],
+  '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 },
+  ],
+  '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 },
+  ],
 }
 
 /**

packages/browseros-agent/apps/agent/entrypoints/app/connect-mcp/ConnectMCP.tsx

@@ -156,6 +156,7 @@ export const ConnectMCP: FC = () => {
       })
       if (response.success) {
         removeServer(id)
+        mutateUserIntegrations()
       } else {
         failedToRemoveMcp(name, 'Success not returned from server')
       }

packages/browseros-agent/apps/agent/entrypoints/app/connect-mcp/useGetUserMCPIntegrations.tsx

@@ -1,4 +1,4 @@
-import useSWR from 'swr'
+import { useQuery } from '@tanstack/react-query'
 import { useAgentServerUrl } from '@/lib/browseros/useBrowserOSProviders'
 
 interface UserMCPIntegrationsList {
@@ -9,7 +9,11 @@ interface UserMCPIntegrationsList {
   count: number
 }
 
-const getUserMCPIntegrations = async ([hostUrl]: [hostUrl: string]) => {
+export const INTEGRATIONS_QUERY_KEY = 'klavis-user-integrations'
+
+const getUserMCPIntegrations = async (
+  hostUrl: string,
+): Promise<UserMCPIntegrationsList> => {
   const response = await fetch(`${hostUrl}/klavis/user-integrations`)
   const data = (await response.json()) as UserMCPIntegrationsList
   return data
@@ -18,12 +22,19 @@ const getUserMCPIntegrations = async ([hostUrl]: [hostUrl: string]) => {
 export const useGetUserMCPIntegrations = () => {
   const { baseUrl: agentServerUrl } = useAgentServerUrl()
 
-  return useSWR(
-    agentServerUrl ? [agentServerUrl, 'klavis/user-integrations'] : null,
-    getUserMCPIntegrations,
-    {
-      keepPreviousData: true,
-      revalidateOnFocus: true,
-    },
-  )
+  const query = useQuery({
+    queryKey: [INTEGRATIONS_QUERY_KEY, agentServerUrl],
+    // biome-ignore lint/style/noNonNullAssertion: guarded by enabled
+    queryFn: () => getUserMCPIntegrations(agentServerUrl!),
+    enabled: !!agentServerUrl,
+    refetchOnWindowFocus: true,
+  })
+
+  return {
+    data: query.data,
+    isLoading: query.isLoading,
+    isFetching: query.isFetching,
+    isSuccess: query.isSuccess,
+    mutate: query.refetch,
+  }
 }

packages/browseros-agent/apps/agent/entrypoints/app/jtbd-agent/SurveyChat.tsx

@@ -4,8 +4,8 @@ import { MessageResponse } from '@/components/ai-elements/message'
 import { Button } from '@/components/ui/button'
 import { Textarea } from '@/components/ui/textarea'
 import { cn } from '@/lib/utils'
+import { useVoiceInput } from '@/lib/voice/useVoiceInput'
 import type { Message } from './useSurveyChat'
-import { useVoiceInput } from './useVoiceInput'
 import { VoiceInputButton } from './VoiceInputButton'
 
 interface Props {
@@ -81,6 +81,7 @@ export const Chat: FC<Props> = ({
   }, [messagesLength])
 
   // Insert transcript into input when transcription completes
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only trigger on transcript/transcribing change
   useEffect(() => {
     if (voice.transcript && !voice.isTranscribing) {
       setInput((prev) => {
@@ -89,7 +90,7 @@ export const Chat: FC<Props> = ({
       })
       voice.clearTranscript()
     }
-  }, [voice])
+  }, [voice.transcript, voice.isTranscribing])
 
   const handleSubmit = (e: FormEvent) => {
     e.preventDefault()

packages/browseros-agent/apps/agent/entrypoints/app/layout/SettingsSidebarLayout.tsx

@@ -17,11 +17,8 @@ export const SettingsSidebarLayout: FC = () => {
 
   useEffect(() => {
     track(SETTINGS_PAGE_VIEWED_EVENT, { page: location.pathname })
-  }, [location.pathname])
-
-  useEffect(() => {
     setMobileOpen(false)
-  }, [])
+  }, [location.pathname])
 
   if (isMobile) {
     return (

packages/browseros-agent/apps/agent/entrypoints/app/layout/SidebarLayout.tsx

@@ -7,8 +7,6 @@ import { Button } from '@/components/ui/button'
 import { Sheet, SheetContent } from '@/components/ui/sheet'
 import { ShortcutsDialog } from '@/entrypoints/newtab/index/ShortcutsDialog'
 import { useIsMobile } from '@/hooks/use-mobile'
-import { SETTINGS_PAGE_VIEWED_EVENT } from '@/lib/constants/analyticsEvents'
-import { track } from '@/lib/metrics/track'
 import { RpcClientProvider } from '@/lib/rpc/RpcClientProvider'
 
 const COLLAPSE_DELAY = 150
@@ -25,10 +23,6 @@ export const SidebarLayout: FC = () => {
     setShortcutsDialogOpen(true)
   }, [])
 
-  useEffect(() => {
-    track(SETTINGS_PAGE_VIEWED_EVENT, { page: location.pathname })
-  }, [location.pathname])
-
   useEffect(() => {
     setMobileOpen(false)
   }, [])
@@ -103,11 +97,17 @@ export const SidebarLayout: FC = () => {
         </div>
 
         {/* Main content - full width, centered */}
-        <main className="min-h-screen overflow-y-auto">
-          <div className="mx-auto max-w-4xl px-4 py-8 sm:px-6 lg:px-8">
+        {location.pathname === '/home/chat' ? (
+          <main className="relative h-dvh overflow-hidden">
             <Outlet />
-          </div>
-        </main>
+          </main>
+        ) : (
+          <main className="min-h-screen overflow-y-auto">
+            <div className="mx-auto max-w-4xl px-4 py-8 sm:px-6 lg:px-8">
+              <Outlet />
+            </div>
+          </main>
+        )}
       </div>
       <ShortcutsDialog
         open={shortcutsDialogOpen}

packages/browseros-agent/apps/agent/entrypoints/app/scheduled-tasks/NewScheduledTaskDialog.tsx

@@ -1,8 +1,12 @@
 import { zodResolver } from '@hookform/resolvers/zod'
+import { ChevronDown, Loader2, Sparkles, Undo2 } from 'lucide-react'
 import type { FC } from 'react'
-import { useEffect } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useForm } from 'react-hook-form'
+import { toast } from 'sonner'
 import { z } from 'zod/v3'
+import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
+import type { Provider } from '@/components/chat/chatComponentTypes'
 import { Button } from '@/components/ui/button'
 import { Checkbox } from '@/components/ui/checkbox'
 import {
@@ -31,6 +35,15 @@ import {
   SelectValue,
 } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
+import { SCHEDULED_TASK_PROMPT_REFINED_EVENT } from '@/lib/constants/analyticsEvents'
+import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
+import {
+  defaultProviderIdStorage,
+  providersStorage,
+} from '@/lib/llm-providers/storage'
+import type { LlmProviderConfig, ProviderType } from '@/lib/llm-providers/types'
+import { track } from '@/lib/metrics/track'
+import { refinePrompt } from '@/lib/schedules/refine-prompt'
 import type { ScheduledJob } from './types'
 
 const formSchema = z
@@ -43,6 +56,7 @@ const formSchema = z
     scheduleType: z.enum(['daily', 'hourly', 'minutes']),
     scheduleTime: z.string().optional(),
     scheduleInterval: z.number().int().min(1).max(60).optional(),
+    providerId: z.string().optional(),
     enabled: z.boolean(),
   })
   .superRefine((data, ctx) => {
@@ -81,6 +95,8 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
   onSave,
 }) => {
   const isEditing = !!initialValues
+  const [providers, setProviders] = useState<LlmProviderConfig[]>([])
+  const [defaultProviderId, setDefaultProviderId] = useState<string>('')
 
   const form = useForm<FormValues>({
     resolver: zodResolver(formSchema),
@@ -90,14 +106,36 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
       scheduleType: 'daily',
       scheduleTime: '09:00',
       scheduleInterval: 1,
+      providerId: undefined,
       enabled: true,
     },
   })
 
   const scheduleType = form.watch('scheduleType')
+  const selectedProviderId = form.watch('providerId')
+  const queryValue = form.watch('query')
+  const [isRefining, setIsRefining] = useState(false)
+  const originalPromptRef = useRef<string | null>(null)
+  const refineRequestIdRef = useRef(0)
+  const isProgrammaticChange = useRef(false)
+
+  // Load providers from storage
+  useEffect(() => {
+    if (!open) return
+    Promise.all([
+      providersStorage.getValue(),
+      defaultProviderIdStorage.getValue(),
+    ]).then(([providerList, defId]) => {
+      setProviders(providerList ?? [])
+      setDefaultProviderId(defId ?? '')
+    })
+  }, [open])
 
   useEffect(() => {
     if (open) {
+      refineRequestIdRef.current++
+      originalPromptRef.current = null
+      setIsRefining(false)
       if (initialValues) {
         form.reset({
           name: initialValues.name,
@@ -105,6 +143,7 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
           scheduleType: initialValues.scheduleType,
           scheduleTime: initialValues.scheduleTime || '09:00',
           scheduleInterval: initialValues.scheduleInterval || 1,
+          providerId: initialValues.providerId,
           enabled: initialValues.enabled,
         })
       } else {
@@ -114,12 +153,87 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
           scheduleType: 'daily',
           scheduleTime: '09:00',
           scheduleInterval: 1,
+          providerId: undefined,
           enabled: true,
         })
       }
     }
   }, [open, initialValues, form])
 
+  // Resolve the currently selected provider for the selector display
+  const resolvedProvider: Provider | null = (() => {
+    const id = selectedProviderId ?? defaultProviderId
+    const found = providers.find((p) => p.id === id)
+    if (found) return { id: found.id, name: found.name, type: found.type }
+    if (providers[0])
+      return {
+        id: providers[0].id,
+        name: providers[0].name,
+        type: providers[0].type,
+      }
+    return null
+  })()
+
+  const providerOptions: Provider[] = providers.map((p) => ({
+    id: p.id,
+    name: p.name,
+    type: p.type,
+  }))
+
+  // Replace textarea content via execCommand so the browser's native undo
+  // stack (Cmd+Z / Ctrl+Z) records the change. Falls back to form.setValue
+  // if the textarea element can't be found.
+  const setQueryWithUndo = (value: string) => {
+    const textarea = document.querySelector(
+      'textarea[name="query"]',
+    ) as HTMLTextAreaElement
+    if (textarea) {
+      isProgrammaticChange.current = true
+      textarea.focus()
+      textarea.select()
+      document.execCommand('insertText', false, value)
+      isProgrammaticChange.current = false
+    } else {
+      form.setValue('query', value)
+    }
+  }
+
+  const handleRefinePrompt = async () => {
+    const currentQuery = form.getValues('query').trim()
+    const currentName = form.getValues('name').trim()
+    if (!currentQuery) return
+
+    const requestId = ++refineRequestIdRef.current
+    setIsRefining(true)
+    originalPromptRef.current = currentQuery
+
+    try {
+      const refined = await refinePrompt({
+        prompt: currentQuery,
+        name: currentName || 'Untitled Task',
+        providerId: form.getValues('providerId'),
+      })
+      if (requestId !== refineRequestIdRef.current) return
+      setQueryWithUndo(refined)
+      track(SCHEDULED_TASK_PROMPT_REFINED_EVENT)
+    } catch {
+      if (requestId !== refineRequestIdRef.current) return
+      toast.error('Failed to rewrite prompt. Please try again.')
+      originalPromptRef.current = null
+    } finally {
+      if (requestId === refineRequestIdRef.current) {
+        setIsRefining(false)
+      }
+    }
+  }
+
+  const handleUndoRefine = () => {
+    if (originalPromptRef.current !== null) {
+      setQueryWithUndo(originalPromptRef.current)
+      originalPromptRef.current = null
+    }
+  }
+
   const onSubmit = (values: FormValues) => {
     onSave({
       name: values.name.trim(),
@@ -129,9 +243,11 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
         values.scheduleType === 'daily' ? values.scheduleTime : undefined,
       scheduleInterval:
         values.scheduleType !== 'daily' ? values.scheduleInterval : undefined,
+      providerId: values.providerId,
       enabled: values.enabled,
     })
     form.reset()
+    originalPromptRef.current = null
     onOpenChange(false)
   }
 
@@ -169,22 +285,96 @@ export const NewScheduledTaskDialog: FC<NewScheduledTaskDialogProps> = ({
               name="query"
               render={({ field }) => (
                 <FormItem>
-                  <FormLabel>Prompt</FormLabel>
+                  <div className="flex items-center justify-between">
+                    <FormLabel>Prompt</FormLabel>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="sm"
+                      className="h-auto gap-1 px-2 py-1 text-muted-foreground text-xs"
+                      disabled={!queryValue?.trim() || isRefining}
+                      onClick={handleRefinePrompt}
+                    >
+                      {isRefining ? (
+                        <Loader2 className="h-3 w-3 animate-spin" />
+                      ) : (
+                        <Sparkles className="h-3 w-3" />
+                      )}
+                      {isRefining ? 'Rewriting...' : 'Rewrite with AI'}
+                    </Button>
+                  </div>
                   <FormControl>
                     <Textarea
                       placeholder="What should the agent do? e.g., Check my email and summarize important messages"
                       className="min-h-[100px] resize-none"
                       {...field}
+                      onChange={(e) => {
+                        field.onChange(e)
+                        if (
+                          !isProgrammaticChange.current &&
+                          originalPromptRef.current !== null
+                        ) {
+                          originalPromptRef.current = null
+                        }
+                      }}
                     />
                   </FormControl>
-                  <FormDescription>
-                    The instruction that will be sent to the agent
-                  </FormDescription>
+                  {!isRefining && originalPromptRef.current !== null ? (
+                    <button
+                      type="button"
+                      className="flex items-center gap-1 text-muted-foreground text-xs hover:text-foreground"
+                      onClick={handleUndoRefine}
+                    >
+                      <Undo2 className="h-3 w-3" />
+                      Undo rewrite
+                    </button>
+                  ) : (
+                    <FormDescription>
+                      The instruction that will be sent to the agent
+                    </FormDescription>
+                  )}
                   <FormMessage />
                 </FormItem>
               )}
             />
 
+            {providers.length > 0 && resolvedProvider && (
+              <FormItem>
+                <FormLabel>AI Provider</FormLabel>
+                <ChatProviderSelector
+                  providers={providerOptions}
+                  selectedProvider={resolvedProvider}
+                  onSelectProvider={(provider) =>
+                    form.setValue('providerId', provider.id)
+                  }
+                >
+                  <Button
+                    type="button"
+                    variant="outline"
+                    className="w-full justify-between"
+                  >
+                    <span className="flex items-center gap-2">
+                      <span className="text-muted-foreground">
+                        {resolvedProvider.type === 'browseros' ? (
+                          <BrowserOSIcon size={16} />
+                        ) : (
+                          <ProviderIcon
+                            type={resolvedProvider.type as ProviderType}
+                            size={16}
+                          />
+                        )}
+                      </span>
+                      {resolvedProvider.name}
+                    </span>
+                    <ChevronDown className="h-4 w-4 opacity-50" />
+                  </Button>
+                </ChatProviderSelector>
+                <FormDescription>
+                  The AI provider used to run this task
+                </FormDescription>
+              </FormItem>
+            )}
+
             <div className="grid gap-4 sm:grid-cols-2">
               <FormField
                 control={form.control}

packages/browseros-agent/apps/agent/entrypoints/app/scheduled-tasks/ScheduledTaskCard.tsx

@@ -12,7 +12,7 @@ import {
   Trash2,
   XCircle,
 } from 'lucide-react'
-import { type FC, useMemo, useState } from 'react'
+import { type FC, useEffect, useMemo, useState } from 'react'
 import { Button } from '@/components/ui/button'
 import {
   Collapsible,
@@ -20,6 +20,9 @@ import {
   CollapsibleTrigger,
 } from '@/components/ui/collapsible'
 import { Switch } from '@/components/ui/switch'
+import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
+import { providersStorage } from '@/lib/llm-providers/storage'
+import type { ProviderType } from '@/lib/llm-providers/types'
 import { useScheduledJobRuns } from '@/lib/schedules/scheduleStorage'
 import type { ScheduledJob, ScheduledJobRun } from './types'
 
@@ -80,9 +83,25 @@ export const ScheduledTaskCard: FC<ScheduledTaskCardProps> = ({
   onRetryRun,
 }) => {
   const [isOpen, setIsOpen] = useState(false)
+  const [providerInfo, setProviderInfo] = useState<{
+    name: string
+    type: ProviderType
+  } | null>(null)
 
   const { jobRuns } = useScheduledJobRuns()
 
+  // Load provider info for display
+  useEffect(() => {
+    if (!job.providerId) {
+      setProviderInfo(null)
+      return
+    }
+    providersStorage.getValue().then((providers) => {
+      const match = providers?.find((p) => p.id === job.providerId)
+      setProviderInfo(match ? { name: match.name, type: match.type } : null)
+    })
+  }, [job.providerId])
+
   const runs = useMemo(
     () =>
       jobRuns
@@ -117,6 +136,19 @@ export const ScheduledTaskCard: FC<ScheduledTaskCardProps> = ({
           </p>
           <div className="flex items-center gap-2 text-muted-foreground text-xs">
             <span>{formatSchedule(job)}</span>
+            {providerInfo && (
+              <>
+                <span>•</span>
+                <span className="flex items-center gap-1">
+                  {providerInfo.type === 'browseros' ? (
+                    <BrowserOSIcon size={12} />
+                  ) : (
+                    <ProviderIcon type={providerInfo.type} size={12} />
+                  )}
+                  {providerInfo.name}
+                </span>
+              </>
+            )}
             {job.lastRunAt && (
               <>
                 <span>•</span>

packages/browseros-agent/apps/agent/entrypoints/app/skills/SkillsPage.tsx

@@ -1,5 +1,6 @@
-import { AlertCircle, Pencil, Plus, Trash2, Wand2 } from 'lucide-react'
+import { AlertCircle, Eye, Pencil, Plus, Trash2, Wand2 } from 'lucide-react'
 import { type FC, useEffect, useState } from 'react'
+import Markdown from 'react-markdown'
 import { toast } from 'sonner'
 import {
   AlertDialog,
@@ -108,23 +109,19 @@ export const SkillsPage: FC = () => {
       ) : null}
 
       {!isLoading && !error && skills.length > 0 ? (
-        <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-3">
-          {skills.map((skill) => (
-            <SkillCard
-              key={skill.id}
-              skill={skill}
-              onEdit={() => handleEdit(skill)}
-              onDelete={() => setSkillToDelete(skill)}
-              onToggle={(enabled) => handleToggle(skill, enabled)}
-            />
-          ))}
-        </div>
+        <SkillSections
+          skills={skills}
+          onEdit={handleEdit}
+          onDelete={(skill) => setSkillToDelete(skill)}
+          onToggle={handleToggle}
+        />
       ) : null}
 
       <SkillDialog
         open={isDialogOpen}
         onOpenChange={setIsDialogOpen}
         editingSkill={editingSkill}
+        readOnly={editingSkill?.builtIn}
         onSave={async (data) => {
           try {
             if (editingSkill) {
@@ -251,6 +248,50 @@ const EmptyState: FC<{ onCreateClick: () => void }> = ({ onCreateClick }) => (
   </Card>
 )
 
+const SkillGrid: FC<{ children: React.ReactNode }> = ({ children }) => (
+  <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-3">
+    {children}
+  </div>
+)
+
+const SkillSections: FC<{
+  skills: SkillMeta[]
+  onEdit: (skill: SkillMeta) => void
+  onDelete: (skill: SkillMeta) => void
+  onToggle: (skill: SkillMeta, enabled: boolean) => void
+}> = ({ skills, onEdit, onDelete, onToggle }) => {
+  const userSkills = skills.filter((s) => !s.builtIn)
+  const builtInSkills = skills.filter((s) => s.builtIn)
+
+  const renderCard = (skill: SkillMeta) => (
+    <SkillCard
+      key={skill.id}
+      skill={skill}
+      onEdit={() => onEdit(skill)}
+      onDelete={() => onDelete(skill)}
+      onToggle={(enabled) => onToggle(skill, enabled)}
+    />
+  )
+
+  return (
+    <div className="space-y-6">
+      {userSkills.length > 0 ? (
+        <div className="space-y-3">
+          <h3 className="font-semibold text-sm">My Skills</h3>
+          <SkillGrid>{userSkills.map(renderCard)}</SkillGrid>
+        </div>
+      ) : null}
+
+      {builtInSkills.length > 0 ? (
+        <div className="space-y-3">
+          <h3 className="font-semibold text-sm">BrowserOS Skills</h3>
+          <SkillGrid>{builtInSkills.map(renderCard)}</SkillGrid>
+        </div>
+      ) : null}
+    </div>
+  )
+}
+
 const SkillCard: FC<{
   skill: SkillMeta
   onEdit: () => void
@@ -260,7 +301,14 @@ const SkillCard: FC<{
   <Card className="h-full py-0 shadow-sm">
     <CardContent className="flex h-full flex-col p-4">
       <div className="flex items-start justify-between gap-3">
-        <h2 className="font-semibold text-sm leading-5">{skill.name}</h2>
+        <div className="flex items-center gap-2">
+          <h2 className="font-semibold text-sm leading-5">{skill.name}</h2>
+          {skill.builtIn ? (
+            <Badge variant="secondary" className="px-1.5 py-0 text-[10px]">
+              Built-in
+            </Badge>
+          ) : null}
+        </div>
         <Switch
           checked={skill.enabled}
           onCheckedChange={onToggle}
@@ -281,18 +329,29 @@ const SkillCard: FC<{
           onClick={onEdit}
           className="-ml-2 h-7 px-2 text-muted-foreground hover:bg-transparent hover:text-foreground"
         >
-          <Pencil className="size-3.5" />
-          Edit
-        </Button>
-        <Button
-          variant="ghost"
-          size="icon-sm"
-          onClick={onDelete}
-          className="size-7 text-muted-foreground hover:bg-transparent hover:text-destructive"
-          aria-label={`Delete ${skill.name}`}
-        >
-          <Trash2 className="size-4" />
+          {skill.builtIn ? (
+            <>
+              <Eye className="size-3.5" />
+              View
+            </>
+          ) : (
+            <>
+              <Pencil className="size-3.5" />
+              Edit
+            </>
+          )}
         </Button>
+        {!skill.builtIn ? (
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            onClick={onDelete}
+            className="size-7 text-muted-foreground hover:bg-transparent hover:text-destructive"
+            aria-label={`Delete ${skill.name}`}
+          >
+            <Trash2 className="size-4" />
+          </Button>
+        ) : null}
       </div>
     </CardContent>
   </Card>
@@ -302,12 +361,13 @@ const SkillDialog: FC<{
   open: boolean
   onOpenChange: (open: boolean) => void
   editingSkill: SkillDetail | null
+  readOnly?: boolean
   onSave: (data: {
     name: string
     description: string
     content: string
   }) => Promise<void>
-}> = ({ open, onOpenChange, editingSkill, onSave }) => {
+}> = ({ open, onOpenChange, editingSkill, readOnly, onSave }) => {
   const [name, setName] = useState('')
   const [description, setDescription] = useState('')
   const [content, setContent] = useState('')
@@ -354,12 +414,18 @@ const SkillDialog: FC<{
       <DialogContent className="flex max-h-[90vh] flex-col gap-0 overflow-hidden p-0 sm:max-w-5xl">
         <DialogHeader className="border-b px-6 py-5">
           <DialogTitle>
-            {editingSkill ? 'Edit Skill' : 'Create Skill'}
+            {readOnly
+              ? 'View Skill'
+              : editingSkill
+                ? 'Edit Skill'
+                : 'Create Skill'}
           </DialogTitle>
           <DialogDescription>
-            {editingSkill
-              ? 'Refine when the agent should use this skill and how it should execute it.'
-              : 'Define a reusable instruction set your agent can apply when a request matches.'}
+            {readOnly
+              ? 'This skill is managed by BrowserOS and updated automatically.'
+              : editingSkill
+                ? 'Refine when the agent should use this skill and how it should execute it.'
+                : 'Define a reusable instruction set your agent can apply when a request matches.'}
           </DialogDescription>
         </DialogHeader>
 
@@ -373,6 +439,7 @@ const SkillDialog: FC<{
                 value={name}
                 onChange={(event) => setName(event.target.value)}
                 maxLength={100}
+                readOnly={readOnly}
               />
               <p className="text-muted-foreground text-xs leading-5">
                 Keep it short and recognizable in the skills list.
@@ -388,19 +455,22 @@ const SkillDialog: FC<{
                 onChange={(event) => setDescription(event.target.value)}
                 maxLength={500}
                 className="min-h-28 resize-none bg-background"
+                readOnly={readOnly}
               />
               <p className="text-muted-foreground text-xs leading-5">
                 This is the trigger summary the agent uses to pick the skill.
               </p>
             </div>
 
-            <div className="mt-auto rounded-lg border border-border/60 border-dashed bg-muted/30 px-3 py-2.5">
-              <p className="font-medium text-muted-foreground text-xs">Tip</p>
-              <ul className="mt-1.5 list-disc space-y-1 pl-4 text-muted-foreground text-xs leading-5">
-                <li>List the ordered steps the agent should follow.</li>
-                <li>Close with the output or formatting you expect back.</li>
-              </ul>
-            </div>
+            {!readOnly ? (
+              <div className="mt-auto rounded-lg border border-border/60 border-dashed bg-muted/30 px-3 py-2.5">
+                <p className="font-medium text-muted-foreground text-xs">Tip</p>
+                <ul className="mt-1.5 list-disc space-y-1 pl-4 text-muted-foreground text-xs leading-5">
+                  <li>List the ordered steps the agent should follow.</li>
+                  <li>Close with the output or formatting you expect back.</li>
+                </ul>
+              </div>
+            ) : null}
           </div>
 
           <div className="flex min-h-0 flex-col px-6 py-5">
@@ -411,36 +481,52 @@ const SkillDialog: FC<{
               </Badge>
             </div>
 
-            <MarkdownEditor
-              id="skill-content"
-              value={content}
-              onChange={setContent}
-              onKeyDown={handleContentKeyDown}
-              placeholder="Write instructions for the agent. Use markdown for structure."
-              className="mt-4 min-h-[320px] flex-1 overflow-y-auto text-sm"
-            />
+            {readOnly ? (
+              <div className="prose prose-sm dark:prose-invert mt-4 min-h-[320px] max-w-none flex-1 overflow-y-auto rounded-md border p-4 text-sm">
+                <Markdown>{content}</Markdown>
+              </div>
+            ) : (
+              <MarkdownEditor
+                id="skill-content"
+                value={content}
+                onChange={setContent}
+                onKeyDown={handleContentKeyDown}
+                placeholder="Write instructions for the agent. Use markdown for structure."
+                className="mt-4 min-h-[320px] flex-1 overflow-y-auto text-sm"
+              />
+            )}
           </div>
         </div>
 
         <div className="flex flex-col gap-3 border-t px-6 py-4 sm:flex-row sm:items-center sm:justify-between">
           <p className="text-muted-foreground text-xs">
-            Saved locally and available to your agent immediately.
+            {readOnly
+              ? 'This skill is managed by BrowserOS and updated automatically.'
+              : 'Saved locally and available to your agent immediately.'}
           </p>
           <div className="flex flex-col-reverse gap-2 sm:flex-row">
-            <Button
-              variant="outline"
-              onClick={() => onOpenChange(false)}
-              disabled={saving}
-            >
-              Cancel
-            </Button>
-            <Button onClick={handleSubmit} disabled={!isValid || saving}>
-              {saving
-                ? 'Saving...'
-                : editingSkill
-                  ? 'Update Skill'
-                  : 'Create Skill'}
-            </Button>
+            {readOnly ? (
+              <Button variant="outline" onClick={() => onOpenChange(false)}>
+                Close
+              </Button>
+            ) : (
+              <>
+                <Button
+                  variant="outline"
+                  onClick={() => onOpenChange(false)}
+                  disabled={saving}
+                >
+                  Cancel
+                </Button>
+                <Button onClick={handleSubmit} disabled={!isValid || saving}>
+                  {saving
+                    ? 'Saving...'
+                    : editingSkill
+                      ? 'Update Skill'
+                      : 'Create Skill'}
+                </Button>
+              </>
+            )}
           </div>
         </div>
       </DialogContent>

packages/browseros-agent/apps/agent/entrypoints/app/skills/useSkills.ts

@@ -7,6 +7,7 @@ export type SkillMeta = {
   description: string
   location: string
   enabled: boolean
+  builtIn: boolean
 }
 
 export type SkillDetail = SkillMeta & {

packages/browseros-agent/apps/agent/entrypoints/app/usage/UsagePage.tsx

@@ -0,0 +1,125 @@
+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 justify-between">
+          <div className="flex items-center gap-3">
+            <CreditCard className="h-5 w-5 text-muted-foreground" />
+            <div>
+              <p className="font-semibold text-sm">Need more credits?</p>
+              <p className="text-muted-foreground text-xs">
+                Additional credit packages coming soon
+              </p>
+            </div>
+          </div>
+          <Button variant="outline" size="sm" disabled className="opacity-50">
+            Add Credits
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}

packages/browseros-agent/apps/agent/entrypoints/background/index.ts

@@ -18,6 +18,7 @@ import {
   syncScheduledJobs,
 } from '@/lib/schedules/scheduleStorage'
 import { searchActionsStorage } from '@/lib/search-actions/searchActionsStorage'
+import { selectedTextStorage } from '@/lib/selected-text/selectedTextStorage'
 import { stopAgentStorage } from '@/lib/stop-agent/stop-agent-storage'
 import { scheduledJobRuns } from './scheduledJobRuns'
 
@@ -66,7 +67,12 @@ export default defineBackground(() => {
     }
   })
 
-  chrome.runtime.onMessage.addListener((message, sender) => {
+  chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+    if (message?.type === 'get-tab-id') {
+      sendResponse({ tabId: sender.tab?.id })
+      return true
+    }
+
     if (message?.type === 'AUTH_SUCCESS' && sender.tab?.id) {
       const tabId = sender.tab.id
       authRedirectPathStorage
@@ -93,6 +99,17 @@ export default defineBackground(() => {
     }
   })
 
+  // Clean up selected text storage when a tab is closed
+  chrome.tabs.onRemoved.addListener((tabId) => {
+    const key = String(tabId)
+    selectedTextStorage.getValue().then((map) => {
+      if (map[key]) {
+        const { [key]: _, ...rest } = map
+        selectedTextStorage.setValue(rest)
+      }
+    })
+  })
+
   sessionStorage.watch(async (newSession) => {
     if (newSession?.user?.id) {
       try {

packages/browseros-agent/apps/agent/entrypoints/background/scheduledJobRuns.ts

@@ -117,6 +117,7 @@ export const scheduledJobRuns = async () => {
       const response = await getChatServerResponse({
         message: job.query,
         signal: abortController.signal,
+        providerId: job.providerId,
       })
 
       await updateJobRun(jobRun.id, {

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

@@ -11,6 +11,8 @@ import {
 } from 'lucide-react'
 import { AnimatePresence, motion } from 'motion/react'
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { useNavigate } from 'react-router'
+import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
 import { AppSelector } from '@/components/elements/AppSelector'
 import {
   GlowingBorder,
@@ -36,7 +38,6 @@ import {
 import {
   NEWTAB_AI_TRIGGERED_EVENT,
   NEWTAB_APPS_OPENED_EVENT,
-  NEWTAB_CHAT_RESET_EVENT,
   NEWTAB_CHAT_STARTED_EVENT,
   NEWTAB_OPENED_EVENT,
   NEWTAB_SEARCH_EXECUTED_EVENT,
@@ -45,6 +46,8 @@ import {
   NEWTAB_TABS_OPENED_EVENT,
   NEWTAB_WORKSPACE_OPENED_EVENT,
 } from '@/lib/constants/analyticsEvents'
+import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
+import type { ProviderType } from '@/lib/llm-providers/types'
 import { useMcpServers } from '@/lib/mcp/mcpServerStorage'
 import { useSyncRemoteIntegrations } from '@/lib/mcp/useSyncRemoteIntegrations'
 import { openSidePanelWithSearch } from '@/lib/messaging/sidepanel/openSidepanelWithSearch'
@@ -58,7 +61,6 @@ import {
   useSuggestions,
 } from './lib/suggestions/useSuggestions'
 import { NewTabBranding } from './NewTabBranding'
-import { NewTabChat } from './NewTabChat'
 import { NewTabTip } from './NewTabTip'
 import { ScheduleResults } from './ScheduleResults'
 import { SearchSuggestions } from './SearchSuggestions'
@@ -78,13 +80,13 @@ interface MentionState {
  */
 export const NewTab = () => {
   const activeHint = useActiveHint()
+  const navigate = useNavigate()
   const [inputValue, setInputValue] = useState('')
   const [mounted, setMounted] = useState(false)
   const inputRef = useRef<HTMLInputElement>(null)
   const tabsDropdownRef = useRef<HTMLDivElement>(null)
   const [selectedTabs, setSelectedTabs] = useState<chrome.tabs.Tab[]>([])
   const [shortcutsDialogOpen, setShortcutsDialogOpen] = useState(false)
-  const [chatActive, setChatActive] = useState(false)
   const [mentionState, setMentionState] = useState<MentionState>({
     isOpen: false,
     filterText: '',
@@ -92,13 +94,12 @@ export const NewTab = () => {
   })
   const { selectedFolder } = useWorkspace()
   const { supports } = useCapabilities()
+  const { providers, selectedProvider, handleSelectProvider } =
+    useChatSessionContext()
   const { servers: mcpServers } = useMcpServers()
   const { data: userMCPIntegrations } = useGetUserMCPIntegrations()
   useSyncRemoteIntegrations()
 
-  const { messages, sendMessage, setMode, resetConversation } =
-    useChatSessionContext()
-
   const connectedManagedServers = mcpServers.filter((s) => {
     if (s.type !== 'managed' || !s.managedServerName) return false
     return userMCPIntegrations?.integrations?.find(
@@ -275,17 +276,28 @@ export const NewTab = () => {
 
   const startInlineChat = (
     message: string,
-    mode: 'chat' | 'agent',
-    action?: ReturnType<
-      typeof createBrowserOSAction | typeof createAITabAction
-    >,
+    chatMode: 'chat' | 'agent',
+    aiTab?: { name: string; description: string },
   ) => {
-    track(NEWTAB_CHAT_STARTED_EVENT, { mode, tabs_count: selectedTabs.length })
-    setMode(mode)
-    setChatActive(true)
-    sendMessage({ text: message, action })
+    track(NEWTAB_CHAT_STARTED_EVENT, {
+      mode: chatMode,
+      tabs_count: selectedTabs.length,
+    })
+    const tabIds = selectedTabs
+      .map((t) => t.id)
+      .filter((id): id is number => id !== undefined)
     reset()
     setSelectedTabs([])
+    const params = new URLSearchParams({ q: message, mode: chatMode })
+    if (tabIds.length > 0) {
+      params.set('tabs', tabIds.join(','))
+    }
+    if (aiTab) {
+      params.set('actionType', 'ai-tab')
+      params.set('tabName', aiTab.name)
+      params.set('tabDescription', aiTab.description)
+    }
+    navigate(`/home/chat?${params.toString()}`)
   }
 
   const runSelectedAction = (item: SuggestionItem | undefined) => {
@@ -306,15 +318,18 @@ export const NewTab = () => {
           mode: 'agent',
           tabs_count: selectedTabs.length,
         })
-        const action = createAITabAction({
-          name: item.name,
-          description: item.description,
-          tabs: selectedTabs,
-        })
         const searchQuery = `${item.name}${item.description ? ` - ${item.description}` : ''}}`
         if (supports(Feature.NEWTAB_CHAT_SUPPORT)) {
-          startInlineChat(searchQuery, 'agent', action)
+          startInlineChat(searchQuery, 'agent', {
+            name: item.name,
+            description: item.description,
+          })
         } else {
+          const action = createAITabAction({
+            name: item.name,
+            description: item.description,
+            tabs: selectedTabs,
+          })
           openSidePanelWithSearch('open', {
             query: searchQuery,
             mode: 'agent',
@@ -330,14 +345,14 @@ export const NewTab = () => {
           mode: item.mode,
           tabs_count: selectedTabs.length,
         })
-        const action = createBrowserOSAction({
-          mode: item.mode,
-          message: item.message,
-          tabs: selectedTabs,
-        })
         if (supports(Feature.NEWTAB_CHAT_SUPPORT)) {
-          startInlineChat(item.message, item.mode, action)
+          startInlineChat(item.message, item.mode)
         } else {
+          const action = createBrowserOSAction({
+            mode: item.mode,
+            message: item.message,
+            tabs: selectedTabs,
+          })
           openSidePanelWithSearch('open', {
             query: item.message,
             mode: item.mode,
@@ -351,12 +366,6 @@ export const NewTab = () => {
     }
   }
 
-  const handleBackToSearch = () => {
-    track(NEWTAB_CHAT_RESET_EVENT, { message_count: messages.length })
-    resetConversation()
-    setChatActive(false)
-  }
-
   const isSuggestionsVisible =
     !mentionState.isOpen &&
     ((isOpen && inputValue.length) ||
@@ -368,10 +377,6 @@ export const NewTab = () => {
     track(NEWTAB_OPENED_EVENT)
   }, [])
 
-  if (chatActive) {
-    return <NewTabChat onBackToSearch={handleBackToSearch} />
-  }
-
   return (
     <div className="pt-[max(25vh,16px)]">
       {/* Main content */}
@@ -524,6 +529,34 @@ export const NewTab = () => {
             {mounted && (
               <div className="flex items-center justify-between border-border/50 border-t px-5 py-3">
                 <div className="flex items-center gap-1">
+                  {selectedProvider && (
+                    <ChatProviderSelector
+                      providers={providers}
+                      selectedProvider={selectedProvider}
+                      onSelectProvider={handleSelectProvider}
+                    >
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        title={selectedProvider.name}
+                        className={cn(
+                          'h-8 w-8 rounded-lg transition-all',
+                          'text-muted-foreground hover:bg-accent hover:text-accent-foreground',
+                          'data-[state=open]:bg-accent',
+                        )}
+                      >
+                        {selectedProvider.type === 'browseros' ? (
+                          <BrowserOSIcon size={16} />
+                        ) : (
+                          <ProviderIcon
+                            type={selectedProvider.type as ProviderType}
+                            size={16}
+                          />
+                        )}
+                      </Button>
+                    </ChatProviderSelector>
+                  )}
+
                   {supports(Feature.WORKSPACE_FOLDER_SUPPORT) && (
                     <WorkspaceSelector>
                       <Button

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

@@ -1,35 +1,41 @@
 import { Loader2 } from 'lucide-react'
-import { type FC, useEffect, useState } from 'react'
+import { type FC, useEffect, useRef } from 'react'
+import { useSearchParams } from 'react-router'
 import { ChatEmptyState } from '@/entrypoints/sidepanel/index/ChatEmptyState'
 import { ChatError } from '@/entrypoints/sidepanel/index/ChatError'
 import { ChatFooter } from '@/entrypoints/sidepanel/index/ChatFooter'
+import { ChatHeader } from '@/entrypoints/sidepanel/index/ChatHeader'
 import { ChatMessages } from '@/entrypoints/sidepanel/index/ChatMessages'
-import type { ChatMode } from '@/entrypoints/sidepanel/index/chatTypes'
-import { useChatSessionContext } from '@/entrypoints/sidepanel/layout/ChatSessionContext'
-import { createBrowserOSAction } from '@/lib/chat-actions/types'
 import {
+  createAITabAction,
+  createBrowserOSAction,
+} from '@/lib/chat-actions/types'
+import { useChatActions } from '@/lib/chat-actions/useChatActions'
+import {
+  NEWTAB_AI_TRIGGERED_EVENT,
   NEWTAB_CHAT_MODE_CHANGED_EVENT,
   NEWTAB_CHAT_RESET_EVENT,
   NEWTAB_CHAT_STOPPED_EVENT,
   NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT,
   NEWTAB_TAB_REMOVED_EVENT,
   NEWTAB_TAB_TOGGLED_EVENT,
+  NEWTAB_VOICE_ERROR_EVENT,
+  NEWTAB_VOICE_RECORDING_STARTED_EVENT,
+  NEWTAB_VOICE_RECORDING_STOPPED_EVENT,
+  NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT,
 } from '@/lib/constants/analyticsEvents'
 import { track } from '@/lib/metrics/track'
-import { NewTabChatHeader } from './NewTabChatHeader'
 
-interface NewTabChatProps {
-  onBackToSearch: () => void
-}
+export const NewTabChat: FC = () => {
+  const [searchParams, setSearchParams] = useSearchParams()
+  const hasSentInitialRef = useRef(false)
 
-export const NewTabChat: FC<NewTabChatProps> = ({ onBackToSearch }) => {
   const {
     mode,
     setMode,
     messages,
     sendMessage,
     status,
-    stop,
     agentUrlError,
     chatError,
     getActionForMessage,
@@ -42,71 +48,80 @@ export const NewTabChat: FC<NewTabChatProps> = ({ onBackToSearch }) => {
     selectedProvider,
     handleSelectProvider,
     resetConversation,
-  } = useChatSessionContext()
-
-  const [input, setInput] = useState('')
-  const [attachedTabs, setAttachedTabs] = useState<chrome.tabs.Tab[]>([])
-  const [mounted, setMounted] = useState(false)
+    input,
+    setInput,
+    attachedTabs,
+    mounted,
+    voiceState,
+    handleModeChange,
+    handleStop,
+    toggleTabSelection,
+    removeTab,
+    handleSubmit,
+    handleSuggestionClick,
+  } = useChatActions({
+    events: {
+      modeChanged: NEWTAB_CHAT_MODE_CHANGED_EVENT,
+      stopClicked: NEWTAB_CHAT_STOPPED_EVENT,
+      suggestionClicked: NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT,
+      tabToggled: NEWTAB_TAB_TOGGLED_EVENT,
+      tabRemoved: NEWTAB_TAB_REMOVED_EVENT,
+      aiTriggered: NEWTAB_AI_TRIGGERED_EVENT,
+      voiceRecordingStarted: NEWTAB_VOICE_RECORDING_STARTED_EVENT,
+      voiceRecordingStopped: NEWTAB_VOICE_RECORDING_STOPPED_EVENT,
+      voiceTranscriptionCompleted: NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT,
+      voiceError: NEWTAB_VOICE_ERROR_EVENT,
+    },
+  })
 
+  // Send the initial message from URL query params (from /home search bar).
+  // Guarded by ref to prevent double-fire in React Strict Mode.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: must only run once on mount
   useEffect(() => {
-    setMounted(true)
-  }, [])
+    if (hasSentInitialRef.current) return
+    const query = searchParams.get('q')
+    const chatMode = searchParams.get('mode')
+    const tabIdsParam = searchParams.get('tabs')
+    if (!query) return
 
-  const handleModeChange = (newMode: ChatMode) => {
-    track(NEWTAB_CHAT_MODE_CHANGED_EVENT, { from: mode, to: newMode })
-    setMode(newMode)
-  }
-
-  const handleStop = () => {
-    track(NEWTAB_CHAT_STOPPED_EVENT)
-    stop()
-  }
-
-  const toggleTabSelection = (tab: chrome.tabs.Tab) => {
-    setAttachedTabs((prev) => {
-      const isSelected = prev.some((t) => t.id === tab.id)
-      track(NEWTAB_TAB_TOGGLED_EVENT, {
-        action: isSelected ? 'removed' : 'added',
-      })
-      if (isSelected) {
-        return prev.filter((t) => t.id !== tab.id)
-      }
-      return [...prev, tab]
-    })
-  }
-
-  const removeTab = (tabId?: number) => {
-    track(NEWTAB_TAB_REMOVED_EVENT)
-    setAttachedTabs((prev) => prev.filter((t) => t.id !== tabId))
-  }
-
-  const executeMessage = (customMessageText?: string) => {
-    const messageText = customMessageText ? customMessageText : input.trim()
-    if (!messageText) return
-
-    if (attachedTabs.length) {
-      const action = createBrowserOSAction({
-        mode,
-        message: messageText,
-        tabs: attachedTabs,
-      })
-      sendMessage({ text: messageText, action })
-    } else {
-      sendMessage({ text: messageText })
+    hasSentInitialRef.current = true
+    if (chatMode === 'chat' || chatMode === 'agent') {
+      setMode(chatMode)
     }
-    setInput('')
-    setAttachedTabs([])
-  }
+    setSearchParams({}, { replace: true })
 
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault()
-    executeMessage()
-  }
+    const actionType = searchParams.get('actionType')
+    const tabName = searchParams.get('tabName')
+    const tabDescription = searchParams.get('tabDescription')
 
-  const handleSuggestionClick = (suggestion: string) => {
-    track(NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT, { mode })
-    executeMessage(suggestion)
-  }
+    if (tabIdsParam) {
+      const tabIds = tabIdsParam.split(',').map(Number).filter(Boolean)
+      chrome.tabs.query({}).then((allTabs) => {
+        const matchedTabs = allTabs.filter(
+          (t) => t.id !== undefined && tabIds.includes(t.id),
+        )
+        if (matchedTabs.length > 0) {
+          const action =
+            actionType === 'ai-tab' && tabName
+              ? createAITabAction({
+                  name: tabName,
+                  description: tabDescription ?? '',
+                  tabs: matchedTabs,
+                })
+              : createBrowserOSAction({
+                  mode: (chatMode as 'chat' | 'agent') ?? 'agent',
+                  message: query,
+                  tabs: matchedTabs,
+                })
+          sendMessage({ text: query, action })
+        } else {
+          sendMessage({ text: query })
+        }
+      })
+    } else {
+      sendMessage({ text: query })
+    }
+  }, [])
 
   const handleNewConversation = () => {
     track(NEWTAB_CHAT_RESET_EVENT, { message_count: messages.length })
@@ -116,17 +131,19 @@ export const NewTabChat: FC<NewTabChatProps> = ({ onBackToSearch }) => {
   if (!selectedProvider) return null
 
   return (
-    <div className="flex h-[calc(100vh-2rem)] flex-col">
-      <NewTabChatHeader
-        selectedProvider={selectedProvider}
-        providers={providers}
-        onSelectProvider={handleSelectProvider}
-        onNewConversation={handleNewConversation}
-        onBackToSearch={onBackToSearch}
-        hasMessages={messages.length > 0}
-      />
+    <div className="absolute inset-0 flex flex-col overflow-hidden">
+      <div className="mx-auto w-full max-w-3xl">
+        <ChatHeader
+          selectedProvider={selectedProvider}
+          providers={providers}
+          onSelectProvider={handleSelectProvider}
+          onNewConversation={handleNewConversation}
+          hasMessages={messages.length > 0}
+          hideHistory
+        />
+      </div>
 
-      <main className="mx-auto flex w-full max-w-3xl flex-1 flex-col space-y-4 overflow-y-auto px-4 pt-4">
+      <main className="styled-scrollbar [&_[data-streamdown='code-block']]:!max-w-full [&_[data-streamdown='code-block']]:!w-auto [&_[data-streamdown='table-wrapper']]:!max-w-full [&_[data-streamdown='table-wrapper']]:!w-auto mx-auto flex min-h-0 w-full max-w-3xl flex-1 flex-col space-y-4 overflow-y-auto overflow-x-hidden px-4 pt-4 [&_[data-streamdown='code-block']]:overflow-x-auto [&_[data-streamdown='table-wrapper']]:overflow-x-auto">
         {isRestoringConversation ? (
           <div className="flex flex-1 items-center justify-center">
             <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
@@ -156,7 +173,7 @@ export const NewTabChat: FC<NewTabChatProps> = ({ onBackToSearch }) => {
         {chatError && <ChatError error={chatError} />}
       </main>
 
-      <div className="mx-auto w-full max-w-3xl px-4">
+      <div className="mx-auto w-full max-w-3xl flex-shrink-0 px-4 pb-2">
         <ChatFooter
           mode={mode}
           onModeChange={handleModeChange}
@@ -168,6 +185,7 @@ export const NewTabChat: FC<NewTabChatProps> = ({ onBackToSearch }) => {
           attachedTabs={attachedTabs}
           onToggleTab={toggleTabSelection}
           onRemoveTab={removeTab}
+          voice={voiceState}
         />
       </div>
     </div>

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

@@ -1,78 +0,0 @@
-import { ArrowLeft, Plus } from 'lucide-react'
-import type { FC } from 'react'
-import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
-import type { Provider } from '@/components/chat/chatComponentTypes'
-import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
-import type { ProviderType } from '@/lib/llm-providers/types'
-
-interface NewTabChatHeaderProps {
-  selectedProvider: Provider
-  providers: Provider[]
-  onSelectProvider: (provider: Provider) => void
-  onNewConversation: () => void
-  onBackToSearch: () => void
-  hasMessages: boolean
-}
-
-export const NewTabChatHeader: FC<NewTabChatHeaderProps> = ({
-  selectedProvider,
-  providers,
-  onSelectProvider,
-  onNewConversation,
-  onBackToSearch,
-  hasMessages,
-}) => {
-  return (
-    <header className="flex items-center justify-between border-border/40 border-b bg-background/80 px-4 py-2.5 backdrop-blur-md">
-      <div className="flex items-center gap-2">
-        {/* Back to search */}
-        <button
-          type="button"
-          onClick={onBackToSearch}
-          className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-          title="Back to search"
-        >
-          <ArrowLeft className="h-4 w-4" />
-        </button>
-
-        {/* Provider selector */}
-        <ChatProviderSelector
-          providers={providers}
-          selectedProvider={selectedProvider}
-          onSelectProvider={onSelectProvider}
-        >
-          <button
-            type="button"
-            className="group relative inline-flex cursor-pointer items-center gap-2 rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground data-[state=open]:bg-accent"
-            title="Change AI Provider"
-          >
-            {selectedProvider.type === 'browseros' ? (
-              <BrowserOSIcon size={18} />
-            ) : (
-              <ProviderIcon
-                type={selectedProvider.type as ProviderType}
-                size={18}
-              />
-            )}
-            <span className="font-semibold text-base">
-              {selectedProvider.name}
-            </span>
-          </button>
-        </ChatProviderSelector>
-      </div>
-
-      <div className="flex items-center gap-1">
-        {hasMessages && (
-          <button
-            type="button"
-            onClick={onNewConversation}
-            className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-            title="New conversation"
-          >
-            <Plus className="h-4 w-4" />
-          </button>
-        )}
-      </div>
-    </header>
-  )
-}

packages/browseros-agent/apps/agent/entrypoints/newtab/layout/NewTabLayout.tsx

@@ -3,14 +3,19 @@ import { Outlet, useLocation } from 'react-router'
 import { ChatSessionProvider } from '@/entrypoints/sidepanel/layout/ChatSessionContext'
 import { NewTabFocusGrid } from './NewTabFocusGrid'
 
+const HIDE_FOCUS_GRID_PATHS = new Set([
+  '/home/soul',
+  '/home/memory',
+  '/home/skills',
+  '/home/chat',
+])
+
 export const NewTabLayout: FC = () => {
   const location = useLocation()
 
   return (
     <ChatSessionProvider origin="newtab">
-      {location.pathname !== '/home/soul' &&
-        location.pathname !== '/home/memory' &&
-        location.pathname !== '/home/skills' && <NewTabFocusGrid />}
+      {!HIDE_FOCUS_GRID_PATHS.has(location.pathname) && <NewTabFocusGrid />}
       <Outlet />
     </ChatSessionProvider>
   )

packages/browseros-agent/apps/agent/entrypoints/selection.content.ts

@@ -0,0 +1,42 @@
+import { selectedTextStorage } from '@/lib/selected-text/selectedTextStorage'
+
+const MAX_SELECTED_TEXT_LENGTH = 5000
+
+export default defineContentScript({
+  matches: ['*://*/*'],
+  runAt: 'document_idle',
+  async main() {
+    const response = await chrome.runtime.sendMessage({ type: 'get-tab-id' })
+    const tabId: number | undefined = response?.tabId
+    if (!tabId) return
+
+    const key = String(tabId)
+
+    document.addEventListener('mouseup', () => {
+      const text = window.getSelection()?.toString().trim()
+
+      if (text && text.length > 0) {
+        selectedTextStorage.getValue().then((map) => {
+          selectedTextStorage.setValue({
+            ...map,
+            [key]: {
+              text: text.slice(0, MAX_SELECTED_TEXT_LENGTH),
+              pageUrl: window.location.href,
+              pageTitle: document.title,
+              tabId,
+              timestamp: Date.now(),
+            },
+          })
+        })
+      } else {
+        // User clicked without selecting — clear this tab's entry only
+        selectedTextStorage.getValue().then((map) => {
+          if (map[key]) {
+            const { [key]: _, ...rest } = map
+            selectedTextStorage.setValue(rest)
+          }
+        })
+      }
+    })
+  },
+})

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

@@ -8,9 +8,14 @@ import {
   SIDEPANEL_SUGGESTION_CLICKED_EVENT,
   SIDEPANEL_TAB_REMOVED_EVENT,
   SIDEPANEL_TAB_TOGGLED_EVENT,
+  SIDEPANEL_VOICE_ERROR_EVENT,
+  SIDEPANEL_VOICE_RECORDING_STARTED_EVENT,
+  SIDEPANEL_VOICE_RECORDING_STOPPED_EVENT,
+  SIDEPANEL_VOICE_TRANSCRIPTION_COMPLETED_EVENT,
 } from '@/lib/constants/analyticsEvents'
 import { useJtbdPopup } from '@/lib/jtbd-popup/useJtbdPopup'
 import { track } from '@/lib/metrics/track'
+import { useVoiceInput } from '@/lib/voice/useVoiceInput'
 import { useChatSessionContext } from '../layout/ChatSessionContext'
 import { ChatEmptyState } from './ChatEmptyState'
 import { ChatError } from './ChatError'
@@ -48,6 +53,8 @@ export const Chat = () => {
     onDismiss: onDismissJtbdPopup,
   } = useJtbdPopup()
 
+  const voice = useVoiceInput()
+
   const [input, setInput] = useState('')
   const [attachedTabs, setAttachedTabs] = useState<chrome.tabs.Tab[]>([])
   const [mounted, setMounted] = useState(false)
@@ -83,6 +90,26 @@ export const Chat = () => {
     previousChatStatus.current = status
   }, [status])
 
+  // Insert transcript into input when transcription completes
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only trigger on transcript/transcribing change
+  useEffect(() => {
+    if (voice.transcript && !voice.isTranscribing) {
+      setInput((prev) => {
+        const separator = prev.trim() ? ' ' : ''
+        return prev + separator + voice.transcript
+      })
+      track(SIDEPANEL_VOICE_TRANSCRIPTION_COMPLETED_EVENT)
+      voice.clearTranscript()
+    }
+  }, [voice.transcript, voice.isTranscribing])
+
+  // Track voice errors
+  useEffect(() => {
+    if (voice.error) {
+      track(SIDEPANEL_VOICE_ERROR_EVENT, { error: voice.error })
+    }
+  }, [voice.error])
+
   const handleModeChange = (newMode: ChatMode) => {
     track(SIDEPANEL_MODE_CHANGED_EVENT, { from: mode, to: newMode })
     setMode(newMode)
@@ -147,6 +174,27 @@ export const Chat = () => {
     executeMessage(suggestion)
   }
 
+  const handleStartRecording = async () => {
+    const started = await voice.startRecording()
+    if (started) {
+      track(SIDEPANEL_VOICE_RECORDING_STARTED_EVENT)
+    }
+  }
+
+  const handleStopRecording = async () => {
+    await voice.stopRecording()
+    track(SIDEPANEL_VOICE_RECORDING_STOPPED_EVENT)
+  }
+
+  const voiceState = {
+    isRecording: voice.isRecording,
+    isTranscribing: voice.isTranscribing,
+    audioLevels: voice.audioLevels,
+    error: voice.error,
+    onStartRecording: handleStartRecording,
+    onStopRecording: handleStopRecording,
+  }
+
   return (
     <>
       <main className="mt-4 flex h-full flex-1 flex-col space-y-4 overflow-y-auto">
@@ -190,6 +238,7 @@ export const Chat = () => {
         attachedTabs={attachedTabs}
         onToggleTab={toggleTabSelection}
         onRemoveTab={removeTab}
+        voice={voiceState}
       />
     </>
   )

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

@@ -30,6 +30,7 @@ function parseErrorMessage(message: string): {
   text: string
   url?: string
   isRateLimit?: boolean
+  isCreditsExhausted?: boolean
   isConnectionError?: boolean
 } {
   // Detect MCP server connection failures
@@ -44,6 +45,19 @@ function parseErrorMessage(message: string): {
     }
   }
 
+  // Detect credit exhaustion from gateway
+  if (
+    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 (unique pattern, no provider uses this)
   if (message.includes('BrowserOS LLM daily limit reached')) {
     return {
@@ -70,9 +84,8 @@ function parseErrorMessage(message: string): {
 }
 
 export const ChatError: FC<ChatErrorProps> = ({ error, onRetry }) => {
-  const { text, url, isRateLimit, isConnectionError } = parseErrorMessage(
-    error.message,
-  )
+  const { text, url, isRateLimit, isCreditsExhausted, isConnectionError } =
+    parseErrorMessage(error.message)
 
   // --- Commented out for Kimi partnership launch (restore after) ---
   // const surveyUrl = useMemo(
@@ -128,7 +141,17 @@ export const ChatError: FC<ChatErrorProps> = ({ error, onRetry }) => {
         </p>
       )}
       --- End commented out survey code --- */}
-      {isRateLimit && (
+      {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 && !isCreditsExhausted && (
         <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 */}

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

@@ -8,12 +8,17 @@ import { useGetUserMCPIntegrations } from '@/entrypoints/app/connect-mcp/useGetU
 import { Feature } from '@/lib/browseros/capabilities'
 import { useCapabilities } from '@/lib/browseros/useCapabilities'
 import { useMcpServers } from '@/lib/mcp/mcpServerStorage'
-import { useSyncRemoteIntegrations } from '@/lib/mcp/useSyncRemoteIntegrations'
+import {
+  type SelectedTextData,
+  selectedTextStorage,
+} from '@/lib/selected-text/selectedTextStorage'
 import { cn } from '@/lib/utils'
+import type { VoiceInputState } from '@/lib/voice/useVoiceInput'
 import { useWorkspace } from '@/lib/workspace/use-workspace'
 import { ChatAttachedTabs } from './ChatAttachedTabs'
 import { ChatInput, type ChatInputHandle } from './ChatInput'
 import { ChatModeToggle } from './ChatModeToggle'
+import { ChatSelectedText } from './ChatSelectedText'
 import type { ChatMode } from './chatTypes'
 
 interface ChatFooterProps {
@@ -27,6 +32,7 @@ interface ChatFooterProps {
   attachedTabs: chrome.tabs.Tab[]
   onToggleTab: (tab: chrome.tabs.Tab) => void
   onRemoveTab: (tabId?: number) => void
+  voice?: VoiceInputState
 }
 
 export const ChatFooter: FC<ChatFooterProps> = ({
@@ -40,13 +46,40 @@ export const ChatFooter: FC<ChatFooterProps> = ({
   attachedTabs,
   onToggleTab,
   onRemoveTab,
+  voice,
 }) => {
   const { selectedFolder } = useWorkspace()
   const { supports } = useCapabilities()
   const { servers: mcpServers } = useMcpServers()
   const { data: userMCPIntegrations } = useGetUserMCPIntegrations()
-  useSyncRemoteIntegrations()
   const chatInputRef = useRef<ChatInputHandle>(null)
+  const [selectionMap, setSelectionMap] = useState<
+    Record<string, SelectedTextData>
+  >({})
+  const [activeTabId, setActiveTabId] = useState<number | undefined>()
+
+  // Track active tab for tab-scoped selection display
+  useEffect(() => {
+    chrome.tabs
+      .query({ active: true, currentWindow: true })
+      .then((tabs) => setActiveTabId(tabs[0]?.id))
+    const listener = (activeInfo: { tabId: number }) => {
+      setActiveTabId(activeInfo.tabId)
+    }
+    chrome.tabs.onActivated.addListener(listener)
+    return () => chrome.tabs.onActivated.removeListener(listener)
+  }, [])
+
+  // Watch selected text storage (per-tab map)
+  useEffect(() => {
+    selectedTextStorage.getValue().then(setSelectionMap)
+    const unwatch = selectedTextStorage.watch(setSelectionMap)
+    return () => unwatch()
+  }, [])
+
+  const visibleSelectedText = activeTabId
+    ? (selectionMap[String(activeTabId)] ?? null)
+    : null
   const [isTabMentionOpen, setIsTabMentionOpen] = useState(false)
 
   useEffect(() => {
@@ -80,6 +113,19 @@ export const ChatFooter: FC<ChatFooterProps> = ({
   return (
     <footer className="border-border/40 border-t bg-background/80 backdrop-blur-md">
       <ChatAttachedTabs tabs={attachedTabs} onRemoveTab={onRemoveTab} />
+      {visibleSelectedText && (
+        <ChatSelectedText
+          selectedText={visibleSelectedText}
+          onDismiss={() => {
+            if (!activeTabId) return
+            const key = String(activeTabId)
+            selectedTextStorage.getValue().then((map) => {
+              const { [key]: _, ...rest } = map
+              selectedTextStorage.setValue(rest)
+            })
+          }}
+        />
+      )}
 
       <div className="p-3">
         <div className="flex items-center gap-2">
@@ -172,6 +218,10 @@ export const ChatFooter: FC<ChatFooterProps> = ({
           </div>
         </div>
 
+        {voice?.error && (
+          <div className="mt-1 text-destructive text-xs">{voice.error}</div>
+        )}
+
         <ChatInput
           input={input}
           status={status}
@@ -182,6 +232,7 @@ export const ChatFooter: FC<ChatFooterProps> = ({
           selectedTabs={attachedTabs}
           onToggleTab={onToggleTab}
           onTabMentionOpenChange={setIsTabMentionOpen}
+          voice={voice}
           ref={chatInputRef}
         />
       </div>

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

@@ -3,17 +3,34 @@ import type { FC } from 'react'
 import { Link, useLocation, useNavigate } from 'react-router'
 import { ChatProviderSelector } from '@/components/chat/ChatProviderSelector'
 import type { Provider } from '@/components/chat/chatComponentTypes'
+import { CreditBadge } from '@/components/credits/CreditBadge'
 import { ThemeToggle } from '@/components/elements/theme-toggle'
+import { Feature } from '@/lib/browseros/capabilities'
+import { useCapabilities } from '@/lib/browseros/useCapabilities'
 import { productRepositoryUrl } from '@/lib/constants/productUrls'
+import { useCredits } from '@/lib/credits/useCredits'
 import { BrowserOSIcon, ProviderIcon } from '@/lib/llm-providers/providerIcons'
 import type { ProviderType } from '@/lib/llm-providers/types'
 
+const CreditsBadgeWrapper: FC = () => {
+  const { supports } = useCapabilities()
+  const { data } = useCredits()
+  if (!supports(Feature.CREDITS_SUPPORT) || data === undefined) return null
+  return (
+    <CreditBadge
+      credits={data.credits}
+      onClick={() => window.open('/app.html#/settings/usage', '_blank')}
+    />
+  )
+}
+
 interface ChatHeaderProps {
   selectedProvider: Provider
   providers: Provider[]
   onSelectProvider: (provider: Provider) => void
   onNewConversation: () => void
   hasMessages: boolean
+  hideHistory?: boolean
 }
 
 export const ChatHeader: FC<ChatHeaderProps> = ({
@@ -22,6 +39,7 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
   onSelectProvider,
   onNewConversation,
   hasMessages,
+  hideHistory,
 }) => {
   const location = useLocation()
   const navigate = useNavigate()
@@ -59,6 +77,7 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
             </span>
           </button>
         </ChatProviderSelector>
+        {selectedProvider.type === 'browseros' && <CreditsBadgeWrapper />}
       </div>
 
       <div className="flex items-center gap-1">
@@ -73,24 +92,25 @@ export const ChatHeader: FC<ChatHeaderProps> = ({
           </button>
         )}
 
-        {isHistoryPage ? (
-          <button
-            type="button"
-            onClick={handleNewConversationFromHistory}
-            className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-            title="New conversation"
-          >
-            <Plus className="h-4 w-4" />
-          </button>
-        ) : (
-          <Link
-            to="/history"
-            className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-            title="Chat history"
-          >
-            <History className="h-4 w-4" />
-          </Link>
-        )}
+        {!hideHistory &&
+          (isHistoryPage ? (
+            <button
+              type="button"
+              onClick={handleNewConversationFromHistory}
+              className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+              title="New conversation"
+            >
+              <Plus className="h-4 w-4" />
+            </button>
+          ) : (
+            <Link
+              to="/history"
+              className="cursor-pointer rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+              title="Chat history"
+            >
+              <History className="h-4 w-4" />
+            </Link>
+          ))}
 
         <a
           href={productRepositoryUrl}

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

@@ -1,4 +1,4 @@
-import { Send, SquareStop } from 'lucide-react'
+import { Loader2, Mic, Send, Square, SquareStop } from 'lucide-react'
 import type { FormEvent, KeyboardEvent } from 'react'
 import {
   forwardRef,
@@ -10,6 +10,7 @@ import {
 } from 'react'
 import { TabPickerPopover } from '@/components/elements/tab-picker-popover'
 import { cn } from '@/lib/utils'
+import type { VoiceInputState } from '@/lib/voice/useVoiceInput'
 import type { ChatMode } from './chatTypes'
 
 interface MentionState {
@@ -28,6 +29,7 @@ interface ChatInputProps {
   selectedTabs: chrome.tabs.Tab[]
   onToggleTab: (tab: chrome.tabs.Tab) => void
   onTabMentionOpenChange?: (isOpen: boolean) => void
+  voice?: VoiceInputState
 }
 
 export interface ChatInputHandle {
@@ -49,6 +51,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
       selectedTabs,
       onToggleTab,
       onTabMentionOpenChange,
+      voice,
     },
     ref,
   ) => {
@@ -259,6 +262,76 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
       return () => document.removeEventListener('mousedown', handleClickOutside)
     }, [mentionState.isOpen, closeMention])
 
+    const renderVoiceButton = () => {
+      if (!voice) return null
+
+      if (voice.isRecording) {
+        return (
+          <button
+            type="button"
+            onClick={voice.onStopRecording}
+            className="cursor-pointer rounded-full bg-red-600 p-2 text-white shadow-sm transition-all duration-200 hover:bg-red-900"
+          >
+            <Square className="h-3.5 w-3.5" />
+            <span className="sr-only">Stop recording</span>
+          </button>
+        )
+      }
+
+      if (voice.isTranscribing) {
+        return (
+          <button
+            type="button"
+            disabled
+            className="rounded-full p-2 text-muted-foreground"
+          >
+            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+            <span className="sr-only">Transcribing</span>
+          </button>
+        )
+      }
+
+      return (
+        <button
+          type="button"
+          onClick={voice.onStartRecording}
+          disabled={isBusy}
+          className="cursor-pointer rounded-full p-2 text-muted-foreground transition-all duration-200 hover:bg-muted hover:text-foreground disabled:cursor-not-allowed disabled:opacity-50"
+        >
+          <Mic className="h-3.5 w-3.5" />
+          <span className="sr-only">Voice input</span>
+        </button>
+      )
+    }
+
+    const renderSendButton = () => {
+      if (isBusy) {
+        return (
+          <button
+            type="button"
+            onClick={onStop}
+            className="cursor-pointer rounded-full bg-red-600 p-2 text-white shadow-sm transition-all duration-200 hover:bg-red-900"
+          >
+            <SquareStop className="h-3.5 w-3.5" />
+            <span className="sr-only">Stop</span>
+          </button>
+        )
+      }
+
+      return (
+        <button
+          type="submit"
+          disabled={
+            !input.trim() || voice?.isRecording || voice?.isTranscribing
+          }
+          className="cursor-pointer rounded-full bg-[var(--accent-orange)] p-2 text-white shadow-sm transition-all duration-200 hover:bg-[var(--accent-orange-bright)] disabled:cursor-not-allowed disabled:opacity-50"
+        >
+          <Send className="h-3.5 w-3.5" />
+          <span className="sr-only">Send</span>
+        </button>
+      )
+    }
+
     return (
       <form
         onSubmit={handleSubmit}
@@ -273,38 +346,43 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
           onClose={closeMention}
           anchorRef={textareaRef}
         />
-        <textarea
-          ref={textareaRef}
-          className={cn(
-            'field-sizing-content max-h-60 min-h-[42px] flex-1 resize-none overflow-hidden rounded-2xl border border-border/50 bg-muted/50 px-4 py-2.5 pr-11 text-sm outline-none transition-colors placeholder:text-muted-foreground/70 hover:border-border focus:border-[var(--accent-orange)]',
-          )}
-          value={input}
-          onChange={(e) => handleInputChange(e.target.value)}
-          onKeyDown={handleKeyDown}
-          placeholder={
-            mode === 'chat' ? 'Ask about this page...' : 'What should I do?'
-          }
-          rows={1}
-        />
-        {isBusy ? (
-          <button
-            type="button"
-            onClick={onStop}
-            className="absolute right-1.5 bottom-1.5 cursor-pointer rounded-full bg-red-600 p-2 text-white shadow-sm transition-all duration-200 hover:bg-red-900 disabled:cursor-not-allowed disabled:opacity-50"
-          >
-            <SquareStop className="h-3.5 w-3.5" />
-            <span className="sr-only">Stop</span>
-          </button>
+        {voice?.isRecording ? (
+          <div className="flex min-h-[42px] flex-1 items-center justify-center gap-1 rounded-2xl border border-red-500/50 bg-muted/50 px-4 py-2.5 pr-[4.5rem]">
+            {voice.audioLevels.map((level, i) => (
+              <div
+                key={i.toString()}
+                className="w-1 rounded-full bg-red-500 transition-all duration-75"
+                style={{
+                  height: `${Math.max(4, Math.min(20, level * 0.6))}px`,
+                }}
+              />
+            ))}
+          </div>
         ) : (
-          <button
-            type="submit"
-            disabled={!input.trim()}
-            className="absolute right-1.5 bottom-1.5 cursor-pointer rounded-full bg-[var(--accent-orange)] p-2 text-white shadow-sm transition-all duration-200 hover:bg-[var(--accent-orange-bright)] disabled:cursor-not-allowed disabled:opacity-50"
-          >
-            <Send className="h-3.5 w-3.5" />
-            <span className="sr-only">Send</span>
-          </button>
+          <textarea
+            ref={textareaRef}
+            className={cn(
+              'field-sizing-content max-h-60 min-h-[42px] flex-1 resize-none overflow-hidden rounded-2xl border border-border/50 bg-muted/50 px-4 py-2.5 text-sm outline-none transition-colors placeholder:text-muted-foreground/70 hover:border-border focus:border-[var(--accent-orange)]',
+              voice ? 'pr-[4.5rem]' : 'pr-11',
+            )}
+            value={input}
+            onChange={(e) => handleInputChange(e.target.value)}
+            onKeyDown={handleKeyDown}
+            placeholder={
+              voice?.isTranscribing
+                ? 'Transcribing...'
+                : mode === 'chat'
+                  ? 'Ask about this page...'
+                  : 'What should I do?'
+            }
+            disabled={voice?.isTranscribing}
+            rows={1}
+          />
         )}
+        <div className="absolute right-1.5 bottom-1.5 flex items-center gap-1">
+          {renderVoiceButton()}
+          {renderSendButton()}
+        </div>
       </form>
     )
   },

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

@@ -0,0 +1,46 @@
+import { FileText, X } from 'lucide-react'
+import type { FC } from 'react'
+import type { SelectedTextData } from '@/lib/selected-text/selectedTextStorage'
+
+const MAX_DISPLAY_LENGTH = 200
+
+interface ChatSelectedTextProps {
+  selectedText: SelectedTextData
+  onDismiss: () => void
+}
+
+export const ChatSelectedText: FC<ChatSelectedTextProps> = ({
+  selectedText,
+  onDismiss,
+}) => {
+  const truncated =
+    selectedText.text.length > MAX_DISPLAY_LENGTH
+      ? `${selectedText.text.slice(0, MAX_DISPLAY_LENGTH)}...`
+      : selectedText.text
+
+  return (
+    <div className="px-3 pt-2">
+      <div className="relative rounded-lg border border-[var(--accent-orange)]/30 bg-accent/30">
+        <div className="flex items-start gap-2 px-3 py-2">
+          <FileText className="mt-0.5 h-3.5 w-3.5 flex-shrink-0 text-[var(--accent-orange)]" />
+          <div className="min-w-0 flex-1">
+            <div className="mb-0.5 truncate font-medium text-[10px] text-muted-foreground">
+              {selectedText.pageTitle}
+            </div>
+            <div className="line-clamp-3 text-foreground text-xs leading-relaxed">
+              &ldquo;{truncated}&rdquo;
+            </div>
+          </div>
+          <button
+            type="button"
+            onClick={onDismiss}
+            className="flex-shrink-0 rounded p-0.5 transition-colors hover:bg-background"
+            title="Remove selected text"
+          >
+            <X className="h-3 w-3 text-muted-foreground" />
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}

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

@@ -21,12 +21,14 @@ import {
   useConversations,
 } from '@/lib/conversations/conversationStorage'
 import { formatConversationHistory } from '@/lib/conversations/formatConversationHistory'
+import { useInvalidateCredits } from '@/lib/credits/useCredits'
 import { declinedAppsStorage } from '@/lib/declined-apps/storage'
 import { useGraphqlQuery } from '@/lib/graphql/useGraphqlQuery'
 import { createDefaultBrowserOSProvider } from '@/lib/llm-providers/storage'
 import { useLlmProviders } from '@/lib/llm-providers/useLlmProviders'
 import { track } from '@/lib/metrics/track'
 import { searchActionsStorage } from '@/lib/search-actions/searchActionsStorage'
+import { selectedTextStorage } from '@/lib/selected-text/selectedTextStorage'
 import { stopAgentStorage } from '@/lib/stop-agent/stop-agent-storage'
 import { selectedWorkspaceStorage } from '@/lib/workspace/workspace-storage'
 import type { ChatMode } from './chatTypes'
@@ -70,6 +72,8 @@ export type ChatOrigin = 'sidepanel' | 'newtab'
 
 export interface ChatSessionOptions {
   origin?: ChatOrigin
+  /** When false, messages are queued until integrations finish syncing. */
+  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.`
@@ -83,6 +87,7 @@ export const useChatSession = (options?: ChatSessionOptions) => {
     selectedLlmProvider,
     isLoadingProviders,
   } = useChatRefs()
+  const invalidateCredits = useInvalidateCredits()
 
   const { providers: llmProviders, setDefaultProvider } = useLlmProviders()
 
@@ -163,8 +168,34 @@ export const useChatSession = (options?: ChatSessionOptions) => {
   const modeRef = useRef<ChatMode>(mode)
   const textToActionRef = useRef<Map<string, ChatAction>>(textToAction)
   const workingDirRef = useRef<string | undefined>(undefined)
+  const selectionMapRef = useRef<
+    Record<string, { text: string; url: string; title: string }>
+  >({})
+  const pendingSelectionTabKeyRef = useRef<string | null>(null)
   const messagesRef = useRef<UIMessage[]>([])
 
+  useEffect(() => {
+    const toRef = (
+      map: Record<string, { text: string; pageUrl: string; pageTitle: string }>,
+    ) => {
+      const result: Record<
+        string,
+        { text: string; url: string; title: string }
+      > = {}
+      for (const [k, v] of Object.entries(map)) {
+        result[k] = { text: v.text, url: v.pageUrl, title: v.pageTitle }
+      }
+      return result
+    }
+    selectedTextStorage.getValue().then((map) => {
+      selectionMapRef.current = toRef(map)
+    })
+    const unwatchText = selectedTextStorage.watch((map) => {
+      selectionMapRef.current = toRef(map)
+    })
+    return () => unwatchText()
+  }, [])
+
   useEffect(() => {
     selectedWorkspaceStorage.getValue().then((folder) => {
       workingDirRef.current = folder?.path
@@ -208,8 +239,12 @@ export const useChatSession = (options?: ChatSessionOptions) => {
           currentWindow: true,
         })
         const activeTab = activeTabsList?.[0] ?? undefined
+        const activeTabSelection = activeTab?.id
+          ? (selectionMapRef.current[String(activeTab.id)] ?? null)
+          : null
         const message = getLastMessageText(messages)
-        const provider = selectedLlmProviderRef.current ?? createDefaultBrowserOSProvider()
+        const provider =
+          selectedLlmProviderRef.current ?? createDefaultBrowserOSProvider()
         const currentMode = modeRef.current
         const enabledMcpServers = enabledMcpServersRef.current
         const customMcpServers = enabledCustomServersRef.current
@@ -284,7 +319,7 @@ export const useChatSession = (options?: ChatSessionOptions) => {
             : history.map((m) => `${m.role}: ${m.content}`).join('\n')
           : undefined
 
-        return {
+        const result = {
           api: `${agentUrlRef.current}/chat`,
           body: {
             message,
@@ -305,6 +340,9 @@ export const useChatSession = (options?: ChatSessionOptions) => {
             secretAccessKey: provider?.secretAccessKey,
             region: provider?.region,
             sessionToken: provider?.sessionToken,
+            // ChatGPT Pro (Codex)
+            reasoningEffort: provider?.reasoningEffort,
+            reasoningSummary: provider?.reasoningSummary,
             browserContext,
             userSystemPrompt:
               options?.origin === 'newtab'
@@ -316,8 +354,21 @@ export const useChatSession = (options?: ChatSessionOptions) => {
             supportsImages: provider?.supportsImages,
             previousConversation,
             declinedApps: declinedApps.length > 0 ? declinedApps : undefined,
+            selectedText: activeTabSelection?.text,
+            selectedTextSource: activeTabSelection
+              ? {
+                  url: activeTabSelection.url,
+                  title: activeTabSelection.title,
+                }
+              : undefined,
           },
         }
+
+        // Track which tab's selection was sent so we can clear it on success
+        pendingSelectionTabKeyRef.current =
+          activeTabSelection && activeTab?.id ? String(activeTab.id) : null
+
+        return result
       },
     }),
   })
@@ -411,6 +462,19 @@ export const useChatSession = (options?: ChatSessionOptions) => {
 
     if (!justFinished) return
 
+    // Clear the selected text that was sent with this request
+    const tabKey = pendingSelectionTabKeyRef.current
+    if (tabKey) {
+      pendingSelectionTabKeyRef.current = null
+      delete selectionMapRef.current[tabKey]
+      selectedTextStorage.getValue().then((map) => {
+        if (map[tabKey]) {
+          const { [tabKey]: _, ...rest } = map
+          selectedTextStorage.setValue(rest)
+        }
+      })
+    }
+
     const messagesToSave = messages.filter((m) => m.parts?.length > 0)
     if (messagesToSave.length === 0) return
 
@@ -419,14 +483,55 @@ 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<{
+    text: string
+    action?: ChatAction
+  } | null>(null)
+
+  useEffect(() => {
+    isIntegrationsSyncedRef.current = isIntegrationsSynced
+  }, [isIntegrationsSynced])
+
+  // Flush pending message when integrations sync completes
+  useEffect(() => {
+    if (isIntegrationsSynced && pendingMessageRef.current) {
+      const pending = pendingMessageRef.current
+      pendingMessageRef.current = null
+      if (pending.action) {
+        setTextToAction((prev) => {
+          const next = new Map(prev)
+          // biome-ignore lint/style/noNonNullAssertion: guarded by if (pending.action) above
+          next.set(pending.text, pending.action!)
+          return next
+        })
+      }
+      baseSendMessage({ text: pending.text })
+    }
+  }, [isIntegrationsSynced, baseSendMessage])
+
   const sendMessage = (params: { text: string; action?: ChatAction }) => {
     track(MESSAGE_SENT_EVENT, {
       mode,
       provider_type: selectedLlmProvider?.type,
       model: selectedLlmProvider?.modelId,
     })
+
+    if (!isIntegrationsSyncedRef.current) {
+      // Queue the message — will be sent when sync completes
+      pendingMessageRef.current = params
+      return
+    }
+
     if (params.action) {
       const action = params.action
       setTextToAction((prev) => {
@@ -503,6 +608,7 @@ export const useChatSession = (options?: ChatSessionOptions) => {
     providers,
     selectedProvider,
     isLoading: isLoadingProviders || isLoadingAgentUrl,
+    isSyncing: !isIntegrationsSynced,
     isRestoringConversation,
     agentUrlError,
     chatError,

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

@@ -19,6 +19,10 @@ 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,
@@ -28,7 +32,10 @@ export const useNotifyActiveTab = ({
   status: ChatStatus
   conversationId: string
 }) => {
-  const lastTabIdRef = useRef<number | null>(null)
+  // 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 lastMessage = messages?.[messages.length - 1]
 
@@ -41,27 +48,35 @@ export const useNotifyActiveTab = ({
 
   useEffect(() => {
     const isStreaming = status === 'streaming'
-    const previousTabId = lastTabIdRef.current
 
     if (!isStreaming) {
-      if (previousTabId) {
+      // Deactivate ALL tabs that were glowed during this stream
+      const allGlowed = allGlowedTabsRef.current
+      if (allGlowed.size > 0) {
         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()
-          const deactivateMessage: GlowMessage = {
-            conversationId,
-            isActive: false,
-            showConfetti: !alreadyShown,
+          let showConfetti = !alreadyShown
+
+          for (const tabId of tabIds) {
+            sendGlow(tabId, {
+              conversationId,
+              isActive: false,
+              showConfetti,
+            })
+            showConfetti = false
           }
-          chrome.tabs
-            .sendMessage(previousTabId, deactivateMessage)
-            .catch(() => {})
+
           if (!alreadyShown) {
             await firstRunConfettiShownStorage.setValue(true)
           }
         }
         deactivate()
-        lastTabIdRef.current = null
       }
+      activeTabIdRef.current = null
       return
     }
 
@@ -70,34 +85,41 @@ export const useNotifyActiveTab = ({
     let cancelled = false
 
     const activate = async () => {
-      let targetTabId = toolTabId ?? previousTabId ?? undefined
+      let targetTabId = toolTabId ?? undefined
 
       if (!targetTabId) {
-        const tabs = await chrome.tabs.query({
-          active: true,
-          currentWindow: true,
-        })
-        targetTabId = tabs[0]?.id
+        // 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
+        }
       }
 
       if (cancelled || !targetTabId) return
 
+      const previousTabId = activeTabIdRef.current
+
+      // If the agent moved to a different tab, deactivate the previous one
       if (previousTabId && previousTabId !== targetTabId) {
-        const deactivateMessage: GlowMessage = {
+        sendGlow(previousTabId, {
           conversationId,
           isActive: false,
-        }
-        chrome.tabs
-          .sendMessage(previousTabId, deactivateMessage)
-          .catch(() => {})
+        })
       }
 
-      const activateMessage: GlowMessage = {
+      // Activate glow on the target tab
+      sendGlow(targetTabId, {
         conversationId,
         isActive: true,
-      }
-      chrome.tabs.sendMessage(targetTabId, activateMessage).catch(() => {})
-      lastTabIdRef.current = targetTabId
+      })
+
+      activeTabIdRef.current = targetTabId
+      allGlowedTabsRef.current.add(targetTabId)
     }
 
     activate()

packages/browseros-agent/apps/agent/entrypoints/sidepanel/layout/ChatSessionContext.tsx

@@ -1,4 +1,5 @@
 import { createContext, type FC, type ReactNode, useContext } from 'react'
+import { useSyncRemoteIntegrations } from '@/lib/mcp/useSyncRemoteIntegrations'
 import {
   type ChatSessionOptions,
   useChatSession,
@@ -11,7 +12,11 @@ const ChatSessionContext = createContext<ChatSessionContextValue | null>(null)
 export const ChatSessionProvider: FC<
   { children: ReactNode } & ChatSessionOptions
 > = ({ children, ...options }) => {
-  const session = useChatSession(options)
+  const { hasSynced } = useSyncRemoteIntegrations()
+  const session = useChatSession({
+    ...options,
+    isIntegrationsSynced: hasSynced,
+  })
   return (
     <ChatSessionContext.Provider value={session}>
       {children}

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

@@ -45,6 +45,14 @@ export enum Feature {
   MEMORY_SUPPORT = 'MEMORY_SUPPORT',
   // Skills page: agent skills viewer and editor
   SKILLS_SUPPORT = 'SKILLS_SUPPORT',
+  // ChatGPT Pro OAuth LLM provider
+  CHATGPT_PRO_SUPPORT = 'CHATGPT_PRO_SUPPORT',
+  // GitHub Copilot OAuth LLM provider
+  GITHUB_COPILOT_SUPPORT = 'GITHUB_COPILOT_SUPPORT',
+  // Qwen Code OAuth LLM provider
+  QWEN_CODE_SUPPORT = 'QWEN_CODE_SUPPORT',
+  // Credit-based usage tracking
+  CREDITS_SUPPORT = 'CREDITS_SUPPORT',
 }
 
 /**
@@ -72,6 +80,10 @@ const FEATURE_CONFIG: { [K in Feature]: FeatureConfig } = {
   [Feature.VERTICAL_TABS_SUPPORT]: { minBrowserOSVersion: '0.42.0.0' },
   [Feature.MEMORY_SUPPORT]: { minServerVersion: '0.0.73' },
   [Feature.SKILLS_SUPPORT]: { minBrowserOSVersion: '0.43.0.0' },
+  [Feature.CHATGPT_PRO_SUPPORT]: { minServerVersion: '0.0.77' },
+  [Feature.GITHUB_COPILOT_SUPPORT]: { minServerVersion: '0.0.77' },
+  [Feature.QWEN_CODE_SUPPORT]: { minServerVersion: '0.0.77' },
+  [Feature.CREDITS_SUPPORT]: { minServerVersion: '0.0.78' },
 }
 
 function parseVersion(version: string): number[] {

packages/browseros-agent/apps/agent/lib/chat-actions/useChatActions.ts

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

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

@@ -29,6 +29,41 @@ export const CONVERSATION_RESET_EVENT = 'ui.conversation.reset'
 /** @public */
 export const AI_PROVIDER_ADDED_EVENT = 'settings.ai_provider.added'
 
+/** @public */
+export const CHATGPT_PRO_OAUTH_STARTED_EVENT =
+  'settings.chatgpt_pro.oauth_started'
+
+/** @public */
+export const CHATGPT_PRO_OAUTH_COMPLETED_EVENT =
+  'settings.chatgpt_pro.oauth_completed'
+
+/** @public */
+export const CHATGPT_PRO_OAUTH_DISCONNECTED_EVENT =
+  'settings.chatgpt_pro.oauth_disconnected'
+
+/** @public */
+export const GITHUB_COPILOT_OAUTH_STARTED_EVENT =
+  'settings.github_copilot.oauth_started'
+
+/** @public */
+export const GITHUB_COPILOT_OAUTH_COMPLETED_EVENT =
+  'settings.github_copilot.oauth_completed'
+
+/** @public */
+export const GITHUB_COPILOT_OAUTH_DISCONNECTED_EVENT =
+  'settings.github_copilot.oauth_disconnected'
+
+/** @public */
+export const QWEN_CODE_OAUTH_STARTED_EVENT = 'settings.qwen_code.oauth_started'
+
+/** @public */
+export const QWEN_CODE_OAUTH_COMPLETED_EVENT =
+  'settings.qwen_code.oauth_completed'
+
+/** @public */
+export const QWEN_CODE_OAUTH_DISCONNECTED_EVENT =
+  'settings.qwen_code.oauth_disconnected'
+
 /** @public */
 export const HUB_PROVIDER_ADDED_EVENT = 'settings.hub_provider.added'
 
@@ -56,6 +91,10 @@ export const SCHEDULED_TASK_DELETED_EVENT = 'settings.scheduled_task.deleted'
 /** @public */
 export const SCHEDULED_TASK_TOGGLED_EVENT = 'settings.scheduled_task.toggled'
 
+/** @public */
+export const SCHEDULED_TASK_PROMPT_REFINED_EVENT =
+  'settings.scheduled_task.prompt_refined'
+
 /** @public */
 export const SCHEDULED_TASK_TESTED_EVENT = 'settings.scheduled_task.tested'
 
@@ -114,6 +153,21 @@ export const NEWTAB_CHAT_SUGGESTION_CLICKED_EVENT =
 /** @public */
 export const NEWTAB_CHAT_MODE_CHANGED_EVENT = 'newtab.chat.mode_changed'
 
+/** @public */
+export const NEWTAB_VOICE_RECORDING_STARTED_EVENT =
+  'newtab.voice.recording_started'
+
+/** @public */
+export const NEWTAB_VOICE_RECORDING_STOPPED_EVENT =
+  'newtab.voice.recording_stopped'
+
+/** @public */
+export const NEWTAB_VOICE_TRANSCRIPTION_COMPLETED_EVENT =
+  'newtab.voice.transcription_completed'
+
+/** @public */
+export const NEWTAB_VOICE_ERROR_EVENT = 'newtab.voice.error'
+
 /** @public */
 export const WORKFLOW_DELETED_EVENT = 'settings.workflow.deleted'
 
@@ -251,3 +305,18 @@ export const KIMI_RATE_LIMIT_DOCS_CLICKED_EVENT =
 /** @public */
 export const KIMI_RATE_LIMIT_PLATFORM_CLICKED_EVENT =
   'ui.rate_limit.moonshot_platform_clicked'
+
+/** @public */
+export const SIDEPANEL_VOICE_RECORDING_STARTED_EVENT =
+  'sidepanel.voice.recording_started'
+
+/** @public */
+export const SIDEPANEL_VOICE_RECORDING_STOPPED_EVENT =
+  'sidepanel.voice.recording_stopped'
+
+/** @public */
+export const SIDEPANEL_VOICE_TRANSCRIPTION_COMPLETED_EVENT =
+  'sidepanel.voice.transcription_completed'
+
+/** @public */
+export const SIDEPANEL_VOICE_ERROR_EVENT = 'sidepanel.voice.error'

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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,33 @@
+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/llm-providers/client-oauth.ts

@@ -0,0 +1,169 @@
+/**
+ * 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/providerIcons.tsx

@@ -8,8 +8,9 @@ import {
   Ollama,
   OpenAI,
   OpenRouter,
+  Qwen,
 } from '@lobehub/icons'
-import { Bot } from 'lucide-react'
+import { Bot, Github } from 'lucide-react'
 import type { FC, SVGProps } from 'react'
 import ProductLogoSvg from '@/assets/product_logo.svg'
 import type { ProviderType } from './types'
@@ -32,6 +33,9 @@ const providerIconMap: Record<ProviderType, IconComponent | null> = {
   bedrock: Bedrock,
   browseros: null,
   moonshot: Kimi,
+  'chatgpt-pro': OpenAI,
+  'github-copilot': Github,
+  'qwen-code': Qwen,
 }
 
 interface ProviderIconProps {

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

@@ -20,6 +20,33 @@ export interface ProviderTemplate {
  * @public
  */
 export const providerTemplates: ProviderTemplate[] = [
+  {
+    id: 'chatgpt-pro',
+    name: 'ChatGPT Plus/Pro',
+    defaultBaseUrl: 'https://chatgpt.com/backend-api',
+    defaultModelId: 'gpt-5.3-codex',
+    supportsImages: true,
+    contextWindow: 400000,
+    setupGuideUrl: 'https://docs.browseros.com/features/chatgpt-pro-oauth',
+  },
+  {
+    id: 'github-copilot',
+    name: 'GitHub Copilot',
+    defaultBaseUrl: 'https://api.githubcopilot.com',
+    defaultModelId: 'gpt-5-mini',
+    supportsImages: true,
+    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',
@@ -129,6 +156,9 @@ export const providerTemplates: ProviderTemplate[] = [
  * @public
  */
 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' },
@@ -157,6 +187,9 @@ export const getProviderTemplate = (
  * Auto-fills when user selects a provider type
  */
 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

@@ -14,6 +14,9 @@ export type ProviderType =
   | 'bedrock'
   | 'browseros'
   | 'moonshot'
+  | 'chatgpt-pro'
+  | 'github-copilot'
+  | 'qwen-code'
 
 /**
  * LLM Provider configuration
@@ -56,6 +59,10 @@ export interface LlmProviderConfig {
   region?: string
   /** AWS session token (for temporary STS credentials) */
   sessionToken?: string
+
+  // ChatGPT Pro (Codex) fields
+  reasoningEffort?: 'none' | 'low' | 'medium' | 'high'
+  reasoningSummary?: 'auto' | 'concise' | 'detailed'
 }
 
 /**

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

@@ -158,9 +158,7 @@ export function useLlmProviders(): UseLlmProvidersReturn {
   // Fall back to first provider if defaultProviderId is stale/invalid
   const selectedProvider = useMemo(
     () =>
-      providers.find((p) => p.id === defaultProviderId) ??
-      providers[0] ??
-      null,
+      providers.find((p) => p.id === defaultProviderId) ?? providers[0] ?? null,
     [providers, defaultProviderId],
   )
 

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

@@ -0,0 +1,167 @@
+import { useEffect, useRef } 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
+}
+
+interface OAuthProviderFlowReturn {
+  status: { authenticated: boolean; email?: string } | null
+  disconnect: () => Promise<void>
+  startOAuthFlow: (agentServerUrl: string | undefined) => Promise<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)
+
+  // 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,
+      })
+      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)
+    toast.info(`Enter code: ${deviceData.user_code}`, {
+      description: `Paste this code on the ${config.displayName} page that just opened.`,
+      duration: 60_000,
+    })
+
+    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)
+      toast.info(`Enter code: ${data.userCode}`, {
+        description: `Paste this code on the ${config.displayName} page that just opened.`,
+        duration: 60_000,
+      })
+      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,
+  }
+}

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

@@ -0,0 +1,90 @@
+import { useEffect, useRef, useState } from 'react'
+import { getAgentServerUrl } from '@/lib/browseros/helpers'
+
+interface OAuthStatus {
+  authenticated: boolean
+  email?: string
+  provider: string
+}
+
+interface UseOAuthStatusReturn {
+  status: OAuthStatus | null
+  isPolling: boolean
+  startPolling: () => void
+  stopPolling: () => void
+  refresh: () => Promise<OAuthStatus | null>
+  disconnect: () => Promise<void>
+}
+
+export function useOAuthStatus(provider: string): UseOAuthStatusReturn {
+  const [status, setStatus] = useState<OAuthStatus | null>(null)
+  const [isPolling, setIsPolling] = useState(false)
+  const pollIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null)
+  const pollTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+
+  async function fetchStatus(): Promise<OAuthStatus | null> {
+    try {
+      const serverUrl = await getAgentServerUrl()
+      const res = await fetch(`${serverUrl}/oauth/${provider}/status`)
+      if (!res.ok) return null
+      const data = (await res.json()) as OAuthStatus
+      setStatus(data)
+      return data
+    } catch {
+      return null
+    }
+  }
+
+  function stopPolling() {
+    if (pollIntervalRef.current) clearInterval(pollIntervalRef.current)
+    if (pollTimeoutRef.current) clearTimeout(pollTimeoutRef.current)
+    pollIntervalRef.current = null
+    pollTimeoutRef.current = null
+    setIsPolling(false)
+  }
+
+  function startPolling() {
+    stopPolling()
+    setIsPolling(true)
+
+    pollIntervalRef.current = setInterval(async () => {
+      const result = await fetchStatus()
+      if (result?.authenticated) {
+        stopPolling()
+      }
+    }, 2_000)
+
+    pollTimeoutRef.current = setTimeout(stopPolling, 300_000)
+  }
+
+  async function disconnect() {
+    try {
+      const serverUrl = await getAgentServerUrl()
+      await fetch(`${serverUrl}/oauth/${provider}`, { method: 'DELETE' })
+      setStatus({ authenticated: false, provider })
+    } catch {
+      // Best-effort disconnect
+    }
+  }
+
+  // Initial status check on mount
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only run on mount
+  useEffect(() => {
+    fetchStatus()
+  }, [])
+
+  // Cleanup on unmount
+  // biome-ignore lint/correctness/useExhaustiveDependencies: cleanup only needs to run on unmount
+  useEffect(() => {
+    return () => stopPolling()
+  }, [])
+
+  return {
+    status,
+    isPolling,
+    startPolling,
+    stopPolling,
+    refresh: fetchStatus,
+    disconnect,
+  }
+}

packages/browseros-agent/apps/agent/lib/mcp/useSyncRemoteIntegrations.ts

@@ -1,8 +1,15 @@
-import { useEffect, useRef } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useGetMCPServersList } from '@/entrypoints/app/connect-mcp/useGetMCPServersList'
 import { useGetUserMCPIntegrations } from '@/entrypoints/app/connect-mcp/useGetUserMCPIntegrations'
 import { type McpServer, mcpServerStorage } from './mcpServerStorage'
 
+export interface SyncStatus {
+  /** True while the initial sync is in progress (fetching + writing to storage) */
+  isSyncing: boolean
+  /** True once the sync has completed at least once this session */
+  hasSynced: boolean
+}
+
 /**
  * Syncs remote Klavis integrations into local Chrome storage.
  *
@@ -12,8 +19,10 @@ import { type McpServer, mcpServerStorage } from './mcpServerStorage'
  *
  * This hook detects authenticated remote integrations missing from local storage
  * and adds them so they appear in the UI (and can be disconnected).
+ *
+ * Returns sync status so consumers can gate behavior on sync completion.
  */
-export function useSyncRemoteIntegrations() {
+export function useSyncRemoteIntegrations(): SyncStatus {
   const { data: userMCPIntegrations, isLoading: isIntegrationsLoading } =
     useGetUserMCPIntegrations()
   const { data: serversList } = useGetMCPServersList()
@@ -21,13 +30,26 @@ export function useSyncRemoteIntegrations() {
   const serversListRef = useRef(serversList)
   integrationsRef.current = userMCPIntegrations
   serversListRef.current = serversList
-  const hasSynced = useRef(false)
+  const hasSyncedRef = useRef(false)
+  const [syncState, setSyncState] = useState<SyncStatus>({
+    isSyncing: true,
+    hasSynced: false,
+  })
 
   const integrationCount = userMCPIntegrations?.integrations?.length ?? 0
 
   useEffect(() => {
-    if (isIntegrationsLoading || !integrationCount) return
-    if (hasSynced.current) return
+    // Still loading data — keep isSyncing: true
+    if (isIntegrationsLoading) return
+
+    // No integrations at all — nothing to sync, mark done
+    if (!integrationCount) {
+      setSyncState({ isSyncing: false, hasSynced: true })
+      return
+    }
+
+    // Already synced this session
+    if (hasSyncedRef.current) return
 
     const integrations = integrationsRef.current?.integrations
     if (!integrations) return
@@ -40,26 +62,30 @@ export function useSyncRemoteIntegrations() {
           !localServers.some((s) => s.managedServerName === remote.name),
       )
 
-      if (missing.length === 0) return
+      if (missing.length > 0) {
+        const catalog = serversListRef.current
+        const newServers: McpServer[] = missing.map((integration) => {
+          const catalogEntry = catalog?.servers.find(
+            (s) => s.name === integration.name,
+          )
+          return {
+            id: `${Date.now()}-${integration.name}`,
+            displayName: integration.name,
+            type: 'managed',
+            managedServerName: integration.name,
+            managedServerDescription: catalogEntry?.description ?? '',
+          }
+        })
 
-      const catalog = serversListRef.current
-      const newServers: McpServer[] = missing.map((integration) => {
-        const catalogEntry = catalog?.servers.find(
-          (s) => s.name === integration.name,
-        )
-        return {
-          id: `${Date.now()}-${integration.name}`,
-          displayName: integration.name,
-          type: 'managed',
-          managedServerName: integration.name,
-          managedServerDescription: catalogEntry?.description ?? '',
-        }
-      })
+        await mcpServerStorage.setValue([...localServers, ...newServers])
+      }
 
-      await mcpServerStorage.setValue([...localServers, ...newServers])
+      hasSyncedRef.current = true
+      setSyncState({ isSyncing: false, hasSynced: true })
     }
 
-    hasSynced.current = true
     syncMissing()
   }, [isIntegrationsLoading, integrationCount])
+
+  return syncState
 }

packages/browseros-agent/apps/agent/lib/messaging/schedules/scheduleMessages.ts

@@ -23,4 +23,4 @@ type ScheduleMessagesProtocol = {
 const { sendMessage, onMessage } =
   defineExtensionMessaging<ScheduleMessagesProtocol>()
 
-export { sendMessage as sendScheduleMessage, onMessage as onScheduleMessage }
+export { onMessage as onScheduleMessage, sendMessage as sendScheduleMessage }

packages/browseros-agent/apps/agent/lib/messaging/server/serverMessages.ts

@@ -12,4 +12,4 @@ type ServerMessagesProtocol = {
 const { sendMessage, onMessage } =
   defineExtensionMessaging<ServerMessagesProtocol>()
 
-export { sendMessage as sendServerMessage, onMessage as onServerMessage }
+export { onMessage as onServerMessage, sendMessage as sendServerMessage }

packages/browseros-agent/apps/agent/lib/messaging/sidepanel/openSidepanelWithSearch.ts

@@ -12,6 +12,6 @@ const { sendMessage, onMessage } =
   defineExtensionMessaging<OpenSidePanelWithSearchParams>()
 
 export {
-  sendMessage as openSidePanelWithSearch,
   onMessage as onOpenSidePanelWithSearch,
+  sendMessage as openSidePanelWithSearch,
 }

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

@@ -25,6 +25,7 @@ interface ChatServerRequest {
   windowId?: number
   activeTab?: ActiveTab
   signal?: AbortSignal
+  providerId?: string
 }
 
 interface ChatServerResponse {
@@ -75,11 +76,23 @@ const getDefaultProvider = async (): Promise<LlmProviderConfig | null> => {
   return defaultProvider ?? providers[0] ?? null
 }
 
+// Resolve provider by ID, falling back to global default
+const resolveProvider = async (
+  providerId?: string,
+): Promise<LlmProviderConfig> => {
+  if (providerId) {
+    const providers = await providersStorage.getValue()
+    const match = providers?.find((p) => p.id === providerId)
+    if (match) return match
+  }
+  return (await getDefaultProvider()) ?? createDefaultBrowserOSProvider()
+}
+
 export async function getChatServerResponse(
   request: ChatServerRequest,
 ): Promise<ChatServerResponse> {
   const agentServerUrl = await getAgentServerUrl()
-  const provider = (await getDefaultProvider()) ?? createDefaultBrowserOSProvider()
+  const provider = await resolveProvider(request.providerId)
   const conversationId = request.conversationId ?? crypto.randomUUID()
   const personalization = await personalizationStorage.getValue()
 

packages/browseros-agent/apps/agent/lib/schedules/graphql/syncSchedulesDocument.ts

@@ -11,6 +11,7 @@ export const GetScheduledJobsByProfileIdDocument = graphql(`
         scheduleTime
         scheduleInterval
         enabled
+        llmProviderId
         createdAt
         updatedAt
         lastRunAt

packages/browseros-agent/apps/agent/lib/schedules/refine-prompt.ts

@@ -0,0 +1,71 @@
+import { getAgentServerUrl } from '@/lib/browseros/helpers'
+import {
+  createDefaultBrowserOSProvider,
+  defaultProviderIdStorage,
+  providersStorage,
+} from '@/lib/llm-providers/storage'
+import type { LlmProviderConfig } from '@/lib/llm-providers/types'
+
+const resolveProvider = async (
+  providerId?: string,
+): Promise<LlmProviderConfig> => {
+  const providers = await providersStorage.getValue()
+  if (providerId && providers?.length) {
+    const match = providers.find((p) => p.id === providerId)
+    if (match) return match
+  }
+  if (providers?.length) {
+    const defaultProviderId = await defaultProviderIdStorage.getValue()
+    const defaultProvider = providers.find((p) => p.id === defaultProviderId)
+    if (defaultProvider) return defaultProvider
+    if (providers[0]) return providers[0]
+  }
+  return createDefaultBrowserOSProvider()
+}
+
+interface RefinePromptResponse {
+  success: boolean
+  refined?: string
+  message?: string
+}
+
+export async function refinePrompt(params: {
+  prompt: string
+  name: string
+  providerId?: string
+}): Promise<string> {
+  const agentServerUrl = await getAgentServerUrl()
+  const provider = await resolveProvider(params.providerId)
+
+  const response = await fetch(`${agentServerUrl}/refine-prompt`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      prompt: params.prompt,
+      name: params.name,
+      provider: provider.type,
+      model: provider.modelId ?? 'default',
+      apiKey: provider.apiKey,
+      baseUrl: provider.baseUrl,
+      resourceName: provider.resourceName,
+      accessKeyId: provider.accessKeyId,
+      secretAccessKey: provider.secretAccessKey,
+      region: provider.region,
+      sessionToken: provider.sessionToken,
+    }),
+  })
+
+  if (!response.ok) {
+    const errorData = (await response
+      .json()
+      .catch(() => null)) as RefinePromptResponse | null
+    throw new Error(errorData?.message ?? `Request failed: ${response.status}`)
+  }
+
+  const data = (await response.json()) as RefinePromptResponse
+  if (!data.success || !data.refined) {
+    throw new Error(data.message ?? 'Failed to refine prompt')
+  }
+
+  return data.refined
+}

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

@@ -6,6 +6,7 @@ export interface ScheduledJob {
   scheduleTime?: string
   scheduleInterval?: number
   enabled: boolean
+  providerId?: string
   createdAt: string
   updatedAt: string
   lastRunAt?: string

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

@@ -19,6 +19,7 @@ type RemoteScheduledJob = {
   scheduleTime: string | null
   scheduleInterval: number | null
   enabled: boolean
+  llmProviderId: string | null
   createdAt: string
   updatedAt: string
   lastRunAt: string | null
@@ -32,6 +33,7 @@ function toComparable(job: ScheduledJob) {
     ...data,
     scheduleTime: data.scheduleTime ?? null,
     scheduleInterval: data.scheduleInterval ?? null,
+    providerId: data.providerId ?? null,
   }
 }
 
@@ -43,6 +45,7 @@ function remoteToComparable(job: RemoteScheduledJob) {
     scheduleTime: job.scheduleTime,
     scheduleInterval: job.scheduleInterval,
     enabled: job.enabled,
+    providerId: job.llmProviderId,
   }
 }
 
@@ -59,6 +62,7 @@ function remoteToLocal(remote: RemoteScheduledJob): ScheduledJob {
     scheduleTime: remote.scheduleTime ?? undefined,
     scheduleInterval: remote.scheduleInterval ?? undefined,
     enabled: remote.enabled,
+    providerId: remote.llmProviderId ?? undefined,
     createdAt: normalizeTimestamp(remote.createdAt),
     updatedAt: normalizeTimestamp(remote.updatedAt),
     lastRunAt: remote.lastRunAt
@@ -163,6 +167,7 @@ export async function syncSchedulesToBackend(
               scheduleTime: job.scheduleTime ?? null,
               scheduleInterval: job.scheduleInterval ?? null,
               enabled: job.enabled,
+              llmProviderId: job.providerId ?? null,
               lastRunAt: job.lastRunAt
                 ? new Date(job.lastRunAt).toISOString()
                 : null,
@@ -182,6 +187,7 @@ export async function syncSchedulesToBackend(
               scheduleTime: job.scheduleTime ?? null,
               scheduleInterval: job.scheduleInterval ?? null,
               enabled: job.enabled,
+              llmProviderId: job.providerId ?? null,
               createdAt: new Date(job.createdAt).toISOString(),
               updatedAt: job.updatedAt || new Date().toISOString(),
               lastRunAt: job.lastRunAt

packages/browseros-agent/apps/agent/lib/selected-text/selectedTextStorage.ts

@@ -0,0 +1,14 @@
+import { storage } from '@wxt-dev/storage'
+
+export interface SelectedTextData {
+  text: string
+  pageUrl: string
+  pageTitle: string
+  tabId: number
+  timestamp: number
+}
+
+/** Map of tabId → selected text. Each tab's selection is independent. */
+export const selectedTextStorage = storage.defineItem<
+  Record<string, SelectedTextData>
+>('local:selectedTextMap', { defaultValue: {} })

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

@@ -1,18 +1,35 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 
 const GATEWAY_URL = 'https://llm.browseros.com'
+const WAVEFORM_BAND_COUNT = 5
 
-interface UseVoiceInputReturn {
+export interface VoiceInputState {
+  isRecording: boolean
+  isTranscribing: boolean
+  audioLevels: number[]
+  error: string | null
+  onStartRecording: () => void
+  onStopRecording: () => void
+}
+
+export interface UseVoiceInputReturn {
   isRecording: boolean
   isTranscribing: boolean
   transcript: string
   audioLevel: number
+  audioLevels: number[]
   error: string | null
-  startRecording: () => Promise<void>
+  startRecording: () => Promise<boolean>
   stopRecording: () => Promise<void>
   clearTranscript: () => void
 }
 
+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')
@@ -21,16 +38,19 @@ async function transcribeAudio(audioBlob: Blob): Promise<string> {
   const response = await fetch(`${GATEWAY_URL}/api/transcribe`, {
     method: 'POST',
     body: formData,
+    signal: AbortSignal.timeout(30_000),
   })
 
   if (!response.ok) {
-    const error = await response
+    const errorBody: { error?: string } = await response
       .json()
       .catch(() => ({ error: 'Transcription failed' }))
-    throw new Error(error.error || `Transcription failed: ${response.status}`)
+    throw new Error(
+      errorBody.error || `Transcription failed: ${response.status}`,
+    )
   }
 
-  const result = await response.json()
+  const result: TranscribeResponse = await response.json()
   return result.text || ''
 }
 
@@ -39,6 +59,7 @@ export function useVoiceInput(): UseVoiceInputReturn {
   const [isTranscribing, setIsTranscribing] = useState(false)
   const [transcript, setTranscript] = useState('')
   const [audioLevel, setAudioLevel] = useState(0)
+  const [audioLevels, setAudioLevels] = useState<number[]>(EMPTY_LEVELS)
   const [error, setError] = useState<string | null>(null)
 
   const mediaRecorderRef = useRef<MediaRecorder | null>(null)
@@ -48,7 +69,7 @@ export function useVoiceInput(): UseVoiceInputReturn {
   const analyserRef = useRef<AnalyserNode | null>(null)
   const animationFrameRef = useRef<number | null>(null)
 
-  const stopAudioLevelMonitoring = useCallback(() => {
+  const stopAudioLevelMonitoring = () => {
     if (animationFrameRef.current) {
       cancelAnimationFrame(animationFrameRef.current)
       animationFrameRef.current = null
@@ -59,8 +80,10 @@ export function useVoiceInput(): UseVoiceInputReturn {
     audioContextRef.current = null
     analyserRef.current = null
     setAudioLevel(0)
-  }, [])
+    setAudioLevels(EMPTY_LEVELS)
+  }
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: cleanup only needs to run on unmount
   useEffect(() => {
     return () => {
       streamRef.current?.getTracks().forEach((track) => {
@@ -71,9 +94,9 @@ export function useVoiceInput(): UseVoiceInputReturn {
       }
       stopAudioLevelMonitoring()
     }
-  }, [stopAudioLevelMonitoring])
+  }, [])
 
-  const startAudioLevelMonitoring = useCallback((stream: MediaStream) => {
+  const startAudioLevelMonitoring = (stream: MediaStream) => {
     const audioContext = new AudioContext()
     const analyser = audioContext.createAnalyser()
     analyser.fftSize = 256
@@ -87,20 +110,36 @@ export function useVoiceInput(): UseVoiceInputReturn {
     const updateLevel = () => {
       if (!analyserRef.current) return
 
-      const dataArray = new Uint8Array(analyserRef.current.frequencyBinCount)
-      analyserRef.current.getByteFrequencyData(dataArray)
+      const dataArray = new Uint8Array(analyserRef.current.fftSize)
+      analyserRef.current.getByteTimeDomainData(dataArray)
 
-      const average = dataArray.reduce((a, b) => a + b, 0) / dataArray.length
-      const normalized = Math.min(100, (average / 128) * 100)
-      setAudioLevel(Math.round(normalized))
+      const binCount = dataArray.length
+      const levels: number[] = []
+      let totalPeak = 0
+
+      for (let band = 0; band < WAVEFORM_BAND_COUNT; band++) {
+        const start = Math.floor((band / WAVEFORM_BAND_COUNT) * binCount)
+        const end = Math.floor(((band + 1) / WAVEFORM_BAND_COUNT) * binCount)
+        let peak = 0
+        for (let j = start; j < end; j++) {
+          const amplitude = Math.abs(dataArray[j] - 128)
+          if (amplitude > peak) peak = amplitude
+        }
+        const normalized = Math.round(Math.min(100, (peak / 50) * 100))
+        levels.push(normalized)
+        totalPeak += normalized
+      }
+
+      setAudioLevels(levels)
+      setAudioLevel(Math.round(totalPeak / WAVEFORM_BAND_COUNT))
 
       animationFrameRef.current = requestAnimationFrame(updateLevel)
     }
 
     updateLevel()
-  }, [])
+  }
 
-  const startRecording = useCallback(async () => {
+  const startRecording = async (): Promise<boolean> => {
     try {
       setError(null)
       setTranscript('')
@@ -133,7 +172,14 @@ export function useVoiceInput(): UseVoiceInputReturn {
 
       mediaRecorder.start(250)
       setIsRecording(true)
+      return true
     } catch (err) {
+      streamRef.current?.getTracks().forEach((track) => {
+        track.stop()
+      })
+      streamRef.current = null
+      stopAudioLevelMonitoring()
+
       if (err instanceof Error) {
         if (err.name === 'NotAllowedError') {
           setError('Microphone permission denied')
@@ -145,10 +191,11 @@ export function useVoiceInput(): UseVoiceInputReturn {
       } else {
         setError('Failed to start recording')
       }
+      return false
     }
-  }, [startAudioLevelMonitoring])
+  }
 
-  const stopRecording = useCallback(async () => {
+  const stopRecording = async () => {
     const mediaRecorder = mediaRecorderRef.current
 
     if (!mediaRecorder || mediaRecorder.state === 'inactive') {
@@ -188,18 +235,19 @@ export function useVoiceInput(): UseVoiceInputReturn {
     } finally {
       setIsTranscribing(false)
     }
-  }, [stopAudioLevelMonitoring])
+  }
 
-  const clearTranscript = useCallback(() => {
+  const clearTranscript = () => {
     setTranscript('')
     setError(null)
-  }, [])
+  }
 
   return {
     isRecording,
     isTranscribing,
     transcript,
     audioLevel,
+    audioLevels,
     error,
     startRecording,
     stopRecording,

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

@@ -9,9 +9,9 @@
     "build": "bun run codegen && wxt build",
     "build:dev": "bun --env-file=.env.development wxt build --mode development",
     "zip": "wxt zip",
-    "compile": "tsc --noEmit",
+    "compile": "tsgo --noEmit",
     "lint": "bunx biome check",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsgo --noEmit",
     "lint:fix": "bunx biome check --write --unsafe",
     "clean:cache": "rm -rf node_modules/.cache && rm -rf .output/ && rm -rf .wxt/",
     "codegen": "bun --env-file=.env.development graphql-codegen --config codegen.ts",
@@ -79,6 +79,7 @@
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-hook-form": "^7.66.1",
+    "react-markdown": "^10.1.0",
     "react-resizable-panels": "^4.3.3",
     "react-router": "^7.12.0",
     "shiki": "^3.15.0",

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

@@ -4,7 +4,6 @@
     "types": ["chrome", "bun"],
     "allowImportingTsExtensions": true,
     "jsx": "react-jsx",
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./*"]
     },

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

@@ -55,6 +55,7 @@ export default defineConfig({
     permissions: [
       'topSites',
       'tabs',
+      'tabGroups',
       'storage',
       'sidePanel',
       'browserOS',

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

@@ -0,0 +1,2 @@
+data/raw/
+results/

packages/browseros-agent/apps/eval/DESIGN_DOC.md

@@ -0,0 +1,875 @@
+# Eval System - Production Grade Design Doc
+
+## Current State Analysis
+
+### What's Working Well
+1. **Zod validation** - Already exists in `config-validator.ts`, reuses `LLMConfigSchema` from `@browseros/shared`
+2. **Grader registry pattern** - `createGrader()` factory works well, easy to add new graders
+3. **AgentEvaluator interface** - Clean interface: `execute() → AgentResult`
+4. **Discriminated unions** - Messages, agent types use proper TypeScript patterns
+5. **Capture utilities** - `ScreenshotCapture`, `MessageLogger`, `TrajectorySaver` are modular
+
+### Key Problems
+
+**1. No Agent Registry/Factory**
+Agent creation is hardcoded if-else in `task-executor.ts`:
+```typescript
+// Current approach - not scalable
+if (this.config.agent.type === 'single') {
+  const evaluator = new SingleAgentEvaluator(...)
+} else if (this.config.agent.type === 'orchestrator-executor') {
+  const evaluator = new OrchestratorExecutorEvaluator(...)
+}
+// Adding new agent = modify this file
+```
+
+**2. Heavy Server Dependency**
+Imports from `@browseros/server`:
+- `GeminiAgent` - Core agent (necessary)
+- `ToolExecutionHooks` - Hook interface
+- `ResolvedAgentConfig` - Agent config type
+- `AgentExecutionError` - Error type
+- `VercelAIContentGenerator` - Provider adapter
+- Gateway client functions
+
+**3. Scattered Types**
+- `src/types.ts` - Main types
+- `agents/types.ts` - Agent interface
+- `agents/orchestrator-executor/types.ts` - Orchestrator types
+- `runner/types.ts` - Runner types
+- `graders/types.ts` - Grader types
+
+**4. Duplicated Capture Logic**
+Both agent evaluators duplicate:
+- Initialize ScreenshotCapture
+- Initialize MessageLogger
+- Set up tool hooks
+- Handle timeouts
+- Collect errors/warnings
+
+**5. No Unified Utils**
+Hooks, screenshot capture, message logging code is copy-pasted per agent type.
+
+---
+
+## Design Goals
+
+1. **Easy to add new agents** - Register new agent type, implement interface, done
+2. **Shared capture infrastructure** - All agents use same screenshot/logging utils
+3. **Type-safe with Zod** - Config validation at entry point
+4. **Minimal server coupling** - Only import what's necessary
+5. **Clear folder structure** - Types where they belong
+6. **Production patterns** - Factory, registry, composition
+
+---
+
+## Proposed Architecture
+
+### Folder Structure
+
+```
+eval/src/
+├── index.ts                      # Entry point, CLI
+├── types/
+│   ├── index.ts                  # Re-exports all types
+│   ├── config.ts                 # EvalConfig, AgentConfig (Zod schemas + types)
+│   ├── task.ts                   # Task, TaskMetadata
+│   ├── message.ts                # Message discriminated union
+│   ├── result.ts                 # AgentResult, GraderResult
+│   └── errors.ts                 # ErrorSource, TaskError, EvalWarning
+│
+├── agents/
+│   ├── index.ts                  # Re-exports + auto-registration
+│   ├── registry.ts               # Agent registry + factory
+│   ├── types.ts                  # AgentEvaluator interface, AgentContext
+│   ├── single/
+│   │   └── index.ts              # SingleAgentEvaluator
+│   └── orchestrator-executor/
+│       ├── index.ts              # OrchestratorExecutorEvaluator
+│       ├── types.ts              # Orchestrator-specific types only
+│       ├── orchestrator.ts
+│       ├── orchestrator-agent.ts
+│       ├── orchestrator-tools.ts
+│       ├── executor.ts
+│       └── executor-store.ts
+│
+├── capture/
+│   ├── index.ts                  # Re-exports
+│   ├── types.ts                  # CaptureContext interface
+│   ├── context.ts                # CaptureContext class (bundles all capture)
+│   ├── hooks.ts                  # createCaptureHooks() utility
+│   ├── screenshot.ts             # ScreenshotCapture
+│   ├── message-logger.ts         # MessageLogger
+│   ├── trajectory-saver.ts       # TrajectorySaver
+│   └── window-manager.ts         # WindowManager
+│
+├── graders/
+│   ├── index.ts                  # Re-exports
+│   ├── registry.ts               # Grader registry (existing pattern)
+│   ├── types.ts                  # Grader interface
+│   ├── benchmark/
+│   │   ├── webvoyager.ts
+│   │   └── mind2web.ts
+│   └── fara/
+│       ├── alignment.ts
+│       ├── rubric.ts
+│       ├── multimodal.ts
+│       └── combined.ts
+│
+├── runner/
+│   ├── index.ts                  # runEval() main entry
+│   ├── types.ts                  # RunEvalOptions, TaskResult, BatchSummary
+│   ├── task-loader.ts
+│   ├── task-executor.ts
+│   └── parallel-executor.ts
+│
+└── utils/
+    ├── env.ts                    # resolveEnvValue() helper
+    └── validation.ts             # Config validation logic
+```
+
+---
+
+## Key Components
+
+### 1. Type System (`types/`)
+
+**`types/config.ts`** - Zod schemas + inferred types:
+```typescript
+import { LLMConfigSchema, LLMProviderSchema } from '@browseros/shared/schemas/llm'
+import { z } from 'zod'
+
+// Single agent config
+export const SingleAgentConfigSchema = LLMConfigSchema.extend({
+  type: z.literal('single'),
+})
+export type SingleAgentConfig = z.infer<typeof SingleAgentConfigSchema>
+
+// Orchestrator-executor config
+export const OrchestratorExecutorConfigSchema = z.object({
+  type: z.literal('orchestrator-executor'),
+  orchestrator: LLMConfigSchema.extend({
+    maxTurns: z.number().int().min(1).optional(),
+  }),
+  executor: LLMConfigSchema.extend({
+    maxStepsPerDelegation: z.number().int().min(1).optional(),
+  }),
+})
+export type OrchestratorExecutorConfig = z.infer<typeof OrchestratorExecutorConfigSchema>
+
+// Discriminated union
+export const AgentConfigSchema = z.discriminatedUnion('type', [
+  SingleAgentConfigSchema,
+  OrchestratorExecutorConfigSchema,
+])
+export type AgentConfig = z.infer<typeof AgentConfigSchema>
+
+// Full eval config
+export const EvalConfigSchema = z.object({
+  agent: AgentConfigSchema,
+  dataset: z.string().min(1),
+  output_dir: z.string().optional(),
+  num_workers: z.number().int().min(1).max(20).default(1),
+  browseros: z.object({
+    server_url: z.string().url(),
+  }),
+  grader_model: z.string().optional(),
+  grader_api_key_env: z.string().optional(),
+  grader_base_url: z.string().url().optional(),
+  timeout_ms: z.number().int().min(30000).max(3600000).optional(),
+})
+export type EvalConfig = z.infer<typeof EvalConfigSchema>
+```
+
+**`types/message.ts`** - Message types:
+```typescript
+import { z } from 'zod'
+
+const BaseMessageSchema = z.object({
+  timestamp: z.string().datetime(),
+})
+
+export const UserMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('user'),
+  content: z.string(),
+})
+
+export const AssistantMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('assistant'),
+  content: z.string(),
+})
+
+export const ToolCallMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('tool_call'),
+  tool: z.string(),
+  toolCallId: z.string(),
+  params: z.record(z.unknown()),
+})
+
+export const ToolResultMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('tool_result'),
+  toolCallId: z.string(),
+  result: z.unknown(),
+  isError: z.boolean(),
+  screenshot: z.number().optional(),
+})
+
+export const ErrorMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('error'),
+  content: z.string(),
+  errorCode: z.string().optional(),
+})
+
+// Orchestrator-specific messages
+export const DelegationMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('delegation'),
+  instruction: z.string(),
+  executorId: z.string(),
+  maxSteps: z.number().optional(),
+})
+
+export const DelegationResultMessageSchema = BaseMessageSchema.extend({
+  type: z.literal('delegation_result'),
+  executorId: z.string(),
+  summary: z.string(),
+  status: z.enum(['done', 'blocked', 'max_steps']),
+  stepsUsed: z.number(),
+  currentUrl: z.string().optional(),
+})
+
+export const MessageSchema = z.discriminatedUnion('type', [
+  UserMessageSchema,
+  AssistantMessageSchema,
+  ToolCallMessageSchema,
+  ToolResultMessageSchema,
+  ErrorMessageSchema,
+  DelegationMessageSchema,
+  DelegationResultMessageSchema,
+])
+
+export type Message = z.infer<typeof MessageSchema>
+export type UserMessage = z.infer<typeof UserMessageSchema>
+export type AssistantMessage = z.infer<typeof AssistantMessageSchema>
+export type ToolCallMessage = z.infer<typeof ToolCallMessageSchema>
+export type ToolResultMessage = z.infer<typeof ToolResultMessageSchema>
+export type ErrorMessage = z.infer<typeof ErrorMessageSchema>
+export type DelegationMessage = z.infer<typeof DelegationMessageSchema>
+export type DelegationResultMessage = z.infer<typeof DelegationResultMessageSchema>
+
+// Type guards
+export const isToolCallMessage = (m: Message): m is ToolCallMessage => m.type === 'tool_call'
+export const isDelegationMessage = (m: Message): m is DelegationMessage => m.type === 'delegation'
+// ... etc
+```
+
+---
+
+### 2. Agent Registry (`agents/registry.ts`)
+
+```typescript
+import type { AgentContext, AgentEvaluator } from './types'
+
+type AgentFactory = (context: AgentContext) => AgentEvaluator
+
+const registry = new Map<string, AgentFactory>()
+
+/**
+ * Register an agent type
+ */
+export function registerAgent(type: string, factory: AgentFactory): void {
+  if (registry.has(type)) {
+    throw new Error(`Agent type "${type}" already registered`)
+  }
+  registry.set(type, factory)
+}
+
+/**
+ * Create agent evaluator from context
+ */
+export function createAgent(context: AgentContext): AgentEvaluator {
+  const factory = registry.get(context.config.agent.type)
+  if (!factory) {
+    const available = Array.from(registry.keys()).join(', ')
+    throw new Error(
+      `Unknown agent type: "${context.config.agent.type}". Available: ${available}`
+    )
+  }
+  return factory(context)
+}
+
+/**
+ * Get all registered agent types
+ */
+export function getRegisteredAgentTypes(): string[] {
+  return Array.from(registry.keys())
+}
+```
+
+**`agents/index.ts`** - Auto-registration:
+```typescript
+import { registerAgent } from './registry'
+import { SingleAgentEvaluator } from './single'
+import { OrchestratorExecutorEvaluator } from './orchestrator-executor'
+
+// Auto-register built-in agents
+registerAgent('single', (ctx) => new SingleAgentEvaluator(ctx))
+registerAgent('orchestrator-executor', (ctx) => new OrchestratorExecutorEvaluator(ctx))
+
+// Re-exports
+export { createAgent, registerAgent, getRegisteredAgentTypes } from './registry'
+export type { AgentContext, AgentEvaluator, AgentResult } from './types'
+```
+
+---
+
+### 3. Agent Context (`agents/types.ts`)
+
+```typescript
+import type { CaptureContext } from '../capture/types'
+import type { EvalConfig, Task, TaskMetadata, Message } from '../types'
+
+/**
+ * All dependencies an agent needs - passed to factory
+ */
+export interface AgentContext {
+  // Config
+  config: EvalConfig
+  task: Task
+
+  // Browser window
+  windowId: number
+  tabId: number
+
+  // Output
+  outputDir: string      // Root output dir
+  taskOutputDir: string  // Task-specific: outputDir/query_id/
+
+  // Capture infrastructure (pre-initialized)
+  capture: CaptureContext
+}
+
+/**
+ * Result returned by agent execution
+ */
+export interface AgentResult {
+  metadata: TaskMetadata
+  messages: Message[]
+  finalAnswer: string | null
+}
+
+/**
+ * Interface all agent evaluators must implement
+ */
+export interface AgentEvaluator {
+  /**
+   * Execute the agent on the task
+   */
+  execute(): Promise<AgentResult>
+}
+```
+
+---
+
+### 4. Capture Context (`capture/context.ts`)
+
+Bundle all capture utilities:
+```typescript
+import { randomUUID } from 'node:crypto'
+import type { ToolExecutionHooks, ToolExecutionResult } from '@browseros/server/agent'
+import type { Message, TaskError, EvalWarning, ErrorSource } from '../types'
+import { MessageLogger } from './message-logger'
+import { ScreenshotCapture } from './screenshot'
+import { TrajectorySaver } from './trajectory-saver'
+
+export interface CaptureContextConfig {
+  serverUrl: string
+  outputDir: string
+  taskId: string
+  tabId: number
+  windowId: number
+}
+
+/**
+ * Unified capture context - bundles screenshot, message logging, errors/warnings
+ */
+export class CaptureContext {
+  readonly screenshot: ScreenshotCapture
+  readonly messageLogger: MessageLogger
+  readonly trajectorySaver: TrajectorySaver
+
+  private errors: TaskError[] = []
+  private warnings: EvalWarning[] = []
+  private currentToolCallId: string | null = null
+
+  private readonly tabId: number
+  private readonly windowId: number
+
+  constructor(private config: CaptureContextConfig) {
+    this.tabId = config.tabId
+    this.windowId = config.windowId
+    this.trajectorySaver = new TrajectorySaver(config.outputDir, config.taskId)
+  }
+
+  /**
+   * Initialize - must be called before use
+   */
+  async init(): Promise<string> {
+    const taskOutputDir = await this.trajectorySaver.init()
+
+    this.screenshot = new ScreenshotCapture(this.config.serverUrl, taskOutputDir)
+    await this.screenshot.init()
+
+    this.messageLogger = new MessageLogger(taskOutputDir)
+
+    return taskOutputDir
+  }
+
+  /**
+   * Create tool execution hooks for GeminiAgent
+   */
+  createToolHooks(): ToolExecutionHooks {
+    return {
+      onBeforeToolCall: async (toolName: string, args: unknown) => {
+        try {
+          this.currentToolCallId = randomUUID()
+          await this.messageLogger.logToolCall(
+            toolName,
+            this.currentToolCallId,
+            args as Record<string, unknown>
+          )
+        } catch (err) {
+          this.addWarning('message_logging', `Failed to log tool call ${toolName}: ${err}`)
+        }
+      },
+
+      onAfterToolCall: async (toolName: string, result: ToolExecutionResult) => {
+        let screenshotNum = 0
+
+        // Capture screenshot
+        try {
+          screenshotNum = await this.screenshot.capture(this.tabId, this.windowId)
+        } catch (err) {
+          this.addWarning('screenshot', `Screenshot after ${toolName} failed: ${err}`)
+          screenshotNum = this.screenshot.getCount()
+        }
+
+        // Log tool errors
+        if (result.isError) {
+          this.addWarning('mcp_tool', `Tool ${toolName} error: ${result.errorMessage}`)
+        }
+
+        // Log result
+        if (this.currentToolCallId) {
+          try {
+            await this.messageLogger.logToolResult(
+              this.currentToolCallId,
+              result.isError ? { error: result.errorMessage } : result.parts,
+              result.isError,
+              screenshotNum
+            )
+          } catch (err) {
+            this.addWarning('message_logging', `Failed to log tool result: ${err}`)
+          }
+        }
+
+        this.currentToolCallId = null
+      },
+    }
+  }
+
+  // Error/warning collection
+  addError(source: ErrorSource, message: string, details?: Record<string, unknown>): void {
+    this.errors.push({ source, message, timestamp: new Date().toISOString(), details })
+  }
+
+  addWarning(source: ErrorSource, message: string): void {
+    this.warnings.push({ source, message, timestamp: new Date().toISOString() })
+    console.warn(`[${source}] ${message}`)
+  }
+
+  getErrors(): TaskError[] { return [...this.errors] }
+  getWarnings(): EvalWarning[] { return [...this.warnings] }
+  getMessages(): Message[] { return this.messageLogger.getMessages() }
+  getScreenshotCount(): number { return this.screenshot.getCount() }
+  getLastAssistantMessage(): string | null { return this.messageLogger.getLastAssistantMessage() }
+
+  // Delegation logging (for orchestrator-executor)
+  async logDelegation(instruction: string, executorId: string, maxSteps?: number): Promise<void> {
+    await this.messageLogger.logDelegation(instruction, executorId, maxSteps)
+  }
+
+  async logDelegationResult(
+    executorId: string,
+    summary: string,
+    status: 'done' | 'blocked' | 'max_steps',
+    stepsUsed: number,
+    currentUrl?: string
+  ): Promise<void> {
+    await this.messageLogger.logDelegationResult(executorId, summary, status, stepsUsed, currentUrl)
+  }
+}
+```
+
+---
+
+### 5. Single Agent Evaluator (`agents/single/index.ts`)
+
+Clean implementation using context:
+```typescript
+import { randomUUID } from 'node:crypto'
+import { GeminiAgent } from '@browseros/server/agent'
+import { AgentExecutionError } from '@browseros/server/agent/errors'
+import type { ResolvedAgentConfig } from '@browseros/server/agent/types'
+import { MCPServerConfig } from '@google/gemini-cli-core'
+import type { AgentContext, AgentEvaluator, AgentResult } from '../types'
+import type { SingleAgentConfig, TaskMetadata } from '../../types'
+import { resolveEnvValue } from '../../utils/env'
+
+const DEFAULT_TIMEOUT_MS = 15 * 60 * 1000
+
+export class SingleAgentEvaluator implements AgentEvaluator {
+  constructor(private ctx: AgentContext) {}
+
+  async execute(): Promise<AgentResult> {
+    const startTime = Date.now()
+    const { config, task, capture } = this.ctx
+    const agentConfig = config.agent as SingleAgentConfig
+    const timeoutMs = config.timeout_ms ?? DEFAULT_TIMEOUT_MS
+
+    // Log initial user message
+    await capture.messageLogger.logUser(task.query)
+
+    // Set up timeout
+    const abortController = new AbortController()
+    const timeoutHandle = setTimeout(() => abortController.abort(), timeoutMs)
+
+    // Create agent
+    const resolvedConfig: ResolvedAgentConfig = {
+      conversationId: randomUUID(),
+      provider: agentConfig.provider,
+      model: agentConfig.model ?? 'gemini-2.0-flash',
+      apiKey: resolveEnvValue(agentConfig.apiKey),
+      baseUrl: agentConfig.baseUrl,
+      sessionExecutionDir: '/tmp/browseros-eval',
+      evalMode: true,
+    }
+
+    const mcpServers = {
+      'browseros-mcp': new MCPServerConfig(
+        undefined, undefined, undefined, undefined, undefined,
+        `${config.browseros.server_url}/mcp`,
+        { Accept: 'application/json, text/event-stream', 'X-BrowserOS-Source': 'eval' },
+        undefined, undefined, true
+      ),
+    }
+
+    const agent = await GeminiAgent.create(resolvedConfig, mcpServers)
+
+    // Set capture hooks
+    agent.setToolHooks(capture.createToolHooks())
+
+    // Create mock stream to capture assistant messages
+    let lastAssistantMessage = ''
+    const mockStream = {
+      write: async (data: string) => {
+        if (data.includes('"type":"text-delta"')) {
+          const match = data.match(/"delta":"((?:[^"\\]|\\.)*)"/)
+          if (match) lastAssistantMessage += JSON.parse(`"${match[1]}"`)
+        } else if (data.includes('"type":"finish"')) {
+          if (lastAssistantMessage) {
+            await capture.messageLogger.logAssistant(lastAssistantMessage)
+            lastAssistantMessage = ''
+          }
+        }
+      },
+    }
+
+    // Execute
+    let terminationReason: TaskMetadata['termination_reason'] = 'completed'
+
+    try {
+      await agent.execute(
+        task.query,
+        mockStream as Parameters<typeof agent.execute>[1],
+        abortController.signal,
+        { windowId: this.ctx.windowId, activeTab: { id: this.ctx.tabId, url: task.start_url } }
+      )
+    } catch (err) {
+      const error = err instanceof Error ? err : new Error(String(err))
+
+      if (abortController.signal.aborted) {
+        terminationReason = 'timeout'
+        capture.addError('agent_execution', `Task timed out after ${timeoutMs / 1000}s`)
+      } else {
+        terminationReason = 'error'
+        const msg = err instanceof AgentExecutionError && err.originalError
+          ? `${error.message}: ${err.originalError.message}`
+          : error.message
+        capture.addError('agent_execution', msg, { stack: error.stack })
+      }
+      await capture.messageLogger.logError(error.message)
+    } finally {
+      clearTimeout(timeoutHandle)
+    }
+
+    // Build metadata
+    const metadata: TaskMetadata = {
+      query_id: task.query_id,
+      dataset: task.dataset,
+      query: task.query,
+      started_at: new Date(startTime).toISOString(),
+      completed_at: new Date().toISOString(),
+      total_duration_ms: Date.now() - startTime,
+      total_steps: capture.getScreenshotCount(),
+      termination_reason: terminationReason,
+      final_answer: capture.getLastAssistantMessage(),
+      errors: capture.getErrors(),
+      warnings: capture.getWarnings(),
+      agent_config: { type: 'single', model: resolvedConfig.model },
+      grader_results: {},
+    }
+
+    await capture.trajectorySaver.saveMetadata(metadata)
+
+    return {
+      metadata,
+      messages: capture.getMessages(),
+      finalAnswer: metadata.final_answer,
+    }
+  }
+}
+```
+
+---
+
+### 6. Task Executor (`runner/task-executor.ts`)
+
+Uses agent registry:
+```typescript
+import { createAgent } from '../agents'
+import type { AgentContext } from '../agents/types'
+import { CaptureContext } from '../capture/context'
+import type { EvalConfig, Task } from '../types'
+import type { WindowManager } from '../capture/window-manager'
+
+export class TaskExecutor {
+  constructor(
+    private config: EvalConfig,
+    private outputDir: string,
+    private windowManager: WindowManager,
+    private graderOptions: GraderOptions | null,
+  ) {}
+
+  async execute(task: Task): Promise<TaskResult> {
+    const startTime = Date.now()
+    let window: { windowId: number; tabId: number } | null = null
+
+    try {
+      // Create window
+      window = await this.windowManager.createWindow(task.query_id, task.start_url)
+
+      // Initialize capture context
+      const capture = new CaptureContext({
+        serverUrl: this.config.browseros.server_url,
+        outputDir: this.outputDir,
+        taskId: task.query_id,
+        tabId: window.tabId,
+        windowId: window.windowId,
+      })
+      const taskOutputDir = await capture.init()
+
+      // Build agent context
+      const context: AgentContext = {
+        config: this.config,
+        task,
+        windowId: window.windowId,
+        tabId: window.tabId,
+        outputDir: this.outputDir,
+        taskOutputDir,
+        capture,
+      }
+
+      // Create and execute agent (via registry)
+      const agent = createAgent(context)
+      const agentResult = await agent.execute()
+
+      // Run graders
+      const graderResults = await this.runGraders(task, agentResult)
+
+      return {
+        status: agentResult.metadata.termination_reason === 'timeout' ? 'timeout' : 'completed',
+        task,
+        agentResult,
+        graderResults,
+        durationMs: Date.now() - startTime,
+      }
+    } catch (error) {
+      return {
+        status: 'failed',
+        task,
+        error: error instanceof Error ? error : new Error(String(error)),
+        errorSource: 'unknown',
+        durationMs: Date.now() - startTime,
+      }
+    } finally {
+      if (window) {
+        await this.windowManager.closeWindow(task.query_id)
+      }
+    }
+  }
+}
+```
+
+---
+
+## Server Dependencies
+
+### What We MUST Import from Server
+
+These are necessary - `GeminiAgent` IS the agent:
+```typescript
+// Core agent
+import { GeminiAgent, type ToolExecutionHooks, type ToolExecutionResult } from '@browseros/server/agent'
+import { AgentExecutionError } from '@browseros/server/agent/errors'
+import type { ResolvedAgentConfig } from '@browseros/server/agent/types'
+
+// Provider adapter (for orchestrator-agent)
+import { VercelAIContentGenerator } from '@browseros/server/agent/provider-adapter'
+
+// Gateway client (for browseros provider only)
+import { fetchBrowserOSConfig, getLLMConfigFromProvider } from '@browseros/server/lib/clients/gateway'
+```
+
+### What Could Move to Shared (Future)
+
+If we want to decouple more:
+```typescript
+// These types could be in @browseros/shared
+export interface ToolExecutionHooks { ... }
+export interface ToolExecutionResult { ... }
+export interface ResolvedAgentConfig { ... }
+```
+
+But for now, importing from server is fine - eval is tightly coupled to server anyway.
+
+---
+
+## Import Guidelines
+
+```typescript
+// Shared package - schemas, constants
+import { LLMConfigSchema, LLMProviderSchema, LLM_PROVIDERS } from '@browseros/shared/schemas/llm'
+import { TIMEOUTS } from '@browseros/shared/constants/timeouts'
+import { AGENT_LIMITS } from '@browseros/shared/constants/limits'
+import type { BrowserContext } from '@browseros/shared/schemas/browser-context'
+
+// Server - only agent-related imports
+import { GeminiAgent, type ToolExecutionHooks } from '@browseros/server/agent'
+import type { ResolvedAgentConfig } from '@browseros/server/agent/types'
+
+// Internal eval types - from types/ folder
+import type { EvalConfig, Task, Message, AgentResult } from '../types'
+import type { AgentContext, AgentEvaluator } from '../agents/types'
+```
+
+---
+
+## Adding a New Agent Type
+
+1. Create folder: `agents/my-new-agent/`
+2. Implement `AgentEvaluator` interface:
+
+```typescript
+// agents/my-new-agent/index.ts
+import type { AgentContext, AgentEvaluator, AgentResult } from '../types'
+
+export class MyNewAgentEvaluator implements AgentEvaluator {
+  constructor(private ctx: AgentContext) {}
+
+  async execute(): Promise<AgentResult> {
+    const { config, task, capture } = this.ctx
+
+    // Use capture.createToolHooks() for screenshot/logging
+    // Use capture.messageLogger for messages
+    // Use capture.addError/addWarning for errors
+
+    // Return AgentResult
+  }
+}
+```
+
+3. Register in `agents/index.ts`:
+
+```typescript
+import { MyNewAgentEvaluator } from './my-new-agent'
+
+registerAgent('my-new-agent', (ctx) => new MyNewAgentEvaluator(ctx))
+```
+
+4. Add config schema in `types/config.ts`:
+
+```typescript
+export const MyNewAgentConfigSchema = z.object({
+  type: z.literal('my-new-agent'),
+  // ... specific fields
+})
+
+export const AgentConfigSchema = z.discriminatedUnion('type', [
+  SingleAgentConfigSchema,
+  OrchestratorExecutorConfigSchema,
+  MyNewAgentConfigSchema,  // Add here
+])
+```
+
+Done - no changes to runner code needed.
+
+---
+
+## Implementation Order
+
+1. **Phase 1: Types** (~1 hour)
+   - Create `types/` folder with proper structure
+   - Move/consolidate all types
+   - Add Zod schemas for messages
+
+2. **Phase 2: Capture Context** (~1 hour)
+   - Create `CaptureContext` class
+   - Add delegation message methods
+   - Create `createToolHooks()` utility
+
+3. **Phase 3: Agent Registry** (~30 min)
+   - Create `registry.ts`
+   - Create `AgentContext` interface
+   - Update exports
+
+4. **Phase 4: Refactor Single Agent** (~1 hour)
+   - Use `AgentContext`
+   - Use `CaptureContext`
+   - Clean up code
+
+5. **Phase 5: Refactor Orchestrator-Executor** (~2 hours)
+   - Use `AgentContext`
+   - Integrate `CaptureContext`
+   - Wire up hooks properly
+
+6. **Phase 6: Update Runner** (~30 min)
+   - Use `createAgent()` instead of if-else
+   - Initialize `CaptureContext` in executor
+
+7. **Phase 7: Testing** (~1 hour)
+   - Run single-agent eval
+   - Run orchestrator-executor eval
+   - Verify screenshots/messages captured
+
+---
+
+## Summary
+
+| Before | After |
+|--------|-------|
+| If-else agent creation | Registry + factory pattern |
+| Duplicated capture code | Shared `CaptureContext` |
+| Scattered types | Organized `types/` folder |
+| Copy-paste hooks | `createToolHooks()` utility |
+| Tight coupling | Clear interfaces |
+| Hard to add agents | Register + implement |

packages/browseros-agent/apps/eval/IMPLEMENTATION_PHASES.md

@@ -0,0 +1,431 @@
+# Implementation Phases - Parallel Execution Plan
+
+## Dependency Graph
+
+```
+Phase 1: Types (4 parallel subagents)
+    │
+    ├──────────────────┬──────────────────┐
+    ▼                  ▼                  │
+Phase 2: Capture    Phase 3: Agent       │
+(2 parallel)        Registry             │
+    │               (1 subagent)         │
+    │                  │                  │
+    └────────┬─────────┘                  │
+             ▼                            │
+Phase 4: Agent Refactors                  │
+(2 parallel - after 2+3)                  │
+             │                            │
+             ▼                            │
+Phase 5: Runner Update                    │
+(1 subagent - after 4)                    │
+             │                            │
+             ▼                            │
+Phase 6: Cleanup & Test ◄─────────────────┘
+(1 subagent)
+```
+
+---
+
+## Phase 1: Types (4 Parallel Subagents)
+
+No dependencies - can all run simultaneously.
+
+### Subagent 1A: Config Types
+```
+Create /apps/eval/src/types/config.ts
+
+Requirements:
+1. Import LLMConfigSchema, LLMProviderSchema from @browseros/shared/schemas/llm
+2. Import z from zod
+
+Create Zod schemas:
+- SingleAgentConfigSchema = LLMConfigSchema.extend({ type: z.literal('single') })
+- OrchestratorExecutorConfigSchema with orchestrator + executor nested configs
+- AgentConfigSchema = z.discriminatedUnion('type', [...])
+- EvalConfigSchema with all fields (agent, dataset, output_dir, num_workers, browseros, grader_*, timeout_ms)
+
+Export both schemas and inferred types (z.infer<>)
+
+Reference: Current implementation in /apps/eval/src/utils/config-validator.ts (lines 1-42)
+```
+
+### Subagent 1B: Message Types
+```
+Create /apps/eval/src/types/message.ts
+
+Requirements:
+1. Use Zod for all schemas
+2. Create BaseMessageSchema with timestamp field
+
+Create schemas for:
+- UserMessageSchema (type: 'user', content)
+- AssistantMessageSchema (type: 'assistant', content)
+- ToolCallMessageSchema (type: 'tool_call', tool, toolCallId, params)
+- ToolResultMessageSchema (type: 'tool_result', toolCallId, result, isError, screenshot?)
+- ErrorMessageSchema (type: 'error', content, errorCode?)
+- DelegationMessageSchema (type: 'delegation', instruction, executorId, maxSteps?)
+- DelegationResultMessageSchema (type: 'delegation_result', executorId, summary, status, stepsUsed, currentUrl?)
+
+Create MessageSchema = z.discriminatedUnion('type', [...all schemas])
+
+Export schemas, types, and type guards (isToolCallMessage, isDelegationMessage, etc.)
+
+Reference: Current types in /apps/eval/src/types.ts (lines 62-127)
+```
+
+### Subagent 1C: Task & Result Types
+```
+Create /apps/eval/src/types/task.ts
+
+Requirements:
+1. Use Zod schemas with inferred types
+
+Create:
+- TaskMetadataSchema (original_task_id, website?, category?, additional?)
+- TaskSchema (query_id, dataset, query, graders[], start_url?, setup_script?, metadata)
+
+Export schemas and types.
+
+---
+
+Create /apps/eval/src/types/result.ts
+
+Create:
+- GraderResultSchema (score, pass, reasoning, details?)
+- TaskMetadataSchema (query_id, dataset, query, started_at, completed_at, total_duration_ms, total_steps, termination_reason, final_answer, errors, warnings, agent_config, grader_results)
+- AgentResultSchema (metadata, messages, finalAnswer)
+
+Export schemas and types.
+
+Reference: Current types in /apps/eval/src/types.ts (lines 6-20, 156-182)
+```
+
+### Subagent 1D: Error Types + Index
+```
+Create /apps/eval/src/types/errors.ts
+
+Create:
+- ErrorSourceSchema = z.enum(['window_creation', 'agent_execution', 'mcp_tool', 'screenshot', 'grader', 'message_logging', 'cleanup', 'unknown'])
+- TaskErrorSchema (source, message, timestamp, details?)
+- EvalWarningSchema (source, message, timestamp)
+
+Export schemas and types.
+
+---
+
+Create /apps/eval/src/types/index.ts
+
+Re-export everything from:
+- ./config
+- ./message
+- ./task
+- ./result
+- ./errors
+
+This becomes the single import point: import { EvalConfig, Message, Task } from '../types'
+
+Reference: Current types in /apps/eval/src/types.ts (lines 129-154)
+```
+
+---
+
+## Phase 2: Capture Infrastructure (2 Parallel Subagents)
+
+**Depends on:** Phase 1 (types)
+
+### Subagent 2A: CaptureContext Class
+```
+Create /apps/eval/src/capture/types.ts
+
+Define interface:
+- CaptureContextConfig { serverUrl, outputDir, taskId, tabId, windowId }
+
+---
+
+Create /apps/eval/src/capture/context.ts
+
+Requirements:
+1. Import ToolExecutionHooks, ToolExecutionResult from @browseros/server/agent
+2. Import types from ../types
+3. Import existing ScreenshotCapture, MessageLogger, TrajectorySaver
+
+Implement CaptureContext class:
+- Constructor takes CaptureContextConfig
+- async init() - initializes screenshot, messageLogger, trajectorySaver, returns taskOutputDir
+- createToolHooks(): ToolExecutionHooks - returns hooks for GeminiAgent
+- addError(source, message, details?)
+- addWarning(source, message)
+- getErrors(), getWarnings(), getMessages(), getScreenshotCount(), getLastAssistantMessage()
+- logDelegation(instruction, executorId, maxSteps?)
+- logDelegationResult(executorId, summary, status, stepsUsed, currentUrl?)
+
+Reference implementation details in DESIGN_DOC.md section "4. Capture Context"
+
+Update /apps/eval/src/capture/index.ts to export CaptureContext
+```
+
+### Subagent 2B: MessageLogger Extensions
+```
+Update /apps/eval/src/capture/message-logger.ts
+
+Add two new methods:
+
+1. logDelegation(instruction: string, executorId: string, maxSteps?: number): Promise<void>
+   - Creates DelegationMessage with type: 'delegation'
+   - Appends to messages
+
+2. logDelegationResult(executorId: string, summary: string, status: 'done' | 'blocked' | 'max_steps', stepsUsed: number, currentUrl?: string): Promise<void>
+   - Creates DelegationResultMessage with type: 'delegation_result'
+   - Appends to messages
+
+Import DelegationMessage, DelegationResultMessage from ../types
+
+Reference: Current MessageLogger in /apps/eval/src/capture/message-logger.ts
+```
+
+---
+
+## Phase 3: Agent Registry (1 Subagent)
+
+**Depends on:** Phase 1 (types)
+**Can run parallel with:** Phase 2
+
+### Subagent 3A: Agent Registry + Types
+```
+Create /apps/eval/src/agents/types.ts
+
+Define:
+- AgentContext interface:
+  {
+    config: EvalConfig
+    task: Task
+    windowId: number
+    tabId: number
+    outputDir: string
+    taskOutputDir: string
+    capture: CaptureContext
+  }
+
+- AgentResult interface (re-export from ../types or define here)
+- AgentEvaluator interface { execute(): Promise<AgentResult> }
+
+---
+
+Create /apps/eval/src/agents/registry.ts
+
+Implement:
+- type AgentFactory = (context: AgentContext) => AgentEvaluator
+- const registry = new Map<string, AgentFactory>()
+- registerAgent(type: string, factory: AgentFactory): void
+- createAgent(context: AgentContext): AgentEvaluator
+- getRegisteredAgentTypes(): string[]
+
+Reference: DESIGN_DOC.md section "2. Agent Registry"
+
+---
+
+Update /apps/eval/src/agents/index.ts
+
+- Import registerAgent from ./registry
+- Import SingleAgentEvaluator (will be updated later)
+- Import OrchestratorExecutorEvaluator (will be updated later)
+- Call registerAgent for both
+- Re-export createAgent, registerAgent, getRegisteredAgentTypes
+- Re-export types
+
+Note: Registration calls will fail initially until agents are refactored.
+That's OK - add TODO comments for now.
+```
+
+---
+
+## Phase 4: Agent Refactors (2 Parallel Subagents)
+
+**Depends on:** Phase 2 + Phase 3
+
+### Subagent 4A: Single Agent Refactor
+```
+Refactor /apps/eval/src/agents/single-agent.ts
+
+Changes:
+1. Change constructor to accept AgentContext instead of individual params:
+   constructor(private ctx: AgentContext) {}
+
+2. Use ctx.capture instead of creating ScreenshotCapture/MessageLogger:
+   - Remove local ScreenshotCapture initialization
+   - Remove local MessageLogger initialization
+   - Remove local hooks setup
+   - Use ctx.capture.createToolHooks() for GeminiAgent hooks
+   - Use ctx.capture.messageLogger.logUser/logAssistant
+   - Use ctx.capture.addError/addWarning
+   - Use ctx.capture.getMessages(), getScreenshotCount(), etc.
+
+3. Build metadata using capture methods
+
+4. Remove TrajectorySaver init (done in CaptureContext)
+
+5. Keep the core agent execution logic (GeminiAgent.create, agent.execute)
+
+Reference:
+- Current implementation: /apps/eval/src/agents/single-agent.ts
+- Target implementation: DESIGN_DOC.md section "5. Single Agent Evaluator"
+```
+
+### Subagent 4B: Orchestrator-Executor Refactor
+```
+Refactor /apps/eval/src/agents/orchestrator-executor/index.ts
+
+Changes:
+1. Change OrchestratorExecutorEvaluator constructor to accept AgentContext:
+   constructor(private ctx: AgentContext) {}
+
+2. Initialize capture from context (already done in runner)
+
+3. Add hook integration:
+   - Create executor hooks that use ctx.capture.createToolHooks()
+   - Wire hooks through Orchestrator → ExecutorStore → Executor
+   - Call ctx.capture.logDelegation() when orchestrator delegates
+   - Call ctx.capture.logDelegationResult() when executor returns
+
+4. Update return to include messages:
+   return {
+     metadata,
+     messages: ctx.capture.getMessages(),  // Now populated!
+     finalAnswer,
+   }
+
+Also update supporting files if needed:
+- orchestrator.ts - add setExecutorHooks() method
+- executor.ts - accept external hooks via setObservationHooks()
+- executor-store.ts - pass hooks to new executors
+
+Reference:
+- Current: /apps/eval/src/agents/orchestrator-executor/index.ts
+- Target: DESIGN_DOC.md and previous IMPLEMENTATION_PLAN.md
+```
+
+---
+
+## Phase 5: Runner Update (1 Subagent)
+
+**Depends on:** Phase 4
+
+### Subagent 5A: Task Executor Update
+```
+Update /apps/eval/src/runner/task-executor.ts
+
+Changes:
+1. Import createAgent from ../agents instead of individual evaluators
+2. Import CaptureContext from ../capture
+
+3. In execute() method:
+   - Create CaptureContext and call init()
+   - Build AgentContext with all required fields
+   - Use createAgent(context) instead of if-else switch
+   - Remove the if (config.agent.type === 'single') / else if blocks
+
+4. Remove direct imports of SingleAgentEvaluator, OrchestratorExecutorEvaluator
+
+Before:
+```typescript
+if (this.config.agent.type === 'single') {
+  const evaluator = new SingleAgentEvaluator(this.config, task, window.windowId, ...)
+} else if (this.config.agent.type === 'orchestrator-executor') {
+  const evaluator = new OrchestratorExecutorEvaluator(this.config, task, ...)
+}
+```
+
+After:
+```typescript
+const capture = new CaptureContext({ serverUrl, outputDir, taskId, tabId, windowId })
+const taskOutputDir = await capture.init()
+
+const context: AgentContext = {
+  config: this.config,
+  task,
+  windowId: window.windowId,
+  tabId: window.tabId,
+  outputDir: this.outputDir,
+  taskOutputDir,
+  capture,
+}
+
+const agent = createAgent(context)
+const agentResult = await agent.execute()
+```
+
+Reference:
+- Current: /apps/eval/src/runner/task-executor.ts (lines 143-186)
+- Target: DESIGN_DOC.md section "6. Task Executor"
+```
+
+---
+
+## Phase 6: Cleanup & Test (1 Subagent)
+
+**Depends on:** Phase 5
+
+### Subagent 6A: Cleanup Old Files + Verify
+```
+Tasks:
+1. Delete old /apps/eval/src/types.ts (replaced by types/ folder)
+
+2. Update all imports across the codebase:
+   - Change: import { EvalConfig, Task, Message } from '../types'
+   - Keep same (types/index.ts re-exports everything)
+
+3. Update /apps/eval/src/utils/config-validator.ts:
+   - Import schemas from ../types/config instead of defining locally
+   - Remove duplicate schema definitions
+
+4. Verify no TypeScript errors:
+   - Run: cd apps/eval && bun run typecheck
+
+5. Test single-agent eval:
+   - Run: cd apps/eval && bun run eval -c configs/webvoyager-test.json
+   - Verify screenshots captured
+   - Verify messages.jsonl populated
+
+6. Test orchestrator-executor eval:
+   - Run: cd apps/eval && bun run eval -c configs/orchestrator-executor-test.json
+   - Verify screenshots captured
+   - Verify messages.jsonl has delegation messages
+   - Verify graders pass (no "no_screenshots" error)
+
+Report any issues found.
+```
+
+---
+
+## Execution Summary
+
+| Phase | Subagents | Can Parallelize? | Dependencies |
+|-------|-----------|------------------|--------------|
+| 1 | 4 (1A, 1B, 1C, 1D) | Yes - all parallel | None |
+| 2 | 2 (2A, 2B) | Yes - both parallel | Phase 1 |
+| 3 | 1 (3A) | Yes - parallel with Phase 2 | Phase 1 |
+| 4 | 2 (4A, 4B) | Yes - both parallel | Phase 2 + 3 |
+| 5 | 1 (5A) | No | Phase 4 |
+| 6 | 1 (6A) | No | Phase 5 |
+
+**Total: 11 subagent tasks**
+
+**Parallel execution timeline:**
+```
+Time →
+─────────────────────────────────────────────────────────────────
+Phase 1: [1A] [1B] [1C] [1D]     (4 parallel)
+         ─────────────────
+Phase 2:                   [2A] [2B]   (2 parallel)
+Phase 3:                   [3A]        (parallel with Phase 2)
+                           ───────────
+Phase 4:                              [4A] [4B]  (2 parallel)
+                                      ──────────
+Phase 5:                                        [5A]
+                                                ────
+Phase 6:                                            [6A]
+                                                    ────
+```
+
+**Maximum parallelism: 4 subagents** (Phase 1)

packages/browseros-agent/apps/eval/IMPLEMENTATION_PLAN.md

@@ -0,0 +1,888 @@
+# Eval System - Production Grade Implementation Plan
+
+## Overview
+
+This plan outlines the changes needed to make the eval system production-grade with uniform agent observation across all agent patterns (single-agent, orchestrator-executor, future patterns).
+
+**Goal:** All agent evaluators produce consistent `AgentResult` with screenshots, message traces, and verifiable action sequences.
+
+---
+
+## Phase 1: Type System Extensions
+
+### 1.1 Add New Message Types
+
+**File:** `src/types.ts`
+
+Add delegation-specific message types for orchestrator pattern:
+
+```typescript
+// After ErrorMessage definition (~line 99)
+
+export interface DelegationMessage extends BaseMessage {
+  type: 'delegation'
+  instruction: string
+  executorId: string
+  maxSteps?: number
+}
+
+export interface DelegationResultMessage extends BaseMessage {
+  type: 'delegation_result'
+  executorId: string
+  summary: string
+  status: 'done' | 'blocked' | 'max_steps'
+  stepsUsed: number
+  currentUrl?: string
+}
+
+// Update Message union (~line 101)
+export type Message =
+  | UserMessage
+  | AssistantMessage
+  | ToolCallMessage
+  | ToolResultMessage
+  | ErrorMessage
+  | DelegationMessage      // NEW
+  | DelegationResultMessage // NEW
+
+// Add type guards
+export function isDelegationMessage(msg: Message): msg is DelegationMessage {
+  return msg.type === 'delegation'
+}
+
+export function isDelegationResultMessage(msg: Message): msg is DelegationResultMessage {
+  return msg.type === 'delegation_result'
+}
+```
+
+### 1.2 Add Orchestrator Hook Types
+
+**File:** `src/agents/orchestrator-executor/types.ts`
+
+```typescript
+// Add after existing types
+
+export interface OrchestratorHooks {
+  onDelegation?: (instruction: string, executorId: string, maxSteps?: number) => Promise<void>
+  onDelegationResult?: (result: ExecutorResult) => Promise<void>
+  onTurnStart?: (turn: number) => Promise<void>
+  onTurnComplete?: (turn: number) => Promise<void>
+  onComplete?: (answer: string) => Promise<void>
+  onFailed?: (reason: string) => Promise<void>
+}
+
+export interface ExecutorObservationHooks {
+  onBeforeToolCall?: (toolName: string, args: unknown) => Promise<string> // returns toolCallId
+  onAfterToolCall?: (toolName: string, toolCallId: string, result: unknown, isError: boolean) => Promise<void>
+}
+```
+
+---
+
+## Phase 2: Unified Capture Infrastructure
+
+### 2.1 Create EvalCapture Class
+
+**File:** `src/capture/eval-capture.ts` (NEW)
+
+```typescript
+/**
+ * EvalCapture - Unified capture infrastructure for all agent evaluators
+ *
+ * Combines screenshot capture, message logging, and provides hooks for
+ * both single-agent and orchestrator-executor patterns.
+ */
+
+import { randomUUID } from 'node:crypto'
+import type {
+  AssistantMessage,
+  DelegationMessage,
+  DelegationResultMessage,
+  ErrorMessage,
+  Message,
+  ToolCallMessage,
+  ToolResultMessage,
+  UserMessage,
+} from '../types'
+import { MessageLogger } from './message-logger'
+import { ScreenshotCapture } from './screenshot'
+
+export interface EvalCaptureConfig {
+  serverUrl: string
+  outputDir: string
+  tabId: number
+  windowId: number
+}
+
+export class EvalCapture {
+  private screenshotCapture: ScreenshotCapture
+  private messageLogger: MessageLogger
+  private tabId: number
+  private windowId: number
+  private currentToolCallId: string | null = null
+
+  constructor(config: EvalCaptureConfig) {
+    this.screenshotCapture = new ScreenshotCapture(config.serverUrl, config.outputDir)
+    this.messageLogger = new MessageLogger(config.outputDir)
+    this.tabId = config.tabId
+    this.windowId = config.windowId
+  }
+
+  async init(): Promise<void> {
+    await this.screenshotCapture.init()
+  }
+
+  // ============================================================================
+  // Screenshot Capture
+  // ============================================================================
+
+  async captureScreenshot(): Promise<number> {
+    return this.screenshotCapture.capture(this.tabId, this.windowId)
+  }
+
+  getScreenshotCount(): number {
+    return this.screenshotCapture.getCount()
+  }
+
+  // ============================================================================
+  // Message Logging - Basic Types
+  // ============================================================================
+
+  async logUser(content: string): Promise<void> {
+    await this.messageLogger.logUser(content)
+  }
+
+  async logAssistant(content: string): Promise<void> {
+    await this.messageLogger.logAssistant(content)
+  }
+
+  async logError(content: string, errorCode?: string): Promise<void> {
+    await this.messageLogger.logError(content, errorCode)
+  }
+
+  // ============================================================================
+  // Tool Call Logging (for single-agent and executor)
+  // ============================================================================
+
+  async logToolCall(tool: string, params: Record<string, unknown>): Promise<string> {
+    const toolCallId = randomUUID()
+    this.currentToolCallId = toolCallId
+    await this.messageLogger.logToolCall(tool, toolCallId, params)
+    return toolCallId
+  }
+
+  async logToolResult(
+    toolCallId: string,
+    result: unknown,
+    isError: boolean,
+    screenshot?: number,
+  ): Promise<void> {
+    await this.messageLogger.logToolResult(toolCallId, result, isError, screenshot)
+    this.currentToolCallId = null
+  }
+
+  getCurrentToolCallId(): string | null {
+    return this.currentToolCallId
+  }
+
+  // ============================================================================
+  // Delegation Logging (for orchestrator-executor)
+  // ============================================================================
+
+  async logDelegation(
+    instruction: string,
+    executorId: string,
+    maxSteps?: number,
+  ): Promise<void> {
+    const message: DelegationMessage = {
+      type: 'delegation',
+      timestamp: new Date().toISOString(),
+      instruction,
+      executorId,
+      ...(maxSteps !== undefined && { maxSteps }),
+    }
+    // Extend MessageLogger to handle this, or append directly
+    await this.appendMessage(message)
+  }
+
+  async logDelegationResult(
+    executorId: string,
+    summary: string,
+    status: 'done' | 'blocked' | 'max_steps',
+    stepsUsed: number,
+    currentUrl?: string,
+  ): Promise<void> {
+    const message: DelegationResultMessage = {
+      type: 'delegation_result',
+      timestamp: new Date().toISOString(),
+      executorId,
+      summary,
+      status,
+      stepsUsed,
+      ...(currentUrl && { currentUrl }),
+    }
+    await this.appendMessage(message)
+  }
+
+  // ============================================================================
+  // Helpers
+  // ============================================================================
+
+  private async appendMessage(message: Message): Promise<void> {
+    // Access internal messages array and file
+    // This requires either extending MessageLogger or using a shared approach
+    const messages = this.messageLogger.getMessages()
+    messages.push(message)
+    // Write to file - MessageLogger needs extension for this
+  }
+
+  getMessages(): Message[] {
+    return this.messageLogger.getMessages()
+  }
+
+  getLastAssistantMessage(): string | null {
+    return this.messageLogger.getLastAssistantMessage()
+  }
+}
+```
+
+### 2.2 Extend MessageLogger for New Types
+
+**File:** `src/capture/message-logger.ts`
+
+Add methods for delegation messages:
+
+```typescript
+// Add after logError method
+
+async logDelegation(
+  instruction: string,
+  executorId: string,
+  maxSteps?: number,
+): Promise<void> {
+  const message: DelegationMessage = {
+    type: 'delegation',
+    timestamp: new Date().toISOString(),
+    instruction,
+    executorId,
+    ...(maxSteps !== undefined && { maxSteps }),
+  }
+  await this.append(message)
+}
+
+async logDelegationResult(
+  executorId: string,
+  summary: string,
+  status: 'done' | 'blocked' | 'max_steps',
+  stepsUsed: number,
+  currentUrl?: string,
+): Promise<void> {
+  const message: DelegationResultMessage = {
+    type: 'delegation_result',
+    timestamp: new Date().toISOString(),
+    executorId,
+    summary,
+    status,
+    stepsUsed,
+    ...(currentUrl && { currentUrl }),
+  }
+  await this.append(message)
+}
+```
+
+---
+
+## Phase 3: Executor Hook Integration
+
+### 3.1 Modify Executor to Accept External Hooks
+
+**File:** `src/agents/orchestrator-executor/executor.ts`
+
+```typescript
+// Add import
+import type { ExecutorObservationHooks } from './types'
+
+export class Executor {
+  private agent: GeminiAgent | null = null
+  private stepsUsed = 0
+  private currentUrl = ''
+  private config: ExecutorConfig
+  private serverUrl: string
+  private windowId: number
+  private tabId: number
+  private observationHooks?: ExecutorObservationHooks  // NEW
+
+  // ... existing constructor ...
+
+  /**
+   * Set external observation hooks for capture integration
+   */
+  setObservationHooks(hooks: ExecutorObservationHooks): void {
+    this.observationHooks = hooks
+  }
+
+  async execute(
+    instruction: string,
+    maxSteps?: number,
+    signal?: AbortSignal,
+  ): Promise<Omit<ExecutorResult, 'executorId'>> {
+    // ... existing setup ...
+
+    // Track steps via hooks - MODIFIED to include external observation
+    let stepsThisRun = 0
+    const hooks: ToolExecutionHooks = {
+      onBeforeToolCall: async (toolName: string, args: unknown) => {
+        // Call external hook if set (for logging)
+        if (this.observationHooks?.onBeforeToolCall) {
+          await this.observationHooks.onBeforeToolCall(toolName, args)
+        }
+      },
+      onAfterToolCall: async (toolName: string, result: ToolExecutionResult) => {
+        stepsThisRun++
+        this.stepsUsed++
+
+        // Call external hook if set (for screenshot capture and logging)
+        if (this.observationHooks?.onAfterToolCall) {
+          const toolCallId = 'current' // Will be tracked by EvalCapture
+          await this.observationHooks.onAfterToolCall(
+            toolName,
+            toolCallId,
+            result.parts,
+            result.isError,
+          )
+        }
+      },
+    }
+    this.agent.setToolHooks(hooks)
+
+    // ... rest of execute method ...
+  }
+}
+```
+
+### 3.2 Pass Hooks Through ExecutorStore
+
+**File:** `src/agents/orchestrator-executor/executor-store.ts`
+
+```typescript
+import type { ExecutorObservationHooks } from './types'
+
+export class ExecutorStore {
+  private executors = new Map<string, Executor>()
+  private observationHooks?: ExecutorObservationHooks  // NEW
+
+  /**
+   * Set observation hooks that will be applied to all executors
+   */
+  setObservationHooks(hooks: ExecutorObservationHooks): void {
+    this.observationHooks = hooks
+    // Apply to existing executors
+    for (const executor of this.executors.values()) {
+      executor.setObservationHooks(hooks)
+    }
+  }
+
+  getOrCreate(
+    id: string,
+    config: ExecutorConfig,
+    serverUrl: string,
+    windowId: number,
+    tabId: number,
+  ): Executor {
+    if (!this.executors.has(id)) {
+      const executor = new Executor(config, serverUrl, windowId, tabId)
+      // Apply observation hooks to new executor
+      if (this.observationHooks) {
+        executor.setObservationHooks(this.observationHooks)
+      }
+      this.executors.set(id, executor)
+    }
+    return this.executors.get(id)!
+  }
+
+  // ... rest unchanged ...
+}
+```
+
+---
+
+## Phase 4: Orchestrator Hook Integration
+
+### 4.1 Add Hooks to OrchestratorAgent
+
+**File:** `src/agents/orchestrator-executor/orchestrator-agent.ts`
+
+```typescript
+import type { ExecutorObservationHooks, OrchestratorHooks } from './types'
+
+export class OrchestratorAgent {
+  private orchestratorHooks?: OrchestratorHooks  // NEW
+
+  private constructor(
+    private client: GeminiClient,
+    private geminiConfig: GeminiConfig,
+    private state: OrchestratorState,
+    private executorStore: ExecutorStore,
+    private maxTurns: number,
+  ) {}
+
+  /**
+   * Set orchestrator-level hooks for delegation tracking
+   */
+  setHooks(hooks: OrchestratorHooks): void {
+    this.orchestratorHooks = hooks
+  }
+
+  /**
+   * Set executor observation hooks (passed through to ExecutorStore)
+   */
+  setExecutorObservationHooks(hooks: ExecutorObservationHooks): void {
+    this.executorStore.setObservationHooks(hooks)
+  }
+
+  /**
+   * Get hooks for tool context (used by orchestrator-tools.ts)
+   */
+  getOrchestratorHooks(): OrchestratorHooks | undefined {
+    return this.orchestratorHooks
+  }
+
+  async run(taskQuery: string): Promise<OrchestratorAgentResult> {
+    let currentParts: Part[] = [{ text: taskQuery }]
+    let turns = 0
+
+    while (
+      !this.state.isComplete &&
+      !this.state.isFailed &&
+      turns < this.maxTurns
+    ) {
+      turns++
+
+      // Fire turn start hook
+      await this.orchestratorHooks?.onTurnStart?.(turns)
+
+      // ... existing turn logic ...
+
+      // Fire turn complete hook
+      await this.orchestratorHooks?.onTurnComplete?.(turns)
+    }
+
+    // Fire completion hooks
+    if (this.state.isComplete && this.state.finalAnswer) {
+      await this.orchestratorHooks?.onComplete?.(this.state.finalAnswer)
+    } else if (this.state.isFailed && this.state.failureReason) {
+      await this.orchestratorHooks?.onFailed?.(this.state.failureReason)
+    }
+
+    return {
+      success: this.state.isComplete,
+      answer: this.state.finalAnswer,
+      reason: this.state.failureReason,
+      delegationCount: this.state.delegationCount,
+      totalExecutorSteps: this.state.totalExecutorSteps,
+      turns,
+    }
+  }
+
+  // ... rest unchanged ...
+}
+```
+
+### 4.2 Fire Hooks in Orchestrator Tools
+
+**File:** `src/agents/orchestrator-executor/orchestrator-tools.ts`
+
+Modify the delegate tool handler to fire hooks:
+
+```typescript
+// In createOrchestratorTools function, modify the delegate tool handler
+
+// Inside the delegate tool's handler:
+handler: async (args) => {
+  const { instruction, executorId, maxSteps } = args as DelegateParams
+
+  // Fire delegation hook BEFORE execution
+  const hooks = context.getOrchestratorHooks?.()
+  const actualExecutorId = executorId ?? randomUUID()
+  await hooks?.onDelegation?.(instruction, actualExecutorId, maxSteps)
+
+  // Get or create executor
+  const executor = context.executorStore.getOrCreate(
+    actualExecutorId,
+    context.executorConfig,
+    context.serverUrl,
+    context.windowId,
+    context.tabId,
+  )
+
+  // Execute
+  const result = await executor.execute(instruction, maxSteps)
+
+  // Update state
+  context.state.delegationCount++
+  context.state.totalExecutorSteps += result.stepsUsed
+
+  // Fire delegation result hook AFTER execution
+  await hooks?.onDelegationResult?.({
+    ...result,
+    executorId: actualExecutorId,
+  })
+
+  // Return result to orchestrator
+  return {
+    executorId: actualExecutorId,
+    ...result,
+  }
+}
+```
+
+---
+
+## Phase 5: Update OrchestratorExecutorEvaluator
+
+### 5.1 Full Integration
+
+**File:** `src/agents/orchestrator-executor/index.ts`
+
+```typescript
+import { ScreenshotCapture } from '../../capture/screenshot'
+import { MessageLogger } from '../../capture/message-logger'
+import { TrajectorySaver } from '../../capture/trajectory-saver'
+import type { ExecutorObservationHooks, OrchestratorHooks } from './types'
+
+export class OrchestratorExecutorEvaluator implements AgentEvaluator {
+  constructor(
+    private config: EvalConfig,
+    private task: Task,
+    private windowId: number,
+    private tabId: number,
+    private outputDir: string,
+  ) {}
+
+  async execute(): Promise<AgentResult> {
+    const startTime = Date.now()
+    const timeoutMs = this.config.timeout_ms ?? DEFAULT_TIMEOUT_MS
+
+    const errors: TaskError[] = []
+    const warnings: EvalWarning[] = []
+
+    const addError = (source: TaskError['source'], message: string, details?: Record<string, unknown>) => {
+      errors.push({ source, message, timestamp: new Date().toISOString(), details })
+    }
+
+    const addWarning = (source: EvalWarning['source'], message: string) => {
+      warnings.push({ source, message, timestamp: new Date().toISOString() })
+      console.warn(`[${source}] ${message}`)
+    }
+
+    // Initialize trajectory saver
+    const saver = new TrajectorySaver(this.outputDir, this.task.query_id)
+    const taskOutputDir = await saver.init()
+
+    // NEW: Initialize capture infrastructure (same as single-agent)
+    const screenshotCapture = new ScreenshotCapture(
+      this.config.browseros.server_url,
+      taskOutputDir,
+    )
+    await screenshotCapture.init()
+
+    const messageLogger = new MessageLogger(taskOutputDir)
+
+    // Log initial user message
+    await messageLogger.logUser(this.task.query)
+
+    // Validate config type
+    if (this.config.agent.type !== 'orchestrator-executor') {
+      throw new Error('OrchestratorExecutorEvaluator requires orchestrator-executor config')
+    }
+
+    const agentConfig = this.config.agent as OrchestratorExecutorConfig
+    const { orchestrator: orchestratorConfig, executor: executorConfig } =
+      resolveAgentConfig(agentConfig)
+
+    // Create orchestrator
+    const orchestrator = new Orchestrator(
+      orchestratorConfig,
+      executorConfig,
+      this.config.browseros.server_url,
+      this.windowId,
+      this.tabId,
+    )
+
+    // NEW: Set up executor observation hooks (for tool call/result capture)
+    let currentToolCallId: string | null = null
+
+    const executorHooks: ExecutorObservationHooks = {
+      onBeforeToolCall: async (toolName: string, args: unknown) => {
+        try {
+          currentToolCallId = randomUUID()
+          await messageLogger.logToolCall(toolName, currentToolCallId, args as Record<string, unknown>)
+        } catch (err) {
+          addWarning('message_logging', `Failed to log tool call ${toolName}: ${err instanceof Error ? err.message : String(err)}`)
+        }
+        return currentToolCallId
+      },
+      onAfterToolCall: async (toolName: string, _toolCallId: string, result: unknown, isError: boolean) => {
+        let screenshotNum = 0
+
+        // Capture screenshot after tool execution
+        try {
+          screenshotNum = await screenshotCapture.capture(this.tabId, this.windowId)
+        } catch (err) {
+          addWarning('screenshot', `Screenshot after ${toolName} failed: ${err instanceof Error ? err.message : String(err)}`)
+          screenshotNum = screenshotCapture.getCount()
+        }
+
+        // Log tool errors
+        if (isError) {
+          addWarning('mcp_tool', `Tool ${toolName} returned error`)
+        }
+
+        if (!currentToolCallId) {
+          addWarning('message_logging', 'Tool result without matching tool call')
+          return
+        }
+
+        try {
+          await messageLogger.logToolResult(currentToolCallId, result, isError, screenshotNum)
+        } catch (err) {
+          addWarning('message_logging', `Failed to log tool result: ${err instanceof Error ? err.message : String(err)}`)
+        }
+
+        currentToolCallId = null
+      },
+    }
+
+    // NEW: Set up orchestrator hooks (for delegation tracking)
+    const orchestratorHooks: OrchestratorHooks = {
+      onDelegation: async (instruction: string, executorId: string, maxSteps?: number) => {
+        try {
+          await messageLogger.logDelegation(instruction, executorId, maxSteps)
+        } catch (err) {
+          addWarning('message_logging', `Failed to log delegation: ${err instanceof Error ? err.message : String(err)}`)
+        }
+      },
+      onDelegationResult: async (result) => {
+        try {
+          await messageLogger.logDelegationResult(
+            result.executorId,
+            result.summary,
+            result.status,
+            result.stepsUsed,
+            result.currentUrl,
+          )
+        } catch (err) {
+          addWarning('message_logging', `Failed to log delegation result: ${err instanceof Error ? err.message : String(err)}`)
+        }
+      },
+    }
+
+    // Apply hooks to orchestrator
+    orchestrator.setHooks(orchestratorHooks)
+    orchestrator.setExecutorObservationHooks(executorHooks)
+
+    // Set up timeout
+    const abortController = new AbortController()
+    const timeoutHandle = setTimeout(() => {
+      abortController.abort()
+    }, timeoutMs)
+
+    let terminationReason: 'completed' | 'max_steps' | 'error' | 'timeout' = 'completed'
+    let finalAnswer: string | null = null
+    let orchestratorResult: Awaited<ReturnType<typeof orchestrator.run>> | null = null
+
+    try {
+      const runPromise = orchestrator.run(this.task.query)
+
+      orchestratorResult = await Promise.race([
+        runPromise,
+        new Promise<never>((_, reject) => {
+          abortController.signal.addEventListener('abort', () => {
+            reject(new Error('Timeout'))
+          })
+        }),
+      ])
+
+      if (orchestratorResult.success) {
+        finalAnswer = orchestratorResult.answer
+        terminationReason = 'completed'
+        // Log final assistant message
+        if (finalAnswer) {
+          await messageLogger.logAssistant(finalAnswer)
+        }
+      } else {
+        terminationReason = 'error'
+        addError('agent_execution', orchestratorResult.reason ?? 'Unknown failure')
+        await messageLogger.logError(orchestratorResult.reason ?? 'Unknown failure')
+      }
+    } catch (err) {
+      const error = err instanceof Error ? err : new Error(String(err))
+
+      if (error.message === 'Timeout' || abortController.signal.aborted) {
+        terminationReason = 'timeout'
+        addError('agent_execution', `Task timed out after ${timeoutMs / 1000}s`)
+      } else {
+        terminationReason = 'error'
+        addError('agent_execution', error.message, { stack: error.stack })
+      }
+      await messageLogger.logError(error.message)
+    } finally {
+      clearTimeout(timeoutHandle)
+      orchestrator.getExecutorStore().clear()
+    }
+
+    const endTime = Date.now()
+
+    // Create metadata
+    const metadata: TaskMetadata = {
+      query_id: this.task.query_id,
+      dataset: this.task.dataset,
+      query: this.task.query,
+      started_at: new Date(startTime).toISOString(),
+      completed_at: new Date(endTime).toISOString(),
+      total_duration_ms: endTime - startTime,
+      total_steps: screenshotCapture.getCount(),  // Now accurate
+      termination_reason: terminationReason,
+      final_answer: finalAnswer,
+      errors,
+      warnings,
+      agent_config: {
+        type: 'orchestrator-executor',
+        model: `${orchestratorConfig.model} / ${executorConfig.model}`,
+      },
+      grader_results: {},
+    }
+
+    await saver.saveMetadata(metadata)
+
+    return {
+      metadata,
+      messages: messageLogger.getMessages(),  // NOW POPULATED
+      finalAnswer,
+    }
+  }
+}
+```
+
+---
+
+## Phase 6: Orchestrator Class Updates
+
+### 6.1 Add Hook Passthrough Methods
+
+**File:** `src/agents/orchestrator-executor/orchestrator.ts`
+
+```typescript
+import type { ExecutorObservationHooks, OrchestratorHooks } from './types'
+
+export class Orchestrator {
+  private agent: OrchestratorAgent | null = null
+  private executorStore: ExecutorStore
+  private pendingOrchestratorHooks?: OrchestratorHooks
+  private pendingExecutorHooks?: ExecutorObservationHooks
+
+  constructor(
+    private orchestratorConfig: OrchestratorConfig,
+    private executorConfig: ExecutorConfig,
+    private serverUrl: string,
+    private windowId: number,
+    private tabId: number,
+  ) {
+    this.executorStore = new ExecutorStore()
+  }
+
+  /**
+   * Set orchestrator-level hooks (must be called before run())
+   */
+  setHooks(hooks: OrchestratorHooks): void {
+    this.pendingOrchestratorHooks = hooks
+    if (this.agent) {
+      this.agent.setHooks(hooks)
+    }
+  }
+
+  /**
+   * Set executor observation hooks (must be called before run())
+   */
+  setExecutorObservationHooks(hooks: ExecutorObservationHooks): void {
+    this.pendingExecutorHooks = hooks
+    this.executorStore.setObservationHooks(hooks)
+    if (this.agent) {
+      this.agent.setExecutorObservationHooks(hooks)
+    }
+  }
+
+  async run(taskQuery: string): Promise<OrchestratorAgentResult> {
+    this.agent = await OrchestratorAgent.create(
+      this.orchestratorConfig,
+      this.executorConfig,
+      this.serverUrl,
+      this.windowId,
+      this.tabId,
+    )
+
+    // Apply pending hooks
+    if (this.pendingOrchestratorHooks) {
+      this.agent.setHooks(this.pendingOrchestratorHooks)
+    }
+    if (this.pendingExecutorHooks) {
+      this.agent.setExecutorObservationHooks(this.pendingExecutorHooks)
+    }
+
+    const result = await this.agent.run(taskQuery)
+    this.executorStore = this.agent.getExecutorStore()
+
+    return result
+  }
+
+  getExecutorStore(): ExecutorStore {
+    return this.agent?.getExecutorStore() ?? this.executorStore
+  }
+}
+```
+
+---
+
+## Implementation Order
+
+1. **Phase 1** - Type extensions (types.ts) - 30 min
+2. **Phase 2** - MessageLogger extensions - 30 min
+3. **Phase 3** - Executor hook integration - 1 hour
+4. **Phase 4** - OrchestratorAgent hooks - 1 hour
+5. **Phase 5** - OrchestratorExecutorEvaluator update - 1.5 hours
+6. **Phase 6** - Orchestrator passthrough - 30 min
+7. **Testing** - End-to-end verification - 1 hour
+
+**Total estimated time:** ~6 hours
+
+---
+
+## Testing Checklist
+
+- [ ] Single-agent eval still works (regression test)
+- [ ] Orchestrator-executor produces screenshots in output folder
+- [ ] Orchestrator-executor produces messages.jsonl with:
+  - [ ] user message
+  - [ ] delegation messages
+  - [ ] tool_call messages (from executor)
+  - [ ] tool_result messages with screenshot numbers
+  - [ ] delegation_result messages
+  - [ ] assistant message (final answer)
+- [ ] Graders pass with orchestrator-executor (no "no_screenshots" error)
+- [ ] metadata.json has accurate `total_steps` count
+- [ ] Error/warning capture works for both patterns
+
+---
+
+## Future Considerations
+
+1. **New Agent Patterns:** Any new agent type just needs to:
+   - Accept hooks in constructor or via setter
+   - Fire hooks at appropriate points
+   - Use shared capture infrastructure
+
+2. **Grader Updates:** May need to update graders to understand delegation messages
+
+3. **Parallel Executors:** If orchestrator delegates to multiple executors in parallel, need to handle concurrent screenshot capture
+
+4. **Memory/Performance:** Screenshot capture creates MCP connection per capture - consider connection pooling for high-volume evals

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

@@ -0,0 +1,248 @@
+# BrowserOS Eval
+
+Evaluation framework for benchmarking BrowserOS browser automation agents. Runs tasks from standard datasets (WebVoyager, Mind2Web), captures trajectories with screenshots, and grades results automatically.
+
+## Prerequisites
+
+- **BrowserOS binary** installed at `/Applications/BrowserOS.app` (macOS)
+- **Bun** runtime
+- **API keys** for your chosen LLM provider and grader model
+
+## Quick Start
+
+### 1. Set up environment
+
+```bash
+cd apps/eval
+```
+
+Edit `.env.development` and add your API keys:
+
+```bash
+# Pick ONE provider for the orchestrator (whichever you have access to)
+OPENAI_API_KEY=sk-xxxxx
+ANTHROPIC_API_KEY=sk-ant-xxxxx
+FIREWORKS_API_KEY=fw_xxxxx
+GOOGLE_API_KEY=AIza-xxxxx
+
+# For grading results (OpenRouter recommended — gives access to many models)
+OPENROUTER_API_KEY=sk-or-v1-xxxxx
+```
+
+### 2. Launch the dashboard
+
+```bash
+bun run eval
+```
+
+Opens the **Eval Dashboard** at `http://localhost:9900` in config mode.
+
+### 3. Configure and run
+
+From the dashboard:
+
+1. **Load a preset** — select from the dropdown or click **Load File** to import a config JSON
+2. **Edit settings** — change agent type, provider, model, API keys, dataset, workers, timeouts
+3. **Save Config** — export your configuration for reuse
+4. **Click Run** — starts the evaluation with live progress
+
+### Alternative: Run from CLI
+
+```bash
+bun run eval -c configs/orchestrator-executor-clado-test.json
+```
+
+Runs immediately. Dashboard still available at `http://localhost:9900` for live progress.
+
+## Agent Types
+
+### Orchestrator-Executor with Clado
+
+The recommended architecture for visual model evals. Two tiers:
+
+- **Orchestrator** — An LLM that plans and issues high-level instructions
+- **Executor** — The **Clado Action** visual model that takes screenshots and predicts click/type/scroll coordinates
+
+The orchestrator works with **any LLM provider**. Pick whichever you have access to:
+
+#### OpenAI orchestrator
+
+```json
+{
+  "agent": {
+    "type": "orchestrator-executor",
+    "orchestrator": {
+      "provider": "openai",
+      "model": "gpt-4o",
+      "apiKey": "OPENAI_API_KEY"
+    },
+    "executor": {
+      "provider": "clado-action",
+      "model": "qwen3-vl-30b-a3b-instruct",
+      "apiKey": "",
+      "baseUrl": "https://clado-ai--clado-browseros-action-actionmodel-generate.modal.run"
+    }
+  },
+  "dataset": "../data/webvoyager_e2e_test.jsonl",
+  "output_dir": "../results/oe-clado-openai",
+  "num_workers": 3,
+  "browseros": {
+    "server_url": "http://127.0.0.1:9110",
+    "base_cdp_port": 9010,
+    "base_server_port": 9110,
+    "base_extension_port": 9310,
+    "headless": true
+  },
+  "grader_api_key_env": "OPENROUTER_API_KEY",
+  "grader_base_url": "https://openrouter.ai/api/v1",
+  "grader_model": "openai/gpt-4.1",
+  "timeout_ms": 1200000
+}
+```
+
+#### Anthropic orchestrator
+
+```json
+"orchestrator": {
+  "provider": "anthropic",
+  "model": "claude-sonnet-4-20250514",
+  "apiKey": "ANTHROPIC_API_KEY"
+}
+```
+
+#### Google orchestrator
+
+```json
+"orchestrator": {
+  "provider": "google",
+  "model": "gemini-2.0-flash",
+  "apiKey": "GOOGLE_API_KEY"
+}
+```
+
+#### Fireworks orchestrator (OpenAI-compatible)
+
+```json
+"orchestrator": {
+  "provider": "openai-compatible",
+  "model": "accounts/fireworks/models/kimi-k2p5",
+  "apiKey": "FIREWORKS_API_KEY",
+  "baseUrl": "https://api.fireworks.ai/inference/v1"
+}
+```
+
+The executor config stays the same across all orchestrator providers — it always uses the Clado action model.
+
+### Other Agent Types
+
+| Type | Description | Example config |
+|------|-------------|----------------|
+| `single` | Single LLM agent via Gemini CLI + MCP | `webvoyager-test.json` |
+| `tool-loop` | AI SDK tool loop, connects via CDP | `tool-loop-test.json` |
+| `gemini-computer-use` | Google native computer use API | `gemini-computer-use.json` |
+| `yutori-navigator` | Yutori N1 visual model | `yutori-navigator.json` |
+
+## Configuration Reference
+
+### API keys
+
+The `apiKey` field supports two formats:
+- **Env var name**: `"OPENAI_API_KEY"` — resolved from `.env.development` at runtime
+- **Direct value**: `"sk-xxxxx"` — used as-is (not recommended, prefer env vars)
+
+### Supported providers
+
+| Provider | `provider` value | Requires `baseUrl` |
+|----------|------------------|--------------------|
+| OpenAI | `openai` | No |
+| Anthropic | `anthropic` | No |
+| Google | `google` | No |
+| Azure OpenAI | `azure` | Yes |
+| AWS Bedrock | `bedrock` | No (uses `region`, `accessKeyId`, `secretAccessKey`) |
+| OpenRouter | `openrouter` | No |
+| Fireworks, Together, etc. | `openai-compatible` | Yes |
+| Ollama | `ollama` | No |
+| Clado Action (executor only) | `clado-action` | Yes |
+
+### BrowserOS infrastructure
+
+```json
+"browseros": {
+  "server_url": "http://127.0.0.1:9110",
+  "base_cdp_port": 9010,
+  "base_server_port": 9110,
+  "base_extension_port": 9310,
+  "load_extensions": false,
+  "headless": true
+}
+```
+
+Each worker gets its own Chrome instance. Worker N uses `base_port + N` for CDP, server, and extension ports.
+
+### Execution settings
+
+| Field | Description | Default |
+|-------|-------------|---------|
+| `num_workers` | Parallel workers (each gets its own Chrome) | `1` |
+| `timeout_ms` | Per-task timeout in ms | `900000` (15 min) |
+| `restart_server_per_task` | Restart Chrome between tasks (cleaner state, slower) | `false` |
+
+### Grading
+
+Results are auto-graded after each task. The grader uses an LLM judge.
+
+| Field | Description |
+|-------|-------------|
+| `grader_model` | Model for grading (e.g., `openai/gpt-4.1`) |
+| `grader_api_key_env` | Env var name for grader API key |
+| `grader_base_url` | API endpoint (e.g., `https://openrouter.ai/api/v1`) |
+
+## Datasets
+
+| File | Tasks | Description |
+|------|-------|-------------|
+| `webvoyager_e2e_test.jsonl` | 10 | WebVoyager test subset (quick smoke test) |
+| `webvoyager.jsonl` | 643 | Full WebVoyager benchmark |
+| `mind2web_e2e_test.jsonl` | 10 | Mind2Web test subset |
+| `mind2web.jsonl` | 300 | Full Mind2Web benchmark |
+
+Task format (JSONL, one per line):
+
+```json
+{
+  "query_id": "Amazon--0",
+  "dataset": "webvoyager",
+  "query": "Search an Xbox Wireless controller with green color and rated above 4 stars.",
+  "graders": ["webvoyager_grader", "fara_combined"],
+  "start_url": "https://www.amazon.com/",
+  "metadata": { "original_task_id": "Amazon--0", "website": "Amazon" }
+}
+```
+
+## Output
+
+Results are saved to `output_dir`:
+
+```
+results/
+  oe-clado-openai/
+    Amazon--0/
+      metadata.json         # Task result, timing, grader scores
+      messages.jsonl         # Full message log
+      screenshots/
+        001.png              # Step-by-step screenshots
+        002.png
+    summary.json             # Aggregate pass rates
+```
+
+## Troubleshooting
+
+**BrowserOS not found**: Expects `/Applications/BrowserOS.app/Contents/MacOS/BrowserOS`. Make sure it's installed.
+
+**Port conflicts**: Each worker uses `base_port + workerIndex`. 3 workers on base 9110 → ports 9110, 9111, 9112. Stop other BrowserOS instances first.
+
+**API key not resolving**: If your config has `"apiKey": "OPENAI_API_KEY"`, ensure the env var is set in `.env.development`.
+
+**Tasks timing out**: Increase `timeout_ms`. Default is 15 minutes; complex tasks may need 20+ minutes.
+
+**Headless vs headed**: Set `"headless": false` to watch Chrome in real-time. Useful for debugging.

packages/browseros-agent/apps/eval/config.json

@@ -0,0 +1,18 @@
+{
+  "agent": {
+    "type": "single",
+    "provider": "openrouter",
+    "model": "openai/gpt-4o",
+    "apiKey": "OPENROUTER_API_KEY"
+  },
+  "dataset": "data/webvoyager_e2e_test.jsonl",
+  "output_dir": "results",
+  "num_workers": 5,
+  "browseros": {
+    "server_url": "http://127.0.0.1:9110"
+  },
+  "grader_api_key_env": "OPENROUTER_API_KEY",
+  "grader_base_url": "https://openrouter.ai/api/v1",
+  "grader_model": "openai/gpt-4.1",
+  "timeout_ms": 300000
+}