diff --git a/.agents/skills/agent-browser/SKILL.md b/.agents/skills/agent-browser/SKILL.md
index ab3ea3c..680828d 100644
--- a/.agents/skills/agent-browser/SKILL.md
+++ b/.agents/skills/agent-browser/SKILL.md
@@ -1,265 +1,24 @@
 ---
 name: agent-browser
-description: Automates browser interactions for web testing, form filling, screenshots, and data extraction. Use when the user needs to navigate websites, interact with web pages, fill forms, take screenshots, test web applications, or extract information from web pages.
-allowed-tools: Bash(agent-browser:*)
+description: Browser automation CLI for AI agents. Use when the user needs to interact with websites, including navigating pages, filling forms, clicking buttons, taking screenshots, extracting data, testing web apps, or automating any browser task. Triggers include requests to "open a website", "fill out a form", "click a button", "take a screenshot", "scrape data from a page", "test this web app", "login to a site", "automate browser actions", or any task requiring programmatic web interaction.
+allowed-tools: Bash(npx agent-browser:*), Bash(agent-browser:*)
 ---
 
 # Browser Automation with agent-browser
 
-## Quick start
+## Core Workflow
 
-```bash
-agent-browser open <url>        # Navigate to page
-agent-browser snapshot -i       # Get interactive elements with refs
-agent-browser click @e1         # Click element by ref
-agent-browser fill @e2 "text"   # Fill input by ref
-agent-browser close             # Close browser
-```
+Every browser automation follows this pattern:
 
-## Core workflow
-
-1. Navigate: `agent-browser open <url>`
-2. Snapshot: `agent-browser snapshot -i` (returns elements with refs like `@e1`, `@e2`)
-3. Interact using refs from the snapshot
-4. Re-snapshot after navigation or significant DOM changes
-
-## Commands
-
-### Navigation
-
-```bash
-agent-browser open <url>      # Navigate to URL (aliases: goto, navigate)
-                              # Supports: https://, http://, file://, about:, data://
-                              # Auto-prepends https:// if no protocol given
-agent-browser back            # Go back
-agent-browser forward         # Go forward
-agent-browser reload          # Reload page
-agent-browser close           # Close browser (aliases: quit, exit)
-agent-browser connect 9222    # Connect to browser via CDP port
-```
-
-### Snapshot (page analysis)
-
-```bash
-agent-browser snapshot            # Full accessibility tree
-agent-browser snapshot -i         # Interactive elements only (recommended)
-agent-browser snapshot -c         # Compact output
-agent-browser snapshot -d 3       # Limit depth to 3
-agent-browser snapshot -s "#main" # Scope to CSS selector
-```
-
-### Interactions (use @refs from snapshot)
-
-```bash
-agent-browser click @e1           # Click
-agent-browser dblclick @e1        # Double-click
-agent-browser focus @e1           # Focus element
-agent-browser fill @e2 "text"     # Clear and type
-agent-browser type @e2 "text"     # Type without clearing
-agent-browser press Enter         # Press key (alias: key)
-agent-browser press Control+a     # Key combination
-agent-browser keydown Shift       # Hold key down
-agent-browser keyup Shift         # Release key
-agent-browser hover @e1           # Hover
-agent-browser check @e1           # Check checkbox
-agent-browser uncheck @e1         # Uncheck checkbox
-agent-browser select @e1 "value"  # Select dropdown option
-agent-browser select @e1 "a" "b"  # Select multiple options
-agent-browser scroll down 500     # Scroll page (default: down 300px)
-agent-browser scrollintoview @e1  # Scroll element into view (alias: scrollinto)
-agent-browser drag @e1 @e2        # Drag and drop
-agent-browser upload @e1 file.pdf # Upload files
-```
-
-### Get information
-
-```bash
-agent-browser get text @e1        # Get element text
-agent-browser get html @e1        # Get innerHTML
-agent-browser get value @e1       # Get input value
-agent-browser get attr @e1 href   # Get attribute
-agent-browser get title           # Get page title
-agent-browser get url             # Get current URL
-agent-browser get count ".item"   # Count matching elements
-agent-browser get box @e1         # Get bounding box
-agent-browser get styles @e1      # Get computed styles (font, color, bg, etc.)
-```
-
-### Check state
-
-```bash
-agent-browser is visible @e1      # Check if visible
-agent-browser is enabled @e1      # Check if enabled
-agent-browser is checked @e1      # Check if checked
-```
-
-### Screenshots & PDF
-
-```bash
-agent-browser screenshot          # Save to a temporary directory
-agent-browser screenshot path.png # Save to a specific path
-agent-browser screenshot --full   # Full page
-agent-browser pdf output.pdf      # Save as PDF
-```
-
-### Video recording
-
-```bash
-agent-browser record start ./demo.webm    # Start recording (uses current URL + state)
-agent-browser click @e1                   # Perform actions
-agent-browser record stop                 # Stop and save video
-agent-browser record restart ./take2.webm # Stop current + start new recording
-```
-
-Recording creates a fresh context but preserves cookies/storage from your session. If no URL is provided, it
-automatically returns to your current page. For smooth demos, explore first, then start recording.
-
-### Wait
-
-```bash
-agent-browser wait @e1                     # Wait for element
-agent-browser wait 2000                    # Wait milliseconds
-agent-browser wait --text "Success"        # Wait for text (or -t)
-agent-browser wait --url "**/dashboard"    # Wait for URL pattern (or -u)
-agent-browser wait --load networkidle      # Wait for network idle (or -l)
-agent-browser wait --fn "window.ready"     # Wait for JS condition (or -f)
-```
-
-### Mouse control
-
-```bash
-agent-browser mouse move 100 200      # Move mouse
-agent-browser mouse down left         # Press button
-agent-browser mouse up left           # Release button
-agent-browser mouse wheel 100         # Scroll wheel
-```
-
-### Semantic locators (alternative to refs)
-
-```bash
-agent-browser find role button click --name "Submit"
-agent-browser find text "Sign In" click
-agent-browser find text "Sign In" click --exact      # Exact match only
-agent-browser find label "Email" fill "user@test.com"
-agent-browser find placeholder "Search" type "query"
-agent-browser find alt "Logo" click
-agent-browser find title "Close" click
-agent-browser find testid "submit-btn" click
-agent-browser find first ".item" click
-agent-browser find last ".item" click
-agent-browser find nth 2 "a" hover
-```
-
-### Browser settings
-
-```bash
-agent-browser set viewport 1920 1080          # Set viewport size
-agent-browser set device "iPhone 14"          # Emulate device
-agent-browser set geo 37.7749 -122.4194       # Set geolocation (alias: geolocation)
-agent-browser set offline on                  # Toggle offline mode
-agent-browser set headers '{"X-Key":"v"}'     # Extra HTTP headers
-agent-browser set credentials user pass       # HTTP basic auth (alias: auth)
-agent-browser set media dark                  # Emulate color scheme
-agent-browser set media light reduced-motion  # Light mode + reduced motion
-```
-
-### Cookies & Storage
-
-```bash
-agent-browser cookies                     # Get all cookies
-agent-browser cookies set name value      # Set cookie
-agent-browser cookies clear               # Clear cookies
-agent-browser storage local               # Get all localStorage
-agent-browser storage local key           # Get specific key
-agent-browser storage local set k v       # Set value
-agent-browser storage local clear         # Clear all
-```
-
-### Network
-
-```bash
-agent-browser network route <url>              # Intercept requests
-agent-browser network route <url> --abort      # Block requests
-agent-browser network route <url> --body '{}'  # Mock response
-agent-browser network unroute [url]            # Remove routes
-agent-browser network requests                 # View tracked requests
-agent-browser network requests --filter api    # Filter requests
-```
-
-### Tabs & Windows
-
-```bash
-agent-browser tab                 # List tabs
-agent-browser tab new [url]       # New tab
-agent-browser tab 2               # Switch to tab by index
-agent-browser tab close           # Close current tab
-agent-browser tab close 2         # Close tab by index
-agent-browser window new          # New window
-```
-
-### Frames
-
-```bash
-agent-browser frame "#iframe"     # Switch to iframe
-agent-browser frame main          # Back to main frame
-```
-
-### Dialogs
-
-```bash
-agent-browser dialog accept [text]  # Accept dialog
-agent-browser dialog dismiss        # Dismiss dialog
-```
-
-### JavaScript
-
-```bash
-agent-browser eval "document.title"   # Run JavaScript
-```
-
-## Global options
-
-```bash
-agent-browser --session <name> ...    # Isolated browser session
-agent-browser --json ...              # JSON output for parsing
-agent-browser --headed ...            # Show browser window (not headless)
-agent-browser --full ...              # Full page screenshot (-f)
-agent-browser --cdp <port> ...        # Connect via Chrome DevTools Protocol
-agent-browser -p <provider> ...       # Cloud browser provider (--provider)
-agent-browser --proxy <url> ...       # Use proxy server
-agent-browser --headers <json> ...    # HTTP headers scoped to URL's origin
-agent-browser --executable-path <p>   # Custom browser executable
-agent-browser --extension <path> ...  # Load browser extension (repeatable)
-agent-browser --help                  # Show help (-h)
-agent-browser --version               # Show version (-V)
-agent-browser <command> --help        # Show detailed help for a command
-```
-
-### Proxy support
-
-```bash
-agent-browser --proxy http://proxy.com:8080 open example.com
-agent-browser --proxy http://user:pass@proxy.com:8080 open example.com
-agent-browser --proxy socks5://proxy.com:1080 open example.com
-```
-
-## Environment variables
-
-```bash
-AGENT_BROWSER_SESSION="mysession"            # Default session name
-AGENT_BROWSER_EXECUTABLE_PATH="/path/chrome" # Custom browser path
-AGENT_BROWSER_EXTENSIONS="/ext1,/ext2"       # Comma-separated extension paths
-AGENT_BROWSER_PROVIDER="your-cloud-browser-provider"  # Cloud browser provider (select browseruse or browserbase)
-AGENT_BROWSER_STREAM_PORT="9223"             # WebSocket streaming port
-AGENT_BROWSER_HOME="/path/to/agent-browser"  # Custom install location (for daemon.js)
-```
-
-## Example: Form submission
+1. **Navigate**: `agent-browser open <url>`
+2. **Snapshot**: `agent-browser snapshot -i` (get element refs like `@e1`, `@e2`)
+3. **Interact**: Use refs to click, fill, select
+4. **Re-snapshot**: After navigation or DOM changes, get fresh refs
 
 ```bash
 agent-browser open https://example.com/form
 agent-browser snapshot -i
-# Output shows: textbox "Email" [ref=e1], textbox "Password" [ref=e2], button "Submit" [ref=e3]
+# Output: @e1 [input type="email"], @e2 [input type="password"], @e3 [button] "Submit"
 
 agent-browser fill @e1 "user@example.com"
 agent-browser fill @e2 "password123"
@@ -268,72 +27,504 @@ agent-browser wait --load networkidle
 agent-browser snapshot -i  # Check result
 ```
 
-## Example: Authentication with saved state
+## Command Chaining
+
+Commands can be chained with `&&` in a single shell invocation. The browser persists between commands via a background daemon, so chaining is safe and more efficient than separate calls.
 
 ```bash
-# Login once
+# Chain open + wait + snapshot in one call
+agent-browser open https://example.com && agent-browser wait --load networkidle && agent-browser snapshot -i
+
+# Chain multiple interactions
+agent-browser fill @e1 "user@example.com" && agent-browser fill @e2 "password123" && agent-browser click @e3
+
+# Navigate and capture
+agent-browser open https://example.com && agent-browser wait --load networkidle && agent-browser screenshot page.png
+```
+
+**When to chain:** Use `&&` when you don't need to read the output of an intermediate command before proceeding (e.g., open + wait + screenshot). Run commands separately when you need to parse the output first (e.g., snapshot to discover refs, then interact using those refs).
+
+## Essential Commands
+
+```bash
+# Navigation
+agent-browser open <url>              # Navigate (aliases: goto, navigate)
+agent-browser close                   # Close browser
+
+# Snapshot
+agent-browser snapshot -i             # Interactive elements with refs (recommended)
+agent-browser snapshot -i -C          # Include cursor-interactive elements (divs with onclick, cursor:pointer)
+agent-browser snapshot -s "#selector" # Scope to CSS selector
+
+# Interaction (use @refs from snapshot)
+agent-browser click @e1               # Click element
+agent-browser click @e1 --new-tab     # Click and open in new tab
+agent-browser fill @e2 "text"         # Clear and type text
+agent-browser type @e2 "text"         # Type without clearing
+agent-browser select @e1 "option"     # Select dropdown option
+agent-browser check @e1               # Check checkbox
+agent-browser press Enter             # Press key
+agent-browser keyboard type "text"    # Type at current focus (no selector)
+agent-browser keyboard inserttext "text"  # Insert without key events
+agent-browser scroll down 500         # Scroll page
+agent-browser scroll down 500 --selector "div.content"  # Scroll within a specific container
+
+# Get information
+agent-browser get text @e1            # Get element text
+agent-browser get url                 # Get current URL
+agent-browser get title               # Get page title
+
+# Wait
+agent-browser wait @e1                # Wait for element
+agent-browser wait --load networkidle # Wait for network idle
+agent-browser wait --url "**/page"    # Wait for URL pattern
+agent-browser wait 2000               # Wait milliseconds
+
+# Downloads
+agent-browser download @e1 ./file.pdf          # Click element to trigger download
+agent-browser wait --download ./output.zip     # Wait for any download to complete
+agent-browser --download-path ./downloads open <url>  # Set default download directory
+
+# Capture
+agent-browser screenshot              # Screenshot to temp dir
+agent-browser screenshot --full       # Full page screenshot
+agent-browser screenshot --annotate   # Annotated screenshot with numbered element labels
+agent-browser pdf output.pdf          # Save as PDF
+
+# Diff (compare page states)
+agent-browser diff snapshot                          # Compare current vs last snapshot
+agent-browser diff snapshot --baseline before.txt    # Compare current vs saved file
+agent-browser diff screenshot --baseline before.png  # Visual pixel diff
+agent-browser diff url <url1> <url2>                 # Compare two pages
+agent-browser diff url <url1> <url2> --wait-until networkidle  # Custom wait strategy
+agent-browser diff url <url1> <url2> --selector "#main"  # Scope to element
+```
+
+## Common Patterns
+
+### Form Submission
+
+```bash
+agent-browser open https://example.com/signup
+agent-browser snapshot -i
+agent-browser fill @e1 "Jane Doe"
+agent-browser fill @e2 "jane@example.com"
+agent-browser select @e3 "California"
+agent-browser check @e4
+agent-browser click @e5
+agent-browser wait --load networkidle
+```
+
+### Authentication with Auth Vault (Recommended)
+
+```bash
+# Save credentials once (encrypted with AGENT_BROWSER_ENCRYPTION_KEY)
+# Recommended: pipe password via stdin to avoid shell history exposure
+echo "pass" | agent-browser auth save github --url https://github.com/login --username user --password-stdin
+
+# Login using saved profile (LLM never sees password)
+agent-browser auth login github
+
+# List/show/delete profiles
+agent-browser auth list
+agent-browser auth show github
+agent-browser auth delete github
+```
+
+### Authentication with State Persistence
+
+```bash
+# Login once and save state
 agent-browser open https://app.example.com/login
 agent-browser snapshot -i
-agent-browser fill @e1 "username"
-agent-browser fill @e2 "password"
+agent-browser fill @e1 "$USERNAME"
+agent-browser fill @e2 "$PASSWORD"
 agent-browser click @e3
 agent-browser wait --url "**/dashboard"
 agent-browser state save auth.json
 
-# Later sessions: load saved state
+# Reuse in future sessions
 agent-browser state load auth.json
 agent-browser open https://app.example.com/dashboard
 ```
 
-## Sessions (parallel browsers)
+### Session Persistence
 
 ```bash
-agent-browser --session test1 open site-a.com
-agent-browser --session test2 open site-b.com
-agent-browser session list
+# Auto-save/restore cookies and localStorage across browser restarts
+agent-browser --session-name myapp open https://app.example.com/login
+# ... login flow ...
+agent-browser close  # State auto-saved to ~/.agent-browser/sessions/
+
+# Next time, state is auto-loaded
+agent-browser --session-name myapp open https://app.example.com/dashboard
+
+# Encrypt state at rest
+export AGENT_BROWSER_ENCRYPTION_KEY=$(openssl rand -hex 32)
+agent-browser --session-name secure open https://app.example.com
+
+# Manage saved states
+agent-browser state list
+agent-browser state show myapp-default.json
+agent-browser state clear myapp
+agent-browser state clean --older-than 7
 ```
 
-## JSON output (for parsing)
-
-Add `--json` for machine-readable output:
+### Data Extraction
 
 ```bash
+agent-browser open https://example.com/products
+agent-browser snapshot -i
+agent-browser get text @e5           # Get specific element text
+agent-browser get text body > page.txt  # Get all page text
+
+# JSON output for parsing
 agent-browser snapshot -i --json
 agent-browser get text @e1 --json
 ```
 
-## Debugging
+### Parallel Sessions
 
 ```bash
-agent-browser --headed open example.com   # Show browser window
-agent-browser --cdp 9222 snapshot         # Connect via CDP port
-agent-browser connect 9222                # Alternative: connect command
-agent-browser console                     # View console messages
-agent-browser console --clear             # Clear console
-agent-browser errors                      # View page errors
-agent-browser errors --clear              # Clear errors
-agent-browser highlight @e1               # Highlight element
-agent-browser trace start                 # Start recording trace
-agent-browser trace stop trace.zip        # Stop and save trace
-agent-browser record start ./debug.webm   # Record video from current page
-agent-browser record stop                 # Save recording
+agent-browser --session site1 open https://site-a.com
+agent-browser --session site2 open https://site-b.com
+
+agent-browser --session site1 snapshot -i
+agent-browser --session site2 snapshot -i
+
+agent-browser session list
 ```
 
-## Deep-dive documentation
+### Connect to Existing Chrome
 
-For detailed patterns and best practices, see:
+```bash
+# Auto-discover running Chrome with remote debugging enabled
+agent-browser --auto-connect open https://example.com
+agent-browser --auto-connect snapshot
 
-| Reference | Description |
+# Or with explicit CDP port
+agent-browser --cdp 9222 snapshot
+```
+
+### Color Scheme (Dark Mode)
+
+```bash
+# Persistent dark mode via flag (applies to all pages and new tabs)
+agent-browser --color-scheme dark open https://example.com
+
+# Or via environment variable
+AGENT_BROWSER_COLOR_SCHEME=dark agent-browser open https://example.com
+
+# Or set during session (persists for subsequent commands)
+agent-browser set media dark
+```
+
+### Visual Browser (Debugging)
+
+```bash
+agent-browser --headed open https://example.com
+agent-browser highlight @e1          # Highlight element
+agent-browser record start demo.webm # Record session
+agent-browser profiler start         # Start Chrome DevTools profiling
+agent-browser profiler stop trace.json # Stop and save profile (path optional)
+```
+
+Use `AGENT_BROWSER_HEADED=1` to enable headed mode via environment variable. Browser extensions work in both headed and headless mode.
+
+### Local Files (PDFs, HTML)
+
+```bash
+# Open local files with file:// URLs
+agent-browser --allow-file-access open file:///path/to/document.pdf
+agent-browser --allow-file-access open file:///path/to/page.html
+agent-browser screenshot output.png
+```
+
+### iOS Simulator (Mobile Safari)
+
+```bash
+# List available iOS simulators
+agent-browser device list
+
+# Launch Safari on a specific device
+agent-browser -p ios --device "iPhone 16 Pro" open https://example.com
+
+# Same workflow as desktop - snapshot, interact, re-snapshot
+agent-browser -p ios snapshot -i
+agent-browser -p ios tap @e1          # Tap (alias for click)
+agent-browser -p ios fill @e2 "text"
+agent-browser -p ios swipe up         # Mobile-specific gesture
+
+# Take screenshot
+agent-browser -p ios screenshot mobile.png
+
+# Close session (shuts down simulator)
+agent-browser -p ios close
+```
+
+**Requirements:** macOS with Xcode, Appium (`npm install -g appium && appium driver install xcuitest`)
+
+**Real devices:** Works with physical iOS devices if pre-configured. Use `--device "<UDID>"` where UDID is from `xcrun xctrace list devices`.
+
+## Security
+
+All security features are opt-in. By default, agent-browser imposes no restrictions on navigation, actions, or output.
+
+### Content Boundaries (Recommended for AI Agents)
+
+Enable `--content-boundaries` to wrap page-sourced output in markers that help LLMs distinguish tool output from untrusted page content:
+
+```bash
+export AGENT_BROWSER_CONTENT_BOUNDARIES=1
+agent-browser snapshot
+# Output:
+# --- AGENT_BROWSER_PAGE_CONTENT nonce=<hex> origin=https://example.com ---
+# [accessibility tree]
+# --- END_AGENT_BROWSER_PAGE_CONTENT nonce=<hex> ---
+```
+
+### Domain Allowlist
+
+Restrict navigation to trusted domains. Wildcards like `*.example.com` also match the bare domain `example.com`. Sub-resource requests, WebSocket, and EventSource connections to non-allowed domains are also blocked. Include CDN domains your target pages depend on:
+
+```bash
+export AGENT_BROWSER_ALLOWED_DOMAINS="example.com,*.example.com"
+agent-browser open https://example.com        # OK
+agent-browser open https://malicious.com       # Blocked
+```
+
+### Action Policy
+
+Use a policy file to gate destructive actions:
+
+```bash
+export AGENT_BROWSER_ACTION_POLICY=./policy.json
+```
+
+Example `policy.json`:
+```json
+{"default": "deny", "allow": ["navigate", "snapshot", "click", "scroll", "wait", "get"]}
+```
+
+Auth vault operations (`auth login`, etc.) bypass action policy but domain allowlist still applies.
+
+### Output Limits
+
+Prevent context flooding from large pages:
+
+```bash
+export AGENT_BROWSER_MAX_OUTPUT=50000
+```
+
+## Diffing (Verifying Changes)
+
+Use `diff snapshot` after performing an action to verify it had the intended effect. This compares the current accessibility tree against the last snapshot taken in the session.
+
+```bash
+# Typical workflow: snapshot -> action -> diff
+agent-browser snapshot -i          # Take baseline snapshot
+agent-browser click @e2            # Perform action
+agent-browser diff snapshot        # See what changed (auto-compares to last snapshot)
+```
+
+For visual regression testing or monitoring:
+
+```bash
+# Save a baseline screenshot, then compare later
+agent-browser screenshot baseline.png
+# ... time passes or changes are made ...
+agent-browser diff screenshot --baseline baseline.png
+
+# Compare staging vs production
+agent-browser diff url https://staging.example.com https://prod.example.com --screenshot
+```
+
+`diff snapshot` output uses `+` for additions and `-` for removals, similar to git diff. `diff screenshot` produces a diff image with changed pixels highlighted in red, plus a mismatch percentage.
+
+## Timeouts and Slow Pages
+
+The default Playwright timeout is 25 seconds for local browsers. This can be overridden with the `AGENT_BROWSER_DEFAULT_TIMEOUT` environment variable (value in milliseconds). For slow websites or large pages, use explicit waits instead of relying on the default timeout:
+
+```bash
+# Wait for network activity to settle (best for slow pages)
+agent-browser wait --load networkidle
+
+# Wait for a specific element to appear
+agent-browser wait "#content"
+agent-browser wait @e1
+
+# Wait for a specific URL pattern (useful after redirects)
+agent-browser wait --url "**/dashboard"
+
+# Wait for a JavaScript condition
+agent-browser wait --fn "document.readyState === 'complete'"
+
+# Wait a fixed duration (milliseconds) as a last resort
+agent-browser wait 5000
+```
+
+When dealing with consistently slow websites, use `wait --load networkidle` after `open` to ensure the page is fully loaded before taking a snapshot. If a specific element is slow to render, wait for it directly with `wait <selector>` or `wait @ref`.
+
+## Session Management and Cleanup
+
+When running multiple agents or automations concurrently, always use named sessions to avoid conflicts:
+
+```bash
+# Each agent gets its own isolated session
+agent-browser --session agent1 open site-a.com
+agent-browser --session agent2 open site-b.com
+
+# Check active sessions
+agent-browser session list
+```
+
+Always close your browser session when done to avoid leaked processes:
+
+```bash
+agent-browser close                    # Close default session
+agent-browser --session agent1 close   # Close specific session
+```
+
+If a previous session was not closed properly, the daemon may still be running. Use `agent-browser close` to clean it up before starting new work.
+
+## Ref Lifecycle (Important)
+
+Refs (`@e1`, `@e2`, etc.) are invalidated when the page changes. Always re-snapshot after:
+
+- Clicking links or buttons that navigate
+- Form submissions
+- Dynamic content loading (dropdowns, modals)
+
+```bash
+agent-browser click @e5              # Navigates to new page
+agent-browser snapshot -i            # MUST re-snapshot
+agent-browser click @e1              # Use new refs
+```
+
+## Annotated Screenshots (Vision Mode)
+
+Use `--annotate` to take a screenshot with numbered labels overlaid on interactive elements. Each label `[N]` maps to ref `@eN`. This also caches refs, so you can interact with elements immediately without a separate snapshot.
+
+```bash
+agent-browser screenshot --annotate
+# Output includes the image path and a legend:
+#   [1] @e1 button "Submit"
+#   [2] @e2 link "Home"
+#   [3] @e3 textbox "Email"
+agent-browser click @e2              # Click using ref from annotated screenshot
+```
+
+Use annotated screenshots when:
+- The page has unlabeled icon buttons or visual-only elements
+- You need to verify visual layout or styling
+- Canvas or chart elements are present (invisible to text snapshots)
+- You need spatial reasoning about element positions
+
+## Semantic Locators (Alternative to Refs)
+
+When refs are unavailable or unreliable, use semantic locators:
+
+```bash
+agent-browser find text "Sign In" click
+agent-browser find label "Email" fill "user@test.com"
+agent-browser find role button click --name "Submit"
+agent-browser find placeholder "Search" type "query"
+agent-browser find testid "submit-btn" click
+```
+
+## JavaScript Evaluation (eval)
+
+Use `eval` to run JavaScript in the browser context. **Shell quoting can corrupt complex expressions** -- use `--stdin` or `-b` to avoid issues.
+
+```bash
+# Simple expressions work with regular quoting
+agent-browser eval 'document.title'
+agent-browser eval 'document.querySelectorAll("img").length'
+
+# Complex JS: use --stdin with heredoc (RECOMMENDED)
+agent-browser eval --stdin <<'EVALEOF'
+JSON.stringify(
+  Array.from(document.querySelectorAll("img"))
+    .filter(i => !i.alt)
+    .map(i => ({ src: i.src.split("/").pop(), width: i.width }))
+)
+EVALEOF
+
+# Alternative: base64 encoding (avoids all shell escaping issues)
+agent-browser eval -b "$(echo -n 'Array.from(document.querySelectorAll("a")).map(a => a.href)' | base64)"
+```
+
+**Why this matters:** When the shell processes your command, inner double quotes, `!` characters (history expansion), backticks, and `$()` can all corrupt the JavaScript before it reaches agent-browser. The `--stdin` and `-b` flags bypass shell interpretation entirely.
+
+**Rules of thumb:**
+- Single-line, no nested quotes -> regular `eval 'expression'` with single quotes is fine
+- Nested quotes, arrow functions, template literals, or multiline -> use `eval --stdin <<'EVALEOF'`
+- Programmatic/generated scripts -> use `eval -b` with base64
+
+## Configuration File
+
+Create `agent-browser.json` in the project root for persistent settings:
+
+```json
+{
+  "headed": true,
+  "proxy": "http://localhost:8080",
+  "profile": "./browser-data"
+}
+```
+
+Priority (lowest to highest): `~/.agent-browser/config.json` < `./agent-browser.json` < env vars < CLI flags. Use `--config <path>` or `AGENT_BROWSER_CONFIG` env var for a custom config file (exits with error if missing/invalid). All CLI options map to camelCase keys (e.g., `--executable-path` -> `"executablePath"`). Boolean flags accept `true`/`false` values (e.g., `--headed false` overrides config). Extensions from user and project configs are merged, not replaced.
+
+## Deep-Dive Documentation
+
+| Reference | When to Use |
 |-----------|-------------|
+| [references/commands.md](references/commands.md) | Full command reference with all options |
 | [references/snapshot-refs.md](references/snapshot-refs.md) | Ref lifecycle, invalidation rules, troubleshooting |
 | [references/session-management.md](references/session-management.md) | Parallel sessions, state persistence, concurrent scraping |
 | [references/authentication.md](references/authentication.md) | Login flows, OAuth, 2FA handling, state reuse |
 | [references/video-recording.md](references/video-recording.md) | Recording workflows for debugging and documentation |
+| [references/profiling.md](references/profiling.md) | Chrome DevTools profiling for performance analysis |
 | [references/proxy-support.md](references/proxy-support.md) | Proxy configuration, geo-testing, rotating proxies |
 
-## Ready-to-use templates
+## Experimental: Native Mode
 
-Executable workflow scripts for common patterns:
+agent-browser has an experimental native Rust daemon that communicates with Chrome directly via CDP, bypassing Node.js and Playwright entirely. It is opt-in and not recommended for production use yet.
+
+```bash
+# Enable via flag
+agent-browser --native open example.com
+
+# Enable via environment variable (avoids passing --native every time)
+export AGENT_BROWSER_NATIVE=1
+agent-browser open example.com
+```
+
+The native daemon supports Chromium and Safari (via WebDriver). Firefox and WebKit are not yet supported. All core commands (navigate, snapshot, click, fill, screenshot, cookies, storage, tabs, eval, etc.) work identically in native mode. Use `agent-browser close` before switching between native and default mode within the same session.
+
+## Browser Engine Selection
+
+Use `--engine` to choose a local browser engine. The default is `chrome`.
+
+```bash
+# Use Lightpanda (fast headless browser, requires separate install)
+agent-browser --engine lightpanda open example.com
+
+# Via environment variable
+export AGENT_BROWSER_ENGINE=lightpanda
+agent-browser open example.com
+
+# With custom binary path
+agent-browser --engine lightpanda --executable-path /path/to/lightpanda open example.com
+```
+
+Supported engines:
+- `chrome` (default) -- Chrome/Chromium via CDP
+- `lightpanda` -- Lightpanda headless browser via CDP (10x faster, 10x less memory than Chrome)
+
+Lightpanda does not support `--extension`, `--profile`, `--state`, or `--allow-file-access`. Install Lightpanda from https://lightpanda.io/docs/open-source/installation.
+
+## Ready-to-Use Templates
 
 | Template | Description |
 |----------|-------------|
@@ -341,16 +532,8 @@ Executable workflow scripts for common patterns:
 | [templates/authenticated-session.sh](templates/authenticated-session.sh) | Login once, reuse state |
 | [templates/capture-workflow.sh](templates/capture-workflow.sh) | Content extraction with screenshots |
 
-Usage:
 ```bash
 ./templates/form-automation.sh https://example.com/form
 ./templates/authenticated-session.sh https://app.example.com/login
 ./templates/capture-workflow.sh https://example.com ./output
 ```
-
-## HTTPS Certificate Errors
-
-For sites with self-signed or invalid certificates:
-```bash
-agent-browser open https://localhost:8443 --ignore-https-errors
-```
diff --git a/.agents/skills/agent-browser/references/authentication.md b/.agents/skills/agent-browser/references/authentication.md
index 5d801f6..12ef5e4 100644
--- a/.agents/skills/agent-browser/references/authentication.md
+++ b/.agents/skills/agent-browser/references/authentication.md
@@ -1,6 +1,20 @@
 # Authentication Patterns
 
-Patterns for handling login flows, session persistence, and authenticated browsing.
+Login flows, session persistence, OAuth, 2FA, and authenticated browsing.
+
+**Related**: [session-management.md](session-management.md) for state persistence details, [SKILL.md](../SKILL.md) for quick start.
+
+## Contents
+
+- [Basic Login Flow](#basic-login-flow)
+- [Saving Authentication State](#saving-authentication-state)
+- [Restoring Authentication](#restoring-authentication)
+- [OAuth / SSO Flows](#oauth--sso-flows)
+- [Two-Factor Authentication](#two-factor-authentication)
+- [HTTP Basic Auth](#http-basic-auth)
+- [Cookie-Based Auth](#cookie-based-auth)
+- [Token Refresh Handling](#token-refresh-handling)
+- [Security Best Practices](#security-best-practices)
 
 ## Basic Login Flow
 
diff --git a/.agents/skills/agent-browser/references/proxy-support.md b/.agents/skills/agent-browser/references/proxy-support.md
index 05fcec2..e86a8fe 100644
--- a/.agents/skills/agent-browser/references/proxy-support.md
+++ b/.agents/skills/agent-browser/references/proxy-support.md
@@ -1,13 +1,29 @@
 # Proxy Support
 
-Configure proxy servers for browser automation, useful for geo-testing, rate limiting avoidance, and corporate environments.
+Proxy configuration for geo-testing, rate limiting avoidance, and corporate environments.
+
+**Related**: [commands.md](commands.md) for global options, [SKILL.md](../SKILL.md) for quick start.
+
+## Contents
+
+- [Basic Proxy Configuration](#basic-proxy-configuration)
+- [Authenticated Proxy](#authenticated-proxy)
+- [SOCKS Proxy](#socks-proxy)
+- [Proxy Bypass](#proxy-bypass)
+- [Common Use Cases](#common-use-cases)
+- [Verifying Proxy Connection](#verifying-proxy-connection)
+- [Troubleshooting](#troubleshooting)
+- [Best Practices](#best-practices)
 
 ## Basic Proxy Configuration
 
-Set proxy via environment variable before starting:
+Use the `--proxy` flag or set proxy via environment variable:
 
 ```bash
-# HTTP proxy
+# Via CLI flag
+agent-browser --proxy "http://proxy.example.com:8080" open https://example.com
+
+# Via environment variable
 export HTTP_PROXY="http://proxy.example.com:8080"
 agent-browser open https://example.com
 
@@ -45,10 +61,13 @@ agent-browser open https://example.com
 
 ## Proxy Bypass
 
-Skip proxy for specific domains:
+Skip proxy for specific domains using `--proxy-bypass` or `NO_PROXY`:
 
 ```bash
-# Bypass proxy for local addresses
+# Via CLI flag
+agent-browser --proxy "http://proxy.example.com:8080" --proxy-bypass "localhost,*.internal.com" open https://example.com
+
+# Via environment variable
 export NO_PROXY="localhost,127.0.0.1,.internal.company.com"
 agent-browser open https://internal.company.com  # Direct connection
 agent-browser open https://external.com          # Via proxy
diff --git a/.agents/skills/agent-browser/references/session-management.md b/.agents/skills/agent-browser/references/session-management.md
index cfc3362..bb5312d 100644
--- a/.agents/skills/agent-browser/references/session-management.md
+++ b/.agents/skills/agent-browser/references/session-management.md
@@ -1,6 +1,18 @@
 # Session Management
 
-Run multiple isolated browser sessions concurrently with state persistence.
+Multiple isolated browser sessions with state persistence and concurrent browsing.
+
+**Related**: [authentication.md](authentication.md) for login patterns, [SKILL.md](../SKILL.md) for quick start.
+
+## Contents
+
+- [Named Sessions](#named-sessions)
+- [Session Isolation Properties](#session-isolation-properties)
+- [Session State Persistence](#session-state-persistence)
+- [Common Patterns](#common-patterns)
+- [Default Session](#default-session)
+- [Session Cleanup](#session-cleanup)
+- [Best Practices](#best-practices)
 
 ## Named Sessions
 
diff --git a/.agents/skills/agent-browser/references/snapshot-refs.md b/.agents/skills/agent-browser/references/snapshot-refs.md
index 0b17a4d..c5868d5 100644
--- a/.agents/skills/agent-browser/references/snapshot-refs.md
+++ b/.agents/skills/agent-browser/references/snapshot-refs.md
@@ -1,21 +1,29 @@
-# Snapshot + Refs Workflow
+# Snapshot and Refs
 
-The core innovation of agent-browser: compact element references that reduce context usage dramatically for AI agents.
+Compact element references that reduce context usage dramatically for AI agents.
 
-## How It Works
+**Related**: [commands.md](commands.md) for full command reference, [SKILL.md](../SKILL.md) for quick start.
 
-### The Problem
-Traditional browser automation sends full DOM to AI agents:
+## Contents
+
+- [How Refs Work](#how-refs-work)
+- [Snapshot Command](#the-snapshot-command)
+- [Using Refs](#using-refs)
+- [Ref Lifecycle](#ref-lifecycle)
+- [Best Practices](#best-practices)
+- [Ref Notation Details](#ref-notation-details)
+- [Troubleshooting](#troubleshooting)
+
+## How Refs Work
+
+Traditional approach:
 ```
-Full DOM/HTML sent → AI parses → Generates CSS selector → Executes action
-~3000-5000 tokens per interaction
+Full DOM/HTML → AI parses → CSS selector → Action (~3000-5000 tokens)
 ```
 
-### The Solution
-agent-browser uses compact snapshots with refs:
+agent-browser approach:
 ```
-Compact snapshot → @refs assigned → Direct ref interaction
-~200-400 tokens per interaction
+Compact snapshot → @refs assigned → Direct interaction (~200-400 tokens)
 ```
 
 ## The Snapshot Command
@@ -166,8 +174,8 @@ agent-browser snapshot -i
 ### Element Not Visible in Snapshot
 
 ```bash
-# Scroll to reveal element
-agent-browser scroll --bottom
+# Scroll down to reveal element
+agent-browser scroll down 1000
 agent-browser snapshot -i
 
 # Or wait for dynamic content
diff --git a/.agents/skills/agent-browser/references/video-recording.md b/.agents/skills/agent-browser/references/video-recording.md
index 98e6b0a..e6a9fb4 100644
--- a/.agents/skills/agent-browser/references/video-recording.md
+++ b/.agents/skills/agent-browser/references/video-recording.md
@@ -1,6 +1,17 @@
 # Video Recording
 
-Capture browser automation sessions as video for debugging, documentation, or verification.
+Capture browser automation as video for debugging, documentation, or verification.
+
+**Related**: [commands.md](commands.md) for full command reference, [SKILL.md](../SKILL.md) for quick start.
+
+## Contents
+
+- [Basic Recording](#basic-recording)
+- [Recording Commands](#recording-commands)
+- [Use Cases](#use-cases)
+- [Best Practices](#best-practices)
+- [Output Format](#output-format)
+- [Limitations](#limitations)
 
 ## Basic Recording
 
diff --git a/.agents/skills/agent-browser/templates/authenticated-session.sh b/.agents/skills/agent-browser/templates/authenticated-session.sh
index e44aaad..b66c928 100755
--- a/.agents/skills/agent-browser/templates/authenticated-session.sh
+++ b/.agents/skills/agent-browser/templates/authenticated-session.sh
@@ -1,67 +1,81 @@
 #!/bin/bash
 # Template: Authenticated Session Workflow
-# Login once, save state, reuse for subsequent runs
+# Purpose: Login once, save state, reuse for subsequent runs
+# Usage: ./authenticated-session.sh <login-url> [state-file]
 #
-# Usage:
-#   ./authenticated-session.sh <login-url> [state-file]
+# RECOMMENDED: Use the auth vault instead of this template:
+#   echo "<pass>" | agent-browser auth save myapp --url <login-url> --username <user> --password-stdin
+#   agent-browser auth login myapp
+# The auth vault stores credentials securely and the LLM never sees passwords.
 #
-# Setup:
-#   1. Run once to see your form structure
-#   2. Note the @refs for your fields
-#   3. Uncomment LOGIN FLOW section and update refs
+# Environment variables:
+#   APP_USERNAME - Login username/email
+#   APP_PASSWORD - Login password
+#
+# Two modes:
+#   1. Discovery mode (default): Shows form structure so you can identify refs
+#   2. Login mode: Performs actual login after you update the refs
+#
+# Setup steps:
+#   1. Run once to see form structure (discovery mode)
+#   2. Update refs in LOGIN FLOW section below
+#   3. Set APP_USERNAME and APP_PASSWORD
+#   4. Delete the DISCOVERY section
 
 set -euo pipefail
 
 LOGIN_URL="${1:?Usage: $0 <login-url> [state-file]}"
 STATE_FILE="${2:-./auth-state.json}"
 
-echo "Authentication workflow for: $LOGIN_URL"
+echo "Authentication workflow: $LOGIN_URL"
 
-# ══════════════════════════════════════════════════════════════
-# SAVED STATE: Skip login if we have valid saved state
-# ══════════════════════════════════════════════════════════════
+# ================================================================
+# SAVED STATE: Skip login if valid saved state exists
+# ================================================================
 if [[ -f "$STATE_FILE" ]]; then
-    echo "Loading saved authentication state..."
-    agent-browser state load "$STATE_FILE"
-    agent-browser open "$LOGIN_URL"
-    agent-browser wait --load networkidle
+    echo "Loading saved state from $STATE_FILE..."
+    if agent-browser --state "$STATE_FILE" open "$LOGIN_URL" 2>/dev/null; then
+        agent-browser wait --load networkidle
 
-    CURRENT_URL=$(agent-browser get url)
-    if [[ "$CURRENT_URL" != *"login"* ]] && [[ "$CURRENT_URL" != *"signin"* ]]; then
-        echo "Session restored successfully!"
-        agent-browser snapshot -i
-        exit 0
+        CURRENT_URL=$(agent-browser get url)
+        if [[ "$CURRENT_URL" != *"login"* ]] && [[ "$CURRENT_URL" != *"signin"* ]]; then
+            echo "Session restored successfully"
+            agent-browser snapshot -i
+            exit 0
+        fi
+        echo "Session expired, performing fresh login..."
+        agent-browser close 2>/dev/null || true
+    else
+        echo "Failed to load state, re-authenticating..."
     fi
-    echo "Session expired, performing fresh login..."
     rm -f "$STATE_FILE"
 fi
 
-# ══════════════════════════════════════════════════════════════
-# DISCOVERY MODE: Show form structure (remove after setup)
-# ══════════════════════════════════════════════════════════════
+# ================================================================
+# DISCOVERY MODE: Shows form structure (delete after setup)
+# ================================================================
 echo "Opening login page..."
 agent-browser open "$LOGIN_URL"
 agent-browser wait --load networkidle
 
 echo ""
-echo "┌─────────────────────────────────────────────────────────┐"
-echo "│ LOGIN FORM STRUCTURE                                    │"
-echo "├─────────────────────────────────────────────────────────┤"
+echo "Login form structure:"
+echo "---"
 agent-browser snapshot -i
-echo "└─────────────────────────────────────────────────────────┘"
+echo "---"
 echo ""
 echo "Next steps:"
-echo "  1. Note refs: @e? = username, @e? = password, @e? = submit"
-echo "  2. Uncomment LOGIN FLOW section below"
-echo "  3. Replace @e1, @e2, @e3 with your refs"
+echo "  1. Note the refs: username=@e?, password=@e?, submit=@e?"
+echo "  2. Update the LOGIN FLOW section below with your refs"
+echo "  3. Set: export APP_USERNAME='...' APP_PASSWORD='...'"
 echo "  4. Delete this DISCOVERY MODE section"
 echo ""
 agent-browser close
 exit 0
 
-# ══════════════════════════════════════════════════════════════
+# ================================================================
 # LOGIN FLOW: Uncomment and customize after discovery
-# ══════════════════════════════════════════════════════════════
+# ================================================================
 # : "${APP_USERNAME:?Set APP_USERNAME environment variable}"
 # : "${APP_PASSWORD:?Set APP_PASSWORD environment variable}"
 #
@@ -78,14 +92,14 @@ exit 0
 # # Verify login succeeded
 # FINAL_URL=$(agent-browser get url)
 # if [[ "$FINAL_URL" == *"login"* ]] || [[ "$FINAL_URL" == *"signin"* ]]; then
-#     echo "ERROR: Login failed - still on login page"
+#     echo "Login failed - still on login page"
 #     agent-browser screenshot /tmp/login-failed.png
 #     agent-browser close
 #     exit 1
 # fi
 #
 # # Save state for future runs
-# echo "Saving authentication state to: $STATE_FILE"
+# echo "Saving state to $STATE_FILE"
 # agent-browser state save "$STATE_FILE"
-# echo "Login successful!"
+# echo "Login successful"
 # agent-browser snapshot -i
diff --git a/.agents/skills/agent-browser/templates/capture-workflow.sh b/.agents/skills/agent-browser/templates/capture-workflow.sh
index a4eae75..3bc93ad 100755
--- a/.agents/skills/agent-browser/templates/capture-workflow.sh
+++ b/.agents/skills/agent-browser/templates/capture-workflow.sh
@@ -1,68 +1,69 @@
 #!/bin/bash
 # Template: Content Capture Workflow
-# Extract content from web pages with optional authentication
+# Purpose: Extract content from web pages (text, screenshots, PDF)
+# Usage: ./capture-workflow.sh <url> [output-dir]
+#
+# Outputs:
+#   - page-full.png: Full page screenshot
+#   - page-structure.txt: Page element structure with refs
+#   - page-text.txt: All text content
+#   - page.pdf: PDF version
+#
+# Optional: Load auth state for protected pages
 
 set -euo pipefail
 
 TARGET_URL="${1:?Usage: $0 <url> [output-dir]}"
 OUTPUT_DIR="${2:-.}"
 
-echo "Capturing content from: $TARGET_URL"
+echo "Capturing: $TARGET_URL"
 mkdir -p "$OUTPUT_DIR"
 
-# Optional: Load authentication state if needed
+# Optional: Load authentication state
 # if [[ -f "./auth-state.json" ]]; then
+#     echo "Loading authentication state..."
 #     agent-browser state load "./auth-state.json"
 # fi
 
-# Navigate to target page
+# Navigate to target
 agent-browser open "$TARGET_URL"
 agent-browser wait --load networkidle
 
-# Get page metadata
-echo "Page title: $(agent-browser get title)"
-echo "Page URL: $(agent-browser get url)"
+# Get metadata
+TITLE=$(agent-browser get title)
+URL=$(agent-browser get url)
+echo "Title: $TITLE"
+echo "URL: $URL"
 
 # Capture full page screenshot
 agent-browser screenshot --full "$OUTPUT_DIR/page-full.png"
-echo "Screenshot saved: $OUTPUT_DIR/page-full.png"
+echo "Saved: $OUTPUT_DIR/page-full.png"
 
-# Get page structure
+# Get page structure with refs
 agent-browser snapshot -i > "$OUTPUT_DIR/page-structure.txt"
-echo "Structure saved: $OUTPUT_DIR/page-structure.txt"
+echo "Saved: $OUTPUT_DIR/page-structure.txt"
 
-# Extract main content
-# Adjust selector based on target site structure
-# agent-browser get text @e1 > "$OUTPUT_DIR/main-content.txt"
-
-# Extract specific elements (uncomment as needed)
-# agent-browser get text "article" > "$OUTPUT_DIR/article.txt"
-# agent-browser get text "main" > "$OUTPUT_DIR/main.txt"
-# agent-browser get text ".content" > "$OUTPUT_DIR/content.txt"
-
-# Get full page text
+# Extract all text content
 agent-browser get text body > "$OUTPUT_DIR/page-text.txt"
-echo "Text content saved: $OUTPUT_DIR/page-text.txt"
+echo "Saved: $OUTPUT_DIR/page-text.txt"
 
-# Optional: Save as PDF
+# Save as PDF
 agent-browser pdf "$OUTPUT_DIR/page.pdf"
-echo "PDF saved: $OUTPUT_DIR/page.pdf"
+echo "Saved: $OUTPUT_DIR/page.pdf"
 
-# Optional: Capture with scrolling for infinite scroll pages
-# scroll_and_capture() {
-#     local count=0
-#     while [[ $count -lt 5 ]]; do
-#         agent-browser scroll down 1000
-#         agent-browser wait 1000
-#         ((count++))
-#     done
-#     agent-browser screenshot --full "$OUTPUT_DIR/page-scrolled.png"
-# }
-# scroll_and_capture
+# Optional: Extract specific elements using refs from structure
+# agent-browser get text @e5 > "$OUTPUT_DIR/main-content.txt"
+
+# Optional: Handle infinite scroll pages
+# for i in {1..5}; do
+#     agent-browser scroll down 1000
+#     agent-browser wait 1000
+# done
+# agent-browser screenshot --full "$OUTPUT_DIR/page-scrolled.png"
 
 # Cleanup
 agent-browser close
 
 echo ""
-echo "Capture complete! Files saved to: $OUTPUT_DIR"
+echo "Capture complete:"
 ls -la "$OUTPUT_DIR"
diff --git a/.agents/skills/agent-browser/templates/form-automation.sh b/.agents/skills/agent-browser/templates/form-automation.sh
index 02a7c81..6784fcd 100755
--- a/.agents/skills/agent-browser/templates/form-automation.sh
+++ b/.agents/skills/agent-browser/templates/form-automation.sh
@@ -1,64 +1,62 @@
 #!/bin/bash
 # Template: Form Automation Workflow
-# Fills and submits web forms with validation
+# Purpose: Fill and submit web forms with validation
+# Usage: ./form-automation.sh <form-url>
+#
+# This template demonstrates the snapshot-interact-verify pattern:
+# 1. Navigate to form
+# 2. Snapshot to get element refs
+# 3. Fill fields using refs
+# 4. Submit and verify result
+#
+# Customize: Update the refs (@e1, @e2, etc.) based on your form's snapshot output
 
 set -euo pipefail
 
 FORM_URL="${1:?Usage: $0 <form-url>}"
 
-echo "Automating form at: $FORM_URL"
+echo "Form automation: $FORM_URL"
 
-# Navigate to form page
+# Step 1: Navigate to form
 agent-browser open "$FORM_URL"
 agent-browser wait --load networkidle
 
-# Get interactive snapshot to identify form fields
-echo "Analyzing form structure..."
+# Step 2: Snapshot to discover form elements
+echo ""
+echo "Form structure:"
 agent-browser snapshot -i
 
-# Example: Fill common form fields
-# Uncomment and modify refs based on snapshot output
+# Step 3: Fill form fields (customize these refs based on snapshot output)
+#
+# Common field types:
+#   agent-browser fill @e1 "John Doe"           # Text input
+#   agent-browser fill @e2 "user@example.com"   # Email input
+#   agent-browser fill @e3 "SecureP@ss123"      # Password input
+#   agent-browser select @e4 "Option Value"     # Dropdown
+#   agent-browser check @e5                     # Checkbox
+#   agent-browser click @e6                     # Radio button
+#   agent-browser fill @e7 "Multi-line text"   # Textarea
+#   agent-browser upload @e8 /path/to/file.pdf # File upload
+#
+# Uncomment and modify:
+# agent-browser fill @e1 "Test User"
+# agent-browser fill @e2 "test@example.com"
+# agent-browser click @e3  # Submit button
 
-# Text inputs
-# agent-browser fill @e1 "John Doe"           # Name field
-# agent-browser fill @e2 "user@example.com"   # Email field
-# agent-browser fill @e3 "+1-555-123-4567"    # Phone field
-
-# Password fields
-# agent-browser fill @e4 "SecureP@ssw0rd!"
-
-# Dropdowns
-# agent-browser select @e5 "Option Value"
-
-# Checkboxes
-# agent-browser check @e6                      # Check
-# agent-browser uncheck @e7                    # Uncheck
-
-# Radio buttons
-# agent-browser click @e8                      # Select radio option
-
-# Text areas
-# agent-browser fill @e9 "Multi-line text content here"
-
-# File uploads
-# agent-browser upload @e10 /path/to/file.pdf
-
-# Submit form
-# agent-browser click @e11                     # Submit button
-
-# Wait for response
+# Step 4: Wait for submission
 # agent-browser wait --load networkidle
-# agent-browser wait --url "**/success"        # Or wait for redirect
+# agent-browser wait --url "**/success"  # Or wait for redirect
 
-# Verify submission
-echo "Form submission result:"
+# Step 5: Verify result
+echo ""
+echo "Result:"
 agent-browser get url
 agent-browser snapshot -i
 
-# Take screenshot of result
+# Optional: Capture evidence
 agent-browser screenshot /tmp/form-result.png
+echo "Screenshot saved: /tmp/form-result.png"
 
 # Cleanup
 agent-browser close
-
-echo "Form automation complete"
+echo "Done"
diff --git a/.claude/commands/post-release-testing.md b/.claude/commands/post-release-testing.md
index 771a1d8..10cf6ff 100644
--- a/.claude/commands/post-release-testing.md
+++ b/.claude/commands/post-release-testing.md
@@ -43,7 +43,7 @@ Manually verify the install script works in a fresh environment:
 ```bash
 docker run --rm alpine:latest sh -c "
   apk add --no-cache curl ca-certificates libstdc++ libgcc bash &&
-  curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh &&
+  curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh &&
   sandbox-agent --version
 "
 ```
diff --git a/.dockerignore b/.dockerignore
index 1a4fa41..4ba2cf3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,11 +9,15 @@ build/
 # Cache
 .cache/
 .turbo/
+**/.turbo/
 *.tsbuildinfo
+.pnpm-store/
+coverage/
 
 # Environment
 .env
 .env.*
+.foundry/
 
 # IDE
 .idea/
@@ -24,3 +28,7 @@ build/
 
 # Git
 .git/
+
+# Tests
+**/test/
+**/tests/
diff --git a/.env.development.example b/.env.development.example
new file mode 100644
index 0000000..0ae0f58
--- /dev/null
+++ b/.env.development.example
@@ -0,0 +1,34 @@
+# Foundry local development environment.
+# Copy ~/misc/the-foundry.env to .env in the repo root to populate secrets.
+# .env is gitignored — never commit it. The source of truth is ~/misc/the-foundry.env.
+#
+# Docker Compose (just foundry-dev) and the justfile (set dotenv-load := true)
+# both read .env automatically.
+
+APP_URL=http://localhost:4173
+BETTER_AUTH_URL=http://localhost:4173
+BETTER_AUTH_SECRET=sandbox-agent-foundry-development-only-change-me
+GITHUB_REDIRECT_URI=http://localhost:4173/v1/auth/callback/github
+
+# Fill these in when enabling live GitHub OAuth.
+GITHUB_CLIENT_ID=
+GITHUB_CLIENT_SECRET=
+
+# Fill these in when enabling GitHub App-backed org installation and repo import.
+GITHUB_APP_ID=
+GITHUB_APP_CLIENT_ID=
+GITHUB_APP_CLIENT_SECRET=
+# Store PEM material as a quoted single-line value with \n escapes.
+GITHUB_APP_PRIVATE_KEY=
+# Webhook secret for verifying GitHub webhook payloads.
+# Use smee.io for local development: https://smee.io/new
+GITHUB_WEBHOOK_SECRET=
+# Required for local GitHub webhook forwarding in compose.dev.
+SMEE_URL=
+SMEE_TARGET=http://backend:7741/v1/webhooks/github
+
+# Fill these in when enabling live Stripe billing.
+STRIPE_SECRET_KEY=
+STRIPE_PUBLISHABLE_KEY=
+STRIPE_WEBHOOK_SECRET=
+STRIPE_PRICE_TEAM=
diff --git a/.github/media/inspector.png b/.github/media/inspector.png
index 1c16ed2..02e588e 100644
Binary files a/.github/media/inspector.png and b/.github/media/inspector.png differ
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e009cad..85f828d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,18 +11,50 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
-      - uses: Swatinem/rust-cache@main
+      - uses: Swatinem/rust-cache@v2
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: pnpm
       - run: pnpm install
+      - name: Run formatter hooks
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            git fetch origin "${{ github.base_ref }}" --depth=1
+            diff_range="origin/${{ github.base_ref }}...HEAD"
+          elif [ "${{ github.event_name }}" = "push" ] && [ "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]; then
+            diff_range="${{ github.event.before }}...${{ github.sha }}"
+          else
+            diff_range="HEAD^...HEAD"
+          fi
+
+          mapfile -t changed_files < <(
+            git diff --name-only --diff-filter=ACMR "$diff_range" \
+              | grep -E '\.(cjs|cts|js|jsx|json|jsonc|mjs|mts|rs|ts|tsx)$' \
+              || true
+          )
+
+          if [ ${#changed_files[@]} -eq 0 ]; then
+            echo "No formatter-managed files changed."
+            exit 0
+          fi
+
+          args=()
+          for file in "${changed_files[@]}"; do
+            args+=(--file "$file")
+          done
+
+          pnpm exec lefthook run pre-commit --no-stage-fixed --fail-on-changes "${args[@]}"
+      - run: npm install -g tsx
       - name: Run checks
-        run: ./scripts/release/main.ts --version 0.0.0 --check
+        run: ./scripts/release/main.ts --version 0.0.0 --only-steps run-ci-checks
       - name: Run ACP v1 server tests
         run: |
           cargo test -p sandbox-agent-agent-management
@@ -31,5 +63,3 @@ jobs:
           cargo test -p sandbox-agent --lib
       - name: Run SDK tests
         run: pnpm --dir sdks/typescript test
-      - name: Run Inspector browser E2E
-        run: pnpm --filter @sandbox-agent/inspector test:agent-browser
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 102f612..34fb64a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -180,10 +180,20 @@ jobs:
         include:
           - platform: linux/arm64
             runner: depot-ubuntu-24.04-arm-8
-            arch_suffix: -arm64
+            tag_suffix: -arm64
+            dockerfile: docker/runtime/Dockerfile
           - platform: linux/amd64
             runner: depot-ubuntu-24.04-8
-            arch_suffix: -amd64
+            tag_suffix: -amd64
+            dockerfile: docker/runtime/Dockerfile
+          - platform: linux/arm64
+            runner: depot-ubuntu-24.04-arm-8
+            tag_suffix: -full-arm64
+            dockerfile: docker/runtime/Dockerfile.full
+          - platform: linux/amd64
+            runner: depot-ubuntu-24.04-8
+            tag_suffix: -full-amd64
+            dockerfile: docker/runtime/Dockerfile.full
     runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@v4
@@ -205,8 +215,8 @@ jobs:
         with:
           context: .
           push: true
-          tags: rivetdev/sandbox-agent:${{ steps.vars.outputs.sha_short }}${{ matrix.arch_suffix }}
-          file: docker/runtime/Dockerfile
+          tags: rivetdev/sandbox-agent:${{ steps.vars.outputs.sha_short }}${{ matrix.tag_suffix }}
+          file: ${{ matrix.dockerfile }}
           platforms: ${{ matrix.platform }}
           build-args: |
             TARGETARCH=${{ contains(matrix.platform, 'arm64') && 'arm64' || 'amd64' }}
diff --git a/.gitignore b/.gitignore
index 07d74c2..de4d863 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ yarn.lock
 .astro/
 *.tsbuildinfo
 .turbo/
+**/.turbo/
+.pnpm-store/
+coverage/
 
 # Environment
 .env
@@ -47,6 +50,13 @@ Cargo.lock
 
 # Example temp files
 .tmp-upload/
+*.db
+.foundry/
 
 # CLI binaries (downloaded during npm publish)
 sdks/cli/platforms/*/bin/
+
+# Foundry desktop app build artifacts
+foundry/packages/desktop/frontend-dist/
+foundry/packages/desktop/src-tauri/sidecars/
+.context/
diff --git a/.mcp.json b/.mcp.json
index cc04a2b..7bae219 100644
--- a/.mcp.json
+++ b/.mcp.json
@@ -1,10 +1,8 @@
 {
   "mcpServers": {
     "everything": {
-      "args": [
-        "@modelcontextprotocol/server-everything"
-      ],
+      "args": ["@modelcontextprotocol/server-everything"],
       "command": "npx"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000..f301fed
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+auto-install-peers=false
diff --git a/CLAUDE.md b/CLAUDE.md
index 2934e3a..248f075 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,38 +1,5 @@
 # Instructions
 
-## ACP v1 Baseline
-
-- v1 is ACP-native.
-- `/v1/*` is removed and returns `410 Gone` (`application/problem+json`).
-- `/opencode/*` is disabled during ACP core phases and returns `503`.
-- Prompt/session traffic is ACP JSON-RPC over streamable HTTP on `/v1/rpc`:
-  - `POST /v1/rpc`
-  - `GET /v1/rpc` (SSE)
-  - `DELETE /v1/rpc`
-- Control-plane endpoints:
-  - `GET /v1/health`
-  - `GET /v1/agents`
-  - `POST /v1/agents/{agent}/install`
-- Binary filesystem transfer endpoints (intentionally HTTP, not ACP extension methods):
-  - `GET /v1/fs/file`
-  - `PUT /v1/fs/file`
-  - `POST /v1/fs/upload-batch`
-- Sandbox Agent ACP extension method naming:
-  - Custom ACP methods use `_sandboxagent/...` (not `_sandboxagent/v1/...`).
-  - Session detach method is `_sandboxagent/session/detach`.
-
-## API Scope
-
-- ACP is the primary protocol for agent/session behavior and all functionality that talks directly to the agent.
-- ACP extensions may be used for gaps (for example `skills`, `models`, and related metadata), but the default is that agent-facing behavior is implemented by the agent through ACP.
-- Custom HTTP APIs are for non-agent/session platform services (for example filesystem, terminals, and other host/runtime capabilities).
-- Filesystem and terminal APIs remain Sandbox Agent-specific HTTP contracts and are not ACP.
-- Keep `GET /v1/fs/file`, `PUT /v1/fs/file`, and `POST /v1/fs/upload-batch` on HTTP:
-  - These are Sandbox Agent host/runtime operations with cross-agent-consistent behavior.
-  - They may involve very large binary transfers that ACP JSON-RPC envelopes are not suited to stream.
-  - This is intentionally separate from ACP native `fs/read_text_file` and `fs/write_text_file`.
-  - ACP extension variants may exist in parallel, but SDK defaults should prefer HTTP for these binary transfer operations.
-
 ## Naming and Ownership
 
 - This repository/product is **Sandbox Agent**.
@@ -41,59 +8,44 @@
 - Canonical extension namespace/domain string is `sandboxagent.dev` (no hyphen).
 - Canonical custom ACP extension method prefix is `_sandboxagent/...` (no hyphen).
 
-## Architecture (Brief)
+## Docs Terminology
 
-- HTTP contract and problem/error mapping: `server/packages/sandbox-agent/src/router.rs`
-- ACP client runtime and agent process bridge: `server/packages/sandbox-agent/src/acp_runtime/mod.rs`
-- Agent/native + ACP agent process install and lazy install: `server/packages/agent-management/`
-- Inspector UI served at `/ui/` and bound to ACP over HTTP from `frontend/packages/inspector/`
+- Never mention "ACP" in user-facing docs (`docs/**/*.mdx`) except in docs that are specifically about ACP itself (e.g. `docs/acp-http-client.mdx`).
+- Never expose underlying protocol method names (e.g. `session/request_permission`, `session/create`, `_sandboxagent/session/detach`) in non-ACP docs. Describe the behavior in user-facing terms instead.
+- Do not describe the underlying protocol implementation in docs. Only document the SDK surface (methods, types, options). ACP protocol details belong exclusively in ACP-specific pages.
+- Do not use em dashes (`—`) in docs. Use commas, periods, or parentheses instead.
 
-## TypeScript SDK Architecture
+### Docs Source Of Truth (HTTP/CLI)
 
-- TypeScript clients are split into:
-  - `acp-http-client`: protocol-pure ACP-over-HTTP (`/v1/acp`) with no Sandbox-specific HTTP helpers.
-  - `sandbox-agent`: `SandboxAgent` SDK wrapper that combines ACP session operations with Sandbox control-plane and filesystem helpers.
-- `SandboxAgent` entry points are `SandboxAgent.connect(...)` and `SandboxAgent.start(...)`.
-- Stable Sandbox session methods are `createSession`, `resumeSession`, `resumeOrCreateSession`, `destroySession`, `sendSessionMethod`, and `onSessionEvent`.
-- `Session` helpers are `prompt(...)`, `send(...)`, and `onEvent(...)`.
-- Cleanup is `sdk.dispose()`.
-
-### Docs Source Of Truth
-
-- For TypeScript docs/examples, source of truth is implementation in:
-  - `sdks/typescript/src/client.ts`
-  - `sdks/typescript/src/index.ts`
-  - `sdks/acp-http-client/src/index.ts`
-- Do not document TypeScript APIs unless they are exported and implemented in those files.
 - For HTTP/CLI docs/examples, source of truth is:
   - `server/packages/sandbox-agent/src/router.rs`
   - `server/packages/sandbox-agent/src/cli.rs`
-- Keep docs aligned to implemented endpoints/commands only (for example ACP under `/v1/acp`, not legacy `/v1/sessions` APIs).
-
-## Source Documents
-
-- `~/misc/acp-docs/schema/schema.json`
-- `~/misc/acp-docs/schema/meta.json`
-- `research/acp/spec.md`
-- `research/acp/v1-schema-to-acp-mapping.md`
-- `research/acp/friction.md`
-- `research/acp/todo.md`
+- Keep docs aligned to implemented endpoints/commands only (for example ACP under `/v1/acp`, not legacy session REST APIs).
 
 ## Change Tracking
 
+- If the user asks to "push" changes, treat that as permission to commit and push all current workspace changes, not a hand-picked subset, unless the user explicitly scopes the push.
 - Keep CLI subcommands and HTTP endpoints in sync.
 - Update `docs/cli.mdx` when CLI behavior changes.
 - Regenerate `docs/openapi.json` when HTTP contracts change.
 - Keep `docs/inspector.mdx` and `docs/sdks/typescript.mdx` aligned with implementation.
 - Append blockers/decisions to `research/acp/friction.md` during ACP work.
-- TypeScript SDK tests should run against a real running server/runtime over real `/v1` HTTP APIs, typically using the real `mock` agent for deterministic behavior.
-- Do not use Vitest fetch/transport mocks to simulate server functionality in TypeScript SDK tests.
+- `docs/agent-capabilities.mdx` lists models/modes/thought levels per agent. Update it when adding a new agent or changing `fallback_config_options`. If its "Last updated" date is >2 weeks old, re-run `cd scripts/agent-configs && npx tsx dump.ts` and update the doc to match. Source data: `scripts/agent-configs/resources/*.json` and hardcoded entries in `server/packages/sandbox-agent/src/router/support.rs` (`fallback_config_options`).
+- Some agent models are gated by subscription (e.g. Claude `opus`). The live report only shows models available to the current credentials. The static doc and JSON resource files should list all known models regardless of subscription tier.
 
-## Docker Examples (Dev Testing)
+## Docker Test Image
 
-- When manually testing bleeding-edge (unreleased) versions of sandbox-agent in `examples/`, use `SANDBOX_AGENT_DEV=1` with the Docker-based examples.
-- This triggers `examples/shared/Dockerfile.dev` which builds the server binary from local source and packages it into the Docker image.
-- Example: `SANDBOX_AGENT_DEV=1 pnpm --filter @sandbox-agent/example-mcp start`
+- Docker-backed Rust and TypeScript tests build `docker/test-agent/Dockerfile` directly in-process and cache the image tag only in memory (`OnceLock` in Rust, module-level variable in TypeScript).
+- Do not add cross-process image-build scripts unless there is a concrete need for them.
+
+## Common Software Sync
+
+- These three files must stay in sync:
+  - `docs/common-software.mdx` (user-facing documentation)
+  - `docker/test-common-software/Dockerfile` (packages installed in the test image)
+  - `server/packages/sandbox-agent/tests/common_software.rs` (test assertions)
+- When adding or removing software from `docs/common-software.mdx`, also add/remove the corresponding `apt-get install` line in the Dockerfile and add/remove the test in `common_software.rs`.
+- Run `cargo test -p sandbox-agent --test common_software` to verify.
 
 ## Install Version References
 
@@ -107,6 +59,7 @@
   - `docs/cli.mdx`
   - `docs/quickstart.mdx`
   - `docs/sdk-overview.mdx`
+  - `docs/react-components.mdx`
   - `docs/session-persistence.mdx`
   - `docs/deploy/local.mdx`
   - `docs/deploy/cloudflare.mdx`
@@ -118,11 +71,10 @@
   - `.claude/commands/post-release-testing.md`
   - `examples/cloudflare/Dockerfile`
   - `examples/daytona/src/index.ts`
-  - `examples/daytona/src/daytona-with-snapshot.ts`
+  - `examples/shared/src/docker.ts`
   - `examples/docker/src/index.ts`
   - `examples/e2b/src/index.ts`
   - `examples/vercel/src/index.ts`
   - `scripts/release/main.ts`
   - `scripts/release/promote-artifacts.ts`
   - `scripts/release/sdk.ts`
-  - `scripts/sandbox-testing/test-sandbox.ts`
diff --git a/Cargo.toml b/Cargo.toml
index 505efb0..0fc4dc8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,10 @@
 [workspace]
 resolver = "2"
 members = ["server/packages/*", "gigacode"]
+exclude = ["factory/packages/desktop/src-tauri", "foundry/packages/desktop/src-tauri"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.4.2"
 edition = "2021"
 authors = [ "Rivet Gaming, LLC <developer@rivet.gg>" ]
 license = "Apache-2.0"
@@ -12,13 +13,13 @@ description = "Universal API for automatic coding agents in sandboxes. Supports
 
 [workspace.dependencies]
 # Internal crates
-sandbox-agent = { version = "0.2.0", path = "server/packages/sandbox-agent" }
-sandbox-agent-error = { version = "0.2.0", path = "server/packages/error" }
-sandbox-agent-agent-management = { version = "0.2.0", path = "server/packages/agent-management" }
-sandbox-agent-agent-credentials = { version = "0.2.0", path = "server/packages/agent-credentials" }
-sandbox-agent-opencode-adapter = { version = "0.2.0", path = "server/packages/opencode-adapter" }
-sandbox-agent-opencode-server-manager = { version = "0.2.0", path = "server/packages/opencode-server-manager" }
-acp-http-adapter = { version = "0.2.0", path = "server/packages/acp-http-adapter" }
+sandbox-agent = { version = "0.4.2", path = "server/packages/sandbox-agent" }
+sandbox-agent-error = { version = "0.4.2", path = "server/packages/error" }
+sandbox-agent-agent-management = { version = "0.4.2", path = "server/packages/agent-management" }
+sandbox-agent-agent-credentials = { version = "0.4.2", path = "server/packages/agent-credentials" }
+sandbox-agent-opencode-adapter = { version = "0.4.2", path = "server/packages/opencode-adapter" }
+sandbox-agent-opencode-server-manager = { version = "0.4.2", path = "server/packages/opencode-server-manager" }
+acp-http-adapter = { version = "0.4.2", path = "server/packages/acp-http-adapter" }
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
@@ -32,7 +33,7 @@ schemars = "0.8"
 utoipa = { version = "4.2", features = ["axum_extras"] }
 
 # Web framework
-axum = "0.7"
+axum = { version = "0.7", features = ["ws"] }
 tower = { version = "0.5", features = ["util"] }
 tower-http = { version = "0.5", features = ["cors", "trace"] }
 
diff --git a/README.md b/README.md
index f57d233..cf9b933 100644
--- a/README.md
+++ b/README.md
@@ -80,13 +80,13 @@ Import the SDK directly into your Node or browser application. Full type safety
 **Install**
 
 ```bash
-npm install sandbox-agent@0.2.x
+npm install sandbox-agent@0.4.x
 ```
 
 ```bash
-bun add sandbox-agent@0.2.x
+bun add sandbox-agent@0.4.x
 # Optional: allow Bun to run postinstall scripts for native binaries (required for SandboxAgent.start()).
-bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
+bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-linux-arm64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
 ```
 
 **Setup**
@@ -118,7 +118,6 @@ const agents = await client.listAgents();
 await client.createSession("demo", {
   agent: "codex",
   agentMode: "default",
-  permissionMode: "plan",
 });
 
 await client.postMessage("demo", { message: "Hello from the SDK." });
@@ -128,9 +127,7 @@ for await (const event of client.streamEvents("demo", { offset: 0 })) {
 }
 ```
 
-`permissionMode: "acceptEdits"` passes through to Claude, auto-approves file changes for Codex, and is treated as `default` for other agents.
-
-[SDK documentation](https://sandboxagent.dev/docs/sdks/typescript) — [Building a Chat UI](https://sandboxagent.dev/docs/building-chat-ui) — [Managing Sessions](https://sandboxagent.dev/docs/manage-sessions)
+[SDK documentation](https://sandboxagent.dev/docs/sdks/typescript) — [Managing Sessions](https://sandboxagent.dev/docs/manage-sessions)
 
 ### HTTP Server
 
@@ -138,7 +135,7 @@ Run as an HTTP server and connect from any language. Deploy to E2B, Daytona, Ver
 
 ```bash
 # Install it
-curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh
+curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
 # Run it
 sandbox-agent server --token "$SANDBOX_TOKEN" --host 127.0.0.1 --port 2468
 ```
@@ -146,10 +143,7 @@ sandbox-agent server --token "$SANDBOX_TOKEN" --host 127.0.0.1 --port 2468
 Optional: preinstall agent binaries (no server required; they will be installed lazily on first use if you skip this):
 
 ```bash
-sandbox-agent install-agent claude
-sandbox-agent install-agent codex
-sandbox-agent install-agent opencode
-sandbox-agent install-agent amp
+sandbox-agent install-agent --all
 ```
 
 To disable auth locally:
@@ -165,13 +159,13 @@ sandbox-agent server --no-token --host 127.0.0.1 --port 2468
 Install the CLI wrapper (optional but convenient):
 
 ```bash
-npm install -g @sandbox-agent/cli@0.2.x
+npm install -g @sandbox-agent/cli@0.4.x
 ```
 
 ```bash
 # Allow Bun to run postinstall scripts for native binaries.
-bun add -g @sandbox-agent/cli@0.2.x
-bun pm -g trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
+bun add -g @sandbox-agent/cli@0.4.x
+bun pm -g trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-linux-arm64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
 ```
 
 Create a session and send a message:
@@ -185,11 +179,11 @@ sandbox-agent api sessions send-message-stream my-session --message "Hello" --en
 You can also use npx like:
 
 ```bash
-npx @sandbox-agent/cli@0.2.x --help
+npx @sandbox-agent/cli@0.4.x --help
 ```
 
 ```bash
-bunx @sandbox-agent/cli@0.2.x --help
+bunx @sandbox-agent/cli@0.4.x --help
 ```
 
 [CLI documentation](https://sandboxagent.dev/docs/cli)
@@ -283,7 +277,7 @@ Coding agents expect interactive terminals with proper TTY handling. SSH with pi
 - **Storage of sessions on disk**: Sessions are already stored by the respective coding agents on disk. It's assumed that the consumer is streaming data from this machine to an external storage, such as Postgres, ClickHouse, or Rivet.
 - **Direct LLM wrappers**: Use the [Vercel AI SDK](https://ai-sdk.dev/docs/introduction) if you want to implement your own agent from scratch.
 - **Git Repo Management**: Just use git commands or the features provided by your sandbox provider of choice.
-- **Sandbox Provider API**: Sandbox providers have many nuanced differences in their API, it does not make sense for us to try to provide a custom layer. Instead, we opt to provide guides that let you integrate this project with sandbox providers.
+- **Sandbox Provider API**: Sandbox providers have many nuanced differences in their API, it does not make sense for us to try to provide a custom layer. Instead, we opt to provide guides that let you integrate this repository with sandbox providers.
 
 ## Roadmap
 
diff --git a/biome.json b/biome.json
new file mode 100644
index 0000000..4a8bd54
--- /dev/null
+++ b/biome.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+  "formatter": {
+    "indentStyle": "space",
+    "lineWidth": 160
+  }
+}
diff --git a/docker/inspector-dev/Dockerfile b/docker/inspector-dev/Dockerfile
new file mode 100644
index 0000000..b55923f
--- /dev/null
+++ b/docker/inspector-dev/Dockerfile
@@ -0,0 +1,7 @@
+FROM node:22-bookworm-slim
+
+RUN npm install -g pnpm@10.28.2
+
+WORKDIR /app
+
+CMD ["bash", "-lc", "pnpm install --filter @sandbox-agent/inspector... && cd frontend/packages/inspector && exec pnpm vite --host 0.0.0.0 --port 5173"]
diff --git a/docker/release/linux-aarch64.Dockerfile b/docker/release/linux-aarch64.Dockerfile
index ef70c14..d5ff208 100644
--- a/docker/release/linux-aarch64.Dockerfile
+++ b/docker/release/linux-aarch64.Dockerfile
@@ -10,7 +10,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
-COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 COPY sdks/typescript/package.json ./sdks/typescript/
 
 # Install dependencies
@@ -20,14 +20,14 @@ RUN pnpm install --filter @sandbox-agent/inspector...
 COPY docs/openapi.json ./docs/
 COPY sdks/cli-shared ./sdks/cli-shared
 COPY sdks/acp-http-client ./sdks/acp-http-client
-COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
+COPY sdks/react ./sdks/react
 COPY sdks/typescript ./sdks/typescript
 
-# Build cli-shared, acp-http-client, SDK, then persist-indexeddb (depends on SDK)
+# Build cli-shared, acp-http-client, SDK, then react (depends on SDK)
 RUN cd sdks/cli-shared && pnpm exec tsup
 RUN cd sdks/acp-http-client && pnpm exec tsup
 RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
-RUN cd sdks/persist-indexeddb && pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
 
 # Copy inspector source and build
 COPY frontend/packages/inspector ./frontend/packages/inspector
diff --git a/docker/release/linux-x86_64.Dockerfile b/docker/release/linux-x86_64.Dockerfile
index 262543b..1c41711 100644
--- a/docker/release/linux-x86_64.Dockerfile
+++ b/docker/release/linux-x86_64.Dockerfile
@@ -10,7 +10,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
-COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 COPY sdks/typescript/package.json ./sdks/typescript/
 
 # Install dependencies
@@ -20,14 +20,14 @@ RUN pnpm install --filter @sandbox-agent/inspector...
 COPY docs/openapi.json ./docs/
 COPY sdks/cli-shared ./sdks/cli-shared
 COPY sdks/acp-http-client ./sdks/acp-http-client
-COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
+COPY sdks/react ./sdks/react
 COPY sdks/typescript ./sdks/typescript
 
-# Build cli-shared, acp-http-client, SDK, then persist-indexeddb (depends on SDK)
+# Build cli-shared, acp-http-client, SDK, then react (depends on SDK)
 RUN cd sdks/cli-shared && pnpm exec tsup
 RUN cd sdks/acp-http-client && pnpm exec tsup
 RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
-RUN cd sdks/persist-indexeddb && pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
 
 # Copy inspector source and build
 COPY frontend/packages/inspector ./frontend/packages/inspector
diff --git a/docker/release/macos-aarch64.Dockerfile b/docker/release/macos-aarch64.Dockerfile
index e93ab15..5d918b2 100644
--- a/docker/release/macos-aarch64.Dockerfile
+++ b/docker/release/macos-aarch64.Dockerfile
@@ -10,7 +10,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
-COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 COPY sdks/typescript/package.json ./sdks/typescript/
 
 # Install dependencies
@@ -20,14 +20,14 @@ RUN pnpm install --filter @sandbox-agent/inspector...
 COPY docs/openapi.json ./docs/
 COPY sdks/cli-shared ./sdks/cli-shared
 COPY sdks/acp-http-client ./sdks/acp-http-client
-COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
+COPY sdks/react ./sdks/react
 COPY sdks/typescript ./sdks/typescript
 
-# Build cli-shared, acp-http-client, SDK, then persist-indexeddb (depends on SDK)
+# Build cli-shared, acp-http-client, SDK, then react (depends on SDK)
 RUN cd sdks/cli-shared && pnpm exec tsup
 RUN cd sdks/acp-http-client && pnpm exec tsup
 RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
-RUN cd sdks/persist-indexeddb && pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
 
 # Copy inspector source and build
 COPY frontend/packages/inspector ./frontend/packages/inspector
diff --git a/docker/release/macos-x86_64.Dockerfile b/docker/release/macos-x86_64.Dockerfile
index af57336..9b52aa6 100644
--- a/docker/release/macos-x86_64.Dockerfile
+++ b/docker/release/macos-x86_64.Dockerfile
@@ -10,7 +10,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
-COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 COPY sdks/typescript/package.json ./sdks/typescript/
 
 # Install dependencies
@@ -20,14 +20,14 @@ RUN pnpm install --filter @sandbox-agent/inspector...
 COPY docs/openapi.json ./docs/
 COPY sdks/cli-shared ./sdks/cli-shared
 COPY sdks/acp-http-client ./sdks/acp-http-client
-COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
+COPY sdks/react ./sdks/react
 COPY sdks/typescript ./sdks/typescript
 
-# Build cli-shared, acp-http-client, SDK, then persist-indexeddb (depends on SDK)
+# Build cli-shared, acp-http-client, SDK, then react (depends on SDK)
 RUN cd sdks/cli-shared && pnpm exec tsup
 RUN cd sdks/acp-http-client && pnpm exec tsup
 RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
-RUN cd sdks/persist-indexeddb && pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
 
 # Copy inspector source and build
 COPY frontend/packages/inspector ./frontend/packages/inspector
diff --git a/docker/release/windows.Dockerfile b/docker/release/windows.Dockerfile
index 83b3f37..92067db 100644
--- a/docker/release/windows.Dockerfile
+++ b/docker/release/windows.Dockerfile
@@ -10,7 +10,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
-COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 COPY sdks/typescript/package.json ./sdks/typescript/
 
 # Install dependencies
@@ -20,14 +20,14 @@ RUN pnpm install --filter @sandbox-agent/inspector...
 COPY docs/openapi.json ./docs/
 COPY sdks/cli-shared ./sdks/cli-shared
 COPY sdks/acp-http-client ./sdks/acp-http-client
-COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
+COPY sdks/react ./sdks/react
 COPY sdks/typescript ./sdks/typescript
 
-# Build cli-shared, acp-http-client, SDK, then persist-indexeddb (depends on SDK)
+# Build cli-shared, acp-http-client, SDK, then react (depends on SDK)
 RUN cd sdks/cli-shared && pnpm exec tsup
 RUN cd sdks/acp-http-client && pnpm exec tsup
 RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
-RUN cd sdks/persist-indexeddb && pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
 
 # Copy inspector source and build
 COPY frontend/packages/inspector ./frontend/packages/inspector
diff --git a/docker/runtime/Dockerfile b/docker/runtime/Dockerfile
index 029a969..85473be 100644
--- a/docker/runtime/Dockerfile
+++ b/docker/runtime/Dockerfile
@@ -12,7 +12,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
-COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 COPY sdks/typescript/package.json ./sdks/typescript/
 
 # Install dependencies
@@ -22,14 +22,14 @@ RUN pnpm install --filter @sandbox-agent/inspector...
 COPY docs/openapi.json ./docs/
 COPY sdks/cli-shared ./sdks/cli-shared
 COPY sdks/acp-http-client ./sdks/acp-http-client
-COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
+COPY sdks/react ./sdks/react
 COPY sdks/typescript ./sdks/typescript
 
-# Build cli-shared, acp-http-client, SDK, then persist-indexeddb (depends on SDK)
+# Build cli-shared, acp-http-client, SDK, then persist-indexeddb and react (depends on SDK)
 RUN cd sdks/cli-shared && pnpm exec tsup
 RUN cd sdks/acp-http-client && pnpm exec tsup
 RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
-RUN cd sdks/persist-indexeddb && pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
 
 # Copy inspector source and build
 COPY frontend/packages/inspector ./frontend/packages/inspector
@@ -149,7 +149,8 @@ FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y \
     ca-certificates \
     curl \
-    git && \
+    git \
+    ffmpeg && \
     rm -rf /var/lib/apt/lists/*
 
 # Copy the binary from builder
@@ -164,4 +165,4 @@ WORKDIR /home/sandbox
 EXPOSE 2468
 
 ENTRYPOINT ["sandbox-agent"]
-CMD ["--host", "0.0.0.0", "--port", "2468"]
+CMD ["server", "--host", "0.0.0.0", "--port", "2468"]
diff --git a/docker/runtime/Dockerfile.full b/docker/runtime/Dockerfile.full
new file mode 100644
index 0000000..9ab4c0d
--- /dev/null
+++ b/docker/runtime/Dockerfile.full
@@ -0,0 +1,159 @@
+# syntax=docker/dockerfile:1.10.0
+
+# ============================================================================
+# Build inspector frontend
+# ============================================================================
+FROM node:22-alpine AS inspector-build
+WORKDIR /app
+RUN npm install -g pnpm
+
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
+COPY sdks/cli-shared/package.json ./sdks/cli-shared/
+COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
+COPY sdks/react/package.json ./sdks/react/
+COPY sdks/typescript/package.json ./sdks/typescript/
+
+RUN pnpm install --filter @sandbox-agent/inspector...
+
+COPY docs/openapi.json ./docs/
+COPY sdks/cli-shared ./sdks/cli-shared
+COPY sdks/acp-http-client ./sdks/acp-http-client
+COPY sdks/react ./sdks/react
+COPY sdks/typescript ./sdks/typescript
+
+RUN cd sdks/cli-shared && pnpm exec tsup
+RUN cd sdks/acp-http-client && pnpm exec tsup
+RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
+
+COPY frontend/packages/inspector ./frontend/packages/inspector
+RUN cd frontend/packages/inspector && pnpm exec vite build
+
+# ============================================================================
+# AMD64 Builder - Uses cross-tools musl toolchain
+# ============================================================================
+FROM --platform=linux/amd64 rust:1.88.0 AS builder-amd64
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+    musl-tools \
+    musl-dev \
+    llvm-14-dev \
+    libclang-14-dev \
+    clang-14 \
+    libssl-dev \
+    pkg-config \
+    ca-certificates \
+    g++ \
+    g++-multilib \
+    git \
+    curl \
+    wget && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget -q https://github.com/cross-tools/musl-cross/releases/latest/download/x86_64-unknown-linux-musl.tar.xz && \
+    tar -xf x86_64-unknown-linux-musl.tar.xz -C /opt/ && \
+    rm x86_64-unknown-linux-musl.tar.xz && \
+    rustup target add x86_64-unknown-linux-musl
+
+ENV PATH="/opt/x86_64-unknown-linux-musl/bin:$PATH" \
+    LIBCLANG_PATH=/usr/lib/llvm-14/lib \
+    CLANG_PATH=/usr/bin/clang-14 \
+    CC_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-gcc \
+    CXX_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-g++ \
+    AR_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-ar \
+    CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-unknown-linux-musl-gcc \
+    CARGO_INCREMENTAL=0 \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true
+
+ENV SSL_VER=1.1.1w
+RUN wget https://www.openssl.org/source/openssl-$SSL_VER.tar.gz && \
+    tar -xzf openssl-$SSL_VER.tar.gz && \
+    cd openssl-$SSL_VER && \
+    ./Configure no-shared no-async --prefix=/musl --openssldir=/musl/ssl linux-x86_64 && \
+    make -j$(nproc) && \
+    make install_sw && \
+    cd .. && \
+    rm -rf openssl-$SSL_VER*
+
+ENV OPENSSL_DIR=/musl \
+    OPENSSL_INCLUDE_DIR=/musl/include \
+    OPENSSL_LIB_DIR=/musl/lib \
+    PKG_CONFIG_ALLOW_CROSS=1 \
+    RUSTFLAGS="-C target-feature=+crt-static -C link-arg=-static-libgcc"
+
+WORKDIR /build
+COPY . .
+
+COPY --from=inspector-build /app/frontend/packages/inspector/dist ./frontend/packages/inspector/dist
+
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \
+    cargo build -p sandbox-agent --release --target x86_64-unknown-linux-musl && \
+    cp target/x86_64-unknown-linux-musl/release/sandbox-agent /sandbox-agent
+
+# ============================================================================
+# ARM64 Builder - Uses Alpine with native musl
+# ============================================================================
+FROM --platform=linux/arm64 rust:1.88-alpine AS builder-arm64
+
+RUN apk add --no-cache \
+    musl-dev \
+    clang \
+    llvm-dev \
+    openssl-dev \
+    openssl-libs-static \
+    pkgconfig \
+    git \
+    curl \
+    build-base
+
+RUN rustup target add aarch64-unknown-linux-musl
+
+ENV CARGO_INCREMENTAL=0 \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true \
+    RUSTFLAGS="-C target-feature=+crt-static"
+
+WORKDIR /build
+COPY . .
+
+COPY --from=inspector-build /app/frontend/packages/inspector/dist ./frontend/packages/inspector/dist
+
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \
+    cargo build -p sandbox-agent --release --target aarch64-unknown-linux-musl && \
+    cp target/aarch64-unknown-linux-musl/release/sandbox-agent /sandbox-agent
+
+# ============================================================================
+# Select the appropriate builder based on target architecture
+# ============================================================================
+ARG TARGETARCH
+FROM builder-${TARGETARCH} AS builder
+
+# Runtime stage - full image with all supported agents preinstalled
+FROM node:22-bookworm-slim
+
+RUN apt-get update && apt-get install -y \
+    bash \
+    ca-certificates \
+    curl \
+    git && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /sandbox-agent /usr/local/bin/sandbox-agent
+RUN chmod +x /usr/local/bin/sandbox-agent
+
+RUN useradd -m -s /bin/bash sandbox
+USER sandbox
+WORKDIR /home/sandbox
+
+RUN sandbox-agent install-agent --all
+
+EXPOSE 2468
+
+ENTRYPOINT ["sandbox-agent"]
+CMD ["server", "--host", "0.0.0.0", "--port", "2468"]
diff --git a/docker/test-agent/Dockerfile b/docker/test-agent/Dockerfile
new file mode 100644
index 0000000..67888b3
--- /dev/null
+++ b/docker/test-agent/Dockerfile
@@ -0,0 +1,61 @@
+FROM rust:1.88.0-bookworm AS builder
+WORKDIR /build
+
+COPY Cargo.toml Cargo.lock ./
+COPY server/ ./server/
+COPY gigacode/ ./gigacode/
+COPY resources/agent-schemas/artifacts/ ./resources/agent-schemas/artifacts/
+COPY scripts/agent-configs/ ./scripts/agent-configs/
+COPY scripts/audit-acp-deps/ ./scripts/audit-acp-deps/
+
+ENV SANDBOX_AGENT_SKIP_INSPECTOR=1
+
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \
+    cargo build -p sandbox-agent --release && \
+    cp target/release/sandbox-agent /sandbox-agent
+
+# Extract neko binary from the official image for WebRTC desktop streaming.
+# Using neko v3 base image from GHCR which provides multi-arch support (amd64, arm64).
+# Pinned by digest to prevent breaking changes from upstream.
+# Reference client: https://github.com/demodesk/neko-client/blob/37f93eae6bd55b333c94bd009d7f2b079075a026/src/component/internal/webrtc.ts
+FROM ghcr.io/m1k1o/neko/base@sha256:0c384afa56268aaa2d5570211d284763d0840dcdd1a7d9a24be3081d94d3dfce AS neko-base
+
+FROM node:22-bookworm-slim
+RUN apt-get update -qq && \
+    apt-get install -y -qq --no-install-recommends \
+      ca-certificates \
+      bash \
+      libstdc++6 \
+      xvfb \
+      openbox \
+      xdotool \
+      imagemagick \
+      ffmpeg \
+      gstreamer1.0-tools \
+      gstreamer1.0-plugins-base \
+      gstreamer1.0-plugins-good \
+      gstreamer1.0-plugins-bad \
+      gstreamer1.0-plugins-ugly \
+      gstreamer1.0-nice \
+      gstreamer1.0-x \
+      gstreamer1.0-pulseaudio \
+      libxcvt0 \
+      x11-xserver-utils \
+      dbus-x11 \
+      xauth \
+      fonts-dejavu-core \
+      xterm \
+      > /dev/null 2>&1 && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /sandbox-agent /usr/local/bin/sandbox-agent
+COPY --from=neko-base /usr/bin/neko /usr/local/bin/neko
+
+EXPOSE 3000
+# Expose UDP port range for WebRTC media transport
+EXPOSE 59050-59070/udp
+
+ENTRYPOINT ["/usr/local/bin/sandbox-agent"]
+CMD ["server", "--host", "0.0.0.0", "--port", "3000", "--no-token"]
diff --git a/docker/test-common-software/Dockerfile b/docker/test-common-software/Dockerfile
new file mode 100644
index 0000000..7a03abc
--- /dev/null
+++ b/docker/test-common-software/Dockerfile
@@ -0,0 +1,37 @@
+# Extends the base test-agent image with common software pre-installed.
+# Used by the common_software integration test to verify that all documented
+# software in docs/common-software.mdx works correctly inside the sandbox.
+#
+# KEEP IN SYNC with docs/common-software.mdx
+
+ARG BASE_IMAGE=sandbox-agent-test:dev
+FROM ${BASE_IMAGE}
+
+USER root
+
+RUN apt-get update -qq && \
+    apt-get install -y -qq --no-install-recommends \
+      # Browsers
+      chromium \
+      firefox-esr \
+      # Languages
+      python3 python3-pip python3-venv \
+      default-jdk \
+      ruby-full \
+      # Databases
+      sqlite3 \
+      redis-server \
+      # Build tools
+      build-essential cmake pkg-config \
+      # CLI tools
+      git jq tmux \
+      # Media and graphics
+      imagemagick \
+      poppler-utils \
+      # Desktop apps
+      gimp \
+      > /dev/null 2>&1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/usr/local/bin/sandbox-agent"]
+CMD ["server", "--host", "0.0.0.0", "--port", "3000", "--no-token"]
diff --git a/docs/advanced/acp-http-client.mdx b/docs/advanced/acp-http-client.mdx
deleted file mode 100644
index 4d93363..0000000
--- a/docs/advanced/acp-http-client.mdx
+++ /dev/null
@@ -1,67 +0,0 @@
----
-title: "ACP HTTP Client"
-description: "Protocol-pure ACP JSON-RPC over streamable HTTP client."
----
-
-`acp-http-client` is a standalone, low-level package for ACP over HTTP (`/v2/rpc`).
-
-Use it when you want strict ACP protocol behavior with no Sandbox-specific metadata or extension adaptation.
-
-## Install
-
-```bash
-npm install acp-http-client
-```
-
-## Usage
-
-```ts
-import { AcpHttpClient } from "acp-http-client";
-
-const client = new AcpHttpClient({
-  baseUrl: "http://127.0.0.1:2468",
-  token: process.env.SANDBOX_TOKEN,
-});
-
-await client.initialize({
-  _meta: {
-    "sandboxagent.dev": {
-      agent: "mock",
-    },
-  },
-});
-
-const session = await client.newSession({
-  cwd: "/",
-  mcpServers: [],
-  _meta: {
-    "sandboxagent.dev": {
-      agent: "mock",
-    },
-  },
-});
-
-const result = await client.prompt({
-  sessionId: session.sessionId,
-  prompt: [{ type: "text", text: "hello" }],
-});
-
-console.log(result.stopReason);
-await client.disconnect();
-```
-
-## Scope
-
-- Implements ACP HTTP transport and connection lifecycle.
-- Supports ACP requests/notifications and session streaming.
-- Does not inject `_meta["sandboxagent.dev"]`.
-- Does not wrap `_sandboxagent/*` extension methods/events.
-
-## Transport Contract
-
-- `POST /v2/rpc` is JSON-only. Send `Content-Type: application/json` and `Accept: application/json`.
-- `GET /v2/rpc` is SSE-only. Send `Accept: text/event-stream`.
-- Keep one active SSE stream per ACP connection id.
-- `x-acp-agent` is removed. Provide agent via `_meta["sandboxagent.dev"].agent` on `initialize` and `session/new`.
-
-If you want Sandbox Agent metadata/extensions and higher-level helpers, use `sandbox-agent` and `SandboxAgentClient` instead.
diff --git a/docs/agent-sessions.mdx b/docs/agent-sessions.mdx
index ac29b9f..0154537 100644
--- a/docs/agent-sessions.mdx
+++ b/docs/agent-sessions.mdx
@@ -21,10 +21,7 @@ const sdk = await SandboxAgent.connect({
 
 const session = await sdk.createSession({
   agent: "codex",
-  sessionInit: {
-    cwd: "/",
-    mcpServers: [],
-  },
+  cwd: "/",
 });
 
 console.log(session.id, session.agentSessionId);
@@ -54,6 +51,108 @@ await session.prompt([
 unsubscribe();
 ```
 
+### Event types
+
+Each event's `payload` contains a session update. The `sessionUpdate` field identifies the type.
+
+<AccordionGroup>
+<Accordion title="agent_message_chunk">
+Streamed text or content from the agent's response.
+
+```json
+{
+  "sessionUpdate": "agent_message_chunk",
+  "content": { "type": "text", "text": "Here's how the repository is structured..." }
+}
+```
+</Accordion>
+
+<Accordion title="agent_thought_chunk">
+Internal reasoning from the agent (chain-of-thought / extended thinking).
+
+```json
+{
+  "sessionUpdate": "agent_thought_chunk",
+  "content": { "type": "text", "text": "I should start by looking at the project structure..." }
+}
+```
+</Accordion>
+
+<Accordion title="user_message_chunk">
+Echo of the user's prompt being processed.
+
+```json
+{
+  "sessionUpdate": "user_message_chunk",
+  "content": { "type": "text", "text": "Summarize the repository structure." }
+}
+```
+</Accordion>
+
+<Accordion title="tool_call">
+The agent invoked a tool (file edit, terminal command, etc.).
+
+```json
+{
+  "sessionUpdate": "tool_call",
+  "toolCallId": "tc_abc123",
+  "title": "Read file",
+  "status": "in_progress",
+  "rawInput": { "path": "/src/index.ts" }
+}
+```
+</Accordion>
+
+<Accordion title="tool_call_update">
+Progress or result update for an in-progress tool call.
+
+```json
+{
+  "sessionUpdate": "tool_call_update",
+  "toolCallId": "tc_abc123",
+  "status": "completed",
+  "content": [{ "type": "text", "text": "import express from 'express';\n..." }]
+}
+```
+</Accordion>
+
+<Accordion title="plan">
+The agent's execution plan for the current task.
+
+```json
+{
+  "sessionUpdate": "plan",
+  "entries": [
+    { "content": "Read the project structure", "status": "completed" },
+    { "content": "Identify main entrypoints", "status": "in_progress" },
+    { "content": "Write summary", "status": "pending" }
+  ]
+}
+```
+</Accordion>
+
+<Accordion title="usage_update">
+Token usage metrics for the current turn.
+
+```json
+{
+  "sessionUpdate": "usage_update"
+}
+```
+</Accordion>
+
+<Accordion title="session_info_update">
+Session metadata changed (e.g. agent-generated title).
+
+```json
+{
+  "sessionUpdate": "session_info_update",
+  "title": "Repository structure analysis"
+}
+```
+</Accordion>
+</AccordionGroup>
+
 ## Fetch persisted event history
 
 ```ts
@@ -82,9 +181,88 @@ if (sessions.items.length > 0) {
 }
 ```
 
+## Configure model, mode, and thought level
+
+Set the model, mode, or thought level on a session at creation time or after:
+
+```ts
+// At creation time
+const session = await sdk.createSession({
+  agent: "codex",
+  model: "gpt-5.3-codex",
+  mode: "auto",
+  thoughtLevel: "high",
+});
+```
+
+```ts
+// After creation
+await session.setModel("gpt-5.2-codex");
+await session.setMode("full-access");
+await session.setThoughtLevel("medium");
+```
+
+Query available modes:
+
+```ts
+const modes = await session.getModes();
+console.log(modes?.currentModeId, modes?.availableModes);
+```
+
+### Advanced config options
+
+For config options beyond model, mode, and thought level, use `getConfigOptions` to discover what the agent supports and `setConfigOption` to set any option by ID:
+
+```ts
+const options = await session.getConfigOptions();
+for (const opt of options) {
+  console.log(opt.id, opt.category, opt.type);
+}
+```
+
+```ts
+await session.setConfigOption("some-agent-option", "value");
+```
+
+## Handle permission requests
+
+For agents that request tool-use permissions, register a permission listener and reply with `once`, `always`, or `reject`:
+
+```ts
+const session = await sdk.createSession({
+  agent: "claude",
+  mode: "default",
+});
+
+session.onPermissionRequest((request) => {
+  console.log(request.toolCall.title, request.availableReplies);
+  void session.respondPermission(request.id, "once");
+});
+
+await session.prompt([
+  { type: "text", text: "Create ./permission-example.txt with the text hello." },
+]);
+```
+
+
+### Auto-approving permissions
+
+To auto-approve all permission requests, respond with `"once"` or `"always"` in your listener:
+
+```ts
+session.onPermissionRequest((request) => {
+  void session.respondPermission(request.id, "always");
+});
+```
+
+See `examples/permissions/src/index.ts` for a complete permissions example that works with Claude and Codex.
+
+<Info>
+Some agents like Claude allow configuring permission behavior through modes (e.g. `bypassPermissions`, `acceptEdits`). We recommend leaving the mode as `default` and handling permission decisions explicitly in `onPermissionRequest` instead.
+</Info>
+
 ## Destroy a session
 
 ```ts
 await sdk.destroySession(session.id);
 ```
-
diff --git a/docs/agents/amp.mdx b/docs/agents/amp.mdx
new file mode 100644
index 0000000..f94e97d
--- /dev/null
+++ b/docs/agents/amp.mdx
@@ -0,0 +1,20 @@
+---
+title: "Amp"
+description: "Use Amp as a sandbox agent."
+---
+
+## Usage
+
+```typescript
+const session = await client.createSession({
+  agent: "amp",
+});
+```
+
+## Capabilities
+
+| Category | Values |
+|----------|--------|
+| **Models** | `amp-default` |
+| **Modes** | `default`, `bypass` |
+| **Thought levels** | Unsupported |
diff --git a/docs/agents/claude.mdx b/docs/agents/claude.mdx
new file mode 100644
index 0000000..2e4fd43
--- /dev/null
+++ b/docs/agents/claude.mdx
@@ -0,0 +1,49 @@
+---
+title: "Claude"
+description: "Use Claude Code as a sandbox agent."
+---
+
+## Usage
+
+```typescript
+const session = await client.createSession({
+  agent: "claude",
+});
+```
+
+## Capabilities
+
+| Category | Values |
+|----------|--------|
+| **Models** | `default`, `sonnet`, `opus`, `haiku` |
+| **Modes** | `default`, `acceptEdits`, `plan`, `dontAsk`, `bypassPermissions` |
+| **Thought levels** | Unsupported |
+
+## Configuring effort level
+
+Claude does not support changing effort level after a session starts. Configure it in the filesystem before creating the session.
+
+```ts
+import { mkdir, writeFile } from "node:fs/promises";
+import path from "node:path";
+
+const cwd = "/path/to/workspace";
+await mkdir(path.join(cwd, ".claude"), { recursive: true });
+await writeFile(
+  path.join(cwd, ".claude", "settings.json"),
+  JSON.stringify({ effortLevel: "high" }, null, 2),
+);
+
+const session = await client.createSession({
+  agent: "claude",
+  cwd,
+});
+```
+
+<Accordion title="Supported settings file locations (highest precedence last)">
+
+1. `~/.claude/settings.json`
+2. `<session cwd>/.claude/settings.json`
+3. `<session cwd>/.claude/settings.local.json`
+
+</Accordion>
diff --git a/docs/agents/codex.mdx b/docs/agents/codex.mdx
new file mode 100644
index 0000000..d359beb
--- /dev/null
+++ b/docs/agents/codex.mdx
@@ -0,0 +1,20 @@
+---
+title: "Codex"
+description: "Use OpenAI Codex as a sandbox agent."
+---
+
+## Usage
+
+```typescript
+const session = await client.createSession({
+  agent: "codex",
+});
+```
+
+## Capabilities
+
+| Category | Values |
+|----------|--------|
+| **Models** | `gpt-5.3-codex` (default), `gpt-5.3-codex-spark`, `gpt-5.2-codex`, `gpt-5.1-codex-max`, `gpt-5.2`, `gpt-5.1-codex-mini` |
+| **Modes** | `read-only` (default), `auto`, `full-access` |
+| **Thought levels** | `low`, `medium`, `high` (default), `xhigh` |
diff --git a/docs/agents/cursor.mdx b/docs/agents/cursor.mdx
new file mode 100644
index 0000000..0905baa
--- /dev/null
+++ b/docs/agents/cursor.mdx
@@ -0,0 +1,34 @@
+---
+title: "Cursor"
+description: "Use Cursor as a sandbox agent."
+---
+
+## Usage
+
+```typescript
+const session = await client.createSession({
+  agent: "cursor",
+});
+```
+
+## Capabilities
+
+| Category | Values |
+|----------|--------|
+| **Models** | See below |
+| **Modes** | Unsupported |
+| **Thought levels** | Unsupported |
+
+<Accordion title="All models">
+
+| Group | Models |
+|-------|--------|
+| **Auto** | `auto` |
+| **Composer** | `composer-1.5`, `composer-1` |
+| **GPT-5.3 Codex** | `gpt-5.3-codex`, `gpt-5.3-codex-low`, `gpt-5.3-codex-high`, `gpt-5.3-codex-xhigh`, `gpt-5.3-codex-fast`, `gpt-5.3-codex-low-fast`, `gpt-5.3-codex-high-fast`, `gpt-5.3-codex-xhigh-fast` |
+| **GPT-5.2** | `gpt-5.2`, `gpt-5.2-high`, `gpt-5.2-codex`, `gpt-5.2-codex-low`, `gpt-5.2-codex-high`, `gpt-5.2-codex-xhigh`, `gpt-5.2-codex-fast`, `gpt-5.2-codex-low-fast`, `gpt-5.2-codex-high-fast`, `gpt-5.2-codex-xhigh-fast` |
+| **GPT-5.1** | `gpt-5.1-high`, `gpt-5.1-codex-max`, `gpt-5.1-codex-max-high` |
+| **Claude** | `opus-4.6-thinking` (default), `opus-4.6`, `opus-4.5`, `opus-4.5-thinking`, `sonnet-4.5`, `sonnet-4.5-thinking` |
+| **Other** | `gemini-3-pro`, `gemini-3-flash`, `grok` |
+
+</Accordion>
diff --git a/docs/agents/opencode.mdx b/docs/agents/opencode.mdx
new file mode 100644
index 0000000..db7b640
--- /dev/null
+++ b/docs/agents/opencode.mdx
@@ -0,0 +1,31 @@
+---
+title: "OpenCode"
+description: "Use OpenCode as a sandbox agent."
+---
+
+## Usage
+
+```typescript
+const session = await client.createSession({
+  agent: "opencode",
+});
+```
+
+## Capabilities
+
+| Category | Values |
+|----------|--------|
+| **Models** | See below |
+| **Modes** | `build` (default), `plan` |
+| **Thought levels** | Unsupported |
+
+<Accordion title="All models">
+
+| Provider | Models |
+|----------|--------|
+| **Anthropic** | `anthropic/claude-3-5-haiku-20241022`, `anthropic/claude-3-5-haiku-latest`, `anthropic/claude-3-5-sonnet-20240620`, `anthropic/claude-3-5-sonnet-20241022`, `anthropic/claude-3-7-sonnet-20250219`, `anthropic/claude-3-7-sonnet-latest`, `anthropic/claude-3-haiku-20240307`, `anthropic/claude-3-opus-20240229`, `anthropic/claude-3-sonnet-20240229`, `anthropic/claude-haiku-4-5`, `anthropic/claude-haiku-4-5-20251001`, `anthropic/claude-opus-4-0`, `anthropic/claude-opus-4-1`, `anthropic/claude-opus-4-1-20250805`, `anthropic/claude-opus-4-20250514`, `anthropic/claude-opus-4-5`, `anthropic/claude-opus-4-5-20251101`, `anthropic/claude-opus-4-6`, `anthropic/claude-sonnet-4-0`, `anthropic/claude-sonnet-4-20250514`, `anthropic/claude-sonnet-4-5`, `anthropic/claude-sonnet-4-5-20250929` |
+| **OpenAI** | `openai/gpt-5.1-codex`, `openai/gpt-5.1-codex-max`, `openai/gpt-5.1-codex-mini`, `openai/gpt-5.2`, `openai/gpt-5.2-codex`, `openai/gpt-5.3-codex` |
+| **Cerebras** | `cerebras/gpt-oss-120b`, `cerebras/qwen-3-235b-a22b-instruct-2507`, `cerebras/zai-glm-4.7` |
+| **OpenCode Zen** | `opencode/big-pickle`, `opencode/claude-3-5-haiku`, `opencode/claude-haiku-4-5`, `opencode/claude-opus-4-1`, `opencode/claude-opus-4-5`, `opencode/claude-opus-4-6`, `opencode/claude-sonnet-4`, `opencode/claude-sonnet-4-5`, `opencode/gemini-3-flash`, `opencode/gemini-3-pro` (default), `opencode/glm-4.6`, `opencode/glm-4.7`, `opencode/gpt-5`, `opencode/gpt-5-codex`, `opencode/gpt-5-nano`, `opencode/gpt-5.1`, `opencode/gpt-5.1-codex`, `opencode/gpt-5.1-codex-max`, `opencode/gpt-5.1-codex-mini`, `opencode/gpt-5.2`, `opencode/gpt-5.2-codex`, `opencode/kimi-k2`, `opencode/kimi-k2-thinking`, `opencode/kimi-k2.5`, `opencode/kimi-k2.5-free`, `opencode/minimax-m2.1`, `opencode/minimax-m2.1-free`, `opencode/trinity-large-preview-free` |
+
+</Accordion>
diff --git a/docs/agents/pi.mdx b/docs/agents/pi.mdx
new file mode 100644
index 0000000..1d56370
--- /dev/null
+++ b/docs/agents/pi.mdx
@@ -0,0 +1,20 @@
+---
+title: "Pi"
+description: "Use Pi as a sandbox agent."
+---
+
+## Usage
+
+```typescript
+const session = await client.createSession({
+  agent: "pi",
+});
+```
+
+## Capabilities
+
+| Category | Values |
+|----------|--------|
+| **Models** | `default` |
+| **Modes** | Unsupported |
+| **Thought levels** | Unsupported |
diff --git a/docs/ai/llms-txt.mdx b/docs/ai/llms-txt.mdx
index ad6fa8b..e5aaf8d 100644
--- a/docs/ai/llms-txt.mdx
+++ b/docs/ai/llms-txt.mdx
@@ -8,8 +8,8 @@ Mintlify publishes `llms.txt` and `llms-full.txt` for this documentation site.
 Access them at:
 
 ```
-https://rivet.dev/docs/llms.txt
-https://rivet.dev/docs/llms-full.txt
+https://sandboxagent.dev/docs/llms.txt
+https://sandboxagent.dev/docs/llms-full.txt
 ```
 
 If you run a reverse proxy in front of the docs, forward `/llms.txt` and `/llms-full.txt` to Mintlify.
diff --git a/docs/ai/skill.mdx b/docs/ai/skill.mdx
index b06e657..105026c 100644
--- a/docs/ai/skill.mdx
+++ b/docs/ai/skill.mdx
@@ -8,7 +8,7 @@ Mintlify hosts a `skill.md` file for this documentation site.
 Access it at:
 
 ```
-https://rivet.dev/docs/skill.md
+https://sandboxagent.dev/docs/skill.md
 ```
 
 To add it to an agent using the Skills CLI:
diff --git a/docs/architecture.mdx b/docs/architecture.mdx
index 78585a2..61b4689 100644
--- a/docs/architecture.mdx
+++ b/docs/architecture.mdx
@@ -1,64 +1,63 @@
 ---
 title: "Architecture"
-description: "How the client, sandbox, server, and agent fit together."
-icon: "microchip"
+description: "How the Sandbox Agent server, SDK, and agent processes fit together."
 ---
 
-Sandbox Agent runs as an HTTP server inside your sandbox. Your app talks to it remotely.
+Sandbox Agent is a lightweight HTTP server that runs **inside** a sandbox. It:
+
+- **Agent management**: Installs, spawns, and stops coding agent processes
+- **Sessions**: Routes prompts to agents and streams events back in real time
+- **Sandbox APIs**: Filesystem, process, and terminal access for the sandbox environment
 
 ## Components
 
-- `Your client`: your app code using the `sandbox-agent` SDK.
-- `Sandbox`: isolated runtime (E2B, Daytona, Docker, etc.).
-- `Sandbox Agent server`: process inside the sandbox exposing HTTP transport.
-- `Agent`: Claude/Codex/OpenCode/Amp process managed by Sandbox Agent.
-
-```mermaid placement="top-right"
-  flowchart LR
-    CLIENT["Sandbox Agent SDK"]
-    SERVER["Sandbox Agent server"]
-    AGENT["Agent process"]
+```mermaid
+flowchart LR
+    CLIENT["Your App"]
 
     subgraph SANDBOX["Sandbox"]
-      direction TB
-      SERVER --> AGENT
+        direction TB
+        SERVER["Sandbox Agent Server"]
+        AGENT["Agent Process<br/>(Claude, Codex, etc.)"]
+        SERVER --> AGENT
     end
 
-    CLIENT -->|HTTP| SERVER
+    CLIENT -->|"SDK (HTTP)"| SERVER
 ```
 
-## Suggested Topology
+- **Your app**: Uses the `sandbox-agent` TypeScript SDK to talk to the server over HTTP.
+- **Sandbox**: An isolated runtime (local process, Docker, E2B, Daytona, Vercel, Cloudflare).
+- **Sandbox Agent server**: A single binary inside the sandbox that manages agent lifecycles, routes prompts, streams events, and exposes filesystem/process/terminal APIs.
+- **Agent process**: A coding agent (Claude Code, Codex, etc.) spawned by the server. Each session maps to one agent process.
 
-Run the SDK on your backend, then call it from your frontend.
+## What `SandboxAgent.start()` does
 
-This extra hop is recommended because it keeps auth/token logic on the backend and makes persistence simpler.
+1. **Provision**: The provider creates a sandbox (starts a container, creates a VM, etc.)
+2. **Install**: The Sandbox Agent binary is installed inside the sandbox
+3. **Boot**: The server starts listening on an HTTP port
+4. **Health check**: The SDK waits for `/v1/health` to respond
+5. **Ready**: The SDK returns a connected client
 
-```mermaid placement="top-right"
-  flowchart LR
-    BROWSER["Browser"]
-    subgraph BACKEND["Your backend"]
-      direction TB
-      SDK["Sandbox Agent SDK"]
-    end
-    subgraph SANDBOX_SIMPLE["Sandbox"]
-      SERVER_SIMPLE["Sandbox Agent server"]
-    end
+For the `local` provider, provisioning is a no-op and the server runs as a local subprocess.
 
-    BROWSER --> BACKEND
-    BACKEND --> SDK --> SERVER_SIMPLE
+### Server recovery
+
+If the server process stops, the SDK automatically calls the provider's `ensureServer()` after 3 consecutive health-check failures. Most built-in providers implement this. Custom providers can add `ensureServer(sandboxId)` to their `SandboxProvider` object.
+
+## Server HTTP API
+
+See the [HTTP API reference](/api-reference) for the full list of server endpoints.
+
+## Agent installation
+
+Agents are installed lazily on first use. To avoid the cold-start delay, pre-install them:
+
+```bash
+sandbox-agent install-agent --all
 ```
 
-### Backend requirements
+The `rivetdev/sandbox-agent:0.4.2-full` Docker image ships with all agents pre-installed.
 
-Your backend layer needs to handle:
+## Production-ready agent orchestration
 
-- **Long-running connections**: prompts can take minutes.
-- **Session affinity**: follow-up messages must reach the same session.
-- **State between requests**: session metadata and event history must persist across requests.
-- **Graceful recovery**: sessions should resume after backend restarts.
-
-We recommend [Rivet](https://rivet.dev) over serverless because actors natively support the long-lived connections, session routing, and state persistence that agent workloads require.
-
-## Session persistence
-
-For storage driver options and replay behavior, see [Persisting Sessions](/session-persistence).
+For production deployments, see [Orchestration Architecture](/orchestration-architecture) for recommended topology, backend requirements, and session persistence patterns.
diff --git a/docs/attachments.mdx b/docs/attachments.mdx
index dcfb412..8deac05 100644
--- a/docs/attachments.mdx
+++ b/docs/attachments.mdx
@@ -58,4 +58,4 @@ Use the filesystem API to upload files, then include file references in prompt c
 
 - Use absolute file URIs in `resource_link` blocks.
 - If `mimeType` is omitted, the agent/runtime may infer a default.
-- Support for non-text resources depends on each agent's ACP prompt capabilities.
+- Support for non-text resources depends on each agent's prompt capabilities.
diff --git a/docs/building-chat-ui.mdx b/docs/building-chat-ui.mdx
deleted file mode 100644
index da706ff..0000000
--- a/docs/building-chat-ui.mdx
+++ /dev/null
@@ -1,370 +0,0 @@
----
-title: "Building a Chat UI"
-description: "Build a chat interface using the universal event stream."
-icon: "comments"
----
-
-## Setup
-
-### List agents
-
-```ts
-const { agents } = await client.listAgents();
-
-// Each agent exposes feature coverage via `capabilities` to determine what UI to show
-const claude = agents.find((a) => a.id === "claude");
-if (claude?.capabilities.permissions) {
-  // Show permission approval UI
-}
-if (claude?.capabilities.questions) {
-  // Show question response UI
-}
-```
-
-### Create a session
-
-```ts
-const sessionId = `session-${crypto.randomUUID()}`;
-
-await client.createSession(sessionId, {
-  agent: "claude",
-  agentMode: "code",        // Optional: agent-specific mode
-  permissionMode: "default", // Optional: "default" | "plan" | "bypass" | "acceptEdits" (Claude: accept edits; Codex: auto-approve file changes; others: default)
-  model: "claude-sonnet-4", // Optional: model override
-});
-```
-
-### Send a message
-
-```ts
-await client.postMessage(sessionId, { message: "Hello, world!" });
-```
-
-### Stream events
-
-Three options for receiving events:
-
-```ts
-// Option 1: SSE (recommended for real-time UI)
-const stream = client.streamEvents(sessionId, { offset: 0 });
-for await (const event of stream) {
-  handleEvent(event);
-}
-
-// Option 2: Polling
-const { events, hasMore } = await client.getEvents(sessionId, { offset: 0 });
-events.forEach(handleEvent);
-
-// Option 3: Turn streaming (send + stream in one call)
-const stream = client.streamTurn(sessionId, { message: "Hello" });
-for await (const event of stream) {
-  handleEvent(event);
-}
-```
-
-Use `offset` to track the last seen `sequence` number and resume from where you left off.
-
----
-
-## Handling Events
-
-### Bare minimum
-
-Handle item lifecycle plus turn lifecycle to render a basic chat:
-
-```ts
-type ItemState = {
-  item: UniversalItem;
-  deltas: string[];
-};
-
-const items = new Map<string, ItemState>();
-let turnInProgress = false;
-
-function handleEvent(event: UniversalEvent) {
-  switch (event.type) {
-    case "turn.started": {
-      turnInProgress = true;
-      break;
-    }
-
-    case "turn.ended": {
-      turnInProgress = false;
-      break;
-    }
-
-    case "item.started": {
-      const { item } = event.data as ItemEventData;
-      items.set(item.item_id, { item, deltas: [] });
-      break;
-    }
-
-    case "item.delta": {
-      const { item_id, delta } = event.data as ItemDeltaData;
-      const state = items.get(item_id);
-      if (state) {
-        state.deltas.push(delta);
-      }
-      break;
-    }
-
-    case "item.completed": {
-      const { item } = event.data as ItemEventData;
-      const state = items.get(item.item_id);
-      if (state) {
-        state.item = item;
-        state.deltas = []; // Clear deltas, use final content
-      }
-      break;
-    }
-  }
-}
-```
-
-When rendering:
-- Use `turnInProgress` for turn-level UI state (disable send button, show global "Agent is responding", etc.).
-- Use `item.status === "in_progress"` for per-item streaming state.
-
-```ts
-function renderItem(state: ItemState) {
-  const { item, deltas } = state;
-  const isItemLoading = item.status === "in_progress";
-
-  // For streaming text, combine item content with accumulated deltas
-  const text = item.content
-    .filter((p) => p.type === "text")
-    .map((p) => p.text)
-    .join("");
-  const streamedText = text + deltas.join("");
-
-  return {
-    content: streamedText,
-    isItemLoading,
-    isTurnLoading: turnInProgress,
-    role: item.role,
-    kind: item.kind,
-  };
-}
-```
-
-### Extra events
-
-Handle these for a complete implementation:
-
-```ts
-function handleEvent(event: UniversalEvent) {
-  switch (event.type) {
-    // ... bare minimum events above ...
-
-    case "session.started": {
-      // Session is ready
-      break;
-    }
-
-    case "session.ended": {
-      const { reason, terminated_by } = event.data as SessionEndedData;
-      // Disable input, show end reason
-      // reason: "completed" | "error" | "terminated"
-      // terminated_by: "agent" | "daemon"
-      break;
-    }
-
-    case "error": {
-      const { message, code } = event.data as ErrorData;
-      // Display error to user
-      break;
-    }
-
-    case "agent.unparsed": {
-      const { error, location } = event.data as AgentUnparsedData;
-      // Parsing failure - treat as bug in development
-      console.error(`Parse error at ${location}: ${error}`);
-      break;
-    }
-  }
-}
-```
-
-### Content parts
-
-Each item has `content` parts. Render based on `type`:
-
-```ts
-function renderContentPart(part: ContentPart) {
-  switch (part.type) {
-    case "text":
-      return <Markdown>{part.text}</Markdown>;
-
-    case "tool_call":
-      return <ToolCall name={part.name} args={part.arguments} />;
-
-    case "tool_result":
-      return <ToolResult output={part.output} />;
-
-    case "file_ref":
-      return <FileChange path={part.path} action={part.action} diff={part.diff} />;
-
-    case "reasoning":
-      return <Reasoning>{part.text}</Reasoning>;
-
-    case "status":
-      return <Status label={part.label} detail={part.detail} />;
-
-    case "image":
-      return <Image src={part.path} />;
-  }
-}
-```
-
----
-
-## Handling Permissions
-
-When `permission.requested` arrives, show an approval UI:
-
-```ts
-const pendingPermissions = new Map<string, PermissionEventData>();
-
-function handleEvent(event: UniversalEvent) {
-  if (event.type === "permission.requested") {
-    const data = event.data as PermissionEventData;
-    pendingPermissions.set(data.permission_id, data);
-  }
-
-  if (event.type === "permission.resolved") {
-    const data = event.data as PermissionEventData;
-    pendingPermissions.delete(data.permission_id);
-  }
-}
-
-// User clicks approve/deny
-async function replyPermission(id: string, reply: "once" | "always" | "reject") {
-  await client.replyPermission(sessionId, id, { reply });
-  pendingPermissions.delete(id);
-}
-```
-
-Render permission requests:
-
-```ts
-function PermissionRequest({ data }: { data: PermissionEventData }) {
-  return (
-    <div>
-      <p>Allow: {data.action}</p>
-      <button onClick={() => replyPermission(data.permission_id, "once")}>
-        Allow Once
-      </button>
-      <button onClick={() => replyPermission(data.permission_id, "always")}>
-        Always Allow
-      </button>
-      <button onClick={() => replyPermission(data.permission_id, "reject")}>
-        Reject
-      </button>
-    </div>
-  );
-}
-```
-
----
-
-## Handling Questions
-
-When `question.requested` arrives, show a selection UI:
-
-```ts
-const pendingQuestions = new Map<string, QuestionEventData>();
-
-function handleEvent(event: UniversalEvent) {
-  if (event.type === "question.requested") {
-    const data = event.data as QuestionEventData;
-    pendingQuestions.set(data.question_id, data);
-  }
-
-  if (event.type === "question.resolved") {
-    const data = event.data as QuestionEventData;
-    pendingQuestions.delete(data.question_id);
-  }
-}
-
-// User selects answer(s)
-async function answerQuestion(id: string, answers: string[][]) {
-  await client.replyQuestion(sessionId, id, { answers });
-  pendingQuestions.delete(id);
-}
-
-async function rejectQuestion(id: string) {
-  await client.rejectQuestion(sessionId, id);
-  pendingQuestions.delete(id);
-}
-```
-
-Render question requests:
-
-```ts
-function QuestionRequest({ data }: { data: QuestionEventData }) {
-  const [selected, setSelected] = useState<string[]>([]);
-
-  return (
-    <div>
-      <p>{data.prompt}</p>
-      {data.options.map((option) => (
-        <label key={option}>
-          <input
-            type="checkbox"
-            checked={selected.includes(option)}
-            onChange={(e) => {
-              if (e.target.checked) {
-                setSelected([...selected, option]);
-              } else {
-                setSelected(selected.filter((s) => s !== option));
-              }
-            }}
-          />
-          {option}
-        </label>
-      ))}
-      <button onClick={() => answerQuestion(data.question_id, [selected])}>
-        Submit
-      </button>
-      <button onClick={() => rejectQuestion(data.question_id)}>
-        Reject
-      </button>
-    </div>
-  );
-}
-```
-
----
-
-## Testing with Mock Agent
-
-The `mock` agent lets you test UI behaviors without external credentials:
-
-```ts
-await client.createSession("test-session", { agent: "mock" });
-```
-
-Send `help` to see available commands:
-
-| Command | Tests |
-|---------|-------|
-| `help` | Lists all commands |
-| `demo` | Full UI coverage sequence with markers |
-| `markdown` | Streaming markdown rendering |
-| `tool` | Tool call + result with file refs |
-| `status` | Status item updates |
-| `image` | Image content part |
-| `permission` | Permission request flow |
-| `question` | Question request flow |
-| `error` | Error + unparsed events |
-| `end` | Session ended event |
-| `echo <text>` | Echo text as assistant message |
-
-Any unrecognized text is echoed back as an assistant message.
-
----
-
-## Reference Implementation
-
-The [Inspector UI](https://github.com/rivet-dev/sandbox-agent/blob/main/frontend/packages/inspector/src/App.tsx)
-is a complete reference showing session management, event rendering, and HITL flows.
diff --git a/docs/cli.mdx b/docs/cli.mdx
index 9472a5e..362de49 100644
--- a/docs/cli.mdx
+++ b/docs/cli.mdx
@@ -37,24 +37,91 @@ Notes:
 - Set `SANDBOX_AGENT_LOG_STDOUT=1` to force stdout/stderr logging.
 - Use `SANDBOX_AGENT_LOG_DIR` to override log directory.
 
-## install-agent
+## install
 
-Install or reinstall a single agent.
+Install first-party runtime dependencies.
+
+### install desktop
+
+Install the Linux desktop runtime packages required by `/v1/desktop/*`.
 
 ```bash
-sandbox-agent install-agent <AGENT> [OPTIONS]
+sandbox-agent install desktop [OPTIONS]
 ```
 
 | Option | Description |
 |--------|-------------|
+| `--yes` | Skip the confirmation prompt |
+| `--print-only` | Print the package-manager command without executing it |
+| `--package-manager <apt\|dnf\|apk>` | Override package-manager detection |
+| `--no-fonts` | Skip the default DejaVu font package |
+
+```bash
+sandbox-agent install desktop --yes
+sandbox-agent install desktop --print-only
+```
+
+Notes:
+
+- Supported on Linux only.
+- The command detects `apt`, `dnf`, or `apk`.
+- If the host is not already running as root, the command requires `sudo`.
+
+## install-agent
+
+Install or reinstall a single agent, or every supported agent with `--all`.
+
+```bash
+sandbox-agent install-agent [<AGENT>] [OPTIONS]
+```
+
+| Option | Description |
+|--------|-------------|
+| `--all` | Install every supported agent |
 | `-r, --reinstall` | Force reinstall |
-| `--agent-version <VERSION>` | Override agent package version |
-| `--agent-process-version <VERSION>` | Override agent process version |
+| `--agent-version <VERSION>` | Override agent package version (conflicts with `--all`) |
+| `--agent-process-version <VERSION>` | Override agent process version (conflicts with `--all`) |
+
+Examples:
 
 ```bash
 sandbox-agent install-agent claude --reinstall
+sandbox-agent install-agent --all
 ```
 
+### Custom Pi implementation path
+
+If you use a forked/custom `pi` binary with `pi-acp`, you can override what executable gets launched.
+
+#### Option 1: explicit command override (recommended)
+
+Set `PI_ACP_PI_COMMAND` in the environment where `sandbox-agent` runs:
+
+```bash
+PI_ACP_PI_COMMAND=/absolute/path/to/your/pi-fork sandbox-agent server
+```
+
+This is forwarded to `pi-acp`, which uses it instead of looking up `pi` on `PATH`.
+
+#### Option 2: PATH override
+
+Put your custom `pi` first on `PATH` before starting `sandbox-agent`:
+
+```bash
+export PATH="/path/to/custom-pi-dir:$PATH"
+sandbox-agent server
+```
+
+#### Option 3: symlink override
+
+Point `pi` to your custom binary via symlink in a directory that is early on `PATH`:
+
+```bash
+ln -sf /absolute/path/to/your/pi-fork /usr/local/bin/pi
+```
+
+Then start `sandbox-agent` normally.
+
 ## opencode (experimental)
 
 Start/reuse daemon and run `opencode attach` against `/opencode`.
@@ -167,6 +234,65 @@ Shared option:
 
 ```bash
 sandbox-agent api agents list [--endpoint <URL>]
+sandbox-agent api agents report [--endpoint <URL>]
 sandbox-agent api agents install <AGENT> [--reinstall] [--endpoint <URL>]
 ```
 
+#### api agents list
+
+List all agents and their install status.
+
+```bash
+sandbox-agent api agents list
+```
+
+#### api agents report
+
+Emit a JSON report of available models, modes, and thought levels for every agent, grouped by category.
+
+```bash
+sandbox-agent api agents report --endpoint http://127.0.0.1:2468 | jq .
+```
+
+Example output:
+
+```json
+{
+  "generatedAtMs": 1740000000000,
+  "endpoint": "http://127.0.0.1:2468",
+  "agents": [
+    {
+      "id": "claude",
+      "installed": true,
+      "models": {
+        "currentValue": "default",
+        "values": [
+          { "value": "default", "name": "Default" },
+          { "value": "sonnet", "name": "Sonnet" },
+          { "value": "opus", "name": "Opus" },
+          { "value": "haiku", "name": "Haiku" }
+        ]
+      },
+      "modes": {
+        "currentValue": "default",
+        "values": [
+          { "value": "default", "name": "Default" },
+          { "value": "acceptEdits", "name": "Accept Edits" },
+          { "value": "plan", "name": "Plan" },
+          { "value": "dontAsk", "name": "Don't Ask" },
+          { "value": "bypassPermissions", "name": "Bypass Permissions" }
+        ]
+      },
+      "thoughtLevels": { "values": [] }
+    }
+  ]
+}
+```
+
+See individual agent pages (e.g. [Claude](/agents/claude), [Codex](/agents/codex)) for supported models, modes, and thought levels.
+
+#### api agents install
+
+```bash
+sandbox-agent api agents install codex --reinstall
+```
diff --git a/docs/common-software.mdx b/docs/common-software.mdx
new file mode 100644
index 0000000..7997a92
--- /dev/null
+++ b/docs/common-software.mdx
@@ -0,0 +1,560 @@
+---
+title: "Common Software"
+description: "Install browsers, languages, databases, and other tools inside the sandbox."
+sidebarTitle: "Common Software"
+icon: "box-open"
+---
+
+The sandbox runs a Debian/Ubuntu base image. You can install software with `apt-get` via the [Process API](/processes) or by customizing your Docker image. This page covers commonly needed packages and how to install them.
+
+## Browsers
+
+### Chromium
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "chromium", "chromium-sandbox"],
+});
+
+// Launch headless
+await sdk.runProcess({
+  command: "chromium",
+  args: ["--headless", "--no-sandbox", "--disable-gpu", "https://example.com"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","chromium","chromium-sandbox"]}'
+```
+</CodeGroup>
+
+<Note>
+Use `--no-sandbox` when running Chromium inside a container. The container itself provides isolation.
+</Note>
+
+### Firefox
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "firefox-esr"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","firefox-esr"]}'
+```
+</CodeGroup>
+
+### Playwright browsers
+
+Playwright bundles its own browser binaries. Install the Playwright CLI and let it download browsers for you.
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "npx",
+  args: ["playwright", "install", "--with-deps", "chromium"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"npx","args":["playwright","install","--with-deps","chromium"]}'
+```
+</CodeGroup>
+
+---
+
+## Languages and runtimes
+
+### Node.js
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "nodejs", "npm"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","nodejs","npm"]}'
+```
+</CodeGroup>
+
+For a specific version, use [nvm](https://github.com/nvm-sh/nvm):
+
+```ts TypeScript
+await sdk.runProcess({
+  command: "bash",
+  args: ["-c", "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash && . ~/.nvm/nvm.sh && nvm install 22"],
+});
+```
+
+### Python
+
+Python 3 is typically pre-installed. To add pip and common packages:
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "python3", "python3-pip", "python3-venv"],
+});
+
+await sdk.runProcess({
+  command: "pip3",
+  args: ["install", "numpy", "pandas", "matplotlib"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","python3","python3-pip","python3-venv"]}'
+
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"pip3","args":["install","numpy","pandas","matplotlib"]}'
+```
+</CodeGroup>
+
+### Go
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "bash",
+  args: ["-c", "curl -fsSL https://go.dev/dl/go1.23.6.linux-amd64.tar.gz | tar -C /usr/local -xz"],
+});
+
+// Add to PATH for subsequent commands
+await sdk.runProcess({
+  command: "bash",
+  args: ["-c", "export PATH=$PATH:/usr/local/go/bin && go version"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"bash","args":["-c","curl -fsSL https://go.dev/dl/go1.23.6.linux-amd64.tar.gz | tar -C /usr/local -xz"]}'
+```
+</CodeGroup>
+
+### Rust
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "bash",
+  args: ["-c", "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"bash","args":["-c","curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"]}'
+```
+</CodeGroup>
+
+### Java (OpenJDK)
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "default-jdk"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","default-jdk"]}'
+```
+</CodeGroup>
+
+### Ruby
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "ruby-full"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","ruby-full"]}'
+```
+</CodeGroup>
+
+---
+
+## Databases
+
+### PostgreSQL
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "postgresql", "postgresql-client"],
+});
+
+// Start the service
+const proc = await sdk.createProcess({
+  command: "bash",
+  args: ["-c", "su - postgres -c 'pg_ctlcluster 15 main start'"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","postgresql","postgresql-client"]}'
+```
+</CodeGroup>
+
+### SQLite
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "sqlite3"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","sqlite3"]}'
+```
+</CodeGroup>
+
+### Redis
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "redis-server"],
+});
+
+const proc = await sdk.createProcess({
+  command: "redis-server",
+  args: ["--daemonize", "no"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","redis-server"]}'
+
+curl -X POST "http://127.0.0.1:2468/v1/processes" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"redis-server","args":["--daemonize","no"]}'
+```
+</CodeGroup>
+
+### MySQL / MariaDB
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "mariadb-server", "mariadb-client"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","mariadb-server","mariadb-client"]}'
+```
+</CodeGroup>
+
+---
+
+## Build tools
+
+### Essential build toolchain
+
+Most compiled software needs the standard build toolchain:
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "build-essential", "cmake", "pkg-config"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","build-essential","cmake","pkg-config"]}'
+```
+</CodeGroup>
+
+This installs `gcc`, `g++`, `make`, `cmake`, and related tools.
+
+---
+
+## Desktop applications
+
+These require the [Computer Use](/computer-use) desktop to be started first.
+
+### LibreOffice
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "libreoffice"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","libreoffice"]}'
+```
+</CodeGroup>
+
+### GIMP
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "gimp"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","gimp"]}'
+```
+</CodeGroup>
+
+### VLC
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "vlc"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","vlc"]}'
+```
+</CodeGroup>
+
+### VS Code (code-server)
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "bash",
+  args: ["-c", "curl -fsSL https://code-server.dev/install.sh | sh"],
+});
+
+const proc = await sdk.createProcess({
+  command: "code-server",
+  args: ["--bind-addr", "0.0.0.0:8080", "--auth", "none"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"bash","args":["-c","curl -fsSL https://code-server.dev/install.sh | sh"]}'
+
+curl -X POST "http://127.0.0.1:2468/v1/processes" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"code-server","args":["--bind-addr","0.0.0.0:8080","--auth","none"]}'
+```
+</CodeGroup>
+
+---
+
+## CLI tools
+
+### Git
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "git"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","git"]}'
+```
+</CodeGroup>
+
+### Docker
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "bash",
+  args: ["-c", "curl -fsSL https://get.docker.com | sh"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"bash","args":["-c","curl -fsSL https://get.docker.com | sh"]}'
+```
+</CodeGroup>
+
+### jq
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "jq"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","jq"]}'
+```
+</CodeGroup>
+
+### tmux
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "tmux"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","tmux"]}'
+```
+</CodeGroup>
+
+---
+
+## Media and graphics
+
+### FFmpeg
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "ffmpeg"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","ffmpeg"]}'
+```
+</CodeGroup>
+
+### ImageMagick
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "imagemagick"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","imagemagick"]}'
+```
+</CodeGroup>
+
+### Poppler (PDF utilities)
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "poppler-utils"],
+});
+
+// Convert PDF to images
+await sdk.runProcess({
+  command: "pdftoppm",
+  args: ["-png", "document.pdf", "output"],
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","poppler-utils"]}'
+```
+</CodeGroup>
+
+---
+
+## Pre-installing in a Docker image
+
+For production use, install software in your Dockerfile instead of at runtime. This avoids repeated downloads and makes startup faster.
+
+```dockerfile
+FROM ubuntu:22.04
+
+RUN apt-get update && apt-get install -y \
+    chromium \
+    firefox-esr \
+    nodejs npm \
+    python3 python3-pip \
+    git curl wget \
+    build-essential \
+    sqlite3 \
+    ffmpeg \
+    imagemagick \
+    jq \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install numpy pandas matplotlib
+```
+
+See [Docker deployment](/deploy/docker) for how to use custom images with Sandbox Agent.
diff --git a/docs/computer-use.mdx b/docs/computer-use.mdx
new file mode 100644
index 0000000..fc6b7d0
--- /dev/null
+++ b/docs/computer-use.mdx
@@ -0,0 +1,859 @@
+---
+title: "Computer Use"
+description: "Control a virtual desktop inside the sandbox with mouse, keyboard, screenshots, recordings, and live streaming."
+sidebarTitle: "Computer Use"
+icon: "desktop"
+---
+
+Sandbox Agent provides a managed virtual desktop (Xvfb + openbox) that you can control programmatically. This is useful for browser automation, GUI testing, and AI computer-use workflows.
+
+## Start and stop
+
+<CodeGroup>
+```ts TypeScript
+import { SandboxAgent } from "sandbox-agent";
+
+const sdk = await SandboxAgent.connect({
+  baseUrl: "http://127.0.0.1:2468",
+});
+
+const status = await sdk.startDesktop({
+  width: 1920,
+  height: 1080,
+  dpi: 96,
+});
+
+console.log(status.state); // "active"
+console.log(status.display); // ":99"
+
+// When done
+await sdk.stopDesktop();
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/desktop/start" \
+  -H "Content-Type: application/json" \
+  -d '{"width":1920,"height":1080,"dpi":96}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/stop"
+```
+</CodeGroup>
+
+All fields in the start request are optional. Defaults are 1440x900 at 96 DPI.
+
+### Start request options
+
+| Field | Type | Default | Description |
+|-------|------|---------|-------------|
+| `width` | number | 1440 | Desktop width in pixels |
+| `height` | number | 900 | Desktop height in pixels |
+| `dpi` | number | 96 | Display DPI |
+| `displayNum` | number | 99 | Starting X display number. The runtime probes from this number upward to find an available display. |
+| `stateDir` | string | (auto) | Desktop state directory for home, logs, recordings |
+| `streamVideoCodec` | string | `"vp8"` | WebRTC video codec (`vp8`, `vp9`, `h264`) |
+| `streamAudioCodec` | string | `"opus"` | WebRTC audio codec (`opus`, `g722`) |
+| `streamFrameRate` | number | 30 | Streaming frame rate (1-60) |
+| `webrtcPortRange` | string | `"59050-59070"` | UDP port range for WebRTC media |
+| `recordingFps` | number | 30 | Default recording FPS when not specified in `startDesktopRecording` (1-60) |
+
+The streaming and recording options configure defaults for the desktop session. They take effect when streaming or recording is started later.
+
+<CodeGroup>
+```ts TypeScript
+const status = await sdk.startDesktop({
+  width: 1920,
+  height: 1080,
+  streamVideoCodec: "h264",
+  streamFrameRate: 60,
+  webrtcPortRange: "59100-59120",
+  recordingFps: 15,
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/desktop/start" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "width": 1920,
+    "height": 1080,
+    "streamVideoCodec": "h264",
+    "streamFrameRate": 60,
+    "webrtcPortRange": "59100-59120",
+    "recordingFps": 15
+  }'
+```
+</CodeGroup>
+
+## Status
+
+<CodeGroup>
+```ts TypeScript
+const status = await sdk.getDesktopStatus();
+console.log(status.state); // "inactive" | "active" | "failed" | ...
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/status"
+```
+</CodeGroup>
+
+## Screenshots
+
+Capture the full desktop or a specific region. Optionally include the cursor position.
+
+<CodeGroup>
+```ts TypeScript
+// Full screenshot (PNG by default)
+const png = await sdk.takeDesktopScreenshot();
+
+// JPEG at 70% quality, half scale
+const jpeg = await sdk.takeDesktopScreenshot({
+  format: "jpeg",
+  quality: 70,
+  scale: 0.5,
+});
+
+// Include cursor overlay
+const withCursor = await sdk.takeDesktopScreenshot({
+  showCursor: true,
+});
+
+// Region screenshot
+const region = await sdk.takeDesktopRegionScreenshot({
+  x: 100,
+  y: 100,
+  width: 400,
+  height: 300,
+});
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/screenshot" --output screenshot.png
+
+curl "http://127.0.0.1:2468/v1/desktop/screenshot?format=jpeg&quality=70&scale=0.5" \
+  --output screenshot.jpg
+
+# Include cursor overlay
+curl "http://127.0.0.1:2468/v1/desktop/screenshot?show_cursor=true" \
+  --output with_cursor.png
+
+curl "http://127.0.0.1:2468/v1/desktop/screenshot/region?x=100&y=100&width=400&height=300" \
+  --output region.png
+```
+</CodeGroup>
+
+### Screenshot options
+
+| Param | Type | Default | Description |
+|-------|------|---------|-------------|
+| `format` | string | `"png"` | Output format: `png`, `jpeg`, or `webp` |
+| `quality` | number | 85 | Compression quality (1-100, JPEG/WebP only) |
+| `scale` | number | 1.0 | Scale factor (0.1-1.0) |
+| `showCursor` | boolean | `false` | Composite a crosshair at the cursor position |
+
+When `showCursor` is enabled, the cursor position is captured at the moment of the screenshot and a red crosshair is drawn at that location. This is useful for AI agents that need to see where the cursor is in the screenshot.
+
+## Mouse
+
+<CodeGroup>
+```ts TypeScript
+// Get current position
+const pos = await sdk.getDesktopMousePosition();
+console.log(pos.x, pos.y);
+
+// Move
+await sdk.moveDesktopMouse({ x: 500, y: 300 });
+
+// Click (left by default)
+await sdk.clickDesktop({ x: 500, y: 300 });
+
+// Right click
+await sdk.clickDesktop({ x: 500, y: 300, button: "right" });
+
+// Double click
+await sdk.clickDesktop({ x: 500, y: 300, clickCount: 2 });
+
+// Drag
+await sdk.dragDesktopMouse({
+  startX: 100, startY: 100,
+  endX: 400, endY: 400,
+});
+
+// Scroll
+await sdk.scrollDesktop({ x: 500, y: 300, deltaY: -3 });
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/mouse/position"
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/mouse/click" \
+  -H "Content-Type: application/json" \
+  -d '{"x":500,"y":300}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/mouse/drag" \
+  -H "Content-Type: application/json" \
+  -d '{"startX":100,"startY":100,"endX":400,"endY":400}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/mouse/scroll" \
+  -H "Content-Type: application/json" \
+  -d '{"x":500,"y":300,"deltaY":-3}'
+```
+</CodeGroup>
+
+## Keyboard
+
+<CodeGroup>
+```ts TypeScript
+// Type text
+await sdk.typeDesktopText({ text: "Hello, world!" });
+
+// Press a key with modifiers
+await sdk.pressDesktopKey({
+  key: "c",
+  modifiers: { ctrl: true },
+});
+
+// Low-level key down/up
+await sdk.keyDownDesktop({ key: "Shift_L" });
+await sdk.keyUpDesktop({ key: "Shift_L" });
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/desktop/keyboard/type" \
+  -H "Content-Type: application/json" \
+  -d '{"text":"Hello, world!"}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/keyboard/press" \
+  -H "Content-Type: application/json" \
+  -d '{"key":"c","modifiers":{"ctrl":true}}'
+```
+</CodeGroup>
+
+## Clipboard
+
+Read and write the X11 clipboard programmatically.
+
+<CodeGroup>
+```ts TypeScript
+// Read clipboard
+const clipboard = await sdk.getDesktopClipboard();
+console.log(clipboard.text);
+
+// Read primary selection (mouse-selected text)
+const primary = await sdk.getDesktopClipboard({ selection: "primary" });
+
+// Write to clipboard
+await sdk.setDesktopClipboard({ text: "Pasted via API" });
+
+// Write to both clipboard and primary selection
+await sdk.setDesktopClipboard({
+  text: "Synced text",
+  selection: "both",
+});
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/clipboard"
+
+curl "http://127.0.0.1:2468/v1/desktop/clipboard?selection=primary"
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/clipboard" \
+  -H "Content-Type: application/json" \
+  -d '{"text":"Pasted via API"}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/clipboard" \
+  -H "Content-Type: application/json" \
+  -d '{"text":"Synced text","selection":"both"}'
+```
+</CodeGroup>
+
+The `selection` parameter controls which X11 selection to read or write:
+
+| Value | Description |
+|-------|-------------|
+| `clipboard` (default) | The standard clipboard (Ctrl+C / Ctrl+V) |
+| `primary` | The primary selection (text selected with the mouse) |
+| `both` | Write to both clipboard and primary selection (write only) |
+
+## Display and windows
+
+<CodeGroup>
+```ts TypeScript
+const display = await sdk.getDesktopDisplayInfo();
+console.log(display.resolution); // { width: 1920, height: 1080, dpi: 96 }
+
+const { windows } = await sdk.listDesktopWindows();
+for (const win of windows) {
+  console.log(win.title, win.x, win.y, win.width, win.height);
+}
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/display/info"
+
+curl "http://127.0.0.1:2468/v1/desktop/windows"
+```
+</CodeGroup>
+
+The windows endpoint filters out noise automatically: window manager internals (Openbox), windows with empty titles, and tiny helper windows (under 120x80) are excluded. The currently active/focused window is always included regardless of filters.
+
+### Focused window
+
+Get the currently focused window without listing all windows.
+
+<CodeGroup>
+```ts TypeScript
+const focused = await sdk.getDesktopFocusedWindow();
+console.log(focused.title, focused.id);
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/windows/focused"
+```
+</CodeGroup>
+
+Returns 404 if no window currently has focus.
+
+### Window management
+
+Focus, move, and resize windows by their X11 window ID.
+
+<CodeGroup>
+```ts TypeScript
+const { windows } = await sdk.listDesktopWindows();
+const win = windows[0];
+
+// Bring window to foreground
+await sdk.focusDesktopWindow(win.id);
+
+// Move window
+await sdk.moveDesktopWindow(win.id, { x: 100, y: 50 });
+
+// Resize window
+await sdk.resizeDesktopWindow(win.id, { width: 1280, height: 720 });
+```
+
+```bash cURL
+# Focus a window
+curl -X POST "http://127.0.0.1:2468/v1/desktop/windows/12345/focus"
+
+# Move a window
+curl -X POST "http://127.0.0.1:2468/v1/desktop/windows/12345/move" \
+  -H "Content-Type: application/json" \
+  -d '{"x":100,"y":50}'
+
+# Resize a window
+curl -X POST "http://127.0.0.1:2468/v1/desktop/windows/12345/resize" \
+  -H "Content-Type: application/json" \
+  -d '{"width":1280,"height":720}'
+```
+</CodeGroup>
+
+All three endpoints return the updated window info so you can verify the operation took effect. The window manager may adjust the requested position or size.
+
+## App launching
+
+Launch applications or open files/URLs on the desktop without needing to shell out.
+
+<CodeGroup>
+```ts TypeScript
+// Launch an app by name
+const result = await sdk.launchDesktopApp({
+  app: "firefox",
+  args: ["--private"],
+});
+console.log(result.processId); // "proc_7"
+
+// Launch and wait for the window to appear
+const withWindow = await sdk.launchDesktopApp({
+  app: "xterm",
+  wait: true,
+});
+console.log(withWindow.windowId); // "12345" or null if timed out
+
+// Open a URL with the default handler
+const opened = await sdk.openDesktopTarget({
+  target: "https://example.com",
+});
+console.log(opened.processId);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/desktop/launch" \
+  -H "Content-Type: application/json" \
+  -d '{"app":"firefox","args":["--private"]}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/launch" \
+  -H "Content-Type: application/json" \
+  -d '{"app":"xterm","wait":true}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/open" \
+  -H "Content-Type: application/json" \
+  -d '{"target":"https://example.com"}'
+```
+</CodeGroup>
+
+The returned `processId` can be used with the [Process API](/processes) to read logs (`GET /v1/processes/{id}/logs`) or stop the application (`POST /v1/processes/{id}/stop`).
+
+When `wait` is `true`, the API polls for up to 5 seconds for a window to appear. If the window appears, its ID is returned in `windowId`. If it times out, `windowId` is `null` but the process is still running.
+
+<Tip>
+**Launch/Open vs the Process API:** Both `launch` and `open` are convenience wrappers around the [Process API](/processes). They create managed processes (with `owner: "desktop"`) that you can inspect, log, and stop through the same Process endpoints. The difference is that `launch` validates the binary exists in PATH first and can optionally wait for a window to appear, while `open` delegates to the system default handler (`xdg-open`). Use the Process API directly when you need full control over command, environment, working directory, or restart policies.
+</Tip>
+
+## Recording
+
+Record the desktop to MP4.
+
+<CodeGroup>
+```ts TypeScript
+const recording = await sdk.startDesktopRecording({ fps: 30 });
+console.log(recording.id);
+
+// ... do things ...
+
+const stopped = await sdk.stopDesktopRecording();
+
+// List all recordings
+const { recordings } = await sdk.listDesktopRecordings();
+
+// Download
+const mp4 = await sdk.downloadDesktopRecording(recording.id);
+
+// Clean up
+await sdk.deleteDesktopRecording(recording.id);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/desktop/recording/start" \
+  -H "Content-Type: application/json" \
+  -d '{"fps":30}'
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/recording/stop"
+
+curl "http://127.0.0.1:2468/v1/desktop/recordings"
+
+curl "http://127.0.0.1:2468/v1/desktop/recordings/rec_1/download" --output recording.mp4
+
+curl -X DELETE "http://127.0.0.1:2468/v1/desktop/recordings/rec_1"
+```
+</CodeGroup>
+
+## Desktop processes
+
+The desktop runtime manages several background processes (Xvfb, openbox, neko, ffmpeg). These are all registered with the general [Process API](/processes) under the `desktop` owner, so you can inspect logs, check status, and troubleshoot using the same tools you use for any other managed process.
+
+<CodeGroup>
+```ts TypeScript
+// List all processes, including desktop-owned ones
+const { processes } = await sdk.listProcesses();
+
+const desktopProcs = processes.filter((p) => p.owner === "desktop");
+for (const p of desktopProcs) {
+  console.log(p.id, p.command, p.status);
+}
+
+// Read logs from a specific desktop process
+const logs = await sdk.getProcessLogs(desktopProcs[0].id, { tail: 50 });
+for (const entry of logs.entries) {
+  console.log(entry.stream, atob(entry.data));
+}
+```
+
+```bash cURL
+# List all processes (desktop processes have owner: "desktop")
+curl "http://127.0.0.1:2468/v1/processes"
+
+# Get logs from a specific desktop process
+curl "http://127.0.0.1:2468/v1/processes/proc_1/logs?tail=50"
+```
+</CodeGroup>
+
+The desktop status endpoint also includes a summary of running processes:
+
+<CodeGroup>
+```ts TypeScript
+const status = await sdk.getDesktopStatus();
+for (const proc of status.processes) {
+  console.log(proc.name, proc.pid, proc.running);
+}
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/desktop/status"
+# Response includes: processes: [{ name: "Xvfb", pid: 123, running: true }, ...]
+```
+</CodeGroup>
+
+| Process | Role | Restart policy |
+|---------|------|---------------|
+| Xvfb | Virtual X11 framebuffer | Auto-restart while desktop is active |
+| openbox | Window manager | Auto-restart while desktop is active |
+| neko | WebRTC streaming server (started by `startDesktopStream`) | No auto-restart |
+| ffmpeg | Screen recorder (started by `startDesktopRecording`) | No auto-restart |
+
+## Live streaming
+
+Start a WebRTC stream for real-time desktop viewing in a browser.
+
+<CodeGroup>
+```ts TypeScript
+await sdk.startDesktopStream();
+
+// Check stream status
+const status = await sdk.getDesktopStreamStatus();
+console.log(status.active); // true
+console.log(status.processId); // "proc_5"
+
+// Connect via the React DesktopViewer component or
+// use the WebSocket signaling endpoint directly
+// at ws://127.0.0.1:2468/v1/desktop/stream/signaling
+
+await sdk.stopDesktopStream();
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/desktop/stream/start"
+
+# Check stream status
+curl "http://127.0.0.1:2468/v1/desktop/stream/status"
+
+# Connect to ws://127.0.0.1:2468/v1/desktop/stream/signaling for WebRTC signaling
+
+curl -X POST "http://127.0.0.1:2468/v1/desktop/stream/stop"
+```
+</CodeGroup>
+
+For a drop-in React component, see [React Components](/react-components).
+
+## API reference
+
+### Endpoints
+
+| Method | Path | Description |
+|--------|------|-------------|
+| `POST` | `/v1/desktop/start` | Start the desktop runtime |
+| `POST` | `/v1/desktop/stop` | Stop the desktop runtime |
+| `GET` | `/v1/desktop/status` | Get desktop runtime status |
+| `GET` | `/v1/desktop/screenshot` | Capture full desktop screenshot |
+| `GET` | `/v1/desktop/screenshot/region` | Capture a region screenshot |
+| `GET` | `/v1/desktop/mouse/position` | Get current mouse position |
+| `POST` | `/v1/desktop/mouse/move` | Move the mouse |
+| `POST` | `/v1/desktop/mouse/click` | Click the mouse |
+| `POST` | `/v1/desktop/mouse/down` | Press mouse button down |
+| `POST` | `/v1/desktop/mouse/up` | Release mouse button |
+| `POST` | `/v1/desktop/mouse/drag` | Drag from one point to another |
+| `POST` | `/v1/desktop/mouse/scroll` | Scroll at a position |
+| `POST` | `/v1/desktop/keyboard/type` | Type text |
+| `POST` | `/v1/desktop/keyboard/press` | Press a key with optional modifiers |
+| `POST` | `/v1/desktop/keyboard/down` | Press a key down (hold) |
+| `POST` | `/v1/desktop/keyboard/up` | Release a key |
+| `GET` | `/v1/desktop/display/info` | Get display info |
+| `GET` | `/v1/desktop/windows` | List visible windows |
+| `GET` | `/v1/desktop/windows/focused` | Get focused window info |
+| `POST` | `/v1/desktop/windows/{id}/focus` | Focus a window |
+| `POST` | `/v1/desktop/windows/{id}/move` | Move a window |
+| `POST` | `/v1/desktop/windows/{id}/resize` | Resize a window |
+| `GET` | `/v1/desktop/clipboard` | Read clipboard contents |
+| `POST` | `/v1/desktop/clipboard` | Write to clipboard |
+| `POST` | `/v1/desktop/launch` | Launch an application |
+| `POST` | `/v1/desktop/open` | Open a file or URL |
+| `POST` | `/v1/desktop/recording/start` | Start recording |
+| `POST` | `/v1/desktop/recording/stop` | Stop recording |
+| `GET` | `/v1/desktop/recordings` | List recordings |
+| `GET` | `/v1/desktop/recordings/{id}` | Get recording metadata |
+| `GET` | `/v1/desktop/recordings/{id}/download` | Download recording |
+| `DELETE` | `/v1/desktop/recordings/{id}` | Delete recording |
+| `POST` | `/v1/desktop/stream/start` | Start WebRTC streaming |
+| `POST` | `/v1/desktop/stream/stop` | Stop WebRTC streaming |
+| `GET` | `/v1/desktop/stream/status` | Get stream status |
+| `GET` | `/v1/desktop/stream/signaling` | WebSocket for WebRTC signaling |
+
+### TypeScript SDK methods
+
+| Method | Returns | Description |
+|--------|---------|-------------|
+| `startDesktop(request?)` | `DesktopStatusResponse` | Start the desktop |
+| `stopDesktop()` | `DesktopStatusResponse` | Stop the desktop |
+| `getDesktopStatus()` | `DesktopStatusResponse` | Get desktop status |
+| `takeDesktopScreenshot(query?)` | `Uint8Array` | Capture screenshot |
+| `takeDesktopRegionScreenshot(query)` | `Uint8Array` | Capture region screenshot |
+| `getDesktopMousePosition()` | `DesktopMousePositionResponse` | Get mouse position |
+| `moveDesktopMouse(request)` | `DesktopMousePositionResponse` | Move mouse |
+| `clickDesktop(request)` | `DesktopMousePositionResponse` | Click mouse |
+| `mouseDownDesktop(request)` | `DesktopMousePositionResponse` | Mouse button down |
+| `mouseUpDesktop(request)` | `DesktopMousePositionResponse` | Mouse button up |
+| `dragDesktopMouse(request)` | `DesktopMousePositionResponse` | Drag mouse |
+| `scrollDesktop(request)` | `DesktopMousePositionResponse` | Scroll |
+| `typeDesktopText(request)` | `DesktopActionResponse` | Type text |
+| `pressDesktopKey(request)` | `DesktopActionResponse` | Press key |
+| `keyDownDesktop(request)` | `DesktopActionResponse` | Key down |
+| `keyUpDesktop(request)` | `DesktopActionResponse` | Key up |
+| `getDesktopDisplayInfo()` | `DesktopDisplayInfoResponse` | Get display info |
+| `listDesktopWindows()` | `DesktopWindowListResponse` | List windows |
+| `getDesktopFocusedWindow()` | `DesktopWindowInfo` | Get focused window |
+| `focusDesktopWindow(id)` | `DesktopWindowInfo` | Focus a window |
+| `moveDesktopWindow(id, request)` | `DesktopWindowInfo` | Move a window |
+| `resizeDesktopWindow(id, request)` | `DesktopWindowInfo` | Resize a window |
+| `getDesktopClipboard(query?)` | `DesktopClipboardResponse` | Read clipboard |
+| `setDesktopClipboard(request)` | `DesktopActionResponse` | Write clipboard |
+| `launchDesktopApp(request)` | `DesktopLaunchResponse` | Launch an app |
+| `openDesktopTarget(request)` | `DesktopOpenResponse` | Open file/URL |
+| `startDesktopRecording(request?)` | `DesktopRecordingInfo` | Start recording |
+| `stopDesktopRecording()` | `DesktopRecordingInfo` | Stop recording |
+| `listDesktopRecordings()` | `DesktopRecordingListResponse` | List recordings |
+| `getDesktopRecording(id)` | `DesktopRecordingInfo` | Get recording |
+| `downloadDesktopRecording(id)` | `Uint8Array` | Download recording |
+| `deleteDesktopRecording(id)` | `void` | Delete recording |
+| `startDesktopStream()` | `DesktopStreamStatusResponse` | Start streaming |
+| `stopDesktopStream()` | `DesktopStreamStatusResponse` | Stop streaming |
+| `getDesktopStreamStatus()` | `DesktopStreamStatusResponse` | Stream status |
+
+## Customizing the desktop environment
+
+The desktop runs inside the sandbox filesystem, so you can customize it using the [File System](/file-system) API before or after starting the desktop. The desktop HOME directory is located at `~/.local/state/sandbox-agent/desktop/home` (or `$XDG_STATE_HOME/sandbox-agent/desktop/home` if `XDG_STATE_HOME` is set).
+
+All configuration files below are written to paths relative to this HOME directory.
+
+### Window manager (openbox)
+
+The desktop uses [openbox](http://openbox.org/) as its window manager. You can customize its behavior, theme, and keyboard shortcuts by writing an `rc.xml` config file.
+
+<CodeGroup>
+```ts TypeScript
+const openboxConfig = `<?xml version="1.0" encoding="UTF-8"?>
+<openbox_config xmlns="http://openbox.org/3.4/rc">
+  <theme>
+    <name>Clearlooks</name>
+    <titleLayout>NLIMC</titleLayout>
+    <font place="ActiveWindow"><name>DejaVu Sans</name><size>10</size></font>
+  </theme>
+  <desktops><number>1</number></desktops>
+  <keyboard>
+    <keybind key="A-F4"><action name="Close"/></keybind>
+    <keybind key="A-Tab"><action name="NextWindow"/></keybind>
+  </keyboard>
+</openbox_config>`;
+
+await sdk.mkdirFs({ path: "~/.local/state/sandbox-agent/desktop/home/.config/openbox" });
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/.config/openbox/rc.xml" },
+  openboxConfig,
+);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/fs/mkdir?path=~/.local/state/sandbox-agent/desktop/home/.config/openbox"
+
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/.config/openbox/rc.xml" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @rc.xml
+```
+</CodeGroup>
+
+### Autostart programs
+
+Openbox runs scripts in `~/.config/openbox/autostart` on startup. Use this to launch applications, set the background, or configure the environment.
+
+<CodeGroup>
+```ts TypeScript
+const autostart = `#!/bin/sh
+# Set a solid background color
+xsetroot -solid "#1e1e2e" &
+
+# Launch a terminal
+xterm -geometry 120x40+50+50 &
+
+# Launch a browser
+firefox --no-remote &
+`;
+
+await sdk.mkdirFs({ path: "~/.local/state/sandbox-agent/desktop/home/.config/openbox" });
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/.config/openbox/autostart" },
+  autostart,
+);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/fs/mkdir?path=~/.local/state/sandbox-agent/desktop/home/.config/openbox"
+
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/.config/openbox/autostart" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @autostart.sh
+```
+</CodeGroup>
+
+<Note>
+The autostart script runs when openbox starts, which happens during `startDesktop()`. Write the autostart file before calling `startDesktop()` for it to take effect.
+</Note>
+
+### Background
+
+There is no wallpaper set by default (the background is the X root window default). You can set it using `xsetroot` in the autostart script (as shown above), or use `feh` if you need an image:
+
+<CodeGroup>
+```ts TypeScript
+// Upload a wallpaper image
+import fs from "node:fs";
+
+const wallpaper = await fs.promises.readFile("./wallpaper.png");
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/wallpaper.png" },
+  wallpaper,
+);
+
+// Set the autostart to apply it
+const autostart = `#!/bin/sh
+feh --bg-fill ~/wallpaper.png &
+`;
+
+await sdk.mkdirFs({ path: "~/.local/state/sandbox-agent/desktop/home/.config/openbox" });
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/.config/openbox/autostart" },
+  autostart,
+);
+```
+
+```bash cURL
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/wallpaper.png" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @wallpaper.png
+
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/.config/openbox/autostart" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @autostart.sh
+```
+</CodeGroup>
+
+<Note>
+`feh` is not installed by default. Install it via the [Process API](/processes) before starting the desktop: `await sdk.runProcess({ command: "apt-get", args: ["install", "-y", "feh"] })`.
+</Note>
+
+### Fonts
+
+Only `fonts-dejavu-core` is installed by default. To add more fonts, install them with your system package manager or copy font files into the sandbox:
+
+<CodeGroup>
+```ts TypeScript
+// Install a font package
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "fonts-noto", "fonts-liberation"],
+});
+
+// Or copy a custom font file
+import fs from "node:fs";
+
+const font = await fs.promises.readFile("./CustomFont.ttf");
+await sdk.mkdirFs({ path: "~/.local/state/sandbox-agent/desktop/home/.local/share/fonts" });
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/.local/share/fonts/CustomFont.ttf" },
+  font,
+);
+
+// Rebuild the font cache
+await sdk.runProcess({ command: "fc-cache", args: ["-fv"] });
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","fonts-noto","fonts-liberation"]}'
+
+curl -X POST "http://127.0.0.1:2468/v1/fs/mkdir?path=~/.local/state/sandbox-agent/desktop/home/.local/share/fonts"
+
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/.local/share/fonts/CustomFont.ttf" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @CustomFont.ttf
+
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"fc-cache","args":["-fv"]}'
+```
+</CodeGroup>
+
+### Cursor theme
+
+<CodeGroup>
+```ts TypeScript
+await sdk.runProcess({
+  command: "apt-get",
+  args: ["install", "-y", "dmz-cursor-theme"],
+});
+
+const xresources = `Xcursor.theme: DMZ-White\nXcursor.size: 24\n`;
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/.Xresources" },
+  xresources,
+);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"apt-get","args":["install","-y","dmz-cursor-theme"]}'
+
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/.Xresources" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary 'Xcursor.theme: DMZ-White\nXcursor.size: 24'
+```
+</CodeGroup>
+
+<Note>
+Run `xrdb -merge ~/.Xresources` (via the autostart or process API) after writing the file for changes to take effect.
+</Note>
+
+### Shell and terminal
+
+No terminal emulator or shell is launched by default. Add one to the openbox autostart:
+
+```sh
+# In ~/.config/openbox/autostart
+xterm -geometry 120x40+50+50 &
+```
+
+To use a different shell, set the `SHELL` environment variable in your Dockerfile or install your preferred shell and configure the terminal to use it.
+
+### GTK theme
+
+Applications using GTK will pick up settings from `~/.config/gtk-3.0/settings.ini`:
+
+<CodeGroup>
+```ts TypeScript
+const gtkSettings = `[Settings]
+gtk-theme-name=Adwaita
+gtk-icon-theme-name=Adwaita
+gtk-font-name=DejaVu Sans 10
+gtk-cursor-theme-name=DMZ-White
+gtk-cursor-theme-size=24
+`;
+
+await sdk.mkdirFs({ path: "~/.local/state/sandbox-agent/desktop/home/.config/gtk-3.0" });
+await sdk.writeFsFile(
+  { path: "~/.local/state/sandbox-agent/desktop/home/.config/gtk-3.0/settings.ini" },
+  gtkSettings,
+);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/fs/mkdir?path=~/.local/state/sandbox-agent/desktop/home/.config/gtk-3.0"
+
+curl -X PUT "http://127.0.0.1:2468/v1/fs/file?path=~/.local/state/sandbox-agent/desktop/home/.config/gtk-3.0/settings.ini" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @settings.ini
+```
+</CodeGroup>
+
+### Summary of configuration paths
+
+All paths are relative to the desktop HOME directory (`~/.local/state/sandbox-agent/desktop/home`).
+
+| What | Path | Notes |
+|------|------|-------|
+| Openbox config | `.config/openbox/rc.xml` | Window manager theme, keybindings, behavior |
+| Autostart | `.config/openbox/autostart` | Shell script run on desktop start |
+| Custom fonts | `.local/share/fonts/` | TTF/OTF files, run `fc-cache -fv` after |
+| Cursor theme | `.Xresources` | Requires `xrdb -merge` to apply |
+| GTK 3 settings | `.config/gtk-3.0/settings.ini` | Theme, icons, fonts for GTK apps |
+| Wallpaper | Any path, referenced from autostart | Requires `feh` or similar tool |
diff --git a/docs/credentials.mdx b/docs/credentials.mdx
deleted file mode 100644
index d014921..0000000
--- a/docs/credentials.mdx
+++ /dev/null
@@ -1,115 +0,0 @@
----
-title: "Credentials"
-description: "How Sandbox Agent discovers and uses provider credentials."
----
-
-Sandbox Agent discovers API credentials from environment variables and local agent config files.
-These credentials are passed through to underlying agent runtimes.
-
-## Credential sources
-
-Credentials are discovered in priority order.
-
-### Environment variables (highest priority)
-
-API keys first:
-
-| Variable | Provider |
-|----------|----------|
-| `ANTHROPIC_API_KEY` | Anthropic |
-| `CLAUDE_API_KEY` | Anthropic fallback |
-| `OPENAI_API_KEY` | OpenAI |
-| `CODEX_API_KEY` | OpenAI fallback |
-
-OAuth tokens (used when OAuth extraction is enabled):
-
-| Variable | Provider |
-|----------|----------|
-| `CLAUDE_CODE_OAUTH_TOKEN` | Anthropic |
-| `ANTHROPIC_AUTH_TOKEN` | Anthropic fallback |
-
-### Agent config files
-
-| Agent | Config path | Provider |
-|-------|-------------|----------|
-| Amp | `~/.amp/config.json` | Anthropic |
-| Claude Code | `~/.claude.json`, `~/.claude/.credentials.json` | Anthropic |
-| Codex | `~/.codex/auth.json` | OpenAI |
-| OpenCode | `~/.local/share/opencode/auth.json` | Anthropic/OpenAI |
-
-## Provider requirements by agent
-
-| Agent | Required provider |
-|-------|-------------------|
-| Claude Code | Anthropic |
-| Amp | Anthropic |
-| Codex | OpenAI |
-| OpenCode | Anthropic or OpenAI |
-| Mock | None |
-
-## Error handling behavior
-
-Credential extraction is best-effort:
-
-- Missing or malformed files are skipped.
-- Discovery continues to later sources.
-- Missing credentials mark providers unavailable instead of failing server startup.
-
-When prompting, Sandbox Agent does not pre-validate provider credentials. Agent-native authentication errors surface through session events/output.
-
-## Checking credential status
-
-### API
-
-`GET /v1/agents` includes `credentialsAvailable` per agent.
-
-```json
-{
-  "agents": [
-    {
-      "id": "claude",
-      "installed": true,
-      "credentialsAvailable": true
-    },
-    {
-      "id": "codex",
-      "installed": true,
-      "credentialsAvailable": false
-    }
-  ]
-}
-```
-
-### TypeScript SDK
-
-```typescript
-const result = await sdk.listAgents();
-
-for (const agent of result.agents) {
-  console.log(`${agent.id}: ${agent.credentialsAvailable ? "authenticated" : "no credentials"}`);
-}
-```
-
-## Passing credentials explicitly
-
-Set environment variables before starting Sandbox Agent:
-
-```bash
-export ANTHROPIC_API_KEY=sk-ant-...
-export OPENAI_API_KEY=sk-...
-sandbox-agent daemon start
-```
-
-Or with SDK-managed local spawn:
-
-```typescript
-import { SandboxAgent } from "sandbox-agent";
-
-const sdk = await SandboxAgent.start({
-  spawn: {
-    env: {
-      ANTHROPIC_API_KEY: process.env.MY_ANTHROPIC_KEY,
-    },
-  },
-});
-```
diff --git a/docs/custom-tools.mdx b/docs/custom-tools.mdx
index 727fb02..2fb3e15 100644
--- a/docs/custom-tools.mdx
+++ b/docs/custom-tools.mdx
@@ -80,9 +80,7 @@ await sdk.setMcpConfig(
 
 const session = await sdk.createSession({
   agent: "claude",
-  sessionInit: {
-    cwd: "/workspace",
-  },
+  cwd: "/workspace",
 });
 
 await session.prompt([
@@ -145,9 +143,7 @@ await sdk.writeFsFile({ path: "/opt/skills/random-number/SKILL.md" }, skill);
 ```ts
 const session = await sdk.createSession({
   agent: "claude",
-  sessionInit: {
-    cwd: "/workspace",
-  },
+  cwd: "/workspace",
 });
 
 await session.prompt([
diff --git a/docs/deploy/boxlite.mdx b/docs/deploy/boxlite.mdx
new file mode 100644
index 0000000..8c02bb4
--- /dev/null
+++ b/docs/deploy/boxlite.mdx
@@ -0,0 +1,67 @@
+---
+title: "BoxLite"
+description: "Run Sandbox Agent inside a BoxLite micro-VM."
+---
+
+BoxLite is a local-first micro-VM sandbox — no cloud account needed.
+See [BoxLite docs](https://docs.boxlite.ai) for platform requirements (KVM on Linux, Apple Silicon on macOS).
+
+## Prerequisites
+
+- `@boxlite-ai/boxlite` installed (requires KVM or Apple Hypervisor)
+- Docker (to build the base image)
+- `ANTHROPIC_API_KEY` or `OPENAI_API_KEY`
+
+## Base image
+
+Build a Docker image with Sandbox Agent pre-installed, then export it as an OCI layout
+that BoxLite can load directly (BoxLite has its own image store separate from Docker):
+
+```dockerfile
+FROM node:22-bookworm-slim
+RUN apt-get update && apt-get install -y curl ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
+RUN sandbox-agent install-agent claude
+RUN sandbox-agent install-agent codex
+```
+
+```bash
+docker build -t sandbox-agent-boxlite .
+mkdir -p oci-image
+docker save sandbox-agent-boxlite | tar -xf - -C oci-image
+```
+
+## TypeScript example
+
+```typescript
+import { SimpleBox } from "@boxlite-ai/boxlite";
+import { SandboxAgent } from "sandbox-agent";
+
+const env: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+const box = new SimpleBox({
+  rootfsPath: "./oci-image",
+  env,
+  ports: [{ hostPort: 3000, guestPort: 3000 }],
+  diskSizeGb: 4,
+});
+
+await box.exec("sh", "-c",
+  "nohup sandbox-agent server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &"
+);
+
+const baseUrl = "http://localhost:3000";
+const sdk = await SandboxAgent.connect({ baseUrl });
+
+const session = await sdk.createSession({ agent: "claude" });
+const off = session.onEvent((event) => {
+  console.log(event.sender, event.payload);
+});
+
+await session.prompt([{ type: "text", text: "Summarize this repository" }]);
+off();
+
+await box.stop();
+```
diff --git a/docs/deploy/cloudflare.mdx b/docs/deploy/cloudflare.mdx
index 5328653..c0370e4 100644
--- a/docs/deploy/cloudflare.mdx
+++ b/docs/deploy/cloudflare.mdx
@@ -25,24 +25,60 @@ cd my-sandbox
 ```dockerfile
 FROM cloudflare/sandbox:0.7.0
 
-RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh
+RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
 RUN sandbox-agent install-agent claude && sandbox-agent install-agent codex
 
 EXPOSE 8000
 ```
 
-## TypeScript proxy example
+## TypeScript example (with provider)
+
+For standalone scripts, use the `cloudflare` provider:
+
+```bash
+npm install sandbox-agent@0.4.x @cloudflare/sandbox
+```
+
+```typescript
+import { SandboxAgent } from "sandbox-agent";
+import { cloudflare } from "sandbox-agent/cloudflare";
+
+const sdk = await SandboxAgent.start({
+  sandbox: cloudflare(),
+});
+
+try {
+  const session = await sdk.createSession({ agent: "codex" });
+  const response = await session.prompt([
+    { type: "text", text: "Summarize this repository" },
+  ]);
+  console.log(response.stopReason);
+} finally {
+  await sdk.destroySandbox();
+}
+```
+
+The `cloudflare` provider uses `containerFetch` under the hood, automatically stripping `AbortSignal` to avoid dropped streaming updates.
+
+## TypeScript example (Durable Objects)
+
+For Workers with Durable Objects, use `SandboxAgent.connect(...)` with a custom `fetch` backed by `sandbox.containerFetch(...)`:
 
 ```typescript
 import { getSandbox, type Sandbox } from "@cloudflare/sandbox";
+import { Hono } from "hono";
+import { SandboxAgent } from "sandbox-agent";
+
 export { Sandbox } from "@cloudflare/sandbox";
 
-type Env = {
+type Bindings = {
   Sandbox: DurableObjectNamespace<Sandbox>;
+  ASSETS: Fetcher;
   ANTHROPIC_API_KEY?: string;
   OPENAI_API_KEY?: string;
 };
 
+const app = new Hono<{ Bindings: Bindings }>();
 const PORT = 8000;
 
 async function isServerRunning(sandbox: Sandbox): Promise<boolean> {
@@ -54,64 +90,85 @@ async function isServerRunning(sandbox: Sandbox): Promise<boolean> {
   }
 }
 
-async function ensureRunning(sandbox: Sandbox, env: Env): Promise<void> {
-  if (await isServerRunning(sandbox)) return;
-
-  const envVars: Record<string, string> = {};
-  if (env.ANTHROPIC_API_KEY) envVars.ANTHROPIC_API_KEY = env.ANTHROPIC_API_KEY;
-  if (env.OPENAI_API_KEY) envVars.OPENAI_API_KEY = env.OPENAI_API_KEY;
-  await sandbox.setEnvVars(envVars);
-
-  await sandbox.startProcess(`sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`);
-
-  for (let i = 0; i < 30; i++) {
-    if (await isServerRunning(sandbox)) return;
-    await new Promise((r) => setTimeout(r, 200));
+async function getReadySandbox(name: string, env: Bindings): Promise<Sandbox> {
+  const sandbox = getSandbox(env.Sandbox, name);
+  if (!(await isServerRunning(sandbox))) {
+    const envVars: Record<string, string> = {};
+    if (env.ANTHROPIC_API_KEY) envVars.ANTHROPIC_API_KEY = env.ANTHROPIC_API_KEY;
+    if (env.OPENAI_API_KEY) envVars.OPENAI_API_KEY = env.OPENAI_API_KEY;
+    await sandbox.setEnvVars(envVars);
+    await sandbox.startProcess(`sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`);
   }
-
-  throw new Error("sandbox-agent failed to start");
+  return sandbox;
 }
 
-export default {
-  async fetch(request: Request, env: Env): Promise<Response> {
-    const url = new URL(request.url);
-    const match = url.pathname.match(/^\/sandbox\/([^/]+)(\/.*)?$/);
+app.post("/sandbox/:name/prompt", async (c) => {
+  const sandbox = await getReadySandbox(c.req.param("name"), c.env);
 
-    if (!match) {
-      return new Response("Not found", { status: 404 });
-    }
+  const sdk = await SandboxAgent.connect({
+    fetch: (input, init) =>
+      sandbox.containerFetch(
+        input as Request | string | URL,
+        {
+          ...(init ?? {}),
+          // Avoid passing AbortSignal through containerFetch; it can drop streamed session updates.
+          signal: undefined,
+        },
+        PORT,
+      ),
+  });
 
-    const [, name, path = "/"] = match;
-    const sandbox = getSandbox(env.Sandbox, name);
-    await ensureRunning(sandbox, env);
+  const session = await sdk.createSession({ agent: "codex" });
+  const response = await session.prompt([{ type: "text", text: "Summarize this repository" }]);
+  await sdk.destroySession(session.id);
+  await sdk.dispose();
 
-    return sandbox.containerFetch(
-      new Request(`http://localhost${path}${url.search}`, request),
-      PORT,
-    );
-  },
-};
+  return c.json(response);
+});
+
+app.all("/sandbox/:name/proxy/*", async (c) => {
+  const sandbox = await getReadySandbox(c.req.param("name"), c.env);
+  const wildcard = c.req.param("*");
+  const path = wildcard ? `/${wildcard}` : "/";
+  const query = new URL(c.req.raw.url).search;
+
+  return sandbox.containerFetch(new Request(`http://localhost${path}${query}`, c.req.raw), PORT);
+});
+
+app.all("*", (c) => c.env.ASSETS.fetch(c.req.raw));
+
+export default app;
 ```
 
-## Connect from a client
+This keeps all Sandbox Agent calls inside the Cloudflare sandbox routing path and does not require a `baseUrl`.
 
-```typescript
-import { SandboxAgent } from "sandbox-agent";
+## Troubleshooting streaming updates
 
+If you only receive:
+- the outbound prompt request
+- the final `{ stopReason: "end_turn" }` response
+
+then the streamed update channel dropped. In Cloudflare sandbox paths, this is typically caused by forwarding `AbortSignal` from SDK fetch init into `containerFetch(...)`.
+
+Fix:
+
+```ts
 const sdk = await SandboxAgent.connect({
-  baseUrl: "http://localhost:8787/sandbox/my-sandbox",
+  fetch: (input, init) =>
+    sandbox.containerFetch(
+      input as Request | string | URL,
+      {
+        ...(init ?? {}),
+        // Avoid passing AbortSignal through containerFetch; it can drop streamed session updates.
+        signal: undefined,
+      },
+      PORT,
+    ),
 });
-
-const session = await sdk.createSession({ agent: "claude" });
-
-const off = session.onEvent((event) => {
-  console.log(event.sender, event.payload);
-});
-
-await session.prompt([{ type: "text", text: "Summarize this repository" }]);
-off();
 ```
 
+This keeps prompt completion behavior the same, but restores streamed text/tool updates.
+
 ## Local development
 
 ```bash
@@ -121,7 +178,7 @@ npm run dev
 Test health:
 
 ```bash
-curl http://localhost:8787/sandbox/demo/v1/health
+curl http://localhost:8787/sandbox/demo/proxy/v1/health
 ```
 
 ## Production deployment
diff --git a/docs/deploy/computesdk.mdx b/docs/deploy/computesdk.mdx
index 5e07da0..601d9c7 100644
--- a/docs/deploy/computesdk.mdx
+++ b/docs/deploy/computesdk.mdx
@@ -1,160 +1,66 @@
 ---
 title: "ComputeSDK"
-description: "Deploy the daemon using ComputeSDK's provider-agnostic sandbox API."
+description: "Deploy Sandbox Agent using ComputeSDK's provider-agnostic sandbox API."
 ---
 
-[ComputeSDK](https://computesdk.com) provides a unified interface for managing sandboxes across multiple providers. Write once, deploy anywhere—switch providers by changing environment variables.
+[ComputeSDK](https://computesdk.com) provides a unified interface for managing sandboxes across multiple providers. Write once, deploy anywhere by changing environment variables.
 
 ## Prerequisites
 
 - `COMPUTESDK_API_KEY` from [console.computesdk.com](https://console.computesdk.com)
 - Provider API key (one of: `E2B_API_KEY`, `DAYTONA_API_KEY`, `VERCEL_TOKEN`, `MODAL_TOKEN_ID` + `MODAL_TOKEN_SECRET`, `BLAXEL_API_KEY`, `CSB_API_KEY`)
-- `ANTHROPIC_API_KEY` or `OPENAI_API_KEY` for the coding agents
+- `ANTHROPIC_API_KEY` or `OPENAI_API_KEY`
 
-## TypeScript Example
+## TypeScript example
+
+```bash
+npm install sandbox-agent@0.4.x computesdk
+```
 
 ```typescript
-import {
-  compute,
-  detectProvider,
-  getMissingEnvVars,
-  getProviderConfigFromEnv,
-  isProviderAuthComplete,
-  isValidProvider,
-  PROVIDER_NAMES,
-  type ExplicitComputeConfig,
-  type ProviderName,
-} from "computesdk";
 import { SandboxAgent } from "sandbox-agent";
+import { computesdk } from "sandbox-agent/computesdk";
 
-const PORT = 3000;
-const REQUEST_TIMEOUT_MS =
-  Number.parseInt(process.env.COMPUTESDK_TIMEOUT_MS || "", 10) || 120_000;
-
-/**
- * Detects and validates the provider to use.
- * Priority: COMPUTESDK_PROVIDER env var > auto-detection from API keys
- */
-function resolveProvider(): ProviderName {
-  const providerOverride = process.env.COMPUTESDK_PROVIDER;
-
-  if (providerOverride) {
-    if (!isValidProvider(providerOverride)) {
-      throw new Error(
-        `Unsupported provider "${providerOverride}". Supported: ${PROVIDER_NAMES.join(", ")}`
-      );
-    }
-    if (!isProviderAuthComplete(providerOverride)) {
-      const missing = getMissingEnvVars(providerOverride);
-      throw new Error(
-        `Missing credentials for "${providerOverride}". Set: ${missing.join(", ")}`
-      );
-    }
-    return providerOverride as ProviderName;
-  }
-
-  const detected = detectProvider();
-  if (!detected) {
-    throw new Error(
-      `No provider credentials found. Set one of: ${PROVIDER_NAMES.map((p) => getMissingEnvVars(p).join(", ")).join(" | ")}`
-    );
-  }
-  return detected as ProviderName;
-}
-
-function configureComputeSDK(): void {
-  const provider = resolveProvider();
-
-  const config: ExplicitComputeConfig = {
-    provider,
-    computesdkApiKey: process.env.COMPUTESDK_API_KEY,
-    requestTimeoutMs: REQUEST_TIMEOUT_MS,
-  };
-
-  // Add provider-specific config from environment
-  const providerConfig = getProviderConfigFromEnv(provider);
-  if (Object.keys(providerConfig).length > 0) {
-    (config as any)[provider] = providerConfig;
-  }
-
-  compute.setConfig(config);
-}
-
-configureComputeSDK();
-
-// Build environment variables to pass to sandbox
 const envs: Record<string, string> = {};
 if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
 if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
 
-// Create sandbox
-const sandbox = await compute.sandbox.create({
-  envs: Object.keys(envs).length > 0 ? envs : undefined,
+const sdk = await SandboxAgent.start({
+  sandbox: computesdk({
+    create: {
+      envs,
+      image: process.env.COMPUTESDK_IMAGE,
+      templateId: process.env.COMPUTESDK_TEMPLATE_ID,
+    },
+  }),
 });
 
-// Helper to run commands with error handling
-const run = async (cmd: string, options?: { background?: boolean }) => {
-  const result = await sandbox.runCommand(cmd, options);
-  if (typeof result?.exitCode === "number" && result.exitCode !== 0) {
-    throw new Error(`Command failed: ${cmd} (exit ${result.exitCode})\n${result.stderr || ""}`);
-  }
-  return result;
-};
-
-// Install sandbox-agent
-await run("curl -fsSL https://releases.rivet.dev/sandbox-agent/latest/install.sh | sh");
-
-// Install agents conditionally based on available API keys
-if (envs.ANTHROPIC_API_KEY) {
-  await run("sandbox-agent install-agent claude");
+try {
+  const session = await sdk.createSession({ agent: "claude" });
+  const response = await session.prompt([
+    { type: "text", text: "Summarize this repository" },
+  ]);
+  console.log(response.stopReason);
+} finally {
+  await sdk.destroySandbox();
 }
-if (envs.OPENAI_API_KEY) {
-  await run("sandbox-agent install-agent codex");
-}
-
-// Start the server in the background
-await run(`sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`, { background: true });
-
-// Get the public URL for the sandbox
-const baseUrl = await sandbox.getUrl({ port: PORT });
-
-// Wait for server to be ready
-const deadline = Date.now() + REQUEST_TIMEOUT_MS;
-while (Date.now() < deadline) {
-  try {
-    const response = await fetch(`${baseUrl}/v1/health`);
-    if (response.ok) {
-      const data = await response.json();
-      if (data?.status === "ok") break;
-    }
-  } catch {
-    // Server not ready yet
-  }
-  await new Promise((r) => setTimeout(r, 500));
-}
-
-// Connect to the server
-const client = await SandboxAgent.connect({ baseUrl });
-
-// Detect which agent to use based on available API keys
-const agent = envs.ANTHROPIC_API_KEY ? "claude" : "codex";
-
-// Create a session and start coding
-await client.createSession("my-session", { agent });
-
-await client.postMessage("my-session", {
-  message: "Summarize this repository",
-});
-
-for await (const event of client.streamEvents("my-session")) {
-  console.log(event.type, event.data);
-}
-
-// Cleanup
-await sandbox.destroy();
 ```
 
-## Supported Providers
+The `computesdk` provider handles sandbox creation, Sandbox Agent installation, agent setup, and server startup automatically. ComputeSDK routes to your configured provider behind the scenes.
+The `create` option now forwards the full ComputeSDK sandbox-create payload, including provider-specific fields such as `image` and `templateId` when the selected provider supports them.
+
+Before calling `SandboxAgent.start()`, configure ComputeSDK with your provider:
+
+```typescript
+import { compute } from "computesdk";
+
+compute.setConfig({
+  provider: "e2b", // or auto-detect via detectProvider()
+  computesdkApiKey: process.env.COMPUTESDK_API_KEY,
+});
+```
+
+## Supported providers
 
 ComputeSDK auto-detects your provider from environment variables:
 
@@ -169,46 +75,7 @@ ComputeSDK auto-detects your provider from environment variables:
 
 ## Notes
 
-- **Provider resolution order**: `COMPUTESDK_PROVIDER` env var takes priority, otherwise auto-detection from API keys.
-- **Conditional agent installation**: Only agents with available API keys are installed, reducing setup time.
-- **Command error handling**: The example validates exit codes and throws on failures for easier debugging.
+- **Provider resolution**: Set `COMPUTESDK_PROVIDER` to force a specific provider, or let ComputeSDK auto-detect from API keys.
 - `sandbox.runCommand(..., { background: true })` keeps the server running while your app continues.
 - `sandbox.getUrl({ port })` returns a public URL for the sandbox port.
-- Always destroy the sandbox when you are done to avoid leaking resources.
-- If sandbox creation times out, set `COMPUTESDK_TIMEOUT_MS` to a higher value (default: 120000ms).
-
-## Explicit Provider Selection
-
-To force a specific provider instead of auto-detection, set the `COMPUTESDK_PROVIDER` environment variable:
-
-```bash
-export COMPUTESDK_PROVIDER=e2b
-```
-
-Or configure programmatically using `getProviderConfigFromEnv()`:
-
-```typescript
-import { compute, getProviderConfigFromEnv, type ExplicitComputeConfig } from "computesdk";
-
-const config: ExplicitComputeConfig = {
-  provider: "e2b",
-  computesdkApiKey: process.env.COMPUTESDK_API_KEY,
-  requestTimeoutMs: 120_000,
-};
-
-// Automatically populate provider-specific config from environment
-const providerConfig = getProviderConfigFromEnv("e2b");
-if (Object.keys(providerConfig).length > 0) {
-  (config as any).e2b = providerConfig;
-}
-
-compute.setConfig(config);
-```
-
-## Direct Mode (No ComputeSDK API Key)
-
-To bypass the ComputeSDK gateway and use provider SDKs directly, see the provider-specific examples:
-
-- [E2B](/deploy/e2b)
-- [Daytona](/deploy/daytona)
-- [Vercel](/deploy/vercel)
+- Always destroy the sandbox when done to avoid leaking resources.
diff --git a/docs/deploy/daytona.mdx b/docs/deploy/daytona.mdx
index bf81c8f..e546bef 100644
--- a/docs/deploy/daytona.mdx
+++ b/docs/deploy/daytona.mdx
@@ -15,37 +15,37 @@ See [Daytona network limits](https://www.daytona.io/docs/en/network-limits/).
 
 ## TypeScript example
 
-```typescript
-import { Daytona } from "@daytonaio/sdk";
-import { SandboxAgent } from "sandbox-agent";
+```bash
+npm install sandbox-agent@0.4.x @daytonaio/sdk
+```
 
-const daytona = new Daytona();
+```typescript
+import { SandboxAgent } from "sandbox-agent";
+import { daytona } from "sandbox-agent/daytona";
 
 const envVars: Record<string, string> = {};
 if (process.env.ANTHROPIC_API_KEY) envVars.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
 if (process.env.OPENAI_API_KEY) envVars.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
 
-const sandbox = await daytona.create({ envVars });
+const sdk = await SandboxAgent.start({
+  sandbox: daytona({
+    create: { envVars },
+  }),
+});
 
-await sandbox.process.executeCommand(
-  "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh"
-);
-
-await sandbox.process.executeCommand(
-  "nohup sandbox-agent server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &"
-);
-
-await new Promise((r) => setTimeout(r, 2000));
-
-const baseUrl = (await sandbox.getSignedPreviewUrl(3000, 4 * 60 * 60)).url;
-const sdk = await SandboxAgent.connect({ baseUrl });
-
-const session = await sdk.createSession({ agent: "claude" });
-await session.prompt([{ type: "text", text: "Summarize this repository" }]);
-
-await sandbox.delete();
+try {
+  const session = await sdk.createSession({ agent: "claude" });
+  const response = await session.prompt([
+    { type: "text", text: "Summarize this repository" },
+  ]);
+  console.log(response.stopReason);
+} finally {
+  await sdk.destroySandbox();
+}
 ```
 
+The `daytona` provider uses the `rivetdev/sandbox-agent:0.4.2-full` image by default and starts the server automatically.
+
 ## Using snapshots for faster startup
 
 ```typescript
@@ -61,7 +61,7 @@ if (!hasSnapshot) {
     name: SNAPSHOT,
     image: Image.base("ubuntu:22.04").runCommands(
       "apt-get update && apt-get install -y curl ca-certificates",
-      "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh",
+      "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh",
       "sandbox-agent install-agent claude",
       "sandbox-agent install-agent codex",
     ),
diff --git a/docs/deploy/docker.mdx b/docs/deploy/docker.mdx
index 28c9f77..c5a3432 100644
--- a/docs/deploy/docker.mdx
+++ b/docs/deploy/docker.mdx
@@ -9,23 +9,38 @@ Docker is not recommended for production isolation of untrusted workloads. Use d
 
 ## Quick start
 
-Run Sandbox Agent with agents pre-installed:
+Run the published full image with all supported agents pre-installed:
 
 ```bash
 docker run --rm -p 3000:3000 \
   -e ANTHROPIC_API_KEY="$ANTHROPIC_API_KEY" \
   -e OPENAI_API_KEY="$OPENAI_API_KEY" \
-  alpine:latest sh -c "\
-    apk add --no-cache curl ca-certificates libstdc++ libgcc bash && \
-    curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh && \
-    sandbox-agent install-agent claude && \
-    sandbox-agent install-agent codex && \
+  rivetdev/sandbox-agent:0.4.2-full \
+  server --no-token --host 0.0.0.0 --port 3000
+```
+
+The `0.4.2-full` tag pins the exact version. The moving `full` tag is also published for contributors who want the latest full image.
+
+If you also want the desktop API inside the container, install desktop dependencies before starting the server:
+
+```bash
+docker run --rm -p 3000:3000 \
+  -e ANTHROPIC_API_KEY="$ANTHROPIC_API_KEY" \
+  -e OPENAI_API_KEY="$OPENAI_API_KEY" \
+  node:22-bookworm-slim sh -c "\
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y curl ca-certificates bash libstdc++6 && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh && \
+    sandbox-agent install desktop --yes && \
     sandbox-agent server --no-token --host 0.0.0.0 --port 3000"
 ```
 
-<Note>
-Alpine is required for some agent binaries that target musl libc.
-</Note>
+In a Dockerfile:
+
+```dockerfile
+RUN sandbox-agent install desktop --yes
+```
 
 ## TypeScript with dockerode
 
@@ -37,17 +52,12 @@ const docker = new Docker();
 const PORT = 3000;
 
 const container = await docker.createContainer({
-  Image: "alpine:latest",
-  Cmd: ["sh", "-c", [
-    "apk add --no-cache curl ca-certificates libstdc++ libgcc bash",
-    "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh",
-    "sandbox-agent install-agent claude",
-    "sandbox-agent install-agent codex",
-    `sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`,
-  ].join(" && ")],
+  Image: "rivetdev/sandbox-agent:0.4.2-full",
+  Cmd: ["server", "--no-token", "--host", "0.0.0.0", "--port", `${PORT}`],
   Env: [
     `ANTHROPIC_API_KEY=${process.env.ANTHROPIC_API_KEY}`,
     `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}`,
+    `CODEX_API_KEY=${process.env.CODEX_API_KEY}`,
   ].filter(Boolean),
   ExposedPorts: { [`${PORT}/tcp`]: {} },
   HostConfig: {
@@ -61,10 +71,33 @@ await container.start();
 const baseUrl = `http://127.0.0.1:${PORT}`;
 const sdk = await SandboxAgent.connect({ baseUrl });
 
-const session = await sdk.createSession({ agent: "claude" });
+const session = await sdk.createSession({ agent: "codex" });
 await session.prompt([{ type: "text", text: "Summarize this repository." }]);
 ```
 
+## Building a custom image with everything preinstalled
+
+If you need to extend your own base image, install Sandbox Agent and preinstall every supported agent in one step:
+
+```dockerfile
+FROM node:22-bookworm-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    bash ca-certificates curl git && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh && \
+    sandbox-agent install-agent --all
+
+RUN useradd -m -s /bin/bash sandbox
+USER sandbox
+WORKDIR /home/sandbox
+
+EXPOSE 2468
+ENTRYPOINT ["sandbox-agent"]
+CMD ["server", "--host", "0.0.0.0", "--port", "2468"]
+```
+
 ## Building from source
 
 ```bash
diff --git a/docs/deploy/e2b.mdx b/docs/deploy/e2b.mdx
index e2d5922..225cfdc 100644
--- a/docs/deploy/e2b.mdx
+++ b/docs/deploy/e2b.mdx
@@ -10,43 +10,43 @@ description: "Deploy Sandbox Agent inside an E2B sandbox."
 
 ## TypeScript example
 
+```bash
+npm install sandbox-agent@0.4.x @e2b/code-interpreter
+```
+
 ```typescript
-import { Sandbox } from "@e2b/code-interpreter";
 import { SandboxAgent } from "sandbox-agent";
+import { e2b } from "sandbox-agent/e2b";
 
 const envs: Record<string, string> = {};
 if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
 if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+const template = process.env.E2B_TEMPLATE;
 
-const sandbox = await Sandbox.create({ allowInternetAccess: true, envs });
-
-await sandbox.commands.run(
-  "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh"
-);
-
-await sandbox.commands.run("sandbox-agent install-agent claude");
-await sandbox.commands.run("sandbox-agent install-agent codex");
-
-await sandbox.commands.run(
-  "sandbox-agent server --no-token --host 0.0.0.0 --port 3000",
-  { background: true }
-);
-
-const baseUrl = `https://${sandbox.getHost(3000)}`;
-const sdk = await SandboxAgent.connect({ baseUrl });
-
-const session = await sdk.createSession({ agent: "claude" });
-const off = session.onEvent((event) => {
-  console.log(event.sender, event.payload);
+const sdk = await SandboxAgent.start({
+  sandbox: e2b({
+    template,
+    create: { envs },
+  }),
 });
 
-await session.prompt([{ type: "text", text: "Summarize this repository" }]);
-off();
-
-await sandbox.kill();
+try {
+  const session = await sdk.createSession({ agent: "claude" });
+  const response = await session.prompt([
+    { type: "text", text: "Summarize this repository" },
+  ]);
+  console.log(response.stopReason);
+} finally {
+  await sdk.destroySandbox();
+}
 ```
 
+The `e2b` provider handles sandbox creation, Sandbox Agent installation, agent setup, and server startup automatically. Sandboxes pause by default instead of being deleted, and reconnecting with the same `sandboxId` resumes them automatically.
+
+Pass `template` when you want to start from a custom E2B template alias or template ID. E2B base-image selection happens when you build the template, then `sandbox-agent/e2b` uses that template at sandbox creation time.
+
 ## Faster cold starts
 
 For faster startup, create a custom E2B template with Sandbox Agent and target agents pre-installed.
-See [E2B Custom Templates](https://e2b.dev/docs/sandbox-template).
+Build System 2.0 also lets you choose the template's base image in code.
+See [E2B Custom Templates](https://e2b.dev/docs/sandbox-template) and [E2B Base Images](https://e2b.dev/docs/template/base-image).
diff --git a/docs/deploy/local.mdx b/docs/deploy/local.mdx
index 8af9f51..6ecdb09 100644
--- a/docs/deploy/local.mdx
+++ b/docs/deploy/local.mdx
@@ -9,7 +9,7 @@ For local development, run Sandbox Agent directly on your machine.
 
 ```bash
 # Install
-curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh
+curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
 
 # Run
 sandbox-agent server --no-token --host 127.0.0.1 --port 2468
@@ -20,24 +20,27 @@ Or with npm/Bun:
 <Tabs>
   <Tab title="npx">
     ```bash
-    npx @sandbox-agent/cli@0.2.x server --no-token --host 127.0.0.1 --port 2468
+    npx @sandbox-agent/cli@0.4.x server --no-token --host 127.0.0.1 --port 2468
     ```
   </Tab>
   <Tab title="bunx">
     ```bash
-    bunx @sandbox-agent/cli@0.2.x server --no-token --host 127.0.0.1 --port 2468
+    bunx @sandbox-agent/cli@0.4.x server --no-token --host 127.0.0.1 --port 2468
     ```
   </Tab>
 </Tabs>
 
 ## With the TypeScript SDK
 
-The SDK can spawn and manage the server as a subprocess:
+The SDK can spawn and manage the server as a subprocess using the `local` provider:
 
 ```typescript
 import { SandboxAgent } from "sandbox-agent";
+import { local } from "sandbox-agent/local";
 
-const sdk = await SandboxAgent.start();
+const sdk = await SandboxAgent.start({
+  sandbox: local(),
+});
 
 const session = await sdk.createSession({
   agent: "claude",
@@ -47,7 +50,21 @@ await session.prompt([
   { type: "text", text: "Summarize this repository." },
 ]);
 
-await sdk.dispose();
+await sdk.destroySandbox();
 ```
 
 This starts the server on an available local port and connects automatically.
+
+Pass options to customize the local provider:
+
+```typescript
+const sdk = await SandboxAgent.start({
+  sandbox: local({
+    port: 3000,
+    log: "inherit",
+    env: {
+      ANTHROPIC_API_KEY: process.env.MY_ANTHROPIC_KEY,
+    },
+  }),
+});
+```
diff --git a/docs/deploy/modal.mdx b/docs/deploy/modal.mdx
new file mode 100644
index 0000000..5850fd8
--- /dev/null
+++ b/docs/deploy/modal.mdx
@@ -0,0 +1,55 @@
+---
+title: "Modal"
+description: "Deploy Sandbox Agent inside a Modal sandbox."
+---
+
+## Prerequisites
+
+- `MODAL_TOKEN_ID` and `MODAL_TOKEN_SECRET` from [modal.com/settings](https://modal.com/settings)
+- `ANTHROPIC_API_KEY` or `OPENAI_API_KEY`
+
+## TypeScript example
+
+```bash
+npm install sandbox-agent@0.4.x modal
+```
+
+```typescript
+import { SandboxAgent } from "sandbox-agent";
+import { modal } from "sandbox-agent/modal";
+
+const secrets: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) secrets.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) secrets.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+const baseImage = process.env.MODAL_BASE_IMAGE ?? "node:22-slim";
+
+const sdk = await SandboxAgent.start({
+  sandbox: modal({
+    image: baseImage,
+    create: { secrets },
+  }),
+});
+
+try {
+  const session = await sdk.createSession({ agent: "claude" });
+  const response = await session.prompt([
+    { type: "text", text: "Summarize this repository" },
+  ]);
+  console.log(response.stopReason);
+} finally {
+  await sdk.destroySandbox();
+}
+```
+
+The `modal` provider handles app creation, image building, sandbox provisioning, agent installation, server startup, and tunnel networking automatically.
+Set `image` to change the base Docker image before Sandbox Agent and its agent binaries are layered on top. You can also pass a prebuilt Modal `Image` object.
+
+## Faster cold starts
+
+Modal caches image layers, so the Dockerfile commands that install `curl` and `sandbox-agent` only run on the first build. Subsequent sandbox creates reuse the cached image.
+
+## Notes
+
+- Modal sandboxes use [gVisor](https://gvisor.dev/) for strong isolation.
+- Ports are exposed via encrypted tunnels (`encryptedPorts`). The provider uses `sb.tunnels()` to get the public HTTPS URL.
+- Environment variables (API keys) are passed as Modal [Secrets](https://modal.com/docs/guide/secrets) for security.
diff --git a/docs/deploy/vercel.mdx b/docs/deploy/vercel.mdx
index 4a840ee..ec931d8 100644
--- a/docs/deploy/vercel.mdx
+++ b/docs/deploy/vercel.mdx
@@ -10,52 +10,40 @@ description: "Deploy Sandbox Agent inside a Vercel Sandbox."
 
 ## TypeScript example
 
-```typescript
-import { Sandbox } from "@vercel/sandbox";
-import { SandboxAgent } from "sandbox-agent";
-
-const envs: Record<string, string> = {};
-if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
-if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
-
-const sandbox = await Sandbox.create({
-  runtime: "node24",
-  ports: [3000],
-});
-
-const run = async (cmd: string, args: string[] = []) => {
-  const result = await sandbox.runCommand({ cmd, args, env: envs });
-  if (result.exitCode !== 0) {
-    throw new Error(`Command failed: ${cmd} ${args.join(" ")}`);
-  }
-};
-
-await run("sh", ["-c", "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh"]);
-await run("sandbox-agent", ["install-agent", "claude"]);
-await run("sandbox-agent", ["install-agent", "codex"]);
-
-await sandbox.runCommand({
-  cmd: "sandbox-agent",
-  args: ["server", "--no-token", "--host", "0.0.0.0", "--port", "3000"],
-  env: envs,
-  detached: true,
-});
-
-const baseUrl = sandbox.domain(3000);
-const sdk = await SandboxAgent.connect({ baseUrl });
-
-const session = await sdk.createSession({ agent: "claude" });
-
-const off = session.onEvent((event) => {
-  console.log(event.sender, event.payload);
-});
-
-await session.prompt([{ type: "text", text: "Summarize this repository" }]);
-off();
-
-await sandbox.stop();
+```bash
+npm install sandbox-agent@0.4.x @vercel/sandbox
 ```
 
+```typescript
+import { SandboxAgent } from "sandbox-agent";
+import { vercel } from "sandbox-agent/vercel";
+
+const env: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+const sdk = await SandboxAgent.start({
+  sandbox: vercel({
+    create: {
+      runtime: "node24",
+      env,
+    },
+  }),
+});
+
+try {
+  const session = await sdk.createSession({ agent: "claude" });
+  const response = await session.prompt([
+    { type: "text", text: "Summarize this repository" },
+  ]);
+  console.log(response.stopReason);
+} finally {
+  await sdk.destroySandbox();
+}
+```
+
+The `vercel` provider handles sandbox creation, Sandbox Agent installation, agent setup, and server startup automatically.
+
 ## Authentication
 
 Vercel Sandboxes support OIDC token auth (recommended) and access-token auth.
diff --git a/docs/docs.json b/docs/docs.json
index e7c2fdf..dbcc407 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -1,128 +1,130 @@
 {
-	"$schema": "https://mintlify.com/docs.json",
-	"theme": "willow",
-	"name": "Sandbox Agent SDK",
-	"appearance": {
-		"default": "dark",
-		"strict": true
-	},
-	"colors": {
-		"primary": "#ff4f00",
-		"light": "#ff4f00",
-		"dark": "#ff4f00"
-	},
-	"favicon": "/favicon.svg",
-	"logo": {
-		"light": "/logo/light.svg",
-		"dark": "/logo/dark.svg"
-	},
-	"integrations": {
-		"posthog": {
-			"apiKey": "phc_6kfTNEAVw7rn1LA51cO3D69FefbKupSWFaM7OUgEpEo",
-			"apiHost": "https://ph.rivet.gg",
-			"sessionRecording": true
-		}
-	},
-	"navbar": {
-		"links": [
-			{
-				"label": "Gigacode",
-				"icon": "terminal",
-				"href": "https://github.com/rivet-dev/sandbox-agent/tree/main/gigacode"
-			},
-			{
-				"label": "Discord",
-				"icon": "discord",
-				"href": "https://discord.gg/auCecybynK"
-			},
-			{
-				"type": "github",
-				"href": "https://github.com/rivet-dev/sandbox-agent"
-			}
-		]
-	},
-	"navigation": {
-		"tabs": [
-			{
-				"tab": "Documentation",
-				"pages": [
-					{
-						"group": "Getting started",
-						"pages": [
-							"quickstart",
-							"sdk-overview",
-							{
-								"group": "Deploy",
-								"icon": "server",
-								"pages": [
-									"deploy/local",
-									"deploy/computesdk",
-									"deploy/e2b",
-									"deploy/daytona",
-									"deploy/vercel",
-									"deploy/cloudflare",
-									"deploy/docker"
-								]
-							}
-						]
-					},
-					{
-						"group": "Agent",
-						"pages": [
-							"agent-sessions",
-							"attachments",
-							"skills-config",
-							"mcp-config",
-							"custom-tools"
-						]
-					},
-					{
-						"group": "System",
-						"pages": ["file-system"]
-					},
-					{
-						"group": "Orchestration",
-						"pages": [
-							"architecture",
-							"session-persistence",
-							"observability",
-							"multiplayer",
-							"security"
-						]
-					},
-					{
-						"group": "Reference",
-						"pages": [
-							"cli",
-							"inspector",
-							"opencode-compatibility",
-							{
-								"group": "More",
-								"pages": [
-									"credentials",
-									"daemon",
-									"cors",
-									"session-restoration",
-									"telemetry",
-									{
-										"group": "AI",
-										"pages": ["ai/skill", "ai/llms-txt"]
-									}
-								]
-							}
-						]
-					}
-				]
-			},
-			{
-				"tab": "HTTP API",
-				"pages": [
-					{
-						"group": "HTTP Reference",
-						"openapi": "openapi.json"
-					}
-				]
-			}
-		]
-	}
+  "$schema": "https://mintlify.com/docs.json",
+  "theme": "mint",
+  "name": "Sandbox Agent SDK",
+  "appearance": {
+    "default": "dark",
+    "strict": true
+  },
+  "colors": {
+    "primary": "#ff4f00",
+    "light": "#ff6a2a",
+    "dark": "#cc3f00"
+  },
+  "favicon": "/favicon.svg",
+  "logo": {
+    "light": "/logo/light.svg",
+    "dark": "/logo/dark.svg"
+  },
+  "integrations": {
+    "posthog": {
+      "apiKey": "phc_6kfTNEAVw7rn1LA51cO3D69FefbKupSWFaM7OUgEpEo",
+      "apiHost": "https://ph.rivet.gg",
+      "sessionRecording": true
+    }
+  },
+  "navbar": {
+    "links": [
+      {
+        "label": "Discord",
+        "icon": "discord",
+        "href": "https://discord.gg/auCecybynK"
+      },
+      {
+        "label": "GitHub",
+        "type": "github",
+        "href": "https://github.com/rivet-dev/sandbox-agent"
+      }
+    ]
+  },
+  "navigation": {
+    "tabs": [
+      {
+        "tab": "Documentation",
+        "pages": [
+          {
+            "group": "Getting started",
+            "pages": [
+              "quickstart",
+              "sdk-overview",
+              "llm-credentials",
+              "react-components",
+              {
+                "group": "Deploy",
+                "icon": "server",
+                "pages": [
+                  "deploy/local",
+                  "deploy/e2b",
+                  "deploy/daytona",
+                  "deploy/vercel",
+                  "deploy/cloudflare",
+                  "deploy/docker",
+                  "deploy/modal",
+                  "deploy/boxlite",
+                  "deploy/computesdk"
+                ]
+              }
+            ]
+          },
+          {
+            "group": "Agent",
+            "pages": [
+              "agent-sessions",
+              {
+                "group": "Agents",
+                "icon": "robot",
+                "pages": ["agents/claude", "agents/codex", "agents/opencode", "agents/cursor", "agents/amp", "agents/pi"]
+              },
+              "attachments",
+              "skills-config",
+              "mcp-config",
+              "custom-tools"
+            ]
+          },
+          {
+            "group": "System",
+            "pages": ["file-system", "processes", "computer-use", "common-software"]
+          },
+          {
+            "group": "Reference",
+            "pages": [
+              "troubleshooting",
+              "architecture",
+              "cli",
+              "inspector",
+              "opencode-compatibility",
+              {
+                "group": "More",
+                "pages": [
+                  "daemon",
+                  "cors",
+                  "session-restoration",
+                  "telemetry",
+                  {
+                    "group": "AI",
+                    "pages": ["ai/skill", "ai/llms-txt"]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "tab": "HTTP API",
+        "pages": [
+          {
+            "group": "HTTP Reference",
+            "openapi": "openapi.json"
+          }
+        ]
+      }
+    ]
+  },
+  "__removed": [
+	  {
+		"group": "Orchestration",
+		"pages": ["orchestration-architecture", "session-persistence", "observability", "multiplayer", "security"]
+	  }
+  ]
 }
diff --git a/docs/gigacode.mdx b/docs/gigacode.mdx
deleted file mode 100644
index ccc9e39..0000000
--- a/docs/gigacode.mdx
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Gigacode
-url: "https://github.com/rivet-dev/sandbox-agent/tree/main/gigacode"
----
-
-
diff --git a/docs/images/inspector.png b/docs/images/inspector.png
index 1c16ed2..02e588e 100644
Binary files a/docs/images/inspector.png and b/docs/images/inspector.png differ
diff --git a/docs/inspector.mdx b/docs/inspector.mdx
index f3b3dc6..1412c21 100644
--- a/docs/inspector.mdx
+++ b/docs/inspector.mdx
@@ -34,9 +34,33 @@ console.log(url);
 - Event JSON inspector
 - Prompt testing
 - Request/response debugging
+- Interactive permission prompts (approve, always-allow, or reject tool-use requests)
+- Desktop panel for status, remediation, start/stop, and screenshot refresh
+- Process management (create, stop, kill, delete, view logs)
+- Interactive PTY terminal for tty processes
+- One-shot command execution
 
 ## When to use
 
 - Development: validate session behavior quickly
 - Debugging: inspect raw event payloads
 - Integration work: compare UI behavior with SDK/API calls
+
+## Process terminal
+
+The Inspector includes an embedded Ghostty-based terminal for interactive tty
+processes. The UI uses the SDK's high-level `connectProcessTerminal(...)`
+wrapper via the shared `@sandbox-agent/react` `ProcessTerminal` component.
+
+## Desktop panel
+
+The `Desktop` panel shows the current desktop runtime state, missing dependencies,
+the suggested install command, last error details, process/log paths, and the
+latest captured screenshot.
+
+Use it to:
+
+- Check whether desktop dependencies are installed
+- Start or stop the managed desktop runtime
+- Refresh desktop status
+- Capture a fresh screenshot on demand
diff --git a/docs/llm-credentials.mdx b/docs/llm-credentials.mdx
new file mode 100644
index 0000000..e771740
--- /dev/null
+++ b/docs/llm-credentials.mdx
@@ -0,0 +1,250 @@
+---
+title: "LLM Credentials"
+description: "Strategies for providing LLM provider credentials to agents."
+icon: "key"
+---
+
+Sandbox Agent needs LLM provider credentials (Anthropic, OpenAI, etc.) to run agent sessions.
+
+## Configuration
+
+Pass credentials via `spawn.env` when starting a sandbox. Each call to `SandboxAgent.start()` can use different credentials:
+
+```typescript
+import { SandboxAgent } from "sandbox-agent";
+
+const sdk = await SandboxAgent.start({
+  spawn: {
+    env: {
+      ANTHROPIC_API_KEY: "sk-ant-...",
+      OPENAI_API_KEY: "sk-...",
+    },
+  },
+});
+```
+
+Each agent requires credentials from a specific provider. Sandbox Agent checks environment variables (including those passed via `spawn.env`) and host config files:
+
+| Agent | Provider | Environment variables | Config files |
+|-------|----------|----------------------|--------------|
+| Claude Code | Anthropic | `ANTHROPIC_API_KEY`, `CLAUDE_API_KEY` | `~/.claude.json`, `~/.claude/.credentials.json` |
+| Amp | Anthropic | `ANTHROPIC_API_KEY`, `CLAUDE_API_KEY` | `~/.amp/config.json` |
+| Codex | OpenAI | `OPENAI_API_KEY`, `CODEX_API_KEY` | `~/.codex/auth.json` |
+| OpenCode | Anthropic or OpenAI | `ANTHROPIC_API_KEY`, `OPENAI_API_KEY` | `~/.local/share/opencode/auth.json` |
+| Mock | None | - | - |
+
+## Credential strategies
+
+LLM credentials are passed into the sandbox as environment variables. The agent and everything inside the sandbox has access to the token, so it's important to choose the right strategy for how you provision and scope these credentials.
+
+| Strategy | Who pays | Cost attribution | Best for |
+|----------|----------|-----------------|----------|
+| **Per-tenant gateway** (recommended) | Your organization, billed back per tenant | Per-tenant keys with budgets | Multi-tenant SaaS, usage-based billing |
+| **Bring your own key** | Each user (usage-based) | Per-user by default | Dev environments, internal tools |
+| **Shared API key** | Your organization | None (single bill) | Single-tenant apps, internal platforms |
+| **Personal subscription** | Each user (existing subscription) | Per-user by default | Local dev, internal tools where users have Claude or Codex subscriptions |
+
+### Per-tenant gateway (recommended)
+
+Route LLM traffic through a gateway that mints per-tenant API keys, each with its own spend tracking and budget limits.
+
+```mermaid
+graph LR
+    B[Your Backend] -->|tenant key| S[Sandbox]
+    S -->|LLM requests| G[Gateway]
+    G -->|scoped key| P[LLM Provider]
+```
+
+Your backend issues a scoped key per tenant, then passes it to the sandbox. This is the typical pattern when using sandbox providers (E2B, Daytona, Docker).
+
+```typescript expandable
+import { SandboxAgent } from "sandbox-agent";
+
+async function createTenantSandbox(tenantId: string) {
+  // Issue a scoped key for this tenant via OpenRouter
+  const res = await fetch("https://openrouter.ai/api/v1/keys", {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${process.env.OPENROUTER_PROVISIONING_KEY}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      name: `tenant-${tenantId}`,
+      limit: 50,
+      limitResetType: "monthly",
+    }),
+  });
+  const { key } = await res.json();
+
+  // Start a sandbox with the tenant's scoped key
+  const sdk = await SandboxAgent.start({
+    spawn: {
+      env: {
+        OPENAI_API_KEY: key, // OpenRouter uses OpenAI-compatible endpoints
+      },
+    },
+  });
+
+  const session = await sdk.createSession({
+    agent: "claude",
+    sessionInit: { cwd: "/workspace" },
+  });
+
+  return { sdk, session };
+}
+```
+
+#### Security
+
+Recommended for multi-tenant applications. Each tenant gets a scoped key with its own budget, so exfiltration only exposes that tenant's allowance.
+
+#### Use cases
+
+- **Multi-tenant SaaS**: per-tenant spend tracking and budget limits
+- **Production apps**: exposed to end users who need isolated credentials
+- **Usage-based billing**: each tenant pays for their own consumption
+
+#### Choosing a gateway
+
+<AccordionGroup>
+
+<Accordion title="OpenRouter provisioned keys" icon="cloud">
+
+Managed service, zero infrastructure. [OpenRouter](https://openrouter.ai/docs/features/provisioning-api-keys) provides per-tenant API keys with spend tracking and budget limits via their Provisioning API. Pass the tenant key to Sandbox Agent as `OPENAI_API_KEY` (OpenRouter uses OpenAI-compatible endpoints).
+
+```bash
+# Create a key for a tenant with a $50/month budget
+curl https://openrouter.ai/api/v1/keys \
+  -H "Authorization: Bearer $PROVISIONING_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "name": "tenant-acme",
+    "limit": 50,
+    "limitResetType": "monthly"
+  }'
+```
+
+Easiest to set up but not open-source. See [OpenRouter pricing](https://openrouter.ai/docs/framework/pricing) for details.
+
+</Accordion>
+
+<Accordion title="LiteLLM proxy" icon="server">
+
+Self-hosted, open-source (MIT). [LiteLLM](https://github.com/BerriAI/litellm) is an OpenAI-compatible proxy with hierarchical budgets (org, team, user, key), virtual keys, and spend tracking. Requires Python + PostgreSQL.
+
+```bash
+# Create a team (tenant) with a $500 budget
+curl http://litellm:4000/team/new \
+  -H "Authorization: Bearer $LITELLM_MASTER_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "team_alias": "tenant-acme",
+    "max_budget": 500
+  }'
+
+# Generate a key for that team
+curl http://litellm:4000/key/generate \
+  -H "Authorization: Bearer $LITELLM_MASTER_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "team_id": "team-abc123",
+    "max_budget": 100
+  }'
+```
+
+Full control with no vendor lock-in. Organization-level features require an enterprise license.
+
+</Accordion>
+
+<Accordion title="Portkey gateway" icon="code-branch">
+
+Self-hosted, open-source (Apache 2.0). [Portkey](https://github.com/Portkey-AI/gateway) is a lightweight OpenAI-compatible gateway supporting 200+ providers. Single binary, no database required. Create virtual keys with per-tenant budget limits and pass them to Sandbox Agent.
+
+Lightest operational footprint of the self-hosted options. Observability and analytics require the managed platform or your own tooling.
+
+</Accordion>
+
+</AccordionGroup>
+
+To bill tenants for LLM usage, use [Stripe token billing](https://docs.stripe.com/billing/token-billing) (integrates natively with OpenRouter) or query your gateway's spend API and feed usage into your billing system.
+
+### Bring your own key
+
+Each user provides their own API key. Users are billed directly by the LLM provider with no additional infrastructure needed.
+
+Pass the user's key via `spawn.env`:
+
+```typescript
+const sdk = await SandboxAgent.start({
+  spawn: {
+    env: {
+      ANTHROPIC_API_KEY: userProvidedKey,
+    },
+  },
+});
+```
+
+#### Security
+
+API keys are typically long-lived. The key is visible to the agent and anything running inside the sandbox, so exfiltration is possible. This is usually acceptable for developer-facing tools where the user owns the key.
+
+#### Use cases
+
+- **Developer tools**: each user manages their own API key
+- **Internal platforms**: users already have LLM provider accounts
+- **Per-user billing**: no extra infrastructure needed
+
+### Shared credentials
+
+A single organization-wide API key is used for all sessions. All token usage appears on one bill with no per-user or per-tenant cost attribution.
+
+```typescript
+const sdk = await SandboxAgent.start({
+  spawn: {
+    env: {
+      ANTHROPIC_API_KEY: process.env.ORG_ANTHROPIC_KEY!,
+      OPENAI_API_KEY: process.env.ORG_OPENAI_KEY!,
+    },
+  },
+});
+```
+
+If you need to track or limit spend per tenant, use a per-tenant gateway instead.
+
+#### Security
+
+Not recommended for anything other than internal tooling. A single exfiltrated key exposes your organization's entire LLM budget. If you need org-paid credentials for external users, use a per-tenant gateway with scoped keys instead.
+
+#### Use cases
+
+- **Single-tenant apps**: small number of users, one bill
+- **Prototyping**: cost attribution not needed yet
+- **Simplicity over security**: acceptable when exfiltration risk is low
+
+### Personal subscription
+
+If the user is signed into Claude Code or Codex on the host machine, Sandbox Agent automatically picks up their OAuth tokens. No configuration is needed.
+
+#### Remote sandboxes
+
+Extract credentials locally and pass them to a remote sandbox via `spawn.env`:
+
+```bash
+$ sandbox-agent credentials extract-env
+ANTHROPIC_API_KEY=sk-ant-...
+CLAUDE_API_KEY=sk-ant-...
+OPENAI_API_KEY=sk-...
+CODEX_API_KEY=sk-...
+```
+
+Use `-e` to prefix with `export` for shell sourcing.
+
+#### Security
+
+Personal subscriptions use OAuth tokens with a limited lifespan. These are the same credentials used when running an agent normally on the host. If a token is exfiltrated from the sandbox, the exposure window is short.
+
+#### Use cases
+
+- **Local development**: users are already signed into Claude Code or Codex
+- **Internal tools**: every user has their own subscription
+- **Prototyping**: no key management needed
\ No newline at end of file
diff --git a/docs/manage-sessions.mdx b/docs/manage-sessions.mdx
index 7d51538..c39dd04 100644
--- a/docs/manage-sessions.mdx
+++ b/docs/manage-sessions.mdx
@@ -6,8 +6,6 @@ icon: "database"
 
 Sandbox Agent stores sessions in memory only. When the server restarts or the sandbox is destroyed, all session data is lost. It's your responsibility to persist events to your own database.
 
-See the [Building a Chat UI](/building-chat-ui) guide for understanding session lifecycle events like `session.started` and `session.ended`.
-
 ## Recommended approach
 
 1. Store events to your database as they arrive
@@ -18,11 +16,11 @@ This prevents duplicate writes and lets you recover from disconnects.
 
 ## Receiving Events
 
-Two ways to receive events: SSE streaming (recommended) or polling.
+Two ways to receive events: streaming (recommended) or polling.
 
 ### Streaming
 
-Use SSE for real-time events with automatic reconnection support.
+Use streaming for real-time events with automatic reconnection support.
 
 ```typescript
 import { SandboxAgentClient } from "sandbox-agent";
@@ -44,7 +42,7 @@ for await (const event of client.streamEvents("my-session", { offset })) {
 
 ### Polling
 
-If you can't use SSE streaming, poll the events endpoint:
+If you can't use streaming, poll the events endpoint:
 
 ```typescript
 const lastEvent = await db.getLastEvent("my-session");
@@ -244,7 +242,7 @@ const events = await redis.lrange(`session:${sessionId}`, offset, -1);
 
 ## Handling disconnects
 
-The SSE stream may disconnect due to network issues. Handle reconnection gracefully:
+The event stream may disconnect due to network issues. Handle reconnection gracefully:
 
 ```typescript
 async function streamWithRetry(sessionId: string) {
diff --git a/docs/mcp-config.mdx b/docs/mcp-config.mdx
index 71e8105..cc1c976 100644
--- a/docs/mcp-config.mdx
+++ b/docs/mcp-config.mdx
@@ -27,9 +27,7 @@ await sdk.setMcpConfig(
 // Create a session using the configured MCP servers
 const session = await sdk.createSession({
   agent: "claude",
-  sessionInit: {
-    cwd: "/workspace",
-  },
+  cwd: "/workspace",
 });
 
 await session.prompt([
diff --git a/docs/multiplayer.mdx b/docs/multiplayer.mdx
index 4f405ea..215bb1c 100644
--- a/docs/multiplayer.mdx
+++ b/docs/multiplayer.mdx
@@ -20,8 +20,40 @@ Use [actor keys](https://rivet.dev/docs/actors/keys) to map each workspace to on
 
 ```ts Actor (server)
 import { actor, setup } from "rivetkit";
-import { SandboxAgent } from "sandbox-agent";
-import { RivetSessionPersistDriver, type RivetPersistState } from "@sandbox-agent/persist-rivet";
+import { SandboxAgent, type SessionPersistDriver, type SessionRecord, type SessionEvent, type ListPageRequest, type ListPage, type ListEventsRequest } from "sandbox-agent";
+
+interface RivetPersistData { sessions: Record<string, SessionRecord>; events: Record<string, SessionEvent[]>; }
+type RivetPersistState = { _sandboxAgentPersist: RivetPersistData };
+
+class RivetSessionPersistDriver implements SessionPersistDriver {
+  private readonly stateKey: string;
+  private readonly ctx: { state: Record<string, unknown> };
+  constructor(ctx: { state: Record<string, unknown> }, options: { stateKey?: string } = {}) {
+    this.ctx = ctx;
+    this.stateKey = options.stateKey ?? "_sandboxAgentPersist";
+    if (!this.ctx.state[this.stateKey]) {
+      this.ctx.state[this.stateKey] = { sessions: {}, events: {} };
+    }
+  }
+  private get data(): RivetPersistData { return this.ctx.state[this.stateKey] as RivetPersistData; }
+  async getSession(id: string) { const s = this.data.sessions[id]; return s ? { ...s } : undefined; }
+  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
+    const sorted = Object.values(this.data.sessions).sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id));
+    const offset = Number(request.cursor ?? 0);
+    const limit = request.limit ?? 100;
+    const slice = sorted.slice(offset, offset + limit);
+    return { items: slice, nextCursor: offset + slice.length < sorted.length ? String(offset + slice.length) : undefined };
+  }
+  async updateSession(session: SessionRecord) { this.data.sessions[session.id] = { ...session }; if (!this.data.events[session.id]) this.data.events[session.id] = []; }
+  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
+    const all = [...(this.data.events[request.sessionId] ?? [])].sort((a, b) => a.eventIndex - b.eventIndex || a.id.localeCompare(b.id));
+    const offset = Number(request.cursor ?? 0);
+    const limit = request.limit ?? 100;
+    const slice = all.slice(offset, offset + limit);
+    return { items: slice, nextCursor: offset + slice.length < all.length ? String(offset + slice.length) : undefined };
+  }
+  async insertEvent(sessionId: string, event: SessionEvent) { const events = this.data.events[sessionId] ?? []; events.push({ ...event, payload: JSON.parse(JSON.stringify(event.payload)) }); this.data.events[sessionId] = events; }
+}
 
 type WorkspaceState = RivetPersistState & {
   sandboxId: string;
@@ -111,5 +143,5 @@ await conn.prompt({
 ## Notes
 
 - Keep sandbox calls actor-only. Browser clients should not call Sandbox Agent directly.
-- Use `@sandbox-agent/persist-rivet` so session history persists in actor state.
+- Copy the Rivet persist driver from the example above into your project so session history persists in actor state.
 - For client connection patterns, see [Rivet JavaScript client](https://rivet.dev/docs/clients/javascript).
diff --git a/docs/observability.mdx b/docs/observability.mdx
index 770fe8b..5b5751b 100644
--- a/docs/observability.mdx
+++ b/docs/observability.mdx
@@ -1,7 +1,7 @@
 ---
 title: "Observability"
 description: "Track session activity with OpenTelemetry."
-icon: "terminal"
+icon: "chart-line"
 ---
 
 Use OpenTelemetry to instrument session traffic, then ship telemetry to your collector/backend.
diff --git a/docs/openapi.json b/docs/openapi.json
index 01fd073..3624707 100644
--- a/docs/openapi.json
+++ b/docs/openapi.json
@@ -10,7 +10,7 @@
     "license": {
       "name": "Apache-2.0"
     },
-    "version": "0.2.0"
+    "version": "0.4.2"
   },
   "servers": [
     {
@@ -20,9 +20,7 @@
   "paths": {
     "/v1/acp": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_acp_servers",
         "responses": {
           "200": {
@@ -40,9 +38,7 @@
     },
     "/v1/acp/{server_id}": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_acp",
         "parameters": [
           {
@@ -92,9 +88,7 @@
         }
       },
       "post": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "post_v1_acp",
         "parameters": [
           {
@@ -204,9 +198,7 @@
         }
       },
       "delete": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "delete_v1_acp",
         "parameters": [
           {
@@ -228,9 +220,7 @@
     },
     "/v1/agents": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_agents",
         "parameters": [
           {
@@ -280,9 +270,7 @@
     },
     "/v1/agents/{agent}": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_agent",
         "parameters": [
           {
@@ -351,9 +339,7 @@
     },
     "/v1/agents/{agent}/install": {
       "post": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "post_v1_agent_install",
         "parameters": [
           {
@@ -412,9 +398,7 @@
     },
     "/v1/config/mcp": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_config_mcp",
         "parameters": [
           {
@@ -460,9 +444,7 @@
         }
       },
       "put": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "put_v1_config_mcp",
         "parameters": [
           {
@@ -501,9 +483,7 @@
         }
       },
       "delete": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "delete_v1_config_mcp",
         "parameters": [
           {
@@ -534,9 +514,7 @@
     },
     "/v1/config/skills": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_config_skills",
         "parameters": [
           {
@@ -582,9 +560,7 @@
         }
       },
       "put": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "put_v1_config_skills",
         "parameters": [
           {
@@ -623,9 +599,7 @@
         }
       },
       "delete": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "delete_v1_config_skills",
         "parameters": [
           {
@@ -654,11 +628,1817 @@
         }
       }
     },
+    "/v1/desktop/clipboard": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Read the desktop clipboard.",
+        "description": "Returns the current text content of the X11 clipboard.",
+        "operationId": "get_v1_desktop_clipboard",
+        "parameters": [
+          {
+            "name": "selection",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "nullable": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Clipboard contents",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopClipboardResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Clipboard read failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": ["v1"],
+        "summary": "Write to the desktop clipboard.",
+        "description": "Sets the text content of the X11 clipboard.",
+        "operationId": "post_v1_desktop_clipboard",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopClipboardWriteRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Clipboard updated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopActionResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Clipboard write failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/display/info": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get desktop display information.",
+        "description": "Performs a health-gated display query against the managed desktop and\nreturns the current display identifier and resolution.",
+        "operationId": "get_v1_desktop_display_info",
+        "responses": {
+          "200": {
+            "description": "Desktop display information",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopDisplayInfoResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "Desktop runtime health or display query failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/keyboard/down": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Press and hold a desktop keyboard key.",
+        "description": "Performs a health-gated `xdotool keydown` operation against the managed\ndesktop.",
+        "operationId": "post_v1_desktop_keyboard_down",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopKeyboardDownRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop keyboard action result",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopActionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid keyboard down request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/keyboard/press": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Press a desktop keyboard shortcut.",
+        "description": "Performs a health-gated `xdotool key` operation against the managed\ndesktop.",
+        "operationId": "post_v1_desktop_keyboard_press",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopKeyboardPressRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop keyboard action result",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopActionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid keyboard press request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/keyboard/type": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Type desktop keyboard text.",
+        "description": "Performs a health-gated `xdotool type` operation against the managed\ndesktop.",
+        "operationId": "post_v1_desktop_keyboard_type",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopKeyboardTypeRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop keyboard action result",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopActionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid keyboard type request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/keyboard/up": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Release a desktop keyboard key.",
+        "description": "Performs a health-gated `xdotool keyup` operation against the managed\ndesktop.",
+        "operationId": "post_v1_desktop_keyboard_up",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopKeyboardUpRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop keyboard action result",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopActionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid keyboard up request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/launch": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Launch a desktop application.",
+        "description": "Launches an application by name on the managed desktop, optionally waiting\nfor its window to appear.",
+        "operationId": "post_v1_desktop_launch",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopLaunchRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Application launched",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopLaunchResponse"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Application not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/click": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Click on the desktop.",
+        "description": "Performs a health-gated pointer move and click against the managed desktop\nand returns the resulting mouse position.",
+        "operationId": "post_v1_desktop_mouse_click",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopMouseClickRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position after click",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid mouse click request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/down": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Press and hold a desktop mouse button.",
+        "description": "Performs a health-gated optional pointer move followed by `xdotool mousedown`\nand returns the resulting mouse position.",
+        "operationId": "post_v1_desktop_mouse_down",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopMouseDownRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position after button press",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid mouse down request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/drag": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Drag the desktop mouse.",
+        "description": "Performs a health-gated drag gesture against the managed desktop and\nreturns the resulting mouse position.",
+        "operationId": "post_v1_desktop_mouse_drag",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopMouseDragRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position after drag",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid mouse drag request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/move": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Move the desktop mouse.",
+        "description": "Performs a health-gated absolute pointer move on the managed desktop and\nreturns the resulting mouse position.",
+        "operationId": "post_v1_desktop_mouse_move",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopMouseMoveRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position after move",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid mouse move request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/position": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get the current desktop mouse position.",
+        "description": "Performs a health-gated mouse position query against the managed desktop.",
+        "operationId": "get_v1_desktop_mouse_position",
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input check failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/scroll": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Scroll the desktop mouse wheel.",
+        "description": "Performs a health-gated scroll gesture at the requested coordinates and\nreturns the resulting mouse position.",
+        "operationId": "post_v1_desktop_mouse_scroll",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopMouseScrollRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position after scroll",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid mouse scroll request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/mouse/up": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Release a desktop mouse button.",
+        "description": "Performs a health-gated optional pointer move followed by `xdotool mouseup`\nand returns the resulting mouse position.",
+        "operationId": "post_v1_desktop_mouse_up",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopMouseUpRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop mouse position after button release",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopMousePositionResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid mouse up request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or input failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/open": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Open a file or URL with the default handler.",
+        "description": "Opens a file path or URL using xdg-open on the managed desktop.",
+        "operationId": "post_v1_desktop_open",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopOpenRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Target opened",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopOpenResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/recording/start": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Start desktop recording.",
+        "description": "Starts an ffmpeg x11grab recording against the managed desktop and returns\nthe created recording metadata.",
+        "operationId": "post_v1_desktop_recording_start",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopRecordingStartRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop recording started",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopRecordingInfo"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready or a recording is already active",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop recording failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/recording/stop": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Stop desktop recording.",
+        "description": "Stops the active desktop recording and returns the finalized recording\nmetadata.",
+        "operationId": "post_v1_desktop_recording_stop",
+        "responses": {
+          "200": {
+            "description": "Desktop recording stopped",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopRecordingInfo"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "No active desktop recording",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop recording stop failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/recordings": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "List desktop recordings.",
+        "description": "Returns the current desktop recording catalog.",
+        "operationId": "get_v1_desktop_recordings",
+        "responses": {
+          "200": {
+            "description": "Desktop recordings",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopRecordingListResponse"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop recordings query failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/recordings/{id}": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get desktop recording metadata.",
+        "description": "Returns metadata for a single desktop recording.",
+        "operationId": "get_v1_desktop_recording",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Desktop recording ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Desktop recording metadata",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopRecordingInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown desktop recording",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": ["v1"],
+        "summary": "Delete a desktop recording.",
+        "description": "Removes a completed desktop recording and its file from disk.",
+        "operationId": "delete_v1_desktop_recording",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Desktop recording ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Desktop recording deleted"
+          },
+          "404": {
+            "description": "Unknown desktop recording",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop recording is still active",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/recordings/{id}/download": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Download a desktop recording.",
+        "description": "Serves the recorded MP4 bytes for a completed desktop recording.",
+        "operationId": "get_v1_desktop_recording_download",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Desktop recording ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Desktop recording as MP4 bytes"
+          },
+          "404": {
+            "description": "Unknown desktop recording",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/screenshot": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Capture a full desktop screenshot.",
+        "description": "Performs a health-gated full-frame screenshot of the managed desktop and\nreturns the requested image bytes.",
+        "operationId": "get_v1_desktop_screenshot",
+        "parameters": [
+          {
+            "name": "format",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/DesktopScreenshotFormat"
+                }
+              ],
+              "nullable": true
+            }
+          },
+          {
+            "name": "quality",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "nullable": true,
+              "minimum": 0
+            }
+          },
+          {
+            "name": "scale",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "number",
+              "format": "float",
+              "nullable": true
+            }
+          },
+          {
+            "name": "showCursor",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "nullable": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Desktop screenshot as image bytes"
+          },
+          "400": {
+            "description": "Invalid screenshot query",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or screenshot capture failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/screenshot/region": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Capture a desktop screenshot region.",
+        "description": "Performs a health-gated screenshot crop against the managed desktop and\nreturns the requested region image bytes.",
+        "operationId": "get_v1_desktop_screenshot_region",
+        "parameters": [
+          {
+            "name": "x",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "y",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "width",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "minimum": 0
+            }
+          },
+          {
+            "name": "height",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "minimum": 0
+            }
+          },
+          {
+            "name": "format",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/DesktopScreenshotFormat"
+                }
+              ],
+              "nullable": true
+            }
+          },
+          {
+            "name": "quality",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "nullable": true,
+              "minimum": 0
+            }
+          },
+          {
+            "name": "scale",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "number",
+              "format": "float",
+              "nullable": true
+            }
+          },
+          {
+            "name": "showCursor",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "nullable": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Desktop screenshot region as image bytes"
+          },
+          "400": {
+            "description": "Invalid screenshot region",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop runtime health or screenshot capture failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/start": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Start the private desktop runtime.",
+        "description": "Lazily launches the managed Xvfb/openbox stack, validates display health,\nand returns the resulting desktop status snapshot.",
+        "operationId": "post_v1_desktop_start",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopStartRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Desktop runtime status after start",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopStatusResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid desktop start request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is already transitioning",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Desktop API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "Desktop runtime could not be started",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/status": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get desktop runtime status.",
+        "description": "Returns the current desktop runtime state, dependency status, active\ndisplay metadata, and supervised process information.",
+        "operationId": "get_v1_desktop_status",
+        "responses": {
+          "200": {
+            "description": "Desktop runtime status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopStatusResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication required",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/stop": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Stop the private desktop runtime.",
+        "description": "Terminates the managed openbox/Xvfb/dbus processes owned by the desktop\nruntime and returns the resulting status snapshot.",
+        "operationId": "post_v1_desktop_stop",
+        "responses": {
+          "200": {
+            "description": "Desktop runtime status after stop",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopStatusResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is already transitioning",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/stream/signaling": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Open a desktop WebRTC signaling session.",
+        "description": "Upgrades the connection to a WebSocket used for WebRTC signaling between\nthe browser client and the desktop streaming process. Also accepts mouse\nand keyboard input frames as a fallback transport.",
+        "operationId": "get_v1_desktop_stream_ws",
+        "parameters": [
+          {
+            "name": "access_token",
+            "in": "query",
+            "description": "Bearer token alternative for WS auth",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "nullable": true
+            }
+          }
+        ],
+        "responses": {
+          "101": {
+            "description": "WebSocket upgraded"
+          },
+          "409": {
+            "description": "Desktop runtime or streaming session is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "502": {
+            "description": "Desktop stream failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/stream/start": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Start desktop streaming.",
+        "description": "Enables desktop websocket streaming for the managed desktop.",
+        "operationId": "post_v1_desktop_stream_start",
+        "responses": {
+          "200": {
+            "description": "Desktop streaming started",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopStreamStatusResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/stream/status": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get desktop stream status.",
+        "description": "Returns the current state of the desktop WebRTC streaming session.",
+        "operationId": "get_v1_desktop_stream_status",
+        "responses": {
+          "200": {
+            "description": "Desktop stream status",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopStreamStatusResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/stream/stop": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Stop desktop streaming.",
+        "description": "Disables desktop websocket streaming for the managed desktop.",
+        "operationId": "post_v1_desktop_stream_stop",
+        "responses": {
+          "200": {
+            "description": "Desktop streaming stopped",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopStreamStatusResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/windows": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "List visible desktop windows.",
+        "description": "Performs a health-gated visible-window enumeration against the managed\ndesktop and returns the current window metadata.",
+        "operationId": "get_v1_desktop_windows",
+        "responses": {
+          "200": {
+            "description": "Visible desktop windows",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopWindowListResponse"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "Desktop runtime health or window query failed",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/windows/focused": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get the currently focused desktop window.",
+        "description": "Returns information about the window that currently has input focus.",
+        "operationId": "get_v1_desktop_windows_focused",
+        "responses": {
+          "200": {
+            "description": "Focused window info",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopWindowInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "No window is focused",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/windows/{id}/focus": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Focus a desktop window.",
+        "description": "Brings the specified window to the foreground and gives it input focus.",
+        "operationId": "post_v1_desktop_window_focus",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "X11 window ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Window info after focus",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopWindowInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Window not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/windows/{id}/move": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Move a desktop window.",
+        "description": "Moves the specified window to the given position.",
+        "operationId": "post_v1_desktop_window_move",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "X11 window ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopWindowMoveRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Window info after move",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopWindowInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Window not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/desktop/windows/{id}/resize": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Resize a desktop window.",
+        "description": "Resizes the specified window to the given dimensions.",
+        "operationId": "post_v1_desktop_window_resize",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "X11 window ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DesktopWindowResizeRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Window info after resize",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DesktopWindowInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Window not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Desktop runtime is not ready",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/v1/fs/entries": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_fs_entries",
         "parameters": [
           {
@@ -691,9 +2471,7 @@
     },
     "/v1/fs/entry": {
       "delete": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "delete_v1_fs_entry",
         "parameters": [
           {
@@ -732,9 +2510,7 @@
     },
     "/v1/fs/file": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_fs_file",
         "parameters": [
           {
@@ -754,9 +2530,7 @@
         }
       },
       "put": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "put_v1_fs_file",
         "parameters": [
           {
@@ -796,9 +2570,7 @@
     },
     "/v1/fs/mkdir": {
       "post": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "post_v1_fs_mkdir",
         "parameters": [
           {
@@ -827,9 +2599,7 @@
     },
     "/v1/fs/move": {
       "post": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "post_v1_fs_move",
         "requestBody": {
           "content": {
@@ -857,9 +2627,7 @@
     },
     "/v1/fs/stat": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_fs_stat",
         "parameters": [
           {
@@ -888,9 +2656,7 @@
     },
     "/v1/fs/upload-batch": {
       "post": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "post_v1_fs_upload_batch",
         "parameters": [
           {
@@ -931,9 +2697,7 @@
     },
     "/v1/health": {
       "get": {
-        "tags": [
-          "v1"
-        ],
+        "tags": ["v1"],
         "operationId": "get_v1_health",
         "responses": {
           "200": {
@@ -948,15 +2712,807 @@
           }
         }
       }
+    },
+    "/v1/processes": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "List all managed processes.",
+        "description": "Returns a list of all processes (running and exited) currently tracked\nby the runtime, sorted by process ID.",
+        "operationId": "get_v1_processes",
+        "parameters": [
+          {
+            "name": "owner",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/ProcessOwner"
+                }
+              ],
+              "nullable": true
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "List processes",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessListResponse"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": ["v1"],
+        "summary": "Create a long-lived managed process.",
+        "description": "Spawns a new process with the given command and arguments. Supports both\npipe-based and PTY (tty) modes. Returns the process descriptor on success.",
+        "operationId": "post_v1_processes",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProcessCreateRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Started process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessInfo"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Process limit or state conflict",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/config": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get process runtime configuration.",
+        "description": "Returns the current runtime configuration for the process management API,\nincluding limits for concurrency, timeouts, and buffer sizes.",
+        "operationId": "get_v1_processes_config",
+        "responses": {
+          "200": {
+            "description": "Current runtime process config",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessConfig"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": ["v1"],
+        "summary": "Update process runtime configuration.",
+        "description": "Replaces the runtime configuration for the process management API.\nValidates that all values are non-zero and clamps default timeout to max.",
+        "operationId": "post_v1_processes_config",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProcessConfig"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Updated runtime process config",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessConfig"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid config",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/run": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Run a one-shot command.",
+        "description": "Executes a command to completion and returns its stdout, stderr, exit code,\nand duration. Supports configurable timeout and output size limits.",
+        "operationId": "post_v1_processes_run",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProcessRunRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "One-off command result",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessRunResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Get a single process by ID.",
+        "description": "Returns the current state of a managed process including its status,\nPID, exit code, and creation/exit timestamps.",
+        "operationId": "get_v1_process",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Process details",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": ["v1"],
+        "summary": "Delete a process record.",
+        "description": "Removes a stopped process from the runtime. Returns 409 if the process\nis still running; stop or kill it first.",
+        "operationId": "delete_v1_process",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Process deleted"
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Process is still running",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}/input": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Write input to a process.",
+        "description": "Sends data to a process's stdin (pipe mode) or PTY writer (tty mode).\nData can be encoded as base64, utf8, or text. Returns 413 if the decoded\npayload exceeds the configured `maxInputBytesPerRequest` limit.",
+        "operationId": "post_v1_process_input",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProcessInputRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Input accepted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessInputResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Process not writable",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "413": {
+            "description": "Input exceeds configured limit",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}/kill": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Send SIGKILL to a process.",
+        "description": "Sends SIGKILL to the process and optionally waits up to `waitMs`\nmilliseconds for the process to exit before returning.",
+        "operationId": "post_v1_process_kill",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "waitMs",
+            "in": "query",
+            "description": "Wait up to N ms for process to exit",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "nullable": true,
+              "minimum": 0
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Kill signal sent",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}/logs": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Fetch process logs.",
+        "description": "Returns buffered log entries for a process. Supports filtering by stream\ntype, tail count, and sequence-based resumption. When `follow=true`,\nreturns an SSE stream that replays buffered entries then streams live output.",
+        "operationId": "get_v1_process_logs",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "stream",
+            "in": "query",
+            "description": "stdout|stderr|combined|pty",
+            "required": false,
+            "schema": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/ProcessLogsStream"
+                }
+              ],
+              "nullable": true
+            }
+          },
+          {
+            "name": "tail",
+            "in": "query",
+            "description": "Tail N entries",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "nullable": true,
+              "minimum": 0
+            }
+          },
+          {
+            "name": "follow",
+            "in": "query",
+            "description": "Follow via SSE",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "nullable": true
+            }
+          },
+          {
+            "name": "since",
+            "in": "query",
+            "description": "Only entries with sequence greater than this",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "nullable": true,
+              "minimum": 0
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Process logs",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessLogsResponse"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}/stop": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Send SIGTERM to a process.",
+        "description": "Sends SIGTERM to the process and optionally waits up to `waitMs`\nmilliseconds for the process to exit before returning.",
+        "operationId": "post_v1_process_stop",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "waitMs",
+            "in": "query",
+            "description": "Wait up to N ms for process to exit",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "nullable": true,
+              "minimum": 0
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Stop signal sent",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}/terminal/resize": {
+      "post": {
+        "tags": ["v1"],
+        "summary": "Resize a process terminal.",
+        "description": "Sets the PTY window size (columns and rows) for a tty-mode process and\nsends SIGWINCH so the child process can adapt.",
+        "operationId": "post_v1_process_terminal_resize",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProcessTerminalResizeRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Resize accepted",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProcessTerminalResizeResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Not a terminal process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/processes/{id}/terminal/ws": {
+      "get": {
+        "tags": ["v1"],
+        "summary": "Open an interactive WebSocket terminal session.",
+        "description": "Upgrades the connection to a WebSocket for bidirectional PTY I/O. Accepts\n`access_token` query param for browser-based auth (WebSocket API cannot\nsend custom headers). Streams raw PTY output as binary frames and accepts\nJSON control frames for input, resize, and close.",
+        "operationId": "get_v1_process_terminal_ws",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Process ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "access_token",
+            "in": "query",
+            "description": "Bearer token alternative for WS auth",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "nullable": true
+            }
+          }
+        ],
+        "responses": {
+          "101": {
+            "description": "WebSocket upgraded"
+          },
+          "400": {
+            "description": "Invalid websocket frame or upgrade request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Not a terminal process",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "501": {
+            "description": "Process API unsupported on this platform",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
     "schemas": {
       "AcpEnvelope": {
         "type": "object",
-        "required": [
-          "jsonrpc"
-        ],
+        "required": ["jsonrpc"],
         "properties": {
           "error": {
             "nullable": true
@@ -990,11 +3546,7 @@
       },
       "AcpServerInfo": {
         "type": "object",
-        "required": [
-          "serverId",
-          "agent",
-          "createdAtMs"
-        ],
+        "required": ["serverId", "agent", "createdAtMs"],
         "properties": {
           "agent": {
             "type": "string"
@@ -1010,9 +3562,7 @@
       },
       "AcpServerListResponse": {
         "type": "object",
-        "required": [
-          "servers"
-        ],
+        "required": ["servers"],
         "properties": {
           "servers": {
             "type": "array",
@@ -1103,12 +3653,7 @@
       },
       "AgentInfo": {
         "type": "object",
-        "required": [
-          "id",
-          "installed",
-          "credentialsAvailable",
-          "capabilities"
-        ],
+        "required": ["id", "installed", "credentialsAvailable", "capabilities"],
         "properties": {
           "capabilities": {
             "$ref": "#/components/schemas/AgentCapabilities"
@@ -1151,11 +3696,7 @@
       },
       "AgentInstallArtifact": {
         "type": "object",
-        "required": [
-          "kind",
-          "path",
-          "source"
-        ],
+        "required": ["kind", "path", "source"],
         "properties": {
           "kind": {
             "type": "string"
@@ -1191,10 +3732,7 @@
       },
       "AgentInstallResponse": {
         "type": "object",
-        "required": [
-          "already_installed",
-          "artifacts"
-        ],
+        "required": ["already_installed", "artifacts"],
         "properties": {
           "already_installed": {
             "type": "boolean"
@@ -1209,9 +3747,7 @@
       },
       "AgentListResponse": {
         "type": "object",
-        "required": [
-          "agents"
-        ],
+        "required": ["agents"],
         "properties": {
           "agents": {
             "type": "array",
@@ -1221,6 +3757,769 @@
           }
         }
       },
+      "DesktopActionResponse": {
+        "type": "object",
+        "required": ["ok"],
+        "properties": {
+          "ok": {
+            "type": "boolean"
+          }
+        }
+      },
+      "DesktopClipboardQuery": {
+        "type": "object",
+        "properties": {
+          "selection": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopClipboardResponse": {
+        "type": "object",
+        "required": ["text", "selection"],
+        "properties": {
+          "selection": {
+            "type": "string"
+          },
+          "text": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopClipboardWriteRequest": {
+        "type": "object",
+        "required": ["text"],
+        "properties": {
+          "selection": {
+            "type": "string",
+            "nullable": true
+          },
+          "text": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopDisplayInfoResponse": {
+        "type": "object",
+        "required": ["display", "resolution"],
+        "properties": {
+          "display": {
+            "type": "string"
+          },
+          "resolution": {
+            "$ref": "#/components/schemas/DesktopResolution"
+          }
+        }
+      },
+      "DesktopErrorInfo": {
+        "type": "object",
+        "required": ["code", "message"],
+        "properties": {
+          "code": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopKeyModifiers": {
+        "type": "object",
+        "properties": {
+          "alt": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "cmd": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "ctrl": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "shift": {
+            "type": "boolean",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopKeyboardDownRequest": {
+        "type": "object",
+        "required": ["key"],
+        "properties": {
+          "key": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopKeyboardPressRequest": {
+        "type": "object",
+        "required": ["key"],
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "modifiers": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopKeyModifiers"
+              }
+            ],
+            "nullable": true
+          }
+        }
+      },
+      "DesktopKeyboardTypeRequest": {
+        "type": "object",
+        "required": ["text"],
+        "properties": {
+          "delayMs": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "text": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopKeyboardUpRequest": {
+        "type": "object",
+        "required": ["key"],
+        "properties": {
+          "key": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopLaunchRequest": {
+        "type": "object",
+        "required": ["app"],
+        "properties": {
+          "app": {
+            "type": "string"
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "wait": {
+            "type": "boolean",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopLaunchResponse": {
+        "type": "object",
+        "required": ["processId"],
+        "properties": {
+          "pid": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "processId": {
+            "type": "string"
+          },
+          "windowId": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopMouseButton": {
+        "type": "string",
+        "enum": ["left", "middle", "right"]
+      },
+      "DesktopMouseClickRequest": {
+        "type": "object",
+        "required": ["x", "y"],
+        "properties": {
+          "button": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopMouseButton"
+              }
+            ],
+            "nullable": true
+          },
+          "clickCount": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopMouseDownRequest": {
+        "type": "object",
+        "properties": {
+          "button": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopMouseButton"
+              }
+            ],
+            "nullable": true
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopMouseDragRequest": {
+        "type": "object",
+        "required": ["startX", "startY", "endX", "endY"],
+        "properties": {
+          "button": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopMouseButton"
+              }
+            ],
+            "nullable": true
+          },
+          "endX": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "endY": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "startX": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "startY": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopMouseMoveRequest": {
+        "type": "object",
+        "required": ["x", "y"],
+        "properties": {
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopMousePositionResponse": {
+        "type": "object",
+        "required": ["x", "y"],
+        "properties": {
+          "screen": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "window": {
+            "type": "string",
+            "nullable": true
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopMouseScrollRequest": {
+        "type": "object",
+        "required": ["x", "y"],
+        "properties": {
+          "deltaX": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "deltaY": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopMouseUpRequest": {
+        "type": "object",
+        "properties": {
+          "button": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopMouseButton"
+              }
+            ],
+            "nullable": true
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopOpenRequest": {
+        "type": "object",
+        "required": ["target"],
+        "properties": {
+          "target": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopOpenResponse": {
+        "type": "object",
+        "required": ["processId"],
+        "properties": {
+          "pid": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "processId": {
+            "type": "string"
+          }
+        }
+      },
+      "DesktopProcessInfo": {
+        "type": "object",
+        "required": ["name", "running"],
+        "properties": {
+          "logPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "name": {
+            "type": "string"
+          },
+          "pid": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "running": {
+            "type": "boolean"
+          }
+        }
+      },
+      "DesktopRecordingInfo": {
+        "type": "object",
+        "required": ["id", "status", "fileName", "bytes", "startedAt"],
+        "properties": {
+          "bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0
+          },
+          "endedAt": {
+            "type": "string",
+            "nullable": true
+          },
+          "fileName": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "processId": {
+            "type": "string",
+            "nullable": true
+          },
+          "startedAt": {
+            "type": "string"
+          },
+          "status": {
+            "$ref": "#/components/schemas/DesktopRecordingStatus"
+          }
+        }
+      },
+      "DesktopRecordingListResponse": {
+        "type": "object",
+        "required": ["recordings"],
+        "properties": {
+          "recordings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/DesktopRecordingInfo"
+            }
+          }
+        }
+      },
+      "DesktopRecordingStartRequest": {
+        "type": "object",
+        "properties": {
+          "fps": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          }
+        }
+      },
+      "DesktopRecordingStatus": {
+        "type": "string",
+        "enum": ["recording", "completed", "failed"]
+      },
+      "DesktopRegionScreenshotQuery": {
+        "type": "object",
+        "required": ["x", "y", "width", "height"],
+        "properties": {
+          "format": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopScreenshotFormat"
+              }
+            ],
+            "nullable": true
+          },
+          "height": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "quality": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "scale": {
+            "type": "number",
+            "format": "float",
+            "nullable": true
+          },
+          "showCursor": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "width": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopResolution": {
+        "type": "object",
+        "required": ["width", "height"],
+        "properties": {
+          "dpi": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "height": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "width": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          }
+        }
+      },
+      "DesktopScreenshotFormat": {
+        "type": "string",
+        "enum": ["png", "jpeg", "webp"]
+      },
+      "DesktopScreenshotQuery": {
+        "type": "object",
+        "properties": {
+          "format": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopScreenshotFormat"
+              }
+            ],
+            "nullable": true
+          },
+          "quality": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "scale": {
+            "type": "number",
+            "format": "float",
+            "nullable": true
+          },
+          "showCursor": {
+            "type": "boolean",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopStartRequest": {
+        "type": "object",
+        "properties": {
+          "displayNum": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "dpi": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "height": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "recordingFps": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "stateDir": {
+            "type": "string",
+            "nullable": true
+          },
+          "streamAudioCodec": {
+            "type": "string",
+            "nullable": true
+          },
+          "streamFrameRate": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "streamVideoCodec": {
+            "type": "string",
+            "nullable": true
+          },
+          "webrtcPortRange": {
+            "type": "string",
+            "nullable": true
+          },
+          "width": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          }
+        }
+      },
+      "DesktopState": {
+        "type": "string",
+        "enum": ["inactive", "install_required", "starting", "active", "stopping", "failed"]
+      },
+      "DesktopStatusResponse": {
+        "type": "object",
+        "required": ["state"],
+        "properties": {
+          "display": {
+            "type": "string",
+            "nullable": true
+          },
+          "installCommand": {
+            "type": "string",
+            "nullable": true
+          },
+          "lastError": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopErrorInfo"
+              }
+            ],
+            "nullable": true
+          },
+          "missingDependencies": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "processes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/DesktopProcessInfo"
+            }
+          },
+          "resolution": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DesktopResolution"
+              }
+            ],
+            "nullable": true
+          },
+          "runtimeLogPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "startedAt": {
+            "type": "string",
+            "nullable": true
+          },
+          "state": {
+            "$ref": "#/components/schemas/DesktopState"
+          },
+          "windows": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/DesktopWindowInfo"
+            },
+            "description": "Current visible windows (included when the desktop is active)."
+          }
+        }
+      },
+      "DesktopStreamStatusResponse": {
+        "type": "object",
+        "required": ["active"],
+        "properties": {
+          "active": {
+            "type": "boolean"
+          },
+          "processId": {
+            "type": "string",
+            "nullable": true
+          },
+          "windowId": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "DesktopWindowInfo": {
+        "type": "object",
+        "required": ["id", "title", "x", "y", "width", "height", "isActive"],
+        "properties": {
+          "height": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "id": {
+            "type": "string"
+          },
+          "isActive": {
+            "type": "boolean"
+          },
+          "title": {
+            "type": "string"
+          },
+          "width": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopWindowListResponse": {
+        "type": "object",
+        "required": ["windows"],
+        "properties": {
+          "windows": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/DesktopWindowInfo"
+            }
+          }
+        }
+      },
+      "DesktopWindowMoveRequest": {
+        "type": "object",
+        "required": ["x", "y"],
+        "properties": {
+          "x": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "y": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "DesktopWindowResizeRequest": {
+        "type": "object",
+        "required": ["width", "height"],
+        "properties": {
+          "height": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "width": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          }
+        }
+      },
       "ErrorType": {
         "type": "string",
         "enum": [
@@ -1234,6 +4533,7 @@
           "permission_denied",
           "not_acceptable",
           "unsupported_media_type",
+          "not_found",
           "session_not_found",
           "session_already_exists",
           "mode_not_supported",
@@ -1243,9 +4543,7 @@
       },
       "FsActionResponse": {
         "type": "object",
-        "required": [
-          "path"
-        ],
+        "required": ["path"],
         "properties": {
           "path": {
             "type": "string"
@@ -1254,9 +4552,7 @@
       },
       "FsDeleteQuery": {
         "type": "object",
-        "required": [
-          "path"
-        ],
+        "required": ["path"],
         "properties": {
           "path": {
             "type": "string"
@@ -1278,12 +4574,7 @@
       },
       "FsEntry": {
         "type": "object",
-        "required": [
-          "name",
-          "path",
-          "entryType",
-          "size"
-        ],
+        "required": ["name", "path", "entryType", "size"],
         "properties": {
           "entryType": {
             "$ref": "#/components/schemas/FsEntryType"
@@ -1307,17 +4598,11 @@
       },
       "FsEntryType": {
         "type": "string",
-        "enum": [
-          "file",
-          "directory"
-        ]
+        "enum": ["file", "directory"]
       },
       "FsMoveRequest": {
         "type": "object",
-        "required": [
-          "from",
-          "to"
-        ],
+        "required": ["from", "to"],
         "properties": {
           "from": {
             "type": "string"
@@ -1333,10 +4618,7 @@
       },
       "FsMoveResponse": {
         "type": "object",
-        "required": [
-          "from",
-          "to"
-        ],
+        "required": ["from", "to"],
         "properties": {
           "from": {
             "type": "string"
@@ -1348,9 +4630,7 @@
       },
       "FsPathQuery": {
         "type": "object",
-        "required": [
-          "path"
-        ],
+        "required": ["path"],
         "properties": {
           "path": {
             "type": "string"
@@ -1359,11 +4639,7 @@
       },
       "FsStat": {
         "type": "object",
-        "required": [
-          "path",
-          "entryType",
-          "size"
-        ],
+        "required": ["path", "entryType", "size"],
         "properties": {
           "entryType": {
             "$ref": "#/components/schemas/FsEntryType"
@@ -1393,10 +4669,7 @@
       },
       "FsUploadBatchResponse": {
         "type": "object",
-        "required": [
-          "paths",
-          "truncated"
-        ],
+        "required": ["paths", "truncated"],
         "properties": {
           "paths": {
             "type": "array",
@@ -1411,10 +4684,7 @@
       },
       "FsWriteResponse": {
         "type": "object",
-        "required": [
-          "path",
-          "bytesWritten"
-        ],
+        "required": ["path", "bytesWritten"],
         "properties": {
           "bytesWritten": {
             "type": "integer",
@@ -1428,9 +4698,7 @@
       },
       "HealthResponse": {
         "type": "object",
-        "required": [
-          "status"
-        ],
+        "required": ["status"],
         "properties": {
           "status": {
             "type": "string"
@@ -1439,10 +4707,7 @@
       },
       "McpConfigQuery": {
         "type": "object",
-        "required": [
-          "directory",
-          "mcpName"
-        ],
+        "required": ["directory", "mcpName"],
         "properties": {
           "directory": {
             "type": "string"
@@ -1456,10 +4721,7 @@
         "oneOf": [
           {
             "type": "object",
-            "required": [
-              "command",
-              "type"
-            ],
+            "required": ["command", "type"],
             "properties": {
               "args": {
                 "type": "array",
@@ -1493,18 +4755,13 @@
               },
               "type": {
                 "type": "string",
-                "enum": [
-                  "local"
-                ]
+                "enum": ["local"]
               }
             }
           },
           {
             "type": "object",
-            "required": [
-              "url",
-              "type"
-            ],
+            "required": ["url", "type"],
             "properties": {
               "bearerTokenEnvVar": {
                 "type": "string",
@@ -1552,9 +4809,7 @@
               },
               "type": {
                 "type": "string",
-                "enum": [
-                  "remote"
-                ]
+                "enum": ["remote"]
               },
               "url": {
                 "type": "string"
@@ -1568,11 +4823,7 @@
       },
       "ProblemDetails": {
         "type": "object",
-        "required": [
-          "type",
-          "title",
-          "status"
-        ],
+        "required": ["type", "title", "status"],
         "properties": {
           "detail": {
             "type": "string",
@@ -1596,18 +4847,370 @@
         },
         "additionalProperties": {}
       },
+      "ProcessConfig": {
+        "type": "object",
+        "required": ["maxConcurrentProcesses", "defaultRunTimeoutMs", "maxRunTimeoutMs", "maxOutputBytes", "maxLogBytesPerProcess", "maxInputBytesPerRequest"],
+        "properties": {
+          "defaultRunTimeoutMs": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0
+          },
+          "maxConcurrentProcesses": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "maxInputBytesPerRequest": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "maxLogBytesPerProcess": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "maxOutputBytes": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "maxRunTimeoutMs": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0
+          }
+        }
+      },
+      "ProcessCreateRequest": {
+        "type": "object",
+        "required": ["command"],
+        "properties": {
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "command": {
+            "type": "string"
+          },
+          "cwd": {
+            "type": "string",
+            "nullable": true
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "interactive": {
+            "type": "boolean"
+          },
+          "tty": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ProcessInfo": {
+        "type": "object",
+        "required": ["id", "command", "args", "tty", "interactive", "owner", "status", "createdAtMs"],
+        "properties": {
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "command": {
+            "type": "string"
+          },
+          "createdAtMs": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "cwd": {
+            "type": "string",
+            "nullable": true
+          },
+          "exitCode": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "exitedAtMs": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "interactive": {
+            "type": "boolean"
+          },
+          "owner": {
+            "$ref": "#/components/schemas/ProcessOwner"
+          },
+          "pid": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "minimum": 0
+          },
+          "status": {
+            "$ref": "#/components/schemas/ProcessState"
+          },
+          "tty": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ProcessInputRequest": {
+        "type": "object",
+        "required": ["data"],
+        "properties": {
+          "data": {
+            "type": "string"
+          },
+          "encoding": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "ProcessInputResponse": {
+        "type": "object",
+        "required": ["bytesWritten"],
+        "properties": {
+          "bytesWritten": {
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      },
+      "ProcessListQuery": {
+        "type": "object",
+        "properties": {
+          "owner": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ProcessOwner"
+              }
+            ],
+            "nullable": true
+          }
+        }
+      },
+      "ProcessListResponse": {
+        "type": "object",
+        "required": ["processes"],
+        "properties": {
+          "processes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProcessInfo"
+            }
+          }
+        }
+      },
+      "ProcessLogEntry": {
+        "type": "object",
+        "required": ["sequence", "stream", "timestampMs", "data", "encoding"],
+        "properties": {
+          "data": {
+            "type": "string"
+          },
+          "encoding": {
+            "type": "string"
+          },
+          "sequence": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0
+          },
+          "stream": {
+            "$ref": "#/components/schemas/ProcessLogsStream"
+          },
+          "timestampMs": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
+      "ProcessLogsQuery": {
+        "type": "object",
+        "properties": {
+          "follow": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "since": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true,
+            "minimum": 0
+          },
+          "stream": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ProcessLogsStream"
+              }
+            ],
+            "nullable": true
+          },
+          "tail": {
+            "type": "integer",
+            "nullable": true,
+            "minimum": 0
+          }
+        }
+      },
+      "ProcessLogsResponse": {
+        "type": "object",
+        "required": ["processId", "stream", "entries"],
+        "properties": {
+          "entries": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProcessLogEntry"
+            }
+          },
+          "processId": {
+            "type": "string"
+          },
+          "stream": {
+            "$ref": "#/components/schemas/ProcessLogsStream"
+          }
+        }
+      },
+      "ProcessLogsStream": {
+        "type": "string",
+        "enum": ["stdout", "stderr", "combined", "pty"]
+      },
+      "ProcessOwner": {
+        "type": "string",
+        "enum": ["user", "desktop", "system"]
+      },
+      "ProcessRunRequest": {
+        "type": "object",
+        "required": ["command"],
+        "properties": {
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "command": {
+            "type": "string"
+          },
+          "cwd": {
+            "type": "string",
+            "nullable": true
+          },
+          "env": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "maxOutputBytes": {
+            "type": "integer",
+            "nullable": true,
+            "minimum": 0
+          },
+          "timeoutMs": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true,
+            "minimum": 0
+          }
+        }
+      },
+      "ProcessRunResponse": {
+        "type": "object",
+        "required": ["timedOut", "stdout", "stderr", "stdoutTruncated", "stderrTruncated", "durationMs"],
+        "properties": {
+          "durationMs": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0
+          },
+          "exitCode": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "stderr": {
+            "type": "string"
+          },
+          "stderrTruncated": {
+            "type": "boolean"
+          },
+          "stdout": {
+            "type": "string"
+          },
+          "stdoutTruncated": {
+            "type": "boolean"
+          },
+          "timedOut": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ProcessSignalQuery": {
+        "type": "object",
+        "properties": {
+          "waitMs": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true,
+            "minimum": 0
+          }
+        }
+      },
+      "ProcessState": {
+        "type": "string",
+        "enum": ["running", "exited"]
+      },
+      "ProcessTerminalResizeRequest": {
+        "type": "object",
+        "required": ["cols", "rows"],
+        "properties": {
+          "cols": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "rows": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          }
+        }
+      },
+      "ProcessTerminalResizeResponse": {
+        "type": "object",
+        "required": ["cols", "rows"],
+        "properties": {
+          "cols": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          },
+          "rows": {
+            "type": "integer",
+            "format": "int32",
+            "minimum": 0
+          }
+        }
+      },
       "ServerStatus": {
         "type": "string",
-        "enum": [
-          "running",
-          "stopped"
-        ]
+        "enum": ["running", "stopped"]
       },
       "ServerStatusInfo": {
         "type": "object",
-        "required": [
-          "status"
-        ],
+        "required": ["status"],
         "properties": {
           "status": {
             "$ref": "#/components/schemas/ServerStatus"
@@ -1622,10 +5225,7 @@
       },
       "SkillSource": {
         "type": "object",
-        "required": [
-          "type",
-          "source"
-        ],
+        "required": ["type", "source"],
         "properties": {
           "ref": {
             "type": "string",
@@ -1652,9 +5252,7 @@
       },
       "SkillsConfig": {
         "type": "object",
-        "required": [
-          "sources"
-        ],
+        "required": ["sources"],
         "properties": {
           "sources": {
             "type": "array",
@@ -1666,10 +5264,7 @@
       },
       "SkillsConfigQuery": {
         "type": "object",
-        "required": [
-          "directory",
-          "skillName"
-        ],
+        "required": ["directory", "skillName"],
         "properties": {
           "directory": {
             "type": "string"
@@ -1687,4 +5282,4 @@
       "description": "ACP proxy v1 API"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/docs/orchestration-architecture.mdx b/docs/orchestration-architecture.mdx
new file mode 100644
index 0000000..08c776c
--- /dev/null
+++ b/docs/orchestration-architecture.mdx
@@ -0,0 +1,43 @@
+---
+title: "Orchestration Architecture"
+description: "Production topology, backend requirements, and session persistence."
+icon: "sitemap"
+---
+
+This page covers production topology and backend requirements. Read [Architecture](/architecture) first for an overview of how the server, SDK, and agent processes fit together.
+
+## Suggested Topology
+
+Run the SDK on your backend, then call it from your frontend.
+
+This extra hop is recommended because it keeps auth/token logic on the backend and makes persistence simpler.
+
+```mermaid placement="top-right"
+  flowchart LR
+    BROWSER["Browser"]
+    subgraph BACKEND["Your backend"]
+      direction TB
+      SDK["Sandbox Agent SDK"]
+    end
+    subgraph SANDBOX_SIMPLE["Sandbox"]
+      SERVER_SIMPLE["Sandbox Agent server"]
+    end
+
+    BROWSER --> BACKEND
+    BACKEND --> SDK --> SERVER_SIMPLE
+```
+
+### Backend requirements
+
+Your backend layer needs to handle:
+
+- **Long-running connections**: prompts can take minutes.
+- **Session affinity**: follow-up messages must reach the same session.
+- **State between requests**: session metadata and event history must persist across requests.
+- **Graceful recovery**: sessions should resume after backend restarts.
+
+We recommend [Rivet](https://rivet.dev) over serverless because actors natively support the long-lived connections, session routing, and state persistence that agent workloads require.
+
+## Session persistence
+
+For storage driver options and replay behavior, see [Persisting Sessions](/session-persistence).
diff --git a/docs/pi-support-plan.md b/docs/pi-support-plan.md
deleted file mode 100644
index 5e207a5..0000000
--- a/docs/pi-support-plan.md
+++ /dev/null
@@ -1,210 +0,0 @@
-# Pi Agent Support Plan (pi-mono)
-
-## Implementation Status Update
-
-- Runtime selection now supports two internal modes:
-  - `PerSession` (default for unknown/non-allowlisted Pi capabilities)
-  - `Shared` (allowlist-only compatibility path)
-- Pi sessions now use per-session process isolation by default, enabling true concurrent Pi sessions in Inspector and API clients.
-- Shared Pi server code remains available and is used only when capability checks allow multiplexing.
-- Session termination for per-session Pi mode hard-kills the underlying Pi process and clears queued prompts/pending waiters.
-- In-session concurrent sends are serialized with an unbounded daemon-side FIFO queue per session.
-
-## Investigation Summary
-
-### Pi CLI modes and RPC protocol
-- Pi supports multiple modes including interactive, print/JSON output, RPC, and SDK usage. JSON mode outputs a stream of JSON events suitable for parsing, and RPC mode is intended for programmatic control over stdin/stdout.
-- RPC mode is started with `pi --mode rpc` and supports options like `--provider`, `--model`, `--no-session`, and `--session-dir`.
-- The RPC protocol is newline-delimited JSON over stdin/stdout:
-  - Commands are JSON objects written to stdin.
-  - Responses are JSON objects with `type: "response"` and optional `id`.
-  - Events are JSON objects without `id`.
-- `prompt` can include images using `ImageContent` (base64 or URL) alongside text.
-- JSON/print mode (`pi -p` or `pi --print --mode json`) produces JSONL for non-interactive parsing and can resume sessions with a token.
-
-### RPC commands
-RPC commands listed in `rpc.md` include:
-- `new_session`, `get_state`, `list_sessions`, `delete_session`, `rename_session`, `clear_session`
-- `prompt`, `queue_message`, `abort`, `get_queued_messages`
-
-### RPC event types
-RPC events listed in `rpc.md` include:
-- `agent_start`, `agent_end`
-- `turn_start`, `turn_end`
-- `message_start`, `message_update`, `message_end`
-- `tool_execution_start`, `tool_execution_update`, `tool_execution_end`
-- `auto_compaction`, `auto_retry`, `hook_error`
-
-`message_update` uses `assistantMessageEvent` deltas such as:
-- `start`, `text_start`, `text_delta`, `text_end`
-- `thinking_start`, `thinking_delta`, `thinking_end`
-- `toolcall_start`, `toolcall_delta`, `toolcall_end`
-- `toolcall_args_start`, `toolcall_args_delta`, `toolcall_args_end`
-- `done`, `error`
-
-`tool_execution_update` includes `partialResult`, which is described as accumulated output so far.
-
-### Schema source locations (pi-mono)
-RPC types are documented as living in:
-- `packages/ai/src/types.ts` (Model types)
-- `packages/agent/src/types.ts` (AgentResponse types)
-- `packages/coding-agent/src/core/messages.ts` (message types)
-- `packages/coding-agent/src/modes/rpc/rpc-types.ts` (RPC protocol types)
-
-### Distribution assets
-Pi releases provide platform-specific binaries such as:
-- `pi-darwin-arm64`, `pi-darwin-x64`
-- `pi-linux-arm64`, `pi-linux-x64`
-- `pi-win-x64.zip`
-
-## Integration Decisions
-- Follow the OpenCode pattern: a shared long-running process (stdio RPC) with session multiplexing.
-- Primary integration path is RPC streaming (`pi --mode rpc`).
-- JSON/print mode is a fallback only (diagnostics or non-interactive runs).
-- Create sessions via `new_session`; store the returned `sessionId` as `native_session_id`.
-- Use `get_state` as a re-sync path after server restarts.
-- Use `prompt` for send-message, with optional image content.
-- Convert Pi events into universal events; emit daemon synthetic `session.started` on session creation and `session.ended` only on errors/termination.
-
-## Implementation Plan
-
-### 1) Agent Identity + Capabilities
-Files:
-- `server/packages/agent-management/src/agents.rs`
-- `server/packages/sandbox-agent/src/router.rs`
-- `docs/cli.mdx`, `docs/conversion.mdx`, `docs/session-transcript-schema.mdx`
-- `README.md`, `frontend/packages/website/src/components/FAQ.tsx`
-
-Tasks:
-- Add `AgentId::Pi` with string/binary name `"pi"` and parsing rules.
-- Add Pi to `all_agents()` and agent lists.
-- Define `AgentCapabilities` for Pi:
-  - `tool_calls=true`, `tool_results=true`
-  - `text_messages=true`, `streaming_deltas=true`, `item_started=true`
-  - `reasoning=true` (from `thinking_*` deltas)
-  - `images=true` (ImageContent in `prompt`)
-  - `permissions=false`, `questions=false`, `mcp_tools=false`
-  - `shared_process=true`, `session_lifecycle=false` (no native session events)
-  - `error_events=true` (hook_error)
-  - `command_execution=false`, `file_changes=false`, `file_attachments=false`
-
-### 2) Installer and Binary Resolution
-Files:
-- `server/packages/agent-management/src/agents.rs`
-
-Tasks:
-- Add `install_pi()` that:
-  - Downloads the correct release asset per platform (`pi-<platform>`).
-  - Handles `.zip` on Windows and raw binaries elsewhere.
-  - Marks binary executable.
-- Add Pi to `AgentManager::install`, `is_installed`, `version`.
-- Version detection: try `--version`, `version`, `-V`.
-
-### 3) Schema Extraction for Pi
-Files:
-- `resources/agent-schemas/src/pi.ts` (new)
-- `resources/agent-schemas/src/index.ts`
-- `resources/agent-schemas/artifacts/json-schema/pi.json`
-- `server/packages/extracted-agent-schemas/build.rs`
-- `server/packages/extracted-agent-schemas/src/lib.rs`
-
-Tasks:
-- Implement `extractPiSchema()`:
-  - Download pi-mono sources (zip/tarball) into a temp dir.
-  - Use `ts-json-schema-generator` against `packages/coding-agent/src/modes/rpc/rpc-types.ts`.
-  - Include dependent files per `rpc.md` (ai/types, agent/types, core/messages).
-  - Extract `RpcEvent`, `RpcResponse`, `RpcCommand` unions (exact type names from source).
-- Add fallback schema if remote fetch fails (minimal union with event/response fields).
-- Wire pi into extractor index and artifact generation.
-
-### 4) Universal Schema Conversion (Pi -> Universal)
-Files:
-- `server/packages/universal-agent-schema/src/agents/pi.rs` (new)
-- `server/packages/universal-agent-schema/src/agents/mod.rs`
-- `server/packages/universal-agent-schema/src/lib.rs`
-- `server/packages/sandbox-agent/src/router.rs`
-
-Mapping rules:
-- `message_start` -> `item.started` (kind=message, role=assistant, native_item_id=messageId)
-- `message_update`:
-  - `text_*` -> `item.delta` (assistant text delta)
-  - `thinking_*` -> `item.delta` with `ContentPart::Reasoning` (visibility=Private)
-  - `toolcall_*` and `toolcall_args_*` -> ignore for now (tool_execution_* is authoritative)
-  - `error` -> `item.completed` with `ItemStatus::Failed` (if no later message_end)
-- `message_end` -> `item.completed` (finalize assistant message)
-- `tool_execution_start` -> `item.started` (kind=tool_call, ContentPart::ToolCall)
-- `tool_execution_update` -> `item.delta` for a synthetic tool_result item:
-  - Maintain a per-toolCallId buffer to compute delta from accumulated `partialResult`.
-- `tool_execution_end` -> `item.completed` (kind=tool_result, output from `result.content`)
-  - If `isError=true`, set item status to failed.
-- `agent_start`, `turn_start`, `turn_end`, `agent_end`, `auto_compaction`, `auto_retry`, `hook_error`:
-  - Map to `ItemKind::Status` with a label like `pi.agent_start`, `pi.auto_retry`, etc.
-  - Do not emit `session.ended` for these events.
-- If event parsing fails, emit `agent.unparsed` (source=daemon, synthetic=true) and fail tests.
-
-### 5) Shared RPC Server Integration
-Files:
-- `server/packages/sandbox-agent/src/router.rs`
-
-Tasks:
-- Add a new managed stdio server type for Pi, similar to Codex:
-  - Create `PiServer` struct with:
-    - stdin sender
-    - pending request map keyed by request id
-    - per-session native session id mapping
-  - Extend `ManagedServerKind` to include Pi.
-  - Add `ensure_pi_server()` and `spawn_pi_server()` using `pi --mode rpc`.
-  - Add a `handle_pi_server_output()` loop to parse stdout lines into events/responses.
-- Session creation:
-  - On `create_session`, ensure Pi server is running, send `new_session`, store sessionId.
-  - Register session with `server_manager.register_session` for native mapping.
-- Sending messages:
-  - Use `prompt` command; include sessionId and optional images.
-  - Emit synthetic `item.started` only if Pi does not emit `message_start`.
-
-### 6) Router + Streaming Path Changes
-Files:
-- `server/packages/sandbox-agent/src/router.rs`
-
-Tasks:
-- Add Pi handling to:
-  - `create_session` (new_session)
-  - `send_message` (prompt)
-  - `parse_agent_line` (Pi event conversion)
-  - `agent_modes` (default to `default` unless Pi exposes a mode list)
-  - `agent_supports_resume` (true if Pi supports session resume)
-
-### 7) Tests
-Files:
-- `server/packages/sandbox-agent/tests/...`
-- `server/packages/universal-agent-schema/tests/...` (if present)
-
-Tasks:
-- Unit tests for conversion:
-  - `message_start/update/end` -> item.started/delta/completed
-  - `tool_execution_*` -> tool call/result mapping with partialResult delta
-  - failure -> agent.unparsed
-- Integration tests:
-  - Start Pi RPC server, create session, send prompt, stream events.
-  - Validate `native_session_id` mapping and event ordering.
-- Update HTTP/SSE test coverage to include Pi agent if relevant.
-
-## Risk Areas / Edge Cases
-- `tool_execution_update.partialResult` is cumulative; must compute deltas.
-- `message_update` may emit `done`/`error` without `message_end`; handle both paths.
-- No native session lifecycle events; rely on daemon synthetic events.
-- Session recovery after RPC server restart requires `get_state` + re-register sessions.
-
-## Acceptance Criteria
-- Pi appears in `/v1/agents`, CLI list, and docs.
-- `create_session` returns `native_session_id` from Pi `new_session`.
-- Streaming prompt yields universal events with proper ordering:
-  - message -> item.started/delta/completed
-  - tool execution -> tool call + tool result
-- Tests pass and no synthetic data is used in test fixtures.
-
-## Sources
-- https://upd.dev/badlogic/pi-mono/src/commit/d36e0ea07303d8a76d51b4a7bd5f0d6d3c490860/packages/coding-agent/docs/rpc.md
-- https://buildwithpi.ai/pi-cli
-- https://takopi.dev/docs/pi-cli/
-- https://upd.dev/badlogic/pi-mono/releases
diff --git a/docs/processes.mdx b/docs/processes.mdx
new file mode 100644
index 0000000..282c0f1
--- /dev/null
+++ b/docs/processes.mdx
@@ -0,0 +1,258 @@
+---
+title: "Processes"
+description: "Run commands and manage long-lived processes inside the sandbox."
+sidebarTitle: "Processes"
+icon: "terminal"
+---
+
+The process API supports:
+
+- **One-shot execution** — run a command to completion and capture stdout, stderr, and exit code
+- **Managed processes** — spawn, list, stop, kill, and delete long-lived processes
+- **Log streaming** — fetch buffered logs or follow live output
+- **Terminals** — full PTY support with bidirectional WebSocket I/O
+- **Configurable limits** — control concurrency, timeouts, and buffer sizes per runtime
+
+## Run a command
+
+Execute a command to completion and get its output.
+
+<CodeGroup>
+```ts TypeScript
+import { SandboxAgent } from "sandbox-agent";
+
+const sdk = await SandboxAgent.connect({
+  baseUrl: "http://127.0.0.1:2468",
+});
+
+const result = await sdk.runProcess({
+  command: "ls",
+  args: ["-la", "/workspace"],
+});
+
+console.log(result.exitCode); // 0
+console.log(result.stdout);
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"ls","args":["-la","/workspace"]}'
+```
+</CodeGroup>
+
+You can set a timeout and cap output size:
+
+<CodeGroup>
+```ts TypeScript
+const result = await sdk.runProcess({
+  command: "make",
+  args: ["build"],
+  timeoutMs: 60000,
+  maxOutputBytes: 1048576,
+});
+
+if (result.timedOut) {
+  console.log("Build timed out");
+}
+if (result.stdoutTruncated) {
+  console.log("Output was truncated");
+}
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/run" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"make","args":["build"],"timeoutMs":60000,"maxOutputBytes":1048576}'
+```
+</CodeGroup>
+
+## Managed processes
+
+Create a long-lived process that you can interact with, monitor, and stop later.
+
+### Create
+
+<CodeGroup>
+```ts TypeScript
+const proc = await sdk.createProcess({
+  command: "node",
+  args: ["server.js"],
+  cwd: "/workspace",
+});
+
+console.log(proc.id, proc.pid); // proc_1, 12345
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes" \
+  -H "Content-Type: application/json" \
+  -d '{"command":"node","args":["server.js"],"cwd":"/workspace"}'
+```
+</CodeGroup>
+
+### List and get
+
+<CodeGroup>
+```ts TypeScript
+const { processes } = await sdk.listProcesses();
+
+for (const p of processes) {
+  console.log(p.id, p.command, p.status);
+}
+
+const proc = await sdk.getProcess("proc_1");
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/processes"
+
+curl "http://127.0.0.1:2468/v1/processes/proc_1"
+```
+</CodeGroup>
+
+### Stop, kill, and delete
+
+<CodeGroup>
+```ts TypeScript
+// SIGTERM with optional wait
+await sdk.stopProcess("proc_1", { waitMs: 5000 });
+
+// SIGKILL
+await sdk.killProcess("proc_1", { waitMs: 1000 });
+
+// Remove exited process record
+await sdk.deleteProcess("proc_1");
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/proc_1/stop?waitMs=5000"
+
+curl -X POST "http://127.0.0.1:2468/v1/processes/proc_1/kill?waitMs=1000"
+
+curl -X DELETE "http://127.0.0.1:2468/v1/processes/proc_1"
+```
+</CodeGroup>
+
+## Logs
+
+### Fetch buffered logs
+
+<CodeGroup>
+```ts TypeScript
+const logs = await sdk.getProcessLogs("proc_1", {
+  tail: 50,
+  stream: "combined",
+});
+
+for (const entry of logs.entries) {
+  console.log(entry.stream, atob(entry.data));
+}
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/processes/proc_1/logs?tail=50&stream=combined"
+```
+</CodeGroup>
+
+### Follow logs
+
+Stream log entries in real time. The subscription replays buffered entries first, then streams new output as it arrives.
+
+```ts TypeScript
+const sub = await sdk.followProcessLogs("proc_1", (entry) => {
+  console.log(entry.stream, atob(entry.data));
+});
+
+// Later, stop following
+sub.close();
+await sub.closed;
+```
+
+## Terminals
+
+Create a process with `tty: true` to allocate a pseudo-terminal, then connect via WebSocket for full bidirectional I/O.
+
+```ts TypeScript
+const proc = await sdk.createProcess({
+  command: "bash",
+  tty: true,
+});
+```
+
+### Write input
+
+<CodeGroup>
+```ts TypeScript
+await sdk.sendProcessInput("proc_1", {
+  data: "echo hello\n",
+  encoding: "utf8",
+});
+```
+
+```bash cURL
+curl -X POST "http://127.0.0.1:2468/v1/processes/proc_1/input" \
+  -H "Content-Type: application/json" \
+  -d '{"data":"echo hello\n","encoding":"utf8"}'
+```
+</CodeGroup>
+
+### Connect to a terminal
+
+Use `ProcessTerminalSession` unless you need direct frame access.
+
+```ts TypeScript
+const terminal = sdk.connectProcessTerminal("proc_1");
+
+terminal.onReady(() => {
+  terminal.resize({ cols: 120, rows: 40 });
+  terminal.sendInput("ls\n");
+});
+
+terminal.onData((bytes) => {
+  process.stdout.write(new TextDecoder().decode(bytes));
+});
+
+terminal.onExit((status) => {
+  console.log("exit:", status.exitCode);
+});
+
+terminal.onError((error) => {
+  console.error(error instanceof Error ? error.message : error.message);
+});
+
+terminal.onClose(() => {
+  console.log("terminal closed");
+});
+```
+
+Since the browser WebSocket API cannot send custom headers, the endpoint accepts an `access_token` query parameter for authentication. The SDK handles this automatically.
+
+### Browser terminal emulators
+
+The terminal session works with any browser terminal emulator like ghostty-web or xterm.js. For a drop-in React terminal, see [React Components](/react-components).
+
+## Configuration
+
+Adjust runtime limits like max concurrent processes, timeouts, and buffer sizes.
+
+<CodeGroup>
+```ts TypeScript
+const config = await sdk.getProcessConfig();
+console.log(config);
+
+await sdk.setProcessConfig({
+  ...config,
+  maxConcurrentProcesses: 32,
+  defaultRunTimeoutMs: 60000,
+});
+```
+
+```bash cURL
+curl "http://127.0.0.1:2468/v1/processes/config"
+
+curl -X POST "http://127.0.0.1:2468/v1/processes/config" \
+  -H "Content-Type: application/json" \
+  -d '{"maxConcurrentProcesses":32,"defaultRunTimeoutMs":60000,"maxRunTimeoutMs":300000,"maxOutputBytes":1048576,"maxLogBytesPerProcess":10485760,"maxInputBytesPerRequest":65536}'
+```
+</CodeGroup>
diff --git a/docs/quickstart.mdx b/docs/quickstart.mdx
index 37eacb9..223a54d 100644
--- a/docs/quickstart.mdx
+++ b/docs/quickstart.mdx
@@ -61,9 +61,11 @@ icon: "rocket"
 
       <Tab title="Docker">
         ```bash
-        docker run -e ANTHROPIC_API_KEY="sk-ant-..." \
+        docker run -p 2468:2468 \
+          -e ANTHROPIC_API_KEY="sk-ant-..." \
           -e OPENAI_API_KEY="sk-..." \
-          your-image
+          rivetdev/sandbox-agent:0.4.2-full \
+          server --no-token --host 0.0.0.0 --port 2468
         ```
       </Tab>
     </Tabs>
@@ -75,6 +77,9 @@ icon: "rocket"
       <Accordion title="Testing without API keys">
         Use the `mock` agent for SDK and integration testing without provider credentials.
       </Accordion>
+      <Accordion title="Multi-tenant and per-user billing">
+        For per-tenant token tracking, budget enforcement, or usage-based billing, see [LLM Credentials](/llm-credentials) for gateway options like OpenRouter, LiteLLM, and Portkey.
+      </Accordion>
     </AccordionGroup>
   </Step>
 
@@ -84,7 +89,7 @@ icon: "rocket"
         Install and run the binary directly.
 
         ```bash
-        curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh
+        curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
         sandbox-agent server --no-token --host 0.0.0.0 --port 2468
         ```
       </Tab>
@@ -93,7 +98,7 @@ icon: "rocket"
         Run without installing globally.
 
         ```bash
-        npx @sandbox-agent/cli@0.2.x server --no-token --host 0.0.0.0 --port 2468
+        npx @sandbox-agent/cli@0.4.x server --no-token --host 0.0.0.0 --port 2468
         ```
       </Tab>
 
@@ -101,7 +106,7 @@ icon: "rocket"
         Run without installing globally.
 
         ```bash
-        bunx @sandbox-agent/cli@0.2.x server --no-token --host 0.0.0.0 --port 2468
+        bunx @sandbox-agent/cli@0.4.x server --no-token --host 0.0.0.0 --port 2468
         ```
       </Tab>
 
@@ -109,7 +114,7 @@ icon: "rocket"
         Install globally, then run.
 
         ```bash
-        npm install -g @sandbox-agent/cli@0.2.x
+        npm install -g @sandbox-agent/cli@0.4.x
         sandbox-agent server --no-token --host 0.0.0.0 --port 2468
         ```
       </Tab>
@@ -118,9 +123,9 @@ icon: "rocket"
         Install globally, then run.
 
         ```bash
-        bun add -g @sandbox-agent/cli@0.2.x
+        bun add -g @sandbox-agent/cli@0.4.x
         # Allow Bun to run postinstall scripts for native binaries (required for SandboxAgent.start()).
-        bun pm -g trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
+        bun pm -g trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-linux-arm64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
         sandbox-agent server --no-token --host 0.0.0.0 --port 2468
         ```
       </Tab>
@@ -129,7 +134,7 @@ icon: "rocket"
         For local development, use `SandboxAgent.start()` to spawn and manage the server as a subprocess.
 
         ```bash
-        npm install sandbox-agent@0.2.x
+        npm install sandbox-agent@0.4.x
         ```
 
         ```typescript
@@ -143,9 +148,9 @@ icon: "rocket"
         For local development, use `SandboxAgent.start()` to spawn and manage the server as a subprocess.
 
         ```bash
-        bun add sandbox-agent@0.2.x
+        bun add sandbox-agent@0.4.x
         # Allow Bun to run postinstall scripts for native binaries (required for SandboxAgent.start()).
-        bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
+        bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-linux-arm64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
         ```
 
         ```typescript
@@ -215,15 +220,22 @@ icon: "rocket"
     To preinstall agents:
 
     ```bash
-    sandbox-agent install-agent claude
-    sandbox-agent install-agent codex
-    sandbox-agent install-agent opencode
-    sandbox-agent install-agent amp
+    sandbox-agent install-agent --all
     ```
 
     If agents are not installed up front, they are lazily installed when creating a session.
   </Step>
 
+  <Step title="Install desktop dependencies (optional, Linux only)">
+    If you want to use `/v1/desktop/*`, install the desktop runtime packages first:
+
+    ```bash
+    sandbox-agent install desktop --yes
+    ```
+
+    Then use `GET /v1/desktop/status` or `sdk.getDesktopStatus()` to verify the runtime is ready before calling desktop screenshot or input APIs.
+  </Step>
+
   <Step title="Create a session">
     ```typescript
     import { SandboxAgent } from "sandbox-agent";
diff --git a/docs/react-components.mdx b/docs/react-components.mdx
new file mode 100644
index 0000000..71a76d2
--- /dev/null
+++ b/docs/react-components.mdx
@@ -0,0 +1,245 @@
+---
+title: "React Components"
+description: "Drop-in React components for Sandbox Agent frontends."
+icon: "react"
+---
+
+`@sandbox-agent/react` exposes small React components built on top of the `sandbox-agent` SDK.
+
+Current exports:
+
+- `AgentConversation` for a combined transcript + composer surface
+- `ProcessTerminal` for attaching to a running tty process
+- `AgentTranscript` for rendering session/message timelines without bundling any styles
+- `ChatComposer` for a reusable prompt input/send surface
+- `useTranscriptVirtualizer` for wiring large transcript lists to a scroll container
+
+## Install
+
+```bash
+npm install @sandbox-agent/react@0.4.x
+```
+
+## Full example
+
+This example connects to a running Sandbox Agent server, starts a tty shell, renders `ProcessTerminal`, and cleans up the process when the component unmounts.
+
+```tsx TerminalPane.tsx expandable highlight={5,32-36,71}
+"use client";
+
+import { useEffect, useState } from "react";
+import { SandboxAgent } from "sandbox-agent";
+import { ProcessTerminal } from "@sandbox-agent/react";
+
+export default function TerminalPane() {
+  const [client, setClient] = useState<SandboxAgent | null>(null);
+  const [processId, setProcessId] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+    let sdk: SandboxAgent | null = null;
+    let createdProcessId: string | null = null;
+
+    const cleanup = async () => {
+      if (!sdk || !createdProcessId) {
+        return;
+      }
+
+      await sdk.killProcess(createdProcessId, { waitMs: 1_000 }).catch(() => {});
+      await sdk.deleteProcess(createdProcessId).catch(() => {});
+    };
+
+    const start = async () => {
+      try {
+        sdk = await SandboxAgent.connect({
+          baseUrl: "http://127.0.0.1:2468",
+        });
+
+        const process = await sdk.createProcess({
+          command: "sh",
+          interactive: true,
+          tty: true,
+        });
+
+        if (cancelled) {
+          createdProcessId = process.id;
+          await cleanup();
+          await sdk.dispose();
+          return;
+        }
+
+        createdProcessId = process.id;
+        setClient(sdk);
+        setProcessId(process.id);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : "Failed to start terminal.";
+        setError(message);
+      }
+    };
+
+    void start();
+
+    return () => {
+      cancelled = true;
+      void cleanup();
+      void sdk?.dispose();
+    };
+  }, []);
+
+  if (error) {
+    return <div>{error}</div>;
+  }
+
+  if (!client || !processId) {
+    return <div>Starting terminal...</div>;
+  }
+
+  return <ProcessTerminal client={client} processId={processId} height={480} />;
+}
+```
+
+## Component
+
+`ProcessTerminal` attaches to a running tty process.
+
+- `client`: a `SandboxAgent` client
+- `processId`: the process to attach to
+- `height`, `style`, `terminalStyle`: optional layout overrides
+- `onExit`, `onError`: optional lifecycle callbacks
+
+See [Processes](/processes) for the lower-level terminal APIs.
+
+## Headless transcript
+
+`AgentTranscript` is intentionally unstyled. It follows the common headless React pattern used by libraries like Radix, Headless UI, and React Aria: behavior lives in the component, while styling stays in your app through `className`, slot-level `classNames`, and `data-*` state attributes on the rendered DOM.
+
+```tsx TranscriptPane.tsx
+import {
+  AgentTranscript,
+  type AgentTranscriptClassNames,
+  type TranscriptEntry,
+} from "@sandbox-agent/react";
+
+const transcriptClasses: Partial<AgentTranscriptClassNames> = {
+  root: "transcript",
+  message: "transcript-message",
+  messageContent: "transcript-message-content",
+  toolGroupContainer: "transcript-tools",
+  toolGroupHeader: "transcript-tools-header",
+  toolItem: "transcript-tool-item",
+  toolItemHeader: "transcript-tool-item-header",
+  toolItemBody: "transcript-tool-item-body",
+  divider: "transcript-divider",
+  dividerText: "transcript-divider-text",
+  error: "transcript-error",
+};
+
+export function TranscriptPane({ entries }: { entries: TranscriptEntry[] }) {
+  return (
+    <AgentTranscript
+      entries={entries}
+      classNames={transcriptClasses}
+      renderMessageText={(entry) => <div>{entry.text}</div>}
+      renderInlinePendingIndicator={() => <span>...</span>}
+      renderToolGroupIcon={() => <span>Events</span>}
+      renderChevron={(expanded) => <span>{expanded ? "Hide" : "Show"}</span>}
+    />
+  );
+}
+```
+
+```css
+.transcript {
+  display: grid;
+  gap: 12px;
+}
+
+.transcript [data-slot="message"][data-variant="user"] .transcript-message-content {
+  background: #161616;
+  color: white;
+}
+
+.transcript [data-slot="message"][data-variant="assistant"] .transcript-message-content {
+  background: #f4f4f0;
+  color: #161616;
+}
+
+.transcript [data-slot="tool-item"][data-failed="true"] {
+  border-color: #d33;
+}
+
+.transcript [data-slot="tool-item-header"][data-expanded="true"] {
+  background: rgba(0, 0, 0, 0.06);
+}
+```
+
+`AgentTranscript` accepts `TranscriptEntry[]`, which matches the Inspector timeline shape:
+
+- `message` entries render user/assistant text
+- `tool` entries render expandable tool input/output sections
+- `reasoning` entries render expandable reasoning blocks
+- `meta` entries render status rows or expandable metadata details
+
+Useful props:
+
+- `className`: root class hook
+- `classNames`: slot-level class hooks for styling from outside the package
+- `scrollRef` + `virtualize`: opt into TanStack Virtual against an external scroll container
+- `renderMessageText`: custom text or markdown renderer
+- `renderToolItemIcon`, `renderToolGroupIcon`, `renderChevron`, `renderEventLinkContent`: presentation overrides
+- `renderInlinePendingIndicator`, `renderThinkingState`: loading/thinking UI overrides
+- `isDividerEntry`, `canOpenEvent`, `getToolGroupSummary`: behavior overrides for grouping and labels
+
+## Transcript virtualization hook
+
+`useTranscriptVirtualizer` exposes the same TanStack Virtual behavior used by `AgentTranscript` when `virtualize` is enabled.
+
+- Pass the grouped transcript rows you want to virtualize
+- Pass a `scrollRef` that points at the actual scrollable element
+- Use it when you need transcript-aware virtualization outside the stock `AgentTranscript` renderer
+
+## Composer and conversation
+
+`ChatComposer` is the headless message input. `AgentConversation` composes `AgentTranscript` and `ChatComposer` so apps can reuse the transcript/composer pairing without pulling in Inspector session chrome.
+
+```tsx ConversationPane.tsx
+import { AgentConversation, type TranscriptEntry } from "@sandbox-agent/react";
+
+export function ConversationPane({
+  entries,
+  message,
+  onMessageChange,
+  onSubmit,
+}: {
+  entries: TranscriptEntry[];
+  message: string;
+  onMessageChange: (value: string) => void;
+  onSubmit: () => void;
+}) {
+  return (
+    <AgentConversation
+      entries={entries}
+      emptyState={<div>Start the conversation.</div>}
+      transcriptProps={{
+        renderMessageText: (entry) => <div>{entry.text}</div>,
+      }}
+      composerProps={{
+        message,
+        onMessageChange,
+        onSubmit,
+        placeholder: "Send a message...",
+      }}
+    />
+  );
+}
+```
+
+Useful `ChatComposer` props:
+
+- `className` and `classNames` for external styling
+- `inputRef` to manage focus or autoresize from the consumer
+- `textareaProps` for lower-level textarea behavior
+- `allowEmptySubmit` when the submit action is valid without draft text, such as a stop button
+
+Use `transcriptProps` and `composerProps` when you want the shared composition but still need custom rendering or behavior. Use `transcriptClassNames` and `composerClassNames` when you want styling hooks for each subcomponent.
diff --git a/docs/sdk-overview.mdx b/docs/sdk-overview.mdx
index 8a973a2..73e0d35 100644
--- a/docs/sdk-overview.mdx
+++ b/docs/sdk-overview.mdx
@@ -11,22 +11,22 @@ The TypeScript SDK is centered on `sandbox-agent` and its `SandboxAgent` class.
 <Tabs>
   <Tab title="npm">
     ```bash
-    npm install sandbox-agent@0.2.x
+    npm install sandbox-agent@0.4.x
     ```
   </Tab>
   <Tab title="bun">
     ```bash
-    bun add sandbox-agent@0.2.x
+    bun add sandbox-agent@0.4.x
     # Allow Bun to run postinstall scripts for native binaries (required for SandboxAgent.start()).
-    bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
+    bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-linux-arm64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
     ```
   </Tab>
 </Tabs>
 
-## Optional persistence drivers
+## Optional React components
 
 ```bash
-npm install @sandbox-agent/persist-indexeddb@0.2.x @sandbox-agent/persist-sqlite@0.2.x @sandbox-agent/persist-postgres@0.2.x
+npm install @sandbox-agent/react@0.4.x
 ```
 
 ## Create a client
@@ -39,15 +39,35 @@ const sdk = await SandboxAgent.connect({
 });
 ```
 
-With persistence:
+`SandboxAgent.connect(...)` now waits for `/v1/health` by default before other SDK requests proceed. To disable that gate, pass `waitForHealth: false`. To keep the default gate but fail after a bounded wait, pass `waitForHealth: { timeoutMs: 120_000 }`. To cancel the startup wait early, pass `signal: abortController.signal`.
+
+With a custom fetch handler (for example, proxying requests inside Workers):
 
 ```ts
-import { SandboxAgent } from "sandbox-agent";
-import { SQLiteSessionPersistDriver } from "@sandbox-agent/persist-sqlite";
-
-const persist = new SQLiteSessionPersistDriver({
-  filename: "./sessions.db",
+const sdk = await SandboxAgent.connect({
+  fetch: (input, init) => customFetch(input, init),
 });
+```
+
+With an abort signal for the startup health gate:
+
+```ts
+const controller = new AbortController();
+
+const sdk = await SandboxAgent.connect({
+  baseUrl: "http://127.0.0.1:2468",
+  signal: controller.signal,
+});
+
+controller.abort();
+```
+
+With persistence (see [Persisting Sessions](/session-persistence) for driver options):
+
+```ts
+import { SandboxAgent, InMemorySessionPersistDriver } from "sandbox-agent";
+
+const persist = new InMemorySessionPersistDriver();
 
 const sdk = await SandboxAgent.connect({
   baseUrl: "http://127.0.0.1:2468",
@@ -55,25 +75,40 @@ const sdk = await SandboxAgent.connect({
 });
 ```
 
-Local autospawn (Node.js only):
+Local spawn with a sandbox provider:
 
 ```ts
 import { SandboxAgent } from "sandbox-agent";
+import { local } from "sandbox-agent/local";
 
-const localSdk = await SandboxAgent.start();
+const sdk = await SandboxAgent.start({
+  sandbox: local(),
+});
 
-await localSdk.dispose();
+// sdk.sandboxId — prefixed provider ID (e.g. "local/127.0.0.1:2468")
+
+await sdk.destroySandbox(); // provider-defined cleanup + disposes client
 ```
 
+`SandboxAgent.start(...)` requires a `sandbox` provider. Built-in providers:
+
+| Import | Provider |
+|--------|----------|
+| `sandbox-agent/local` | Local subprocess |
+| `sandbox-agent/docker` | Docker container |
+| `sandbox-agent/e2b` | E2B sandbox |
+| `sandbox-agent/daytona` | Daytona workspace |
+| `sandbox-agent/vercel` | Vercel Sandbox |
+| `sandbox-agent/cloudflare` | Cloudflare Sandbox |
+
+Use `sdk.dispose()` to disconnect without changing sandbox state, `sdk.pauseSandbox()` for graceful suspension when supported, or `sdk.killSandbox()` for permanent deletion.
+
 ## Session flow
 
 ```ts
 const session = await sdk.createSession({
   agent: "mock",
-  sessionInit: {
-    cwd: "/",
-    mcpServers: [],
-  },
+  cwd: "/",
 });
 
 const prompt = await session.prompt([
@@ -92,6 +127,38 @@ await restored.prompt([{ type: "text", text: "Continue from previous context." }
 await sdk.destroySession(restored.id);
 ```
 
+## Session configuration
+
+Set model, mode, or thought level at creation or on an existing session:
+
+```ts
+const session = await sdk.createSession({
+  agent: "codex",
+  model: "gpt-5.3-codex",
+});
+
+await session.setModel("gpt-5.2-codex");
+await session.setMode("auto");
+
+const options = await session.getConfigOptions();
+const modes = await session.getModes();
+```
+
+Handle permission requests from agents that ask before executing tools:
+
+```ts
+const claude = await sdk.createSession({
+  agent: "claude",
+  mode: "default",
+});
+
+claude.onPermissionRequest((request) => {
+  void claude.respondPermission(request.id, "once");
+});
+```
+
+See [Agent Sessions](/agent-sessions) for full details on config options and error handling.
+
 ## Events
 
 Subscribe to live events:
@@ -129,6 +196,44 @@ const writeResult = await sdk.writeFsFile({ path: "./hello.txt" }, "hello");
 console.log(health.status, agents.agents.length, entries.length, writeResult.path);
 ```
 
+## Desktop API
+
+The SDK also wraps the desktop host/runtime HTTP API.
+
+Install desktop dependencies first on Linux hosts:
+
+```bash
+sandbox-agent install desktop --yes
+```
+
+Then query status, surface remediation if needed, and start the runtime:
+
+```ts
+const status = await sdk.getDesktopStatus();
+
+if (status.state === "install_required") {
+  console.log(status.installCommand);
+}
+
+const started = await sdk.startDesktop({
+  width: 1440,
+  height: 900,
+  dpi: 96,
+});
+
+const screenshot = await sdk.takeDesktopScreenshot();
+const displayInfo = await sdk.getDesktopDisplayInfo();
+
+await sdk.moveDesktopMouse({ x: 400, y: 300 });
+await sdk.clickDesktop({ x: 400, y: 300, button: "left", clickCount: 1 });
+await sdk.typeDesktopText({ text: "hello world", delayMs: 10 });
+await sdk.pressDesktopKey({ key: "ctrl+l" });
+
+await sdk.stopDesktop();
+```
+
+Screenshot helpers return `Uint8Array` PNG bytes. The SDK does not attempt to install OS packages remotely; callers should surface `missingDependencies` and `installCommand` from `getDesktopStatus()`.
+
 ## Error handling
 
 ```ts
@@ -158,17 +263,14 @@ console.log(url);
 
 Parameters:
 
-- `baseUrl` (required): Sandbox Agent server URL
+- `baseUrl` (required unless `fetch` is provided): Sandbox Agent server URL
 - `token` (optional): Bearer token for authenticated servers
 - `headers` (optional): Additional request headers
+- `fetch` (optional): Custom fetch implementation used by SDK HTTP and session calls
+- `skipHealthCheck` (optional): set `true` to skip the startup `/v1/health` wait
+- `waitForHealth` (optional, defaults to enabled): waits for `/v1/health` before HTTP helpers and session setup proceed; pass `false` to disable or `{ timeoutMs }` to bound the wait
+- `signal` (optional): aborts the startup `/v1/health` wait used by `connect()`
 
-## Types
+## LLM credentials
 
-```ts
-import type {
-  AgentInfo,
-  HealthResponse,
-  SessionEvent,
-  SessionRecord,
-} from "sandbox-agent";
-```
+Sandbox Agent supports personal API keys, shared organization keys, and per-tenant gateway keys with budget enforcement. See [LLM Credentials](/llm-credentials) for setup details.
diff --git a/docs/sdks/python.mdx b/docs/sdks/python.mdx
deleted file mode 100644
index 80f667a..0000000
--- a/docs/sdks/python.mdx
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: "Python"
-description: "Python client for managing sessions and streaming events."
-icon: "python"
-tag: "Coming Soon"
----
-
-The Python SDK is on our roadmap. It will provide a typed client for managing sessions and streaming events, similar to the TypeScript SDK.
-
-In the meantime, you can use the [HTTP API](/http-api) directly with any HTTP client like `requests` or `httpx`.
-
-```python
-import httpx
-
-base_url = "http://127.0.0.1:2468"
-headers = {"Authorization": f"Bearer {token}"}
-
-# Create a session
-httpx.post(
-    f"{base_url}/v1/sessions/my-session",
-    headers=headers,
-    json={"agent": "claude", "permissionMode": "default"}
-)
-
-# Send a message
-httpx.post(
-    f"{base_url}/v1/sessions/my-session/messages",
-    headers=headers,
-    json={"message": "Hello from Python"}
-)
-
-# Get events
-response = httpx.get(
-    f"{base_url}/v1/sessions/my-session/events",
-    headers=headers,
-    params={"offset": 0, "limit": 50}
-)
-events = response.json()["events"]
-```
-
-Want the Python SDK sooner? [Open an issue](https://github.com/rivet-dev/sandbox-agent/issues) to let us know.
diff --git a/docs/sdks/typescript.mdx b/docs/sdks/typescript.mdx
deleted file mode 100644
index 9c74214..0000000
--- a/docs/sdks/typescript.mdx
+++ /dev/null
@@ -1,267 +0,0 @@
----
-title: "TypeScript"
-description: "Use the TypeScript SDK to manage ACP sessions and Sandbox Agent HTTP APIs."
-icon: "js"
----
-
-The TypeScript SDK is centered on `sandbox-agent` and its `SandboxAgentClient`, which provides a Sandbox-facing API for session flows, ACP extensions, and binary HTTP filesystem helpers.
-
-## Install
-
-<Tabs>
-  <Tab title="npm">
-    ```bash
-    npm install sandbox-agent
-    ```
-  </Tab>
-  <Tab title="bun">
-    ```bash
-    bun add sandbox-agent
-    # Allow Bun to run postinstall scripts for native binaries (required for SandboxAgent.start()).
-    bun pm trust @sandbox-agent/cli-linux-x64 @sandbox-agent/cli-darwin-arm64 @sandbox-agent/cli-darwin-x64 @sandbox-agent/cli-win32-x64
-    ```
-  </Tab>
-</Tabs>
-
-## Create a client
-
-```ts
-import { SandboxAgentClient } from "sandbox-agent";
-
-const client = new SandboxAgentClient({
-  baseUrl: "http://127.0.0.1:2468",
-  token: process.env.SANDBOX_TOKEN,
-  agent: "mock",
-});
-```
-
-`SandboxAgentClient` is the canonical API. By default it auto-connects (`autoConnect: true`), so provide `agent` in the constructor. Use the instance method `client.connect()` only when you explicitly set `autoConnect: false`.
-
-## Autospawn (Node only)
-
-If you run locally, the SDK can launch the server for you.
-
-```ts
-import { SandboxAgent } from "sandbox-agent";
-
-const client = await SandboxAgent.start({
-  agent: "mock",
-});
-
-await client.dispose();
-```
-
-Autospawn uses the local `sandbox-agent` binary. Install `@sandbox-agent/cli` (recommended) or set
-`SANDBOX_AGENT_BIN` to a custom path.
-
-## Connect lifecycle
-
-Use manual mode when you want explicit ACP session lifecycle control.
-
-```ts
-import {
-  AlreadyConnectedError,
-  NotConnectedError,
-  SandboxAgentClient,
-} from "sandbox-agent";
-
-const client = new SandboxAgentClient({
-  baseUrl: "http://127.0.0.1:2468",
-  token: process.env.SANDBOX_TOKEN,
-  agent: "mock",
-  autoConnect: false,
-});
-
-await client.connect();
-
-try {
-  await client.connect();
-} catch (error) {
-  if (error instanceof AlreadyConnectedError) {
-    console.error("already connected");
-  }
-}
-
-await client.disconnect();
-
-try {
-  await client.prompt({ sessionId: "s", prompt: [{ type: "text", text: "hi" }] });
-} catch (error) {
-  if (error instanceof NotConnectedError) {
-    console.error("connect first");
-  }
-}
-```
-
-## Session flow
-
-```ts
-const session = await client.newSession({
-  cwd: "/",
-  mcpServers: [],
-  metadata: {
-    agent: "mock",
-    title: "Demo Session",
-    variant: "high",
-    permissionMode: "ask",
-  },
-});
-
-const result = await client.prompt({
-  sessionId: session.sessionId,
-  prompt: [{ type: "text", text: "Summarize this repository." }],
-});
-
-console.log(result.stopReason);
-```
-
-Load, cancel, and runtime settings use ACP-aligned method names:
-
-```ts
-await client.loadSession({ sessionId: session.sessionId, cwd: "/", mcpServers: [] });
-await client.cancel({ sessionId: session.sessionId });
-await client.setSessionMode({ sessionId: session.sessionId, modeId: "default" });
-await client.setSessionConfigOption({
-  sessionId: session.sessionId,
-  configId: "config-id-from-session",
-  value: "config-value-id",
-});
-```
-
-## Extension helpers
-
-Sandbox extensions are exposed as first-class methods:
-
-```ts
-const models = await client.listModels({ sessionId: session.sessionId });
-console.log(models.currentModelId, models.availableModels.length);
-
-await client.setMetadata(session.sessionId, {
-  title: "Renamed Session",
-  model: "mock",
-  permissionMode: "ask",
-});
-
-await client.detachSession(session.sessionId);
-await client.terminateSession(session.sessionId);
-```
-
-## Event handling
-
-Use `onEvent` to consume converted SDK events.
-
-```ts
-import { SandboxAgentClient, type AgentEvent } from "sandbox-agent";
-
-const events: AgentEvent[] = [];
-
-const client = new SandboxAgentClient({
-  baseUrl: "http://127.0.0.1:2468",
-  token: process.env.SANDBOX_TOKEN,
-  agent: "mock",
-  onEvent: (event) => {
-    events.push(event);
-
-    if (event.type === "sessionEnded") {
-      console.log("ended", event.notification.params.sessionId ?? event.notification.params.session_id);
-    }
-
-    if (event.type === "agentUnparsed") {
-      console.warn("unparsed", event.notification.params);
-    }
-  },
-});
-```
-
-You can also handle raw session update notifications directly:
-
-```ts
-const client = new SandboxAgentClient({
-  baseUrl: "http://127.0.0.1:2468",
-  token: process.env.SANDBOX_TOKEN,
-  agent: "mock",
-  onSessionUpdate: (notification) => {
-    console.log(notification.update.sessionUpdate);
-  },
-});
-```
-
-## Control + HTTP helpers
-
-Agent/session and non-binary filesystem control helpers use ACP extension methods over `/v2/rpc`:
-
-```ts
-const health = await client.getHealth();
-const agents = await client.listAgents();
-await client.installAgent("codex", { reinstall: true });
-
-const sessions = await client.listSessions();
-const sessionInfo = await client.getSession(sessions.sessions[0].session_id);
-```
-
-These methods require an active ACP connection and throw `NotConnectedError` when disconnected.
-
-Binary filesystem transfer intentionally remains HTTP:
-
-- `readFsFile` -> `GET /v2/fs/file`
-- `writeFsFile` -> `PUT /v2/fs/file`
-- `uploadFsBatch` -> `POST /v2/fs/upload-batch`
-
-Reason: these are Sandbox Agent host/runtime filesystem operations (not agent-specific ACP behavior), intentionally separate from ACP native `fs/read_text_file` / `fs/write_text_file`, and they may require streaming very large binary payloads that ACP JSON-RPC is not suited to transport efficiently.
-
-ACP extension variants can exist in parallel for compatibility, but `SandboxAgentClient` should prefer the HTTP endpoints above by default.
-
-## Error handling
-
-All HTTP errors throw `SandboxAgentError`:
-
-```ts
-import { SandboxAgentError } from "sandbox-agent";
-
-try {
-  await client.listAgents();
-} catch (error) {
-  if (error instanceof SandboxAgentError) {
-    console.error(error.status, error.problem);
-  }
-}
-```
-
-## Inspector URL
-
-Build a URL to open the sandbox-agent Inspector UI with pre-filled connection settings:
-
-```ts
-import { buildInspectorUrl } from "sandbox-agent";
-
-const url = buildInspectorUrl({
-  baseUrl: "https://your-sandbox-agent.example.com",
-  token: "optional-bearer-token",
-  headers: { "X-Custom-Header": "value" },
-});
-
-console.log(url);
-// https://your-sandbox-agent.example.com/ui/?token=...&headers=...
-```
-
-Parameters:
-- `baseUrl` (required): The sandbox-agent server URL
-- `token` (optional): Bearer token for authentication
-- `headers` (optional): Extra headers to pass to the server (JSON-encoded in the URL)
-
-## Types
-
-The SDK exports typed events and responses for the Sandbox layer:
-
-```ts
-import type {
-  AgentEvent,
-  AgentInfo,
-  HealthResponse,
-  SessionInfo,
-  SessionListResponse,
-  SessionTerminateResponse,
-} from "sandbox-agent";
-```
-
-For low-level protocol transport details, see [ACP HTTP Client](/advanced/acp-http-client).
diff --git a/docs/security.mdx b/docs/security.mdx
index ec00f49..c8b02ad 100644
--- a/docs/security.mdx
+++ b/docs/security.mdx
@@ -4,7 +4,7 @@ description: "Backend-first auth and access control patterns."
 icon: "shield"
 ---
 
-As covered in [Architecture](/architecture), run the Sandbox Agent client on your backend, not in the browser.
+As covered in [Orchestration Architecture](/orchestration-architecture), run the Sandbox Agent client on your backend, not in the browser.
 
 This keeps sandbox credentials private and gives you one place for authz, rate limiting, and audit logging.
 
@@ -92,7 +92,7 @@ export const workspace = actor({
 
       const session = await sdk.createSession({
         agent: "claude",
-        sessionInit: { cwd: "/workspace" },
+        cwd: "/workspace",
       });
 
       session.onEvent((event) => {
diff --git a/docs/session-persistence.mdx b/docs/session-persistence.mdx
index 43bbcef..5505864 100644
--- a/docs/session-persistence.mdx
+++ b/docs/session-persistence.mdx
@@ -10,14 +10,22 @@ With persistence enabled, sessions can be restored after runtime/session loss. S
 
 Each driver stores:
 
-- `SessionRecord` (`id`, `agent`, `agentSessionId`, `lastConnectionId`, `createdAt`, optional `destroyedAt`, optional `sessionInit`)
+- `SessionRecord` (`id`, `agent`, `agentSessionId`, `lastConnectionId`, `createdAt`, optional `destroyedAt`, optional `sandboxId`, optional `sessionInit`, optional `configOptions`, optional `modes`)
 - `SessionEvent` (`id`, `eventIndex`, `sessionId`, `connectionId`, `sender`, `payload`, `createdAt`)
 
 ## Persistence drivers
 
-### In-memory
+### Rivet
 
-Best for local dev and ephemeral workloads.
+Recommended for sandbox orchestration with actor state. See [Multiplayer](/multiplayer) for a full Rivet actor example with persistence in actor state.
+
+### IndexedDB (browser)
+
+Best for browser apps that should survive reloads. See the [Inspector source](https://github.com/rivet-dev/sandbox-agent/tree/main/frontend/packages/inspector/src/persist-indexeddb.ts) for a complete IndexedDB driver you can copy into your project.
+
+### In-memory (built-in)
+
+Best for local dev and ephemeral workloads. No extra dependencies required.
 
 ```ts
 import { InMemorySessionPersistDriver, SandboxAgent } from "sandbox-agent";
@@ -33,91 +41,17 @@ const sdk = await SandboxAgent.connect({
 });
 ```
 
-### Rivet
-
-Recommended for sandbox orchestration with actor state.
-
-```bash
-npm install @sandbox-agent/persist-rivet@0.1.x
-```
-
-```ts
-import { actor } from "rivetkit";
-import { SandboxAgent } from "sandbox-agent";
-import { RivetSessionPersistDriver, type RivetPersistState } from "@sandbox-agent/persist-rivet";
-
-type PersistedState = RivetPersistState & {
-  sandboxId: string;
-  baseUrl: string;
-};
-
-export default actor({
-  createState: async () => {
-    return {
-      sandboxId: "sbx_123",
-      baseUrl: "http://127.0.0.1:2468",
-    } satisfies Partial<PersistedState>;
-  },
-  createVars: async (c) => {
-    const persist = new RivetSessionPersistDriver(c);
-    const sdk = await SandboxAgent.connect({
-      baseUrl: c.state.baseUrl,
-      persist,
-    });
-
-    const session = await sdk.resumeOrCreateSession({ id: "default", agent: "codex" });
-
-    const unsubscribe = session.onEvent((event) => {
-      c.broadcast("session.event", event);
-    });
-
-    return { sdk, session, unsubscribe };
-  },
-  actions: {
-    sendMessage: async (c, message: string) => {
-      await c.vars.session.prompt([{ type: "text", text: message }]);
-    },
-  },
-  onSleep: async (c) => {
-    c.vars.unsubscribe?.();
-    await c.vars.sdk.dispose();
-  },
-});
-```
-
-### IndexedDB
-
-Best for browser apps that should survive reloads.
-
-```bash
-npm install @sandbox-agent/persist-indexeddb@0.2.x
-```
-
-```ts
-import { SandboxAgent } from "sandbox-agent";
-import { IndexedDbSessionPersistDriver } from "@sandbox-agent/persist-indexeddb";
-
-const persist = new IndexedDbSessionPersistDriver({
-  databaseName: "sandbox-agent-session-store",
-});
-
-const sdk = await SandboxAgent.connect({
-  baseUrl: "http://127.0.0.1:2468",
-  persist,
-});
-```
-
 ### SQLite
 
 Best for local/server Node apps that need durable storage without a DB server.
 
 ```bash
-npm install @sandbox-agent/persist-sqlite@0.2.x
+npm install better-sqlite3
 ```
 
 ```ts
 import { SandboxAgent } from "sandbox-agent";
-import { SQLiteSessionPersistDriver } from "@sandbox-agent/persist-sqlite";
+import { SQLiteSessionPersistDriver } from "./persist.ts";
 
 const persist = new SQLiteSessionPersistDriver({
   filename: "./sandbox-agent.db",
@@ -129,17 +63,19 @@ const sdk = await SandboxAgent.connect({
 });
 ```
 
+See the [full SQLite example](https://github.com/rivet-dev/sandbox-agent/tree/main/examples/persist-sqlite) for the complete driver implementation you can copy into your project.
+
 ### Postgres
 
 Use when you already run Postgres and want shared relational storage.
 
 ```bash
-npm install @sandbox-agent/persist-postgres@0.2.x
+npm install pg
 ```
 
 ```ts
 import { SandboxAgent } from "sandbox-agent";
-import { PostgresSessionPersistDriver } from "@sandbox-agent/persist-postgres";
+import { PostgresSessionPersistDriver } from "./persist.ts";
 
 const persist = new PostgresSessionPersistDriver({
   connectionString: process.env.DATABASE_URL,
@@ -152,6 +88,8 @@ const sdk = await SandboxAgent.connect({
 });
 ```
 
+See the [full Postgres example](https://github.com/rivet-dev/sandbox-agent/tree/main/examples/persist-postgres) for the complete driver implementation you can copy into your project.
+
 ### Custom driver
 
 Implement `SessionPersistDriver` for custom backends.
@@ -160,11 +98,11 @@ Implement `SessionPersistDriver` for custom backends.
 import type { SessionPersistDriver } from "sandbox-agent";
 
 class MyDriver implements SessionPersistDriver {
-  async getSession(id) { return null; }
+  async getSession(id) { return undefined; }
   async listSessions(request) { return { items: [] }; }
   async updateSession(session) {}
   async listEvents(request) { return { items: [] }; }
-  async insertEvent(event) {}
+  async insertEvent(sessionId, event) {}
 }
 ```
 
diff --git a/docs/session-transcript-schema.mdx b/docs/session-transcript-schema.mdx
deleted file mode 100644
index c9c004a..0000000
--- a/docs/session-transcript-schema.mdx
+++ /dev/null
@@ -1,388 +0,0 @@
----
-title: "Session Transcript Schema"
-description: "Universal event schema for session transcripts across all agents."
----
-
-Each coding agent outputs events in its own native format. The sandbox-agent converts these into a universal event schema, giving you a consistent session transcript regardless of which agent you use.
-
-The schema is defined in [OpenAPI format](https://github.com/rivet-dev/sandbox-agent/blob/main/docs/openapi.json). See the [HTTP API Reference](/api-reference) for endpoint documentation.
-
-## Coverage Matrix
-
-This table shows which agent feature coverage appears in the universal event stream. All agents retain their full native feature coverage—this only reflects what's normalized into the schema.
-
-| Feature            | Claude | Codex | OpenCode     | Amp          | Pi (RPC)     |
-|--------------------|:------:|:-----:|:------------:|:------------:|:------------:|
-| Stability          | Stable | Stable| Experimental | Experimental | Experimental |
-| Text Messages      |   ✓    |   ✓   |      ✓       |      ✓       |      ✓       |
-| Tool Calls         |   ✓    |   ✓   |      ✓       |      ✓       |      ✓       |
-| Tool Results       |   ✓    |   ✓   |      ✓       |      ✓       |      ✓       |
-| Questions (HITL)   |   ✓    |       |      ✓       |              |              |
-| Permissions (HITL) |   ✓    |   ✓   |      ✓       |      -       |              |
-| Images             |   -    |   ✓   |      ✓       |      -       |      ✓       |
-| File Attachments   |   -    |   ✓   |      ✓       |      -       |              |
-| Session Lifecycle  |   -    |   ✓   |      ✓       |      -       |              |
-| Error Events       |   -    |   ✓   |      ✓       |      ✓       |      ✓       |
-| Reasoning/Thinking |   -    |   ✓   |      -       |      -       |      ✓       |
-| Command Execution  |   -    |   ✓   |      -       |      -       |              |
-| File Changes       |   -    |   ✓   |      -       |      -       |              |
-| MCP Tools          |   ✓    |   ✓   |      ✓       |      ✓       |              |
-| Streaming Deltas   |   ✓    |   ✓   |      ✓       |      -       |      ✓       |
-| Variants           |        |   ✓   |      ✓       |      ✓       |      ✓       |
-
-Agents: [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview) · [Codex](https://github.com/openai/codex) · [OpenCode](https://github.com/opencode-ai/opencode) · [Amp](https://ampcode.com) · [Pi](https://buildwithpi.ai/pi-cli)
-
-- ✓ = Appears in session events
-- \- = Agent supports natively, schema conversion coming soon
-- (blank) = Not supported by agent
-- Pi runtime model is router-managed per-session RPC (`pi --mode rpc`); it does not use generic subprocess streaming.
-
-<AccordionGroup>
-  <Accordion title="Text Messages">
-    Basic message exchange between user and assistant.
-  </Accordion>
-  <Accordion title="Tool Calls & Results">
-    Visibility into tool invocations (file reads, command execution, etc.) and their results. When not natively supported, tool activity is embedded in message content.
-  </Accordion>
-  <Accordion title="Questions (HITL)">
-    Interactive questions the agent asks the user. Emits `question.requested` and `question.resolved` events.
-  </Accordion>
-  <Accordion title="Permissions (HITL)">
-    Permission requests for sensitive operations. Emits `permission.requested` and `permission.resolved` events.
-  </Accordion>
-  <Accordion title="Images">
-    Support for image attachments in messages.
-  </Accordion>
-  <Accordion title="File Attachments">
-    Support for file attachments in messages.
-  </Accordion>
-  <Accordion title="Session Lifecycle">
-    Native `session.started` and `session.ended` events. When not supported, the daemon emits synthetic lifecycle events.
-  </Accordion>
-  <Accordion title="Error Events">
-    Structured error events for runtime failures.
-  </Accordion>
-  <Accordion title="Reasoning/Thinking">
-    Extended thinking or reasoning content with visibility controls.
-  </Accordion>
-  <Accordion title="Command Execution">
-    Detailed command execution events with stdout/stderr.
-  </Accordion>
-  <Accordion title="File Changes">
-    Structured file modification events with diffs.
-  </Accordion>
-  <Accordion title="MCP Tools">
-    Model Context Protocol tool support.
-  </Accordion>
-  <Accordion title="Streaming Deltas">
-    Native streaming of content deltas. When not supported, the daemon emits a single synthetic delta before `item.completed`.
-  </Accordion>
-  <Accordion title="Variants">
-    Model variants such as reasoning effort or depth. Agents may expose different variant sets per model.
-  </Accordion>
-</AccordionGroup>
-
-Want support for another agent? [Open an issue](https://github.com/rivet-dev/sandbox-agent/issues/new) to request it.
-
-## UniversalEvent
-
-Every event from the API is wrapped in a `UniversalEvent` envelope.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `event_id` | string | Unique identifier for this event |
-| `sequence` | integer | Monotonic sequence number within the session (starts at 1) |
-| `time` | string | RFC3339 timestamp |
-| `session_id` | string | Daemon-generated session identifier |
-| `native_session_id` | string? | Provider-native session/thread identifier (e.g., Codex `threadId`, OpenCode `sessionID`) |
-| `source` | string | Event origin: `agent` (native) or `daemon` (synthetic) |
-| `synthetic` | boolean | Whether this event was generated by the daemon to fill gaps |
-| `type` | string | Event type (see [Event Types](#event-types)) |
-| `data` | object | Event-specific payload |
-| `raw` | any? | Original provider payload (only when `include_raw=true`) |
-
-```json
-{
-  "event_id": "evt_abc123",
-  "sequence": 1,
-  "time": "2025-01-28T12:00:00Z",
-  "session_id": "my-session",
-  "native_session_id": "thread_xyz",
-  "source": "agent",
-  "synthetic": false,
-  "type": "item.completed",
-  "data": { ... }
-}
-```
-
-## Event Types
-
-### Session Lifecycle
-
-| Type | Description | Data |
-|------|-------------|------|
-| `session.started` | Session has started | `{ metadata?: any }` |
-| `session.ended` | Session has ended | `{ reason, terminated_by, message?, exit_code? }` |
-
-### Turn Lifecycle
-
-| Type | Description | Data |
-|------|-------------|------|
-| `turn.started` | Turn has started | `{ phase: "started", turn_id?, metadata? }` |
-| `turn.ended` | Turn has ended | `{ phase: "ended", turn_id?, metadata? }` |
-
-**SessionEndedData**
-
-| Field | Type | Values |
-|-------|------|--------|
-| `reason` | string | `completed`, `error`, `terminated` |
-| `terminated_by` | string | `agent`, `daemon` |
-| `message` | string? | Error message (only present when reason is `error`) |
-| `exit_code` | int? | Process exit code (only present when reason is `error`) |
-| `stderr` | StderrOutput? | Structured stderr output (only present when reason is `error`) |
-
-**StderrOutput**
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `head` | string? | First 20 lines of stderr (if truncated) or full stderr (if not truncated) |
-| `tail` | string? | Last 50 lines of stderr (only present if truncated) |
-| `truncated` | boolean | Whether the output was truncated |
-| `total_lines` | int? | Total number of lines in stderr |
-
-### Item Lifecycle
-
-| Type | Description | Data |
-|------|-------------|------|
-| `item.started` | Item creation | `{ item }` |
-| `item.delta` | Streaming content delta | `{ item_id, native_item_id?, delta }` |
-| `item.completed` | Item finalized | `{ item }` |
-
-Items follow a consistent lifecycle: `item.started` → `item.delta` (0 or more) → `item.completed`.
-
-### HITL (Human-in-the-Loop)
-
-| Type | Description | Data |
-|------|-------------|------|
-| `permission.requested` | Permission request pending | `{ permission_id, action, status, metadata? }` |
-| `permission.resolved` | Permission decision recorded | `{ permission_id, action, status, metadata? }` |
-| `question.requested` | Question pending user input | `{ question_id, prompt, options, status }` |
-| `question.resolved` | Question answered or rejected | `{ question_id, prompt, options, status, response? }` |
-
-**PermissionEventData**
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `permission_id` | string | Identifier for the permission request |
-| `action` | string | What the agent wants to do |
-| `status` | string | `requested`, `accept`, `accept_for_session`, `reject` |
-| `metadata` | any? | Additional context |
-
-**QuestionEventData**
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `question_id` | string | Identifier for the question |
-| `prompt` | string | Question text |
-| `options` | string[] | Available answer options |
-| `status` | string | `requested`, `answered`, `rejected` |
-| `response` | string? | Selected answer (when resolved) |
-
-### Errors
-
-| Type | Description | Data |
-|------|-------------|------|
-| `error` | Runtime error | `{ message, code?, details? }` |
-| `agent.unparsed` | Parse failure | `{ error, location, raw_hash? }` |
-
-The `agent.unparsed` event indicates the daemon failed to parse an agent payload. This should be treated as a bug.
-
-## UniversalItem
-
-Items represent discrete units of content within a session.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `item_id` | string | Daemon-generated identifier |
-| `native_item_id` | string? | Provider-native item/message identifier |
-| `parent_id` | string? | Parent item ID (e.g., tool call/result parented to a message) |
-| `kind` | string | Item category (see below) |
-| `role` | string? | Actor role for message items |
-| `status` | string | Lifecycle status |
-| `content` | ContentPart[] | Ordered list of content parts |
-
-### ItemKind
-
-| Value | Description |
-|-------|-------------|
-| `message` | User or assistant message |
-| `tool_call` | Tool invocation |
-| `tool_result` | Tool execution result |
-| `system` | System message |
-| `status` | Status update |
-| `unknown` | Unrecognized item type |
-
-### ItemRole
-
-| Value | Description |
-|-------|-------------|
-| `user` | User message |
-| `assistant` | Assistant response |
-| `system` | System prompt |
-| `tool` | Tool-related message |
-
-### ItemStatus
-
-| Value | Description |
-|-------|-------------|
-| `in_progress` | Item is streaming or pending |
-| `completed` | Item is finalized |
-| `failed` | Item execution failed |
-
-## Content Parts
-
-The `content` array contains typed parts that make up an item's payload.
-
-### text
-
-Plain text content.
-
-```json
-{ "type": "text", "text": "Hello, world!" }
-```
-
-### json
-
-Structured JSON content.
-
-```json
-{ "type": "json", "json": { "key": "value" } }
-```
-
-### tool_call
-
-Tool invocation.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `name` | string | Tool name |
-| `arguments` | string | JSON-encoded arguments |
-| `call_id` | string | Unique call identifier |
-
-```json
-{
-  "type": "tool_call",
-  "name": "read_file",
-  "arguments": "{\"path\": \"/src/main.ts\"}",
-  "call_id": "call_abc123"
-}
-```
-
-### tool_result
-
-Tool execution result.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `call_id` | string | Matching call identifier |
-| `output` | string | Tool output |
-
-```json
-{
-  "type": "tool_result",
-  "call_id": "call_abc123",
-  "output": "File contents here..."
-}
-```
-
-### file_ref
-
-File reference with optional diff.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `path` | string | File path |
-| `action` | string | `read`, `write`, `patch` |
-| `diff` | string? | Unified diff (for patches) |
-
-```json
-{
-  "type": "file_ref",
-  "path": "/src/main.ts",
-  "action": "write",
-  "diff": "@@ -1,3 +1,4 @@\n+import { foo } from 'bar';"
-}
-```
-
-### image
-
-Image reference.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `path` | string | Image file path |
-| `mime` | string? | MIME type |
-
-```json
-{ "type": "image", "path": "/tmp/screenshot.png", "mime": "image/png" }
-```
-
-### reasoning
-
-Model reasoning/thinking content.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `text` | string | Reasoning text |
-| `visibility` | string | `public` or `private` |
-
-```json
-{ "type": "reasoning", "text": "Let me think about this...", "visibility": "public" }
-```
-
-### status
-
-Status indicator.
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `label` | string | Status label |
-| `detail` | string? | Additional detail |
-
-```json
-{ "type": "status", "label": "Running tests", "detail": "3 of 10 passed" }
-```
-
-## Source & Synthetics
-
-### EventSource
-
-The `source` field indicates who emitted the event:
-
-| Value | Description |
-|-------|-------------|
-| `agent` | Native event from the agent |
-| `daemon` | Synthetic event generated by the daemon |
-
-### Synthetic Events
-
-The daemon emits synthetic events (`synthetic: true`, `source: "daemon"`) to provide a consistent event stream across all agents. Common synthetics:
-
-| Synthetic | When |
-|-----------|------|
-| `session.started` | Agent doesn't emit explicit session start |
-| `session.ended` | Agent doesn't emit explicit session end |
-| `turn.started` | Agent doesn't emit explicit turn start |
-| `turn.ended` | Agent doesn't emit explicit turn end |
-| `item.started` | Agent doesn't emit item start events |
-| `item.delta` | Agent doesn't stream deltas natively |
-| `question.*` | Claude Code plan mode (from ExitPlanMode tool) |
-
-### Raw Payloads
-
-Pass `include_raw=true` to event endpoints to receive the original agent payload in the `raw` field. Useful for debugging or accessing agent-specific data not in the universal schema.
-
-```typescript
-const events = await client.getEvents("my-session", { includeRaw: true });
-// events[0].raw contains the original agent payload
-```
diff --git a/docs/skills-config.mdx b/docs/skills-config.mdx
index c85bc2c..c3145c2 100644
--- a/docs/skills-config.mdx
+++ b/docs/skills-config.mdx
@@ -35,9 +35,7 @@ await sdk.setSkillsConfig(
 // Create a session using the configured skills
 const session = await sdk.createSession({
   agent: "claude",
-  sessionInit: {
-    cwd: "/workspace",
-  },
+  cwd: "/workspace",
 });
 
 await session.prompt([
diff --git a/docs/theme.css b/docs/theme.css
index daeb719..4286d2c 100644
--- a/docs/theme.css
+++ b/docs/theme.css
@@ -20,7 +20,6 @@ body {
   color: var(--sa-text);
 }
 
-/*
 a {
   color: var(--sa-primary);
 }
@@ -41,6 +40,13 @@ select {
   color: var(--sa-text);
 }
 
+code,
+pre {
+  background-color: var(--sa-card);
+  border: 1px solid var(--sa-border);
+  color: var(--sa-text);
+}
+
 .card,
 .mintlify-card,
 .docs-card {
@@ -64,4 +70,3 @@ select {
 .alert-danger {
   border-color: var(--sa-danger);
 }
-*/
diff --git a/docs/troubleshooting.mdx b/docs/troubleshooting.mdx
index 838cc28..18186d6 100644
--- a/docs/troubleshooting.mdx
+++ b/docs/troubleshooting.mdx
@@ -29,25 +29,6 @@ Verify the agent is installed:
 ls -la ~/.local/share/sandbox-agent/bin/
 ```
 
-### 4. Binary libc mismatch (musl vs glibc)
-
-Claude Code binaries are available in both musl and glibc variants. If you see errors like:
-
-```
-cannot execute: required file not found
-Error loading shared library libstdc++.so.6: No such file or directory
-```
-
-This means the wrong binary variant was downloaded.
-
-**For sandbox-agent 0.2.0+**: Platform detection is automatic. The correct binary (musl or glibc) is downloaded based on the runtime environment.
-
-**For sandbox-agent 0.1.x**: Use Alpine Linux which has native musl support:
-
-```dockerfile
-FROM alpine:latest
-RUN apk add --no-cache curl ca-certificates libstdc++ libgcc bash
-```
 
 ## Daytona Network Restrictions
 
diff --git a/examples/boxlite-python/.gitignore b/examples/boxlite-python/.gitignore
new file mode 100644
index 0000000..f878106
--- /dev/null
+++ b/examples/boxlite-python/.gitignore
@@ -0,0 +1,4 @@
+__pycache__/
+*.pyc
+.venv/
+oci-image/
diff --git a/examples/boxlite-python/Dockerfile b/examples/boxlite-python/Dockerfile
new file mode 100644
index 0000000..8aba774
--- /dev/null
+++ b/examples/boxlite-python/Dockerfile
@@ -0,0 +1,5 @@
+FROM node:22-bookworm-slim
+RUN apt-get update && apt-get install -y curl ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
+RUN sandbox-agent install-agent claude
+RUN sandbox-agent install-agent codex
diff --git a/examples/boxlite-python/client.py b/examples/boxlite-python/client.py
new file mode 100644
index 0000000..29e4609
--- /dev/null
+++ b/examples/boxlite-python/client.py
@@ -0,0 +1,145 @@
+"""Minimal JSON-RPC client for sandbox-agent's streamable HTTP transport."""
+
+import json
+import threading
+import time
+import uuid
+
+import httpx
+
+
+class SandboxConnection:
+    """Connects to a sandbox-agent server via JSON-RPC over streamable HTTP.
+
+    Endpoints used:
+        POST /v1/acp/{server_id}?agent=...  (bootstrap + requests)
+        GET  /v1/acp/{server_id}            (SSE event stream)
+        DELETE /v1/acp/{server_id}          (close)
+    """
+
+    def __init__(self, base_url: str, agent: str):
+        self.base_url = base_url.rstrip("/")
+        self.agent = agent
+        self.server_id = f"py-{uuid.uuid4().hex[:8]}"
+        self.url = f"{self.base_url}/v1/acp/{self.server_id}"
+        self._next_id = 0
+        self._events: list[dict] = []
+        self._stop = threading.Event()
+        self._sse_thread: threading.Thread | None = None
+
+    def _alloc_id(self) -> int:
+        self._next_id += 1
+        return self._next_id
+
+    def _post(self, method: str, params: dict | None = None, *, bootstrap: bool = False) -> dict:
+        payload: dict = {
+            "jsonrpc": "2.0",
+            "id": self._alloc_id(),
+            "method": method,
+        }
+        if params is not None:
+            payload["params"] = params
+
+        url = f"{self.url}?agent={self.agent}" if bootstrap else self.url
+        r = httpx.post(url, json=payload, timeout=120)
+        r.raise_for_status()
+        body = r.text.strip()
+        return json.loads(body) if body else {}
+
+    # -- Lifecycle -----------------------------------------------------------
+
+    def initialize(self) -> dict:
+        result = self._post(
+            "initialize",
+            {
+                "protocolVersion": 1,
+                "clientInfo": {"name": "python-example", "version": "0.1.0"},
+            },
+            bootstrap=True,
+        )
+        self._start_sse()
+
+        # Auto-authenticate if the agent advertises env-var-based auth methods.
+        auth_methods = result.get("result", {}).get("authMethods", [])
+        env_ids = ("anthropic-api-key", "codex-api-key", "openai-api-key")
+        for method in auth_methods:
+            if method.get("id") not in env_ids:
+                continue
+            try:
+                resp = self._post("authenticate", {"methodId": method["id"]})
+                if "error" not in resp:
+                    break
+            except Exception:
+                continue
+
+        return result
+
+    def new_session(self, cwd: str = "/root") -> str:
+        result = self._post("session/new", {"cwd": cwd, "mcpServers": []})
+        if "error" in result:
+            raise RuntimeError(f"session/new failed: {result['error'].get('message', result['error'])}")
+        return result["result"]["sessionId"]
+
+    def prompt(self, session_id: str, text: str) -> dict:
+        result = self._post(
+            "session/prompt",
+            {
+                "sessionId": session_id,
+                "prompt": [{"type": "text", "text": text}],
+            },
+        )
+        return result
+
+    def close(self) -> None:
+        self._stop.set()
+        try:
+            httpx.delete(self.url, timeout=2)
+        except Exception:
+            pass
+
+    # -- SSE event stream (background thread) --------------------------------
+
+    @property
+    def events(self) -> list[dict]:
+        return list(self._events)
+
+    def _start_sse(self) -> None:
+        self._sse_thread = threading.Thread(target=self._sse_loop, daemon=True)
+        self._sse_thread.start()
+
+    def _sse_loop(self) -> None:
+        while not self._stop.is_set():
+            try:
+                with httpx.stream(
+                    "GET",
+                    self.url,
+                    headers={"Accept": "text/event-stream"},
+                    timeout=httpx.Timeout(connect=5, read=None, write=5, pool=5),
+                ) as resp:
+                    buffer = ""
+                    for chunk in resp.iter_text():
+                        if self._stop.is_set():
+                            break
+                        buffer += chunk.replace("\r\n", "\n")
+                        while "\n\n" in buffer:
+                            event_chunk, buffer = buffer.split("\n\n", 1)
+                            self._process_sse_event(event_chunk)
+            except Exception:
+                if self._stop.is_set():
+                    return
+                time.sleep(0.15)
+
+    def _process_sse_event(self, chunk: str) -> None:
+        data_lines: list[str] = []
+        for line in chunk.split("\n"):
+            if line.startswith("data:"):
+                data_lines.append(line[5:].lstrip())
+        if not data_lines:
+            return
+        payload = "\n".join(data_lines).strip()
+        if not payload:
+            return
+        try:
+            self._events.append(json.loads(payload))
+        except json.JSONDecodeError:
+            pass
diff --git a/examples/boxlite-python/credentials.py b/examples/boxlite-python/credentials.py
new file mode 100644
index 0000000..46114dc
--- /dev/null
+++ b/examples/boxlite-python/credentials.py
@@ -0,0 +1,32 @@
+"""Agent detection and credential helpers for sandbox-agent examples."""
+
+import os
+import sys
+
+
+def detect_agent() -> str:
+    """Pick an agent based on env vars. Exits if no credentials are found."""
+    if os.environ.get("SANDBOX_AGENT"):
+        return os.environ["SANDBOX_AGENT"]
+    has_claude = bool(
+        os.environ.get("ANTHROPIC_API_KEY")
+        or os.environ.get("CLAUDE_API_KEY")
+        or os.environ.get("CLAUDE_CODE_OAUTH_TOKEN")
+    )
+    has_codex = (os.environ.get("OPENAI_API_KEY") or "").startswith("sk-")
+    if has_codex:
+        return "codex"
+    if has_claude:
+        return "claude"
+    print("No API keys found. Set ANTHROPIC_API_KEY or OPENAI_API_KEY.")
+    sys.exit(1)
+
+
+def build_box_env() -> list[tuple[str, str]]:
+    """Collect credential env vars to forward into the BoxLite sandbox."""
+    env: list[tuple[str, str]] = []
+    for key in ("ANTHROPIC_API_KEY", "CLAUDE_API_KEY", "OPENAI_API_KEY", "CODEX_API_KEY"):
+        val = os.environ.get(key)
+        if val:
+            env.append((key, val))
+    return env
diff --git a/examples/boxlite-python/main.py b/examples/boxlite-python/main.py
new file mode 100644
index 0000000..244985f
--- /dev/null
+++ b/examples/boxlite-python/main.py
@@ -0,0 +1,110 @@
+"""
+Sandbox Agent – Python + BoxLite example.
+
+Builds a Docker image, exports it to OCI layout, runs it inside a BoxLite
+sandbox, connects to the sandbox-agent server, creates a session, and sends a prompt.
+
+Usage:
+    pip install -r requirements.txt
+    python main.py
+"""
+
+import asyncio
+import json
+import signal
+import time
+
+import boxlite
+import httpx
+
+from client import SandboxConnection
+from credentials import build_box_env, detect_agent
+from setup_image import OCI_DIR, setup_image
+
+PORT = 3000
+
+
+def wait_for_health(base_url: str, timeout_s: float = 120) -> None:
+    deadline = time.monotonic() + timeout_s
+    last_err: str | None = None
+    while time.monotonic() < deadline:
+        try:
+            r = httpx.get(f"{base_url}/v1/health", timeout=5)
+            if r.status_code == 200 and r.json().get("status") == "ok":
+                return
+            last_err = f"health returned {r.status_code}"
+        except Exception as exc:
+            last_err = str(exc)
+        time.sleep(0.5)
+    raise RuntimeError(f"Timed out waiting for /v1/health: {last_err}")
+
+
+async def main() -> None:
+    agent = detect_agent()
+    print(f"Agent: {agent}")
+
+    setup_image()
+
+    env = build_box_env()
+
+    print("Creating BoxLite sandbox...")
+    box = boxlite.SimpleBox(
+        rootfs_path=OCI_DIR,
+        env=env,
+        ports=[(PORT, PORT, "tcp")],
+    )
+
+    async with box:
+        print("Starting server...")
+        result = await box.exec(
+            "sh", "-c",
+            f"nohup sandbox-agent server --no-token --host 0.0.0.0 --port {PORT} "
+            ">/tmp/sandbox-agent.log 2>&1 &",
+        )
+        if result.exit_code != 0:
+            raise RuntimeError(f"Failed to start server: {result.stderr}")
+
+        base_url = f"http://localhost:{PORT}"
+        print("Waiting for server...")
+        wait_for_health(base_url)
+        print("Server ready.")
+        print(f"Inspector: {base_url}/ui/")
+
+        # -- Session flow ----------------------------------------------------
+        conn = SandboxConnection(base_url, agent)
+
+        print("Connecting...")
+        init_result = conn.initialize()
+        agent_info = init_result.get("result", {}).get("agentInfo", {})
+        print(f"Connected to: {agent_info.get('title', agent)} {agent_info.get('version', '')}")
+
+        session_id = conn.new_session()
+        print(f"Session: {session_id}")
+
+        prompt_text = "Say hello and tell me what you are. Be brief (one sentence)."
+        print(f"\n> {prompt_text}")
+        response = conn.prompt(session_id, prompt_text)
+
+        if "error" in response:
+            err = response["error"]
+            print(f"Error: {err.get('message', err)}")
+        else:
+            print(f"Stop reason: {response.get('result', {}).get('stopReason', 'unknown')}")
+
+        # Give SSE events a moment to arrive.
+        time.sleep(1)
+
+        if conn.events:
+            for ev in conn.events:
+                if ev.get("method") == "session/update":
+                    content = ev.get("params", {}).get("update", {}).get("content", {})
+                    if content.get("text"):
+                        print(content["text"], end="")
+            print()
+
+        conn.close()
+        print("\nDone.")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/examples/boxlite-python/requirements.txt b/examples/boxlite-python/requirements.txt
new file mode 100644
index 0000000..2977142
--- /dev/null
+++ b/examples/boxlite-python/requirements.txt
@@ -0,0 +1,2 @@
+boxlite>=0.5.0
+httpx>=0.27.0
diff --git a/examples/boxlite-python/setup_image.py b/examples/boxlite-python/setup_image.py
new file mode 100644
index 0000000..f56b76f
--- /dev/null
+++ b/examples/boxlite-python/setup_image.py
@@ -0,0 +1,29 @@
+"""Build the sandbox-agent Docker image and export it to OCI layout."""
+
+import os
+import subprocess
+
+DOCKER_IMAGE = "sandbox-agent-boxlite"
+OCI_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "oci-image")
+
+
+def setup_image() -> None:
+    dockerfile_dir = os.path.dirname(os.path.abspath(__file__))
+
+    print(f'Building image "{DOCKER_IMAGE}" (cached after first run)...')
+    subprocess.run(
+        ["docker", "build", "-t", DOCKER_IMAGE, dockerfile_dir],
+        check=True,
+    )
+
+    if not os.path.exists(os.path.join(OCI_DIR, "oci-layout")):
+        print("Exporting to OCI layout...")
+        os.makedirs(OCI_DIR, exist_ok=True)
+        subprocess.run(
+            [
+                "skopeo", "copy",
+                f"docker-daemon:{DOCKER_IMAGE}:latest",
+                f"oci:{OCI_DIR}:latest",
+            ],
+            check=True,
+        )
diff --git a/examples/boxlite/.gitignore b/examples/boxlite/.gitignore
new file mode 100644
index 0000000..329f592
--- /dev/null
+++ b/examples/boxlite/.gitignore
@@ -0,0 +1 @@
+oci-image/
diff --git a/examples/boxlite/Dockerfile b/examples/boxlite/Dockerfile
new file mode 100644
index 0000000..8aba774
--- /dev/null
+++ b/examples/boxlite/Dockerfile
@@ -0,0 +1,5 @@
+FROM node:22-bookworm-slim
+RUN apt-get update && apt-get install -y curl ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
+RUN sandbox-agent install-agent claude
+RUN sandbox-agent install-agent codex
diff --git a/examples/boxlite/package.json b/examples/boxlite/package.json
new file mode 100644
index 0000000..8e7a5d8
--- /dev/null
+++ b/examples/boxlite/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@sandbox-agent/example-boxlite",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@boxlite-ai/boxlite": "latest",
+    "@sandbox-agent/example-shared": "workspace:*",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
+  }
+}
diff --git a/examples/boxlite/src/index.ts b/examples/boxlite/src/index.ts
new file mode 100644
index 0000000..171166b
--- /dev/null
+++ b/examples/boxlite/src/index.ts
@@ -0,0 +1,41 @@
+import { SimpleBox } from "@boxlite-ai/boxlite";
+import { SandboxAgent } from "sandbox-agent";
+import { detectAgent, buildInspectorUrl } from "@sandbox-agent/example-shared";
+import { setupImage, OCI_DIR } from "./setup-image.ts";
+
+const env: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+setupImage();
+
+console.log("Creating BoxLite sandbox...");
+const box = new SimpleBox({
+  rootfsPath: OCI_DIR,
+  env,
+  ports: [{ hostPort: 3000, guestPort: 3000 }],
+  diskSizeGb: 4,
+});
+
+console.log("Starting server...");
+const result = await box.exec("sh", "-c", "nohup sandbox-agent server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &");
+if (result.exitCode !== 0) throw new Error(`Failed to start server: ${result.stderr}`);
+
+const baseUrl = "http://localhost:3000";
+
+console.log("Connecting to server...");
+const client = await SandboxAgent.connect({ baseUrl });
+const session = await client.createSession({ agent: detectAgent(), cwd: "/root" });
+const sessionId = session.id;
+
+console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
+console.log("  Press Ctrl+C to stop.");
+
+const keepAlive = setInterval(() => {}, 60_000);
+const cleanup = async () => {
+  clearInterval(keepAlive);
+  await box.stop();
+  process.exit(0);
+};
+process.once("SIGINT", cleanup);
+process.once("SIGTERM", cleanup);
diff --git a/examples/boxlite/src/setup-image.ts b/examples/boxlite/src/setup-image.ts
new file mode 100644
index 0000000..9c15c99
--- /dev/null
+++ b/examples/boxlite/src/setup-image.ts
@@ -0,0 +1,16 @@
+import { execSync } from "node:child_process";
+import { existsSync, mkdirSync } from "node:fs";
+
+export const DOCKER_IMAGE = "sandbox-agent-boxlite";
+export const OCI_DIR = new URL("../oci-image", import.meta.url).pathname;
+
+export function setupImage() {
+  console.log(`Building image "${DOCKER_IMAGE}" (cached after first run)...`);
+  execSync(`docker build -t ${DOCKER_IMAGE} ${new URL("..", import.meta.url).pathname}`, { stdio: "inherit" });
+
+  if (!existsSync(`${OCI_DIR}/oci-layout`)) {
+    console.log("Exporting to OCI layout...");
+    mkdirSync(OCI_DIR, { recursive: true });
+    execSync(`docker save ${DOCKER_IMAGE} | tar -xf - -C ${OCI_DIR}`, { stdio: "inherit" });
+  }
+}
diff --git a/examples/boxlite/tsconfig.json b/examples/boxlite/tsconfig.json
new file mode 100644
index 0000000..ad591c3
--- /dev/null
+++ b/examples/boxlite/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "**/*.test.ts"]
+}
diff --git a/examples/cloudflare/Dockerfile b/examples/cloudflare/Dockerfile
index 17ddb78..738f8a2 100644
--- a/examples/cloudflare/Dockerfile
+++ b/examples/cloudflare/Dockerfile
@@ -1,7 +1,7 @@
 FROM cloudflare/sandbox:0.7.0
 
 # Install sandbox-agent
-RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh
+RUN curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh
 
 # Pre-install agents
 RUN sandbox-agent install-agent claude && \
diff --git a/examples/cloudflare/README.md b/examples/cloudflare/README.md
index 783d34e..b8461f2 100644
--- a/examples/cloudflare/README.md
+++ b/examples/cloudflare/README.md
@@ -36,6 +36,48 @@ Test the endpoint:
 curl http://localhost:8787
 ```
 
+Test prompt routing through the SDK with a custom sandbox fetch handler:
+
+```bash
+curl -N -X POST "http://localhost:8787/sandbox/demo/prompt" \
+  -H "Content-Type: application/json" \
+  -H "Accept: text/event-stream" \
+  -d '{"agent":"codex","prompt":"Reply with one short sentence."}'
+```
+
+The response is an SSE stream with events:
+- `session.created`
+- `session.event`
+- `prompt.completed`
+- `done`
+
+### Troubleshooting: only two events
+
+If you only see:
+- outbound `session/prompt`
+- inbound prompt result with `stopReason: "end_turn"`
+
+then ACP `session/update` notifications are not flowing. In Cloudflare sandbox paths this can happen if you forward `AbortSignal` from SDK fetch init into `containerFetch(...)` for long-lived ACP SSE requests.
+
+Use:
+
+```ts
+const sdk = await SandboxAgent.connect({
+  fetch: (input, init) =>
+    sandbox.containerFetch(
+      input as Request | string | URL,
+      {
+        ...(init ?? {}),
+        // Avoid passing AbortSignal through containerFetch; it can drop ACP SSE updates.
+        signal: undefined,
+      },
+      PORT,
+    ),
+});
+```
+
+Without `session/update` events, assistant text/tool deltas will not appear in UI streams.
+
 ## Deploy
 
 ```bash
diff --git a/examples/cloudflare/frontend/App.tsx b/examples/cloudflare/frontend/App.tsx
index 2f7f0c5..499fc63 100644
--- a/examples/cloudflare/frontend/App.tsx
+++ b/examples/cloudflare/frontend/App.tsx
@@ -25,7 +25,7 @@ export function App() {
 
     try {
       // Connect via proxy endpoint (need full URL for SDK)
-      const baseUrl = `${window.location.origin}/sandbox/${encodeURIComponent(sandboxName)}`;
+      const baseUrl = `${window.location.origin}/sandbox/${encodeURIComponent(sandboxName)}/proxy`;
       log(`Connecting to sandbox: ${sandboxName}`);
 
       const client = await SandboxAgent.connect({ baseUrl });
@@ -71,7 +71,7 @@ export function App() {
           if (event.type === "permission.requested") {
             const data = event.data as PermissionEventData;
             log(`[Auto-approved] ${data.action}`);
-            await client.replyPermission(sessionIdRef.current, data.permission_id, { reply: "once" });
+            await client.respondPermission(sessionIdRef.current, data.permission_id, { reply: "once" });
           }
 
           // Reject questions (don't support interactive input)
@@ -128,7 +128,7 @@ export function App() {
         console.error("Event stream error:", err);
       }
     },
-    [log]
+    [log],
   );
 
   const send = useCallback(async () => {
@@ -162,12 +162,7 @@ export function App() {
         <div style={styles.connectForm}>
           <label style={styles.label}>
             Sandbox name:
-            <input
-              style={styles.input}
-              value={sandboxName}
-              onChange={(e) => setSandboxName(e.target.value)}
-              placeholder="demo"
-            />
+            <input style={styles.input} value={sandboxName} onChange={(e) => setSandboxName(e.target.value)} placeholder="demo" />
           </label>
           <button style={styles.button} onClick={connect}>
             Connect
diff --git a/examples/cloudflare/frontend/main.tsx b/examples/cloudflare/frontend/main.tsx
index f258e49..1c711a7 100644
--- a/examples/cloudflare/frontend/main.tsx
+++ b/examples/cloudflare/frontend/main.tsx
@@ -5,5 +5,5 @@ import { App } from "./App";
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
     <App />
-  </StrictMode>
+  </StrictMode>,
 );
diff --git a/examples/cloudflare/package.json b/examples/cloudflare/package.json
index e052605..0385703 100644
--- a/examples/cloudflare/package.json
+++ b/examples/cloudflare/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@cloudflare/sandbox": "latest",
+    "hono": "^4.12.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "sandbox-agent": "workspace:*"
diff --git a/examples/cloudflare/src/index.ts b/examples/cloudflare/src/index.ts
index 3866727..1efa742 100644
--- a/examples/cloudflare/src/index.ts
+++ b/examples/cloudflare/src/index.ts
@@ -1,16 +1,21 @@
 import { getSandbox, type Sandbox } from "@cloudflare/sandbox";
+import { Hono } from "hono";
+import { HTTPException } from "hono/http-exception";
+import { streamSSE } from "hono/streaming";
+import { runPromptEndpointStream, type PromptRequest } from "./prompt-endpoint";
 
 export { Sandbox } from "@cloudflare/sandbox";
 
-type Env = {
-  Bindings: {
-    Sandbox: DurableObjectNamespace<Sandbox>;
-    ASSETS: Fetcher;
-    ANTHROPIC_API_KEY?: string;
-    OPENAI_API_KEY?: string;
-  };
+type Bindings = {
+  Sandbox: DurableObjectNamespace<Sandbox>;
+  ASSETS: Fetcher;
+  ANTHROPIC_API_KEY?: string;
+  OPENAI_API_KEY?: string;
+  CODEX_API_KEY?: string;
 };
 
+type AppEnv = { Bindings: Bindings };
+
 const PORT = 8000;
 
 /** Check if sandbox-agent is already running by probing its health endpoint */
@@ -23,54 +28,87 @@ async function isServerRunning(sandbox: Sandbox): Promise<boolean> {
   }
 }
 
-/** Ensure sandbox-agent is running in the container */
-async function ensureRunning(sandbox: Sandbox, env: Env["Bindings"]): Promise<void> {
-  if (await isServerRunning(sandbox)) return;
-
-  // Set environment variables for agents
+async function getReadySandbox(name: string, env: Bindings): Promise<Sandbox> {
+  const sandbox = getSandbox(env.Sandbox, name);
   const envVars: Record<string, string> = {};
   if (env.ANTHROPIC_API_KEY) envVars.ANTHROPIC_API_KEY = env.ANTHROPIC_API_KEY;
   if (env.OPENAI_API_KEY) envVars.OPENAI_API_KEY = env.OPENAI_API_KEY;
+  if (env.CODEX_API_KEY) envVars.CODEX_API_KEY = env.CODEX_API_KEY;
+  if (!envVars.CODEX_API_KEY && envVars.OPENAI_API_KEY) envVars.CODEX_API_KEY = envVars.OPENAI_API_KEY;
   await sandbox.setEnvVars(envVars);
 
-  // Start sandbox-agent server as background process
-  await sandbox.startProcess(`sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`);
+  if (!(await isServerRunning(sandbox))) {
+    await sandbox.startProcess(`sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`);
 
-  // Poll health endpoint until server is ready (max ~6 seconds)
-  for (let i = 0; i < 30; i++) {
-    if (await isServerRunning(sandbox)) return;
-    await new Promise((r) => setTimeout(r, 200));
+    for (let i = 0; i < 30; i++) {
+      if (await isServerRunning(sandbox)) break;
+      await new Promise((r) => setTimeout(r, 200));
+    }
   }
+  return sandbox;
 }
 
-export default {
-  async fetch(request: Request, env: Env["Bindings"]): Promise<Response> {
-    const url = new URL(request.url);
+async function proxyToSandbox(sandbox: Sandbox, request: Request, path: string): Promise<Response> {
+  const query = new URL(request.url).search;
+  return sandbox.containerFetch(
+    `http://localhost${path}${query}`,
+    {
+      method: request.method,
+      headers: request.headers,
+      body: request.body,
+    },
+    PORT,
+  );
+}
 
-    // Proxy requests to sandbox-agent: /sandbox/:name/v1/...
-    const match = url.pathname.match(/^\/sandbox\/([^/]+)(\/.*)?$/);
-    if (match) {
-      if (!env.ANTHROPIC_API_KEY && !env.OPENAI_API_KEY) {
-        return Response.json(
-          { error: "ANTHROPIC_API_KEY or OPENAI_API_KEY must be set" },
-          { status: 500 }
-        );
-      }
+const app = new Hono<AppEnv>();
 
-      const name = match[1];
-      const path = match[2] || "/";
-      const sandbox = getSandbox(env.Sandbox, name);
+app.onError((error) => {
+  return new Response(String(error), { status: 500 });
+});
 
-      await ensureRunning(sandbox, env);
+app.post("/sandbox/:name/prompt", async (c) => {
+  if (!(c.req.header("content-type") ?? "").includes("application/json")) {
+    throw new HTTPException(400, { message: "Content-Type must be application/json" });
+  }
 
-      // Proxy request to container
-      return sandbox.containerFetch(
-        new Request(`http://localhost${path}${url.search}`, request),
-        PORT
-      );
+  let payload: PromptRequest;
+  try {
+    payload = await c.req.json<PromptRequest>();
+  } catch {
+    throw new HTTPException(400, { message: "Invalid JSON body" });
+  }
+
+  const sandbox = await getReadySandbox(c.req.param("name"), c.env);
+  return streamSSE(c, async (stream) => {
+    try {
+      await runPromptEndpointStream(sandbox, payload, PORT, async (event) => {
+        await stream.writeSSE({
+          event: event.type,
+          data: JSON.stringify(event),
+        });
+      });
+      await stream.writeSSE({
+        event: "done",
+        data: JSON.stringify({ ok: true }),
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      await stream.writeSSE({
+        event: "error",
+        data: JSON.stringify({ message }),
+      });
     }
+  });
+});
 
-    // Serve frontend assets
-    return env.ASSETS.fetch(request);
-  },
-} satisfies ExportedHandler<Env["Bindings"]>;
+app.all("/sandbox/:name/proxy/*", async (c) => {
+  const sandbox = await getReadySandbox(c.req.param("name"), c.env);
+  const wildcard = c.req.param("*");
+  const path = wildcard ? `/${wildcard}` : "/";
+  return proxyToSandbox(sandbox, c.req.raw, path);
+});
+
+app.all("*", (c) => c.env.ASSETS.fetch(c.req.raw));
+
+export default app;
diff --git a/examples/cloudflare/src/prompt-endpoint.ts b/examples/cloudflare/src/prompt-endpoint.ts
new file mode 100644
index 0000000..f3c3366
--- /dev/null
+++ b/examples/cloudflare/src/prompt-endpoint.ts
@@ -0,0 +1,62 @@
+import type { Sandbox } from "@cloudflare/sandbox";
+import { SandboxAgent } from "sandbox-agent";
+
+export type PromptRequest = {
+  agent?: string;
+  prompt?: string;
+};
+
+export async function runPromptEndpointStream(
+  sandbox: Sandbox,
+  request: PromptRequest,
+  port: number,
+  emit: (event: { type: string; [key: string]: unknown }) => Promise<void> | void,
+): Promise<void> {
+  const client = await SandboxAgent.connect({
+    fetch: (req, init) =>
+      sandbox.containerFetch(
+        req,
+        {
+          ...(init ?? {}),
+          // Cloudflare containerFetch may drop long-lived update streams when
+          // a forwarded AbortSignal is cancelled; clear it for this path.
+          signal: undefined,
+        },
+        port,
+      ),
+  });
+
+  let unsubscribe: (() => void) | undefined;
+  try {
+    const session = await client.createSession({
+      agent: request.agent ?? "codex",
+    });
+
+    const promptText = request.prompt?.trim() || "Reply with a short confirmation.";
+    await emit({
+      type: "session.created",
+      sessionId: session.id,
+      agent: session.agent,
+      prompt: promptText,
+    });
+
+    let pendingWrites: Promise<void> = Promise.resolve();
+    unsubscribe = session.onEvent((event) => {
+      pendingWrites = pendingWrites
+        .then(async () => {
+          await emit({ type: "session.event", event });
+        })
+        .catch(() => {});
+    });
+
+    const response = await session.prompt([{ type: "text", text: promptText }]);
+    await pendingWrites;
+    await emit({ type: "prompt.response", response });
+    await emit({ type: "prompt.completed" });
+  } finally {
+    if (unsubscribe) {
+      unsubscribe();
+    }
+    await Promise.race([client.dispose(), new Promise((resolve) => setTimeout(resolve, 250))]);
+  }
+}
diff --git a/examples/cloudflare/tests/cloudflare.test.ts b/examples/cloudflare/tests/cloudflare.test.ts
new file mode 100644
index 0000000..d00c2ce
--- /dev/null
+++ b/examples/cloudflare/tests/cloudflare.test.ts
@@ -0,0 +1,154 @@
+import { describe, it, expect } from "vitest";
+import { spawn, type ChildProcess } from "node:child_process";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { execSync } from "node:child_process";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const PROJECT_DIR = resolve(__dirname, "..");
+
+/**
+ * Cloudflare Workers integration test.
+ *
+ * Set RUN_CLOUDFLARE_EXAMPLES=1 to enable. Requires wrangler and Docker.
+ *
+ * This starts `wrangler dev` which:
+ *  1. Builds the Dockerfile (cloudflare/sandbox base + sandbox-agent)
+ *  2. Starts a local Workers runtime with Durable Objects and containers
+ *  3. Exposes the app on a local port
+ *
+ * We then test through the proxy endpoint which forwards to sandbox-agent
+ * running inside the container.
+ */
+const shouldRun = process.env.RUN_CLOUDFLARE_EXAMPLES === "1";
+const timeoutMs = Number.parseInt(process.env.SANDBOX_TEST_TIMEOUT_MS || "", 10) || 600_000;
+
+const testFn = shouldRun ? it : it.skip;
+
+interface WranglerDev {
+  baseUrl: string;
+  cleanup: () => void;
+}
+
+async function startWranglerDev(): Promise<WranglerDev> {
+  // Build frontend assets first (wrangler expects dist/ to exist)
+  execSync("npx vite build", { cwd: PROJECT_DIR, stdio: "pipe" });
+
+  return new Promise<WranglerDev>((resolve, reject) => {
+    const child: ChildProcess = spawn("npx", ["wrangler", "dev", "--port", "0"], {
+      cwd: PROJECT_DIR,
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: true,
+      env: {
+        ...process.env,
+        // Ensure wrangler picks up API keys to pass to the container
+        NODE_ENV: "development",
+      },
+    });
+
+    let stdout = "";
+    let stderr = "";
+    let resolved = false;
+
+    const cleanup = () => {
+      if (child.pid) {
+        // Kill process group to ensure wrangler and its children are cleaned up
+        try {
+          process.kill(-child.pid, "SIGTERM");
+        } catch {
+          try {
+            child.kill("SIGTERM");
+          } catch {}
+        }
+      }
+    };
+
+    const timer = setTimeout(() => {
+      if (!resolved) {
+        resolved = true;
+        cleanup();
+        reject(new Error(`wrangler dev did not start within 120s.\nstdout: ${stdout}\nstderr: ${stderr}`));
+      }
+    }, 120_000);
+
+    const onData = (chunk: Buffer) => {
+      const text = chunk.toString();
+      stdout += text;
+
+      // wrangler dev prints "Ready on http://localhost:XXXX" when ready
+      const match = stdout.match(/Ready on (https?:\/\/[^\s]+)/i) ?? stdout.match(/(https?:\/\/(?:localhost|127\.0\.0\.1):\d+)/);
+      if (match && !resolved) {
+        resolved = true;
+        clearTimeout(timer);
+        resolve({ baseUrl: match[1], cleanup });
+      }
+    };
+
+    child.stdout?.on("data", onData);
+    child.stderr?.on("data", (chunk: Buffer) => {
+      const text = chunk.toString();
+      stderr += text;
+      // Some wrangler versions print ready message to stderr
+      const match = text.match(/Ready on (https?:\/\/[^\s]+)/i) ?? text.match(/(https?:\/\/(?:localhost|127\.0\.0\.1):\d+)/);
+      if (match && !resolved) {
+        resolved = true;
+        clearTimeout(timer);
+        resolve({ baseUrl: match[1], cleanup });
+      }
+    });
+
+    child.on("error", (err) => {
+      if (!resolved) {
+        resolved = true;
+        clearTimeout(timer);
+        reject(new Error(`wrangler dev failed to start: ${err.message}`));
+      }
+    });
+
+    child.on("exit", (code) => {
+      if (!resolved) {
+        resolved = true;
+        clearTimeout(timer);
+        reject(new Error(`wrangler dev exited with code ${code}.\nstdout: ${stdout}\nstderr: ${stderr}`));
+      }
+    });
+  });
+}
+
+describe("cloudflare example", () => {
+  testFn(
+    "starts wrangler dev and sandbox-agent responds via proxy",
+    async () => {
+      const { baseUrl, cleanup } = await startWranglerDev();
+      try {
+        // The Cloudflare example proxies requests through /sandbox/:name/proxy/*
+        // Wait for the container inside the Durable Object to start sandbox-agent
+        const healthUrl = `${baseUrl}/sandbox/test/proxy/v1/health`;
+
+        let healthy = false;
+        for (let i = 0; i < 120; i++) {
+          try {
+            const res = await fetch(healthUrl);
+            if (res.ok) {
+              const data = await res.json();
+              // The proxied health endpoint returns {name: "Sandbox Agent", ...}
+              if (data.status === "ok" || data.name === "Sandbox Agent") {
+                healthy = true;
+                break;
+              }
+            }
+          } catch {}
+          await new Promise((r) => setTimeout(r, 2000));
+        }
+        expect(healthy).toBe(true);
+
+        // Confirm a second request also works
+        const response = await fetch(healthUrl);
+        expect(response.ok).toBe(true);
+      } finally {
+        cleanup();
+      }
+    },
+    timeoutMs,
+  );
+});
diff --git a/sdks/persist-sqlite/vitest.config.ts b/examples/cloudflare/vitest.config.ts
similarity index 84%
rename from sdks/persist-sqlite/vitest.config.ts
rename to examples/cloudflare/vitest.config.ts
index 8a85a83..52a3740 100644
--- a/sdks/persist-sqlite/vitest.config.ts
+++ b/examples/cloudflare/vitest.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
+    root: ".",
     include: ["tests/**/*.test.ts"],
-    testTimeout: 60000,
   },
 });
diff --git a/examples/computesdk/package.json b/examples/computesdk/package.json
index e22b51b..243b3b1 100644
--- a/examples/computesdk/package.json
+++ b/examples/computesdk/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "start": "tsx src/computesdk.ts",
+    "start": "tsx src/index.ts",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
diff --git a/examples/computesdk/src/computesdk.ts b/examples/computesdk/src/computesdk.ts
deleted file mode 100644
index 484817d..0000000
--- a/examples/computesdk/src/computesdk.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import {
-  compute,
-  detectProvider,
-  getMissingEnvVars,
-  getProviderConfigFromEnv,
-  isProviderAuthComplete,
-  isValidProvider,
-  PROVIDER_NAMES,
-  type ExplicitComputeConfig,
-  type ProviderName,
-} from "computesdk";
-import { SandboxAgent } from "sandbox-agent";
-import { detectAgent, buildInspectorUrl, waitForHealth } from "@sandbox-agent/example-shared";
-import { fileURLToPath } from "node:url";
-import { resolve } from "node:path";
-
-const PORT = 3000;
-const REQUEST_TIMEOUT_MS =
-  Number.parseInt(process.env.COMPUTESDK_TIMEOUT_MS || "", 10) || 120_000;
-
-/**
- * Detects and validates the provider to use.
- * Priority: COMPUTESDK_PROVIDER env var > auto-detection from API keys
- */
-function resolveProvider(): ProviderName {
-  const providerOverride = process.env.COMPUTESDK_PROVIDER;
-  
-  if (providerOverride) {
-    if (!isValidProvider(providerOverride)) {
-      throw new Error(
-        `Unsupported ComputeSDK provider "${providerOverride}". Supported providers: ${PROVIDER_NAMES.join(", ")}`
-      );
-    }
-    if (!isProviderAuthComplete(providerOverride)) {
-      const missing = getMissingEnvVars(providerOverride);
-      throw new Error(
-        `Missing credentials for provider "${providerOverride}". Set: ${missing.join(", ")}`
-      );
-    }
-    console.log(`Using ComputeSDK provider: ${providerOverride} (explicit)`);
-    return providerOverride as ProviderName;
-  }
-  
-  const detected = detectProvider();
-  if (!detected) {
-    throw new Error(
-      `No provider credentials found. Set one of: ${PROVIDER_NAMES.map((p) => getMissingEnvVars(p).join(", ")).join(" | ")}`
-    );
-  }
-  console.log(`Using ComputeSDK provider: ${detected} (auto-detected)`);
-  return detected as ProviderName;
-}
-
-function configureComputeSDK(): void {
-  const provider = resolveProvider();
-  
-  const config: ExplicitComputeConfig = {
-    provider,
-    computesdkApiKey: process.env.COMPUTESDK_API_KEY,
-    requestTimeoutMs: REQUEST_TIMEOUT_MS,
-  };
-  
-  const providerConfig = getProviderConfigFromEnv(provider);
-  if (Object.keys(providerConfig).length > 0) {
-    const configWithProvider =
-      config as ExplicitComputeConfig & Record<ProviderName, Record<string, string>>;
-    configWithProvider[provider] = providerConfig;
-  }
-  
-  compute.setConfig(config);
-}
-
-configureComputeSDK();
-
-const buildEnv = (): Record<string, string> => {
-  const env: Record<string, string> = {};
-  if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
-  if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
-  return env;
-};
-
-export async function setupComputeSdkSandboxAgent(): Promise<{
-  baseUrl: string;
-  cleanup: () => Promise<void>;
-}> {
-  const env = buildEnv();
-
-  console.log("Creating ComputeSDK sandbox...");
-  const sandbox = await compute.sandbox.create({
-    envs: Object.keys(env).length > 0 ? env : undefined,
-  });
-
-  const run = async (cmd: string, options?: { background?: boolean }) => {
-    const result = await sandbox.runCommand(cmd, options);
-    if (typeof result?.exitCode === "number" && result.exitCode !== 0) {
-      throw new Error(`Command failed: ${cmd} (exit ${result.exitCode})\n${result.stderr || ""}`);
-    }
-    return result;
-  };
-
-  console.log("Installing sandbox-agent...");
-  await run("curl -fsSL https://releases.rivet.dev/sandbox-agent/latest/install.sh | sh");
-
-  if (env.ANTHROPIC_API_KEY) {
-    console.log("Installing Claude agent...");
-    await run("sandbox-agent install-agent claude");
-  }
-
-  if (env.OPENAI_API_KEY) {
-    console.log("Installing Codex agent...");
-    await run("sandbox-agent install-agent codex");
-  }
-
-  console.log("Starting server...");
-  await run(`sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`, { background: true });
-
-  const baseUrl = await sandbox.getUrl({ port: PORT });
-
-  console.log("Waiting for server...");
-  await waitForHealth({ baseUrl });
-
-  const cleanup = async () => {
-    try {
-      await sandbox.destroy();
-    } catch (error) {
-      console.warn("Cleanup failed:", error instanceof Error ? error.message : error);
-    }
-  };
-
-  return { baseUrl, cleanup };
-}
-
-export async function runComputeSdkExample(): Promise<void> {
-  const { baseUrl, cleanup } = await setupComputeSdkSandboxAgent();
-
-  const handleExit = async () => {
-    await cleanup();
-    process.exit(0);
-  };
-
-  process.once("SIGINT", handleExit);
-  process.once("SIGTERM", handleExit);
-
-  const client = await SandboxAgent.connect({ baseUrl });
-  const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
-  const sessionId = session.id;
-
-  console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
-  console.log("  Press Ctrl+C to stop.");
-
-  // Keep alive until SIGINT/SIGTERM triggers cleanup above
-  await new Promise(() => {});
-}
-
-const isDirectRun = Boolean(
-  process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)
-);
-
-if (isDirectRun) {
-  runComputeSdkExample().catch((error) => {
-    console.error(error instanceof Error ? error.message : error);
-    process.exit(1);
-  });
-}
diff --git a/examples/computesdk/src/index.ts b/examples/computesdk/src/index.ts
new file mode 100644
index 0000000..63d4aee
--- /dev/null
+++ b/examples/computesdk/src/index.ts
@@ -0,0 +1,30 @@
+import { SandboxAgent } from "sandbox-agent";
+import { computesdk } from "sandbox-agent/computesdk";
+import { detectAgent } from "@sandbox-agent/example-shared";
+
+const envs: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+const client = await SandboxAgent.start({
+  sandbox: computesdk({
+    create: { envs },
+  }),
+});
+
+console.log(`UI: ${client.inspectorUrl}`);
+
+const session = await client.createSession({
+  agent: detectAgent(),
+});
+
+session.onEvent((event) => {
+  console.log(`[${event.sender}]`, JSON.stringify(event.payload));
+});
+
+session.prompt([{ type: "text", text: "Say hello from ComputeSDK in one sentence." }]);
+
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
+  process.exit(0);
+});
diff --git a/examples/computesdk/tests/computesdk.test.ts b/examples/computesdk/tests/computesdk.test.ts
index 9d023a9..61ebb2c 100644
--- a/examples/computesdk/tests/computesdk.test.ts
+++ b/examples/computesdk/tests/computesdk.test.ts
@@ -1,16 +1,11 @@
 import { describe, it, expect } from "vitest";
-import { buildHeaders } from "@sandbox-agent/example-shared";
-import { setupComputeSdkSandboxAgent } from "../src/computesdk.ts";
+import { SandboxAgent } from "sandbox-agent";
+import { computesdk } from "sandbox-agent/computesdk";
 
 const hasModal = Boolean(process.env.MODAL_TOKEN_ID && process.env.MODAL_TOKEN_SECRET);
 const hasVercel = Boolean(process.env.VERCEL_TOKEN || process.env.VERCEL_OIDC_TOKEN);
 const hasProviderKey = Boolean(
-  process.env.BLAXEL_API_KEY ||
-    process.env.CSB_API_KEY ||
-    process.env.DAYTONA_API_KEY ||
-    process.env.E2B_API_KEY ||
-    hasModal ||
-    hasVercel
+  process.env.BLAXEL_API_KEY || process.env.CSB_API_KEY || process.env.DAYTONA_API_KEY || process.env.E2B_API_KEY || hasModal || hasVercel,
 );
 
 const shouldRun = Boolean(process.env.COMPUTESDK_API_KEY) && hasProviderKey;
@@ -18,22 +13,25 @@ const timeoutMs = Number.parseInt(process.env.SANDBOX_TEST_TIMEOUT_MS || "", 10)
 
 const testFn = shouldRun ? it : it.skip;
 
-describe("computesdk example", () => {
+describe("computesdk provider", () => {
   testFn(
     "starts sandbox-agent and responds to /v1/health",
     async () => {
-      const { baseUrl, cleanup } = await setupComputeSdkSandboxAgent();
+      const envs: Record<string, string> = {};
+      if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+      if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+      const sdk = await SandboxAgent.start({
+        sandbox: computesdk({ create: { envs } }),
+      });
+
       try {
-        const response = await fetch(`${baseUrl}/v1/health`, {
-          headers: buildHeaders({}),
-        });
-        expect(response.ok).toBe(true);
-        const data = await response.json();
-        expect(data.status).toBe("ok");
+        const health = await sdk.getHealth();
+        expect(health.status).toBe("ok");
       } finally {
-        await cleanup();
+        await sdk.destroySandbox();
       }
     },
-    timeoutMs
+    timeoutMs,
   );
 });
diff --git a/examples/computesdk/tsconfig.json b/examples/computesdk/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/computesdk/tsconfig.json
+++ b/examples/computesdk/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/daytona/package.json b/examples/daytona/package.json
index f105bac..ba5b0ac 100644
--- a/examples/daytona/package.json
+++ b/examples/daytona/package.json
@@ -4,7 +4,6 @@
   "type": "module",
   "scripts": {
     "start": "tsx src/index.ts",
-    "start:snapshot": "tsx src/daytona-with-snapshot.ts",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
diff --git a/examples/daytona/src/daytona-with-snapshot.ts b/examples/daytona/src/daytona-with-snapshot.ts
deleted file mode 100644
index b19fad3..0000000
--- a/examples/daytona/src/daytona-with-snapshot.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Daytona, Image } from "@daytonaio/sdk";
-import { SandboxAgent } from "sandbox-agent";
-import { detectAgent, buildInspectorUrl, waitForHealth } from "@sandbox-agent/example-shared";
-
-const daytona = new Daytona();
-
-const envVars: Record<string, string> = {};
-if (process.env.ANTHROPIC_API_KEY)
-	envVars.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
-if (process.env.OPENAI_API_KEY)
-	envVars.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
-
-// Build a custom image with sandbox-agent pre-installed (slower first run, faster subsequent runs)
-const image = Image.base("ubuntu:22.04").runCommands(
-	"apt-get update && apt-get install -y curl ca-certificates",
-	"curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh",
-);
-
-console.log("Creating Daytona sandbox (first run builds the base image and may take a few minutes, subsequent runs are fast)...");
-const sandbox = await daytona.create({ envVars, image, autoStopInterval: 0 }, { timeout: 180 });
-
-await sandbox.process.executeCommand(
-	"nohup sandbox-agent server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &",
-);
-
-const baseUrl = (await sandbox.getSignedPreviewUrl(3000, 4 * 60 * 60)).url;
-
-console.log("Waiting for server...");
-await waitForHealth({ baseUrl });
-
-const client = await SandboxAgent.connect({ baseUrl });
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
-const sessionId = session.id;
-
-console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
-console.log("  Press Ctrl+C to stop.");
-
-const keepAlive = setInterval(() => {}, 60_000);
-const cleanup = async () => {
-	clearInterval(keepAlive);
-	await sandbox.delete(60);
-	process.exit(0);
-};
-process.once("SIGINT", cleanup);
-process.once("SIGTERM", cleanup);
diff --git a/examples/daytona/src/daytona.ts b/examples/daytona/src/daytona.ts
new file mode 100644
index 0000000..ccffc94
--- /dev/null
+++ b/examples/daytona/src/daytona.ts
@@ -0,0 +1,33 @@
+import { SandboxAgent } from "sandbox-agent";
+import { daytona } from "sandbox-agent/daytona";
+
+function collectEnvVars(): Record<string, string> {
+  const envVars: Record<string, string> = {};
+  if (process.env.ANTHROPIC_API_KEY) envVars.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+  if (process.env.OPENAI_API_KEY) envVars.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+  return envVars;
+}
+
+function inspectorUrlToBaseUrl(inspectorUrl: string): string {
+  return inspectorUrl.replace(/\/ui\/$/, "");
+}
+
+export async function setupDaytonaSandboxAgent(): Promise<{
+  baseUrl: string;
+  token?: string;
+  extraHeaders?: Record<string, string>;
+  cleanup: () => Promise<void>;
+}> {
+  const client = await SandboxAgent.start({
+    sandbox: daytona({
+      create: { envVars: collectEnvVars() },
+    }),
+  });
+
+  return {
+    baseUrl: inspectorUrlToBaseUrl(client.inspectorUrl),
+    cleanup: async () => {
+      await client.killSandbox();
+    },
+  };
+}
diff --git a/examples/daytona/src/index.ts b/examples/daytona/src/index.ts
index 9a6a1b9..9c4cf85 100644
--- a/examples/daytona/src/index.ts
+++ b/examples/daytona/src/index.ts
@@ -1,46 +1,30 @@
-import { Daytona } from "@daytonaio/sdk";
 import { SandboxAgent } from "sandbox-agent";
-import { detectAgent, buildInspectorUrl, waitForHealth } from "@sandbox-agent/example-shared";
-
-const daytona = new Daytona();
+import { daytona } from "sandbox-agent/daytona";
+import { detectAgent } from "@sandbox-agent/example-shared";
 
 const envVars: Record<string, string> = {};
-if (process.env.ANTHROPIC_API_KEY)
-	envVars.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
-if (process.env.OPENAI_API_KEY)
-	envVars.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+if (process.env.ANTHROPIC_API_KEY) envVars.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) envVars.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
 
-// Use default image and install sandbox-agent at runtime (faster startup, no snapshot build)
-console.log("Creating Daytona sandbox...");
-const sandbox = await daytona.create({ envVars, autoStopInterval: 0 });
+const client = await SandboxAgent.start({
+  sandbox: daytona({
+    create: { envVars },
+  }),
+});
 
-// Install sandbox-agent and start server
-console.log("Installing sandbox-agent...");
-await sandbox.process.executeCommand(
-	"curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh",
-);
+console.log(`UI: ${client.inspectorUrl}`);
 
-await sandbox.process.executeCommand(
-	"nohup sandbox-agent server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &",
-);
+const session = await client.createSession({
+  agent: detectAgent(),
+});
 
-const baseUrl = (await sandbox.getSignedPreviewUrl(3000, 4 * 60 * 60)).url;
+session.onEvent((event) => {
+  console.log(`[${event.sender}]`, JSON.stringify(event.payload));
+});
 
-console.log("Waiting for server...");
-await waitForHealth({ baseUrl });
+session.prompt([{ type: "text", text: "Say hello from Daytona in one sentence." }]);
 
-const client = await SandboxAgent.connect({ baseUrl });
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
-const sessionId = session.id;
-
-console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
-console.log("  Press Ctrl+C to stop.");
-
-const keepAlive = setInterval(() => {}, 60_000);
-const cleanup = async () => {
-	clearInterval(keepAlive);
-	await sandbox.delete(60);
-	process.exit(0);
-};
-process.once("SIGINT", cleanup);
-process.once("SIGTERM", cleanup);
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
+  process.exit(0);
+});
diff --git a/examples/daytona/tests/daytona.test.ts b/examples/daytona/tests/daytona.test.ts
index 9e88d7b..ddc81d4 100644
--- a/examples/daytona/tests/daytona.test.ts
+++ b/examples/daytona/tests/daytona.test.ts
@@ -23,6 +23,6 @@ describe("daytona example", () => {
         await cleanup();
       }
     },
-    timeoutMs
+    timeoutMs,
   );
 });
diff --git a/examples/daytona/tsconfig.json b/examples/daytona/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/daytona/tsconfig.json
+++ b/examples/daytona/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/docker-python/.gitignore b/examples/docker-python/.gitignore
new file mode 100644
index 0000000..00f2d38
--- /dev/null
+++ b/examples/docker-python/.gitignore
@@ -0,0 +1,3 @@
+__pycache__/
+*.pyc
+.venv/
diff --git a/examples/docker-python/client.py b/examples/docker-python/client.py
new file mode 100644
index 0000000..29e4609
--- /dev/null
+++ b/examples/docker-python/client.py
@@ -0,0 +1,145 @@
+"""Minimal JSON-RPC client for sandbox-agent's streamable HTTP transport."""
+
+import json
+import threading
+import time
+import uuid
+
+import httpx
+
+
+class SandboxConnection:
+    """Connects to a sandbox-agent server via JSON-RPC over streamable HTTP.
+
+    Endpoints used:
+        POST /v1/acp/{server_id}?agent=...  (bootstrap + requests)
+        GET  /v1/acp/{server_id}            (SSE event stream)
+        DELETE /v1/acp/{server_id}          (close)
+    """
+
+    def __init__(self, base_url: str, agent: str):
+        self.base_url = base_url.rstrip("/")
+        self.agent = agent
+        self.server_id = f"py-{uuid.uuid4().hex[:8]}"
+        self.url = f"{self.base_url}/v1/acp/{self.server_id}"
+        self._next_id = 0
+        self._events: list[dict] = []
+        self._stop = threading.Event()
+        self._sse_thread: threading.Thread | None = None
+
+    def _alloc_id(self) -> int:
+        self._next_id += 1
+        return self._next_id
+
+    def _post(self, method: str, params: dict | None = None, *, bootstrap: bool = False) -> dict:
+        payload: dict = {
+            "jsonrpc": "2.0",
+            "id": self._alloc_id(),
+            "method": method,
+        }
+        if params is not None:
+            payload["params"] = params
+
+        url = f"{self.url}?agent={self.agent}" if bootstrap else self.url
+        r = httpx.post(url, json=payload, timeout=120)
+        r.raise_for_status()
+        body = r.text.strip()
+        return json.loads(body) if body else {}
+
+    # -- Lifecycle -----------------------------------------------------------
+
+    def initialize(self) -> dict:
+        result = self._post(
+            "initialize",
+            {
+                "protocolVersion": 1,
+                "clientInfo": {"name": "python-example", "version": "0.1.0"},
+            },
+            bootstrap=True,
+        )
+        self._start_sse()
+
+        # Auto-authenticate if the agent advertises env-var-based auth methods.
+        auth_methods = result.get("result", {}).get("authMethods", [])
+        env_ids = ("anthropic-api-key", "codex-api-key", "openai-api-key")
+        for method in auth_methods:
+            if method.get("id") not in env_ids:
+                continue
+            try:
+                resp = self._post("authenticate", {"methodId": method["id"]})
+                if "error" not in resp:
+                    break
+            except Exception:
+                continue
+
+        return result
+
+    def new_session(self, cwd: str = "/root") -> str:
+        result = self._post("session/new", {"cwd": cwd, "mcpServers": []})
+        if "error" in result:
+            raise RuntimeError(f"session/new failed: {result['error'].get('message', result['error'])}")
+        return result["result"]["sessionId"]
+
+    def prompt(self, session_id: str, text: str) -> dict:
+        result = self._post(
+            "session/prompt",
+            {
+                "sessionId": session_id,
+                "prompt": [{"type": "text", "text": text}],
+            },
+        )
+        return result
+
+    def close(self) -> None:
+        self._stop.set()
+        try:
+            httpx.delete(self.url, timeout=2)
+        except Exception:
+            pass
+
+    # -- SSE event stream (background thread) --------------------------------
+
+    @property
+    def events(self) -> list[dict]:
+        return list(self._events)
+
+    def _start_sse(self) -> None:
+        self._sse_thread = threading.Thread(target=self._sse_loop, daemon=True)
+        self._sse_thread.start()
+
+    def _sse_loop(self) -> None:
+        while not self._stop.is_set():
+            try:
+                with httpx.stream(
+                    "GET",
+                    self.url,
+                    headers={"Accept": "text/event-stream"},
+                    timeout=httpx.Timeout(connect=5, read=None, write=5, pool=5),
+                ) as resp:
+                    buffer = ""
+                    for chunk in resp.iter_text():
+                        if self._stop.is_set():
+                            break
+                        buffer += chunk.replace("\r\n", "\n")
+                        while "\n\n" in buffer:
+                            event_chunk, buffer = buffer.split("\n\n", 1)
+                            self._process_sse_event(event_chunk)
+            except Exception:
+                if self._stop.is_set():
+                    return
+                time.sleep(0.15)
+
+    def _process_sse_event(self, chunk: str) -> None:
+        data_lines: list[str] = []
+        for line in chunk.split("\n"):
+            if line.startswith("data:"):
+                data_lines.append(line[5:].lstrip())
+        if not data_lines:
+            return
+        payload = "\n".join(data_lines).strip()
+        if not payload:
+            return
+        try:
+            self._events.append(json.loads(payload))
+        except json.JSONDecodeError:
+            pass
diff --git a/examples/docker-python/credentials.py b/examples/docker-python/credentials.py
new file mode 100644
index 0000000..5d5e489
--- /dev/null
+++ b/examples/docker-python/credentials.py
@@ -0,0 +1,32 @@
+"""Agent detection and credential helpers for sandbox-agent examples."""
+
+import os
+import sys
+
+
+def detect_agent() -> str:
+    """Pick an agent based on env vars. Exits if no credentials are found."""
+    if os.environ.get("SANDBOX_AGENT"):
+        return os.environ["SANDBOX_AGENT"]
+    has_claude = bool(
+        os.environ.get("ANTHROPIC_API_KEY")
+        or os.environ.get("CLAUDE_API_KEY")
+        or os.environ.get("CLAUDE_CODE_OAUTH_TOKEN")
+    )
+    has_codex = (os.environ.get("OPENAI_API_KEY") or "").startswith("sk-")
+    if has_codex:
+        return "codex"
+    if has_claude:
+        return "claude"
+    print("No API keys found. Set ANTHROPIC_API_KEY or OPENAI_API_KEY.")
+    sys.exit(1)
+
+
+def build_container_env() -> dict[str, str]:
+    """Collect credential env vars to forward into the Docker container."""
+    env: dict[str, str] = {}
+    for key in ("ANTHROPIC_API_KEY", "CLAUDE_API_KEY", "OPENAI_API_KEY", "CODEX_API_KEY"):
+        val = os.environ.get(key)
+        if val:
+            env[key] = val
+    return env
diff --git a/examples/docker-python/main.py b/examples/docker-python/main.py
new file mode 100644
index 0000000..b8f0f86
--- /dev/null
+++ b/examples/docker-python/main.py
@@ -0,0 +1,143 @@
+"""
+Sandbox Agent – Python + Docker example.
+
+Starts a Docker container running sandbox-agent, connects to the sandbox-agent server, creates a session, sends a prompt, and
+prints the streamed response.
+
+Usage:
+    pip install -r requirements.txt
+    python main.py
+"""
+
+import json
+import os
+import signal
+import subprocess
+import sys
+import time
+
+import docker
+import httpx
+
+from client import SandboxConnection
+from credentials import build_container_env, detect_agent
+
+PORT = 3000
+DOCKERFILE_DIR = os.path.join(os.path.dirname(__file__), "..", "shared")
+IMAGE_NAME = "sandbox-agent-examples:latest"
+
+
+def build_image(client: docker.DockerClient) -> str:
+    """Build the shared example Docker image if it doesn't exist."""
+    try:
+        client.images.get(IMAGE_NAME)
+        return IMAGE_NAME
+    except docker.errors.ImageNotFound:
+        pass
+
+    print(f"Building {IMAGE_NAME} (first run only)...")
+    subprocess.run(
+        ["docker", "build", "-t", IMAGE_NAME, DOCKERFILE_DIR],
+        check=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.PIPE,
+    )
+    return IMAGE_NAME
+
+
+def wait_for_health(base_url: str, timeout_s: float = 120) -> None:
+    deadline = time.monotonic() + timeout_s
+    last_err: str | None = None
+    while time.monotonic() < deadline:
+        try:
+            r = httpx.get(f"{base_url}/v1/health", timeout=5)
+            if r.status_code == 200 and r.json().get("status") == "ok":
+                return
+            last_err = f"health returned {r.status_code}"
+        except Exception as exc:
+            last_err = str(exc)
+        time.sleep(0.5)
+    raise RuntimeError(f"Timed out waiting for /v1/health: {last_err}")
+
+
+def main() -> None:
+    agent = detect_agent()
+    print(f"Agent: {agent}")
+
+    client = docker.from_env()
+    image = build_image(client)
+
+    env = build_container_env()
+
+    print("Starting container...")
+    container = client.containers.run(
+        image,
+        command=[
+            "sh", "-c",
+            f"sandbox-agent install-agent {agent} && "
+            f"sandbox-agent server --no-token --host 0.0.0.0 --port {PORT}",
+        ],
+        environment=env,
+        ports={f"{PORT}/tcp": PORT},
+        detach=True,
+        auto_remove=True,
+    )
+
+    def cleanup(*_args: object) -> None:
+        print("\nCleaning up...")
+        try:
+            container.stop(timeout=5)
+        except Exception:
+            pass
+
+    signal.signal(signal.SIGINT, cleanup)
+    signal.signal(signal.SIGTERM, cleanup)
+
+    try:
+        base_url = f"http://127.0.0.1:{PORT}"
+        print(f"Waiting for server at {base_url}...")
+        wait_for_health(base_url)
+        print("Server ready.")
+        print(f"Inspector: {base_url}/ui/")
+
+        # -- Session flow ----------------------------------------------------
+        conn = SandboxConnection(base_url, agent)
+
+        print("Connecting...")
+        init_result = conn.initialize()
+        agent_info = init_result.get("result", {}).get("agentInfo", {})
+        print(f"Connected to: {agent_info.get('title', agent)} {agent_info.get('version', '')}")
+
+        session_id = conn.new_session()
+        print(f"Session: {session_id}")
+
+        prompt_text = "Say hello and tell me what you are. Be brief (one sentence)."
+        print(f"\n> {prompt_text}")
+        response = conn.prompt(session_id, prompt_text)
+
+        if "error" in response:
+            err = response["error"]
+            print(f"Error: {err.get('message', err)}")
+        else:
+            print(f"Stop reason: {response.get('result', {}).get('stopReason', 'unknown')}")
+
+        # Give SSE events a moment to arrive.
+        time.sleep(1)
+
+        if conn.events:
+            for ev in conn.events:
+                if ev.get("method") == "session/update":
+                    content = ev.get("params", {}).get("update", {}).get("content", {})
+                    if content.get("text"):
+                        print(content["text"], end="")
+            print()
+
+        conn.close()
+        print("\nDone.")
+
+    finally:
+        cleanup()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/examples/docker-python/requirements.txt b/examples/docker-python/requirements.txt
new file mode 100644
index 0000000..f7fd028
--- /dev/null
+++ b/examples/docker-python/requirements.txt
@@ -0,0 +1,2 @@
+docker>=7.0.0
+httpx>=0.27.0
diff --git a/examples/docker/package.json b/examples/docker/package.json
index 2c29cfe..7b796c9 100644
--- a/examples/docker/package.json
+++ b/examples/docker/package.json
@@ -9,10 +9,10 @@
   "dependencies": {
     "@sandbox-agent/example-shared": "workspace:*",
     "dockerode": "latest",
+    "get-port": "latest",
     "sandbox-agent": "workspace:*"
   },
   "devDependencies": {
-    "@types/dockerode": "latest",
     "@types/node": "latest",
     "tsx": "latest",
     "typescript": "latest",
diff --git a/examples/docker/src/index.ts b/examples/docker/src/index.ts
index e31d8ed..9f50859 100644
--- a/examples/docker/src/index.ts
+++ b/examples/docker/src/index.ts
@@ -1,63 +1,40 @@
-import Docker from "dockerode";
+import fs from "node:fs";
+import path from "node:path";
 import { SandboxAgent } from "sandbox-agent";
-import { detectAgent, buildInspectorUrl, waitForHealth } from "@sandbox-agent/example-shared";
+import { docker } from "sandbox-agent/docker";
+import { detectAgent } from "@sandbox-agent/example-shared";
+import { FULL_IMAGE } from "@sandbox-agent/example-shared/docker";
 
-const IMAGE = "alpine:latest";
-const PORT = 3000;
+const codexAuthPath = process.env.HOME ? path.join(process.env.HOME, ".codex", "auth.json") : null;
+const bindMounts = codexAuthPath && fs.existsSync(codexAuthPath) ? [`${codexAuthPath}:/home/sandbox/.codex/auth.json:ro`] : [];
+const env = [
+  process.env.ANTHROPIC_API_KEY ? `ANTHROPIC_API_KEY=${process.env.ANTHROPIC_API_KEY}` : "",
+  process.env.OPENAI_API_KEY ? `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}` : "",
+  process.env.CODEX_API_KEY ? `CODEX_API_KEY=${process.env.CODEX_API_KEY}` : "",
+].filter(Boolean);
 
-const docker = new Docker({ socketPath: "/var/run/docker.sock" });
-
-// Pull image if needed
-try {
-  await docker.getImage(IMAGE).inspect();
-} catch {
-  console.log(`Pulling ${IMAGE}...`);
-  await new Promise<void>((resolve, reject) => {
-    docker.pull(IMAGE, (err: Error | null, stream: NodeJS.ReadableStream) => {
-      if (err) return reject(err);
-      docker.modem.followProgress(stream, (err: Error | null) => err ? reject(err) : resolve());
-    });
-  });
-}
-
-console.log("Starting container...");
-const container = await docker.createContainer({
-  Image: IMAGE,
-  Cmd: ["sh", "-c", [
-    "apk add --no-cache curl ca-certificates libstdc++ libgcc bash",
-    "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh",
-    "sandbox-agent install-agent claude",
-    "sandbox-agent install-agent codex",
-    `sandbox-agent server --no-token --host 0.0.0.0 --port ${PORT}`,
-  ].join(" && ")],
-  Env: [
-    process.env.ANTHROPIC_API_KEY ? `ANTHROPIC_API_KEY=${process.env.ANTHROPIC_API_KEY}` : "",
-    process.env.OPENAI_API_KEY ? `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}` : "",
-  ].filter(Boolean),
-  ExposedPorts: { [`${PORT}/tcp`]: {} },
-  HostConfig: {
-    AutoRemove: true,
-    PortBindings: { [`${PORT}/tcp`]: [{ HostPort: `${PORT}` }] },
-  },
+const client = await SandboxAgent.start({
+  sandbox: docker({
+    image: FULL_IMAGE,
+    env,
+    binds: bindMounts,
+  }),
 });
-await container.start();
 
-const baseUrl = `http://127.0.0.1:${PORT}`;
-await waitForHealth({ baseUrl });
+console.log(`UI: ${client.inspectorUrl}`);
 
-const client = await SandboxAgent.connect({ baseUrl });
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
-const sessionId = session.id;
+const session = await client.createSession({
+  agent: detectAgent(),
+  cwd: "/home/sandbox",
+});
 
-console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
-console.log("  Press Ctrl+C to stop.");
+session.onEvent((event) => {
+  console.log(`[${event.sender}]`, JSON.stringify(event.payload));
+});
 
-const keepAlive = setInterval(() => {}, 60_000);
-const cleanup = async () => {
-  clearInterval(keepAlive);
-  try { await container.stop({ t: 5 }); } catch {}
-  try { await container.remove({ force: true }); } catch {}
+session.prompt([{ type: "text", text: "Say hello from Docker in one sentence." }]);
+
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
   process.exit(0);
-};
-process.once("SIGINT", cleanup);
-process.once("SIGTERM", cleanup);
+});
diff --git a/examples/docker/tests/docker.test.ts b/examples/docker/tests/docker.test.ts
index 0b51407..683f033 100644
--- a/examples/docker/tests/docker.test.ts
+++ b/examples/docker/tests/docker.test.ts
@@ -1,8 +1,15 @@
 import { describe, it, expect } from "vitest";
-import { buildHeaders } from "@sandbox-agent/example-shared";
-import { setupDockerSandboxAgent } from "../src/docker.ts";
+import { startDockerSandbox } from "@sandbox-agent/example-shared/docker";
 
-const shouldRun = process.env.RUN_DOCKER_EXAMPLES === "1";
+/**
+ * Docker integration test.
+ *
+ * Set SANDBOX_AGENT_DOCKER_IMAGE to the image tag to test (e.g. a locally-built
+ * full image). The test starts a container from that image, waits for
+ * sandbox-agent to become healthy, and validates the /v1/health endpoint.
+ */
+const image = process.env.SANDBOX_AGENT_DOCKER_IMAGE;
+const shouldRun = Boolean(image);
 const timeoutMs = Number.parseInt(process.env.SANDBOX_TEST_TIMEOUT_MS || "", 10) || 300_000;
 
 const testFn = shouldRun ? it : it.skip;
@@ -11,11 +18,29 @@ describe("docker example", () => {
   testFn(
     "starts sandbox-agent and responds to /v1/health",
     async () => {
-      const { baseUrl, token, cleanup } = await setupDockerSandboxAgent();
+      const { baseUrl, cleanup } = await startDockerSandbox({
+        port: 2468,
+        image: image!,
+      });
       try {
-        const response = await fetch(`${baseUrl}/v1/health`, {
-          headers: buildHeaders({ token }),
-        });
+        // Wait for health check
+        let healthy = false;
+        for (let i = 0; i < 60; i++) {
+          try {
+            const res = await fetch(`${baseUrl}/v1/health`);
+            if (res.ok) {
+              const data = await res.json();
+              if (data.status === "ok") {
+                healthy = true;
+                break;
+              }
+            }
+          } catch {}
+          await new Promise((r) => setTimeout(r, 1000));
+        }
+        expect(healthy).toBe(true);
+
+        const response = await fetch(`${baseUrl}/v1/health`);
         expect(response.ok).toBe(true);
         const data = await response.json();
         expect(data.status).toBe("ok");
@@ -23,6 +48,6 @@ describe("docker example", () => {
         await cleanup();
       }
     },
-    timeoutMs
+    timeoutMs,
   );
 });
diff --git a/examples/docker/tsconfig.json b/examples/docker/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/docker/tsconfig.json
+++ b/examples/docker/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/e2b/src/e2b.ts b/examples/e2b/src/e2b.ts
new file mode 100644
index 0000000..17762a2
--- /dev/null
+++ b/examples/e2b/src/e2b.ts
@@ -0,0 +1,34 @@
+import { SandboxAgent } from "sandbox-agent";
+import { e2b } from "sandbox-agent/e2b";
+
+function collectEnvVars(): Record<string, string> {
+  const envs: Record<string, string> = {};
+  if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+  if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+  return envs;
+}
+
+function inspectorUrlToBaseUrl(inspectorUrl: string): string {
+  return inspectorUrl.replace(/\/ui\/$/, "");
+}
+
+export async function setupE2BSandboxAgent(): Promise<{
+  baseUrl: string;
+  token?: string;
+  cleanup: () => Promise<void>;
+}> {
+  const template = process.env.E2B_TEMPLATE;
+  const client = await SandboxAgent.start({
+    sandbox: e2b({
+      template,
+      create: { envs: collectEnvVars() },
+    }),
+  });
+
+  return {
+    baseUrl: inspectorUrlToBaseUrl(client.inspectorUrl),
+    cleanup: async () => {
+      await client.killSandbox();
+    },
+  };
+}
diff --git a/examples/e2b/src/index.ts b/examples/e2b/src/index.ts
index 98d6034..67b74dc 100644
--- a/examples/e2b/src/index.ts
+++ b/examples/e2b/src/index.ts
@@ -1,47 +1,28 @@
-import { Sandbox } from "@e2b/code-interpreter";
 import { SandboxAgent } from "sandbox-agent";
-import { detectAgent, buildInspectorUrl, waitForHealth } from "@sandbox-agent/example-shared";
+import { e2b } from "sandbox-agent/e2b";
+import { detectAgent } from "@sandbox-agent/example-shared";
 
 const envs: Record<string, string> = {};
 if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
 if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+const template = process.env.E2B_TEMPLATE;
 
-console.log("Creating E2B sandbox...");
-const sandbox = await Sandbox.create({ allowInternetAccess: true, envs });
+const client = await SandboxAgent.start({
+  // ✨ NEW ✨
+  sandbox: e2b({ template, create: { envs } }),
+});
 
-const run = async (cmd: string) => {
-  const result = await sandbox.commands.run(cmd);
-  if (result.exitCode !== 0) throw new Error(`Command failed: ${cmd}\n${result.stderr}`);
-  return result;
-};
+const session = await client.createSession({
+  agent: detectAgent(),
+});
 
-console.log("Installing sandbox-agent...");
-await run("curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh");
+session.onEvent((event) => {
+  console.log(`[${event.sender}]`, JSON.stringify(event.payload));
+});
 
-console.log("Installing agents...");
-await run("sandbox-agent install-agent claude");
-await run("sandbox-agent install-agent codex");
+session.prompt([{ type: "text", text: "Say hello from E2B in one sentence." }]);
 
-console.log("Starting server...");
-await sandbox.commands.run("sandbox-agent server --no-token --host 0.0.0.0 --port 3000", { background: true });
-
-const baseUrl = `https://${sandbox.getHost(3000)}`;
-
-console.log("Waiting for server...");
-await waitForHealth({ baseUrl });
-
-const client = await SandboxAgent.connect({ baseUrl });
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
-const sessionId = session.id;
-
-console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
-console.log("  Press Ctrl+C to stop.");
-
-const keepAlive = setInterval(() => {}, 60_000);
-const cleanup = async () => {
-  clearInterval(keepAlive);
-  await sandbox.kill();
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
   process.exit(0);
-};
-process.once("SIGINT", cleanup);
-process.once("SIGTERM", cleanup);
+});
diff --git a/examples/e2b/tests/e2b.test.ts b/examples/e2b/tests/e2b.test.ts
index b3fdbfc..843e578 100644
--- a/examples/e2b/tests/e2b.test.ts
+++ b/examples/e2b/tests/e2b.test.ts
@@ -23,6 +23,6 @@ describe("e2b example", () => {
         await cleanup();
       }
     },
-    timeoutMs
+    timeoutMs,
   );
 });
diff --git a/examples/e2b/tsconfig.json b/examples/e2b/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/e2b/tsconfig.json
+++ b/examples/e2b/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/file-system/src/index.ts b/examples/file-system/src/index.ts
index 4595fb8..71d65c0 100644
--- a/examples/file-system/src/index.ts
+++ b/examples/file-system/src/index.ts
@@ -24,10 +24,7 @@ console.log("Uploading files via batch tar...");
 const client = await SandboxAgent.connect({ baseUrl });
 
 const tarPath = path.join(tmpDir, "upload.tar");
-await tar.create(
-  { file: tarPath, cwd: tmpDir },
-  ["my-project"],
-);
+await tar.create({ file: tarPath, cwd: tmpDir }, ["my-project"]);
 const tarBuffer = await fs.promises.readFile(tarPath);
 const uploadResult = await client.uploadFsBatch(tarBuffer, { path: "/opt" });
 console.log(`  Uploaded ${uploadResult.paths.length} files: ${uploadResult.paths.join(", ")}`);
@@ -47,11 +44,14 @@ const readmeText = new TextDecoder().decode(readmeBytes);
 console.log(`  README.md content: ${readmeText.trim()}`);
 
 console.log("Creating session...");
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/opt/my-project", mcpServers: [] } });
+const session = await client.createSession({ agent: detectAgent(), cwd: "/opt/my-project" });
 const sessionId = session.id;
 console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
 console.log('  Try: "read the README in /opt/my-project"');
 console.log("  Press Ctrl+C to stop.");
 
 const keepAlive = setInterval(() => {}, 60_000);
-process.on("SIGINT", () => { clearInterval(keepAlive); cleanup().then(() => process.exit(0)); });
+process.on("SIGINT", () => {
+  clearInterval(keepAlive);
+  cleanup().then(() => process.exit(0));
+});
diff --git a/examples/file-system/tsconfig.json b/examples/file-system/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/file-system/tsconfig.json
+++ b/examples/file-system/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/mcp-custom-tool/src/index.ts b/examples/mcp-custom-tool/src/index.ts
index fc06b78..a609777 100644
--- a/examples/mcp-custom-tool/src/index.ts
+++ b/examples/mcp-custom-tool/src/index.ts
@@ -23,10 +23,7 @@ console.log("Uploading MCP server bundle...");
 const client = await SandboxAgent.connect({ baseUrl });
 
 const bundle = await fs.promises.readFile(serverFile);
-const written = await client.writeFsFile(
-  { path: "/opt/mcp/custom-tools/mcp-server.cjs" },
-  bundle,
-);
+const written = await client.writeFsFile({ path: "/opt/mcp/custom-tools/mcp-server.cjs" }, bundle);
 console.log(`  Written: ${written.path} (${written.bytesWritten} bytes)`);
 
 // Create a session with the uploaded MCP server as a local command.
@@ -35,12 +32,14 @@ const session = await client.createSession({
   agent: detectAgent(),
   sessionInit: {
     cwd: "/root",
-    mcpServers: [{
-      name: "customTools",
-      command: "node",
-      args: ["/opt/mcp/custom-tools/mcp-server.cjs"],
-      env: [],
-    }],
+    mcpServers: [
+      {
+        name: "customTools",
+        command: "node",
+        args: ["/opt/mcp/custom-tools/mcp-server.cjs"],
+        env: [],
+      },
+    ],
   },
 });
 const sessionId = session.id;
@@ -49,4 +48,7 @@ console.log('  Try: "generate a random number between 1 and 100"');
 console.log("  Press Ctrl+C to stop.");
 
 const keepAlive = setInterval(() => {}, 60_000);
-process.on("SIGINT", () => { clearInterval(keepAlive); cleanup().then(() => process.exit(0)); });
+process.on("SIGINT", () => {
+  clearInterval(keepAlive);
+  cleanup().then(() => process.exit(0));
+});
diff --git a/examples/mcp-custom-tool/tsconfig.json b/examples/mcp-custom-tool/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/mcp-custom-tool/tsconfig.json
+++ b/examples/mcp-custom-tool/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/mcp/src/index.ts b/examples/mcp/src/index.ts
index 5187643..dfaf43f 100644
--- a/examples/mcp/src/index.ts
+++ b/examples/mcp/src/index.ts
@@ -5,9 +5,7 @@ import { startDockerSandbox } from "@sandbox-agent/example-shared/docker";
 console.log("Starting sandbox...");
 const { baseUrl, cleanup } = await startDockerSandbox({
   port: 3002,
-  setupCommands: [
-    "npm install -g --silent @modelcontextprotocol/server-everything@2026.1.26",
-  ],
+  setupCommands: ["npm install -g --silent @modelcontextprotocol/server-everything@2026.1.26"],
 });
 
 console.log("Creating session with everything MCP server...");
@@ -16,12 +14,14 @@ const session = await client.createSession({
   agent: detectAgent(),
   sessionInit: {
     cwd: "/root",
-    mcpServers: [{
-      name: "everything",
-      command: "mcp-server-everything",
-      args: [],
-      env: [],
-    }],
+    mcpServers: [
+      {
+        name: "everything",
+        command: "mcp-server-everything",
+        args: [],
+        env: [],
+      },
+    ],
   },
 });
 const sessionId = session.id;
@@ -30,4 +30,7 @@ console.log('  Try: "generate a random number between 1 and 100"');
 console.log("  Press Ctrl+C to stop.");
 
 const keepAlive = setInterval(() => {}, 60_000);
-process.on("SIGINT", () => { clearInterval(keepAlive); cleanup().then(() => process.exit(0)); });
+process.on("SIGINT", () => {
+  clearInterval(keepAlive);
+  cleanup().then(() => process.exit(0));
+});
diff --git a/examples/mcp/tsconfig.json b/examples/mcp/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/mcp/tsconfig.json
+++ b/examples/mcp/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/modal/package.json b/examples/modal/package.json
new file mode 100644
index 0000000..d3e51ec
--- /dev/null
+++ b/examples/modal/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@sandbox-agent/example-modal",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "modal": "latest",
+    "@sandbox-agent/example-shared": "workspace:*",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "tsx": "latest",
+    "typescript": "latest",
+    "vitest": "^3.0.0"
+  }
+}
diff --git a/examples/modal/src/index.ts b/examples/modal/src/index.ts
new file mode 100644
index 0000000..35eef8d
--- /dev/null
+++ b/examples/modal/src/index.ts
@@ -0,0 +1,30 @@
+import { SandboxAgent } from "sandbox-agent";
+import { modal } from "sandbox-agent/modal";
+import { detectAgent } from "@sandbox-agent/example-shared";
+
+const secrets: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) secrets.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) secrets.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+const client = await SandboxAgent.start({
+  sandbox: modal({
+    create: { secrets },
+  }),
+});
+
+console.log(`UI: ${client.inspectorUrl}`);
+
+const session = await client.createSession({
+  agent: detectAgent(),
+});
+
+session.onEvent((event) => {
+  console.log(`[${event.sender}]`, JSON.stringify(event.payload));
+});
+
+session.prompt([{ type: "text", text: "Say hello from Modal in one sentence." }]);
+
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
+  process.exit(0);
+});
diff --git a/examples/modal/tests/modal.test.ts b/examples/modal/tests/modal.test.ts
new file mode 100644
index 0000000..010256a
--- /dev/null
+++ b/examples/modal/tests/modal.test.ts
@@ -0,0 +1,31 @@
+import { describe, it, expect } from "vitest";
+import { SandboxAgent } from "sandbox-agent";
+import { modal } from "sandbox-agent/modal";
+
+const shouldRun = Boolean(process.env.MODAL_TOKEN_ID && process.env.MODAL_TOKEN_SECRET);
+const timeoutMs = Number.parseInt(process.env.SANDBOX_TEST_TIMEOUT_MS || "", 10) || 300_000;
+
+const testFn = shouldRun ? it : it.skip;
+
+describe("modal provider", () => {
+  testFn(
+    "starts sandbox-agent and responds to /v1/health",
+    async () => {
+      const secrets: Record<string, string> = {};
+      if (process.env.ANTHROPIC_API_KEY) secrets.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+      if (process.env.OPENAI_API_KEY) secrets.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+      const sdk = await SandboxAgent.start({
+        sandbox: modal({ create: { secrets } }),
+      });
+
+      try {
+        const health = await sdk.getHealth();
+        expect(health.status).toBe("ok");
+      } finally {
+        await sdk.destroySandbox();
+      }
+    },
+    timeoutMs,
+  );
+});
diff --git a/examples/modal/tsconfig.json b/examples/modal/tsconfig.json
new file mode 100644
index 0000000..ad591c3
--- /dev/null
+++ b/examples/modal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "**/*.test.ts"]
+}
diff --git a/examples/permissions/package.json b/examples/permissions/package.json
new file mode 100644
index 0000000..5b82ef9
--- /dev/null
+++ b/examples/permissions/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@sandbox-agent/example-permissions",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "commander": "^12.1.0",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
+  }
+}
diff --git a/examples/permissions/src/index.ts b/examples/permissions/src/index.ts
new file mode 100644
index 0000000..e684e34
--- /dev/null
+++ b/examples/permissions/src/index.ts
@@ -0,0 +1,173 @@
+import { createInterface } from "node:readline/promises";
+import { stdin as input, stdout as output } from "node:process";
+import { Command } from "commander";
+import { SandboxAgent, type PermissionReply, type SessionPermissionRequest } from "sandbox-agent";
+import { local } from "sandbox-agent/local";
+
+const options = parseOptions();
+const agent = options.agent.trim().toLowerCase();
+const autoReply = parsePermissionReply(options.reply);
+const promptText = options.prompt?.trim() || `Create ./permission-example.txt with the text 'hello from the ${agent} permissions example'.`;
+
+const sdk = await SandboxAgent.start({
+  sandbox: local({ log: "inherit" }),
+});
+
+try {
+  await sdk.installAgent(agent);
+
+  const agents = await sdk.listAgents({ config: true });
+  const selectedAgent = agents.agents.find((entry) => entry.id === agent);
+  const configOptions = Array.isArray(selectedAgent?.configOptions)
+    ? (selectedAgent.configOptions as Array<{ category?: string; currentValue?: string; options?: unknown[] }>)
+    : [];
+  const modeOption = configOptions.find((option) => option.category === "mode");
+  const availableModes = extractOptionValues(modeOption);
+  const mode = options.mode?.trim() || (typeof modeOption?.currentValue === "string" ? modeOption.currentValue : "") || availableModes[0] || "";
+
+  console.log(`Agent: ${agent}`);
+  console.log(`Mode: ${mode || "(default)"}`);
+  if (availableModes.length > 0) {
+    console.log(`Available modes: ${availableModes.join(", ")}`);
+  }
+  console.log(`Working directory: ${process.cwd()}`);
+  console.log(`Prompt: ${promptText}`);
+  if (autoReply) {
+    console.log(`Automatic permission reply: ${autoReply}`);
+  } else {
+    console.log("Interactive permission replies enabled.");
+  }
+
+  const session = await sdk.createSession({
+    agent,
+    ...(mode ? { mode } : {}),
+    cwd: process.cwd(),
+  });
+
+  const rl = autoReply
+    ? null
+    : createInterface({
+        input,
+        output,
+      });
+
+  session.onPermissionRequest((request: SessionPermissionRequest) => {
+    void handlePermissionRequest(session, request, autoReply, rl);
+  });
+
+  const response = await session.prompt([{ type: "text", text: promptText }]);
+  console.log(`Prompt finished with stopReason=${response.stopReason}`);
+
+  await rl?.close();
+} finally {
+  await sdk.dispose();
+}
+
+async function handlePermissionRequest(
+  session: {
+    respondPermission(permissionId: string, reply: PermissionReply): Promise<void>;
+  },
+  request: SessionPermissionRequest,
+  auto: PermissionReply | null,
+  rl: ReturnType<typeof createInterface> | null,
+): Promise<void> {
+  const reply = auto ?? (await promptForReply(request, rl));
+  console.log(`Permission ${reply}: ${request.toolCall.title ?? request.toolCall.toolCallId}`);
+  await session.respondPermission(request.id, reply);
+}
+
+async function promptForReply(request: SessionPermissionRequest, rl: ReturnType<typeof createInterface> | null): Promise<PermissionReply> {
+  if (!rl) {
+    return "reject";
+  }
+
+  const title = request.toolCall.title ?? request.toolCall.toolCallId;
+  const available = request.availableReplies;
+  console.log("");
+  console.log(`Permission request: ${title}`);
+  console.log(`Available replies: ${available.join(", ")}`);
+  const answer = (await rl.question("Reply [once|always|reject]: ")).trim().toLowerCase();
+  const parsed = parsePermissionReply(answer);
+  if (parsed && available.includes(parsed)) {
+    return parsed;
+  }
+
+  console.log("Invalid reply, defaulting to reject.");
+  return "reject";
+}
+
+function extractOptionValues(option: { options?: unknown[] } | undefined): string[] {
+  if (!option?.options) {
+    return [];
+  }
+
+  const values: string[] = [];
+  for (const entry of option.options) {
+    if (!entry || typeof entry !== "object") {
+      continue;
+    }
+    const value = "value" in entry && typeof entry.value === "string" ? entry.value : null;
+    if (value) {
+      values.push(value);
+      continue;
+    }
+    if (!("options" in entry) || !Array.isArray(entry.options)) {
+      continue;
+    }
+    for (const nested of entry.options) {
+      if (!nested || typeof nested !== "object") {
+        continue;
+      }
+      const nestedValue = "value" in nested && typeof nested.value === "string" ? nested.value : null;
+      if (nestedValue) {
+        values.push(nestedValue);
+      }
+    }
+  }
+
+  return [...new Set(values)];
+}
+
+function parsePermissionReply(value: string | undefined): PermissionReply | null {
+  if (!value) {
+    return null;
+  }
+
+  switch (value.trim().toLowerCase()) {
+    case "once":
+      return "once";
+    case "always":
+      return "always";
+    case "reject":
+    case "deny":
+      return "reject";
+    default:
+      return null;
+  }
+}
+
+function parseOptions(): {
+  agent: string;
+  mode?: string;
+  prompt?: string;
+  reply?: string;
+} {
+  const argv = process.argv.slice(2);
+  const normalizedArgv = argv[0] === "--" ? argv.slice(1) : argv;
+  const program = new Command();
+  program
+    .name("permissions")
+    .description("Run a permissions example against an agent session.")
+    .requiredOption("--agent <agent>", "Agent to run, for example 'claude' or 'codex'")
+    .option("--mode <mode>", "Mode to configure for the session (uses agent default if omitted)")
+    .option("--prompt <text>", "Prompt to send after the session starts")
+    .option("--reply <reply>", "Automatically answer permission prompts with once, always, or reject");
+
+  program.parse(normalizedArgv, { from: "user" });
+  return program.opts<{
+    agent: string;
+    mode?: string;
+    prompt?: string;
+    reply?: string;
+  }>();
+}
diff --git a/examples/permissions/tsconfig.json b/examples/permissions/tsconfig.json
new file mode 100644
index 0000000..4eec283
--- /dev/null
+++ b/examples/permissions/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "types": ["node"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*"]
+}
diff --git a/examples/persist-memory/package.json b/examples/persist-memory/package.json
new file mode 100644
index 0000000..0514ad9
--- /dev/null
+++ b/examples/persist-memory/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@sandbox-agent/example-persist-memory",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@sandbox-agent/example-shared": "workspace:*",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
+  }
+}
diff --git a/examples/persist-memory/src/index.ts b/examples/persist-memory/src/index.ts
new file mode 100644
index 0000000..2065a50
--- /dev/null
+++ b/examples/persist-memory/src/index.ts
@@ -0,0 +1,33 @@
+import { SandboxAgent, InMemorySessionPersistDriver } from "sandbox-agent";
+import { startDockerSandbox } from "@sandbox-agent/example-shared/docker";
+import { detectAgent } from "@sandbox-agent/example-shared";
+
+const persist = new InMemorySessionPersistDriver();
+
+console.log("Starting sandbox...");
+const sandbox = await startDockerSandbox({
+  port: 3000,
+});
+
+const sdk = await SandboxAgent.connect({ baseUrl: sandbox.baseUrl, persist });
+
+const session = await sdk.createSession({ agent: detectAgent() });
+console.log(`Created session ${session.id}`);
+
+await session.prompt([{ type: "text", text: "Say hello in one sentence." }]);
+console.log("Prompt complete.");
+
+const sessions = await sdk.listSessions();
+console.log(`\nSessions (${sessions.items.length}):`);
+for (const s of sessions.items) {
+  console.log(`  ${s.id}  agent=${s.agent}`);
+}
+
+const events = await sdk.getEvents({ sessionId: session.id });
+console.log(`\nSession history (${events.items.length} events):`);
+for (const e of events.items) {
+  console.log(`  [${e.eventIndex}] ${e.sender}: ${JSON.stringify(e.payload).slice(0, 120)}`);
+}
+
+await sdk.dispose();
+await sandbox.cleanup();
diff --git a/examples/persist-memory/tsconfig.json b/examples/persist-memory/tsconfig.json
new file mode 100644
index 0000000..ec2723c
--- /dev/null
+++ b/examples/persist-memory/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "types": ["node"]
+  },
+  "include": ["src"]
+}
diff --git a/examples/persist-postgres/package.json b/examples/persist-postgres/package.json
new file mode 100644
index 0000000..8445516
--- /dev/null
+++ b/examples/persist-postgres/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@sandbox-agent/example-persist-postgres",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@sandbox-agent/example-shared": "workspace:*",
+    "pg": "latest",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "@types/pg": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
+  }
+}
diff --git a/examples/persist-postgres/src/index.ts b/examples/persist-postgres/src/index.ts
new file mode 100644
index 0000000..43eecbd
--- /dev/null
+++ b/examples/persist-postgres/src/index.ts
@@ -0,0 +1,100 @@
+import { execFileSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { Client } from "pg";
+import { setTimeout as delay } from "node:timers/promises";
+import { SandboxAgent } from "sandbox-agent";
+import { PostgresSessionPersistDriver } from "./persist.ts";
+import { startDockerSandbox } from "@sandbox-agent/example-shared/docker";
+import { detectAgent } from "@sandbox-agent/example-shared";
+
+// --- Postgres setup (Docker or DATABASE_URL) ---
+
+let containerId: string | undefined;
+let connectionString: string;
+
+if (process.env.DATABASE_URL) {
+  connectionString = process.env.DATABASE_URL;
+} else {
+  const name = `persist-example-${randomUUID().slice(0, 8)}`;
+  containerId = execFileSync(
+    "docker",
+    [
+      "run",
+      "-d",
+      "--rm",
+      "--name",
+      name,
+      "-e",
+      "POSTGRES_USER=postgres",
+      "-e",
+      "POSTGRES_PASSWORD=postgres",
+      "-e",
+      "POSTGRES_DB=sandbox",
+      "-p",
+      "127.0.0.1::5432",
+      "postgres:16-alpine",
+    ],
+    { encoding: "utf8" },
+  ).trim();
+  const port = execFileSync("docker", ["port", containerId, "5432/tcp"], { encoding: "utf8" })
+    .trim()
+    .split("\n")[0]
+    ?.match(/:(\d+)$/)?.[1];
+  connectionString = `postgres://postgres:postgres@127.0.0.1:${port}/sandbox`;
+  console.log(`Postgres on port ${port}`);
+
+  const deadline = Date.now() + 30_000;
+  while (Date.now() < deadline) {
+    const c = new Client({ connectionString });
+    try {
+      await c.connect();
+      await c.query("SELECT 1");
+      await c.end();
+      break;
+    } catch {
+      try {
+        await c.end();
+      } catch {}
+      await delay(250);
+    }
+  }
+}
+
+try {
+  const persist = new PostgresSessionPersistDriver({ connectionString });
+
+  console.log("Starting sandbox...");
+  const sandbox = await startDockerSandbox({
+    port: 3000,
+  });
+
+  const sdk = await SandboxAgent.connect({ baseUrl: sandbox.baseUrl, persist });
+
+  const session = await sdk.createSession({ agent: detectAgent() });
+  console.log(`Created session ${session.id}`);
+
+  await session.prompt([{ type: "text", text: "Say hello in one sentence." }]);
+  console.log("Prompt complete.");
+
+  const sessions = await sdk.listSessions();
+  console.log(`\nSessions (${sessions.items.length}):`);
+  for (const s of sessions.items) {
+    console.log(`  ${s.id}  agent=${s.agent}`);
+  }
+
+  const events = await sdk.getEvents({ sessionId: session.id });
+  console.log(`\nSession history (${events.items.length} events):`);
+  for (const e of events.items) {
+    console.log(`  [${e.eventIndex}] ${e.sender}: ${JSON.stringify(e.payload).slice(0, 120)}`);
+  }
+
+  await persist.close();
+  await sdk.dispose();
+  await sandbox.cleanup();
+} finally {
+  if (containerId) {
+    try {
+      execFileSync("docker", ["rm", "-f", containerId], { stdio: "ignore" });
+    } catch {}
+  }
+}
diff --git a/examples/persist-postgres/src/persist.ts b/examples/persist-postgres/src/persist.ts
new file mode 100644
index 0000000..2a6ccff
--- /dev/null
+++ b/examples/persist-postgres/src/persist.ts
@@ -0,0 +1,336 @@
+import { Pool, type PoolConfig } from "pg";
+import type { ListEventsRequest, ListPage, ListPageRequest, SessionEvent, SessionPersistDriver, SessionRecord } from "sandbox-agent";
+
+const DEFAULT_LIST_LIMIT = 100;
+
+export interface PostgresSessionPersistDriverOptions {
+  connectionString?: string;
+  pool?: Pool;
+  poolConfig?: PoolConfig;
+  schema?: string;
+}
+
+export class PostgresSessionPersistDriver implements SessionPersistDriver {
+  private readonly pool: Pool;
+  private readonly ownsPool: boolean;
+  private readonly schema: string;
+  private readonly initialized: Promise<void>;
+
+  constructor(options: PostgresSessionPersistDriverOptions = {}) {
+    this.schema = normalizeSchema(options.schema ?? "public");
+
+    if (options.pool) {
+      this.pool = options.pool;
+      this.ownsPool = false;
+    } else {
+      this.pool = new Pool({
+        connectionString: options.connectionString,
+        ...options.poolConfig,
+      });
+      this.ownsPool = true;
+    }
+
+    this.initialized = this.initialize();
+  }
+
+  async getSession(id: string): Promise<SessionRecord | undefined> {
+    await this.ready();
+
+    const result = await this.pool.query<SessionRow>(
+      `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, sandbox_id, session_init_json, config_options_json, modes_json
+       FROM ${this.table("sessions")}
+       WHERE id = $1`,
+      [id],
+    );
+
+    if (result.rows.length === 0) {
+      return undefined;
+    }
+
+    return decodeSessionRow(result.rows[0]);
+  }
+
+  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
+    await this.ready();
+
+    const offset = parseCursor(request.cursor);
+    const limit = normalizeLimit(request.limit);
+
+    const rowsResult = await this.pool.query<SessionRow>(
+      `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, sandbox_id, session_init_json, config_options_json, modes_json
+       FROM ${this.table("sessions")}
+       ORDER BY created_at ASC, id ASC
+       LIMIT $1 OFFSET $2`,
+      [limit, offset],
+    );
+
+    const countResult = await this.pool.query<{ count: string }>(`SELECT COUNT(*) AS count FROM ${this.table("sessions")}`);
+    const total = parseInteger(countResult.rows[0]?.count ?? "0");
+    const nextOffset = offset + rowsResult.rows.length;
+
+    return {
+      items: rowsResult.rows.map(decodeSessionRow),
+      nextCursor: nextOffset < total ? String(nextOffset) : undefined,
+    };
+  }
+
+  async updateSession(session: SessionRecord): Promise<void> {
+    await this.ready();
+
+    await this.pool.query(
+      `INSERT INTO ${this.table("sessions")} (
+        id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, sandbox_id, session_init_json, config_options_json, modes_json
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+      ON CONFLICT(id) DO UPDATE SET
+        agent = EXCLUDED.agent,
+        agent_session_id = EXCLUDED.agent_session_id,
+        last_connection_id = EXCLUDED.last_connection_id,
+        created_at = EXCLUDED.created_at,
+        destroyed_at = EXCLUDED.destroyed_at,
+        sandbox_id = EXCLUDED.sandbox_id,
+        session_init_json = EXCLUDED.session_init_json,
+        config_options_json = EXCLUDED.config_options_json,
+        modes_json = EXCLUDED.modes_json`,
+      [
+        session.id,
+        session.agent,
+        session.agentSessionId,
+        session.lastConnectionId,
+        session.createdAt,
+        session.destroyedAt ?? null,
+        session.sandboxId ?? null,
+        session.sessionInit ? JSON.stringify(session.sessionInit) : null,
+        session.configOptions ? JSON.stringify(session.configOptions) : null,
+        session.modes !== undefined ? JSON.stringify(session.modes) : null,
+      ],
+    );
+  }
+
+  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
+    await this.ready();
+
+    const offset = parseCursor(request.cursor);
+    const limit = normalizeLimit(request.limit);
+
+    const rowsResult = await this.pool.query<EventRow>(
+      `SELECT id, event_index, session_id, created_at, connection_id, sender, payload_json
+       FROM ${this.table("events")}
+       WHERE session_id = $1
+       ORDER BY event_index ASC, id ASC
+       LIMIT $2 OFFSET $3`,
+      [request.sessionId, limit, offset],
+    );
+
+    const countResult = await this.pool.query<{ count: string }>(`SELECT COUNT(*) AS count FROM ${this.table("events")} WHERE session_id = $1`, [
+      request.sessionId,
+    ]);
+    const total = parseInteger(countResult.rows[0]?.count ?? "0");
+    const nextOffset = offset + rowsResult.rows.length;
+
+    return {
+      items: rowsResult.rows.map(decodeEventRow),
+      nextCursor: nextOffset < total ? String(nextOffset) : undefined,
+    };
+  }
+
+  async insertEvent(_sessionId: string, event: SessionEvent): Promise<void> {
+    await this.ready();
+
+    await this.pool.query(
+      `INSERT INTO ${this.table("events")} (
+        id, event_index, session_id, created_at, connection_id, sender, payload_json
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7)
+      ON CONFLICT(id) DO UPDATE SET
+        event_index = EXCLUDED.event_index,
+        session_id = EXCLUDED.session_id,
+        created_at = EXCLUDED.created_at,
+        connection_id = EXCLUDED.connection_id,
+        sender = EXCLUDED.sender,
+        payload_json = EXCLUDED.payload_json`,
+      [event.id, event.eventIndex, event.sessionId, event.createdAt, event.connectionId, event.sender, event.payload],
+    );
+  }
+
+  async close(): Promise<void> {
+    if (!this.ownsPool) {
+      return;
+    }
+    await this.pool.end();
+  }
+
+  private async ready(): Promise<void> {
+    await this.initialized;
+  }
+
+  private table(name: "sessions" | "events"): string {
+    return `"${this.schema}"."${name}"`;
+  }
+
+  private async initialize(): Promise<void> {
+    await this.pool.query(`CREATE SCHEMA IF NOT EXISTS "${this.schema}"`);
+
+    await this.pool.query(`
+      CREATE TABLE IF NOT EXISTS ${this.table("sessions")} (
+        id TEXT PRIMARY KEY,
+        agent TEXT NOT NULL,
+        agent_session_id TEXT NOT NULL,
+        last_connection_id TEXT NOT NULL,
+        created_at BIGINT NOT NULL,
+        destroyed_at BIGINT,
+        sandbox_id TEXT,
+        session_init_json JSONB,
+        config_options_json JSONB,
+        modes_json JSONB
+      )
+    `);
+
+    await this.pool.query(`
+      ALTER TABLE ${this.table("sessions")}
+      ADD COLUMN IF NOT EXISTS sandbox_id TEXT
+    `);
+
+    await this.pool.query(`
+      ALTER TABLE ${this.table("sessions")}
+      ADD COLUMN IF NOT EXISTS config_options_json JSONB
+    `);
+
+    await this.pool.query(`
+      ALTER TABLE ${this.table("sessions")}
+      ADD COLUMN IF NOT EXISTS modes_json JSONB
+    `);
+
+    await this.pool.query(`
+      CREATE TABLE IF NOT EXISTS ${this.table("events")} (
+        id TEXT PRIMARY KEY,
+        event_index BIGINT NOT NULL,
+        session_id TEXT NOT NULL,
+        created_at BIGINT NOT NULL,
+        connection_id TEXT NOT NULL,
+        sender TEXT NOT NULL,
+        payload_json JSONB NOT NULL
+      )
+    `);
+
+    await this.pool.query(`
+      ALTER TABLE ${this.table("events")}
+      ALTER COLUMN id TYPE TEXT USING id::TEXT
+    `);
+
+    await this.pool.query(`
+      ALTER TABLE ${this.table("events")}
+      ADD COLUMN IF NOT EXISTS event_index BIGINT
+    `);
+
+    await this.pool.query(`
+      WITH ranked AS (
+        SELECT id, ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at ASC, id ASC) AS ranked_index
+        FROM ${this.table("events")}
+      )
+      UPDATE ${this.table("events")} AS current_events
+      SET event_index = ranked.ranked_index
+      FROM ranked
+      WHERE current_events.id = ranked.id
+        AND current_events.event_index IS NULL
+    `);
+
+    await this.pool.query(`
+      ALTER TABLE ${this.table("events")}
+      ALTER COLUMN event_index SET NOT NULL
+    `);
+
+    await this.pool.query(`
+      CREATE INDEX IF NOT EXISTS idx_events_session_order
+      ON ${this.table("events")}(session_id, event_index, id)
+    `);
+  }
+}
+
+type SessionRow = {
+  id: string;
+  agent: string;
+  agent_session_id: string;
+  last_connection_id: string;
+  created_at: string | number;
+  destroyed_at: string | number | null;
+  sandbox_id: string | null;
+  session_init_json: unknown | null;
+  config_options_json: unknown | null;
+  modes_json: unknown | null;
+};
+
+type EventRow = {
+  id: string | number;
+  event_index: string | number;
+  session_id: string;
+  created_at: string | number;
+  connection_id: string;
+  sender: string;
+  payload_json: unknown;
+};
+
+function decodeSessionRow(row: SessionRow): SessionRecord {
+  return {
+    id: row.id,
+    agent: row.agent,
+    agentSessionId: row.agent_session_id,
+    lastConnectionId: row.last_connection_id,
+    createdAt: parseInteger(row.created_at),
+    destroyedAt: row.destroyed_at === null ? undefined : parseInteger(row.destroyed_at),
+    sandboxId: row.sandbox_id ?? undefined,
+    sessionInit: row.session_init_json ? (row.session_init_json as SessionRecord["sessionInit"]) : undefined,
+    configOptions: row.config_options_json ? (row.config_options_json as SessionRecord["configOptions"]) : undefined,
+    modes: row.modes_json ? (row.modes_json as SessionRecord["modes"]) : undefined,
+  };
+}
+
+function decodeEventRow(row: EventRow): SessionEvent {
+  return {
+    id: String(row.id),
+    eventIndex: parseInteger(row.event_index),
+    sessionId: row.session_id,
+    createdAt: parseInteger(row.created_at),
+    connectionId: row.connection_id,
+    sender: parseSender(row.sender),
+    payload: row.payload_json as SessionEvent["payload"],
+  };
+}
+
+function normalizeLimit(limit: number | undefined): number {
+  if (!Number.isFinite(limit) || (limit ?? 0) < 1) {
+    return DEFAULT_LIST_LIMIT;
+  }
+  return Math.floor(limit as number);
+}
+
+function parseCursor(cursor: string | undefined): number {
+  if (!cursor) {
+    return 0;
+  }
+  const parsed = Number.parseInt(cursor, 10);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    return 0;
+  }
+  return parsed;
+}
+
+function parseInteger(value: string | number): number {
+  const parsed = typeof value === "number" ? value : Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed)) {
+    throw new Error(`Invalid integer value returned by postgres: ${String(value)}`);
+  }
+  return parsed;
+}
+
+function parseSender(value: string): SessionEvent["sender"] {
+  if (value === "agent" || value === "client") {
+    return value;
+  }
+  throw new Error(`Invalid sender value returned by postgres: ${value}`);
+}
+
+function normalizeSchema(schema: string): string {
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(schema)) {
+    throw new Error(`Invalid schema name '${schema}'. Use letters, numbers, and underscores only.`);
+  }
+  return schema;
+}
diff --git a/examples/persist-postgres/tsconfig.json b/examples/persist-postgres/tsconfig.json
new file mode 100644
index 0000000..ec2723c
--- /dev/null
+++ b/examples/persist-postgres/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "types": ["node"]
+  },
+  "include": ["src"]
+}
diff --git a/examples/persist-sqlite/package.json b/examples/persist-sqlite/package.json
new file mode 100644
index 0000000..be6bf0d
--- /dev/null
+++ b/examples/persist-sqlite/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@sandbox-agent/example-persist-sqlite",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@sandbox-agent/example-shared": "workspace:*",
+    "better-sqlite3": "^11.0.0",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.0.0",
+    "@types/node": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
+  }
+}
diff --git a/examples/persist-sqlite/src/index.ts b/examples/persist-sqlite/src/index.ts
new file mode 100644
index 0000000..943e902
--- /dev/null
+++ b/examples/persist-sqlite/src/index.ts
@@ -0,0 +1,35 @@
+import { SandboxAgent } from "sandbox-agent";
+import { SQLiteSessionPersistDriver } from "./persist.ts";
+import { startDockerSandbox } from "@sandbox-agent/example-shared/docker";
+import { detectAgent } from "@sandbox-agent/example-shared";
+
+const persist = new SQLiteSessionPersistDriver({ filename: "./sessions.db" });
+
+console.log("Starting sandbox...");
+const sandbox = await startDockerSandbox({
+  port: 3000,
+});
+
+const sdk = await SandboxAgent.connect({ baseUrl: sandbox.baseUrl, persist });
+
+const session = await sdk.createSession({ agent: detectAgent() });
+console.log(`Created session ${session.id}`);
+
+await session.prompt([{ type: "text", text: "Say hello in one sentence." }]);
+console.log("Prompt complete.");
+
+const sessions = await sdk.listSessions();
+console.log(`\nSessions (${sessions.items.length}):`);
+for (const s of sessions.items) {
+  console.log(`  ${s.id}  agent=${s.agent}`);
+}
+
+const events = await sdk.getEvents({ sessionId: session.id });
+console.log(`\nSession history (${events.items.length} events):`);
+for (const e of events.items) {
+  console.log(`  [${e.eventIndex}] ${e.sender}: ${JSON.stringify(e.payload).slice(0, 120)}`);
+}
+
+persist.close();
+await sdk.dispose();
+await sandbox.cleanup();
diff --git a/examples/persist-sqlite/src/persist.ts b/examples/persist-sqlite/src/persist.ts
new file mode 100644
index 0000000..2292903
--- /dev/null
+++ b/examples/persist-sqlite/src/persist.ts
@@ -0,0 +1,310 @@
+import Database from "better-sqlite3";
+import type { ListEventsRequest, ListPage, ListPageRequest, SessionEvent, SessionPersistDriver, SessionRecord } from "sandbox-agent";
+
+const DEFAULT_LIST_LIMIT = 100;
+
+export interface SQLiteSessionPersistDriverOptions {
+  filename?: string;
+}
+
+export class SQLiteSessionPersistDriver implements SessionPersistDriver {
+  private readonly db: Database.Database;
+
+  constructor(options: SQLiteSessionPersistDriverOptions = {}) {
+    this.db = new Database(options.filename ?? ":memory:");
+    this.initialize();
+  }
+
+  async getSession(id: string): Promise<SessionRecord | undefined> {
+    const row = this.db
+      .prepare(
+        `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, sandbox_id, session_init_json, config_options_json, modes_json
+         FROM sessions WHERE id = ?`,
+      )
+      .get(id) as SessionRow | undefined;
+
+    if (!row) {
+      return undefined;
+    }
+
+    return decodeSessionRow(row);
+  }
+
+  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
+    const offset = parseCursor(request.cursor);
+    const limit = normalizeLimit(request.limit);
+
+    const rows = this.db
+      .prepare(
+        `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, sandbox_id, session_init_json, config_options_json, modes_json
+         FROM sessions
+         ORDER BY created_at ASC, id ASC
+         LIMIT ? OFFSET ?`,
+      )
+      .all(limit, offset) as SessionRow[];
+
+    const countRow = this.db.prepare(`SELECT COUNT(*) as count FROM sessions`).get() as { count: number };
+    const nextOffset = offset + rows.length;
+
+    return {
+      items: rows.map(decodeSessionRow),
+      nextCursor: nextOffset < countRow.count ? String(nextOffset) : undefined,
+    };
+  }
+
+  async updateSession(session: SessionRecord): Promise<void> {
+    this.db
+      .prepare(
+        `INSERT INTO sessions (
+          id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, sandbox_id, session_init_json, config_options_json, modes_json
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT(id) DO UPDATE SET
+          agent = excluded.agent,
+          agent_session_id = excluded.agent_session_id,
+          last_connection_id = excluded.last_connection_id,
+          created_at = excluded.created_at,
+          destroyed_at = excluded.destroyed_at,
+          sandbox_id = excluded.sandbox_id,
+          session_init_json = excluded.session_init_json,
+          config_options_json = excluded.config_options_json,
+          modes_json = excluded.modes_json`,
+      )
+      .run(
+        session.id,
+        session.agent,
+        session.agentSessionId,
+        session.lastConnectionId,
+        session.createdAt,
+        session.destroyedAt ?? null,
+        session.sandboxId ?? null,
+        session.sessionInit ? JSON.stringify(session.sessionInit) : null,
+        session.configOptions ? JSON.stringify(session.configOptions) : null,
+        session.modes !== undefined ? JSON.stringify(session.modes) : null,
+      );
+  }
+
+  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
+    const offset = parseCursor(request.cursor);
+    const limit = normalizeLimit(request.limit);
+
+    const rows = this.db
+      .prepare(
+        `SELECT id, event_index, session_id, created_at, connection_id, sender, payload_json
+         FROM events
+         WHERE session_id = ?
+         ORDER BY event_index ASC, id ASC
+         LIMIT ? OFFSET ?`,
+      )
+      .all(request.sessionId, limit, offset) as EventRow[];
+
+    const countRow = this.db.prepare(`SELECT COUNT(*) as count FROM events WHERE session_id = ?`).get(request.sessionId) as { count: number };
+
+    const nextOffset = offset + rows.length;
+
+    return {
+      items: rows.map(decodeEventRow),
+      nextCursor: nextOffset < countRow.count ? String(nextOffset) : undefined,
+    };
+  }
+
+  async insertEvent(_sessionId: string, event: SessionEvent): Promise<void> {
+    this.db
+      .prepare(
+        `INSERT INTO events (
+          id, event_index, session_id, created_at, connection_id, sender, payload_json
+        ) VALUES (?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT(id) DO UPDATE SET
+          event_index = excluded.event_index,
+          session_id = excluded.session_id,
+          created_at = excluded.created_at,
+          connection_id = excluded.connection_id,
+          sender = excluded.sender,
+          payload_json = excluded.payload_json`,
+      )
+      .run(event.id, event.eventIndex, event.sessionId, event.createdAt, event.connectionId, event.sender, JSON.stringify(event.payload));
+  }
+
+  close(): void {
+    this.db.close();
+  }
+
+  private initialize(): void {
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS sessions (
+        id TEXT PRIMARY KEY,
+        agent TEXT NOT NULL,
+        agent_session_id TEXT NOT NULL,
+        last_connection_id TEXT NOT NULL,
+        created_at INTEGER NOT NULL,
+        destroyed_at INTEGER,
+        sandbox_id TEXT,
+        session_init_json TEXT,
+        config_options_json TEXT,
+        modes_json TEXT
+      )
+    `);
+
+    const sessionColumns = this.db.prepare(`PRAGMA table_info(sessions)`).all() as TableInfoRow[];
+    if (!sessionColumns.some((column) => column.name === "sandbox_id")) {
+      this.db.exec(`ALTER TABLE sessions ADD COLUMN sandbox_id TEXT`);
+    }
+    if (!sessionColumns.some((column) => column.name === "config_options_json")) {
+      this.db.exec(`ALTER TABLE sessions ADD COLUMN config_options_json TEXT`);
+    }
+    if (!sessionColumns.some((column) => column.name === "modes_json")) {
+      this.db.exec(`ALTER TABLE sessions ADD COLUMN modes_json TEXT`);
+    }
+
+    this.ensureEventsTable();
+  }
+
+  private ensureEventsTable(): void {
+    const tableInfo = this.db.prepare(`PRAGMA table_info(events)`).all() as TableInfoRow[];
+    if (tableInfo.length === 0) {
+      this.createEventsTable();
+      return;
+    }
+
+    const idColumn = tableInfo.find((column) => column.name === "id");
+    const hasEventIndex = tableInfo.some((column) => column.name === "event_index");
+    const idType = (idColumn?.type ?? "").trim().toUpperCase();
+    const idIsText = idType === "TEXT";
+
+    if (!idIsText || !hasEventIndex) {
+      this.rebuildEventsTable(hasEventIndex);
+    }
+
+    this.db.exec(`
+      CREATE INDEX IF NOT EXISTS idx_events_session_order
+      ON events(session_id, event_index, id)
+    `);
+  }
+
+  private createEventsTable(): void {
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS events (
+        id TEXT PRIMARY KEY,
+        event_index INTEGER NOT NULL,
+        session_id TEXT NOT NULL,
+        created_at INTEGER NOT NULL,
+        connection_id TEXT NOT NULL,
+        sender TEXT NOT NULL,
+        payload_json TEXT NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_events_session_order
+      ON events(session_id, event_index, id)
+    `);
+  }
+
+  private rebuildEventsTable(hasEventIndex: boolean): void {
+    this.db.exec(`
+      ALTER TABLE events RENAME TO events_legacy;
+    `);
+
+    this.createEventsTable();
+
+    if (hasEventIndex) {
+      this.db.exec(`
+        INSERT INTO events (id, event_index, session_id, created_at, connection_id, sender, payload_json)
+        SELECT
+          CAST(id AS TEXT),
+          COALESCE(event_index, ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at ASC, id ASC)),
+          session_id,
+          created_at,
+          connection_id,
+          sender,
+          payload_json
+        FROM events_legacy
+      `);
+    } else {
+      this.db.exec(`
+        INSERT INTO events (id, event_index, session_id, created_at, connection_id, sender, payload_json)
+        SELECT
+          CAST(id AS TEXT),
+          ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at ASC, id ASC),
+          session_id,
+          created_at,
+          connection_id,
+          sender,
+          payload_json
+        FROM events_legacy
+      `);
+    }
+
+    this.db.exec(`DROP TABLE events_legacy`);
+  }
+}
+
+type SessionRow = {
+  id: string;
+  agent: string;
+  agent_session_id: string;
+  last_connection_id: string;
+  created_at: number;
+  destroyed_at: number | null;
+  sandbox_id: string | null;
+  session_init_json: string | null;
+  config_options_json: string | null;
+  modes_json: string | null;
+};
+
+type EventRow = {
+  id: string;
+  event_index: number;
+  session_id: string;
+  created_at: number;
+  connection_id: string;
+  sender: "client" | "agent";
+  payload_json: string;
+};
+
+type TableInfoRow = {
+  name: string;
+  type: string;
+};
+
+function decodeSessionRow(row: SessionRow): SessionRecord {
+  return {
+    id: row.id,
+    agent: row.agent,
+    agentSessionId: row.agent_session_id,
+    lastConnectionId: row.last_connection_id,
+    createdAt: row.created_at,
+    destroyedAt: row.destroyed_at ?? undefined,
+    sandboxId: row.sandbox_id ?? undefined,
+    sessionInit: row.session_init_json ? (JSON.parse(row.session_init_json) as SessionRecord["sessionInit"]) : undefined,
+    configOptions: row.config_options_json ? (JSON.parse(row.config_options_json) as SessionRecord["configOptions"]) : undefined,
+    modes: row.modes_json ? (JSON.parse(row.modes_json) as SessionRecord["modes"]) : undefined,
+  };
+}
+
+function decodeEventRow(row: EventRow): SessionEvent {
+  return {
+    id: row.id,
+    eventIndex: row.event_index,
+    sessionId: row.session_id,
+    createdAt: row.created_at,
+    connectionId: row.connection_id,
+    sender: row.sender,
+    payload: JSON.parse(row.payload_json),
+  };
+}
+
+function normalizeLimit(limit: number | undefined): number {
+  if (!Number.isFinite(limit) || (limit ?? 0) < 1) {
+    return DEFAULT_LIST_LIMIT;
+  }
+  return Math.floor(limit as number);
+}
+
+function parseCursor(cursor: string | undefined): number {
+  if (!cursor) {
+    return 0;
+  }
+  const parsed = Number.parseInt(cursor, 10);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    return 0;
+  }
+  return parsed;
+}
diff --git a/examples/persist-sqlite/tsconfig.json b/examples/persist-sqlite/tsconfig.json
new file mode 100644
index 0000000..ec2723c
--- /dev/null
+++ b/examples/persist-sqlite/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "types": ["node"]
+  },
+  "include": ["src"]
+}
diff --git a/examples/shared/Dockerfile b/examples/shared/Dockerfile
deleted file mode 100644
index 1a960d6..0000000
--- a/examples/shared/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM node:22-bookworm-slim
-RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends ca-certificates > /dev/null 2>&1 && \
-    rm -rf /var/lib/apt/lists/* && \
-    npm install -g --silent @sandbox-agent/cli@latest && \
-    sandbox-agent install-agent claude
diff --git a/examples/shared/Dockerfile.dev b/examples/shared/Dockerfile.dev
deleted file mode 100644
index cac363d..0000000
--- a/examples/shared/Dockerfile.dev
+++ /dev/null
@@ -1,62 +0,0 @@
-FROM node:22-bookworm-slim AS frontend
-RUN corepack enable && corepack prepare pnpm@latest --activate
-WORKDIR /build
-
-# Copy workspace root config
-COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-
-# Copy packages needed for the inspector build chain:
-#   inspector -> sandbox-agent SDK -> acp-http-client, cli-shared, persist-indexeddb
-COPY sdks/typescript/ sdks/typescript/
-COPY sdks/acp-http-client/ sdks/acp-http-client/
-COPY sdks/cli-shared/ sdks/cli-shared/
-COPY sdks/persist-indexeddb/ sdks/persist-indexeddb/
-COPY frontend/packages/inspector/ frontend/packages/inspector/
-COPY docs/openapi.json docs/
-
-# Create stub package.json for workspace packages referenced in pnpm-workspace.yaml
-# but not needed for the inspector build (avoids install errors).
-RUN set -e; for dir in \
-      sdks/cli sdks/gigacode \
-      sdks/persist-postgres sdks/persist-sqlite sdks/persist-rivet \
-      resources/agent-schemas resources/vercel-ai-sdk-schemas \
-      scripts/release scripts/sandbox-testing \
-      examples/shared examples/docker examples/e2b examples/vercel \
-      examples/daytona examples/cloudflare examples/file-system \
-      examples/mcp examples/mcp-custom-tool \
-      examples/skills examples/skills-custom-tool \
-      frontend/packages/website; do \
-      mkdir -p "$dir"; \
-      printf '{"name":"@stub/%s","private":true,"version":"0.0.0"}\n' "$(basename "$dir")" > "$dir/package.json"; \
-    done; \
-    for parent in sdks/cli/platforms sdks/gigacode/platforms; do \
-      for plat in darwin-arm64 darwin-x64 linux-arm64 linux-x64 win32-x64; do \
-        mkdir -p "$parent/$plat"; \
-        printf '{"name":"@stub/%s-%s","private":true,"version":"0.0.0"}\n' "$(basename "$parent")" "$plat" > "$parent/$plat/package.json"; \
-      done; \
-    done
-
-RUN pnpm install --no-frozen-lockfile
-ENV SKIP_OPENAPI_GEN=1
-RUN pnpm --filter sandbox-agent build && \
-    pnpm --filter @sandbox-agent/inspector build
-
-FROM rust:1.88.0-bookworm AS builder
-WORKDIR /build
-COPY Cargo.toml Cargo.lock ./
-COPY server/ ./server/
-COPY gigacode/ ./gigacode/
-COPY resources/agent-schemas/artifacts/ ./resources/agent-schemas/artifacts/
-COPY scripts/agent-configs/ ./scripts/agent-configs/
-COPY --from=frontend /build/frontend/packages/inspector/dist/ ./frontend/packages/inspector/dist/
-RUN --mount=type=cache,target=/usr/local/cargo/registry \
-    --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=/build/target \
-    cargo build -p sandbox-agent --release && \
-    cp target/release/sandbox-agent /sandbox-agent
-
-FROM node:22-bookworm-slim
-RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends ca-certificates > /dev/null 2>&1 && \
-    rm -rf /var/lib/apt/lists/*
-COPY --from=builder /sandbox-agent /usr/local/bin/sandbox-agent
-RUN sandbox-agent install-agent claude
diff --git a/examples/shared/src/docker.ts b/examples/shared/src/docker.ts
index 5ec8a8c..f4161fb 100644
--- a/examples/shared/src/docker.ts
+++ b/examples/shared/src/docker.ts
@@ -4,13 +4,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { PassThrough } from "node:stream";
 import { fileURLToPath } from "node:url";
-import { waitForHealth } from "./sandbox-agent-client.ts";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const EXAMPLE_IMAGE = "sandbox-agent-examples:latest";
-const EXAMPLE_IMAGE_DEV = "sandbox-agent-examples-dev:latest";
-const DOCKERFILE_DIR = path.resolve(__dirname, "..");
-const REPO_ROOT = path.resolve(DOCKERFILE_DIR, "../..");
+const REPO_ROOT = path.resolve(__dirname, "..", "..", "..");
+
+/** Pre-built Docker image with all agents installed. */
+export const FULL_IMAGE = "rivetdev/sandbox-agent:0.4.2-full";
 
 export interface DockerSandboxOptions {
   /** Container port used by sandbox-agent inside Docker. */
@@ -19,7 +18,7 @@ export interface DockerSandboxOptions {
   hostPort?: number;
   /** Additional shell commands to run before starting sandbox-agent. */
   setupCommands?: string[];
-  /** Docker image to use. Defaults to the pre-built sandbox-agent-examples image. */
+  /** Docker image to use. Defaults to the pre-built full image. */
   image?: string;
 }
 
@@ -41,7 +40,7 @@ const DIRECT_CREDENTIAL_KEYS = [
 
 function stripShellQuotes(value: string): string {
   const trimmed = value.trim();
-  if (trimmed.length >= 2 && trimmed.startsWith("\"") && trimmed.endsWith("\"")) {
+  if (trimmed.length >= 2 && trimmed.startsWith('"') && trimmed.endsWith('"')) {
     return trimmed.slice(1, -1);
   }
   if (trimmed.length >= 2 && trimmed.startsWith("'") && trimmed.endsWith("'")) {
@@ -79,11 +78,11 @@ function readClaudeCredentialFiles(): ClaudeCredentialFile[] {
   const candidates: Array<{ hostPath: string; containerPath: string }> = [
     {
       hostPath: path.join(homeDir, ".claude", ".credentials.json"),
-      containerPath: "/root/.claude/.credentials.json",
+      containerPath: ".claude/.credentials.json",
     },
     {
       hostPath: path.join(homeDir, ".claude-oauth-credentials.json"),
-      containerPath: "/root/.claude-oauth-credentials.json",
+      containerPath: ".claude-oauth-credentials.json",
     },
   ];
 
@@ -108,11 +107,7 @@ function collectCredentialEnv(): Record<string, string> {
   const merged: Record<string, string> = {};
   let extracted: Record<string, string> = {};
   try {
-    const output = execFileSync(
-      "sandbox-agent",
-      ["credentials", "extract-env"],
-      { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] },
-    );
+    const output = execFileSync("sandbox-agent", ["credentials", "extract-env"], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
     extracted = parseExtractedCredentials(output);
   } catch {
     // Fall back to direct env vars if extraction is unavailable.
@@ -133,53 +128,43 @@ function shellSingleQuotedLiteral(value: string): string {
 }
 
 function stripAnsi(value: string): string {
-  return value.replace(
-    /[\u001B\u009B][[\]()#;?]*(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007|(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
-    "",
-  );
+  return value.replace(/[\u001B\u009B][[\]()#;?]*(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007|(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><])/g, "");
 }
 
-async function ensureExampleImage(_docker: Docker): Promise<string> {
-  const dev = !!process.env.SANDBOX_AGENT_DEV;
-  const imageName = dev ? EXAMPLE_IMAGE_DEV : EXAMPLE_IMAGE;
-
-  if (dev) {
-    console.log("  Building sandbox image from source (may take a while, only runs once)...");
+async function ensureImage(docker: Docker, image: string): Promise<void> {
+  if (process.env.SANDBOX_AGENT_DEV) {
+    console.log("  Building sandbox image from source (may take a while)...");
     try {
-      execFileSync("docker", [
-        "build", "-t", imageName,
-        "-f", path.join(DOCKERFILE_DIR, "Dockerfile.dev"),
-        REPO_ROOT,
-      ], {
-        stdio: ["ignore", "ignore", "pipe"],
-      });
-    } catch (err: unknown) {
-      const stderr = err instanceof Error && "stderr" in err ? String((err as { stderr: unknown }).stderr) : "";
-      throw new Error(`Failed to build sandbox image: ${stderr}`);
-    }
-  } else {
-    console.log("  Building sandbox image (may take a while, only runs once)...");
-    try {
-      execFileSync("docker", ["build", "-t", imageName, DOCKERFILE_DIR], {
+      execFileSync("docker", ["build", "-t", image, "-f", path.join(REPO_ROOT, "docker/runtime/Dockerfile.full"), REPO_ROOT], {
         stdio: ["ignore", "ignore", "pipe"],
       });
     } catch (err: unknown) {
       const stderr = err instanceof Error && "stderr" in err ? String((err as { stderr: unknown }).stderr) : "";
       throw new Error(`Failed to build sandbox image: ${stderr}`);
     }
+    return;
   }
 
-  return imageName;
+  try {
+    await docker.getImage(image).inspect();
+  } catch {
+    console.log(`  Pulling ${image}...`);
+    await new Promise<void>((resolve, reject) => {
+      docker.pull(image, (err: Error | null, stream: NodeJS.ReadableStream) => {
+        if (err) return reject(err);
+        docker.modem.followProgress(stream, (err: Error | null) => (err ? reject(err) : resolve()));
+      });
+    });
+  }
 }
 
 /**
- * Start a Docker container running sandbox-agent and wait for it to be healthy.
+ * Start a Docker container running sandbox-agent.
  * Registers SIGINT/SIGTERM handlers for cleanup.
  */
 export async function startDockerSandbox(opts: DockerSandboxOptions): Promise<DockerSandbox> {
   const { port, hostPort } = opts;
-  const useCustomImage = !!opts.image;
-  let image = opts.image ?? EXAMPLE_IMAGE;
+  const image = opts.image ?? FULL_IMAGE;
   // TODO: Replace setupCommands shell bootstrapping with native sandbox-agent exec API once available.
   const setupCommands = [...(opts.setupCommands ?? [])];
   const credentialEnv = collectCredentialEnv();
@@ -195,10 +180,9 @@ export async function startDockerSandbox(opts: DockerSandboxOptions): Promise<Do
     const credentialBootstrapCommands = claudeCredentialFiles.flatMap((file, index) => {
       const envKey = `SANDBOX_AGENT_CLAUDE_CREDENTIAL_${index}_B64`;
       bootstrapEnv[envKey] = file.base64Content;
-      return [
-        `mkdir -p ${shellSingleQuotedLiteral(path.posix.dirname(file.containerPath))}`,
-        `printf %s "$${envKey}" | base64 -d > ${shellSingleQuotedLiteral(file.containerPath)}`,
-      ];
+      // Use $HOME-relative paths so credentials work regardless of container user
+      const containerDir = path.posix.dirname(file.containerPath);
+      return [`mkdir -p "$HOME/${containerDir}"`, `printf %s "$${envKey}" | base64 -d > "$HOME/${file.containerPath}"`];
     });
     setupCommands.unshift(...credentialBootstrapCommands);
   }
@@ -209,35 +193,16 @@ export async function startDockerSandbox(opts: DockerSandboxOptions): Promise<Do
 
   const docker = new Docker({ socketPath: "/var/run/docker.sock" });
 
-  if (useCustomImage) {
-    try {
-      await docker.getImage(image).inspect();
-    } catch {
-      console.log(`  Pulling ${image}...`);
-      await new Promise<void>((resolve, reject) => {
-        docker.pull(image, (err: Error | null, stream: NodeJS.ReadableStream) => {
-          if (err) return reject(err);
-          docker.modem.followProgress(stream, (err: Error | null) => (err ? reject(err) : resolve()));
-        });
-      });
-    }
-  } else {
-    image = await ensureExampleImage(docker);
-  }
+  await ensureImage(docker, image);
 
-  const bootCommands = [
-    ...setupCommands,
-    `sandbox-agent server --no-token --host 0.0.0.0 --port ${port}`,
-  ];
+  const bootCommands = [...setupCommands, `sandbox-agent server --no-token --host 0.0.0.0 --port ${port}`];
 
   const container = await docker.createContainer({
     Image: image,
-    WorkingDir: "/root",
-    Cmd: ["sh", "-c", bootCommands.join(" && ")],
-    Env: [
-      ...Object.entries(credentialEnv).map(([key, value]) => `${key}=${value}`),
-      ...Object.entries(bootstrapEnv).map(([key, value]) => `${key}=${value}`),
-    ],
+    Entrypoint: ["/bin/sh", "-c"],
+    WorkingDir: "/home/sandbox",
+    Cmd: [bootCommands.join(" && ")],
+    Env: [...Object.entries(credentialEnv).map(([key, value]) => `${key}=${value}`), ...Object.entries(bootstrapEnv).map(([key, value]) => `${key}=${value}`)],
     ExposedPorts: { [`${port}/tcp`]: {} },
     HostConfig: {
       AutoRemove: true,
@@ -247,12 +212,12 @@ export async function startDockerSandbox(opts: DockerSandboxOptions): Promise<Do
   await container.start();
 
   const logChunks: string[] = [];
-  const startupLogs = await container.logs({
+  const startupLogs = (await container.logs({
     follow: true,
     stdout: true,
     stderr: true,
     since: 0,
-  }) as NodeJS.ReadableStream;
+  })) as NodeJS.ReadableStream;
   const stdoutStream = new PassThrough();
   const stderrStream = new PassThrough();
   stdoutStream.on("data", (chunk) => {
@@ -264,7 +229,9 @@ export async function startDockerSandbox(opts: DockerSandboxOptions): Promise<Do
   docker.modem.demuxStream(startupLogs, stdoutStream, stderrStream);
   const stopStartupLogs = () => {
     const stream = startupLogs as NodeJS.ReadableStream & { destroy?: () => void };
-    try { stream.destroy?.(); } catch {}
+    try {
+      stream.destroy?.();
+    } catch {}
   };
 
   const inspect = await container.inspect();
@@ -275,27 +242,24 @@ export async function startDockerSandbox(opts: DockerSandboxOptions): Promise<Do
   }
   const baseUrl = `http://127.0.0.1:${mappedHostPort}`;
 
-  try {
-    await waitForHealth({ baseUrl });
-  } catch (err) {
-    stopStartupLogs();
-    console.error("  Container logs:");
-    for (const chunk of logChunks) {
-      process.stderr.write(`    ${chunk}`);
-    }
-    throw err;
-  }
   stopStartupLogs();
-  console.log(`  Ready (${baseUrl})`);
+  console.log(`  Started (${baseUrl})`);
 
   const cleanup = async () => {
     stopStartupLogs();
-    try { await container.stop({ t: 5 }); } catch {}
-    try { await container.remove({ force: true }); } catch {}
+    try {
+      await container.stop({ t: 5 });
+    } catch {}
+    try {
+      await container.remove({ force: true });
+    } catch {}
+  };
+  const signalCleanup = async () => {
+    await cleanup();
     process.exit(0);
   };
-  process.once("SIGINT", cleanup);
-  process.once("SIGTERM", cleanup);
+  process.once("SIGINT", signalCleanup);
+  process.once("SIGTERM", signalCleanup);
 
   return { baseUrl, cleanup };
 }
diff --git a/examples/shared/src/sandbox-agent-client.ts b/examples/shared/src/sandbox-agent-client.ts
index df8fa51..8efec19 100644
--- a/examples/shared/src/sandbox-agent-client.ts
+++ b/examples/shared/src/sandbox-agent-client.ts
@@ -3,8 +3,6 @@
  * Provides minimal helpers for connecting to and interacting with sandbox-agent servers.
  */
 
-import { setTimeout as delay } from "node:timers/promises";
-
 function normalizeBaseUrl(baseUrl: string): string {
   return baseUrl.replace(/\/+$/, "");
 }
@@ -43,15 +41,7 @@ export function buildInspectorUrl({
   return `${normalized}/ui/${sessionPath}${queryString ? `?${queryString}` : ""}`;
 }
 
-export function logInspectorUrl({
-  baseUrl,
-  token,
-  headers,
-}: {
-  baseUrl: string;
-  token?: string;
-  headers?: Record<string, string>;
-}): void {
+export function logInspectorUrl({ baseUrl, token, headers }: { baseUrl: string; token?: string; headers?: Record<string, string> }): void {
   console.log(`Inspector: ${buildInspectorUrl({ baseUrl, token, headers })}`);
 }
 
@@ -74,41 +64,6 @@ export function buildHeaders({
   return headers;
 }
 
-export async function waitForHealth({
-  baseUrl,
-  token,
-  extraHeaders,
-  timeoutMs = 120_000,
-}: {
-  baseUrl: string;
-  token?: string;
-  extraHeaders?: Record<string, string>;
-  timeoutMs?: number;
-}): Promise<void> {
-  const normalized = normalizeBaseUrl(baseUrl);
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const headers = buildHeaders({ token, extraHeaders });
-      const response = await fetch(`${normalized}/v1/health`, { headers });
-      if (response.ok) {
-        const data = await response.json();
-        if (data?.status === "ok") {
-          return;
-        }
-        lastError = new Error(`Unexpected health response: ${JSON.stringify(data)}`);
-      } else {
-        lastError = new Error(`Health check failed: ${response.status}`);
-      }
-    } catch (error) {
-      lastError = error;
-    }
-    await delay(500);
-  }
-  throw (lastError ?? new Error("Timed out waiting for /v1/health")) as Error;
-}
-
 export function generateSessionId(): string {
   const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
   let id = "session-";
@@ -121,10 +76,7 @@ export function generateSessionId(): string {
 export function detectAgent(): string {
   if (process.env.SANDBOX_AGENT) return process.env.SANDBOX_AGENT;
   const hasClaude = Boolean(
-    process.env.ANTHROPIC_API_KEY ||
-    process.env.CLAUDE_API_KEY ||
-    process.env.CLAUDE_CODE_OAUTH_TOKEN ||
-    process.env.ANTHROPIC_AUTH_TOKEN,
+    process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY || process.env.CLAUDE_CODE_OAUTH_TOKEN || process.env.ANTHROPIC_AUTH_TOKEN,
   );
   const openAiLikeKey = process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY || "";
   const hasCodexApiKey = openAiLikeKey.startsWith("sk-");
@@ -144,4 +96,3 @@ export function detectAgent(): string {
   }
   return "claude";
 }
-
diff --git a/examples/skills-custom-tool/src/index.ts b/examples/skills-custom-tool/src/index.ts
index 9ead3f9..490be64 100644
--- a/examples/skills-custom-tool/src/index.ts
+++ b/examples/skills-custom-tool/src/index.ts
@@ -23,33 +23,27 @@ console.log("Uploading script and skill file...");
 const client = await SandboxAgent.connect({ baseUrl });
 
 const script = await fs.promises.readFile(scriptFile);
-const scriptResult = await client.writeFsFile(
-  { path: "/opt/skills/random-number/random-number.cjs" },
-  script,
-);
+const scriptResult = await client.writeFsFile({ path: "/opt/skills/random-number/random-number.cjs" }, script);
 console.log(`  Script: ${scriptResult.path} (${scriptResult.bytesWritten} bytes)`);
 
 const skillMd = await fs.promises.readFile(path.resolve(__dirname, "../SKILL.md"));
-const skillResult = await client.writeFsFile(
-  { path: "/opt/skills/random-number/SKILL.md" },
-  skillMd,
-);
+const skillResult = await client.writeFsFile({ path: "/opt/skills/random-number/SKILL.md" }, skillMd);
 console.log(`  Skill:  ${skillResult.path} (${skillResult.bytesWritten} bytes)`);
 
 // Configure the uploaded skill.
 console.log("Configuring custom skill...");
-await client.setSkillsConfig(
-  { directory: "/", skillName: "random-number" },
-  { sources: [{ type: "local", source: "/opt/skills/random-number" }] },
-);
+await client.setSkillsConfig({ directory: "/", skillName: "random-number" }, { sources: [{ type: "local", source: "/opt/skills/random-number" }] });
 
 // Create a session.
 console.log("Creating session with custom skill...");
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
+const session = await client.createSession({ agent: detectAgent(), cwd: "/root" });
 const sessionId = session.id;
 console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
 console.log('  Try: "generate a random number between 1 and 100"');
 console.log("  Press Ctrl+C to stop.");
 
 const keepAlive = setInterval(() => {}, 60_000);
-process.on("SIGINT", () => { clearInterval(keepAlive); cleanup().then(() => process.exit(0)); });
+process.on("SIGINT", () => {
+  clearInterval(keepAlive);
+  cleanup().then(() => process.exit(0));
+});
diff --git a/examples/skills-custom-tool/tsconfig.json b/examples/skills-custom-tool/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/skills-custom-tool/tsconfig.json
+++ b/examples/skills-custom-tool/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/skills/src/index.ts b/examples/skills/src/index.ts
index 1fd3df9..3087ecc 100644
--- a/examples/skills/src/index.ts
+++ b/examples/skills/src/index.ts
@@ -15,11 +15,14 @@ await client.setSkillsConfig(
 );
 
 console.log("Creating session...");
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
+const session = await client.createSession({ agent: detectAgent(), cwd: "/root" });
 const sessionId = session.id;
 console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
 console.log('  Try: "How do I start sandbox-agent?"');
 console.log("  Press Ctrl+C to stop.");
 
 const keepAlive = setInterval(() => {}, 60_000);
-process.on("SIGINT", () => { clearInterval(keepAlive); cleanup().then(() => process.exit(0)); });
+process.on("SIGINT", () => {
+  clearInterval(keepAlive);
+  cleanup().then(() => process.exit(0));
+});
diff --git a/examples/skills/tsconfig.json b/examples/skills/tsconfig.json
index 96ba2fd..ad591c3 100644
--- a/examples/skills/tsconfig.json
+++ b/examples/skills/tsconfig.json
@@ -9,7 +9,8 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
diff --git a/examples/sprites/package.json b/examples/sprites/package.json
new file mode 100644
index 0000000..df808e8
--- /dev/null
+++ b/examples/sprites/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@sandbox-agent/example-sprites",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "tsx src/index.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@fly/sprites": "latest",
+    "@sandbox-agent/example-shared": "workspace:*",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "tsx": "latest",
+    "typescript": "latest",
+    "vitest": "^3.0.0"
+  }
+}
diff --git a/examples/sprites/src/index.ts b/examples/sprites/src/index.ts
new file mode 100644
index 0000000..bf95e5d
--- /dev/null
+++ b/examples/sprites/src/index.ts
@@ -0,0 +1,21 @@
+import { SandboxAgent } from "sandbox-agent";
+import { sprites } from "sandbox-agent/sprites";
+
+const env: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+const client = await SandboxAgent.start({
+  sandbox: sprites({
+    token: process.env.SPRITES_API_KEY ?? process.env.SPRITE_TOKEN ?? process.env.SPRITES_TOKEN,
+    env,
+  }),
+});
+
+console.log(`UI: ${client.inspectorUrl}`);
+console.log(await client.getHealth());
+
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
+  process.exit(0);
+});
diff --git a/examples/sprites/tests/sprites.test.ts b/examples/sprites/tests/sprites.test.ts
new file mode 100644
index 0000000..dfd1594
--- /dev/null
+++ b/examples/sprites/tests/sprites.test.ts
@@ -0,0 +1,34 @@
+import { describe, it, expect } from "vitest";
+import { SandboxAgent } from "sandbox-agent";
+import { sprites } from "sandbox-agent/sprites";
+
+const shouldRun = Boolean(process.env.SPRITES_API_KEY || process.env.SPRITE_TOKEN || process.env.SPRITES_TOKEN);
+const timeoutMs = Number.parseInt(process.env.SANDBOX_TEST_TIMEOUT_MS || "", 10) || 300_000;
+
+const testFn = shouldRun ? it : it.skip;
+
+describe("sprites provider", () => {
+  testFn(
+    "starts sandbox-agent and responds to /v1/health",
+    async () => {
+      const env: Record<string, string> = {};
+      if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+      if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+
+      const sdk = await SandboxAgent.start({
+        sandbox: sprites({
+          token: process.env.SPRITES_API_KEY ?? process.env.SPRITE_TOKEN ?? process.env.SPRITES_TOKEN,
+          env,
+        }),
+      });
+
+      try {
+        const health = await sdk.getHealth();
+        expect(health.status).toBe("ok");
+      } finally {
+        await sdk.destroySandbox();
+      }
+    },
+    timeoutMs,
+  );
+});
diff --git a/examples/sprites/tsconfig.json b/examples/sprites/tsconfig.json
new file mode 100644
index 0000000..ad591c3
--- /dev/null
+++ b/examples/sprites/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "**/*.test.ts"]
+}
diff --git a/examples/vercel/src/index.ts b/examples/vercel/src/index.ts
index 818d08c..5a83e0c 100644
--- a/examples/vercel/src/index.ts
+++ b/examples/vercel/src/index.ts
@@ -1,58 +1,33 @@
-import { Sandbox } from "@vercel/sandbox";
 import { SandboxAgent } from "sandbox-agent";
-import { detectAgent, buildInspectorUrl, waitForHealth } from "@sandbox-agent/example-shared";
+import { vercel } from "sandbox-agent/vercel";
+import { detectAgent } from "@sandbox-agent/example-shared";
 
-const envs: Record<string, string> = {};
-if (process.env.ANTHROPIC_API_KEY) envs.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
-if (process.env.OPENAI_API_KEY) envs.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+const env: Record<string, string> = {};
+if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
 
-console.log("Creating Vercel sandbox...");
-const sandbox = await Sandbox.create({
-  runtime: "node24",
-  ports: [3000],
+const client = await SandboxAgent.start({
+  sandbox: vercel({
+    create: {
+      runtime: "node24",
+      env,
+    },
+  }),
 });
 
-const run = async (cmd: string, args: string[] = []) => {
-  const result = await sandbox.runCommand({ cmd, args, env: envs });
-  if (result.exitCode !== 0) {
-    const stderr = await result.stderr();
-    throw new Error(`Command failed: ${cmd} ${args.join(" ")}\n${stderr}`);
-  }
-  return result;
-};
+console.log(`UI: ${client.inspectorUrl}`);
 
-console.log("Installing sandbox-agent...");
-await run("sh", ["-c", "curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh"]);
-
-console.log("Installing agents...");
-await run("sandbox-agent", ["install-agent", "claude"]);
-await run("sandbox-agent", ["install-agent", "codex"]);
-
-console.log("Starting server...");
-await sandbox.runCommand({
-  cmd: "sandbox-agent",
-  args: ["server", "--no-token", "--host", "0.0.0.0", "--port", "3000"],
-  env: envs,
-  detached: true,
+const session = await client.createSession({
+  agent: detectAgent(),
 });
 
-const baseUrl = sandbox.domain(3000);
+session.onEvent((event) => {
+  console.log(`[${event.sender}]`, JSON.stringify(event.payload));
+});
 
-console.log("Waiting for server...");
-await waitForHealth({ baseUrl });
+session.prompt([{ type: "text", text: "Say hello from Vercel in one sentence." }]);
 
-const client = await SandboxAgent.connect({ baseUrl });
-const session = await client.createSession({ agent: detectAgent(), sessionInit: { cwd: "/root", mcpServers: [] } });
-const sessionId = session.id;
-
-console.log(`  UI: ${buildInspectorUrl({ baseUrl, sessionId })}`);
-console.log("  Press Ctrl+C to stop.");
-
-const keepAlive = setInterval(() => {}, 60_000);
-const cleanup = async () => {
-  clearInterval(keepAlive);
-  await sandbox.stop();
+process.once("SIGINT", async () => {
+  await client.destroySandbox();
   process.exit(0);
-};
-process.once("SIGINT", cleanup);
-process.once("SIGTERM", cleanup);
+});
diff --git a/examples/vercel/src/vercel.ts b/examples/vercel/src/vercel.ts
new file mode 100644
index 0000000..742cd5a
--- /dev/null
+++ b/examples/vercel/src/vercel.ts
@@ -0,0 +1,35 @@
+import { SandboxAgent } from "sandbox-agent";
+import { vercel } from "sandbox-agent/vercel";
+
+function collectEnvVars(): Record<string, string> {
+  const env: Record<string, string> = {};
+  if (process.env.ANTHROPIC_API_KEY) env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+  if (process.env.OPENAI_API_KEY) env.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+  return env;
+}
+
+function inspectorUrlToBaseUrl(inspectorUrl: string): string {
+  return inspectorUrl.replace(/\/ui\/$/, "");
+}
+
+export async function setupVercelSandboxAgent(): Promise<{
+  baseUrl: string;
+  token?: string;
+  cleanup: () => Promise<void>;
+}> {
+  const client = await SandboxAgent.start({
+    sandbox: vercel({
+      create: {
+        runtime: "node24",
+        env: collectEnvVars(),
+      },
+    }),
+  });
+
+  return {
+    baseUrl: inspectorUrlToBaseUrl(client.inspectorUrl),
+    cleanup: async () => {
+      await client.killSandbox();
+    },
+  };
+}
diff --git a/examples/vercel/tests/vercel.test.ts b/examples/vercel/tests/vercel.test.ts
index dd6de67..40b8aa8 100644
--- a/examples/vercel/tests/vercel.test.ts
+++ b/examples/vercel/tests/vercel.test.ts
@@ -23,6 +23,6 @@ describe("vercel example", () => {
         await cleanup();
       }
     },
-    timeoutMs
+    timeoutMs,
   );
 });
diff --git a/examples/vercel/tsconfig.json b/examples/vercel/tsconfig.json
index ad92bfa..ad591c3 100644
--- a/examples/vercel/tsconfig.json
+++ b/examples/vercel/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "compilerOptions": {
     "target": "ES2022",
-    "lib": [
-      "ES2022",
-      "DOM"
-    ],
+    "lib": ["ES2022", "DOM"],
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "allowImportingTsExtensions": true,
@@ -12,13 +9,9 @@
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/*.test.ts"
-  ]
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "**/*.test.ts"]
 }
diff --git a/foundry/AGENT-HANDOFF.md b/foundry/AGENT-HANDOFF.md
new file mode 100644
index 0000000..20bade7
--- /dev/null
+++ b/foundry/AGENT-HANDOFF.md
@@ -0,0 +1,179 @@
+# Foundry Agent Handoff
+
+## Baseline
+
+- Repo: `rivet-dev/sandbox-agent`
+- Branch: `columbus-v2`
+- Last pushed commit: `3174fe73` (`feat(foundry): checkpoint actor and workspace refactor`)
+- Progress/spec tracker: [FOUNDRY-CHANGES.md](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/FOUNDRY-CHANGES.md)
+
+## What is already landed
+
+These spec slices are already implemented and pushed:
+
+- Item `1`: backend actor rename `auth-user` -> `user`
+- Item `2`: Better Auth mapping comments
+- Item `5`: task raw SQL cleanup into migrations
+- Item `6`: `history` -> `audit-log`
+- Item `7`: default model moved to user-scoped app state
+- Item `20`: admin action prefixing
+- Item `23`: dead `getTaskEnriched` / `enrichTaskRecord` removal
+- Item `25`: `Workbench` -> `Workspace` rename across backend/shared/client/frontend
+- Item `26`: branch rename deleted
+- Organization realtime was already collapsed to full-snapshot `organizationUpdated`
+- Task realtime was already aligned to `taskUpdated`
+
+## Known blocker
+
+Spec item `3` is only partially done. The singleton constraint for the Better Auth `user` table is still blocked.
+
+- File: [foundry/packages/backend/src/actors/user/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/user/db/schema.ts)
+- Reason: Better Auth still depends on external string `user.id`, so a literal singleton `CHECK (id = 1)` on that table is not a safe mechanical change.
+
+## Important current state
+
+There are uncommitted edits on top of the pushed checkpoint. Another agent should start from the current worktree, not just `origin/columbus-v2`.
+
+Current dirty files:
+
+- [foundry/packages/backend/src/actors/github-data/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/github-data/index.ts)
+- [foundry/packages/backend/src/actors/organization/actions.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/organization/actions.ts)
+- [foundry/packages/backend/src/actors/repository/actions.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/repository/actions.ts)
+- [foundry/packages/backend/src/actors/task/workspace.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workspace.ts)
+- [foundry/packages/client/src/mock/backend-client.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/client/src/mock/backend-client.ts)
+
+These files are the current hot path for the unfinished structural work.
+
+## What is partially in place but not finished
+
+### User-owned task UI state
+
+The user actor already has the schema and CRUD surface for per-user task/session UI state:
+
+- [foundry/packages/backend/src/actors/user/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/user/db/schema.ts)
+  `user_task_state`
+- [foundry/packages/backend/src/actors/user/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/user/index.ts)
+  `getTaskState`, `upsertTaskState`, `deleteTaskState`
+
+But the task actor and UI are still reading/writing the old task-global fields:
+
+- [foundry/packages/backend/src/actors/task/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/db/schema.ts)
+  still contains `task_runtime.active_session_id` and session `unread` / `draft_*`
+- [foundry/packages/backend/src/actors/task/workspace.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workspace.ts)
+  still derives unread/draft/active-session from task-local rows
+- [foundry/packages/frontend/src/components/mock-layout.tsx](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/frontend/src/components/mock-layout.tsx)
+  still treats `activeSessionId` as frontend-local and uses task-level unread/draft state
+
+So items `21`, `22`, `24`, and part of `19` are only half-done.
+
+### Coordinator ownership
+
+The current architecture still violates the intended coordinator pattern:
+
+- Organization still owns `taskLookup` and `taskSummaries`
+  - [foundry/packages/backend/src/actors/organization/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/organization/db/schema.ts)
+- Organization still resolves `taskId -> repoId`
+  - [foundry/packages/backend/src/actors/organization/actions.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/organization/actions.ts)
+- Task still pushes summary updates to organization instead of repository
+  - [foundry/packages/backend/src/actors/task/workspace.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workspace.ts)
+- Repository still does not own a `tasks` projection table yet
+  - [foundry/packages/backend/src/actors/repository/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/repository/db/schema.ts)
+
+So items `9`, `13`, and `15` are still open.
+
+### Queue-only mutations
+
+Task actor workspace commands already go through queue sends. Other actors still do not fully follow the queue-only mutation rule:
+
+- [foundry/packages/backend/src/actors/user/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/user/index.ts)
+- [foundry/packages/backend/src/actors/github-data/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/github-data/index.ts)
+- [foundry/packages/backend/src/actors/organization/actions.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/organization/actions.ts)
+- [foundry/packages/backend/src/actors/organization/app-shell.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/organization/app-shell.ts)
+
+So items `4`, `10`, and `11` are still open.
+
+### Dynamic model/agent data
+
+The frontend/client still hardcode model groups:
+
+- [foundry/packages/frontend/src/components/mock-layout/view-model.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/frontend/src/components/mock-layout/view-model.ts)
+- [foundry/packages/client/src/workspace-model.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/client/src/workspace-model.ts)
+- [foundry/packages/shared/src/workspace.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/shared/src/workspace.ts)
+  `WorkspaceModelId` is still a hardcoded union
+
+The repo already has the API source of truth available through the TypeScript SDK:
+
+- [sdks/typescript/src/client.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/sdks/typescript/src/client.ts)
+  `SandboxAgent.listAgents({ config: true })`
+- [server/packages/sandbox-agent/src/router.rs](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/server/packages/sandbox-agent/src/router.rs)
+  `/v1/agents`
+- [server/packages/sandbox-agent/src/router/support.rs](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/server/packages/sandbox-agent/src/router/support.rs)
+  `fallback_config_options`
+
+So item `8` is still open.
+
+### GitHub sync chunking/progress
+
+GitHub data sync is still a delete-and-replace flow:
+
+- [foundry/packages/backend/src/actors/github-data/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/github-data/index.ts)
+  `replaceRepositories`, `replaceBranches`, `replaceMembers`, `replacePullRequests`, and full-sync flow
+- [foundry/packages/backend/src/actors/github-data/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/github-data/db/schema.ts)
+  no generation/progress columns yet
+- [foundry/packages/shared/src/app-shell.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/shared/src/app-shell.ts)
+  no structured sync progress field yet
+
+So item `16` is still open.
+
+## Recommended next order
+
+If another agent picks this up, this is the safest order:
+
+1. Finish items `21`, `22`, `24`, `19` together.
+   Reason: user-owned task UI state is already half-wired, and task schema cleanup depends on the same files.
+
+2. Finish items `9`, `13`, `15` together.
+   Reason: coordinator ownership, repo-owned task projections, and PR/task unification are the same refactor seam.
+
+3. Finish item `16`.
+   Reason: GitHub sync chunking is mostly isolated to `github-data` plus app-shell/shared snapshot wiring.
+
+4. Finish item `8`.
+   Reason: dynamic model/agent data is largely independent once user default model is already user-scoped.
+
+5. Finish items `4`, `10`, `11`, `12`, `18`, final event audit.
+
+6. Do item `17` last.
+
+## Concrete file hotspots for the next agent
+
+Backend:
+
+- [foundry/packages/backend/src/actors/task/workspace.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workspace.ts)
+- [foundry/packages/backend/src/actors/task/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/db/schema.ts)
+- [foundry/packages/backend/src/actors/task/workflow/common.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workflow/common.ts)
+- [foundry/packages/backend/src/actors/task/workflow/commands.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workflow/commands.ts)
+- [foundry/packages/backend/src/actors/task/workflow/init.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/task/workflow/init.ts)
+- [foundry/packages/backend/src/actors/repository/actions.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/repository/actions.ts)
+- [foundry/packages/backend/src/actors/repository/db/schema.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/repository/db/schema.ts)
+- [foundry/packages/backend/src/actors/organization/actions.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/organization/actions.ts)
+- [foundry/packages/backend/src/actors/github-data/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/github-data/index.ts)
+- [foundry/packages/backend/src/actors/user/index.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/backend/src/actors/user/index.ts)
+
+Shared/client/frontend:
+
+- [foundry/packages/shared/src/workspace.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/shared/src/workspace.ts)
+- [foundry/packages/shared/src/contracts.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/shared/src/contracts.ts)
+- [foundry/packages/shared/src/app-shell.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/shared/src/app-shell.ts)
+- [foundry/packages/client/src/backend-client.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/client/src/backend-client.ts)
+- [foundry/packages/client/src/workspace-model.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/client/src/workspace-model.ts)
+- [foundry/packages/frontend/src/components/mock-layout.tsx](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/frontend/src/components/mock-layout.tsx)
+- [foundry/packages/frontend/src/components/mock-layout/view-model.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/frontend/src/components/mock-layout/model-picker.tsx)
+- [foundry/packages/frontend/src/features/tasks/status.ts](/Users/nathan/conductor/workspaces/sandbox-agent/columbus-v1/foundry/packages/frontend/src/features/tasks/status.ts)
+
+## Notes that matter
+
+- The pushed checkpoint is useful, but it is not the full current state. There are uncommitted edits in the hot-path backend files listed above.
+- The current tree already contains a partially added `user_task_state` path. Do not duplicate that work; finish the migration by removing the old task-owned fields and rewiring readers/writers.
+- The current task actor still reads mutable fields from `c.state` such as `repoRemote`, `branchName`, `title`, `task`, `sandboxProviderId`, and `agentType`. That is part of item `19`.
+- The current frontend still synthesizes PR-only rows into fake tasks. That should go away as part of repo-owned task projection / PR unification.
diff --git a/foundry/AGENTS.md b/foundry/AGENTS.md
new file mode 120000
index 0000000..681311e
--- /dev/null
+++ b/foundry/AGENTS.md
@@ -0,0 +1 @@
+CLAUDE.md
\ No newline at end of file
diff --git a/foundry/CLAUDE.md b/foundry/CLAUDE.md
new file mode 100644
index 0000000..2d9bcbb
--- /dev/null
+++ b/foundry/CLAUDE.md
@@ -0,0 +1,391 @@
+# Project Instructions
+
+## Language Policy
+
+Use TypeScript for all source code.
+
+- Never add raw JavaScript source files (`.js`, `.mjs`, `.cjs`).
+- Prefer `.ts`/`.tsx` for runtime code, scripts, tests, and tooling.
+- If touching old JavaScript, migrate it to TypeScript instead of extending it.
+
+## Monorepo + Tooling
+
+Use `pnpm` workspaces and Turborepo.
+
+- Repository root uses `pnpm-workspace.yaml` and `turbo.json`.
+- Packages live in `packages/*`.
+- `core` is renamed to `shared`.
+- `packages/cli` is disabled and excluded from active monorepo validation.
+- Integrations and providers live under `packages/backend/src/{integrations,providers}`.
+
+## CLI Status
+
+- `packages/cli` is fully disabled for active development.
+- Do not implement new behavior in `packages/cli` unless explicitly requested.
+- Frontend is the primary product surface; prioritize `packages/frontend` + supporting `packages/client`/`packages/backend`.
+- Monorepo `build`, `typecheck`, and `test` intentionally exclude `@sandbox-agent/foundry-cli`.
+- `pnpm-workspace.yaml` excludes `packages/cli` from monorepo package resolution.
+
+## Common Commands
+
+- Foundry is the canonical name for this product tree. Do not introduce or preserve legacy pre-Foundry naming in code, docs, commands, or runtime paths.
+- Install deps: `pnpm install`
+- Full active-monorepo validation: `pnpm -w typecheck`, `pnpm -w build`, `pnpm -w test`
+- Start the full dev stack (real backend + frontend): `just foundry-dev` — frontend on **port 4173**, backend on **port 7741** (Docker via `compose.dev.yaml`)
+- Start the mock frontend stack (no backend): `just foundry-mock` — mock frontend on **port 4174** (Docker via `compose.mock.yaml`)
+- Start the local production-build preview stack: `just foundry-preview`
+- Start only the backend locally: `just foundry-backend-start`
+- Start only the frontend locally: `pnpm --filter @sandbox-agent/foundry-frontend dev`
+- Start the mock frontend locally (no Docker): `just foundry-dev-mock` — mock frontend on **port 4174**
+- Dev and mock stacks can run simultaneously on different ports (4173 and 4174).
+- Stop the compose dev stack: `just foundry-dev-down`
+- Tail compose dev logs: `just foundry-dev-logs`
+- Stop the mock stack: `just foundry-mock-down`
+- Tail mock logs: `just foundry-mock-logs`
+- Stop the preview stack: `just foundry-preview-down`
+- Tail preview logs: `just foundry-preview-logs`
+
+## Dev Environment Setup
+
+- `compose.dev.yaml` loads `foundry/.env` (optional) for credentials needed by the backend (GitHub OAuth, Stripe, Daytona, API keys, etc.).
+- The canonical source for these credentials is `~/misc/the-foundry.env`. If `foundry/.env` does not exist, copy it: `cp ~/misc/the-foundry.env foundry/.env`
+- `foundry/.env` is gitignored and must never be committed.
+- If your changes affect the dev server, mock server, frontend runtime, backend runtime, Vite wiring, compose files, or other server-startup/runtime behavior, you must start or restart the relevant stack before finishing the task.
+- Use the matching stack for verification:
+  - real backend + frontend changes: `just foundry-dev` or restart with `just foundry-dev-down && just foundry-dev`
+  - mock frontend changes: `just foundry-mock` or restart with `just foundry-mock-down && just foundry-mock`
+  - local frontend-only work outside Docker: restart `pnpm --filter @sandbox-agent/foundry-frontend dev` or `just foundry-dev-mock` as appropriate
+- The backend does **not** hot reload. Bun's `--hot` flag causes the server to re-bind on a different port (e.g. 6421 instead of 6420), breaking all client connections while the container still exposes the original port. After backend code changes, restart the backend container: `just foundry-dev-down && just foundry-dev`.
+- The dev server has debug logging enabled by default (`RIVET_LOG_LEVEL=debug`, `FOUNDRY_LOG_LEVEL=debug`) via `compose.dev.yaml`. Error stacks and timestamps are also enabled.
+- The frontend client uses JSON encoding for RivetKit in development (`import.meta.env.DEV`) for easier debugging. Production uses the default encoding.
+
+## Foundry Base Sandbox Image
+
+Local Docker sandboxes use the `rivetdev/sandbox-agent:foundry-base-latest` image by default. This image extends the sandbox-agent runtime with sudo, git, neovim, gh, node, bun, chromium, and agent-browser.
+
+- **Dockerfile:** `docker/foundry-base.Dockerfile` (builds sandbox-agent from source, x86_64 only)
+- **Publish script:** `scripts/publish-foundry-base.sh` (builds and pushes to Docker Hub `rivetdev/sandbox-agent`)
+- **Tags:** `foundry-base-<YYYYMMDD>T<HHMMSS>Z` (timestamped) + `foundry-base-latest` (rolling)
+- **Build from repo root:** `./foundry/scripts/publish-foundry-base.sh` (or `--dry-run` to skip push)
+- **Override image in dev:** set `HF_LOCAL_SANDBOX_IMAGE` in `foundry/.env` or environment. The env var is passed through `compose.dev.yaml` to the backend.
+- **Resolution order:** `config.sandboxProviders.local.image` (config.toml) > `HF_LOCAL_SANDBOX_IMAGE` (env var) > `DEFAULT_LOCAL_SANDBOX_IMAGE` constant in `packages/backend/src/actors/sandbox/index.ts`.
+- The image must be built with `--platform linux/amd64`. The Rust build is memory-intensive; Docker Desktop needs at least 8GB RAM allocated.
+- When updating the base image contents (new system packages, agent versions), rebuild and push with the publish script, then update the `foundry-base-latest` tag.
+
+## Production GitHub App + OAuth App
+
+Foundry uses two separate GitHub entities in production:
+
+- **OAuth App** (`GITHUB_CLIENT_ID` / `GITHUB_CLIENT_SECRET`) — handles "Sign in with GitHub" via Better Auth. This is a standard OAuth App.
+- **GitHub App** (`GITHUB_APP_ID` / `GITHUB_APP_CLIENT_ID` / `GITHUB_APP_CLIENT_SECRET` / `GITHUB_APP_PRIVATE_KEY`) — handles webhooks, installation tokens for repo access, and GitHub API sync (repos, PRs). Must be manually installed on each org.
+
+Key env vars and where they connect:
+
+- `GITHUB_REDIRECT_URI` — OAuth callback, must point to `https://api.sandboxagent.dev/v1/auth/callback/github`
+- `GITHUB_WEBHOOK_SECRET` — must match the secret configured on the GitHub App's Webhook settings page exactly. Mismatches cause silent 500s on webhook delivery (signature verification fails inside the actor, surfaced as a generic RivetKit `internal_error`).
+- `BETTER_AUTH_URL` — must be the **API** URL (`https://api.sandboxagent.dev`), not the frontend URL. Better Auth uses this internally for sign-out and session management calls.
+- `APP_URL` — the **frontend** URL (`https://foundry.sandboxagent.dev`).
+
+Troubleshooting:
+
+- **"GitHub App not installed"** — The GitHub App must be manually installed on each org. Sign-in does not auto-install it. Go to the GitHub App settings → Install App tab. The sign-in flow can only detect existing installations, not create them.
+- **Webhooks not arriving** — Check the GitHub App → Advanced tab for delivery history. If deliveries show 500, the webhook secret likely doesn't match `GITHUB_WEBHOOK_SECRET`. Test with: `echo -n '{"test":true}' | openssl dgst -sha256 -hmac "$SECRET"` and curl the endpoint with the computed signature.
+- **Deleting all actors wipes GitHub App installation state.** After a full actor reset, you must trigger a webhook (e.g. redeliver from GitHub App Advanced tab, or re-install the app) to repopulate installation records.
+
+## Railway Logs
+
+- Production Foundry Railway logs can be read from a linked checkout with `railway logs --deployment --lines 200` or `railway logs <deployment-id> --deployment --lines 200`.
+- Production deploys should go through `git push` to the deployment branch/workflow. Do not use `railway up` for Foundry deploys.
+- If Railway logs fail because the checkout is not linked to the correct Railway project/service/environment, run:
+  `railway link --project 33e3e2df-32c5-41c5-a4af-dca8654acb1d --environment cf387142-61fd-4668-8cf7-b3559e0983cb --service 91c7e450-d6d2-481a-b2a4-0a916f4160fc`
+- That links this directory to the `sandbox-agent` project, `production` environment, and `foundry-api` service.
+- Production proxy chain: `api.sandboxagent.dev` routes through Cloudflare → Fastly/Varnish → Railway. When debugging request duplication, timeouts, or retry behavior, check headers like `cf-ray`, `x-varnish`, `x-railway-edge`, and `cdn-loop` to identify which layer is involved.
+
+## Frontend + Client Boundary
+
+- Keep a browser-friendly GUI implementation aligned with the TUI interaction model wherever possible.
+- Do not import `rivetkit` directly in CLI or GUI packages. RivetKit client access must stay isolated inside `packages/client`.
+- All backend interaction (actor calls, metadata/health checks, backend HTTP endpoint access) must go through the dedicated client library in `packages/client`.
+- Outside `packages/client`, do not call backend endpoints directly (for example `fetch(.../v1/rivet...)`), except in black-box E2E tests that intentionally exercise raw transport behavior.
+- GUI state should update in realtime (no manual refresh buttons). Prefer RivetKit push reactivity and actor-driven events; do not add polling/refetch for normal product flows.
+- Keep the mock workspace types and mock client in `packages/shared` + `packages/client` up to date with the frontend contract. The mock is the UI testing reference implementation while backend functionality catches up.
+- Keep frontend route/state coverage current in code and tests; there is no separate page-inventory doc to maintain.
+- If Foundry uses a shared component from `@sandbox-agent/react`, make changes in `sdks/react` instead of copying or forking that component into Foundry.
+- When changing shared React components in `sdks/react` for Foundry, verify they still work in the Sandbox Agent Inspector before finishing.
+- When making UI changes, verify the live flow with the Chrome DevTools MCP or `agent-browser`, take screenshots of the updated UI, and offer to open those screenshots in Preview when you finish.
+- When asked for screenshots, capture all relevant affected screens and modal states, not just a single viewport. Include empty, populated, success, and blocked/error states when they are part of the changed flow.
+- If a screenshot catches a transition frame, blank modal, or otherwise misleading state, retake it before reporting it.
+- When verifying UI in the browser, attempt to sign in by navigating to `/signin` and clicking "Continue with GitHub". If the browser lands on the GitHub login page (github.com/login) and you don't have credentials, stop and ask the user to complete the sign-in. Do not assume the session is invalid just because you see the Foundry sign-in page — always attempt the OAuth flow first.
+
+## Realtime Data Architecture
+
+### Core pattern: fetch initial state + subscribe to deltas
+
+All client data flows follow the same pattern:
+
+1. **Connect** to the actor via WebSocket.
+2. **Fetch initial state** via an action call to get the current materialized snapshot.
+3. **Subscribe to events** on the connection. Events carry **full replacement payloads** for the changed entity (not empty notifications, not patches — the complete new state of the thing that changed).
+4. **Unsubscribe** after a 30-second grace period when interest ends (screen navigation, component unmount). The grace period prevents thrashing during screen transitions and React double-renders.
+
+Do not use polling (`refetchInterval`), empty "go re-fetch" broadcast events, or full-snapshot re-fetches on every mutation. Every mutation broadcasts the new absolute state of the changed entity to connected clients.
+
+### Materialized state in coordinator actors
+
+- **Organization actor** materializes sidebar-level data in its own SQLite: repo catalog, task summaries (title, status, branch, PR, updatedAt), repo summaries (overview/branch state), and session summaries (id, name, status, unread, model — no transcript). Task actors push summary changes to the organization actor when they mutate. The organization actor broadcasts the updated entity to connected clients. `getOrganizationSummary` reads from local tables only — no fan-out to child actors.
+- **Task actor** materializes its own detail state (session summaries, sandbox info, diffs, file tree). `getTaskDetail` reads from the task actor's own SQLite. The task actor broadcasts updates directly to clients connected to it.
+- **Session data** lives on the task actor but is a separate subscription topic. The task topic includes `sessions_summary` (list without content). The `session` topic provides full transcript and draft state. Clients subscribe to the `session` topic for whichever session is active, and filter `sessionUpdated` events by session ID (ignoring events for other sessions on the same actor).
+- There is no fan-out on the read path. The organization actor owns all task summaries locally.
+
+### Subscription manager
+
+The subscription manager (`packages/client`) is a global singleton that manages WebSocket connections, cached state, and subscriptions for all topics. It:
+
+- **Deduplicates** — multiple subscribers to the same topic share one connection and one cached state.
+- **Grace period (30s)** — when the last subscriber leaves, the connection and state stay alive for 30 seconds before teardown. This keeps data warm for back-navigation and prevents thrashing.
+- **Exposes a single hook** — `useSubscription(topicKey, params)` returns `{ data, status, error }`. Null params = no subscription (conditional subscription).
+- **Shared harness, separate implementations** — the `SubscriptionManager` interface is shared between mock and remote implementations. The mock implementation uses in-memory state. The remote implementation uses WebSocket connections. The API/client exposure is identical for both.
+
+### Topics
+
+Each topic maps to one actor connection and one event stream:
+
+| Topic | Actor | Event | Data |
+|---|---|---|---|
+| `app` | Organization `"app"` | `appUpdated` | Auth, orgs, onboarding |
+| `organization` | Organization `{organizationId}` | `organizationUpdated` | Repo catalog, task summaries, repo summaries |
+| `task` | Task `{organizationId, repoId, taskId}` | `taskUpdated` | Session summaries, sandbox info, diffs, file tree |
+| `session` | Task `{organizationId, repoId, taskId}` (filtered by sessionId) | `sessionUpdated` | Transcript, draft state |
+| `sandboxProcesses` | SandboxInstance | `processesUpdated` | Process list |
+
+The client subscribes to `app` always, `organization` when entering an organization, `task` when viewing a task, and `session` when viewing a specific session. At most 4 actor connections at a time (app + organization + task + sandbox if terminal is open). The `session` topic reuses the task actor connection and filters by session ID.
+
+### Rules
+
+- Do not add `useQuery` with `refetchInterval` for data that should be push-based.
+- Do not broadcast empty notification events. Events must carry the full new state of the changed entity.
+- Do not re-fetch full snapshots after mutations. The mutation triggers a server-side broadcast with the new entity state; the client replaces it in local state.
+- All event subscriptions go through the subscription manager. Do not create ad-hoc `handle.connect()` + `conn.on()` patterns.
+- Backend mutations that affect sidebar data (task title, status, branch, PR state) must push the updated summary to the parent organization actor, which broadcasts to organization subscribers.
+- Comment architecture-related code: add doc comments explaining the materialized state pattern, why deltas flow the way they do, and the relationship between parent/child actor broadcasts. New contributors should understand the data flow from comments alone.
+
+## Sandbox Architecture
+
+- Structurally, the system supports multiple sandboxes per task, but in practice there is exactly one active sandbox per task. Design features assuming one sandbox per task. If multi-sandbox is needed in the future, extend at that time.
+- Each task has a **primary user** (owner) whose GitHub OAuth credentials are injected into the sandbox for git operations. The owner swaps when a different user sends a message. See `.context/proposal-task-owner-git-auth.md` for the full design.
+- **Security: OAuth token scope.** The user's GitHub OAuth token has `repo` scope, granting full control of all private repositories the user has access to. When the user is the active task owner, their token is injected into the sandbox. This means the agent can read/write ANY repo the user has access to, not just the task's target repo. This is the standard trade-off for OAuth-based git integrations (same as GitHub Codespaces, Gitpod). The user consents to `repo` scope at sign-in time. Credential files in the sandbox are `chmod 600` and overwritten on owner swap.
+- All git operations in the sandbox must be auto-authenticated. Never configure git to prompt for credentials (no interactive `GIT_ASKPASS` prompts). Use a credential store file that is pre-populated with the active owner's token.
+- All git operation errors (push 401, clone failure, branch protection rejection) must surface in the UI with actionable context. Never silently swallow git errors.
+
+## Git State Policy
+
+- The backend stores zero git state. No local clones, no refs, no working trees, and no git-spice.
+- Repository metadata (branches, default branch, pull requests) comes from GitHub API data and webhook events already flowing into the system.
+- All git operations that require a working tree run inside the task's sandbox via `executeInSandbox()`.
+- Do not add backend git clone paths, `git fetch`, `git for-each-ref`, or direct backend git CLI calls. If you need git data, either read stored GitHub metadata or run the command inside a sandbox.
+- The `BackendDriver` has no `GitDriver` or `StackDriver`. Only `GithubDriver` and `TmuxDriver` remain.
+
+## React Hook Dependency Safety
+
+- **Never use unstable references as `useEffect`/`useMemo`/`useCallback` dependencies.** React compares dependencies by reference, not value. Expressions like `?? []`, `?? {}`, `.map(...)`, `.filter(...)`, or object/array literals create new references every render, causing infinite re-render loops when used as dependencies.
+- If the upstream value may be `undefined`/`null` and you need a fallback, either:
+  - Use the raw upstream value as the dependency and apply the fallback inside the effect body: `useEffect(() => { doThing(value ?? []); }, [value]);`
+  - Derive a stable primitive key: `const key = JSON.stringify(value ?? []);` then depend on `key`
+  - Memoize: `const stable = useMemo(() => value ?? [], [value]);`
+- When reviewing code, treat any `?? []`, `?? {}`, or inline `.map()/.filter()` in a dependency array as a bug.
+
+## UI System
+
+- Foundry's base UI system is `BaseUI` with `Styletron`, plus Foundry-specific theme/tokens on top. Treat that as the default UI foundation.
+- The full `BaseUI` reference for available components and guidance on animations, customization, composition, and forms is at `https://base-ui.com/llms.txt`.
+- Prefer existing `BaseUI` components and composition patterns whenever possible instead of building custom controls from scratch.
+- Reuse the established Foundry theme/token layer for colors, typography, spacing, and surfaces instead of introducing ad hoc visual values.
+- If the same UI pattern is shared with the Inspector or other consumers, prefer extracting or reusing it through `@sandbox-agent/react` rather than duplicating it in Foundry.
+- If a requested UI cannot be implemented cleanly with an existing `BaseUI` component, stop and ask the user whether they are sure they want to diverge from the system.
+- In that case, recommend the closest existing `BaseUI` components or compositions that could satisfy the need before proposing custom UI work.
+- Only introduce custom UI primitives when `BaseUI` and existing Foundry patterns are not sufficient, or when the user explicitly confirms they want the divergence.
+- **Styletron atomic CSS rule:** Never mix CSS shorthand properties with their longhand equivalents in the same style object (including nested pseudo-selectors like `:hover`), or in a base styled component whose consumers override with longhand via `$style`. This includes `padding`/`paddingLeft`, `margin`/`marginTop`, `background`/`backgroundColor`, `border`/`borderLeft`, etc. Styletron generates independent atomic classes for shorthand and longhand, so they conflict unpredictably. Use `backgroundColor: "transparent"` instead of `background: "none"` for button resets. Always use longhand properties when any side may be overridden individually.
+
+## Runtime Policy
+
+- Runtime is Bun-native.
+- Use Bun for CLI/backend execution paths and process spawning.
+- Do not add Node compatibility fallbacks for OpenTUI/runtime execution.
+
+## Defensive Error Handling
+
+- Write code defensively: validate assumptions at boundaries and state transitions.
+- If the system reaches an unexpected state, raise an explicit error with actionable context.
+- Do not fail silently, swallow errors, or auto-ignore inconsistent data.
+- Prefer fail-fast behavior over hidden degradation when correctness is uncertain.
+- **Never use bare `catch {}` or `catch { }` blocks.** Every catch must at minimum log the error with `logActorWarning` or `console.warn`. Silent catches hide bugs and make debugging impossible. If a catch is intentionally degrading (e.g. returning empty data when a sandbox is expired), it must still log so operators can see what happened. Use `catch (error) { logActorWarning(..., { error: resolveErrorMessage(error) }); }` or equivalent.
+
+## RivetKit Dependency Policy
+
+For all Rivet/RivetKit implementation:
+
+1. Use SQLite + Drizzle for persistent state.
+2. SQLite is **per actor instance** (per actor key), not a shared backend-global database:
+   - Each actor instance gets its own SQLite DB.
+   - Schema design should assume a single actor instance owns the entire DB.
+   - Do not add `organizationId`/`repoId`/`taskId` columns just to "namespace" rows for a given actor instance; use actor state and/or the actor key instead.
+   - Example: the `task` actor instance already represents `(organizationId, repoId, taskId)`, so its SQLite tables should not need those columns for primary keys.
+3. Do not use backend-global SQLite singletons; database access must go through actor `db` providers (`c.db`).
+4. The default dependency source for RivetKit is the published `rivetkit` package so monorepo installs and CI remain self-contained.
+
+## Rivet Routing
+
+- Mount RivetKit directly on `/v1/rivet` via `registry.handler(c.req.raw)`.
+- Do not add an extra proxy or manager-specific route layer in the backend.
+- Let RivetKit own metadata/public endpoint behavior for `/v1/rivet`.
+
+## Organization + Actor Rules
+
+- Everything is scoped to an organization.
+- Organization resolution order: `--organization` flag -> config default -> `"default"`.
+- `ControlPlaneActor` is replaced by `OrganizationActor` (organization coordinator).
+- Every actor key must be prefixed with organization namespace (`["org", organizationId, ...]`).
+- CLI/TUI/GUI must use `@sandbox-agent/foundry-client` (`packages/client`) for backend access; `rivetkit/client` imports are only allowed inside `packages/client`.
+- Do not add custom backend REST endpoints (no `/v1/*` shim layer).
+- We own the sandbox-agent project; treat sandbox-agent defects as first-party bugs and fix them instead of working around them.
+- Keep strict single-writer ownership: each table/row has exactly one actor writer.
+- Parent actors (`organization`, `task`, `sandbox-instance`) use command-only loops with no timeout.
+- Periodic syncing lives in dedicated child actors with one timeout cadence each.
+- **Task actors must be created lazily** — never during sync or bulk operations. PR sync writes virtual entries to the org's local `taskIndex`/`taskSummaries` tables. The task actor is created on first user interaction via `getOrCreate`. See `packages/backend/CLAUDE.md` "Lazy Task Actor Creation" for details.
+- Do not build blocking flows that wait on external systems to become ready or complete. Prefer push-based progression driven by actor messages, events, webhooks, or queue/workflow state changes.
+- Use workflows/background commands for any repo sync, sandbox provisioning, agent install, branch restack/rebase, or other multi-step external work. Do not keep user-facing actions/requests open while that work runs.
+- `send` policy: always `await` the `send(...)` call itself so enqueue failures surface immediately, but default to `wait: false`.
+- Never self-send with `wait: true` from inside a workflow handler — the workflow processes one message at a time, so the handler would deadlock waiting for the new message to be dequeued.
+- Read paths must not force refresh/sync work inline. Serve the latest cached projection, mark staleness explicitly, and trigger background refresh separately when needed.
+- If a workflow needs to resume after some external work completes, model that as workflow state plus follow-up messages/events instead of holding the original request open.
+- No retries: never add retry loops (`withRetries`, `setTimeout` retry, exponential backoff) anywhere in the codebase. If an operation fails, surface the error immediately. If a dependency is not ready yet, model that explicitly with workflow state and resume from a push/event instead of polling or retry loops.
+- Never throw errors that expect the caller to retry (e.g. `throw new Error("... retry shortly")`). If a dependency is not ready, write the current state to the DB with an appropriate pending status, enqueue the async work, and return successfully. Let the client observe the pending → ready transition via push events.
+- Action return contract: every action that creates a resource must write the resource record to the DB before returning, so the client can immediately query/render it. The record may have a pending status, but it must exist. Never return an ID that doesn't yet have a corresponding DB row.
+
+### Action handler responsiveness
+
+Action handlers must return fast. The pattern:
+
+1. **Creating an entity** — `wait: true` is fine. Do the DB write, return the ID/record. The caller needs the ID to proceed. The record may have a pending status; that's expected.
+2. **Enqueuing work** (sending a message, triggering a sandbox operation, starting a sync) — `wait: false`. Write any precondition state to the DB synchronously, enqueue the work, and return. The client observes progress via push events on the relevant topic (session status, task status, etc.).
+3. **Validating preconditions** — check state synchronously in the action handler *before* enqueuing. If a precondition isn't met (e.g. session not ready, task not initialized), throw an error immediately. Do not implicitly provision missing dependencies or poll for readiness inside the action handler. It is the client's responsibility to ensure preconditions are met before calling the action.
+
+Examples:
+- `createTask` → `wait: true` (returns `{ taskId }`), then enqueue provisioning with `wait: false`. Client sees task appear immediately with pending status, observes `ready` via organization events.
+- `sendWorkspaceMessage` → validate session is `ready` (throw if not), enqueue with `wait: false`. Client observes session transition to `running` → `idle` via session events.
+- `createWorkspaceSession` → `wait: true` (returns `{ sessionId }`), enqueue sandbox provisioning with `wait: false`. Client observes `pending_provision` → `ready` via task events.
+
+Never use `wait: true` for operations that depend on external readiness, sandbox I/O, agent responses, git network operations, polling loops, or long-running queue drains. Never hold an action open while waiting for an external system to become ready — that is a polling/retry loop in disguise.
+
+### Timeout policy
+
+All `wait: true` sends must have an explicit `timeout`. Maximum timeout for any `wait: true` send is **10 seconds** (`10_000`). If an operation cannot reliably complete within 10 seconds, it must be restructured: write the initial record to the DB, return it to the caller, and continue the work asynchronously with `wait: false`. The client observes completion via push events.
+
+`wait: false` sends do not need a timeout (the enqueue is instant; the work runs in the workflow loop with its own step-level timeouts).
+
+### Task creation: resolve metadata before creating the actor
+
+When creating a task, all deterministic metadata (title, branch name) must be resolved synchronously in the organization actor *before* the task actor is created. The task actor must never be created with null `branchName` or `title`.
+
+- Title is derived from the task description via `deriveFallbackTitle()` — pure string manipulation, no external I/O.
+- Branch name is derived from the title via `sanitizeBranchName()` + conflict checking against the repository's task index.
+- The organization actor owns the task index and reads GitHub-backed default branch metadata from the github-data actor. Resolve the branch name there without local git fetches.
+- Do not defer naming to a background provision workflow. Do not poll for names to become available.
+- The `onBranch` path (attaching to an existing branch) and the new-task path should both produce a fully-named task record on return.
+- Actor handle policy:
+- Prefer explicit `get` or explicit `create` based on workflow intent; do not default to `getOrCreate`.
+- Use `get`/`getForId` when the actor is expected to already exist; if missing, surface an explicit `Actor not found` error with recovery context.
+- Use create semantics only on explicit provisioning/create paths where creating a new actor instance is intended.
+- `getOrCreate` is a last resort for create paths when an explicit create API is unavailable; never use it in read/command paths.
+- For long-lived cross-actor links (for example sandbox/session runtime access), persist actor identity (`actorId`) and keep a fallback lookup path by actor id.
+- RivetKit actor `c.state` is durable, but in Docker it is stored under `/root/.local/share/rivetkit`. If that path is not persisted, actor state-derived indexes can be lost after container recreation even when other data still exists.
+- Workflow history divergence policy:
+- Production: never auto-delete actor state to resolve `HistoryDivergedError`; ship explicit workflow migrations (`ctx.removed(...)`, step compatibility).
+- Development: manual local state reset is allowed as an operator recovery path when migrations are not yet available.
+- Storage rule of thumb:
+- Put simple metadata in `c.state` (KV state): small scalars and identifiers like `{ taskId }`, `{ repoId }`, booleans, counters, timestamps, status strings.
+- If it grows beyond trivial (arrays, maps, histories, query/filter needs, relational consistency), use SQLite + Drizzle in `c.db`.
+
+## Testing Policy
+
+- Never use vitest mocks (`vi.mock`, `vi.spyOn`, `vi.fn`). Instead, define driver interfaces for external I/O and pass test implementations via the actor runtime context.
+- All external service calls (git CLI, GitHub CLI, sandbox-agent HTTP, tmux) must go through the `BackendDriver` interface on the runtime context.
+- Integration tests use `setupTest()` from `rivetkit/test` and are gated behind `HF_ENABLE_ACTOR_INTEGRATION_TESTS=1`.
+- End-to-end testing must run against the dev backend started via `docker compose -f compose.dev.yaml up` (host -> container). Do not run E2E against an in-process test runtime.
+  - E2E tests should talk to the backend over HTTP (default `http://127.0.0.1:7741/v1/rivet`) and use real GitHub repos/PRs.
+  - For Foundry live verification, use `rivet-dev/sandbox-agent-testing` as the default testing repo unless the task explicitly says otherwise.
+  - Secrets (e.g. `OPENAI_API_KEY`, `GITHUB_TOKEN`/`GH_TOKEN`) must be provided via environment variables, never hardcoded in the repo.
+  - `~/misc/env.txt` and `~/misc/the-foundry.env` contain the expected local OpenAI + GitHub OAuth/App config for dev.
+  - For local GitHub webhook development, use the configured Smee proxy (`SMEE_URL`) to forward deliveries into `POST /v1/webhooks/github`. Check `.env` / `foundry/.env` if you need the current channel URL.
+  - If GitHub repos, PRs, or install state are not showing up, verify that the GitHub App is installed for the organization and that webhook delivery is enabled and healthy. Foundry depends on webhook events for GitHub-backed state; missing webhooks means the product will appear broken.
+  - Do not assume `gh auth token` is sufficient for Foundry task provisioning against private repos. Sandbox/bootstrap git clone, push, and PR flows require a repo-capable `GITHUB_TOKEN`/`GH_TOKEN` in the backend container.
+  - Preferred product behavior for organizations is to mint a GitHub App installation token from the organization installation and inject it into backend/sandbox git operations. Do not rely on an operator's ambient CLI auth as the long-term solution.
+- Treat client E2E tests in `packages/client/test` as the primary end-to-end source of truth for product behavior.
+- Keep backend tests small and targeted. Only retain backend-only tests for invariants or persistence rules that are not well-covered through client E2E.
+- Do not keep large browser E2E suites around in a broken state. If a frontend browser E2E is not maintained and producing signal, remove it until it can be replaced with a reliable test.
+
+## Config
+
+- Keep config path at `~/.config/foundry/config.toml`.
+- Evolve properties in place; do not move config location.
+
+## Project Guidance
+
+Project-specific guidance lives in `README.md`, `CONTRIBUTING.md`, and the relevant files under `research/`.
+
+Keep those updated when:
+
+- Commands change
+- Configuration options change
+- Architecture changes
+- Plugins/providers change
+- Actor ownership changes
+
+## Friction Logs
+
+Track friction at:
+
+- `research/friction/rivet.mdx`
+- `research/friction/sandbox-agent.mdx`
+- `research/friction/sandboxes.mdx`
+- `research/friction/general.mdx`
+
+Category mapping:
+
+- `rivet`: Rivet/RivetKit runtime, actor model, queues, keys
+- `sandbox-agent`: sandbox-agent SDK/API behavior
+- `sandboxes`: provider implementations (worktree/daytona/etc)
+- `general`: everything else
+
+Each entry must include:
+
+- Date (`YYYY-MM-DD`)
+- Commit SHA (or `uncommitted`)
+- What you were implementing
+- Friction/issue
+- Attempted fix/workaround and outcome
+
+## Audit Log Events
+
+Log notable workflow changes to `events` so the audit log remains complete:
+
+- create
+- attach
+- push/sync/merge
+- archive/kill
+- status transitions
+- PR state transitions
+
+When adding new task/workspace commands, always add a corresponding audit log event.
+
+## Validation After Changes
+
+Always run and fix failures:
+
+```bash
+pnpm -w typecheck
+pnpm -w build
+pnpm -w test
+```
+
+After making code changes, always update the dev server before declaring the work complete. If the dev stack is running through Docker Compose, restart or recreate the relevant dev services so the running app reflects the latest code.
diff --git a/foundry/CONTRIBUTING.md b/foundry/CONTRIBUTING.md
new file mode 100644
index 0000000..29875a9
--- /dev/null
+++ b/foundry/CONTRIBUTING.md
@@ -0,0 +1,64 @@
+# Contributing
+
+## Development Setup
+
+1. Clone:
+
+```bash
+git clone https://github.com/rivet-dev/sandbox-agent.git
+cd sandbox-agent/foundry
+```
+
+2. Install dependencies:
+
+```bash
+pnpm install
+```
+
+3. Build all packages:
+
+```bash
+pnpm -w build
+```
+
+## Package Layout
+
+- `packages/shared`: contracts/schemas
+- `packages/backend`: RivetKit actors + DB + providers + integrations
+- `packages/cli`: `hf` and `hf tui` (OpenTUI)
+
+## Local RivetKit Dependency
+
+Build local RivetKit before backend changes that depend on Rivet internals:
+
+```bash
+cd ../rivet
+pnpm build -F rivetkit
+
+cd /path/to/sandbox-agent/foundry
+just sync-rivetkit
+```
+
+## Validation
+
+Run before opening a PR:
+
+```bash
+pnpm -w typecheck
+pnpm -w build
+pnpm -w test
+```
+
+## Dev Backend (Docker Compose)
+
+Start the dev backend (hot reload via `bun --watch`) and Vite frontend via Docker Compose:
+
+```bash
+just foundry-dev
+```
+
+Stop it:
+
+```bash
+just foundry-dev-down
+```
diff --git a/foundry/FOUNDRY-CHANGES.md b/foundry/FOUNDRY-CHANGES.md
new file mode 100644
index 0000000..2bd76d2
--- /dev/null
+++ b/foundry/FOUNDRY-CHANGES.md
@@ -0,0 +1,1456 @@
+# Foundry Planned Changes
+
+## How to use this document
+
+Work through items checking boxes as you go. Some items have dependencies — do not start an item until its dependencies are checked off. After each item, run `pnpm -w typecheck && pnpm -w build && pnpm -w test` to validate. If an item includes a "CLAUDE.md update" section, apply it in the same change. Commit after each item passes validation.
+
+## Progress Log
+
+- 2026-03-14 10: Initial architecture mapping complete.
+  - Confirmed the current hot spots match the spec: `auth-user` is still mutation-by-action, `history` is still a separate actor with an `append` action wrapper, organization still owns `taskLookup`/`taskSummaries`, and the `Workbench*` surface is still shared across backend/client/frontend.
+  - Started foundational rename and migration planning for items `1`, `6`, and `25` because they drive most of the later fallout.
+- 2026-03-14 11: Audit-log rename slice landed.
+  - Renamed the backend actor from `history` to `audit-log`, switched the queue name to `auditLog.command.append`, and removed the `append` action wrapper.
+  - Updated task/repository/organization call sites to send directly to the audit-log queue or read through the renamed audit-log handle.
+- 2026-03-14 12: Foundational naming and dead-surface cleanup landed.
+  - Renamed the backend auth actor surface from `authUser` to `user`, including actor registration, key helpers, handles, and Better Auth service routing.
+  - Deleted the dead `getTaskEnriched` / `enrichTaskRecord` fan-out path and changed organization task reads to go straight to the task actor.
+  - Renamed admin-only GitHub rebuild/reload actions with the `admin*` prefix across backend, client, and frontend.
+  - Collapsed organization realtime to full-snapshot `organizationUpdated` events and aligned task events to `type: "taskUpdated"`.
+- 2026-03-14 13: Task schema migration cleanup landed.
+  - Removed the task actor's runtime `CREATE TABLE IF NOT EXISTS` / `ALTER TABLE` helpers from `task/workbench.ts` and `task/workflow/init.ts`.
+  - Updated the checked-in task migration artifacts so the schema-defined task/session/runtime columns are created directly by migrations.
+- 2026-03-14 14: Item 3 blocker documented.
+  - The spec's requested literal singleton `CHECK (id = 1)` on the Better Auth `user` table conflicts with the existing Better Auth adapter contract, which relies on external string `user.id`.
+  - Proceeding safely will require a design adjustment for that table rather than a straight mechanical migration.
+- 2026-03-14 15: Better Auth mapping comments landed.
+  - Added Better Auth vs custom Foundry table/action comments in the user and organization actor schema/action surfaces so the adapter-constrained paths are explicit.
+- 2026-03-15 09: Branch rename surface deleted and stale organization subscription fixed.
+  - Removed the remaining branch-rename surface from the client, mock backend, frontend UI, and repository action layer. There are no remaining `renameBranch` / `renameWorkbenchBranch` references in Foundry.
+  - Fixed the remote backend client to listen for `organizationUpdated` on the organization connection instead of the dead `workspaceUpdated` event name.
+- 2026-03-15 10: Backend workspace rename landed.
+  - Renamed the backend task UI/workflow surface from `workbench` to `workspace`, including the task actor file, queue topic family, organization proxy actions, and the task session table name (`task_workspace_sessions`).
+  - Backend actor code no longer contains `Workbench` / `workbench` references, so the remaining shared/client/frontend rename can align to a stable backend target.
+- 2026-03-15 11: Default model moved to user-scoped app state.
+  - Removed `defaultModel` from the organization schema/snapshot and stored it on the user profile instead, exposed through the app snapshot as a user preference.
+  - Wired `setAppDefaultModel` through the backend/app clients and changed the model picker to persist the starred/default model instead of resetting local React state on reload.
+- 2026-03-15 11: Workspace surface completed across Foundry packages.
+  - Renamed the shared/client/frontend surface from `Workbench` to `Workspace`, including `workspace.ts`, workspace client/model files, DTO/type names, backend-client method names, frontend view-model imports, and the affected e2e/test files.
+  - Verified that Foundry backend/shared/client/frontend packages no longer contain `Workbench` / `workbench` references.
+- 2026-03-15 11: Singleton constraints tightened where safe.
+  - Added `CHECK (id = 1)` enforcement for `github_meta`, `repo_meta`, `organization_profile`, and `user_profiles`, and updated the affected code paths/migrations to use row id `1`.
+  - The Better Auth `user` table remains blocked by the adapter contract, so item `3` is still open overall.
+- 2026-03-14 12: Confirmed blocker for later user-table singleton work.
+  - Item `3` conflicts with the current Better Auth adapter contract for the `user` table: the adapter depends on the external string `user.id`, while the spec also asks for a literal singleton `CHECK (id = 1)` on that same table.
+  - That cannot be applied mechanically without redesigning the Better Auth adapter contract or introducing a separate surrogate identity column. I have not forced that change yet.
+- 2026-03-15 13: Task/repository durable-state cleanup and auth-scoped workspace reads landed.
+  - Removed the remaining task/repository actor durable-state duplication: task `createState` now holds only `(organizationId, repoId, taskId)`, repository `createState` now holds only `(organizationId, repoId)`, task initialization seeds SQLite from the initialize queue payload, and task record reads fetch `repoRemote` through repository metadata instead of stale actor state.
+  - Removed the repository creation-time `remoteUrl` dependency from actor handles/callers and changed repository metadata to backfill/persist `remoteUrl` from GitHub data when needed.
+  - Wired Better Auth session ids through the remote client workspace/task-detail reads and through the task workflow queue handlers so user-scoped workspace state is no longer dropped on the floor by the organization/task proxy path.
+- 2026-03-15 14: Coordinator routing boundary tightened.
+  - Removed the organization actor's fallback `taskId -> repoId` scan across repositories; task proxy actions now require `repoId` and route directly to the repository/task coordinator path the client already uses.
+  - Updated backend architecture notes to reflect the live repo-owned task projection (`tasks`) and the removal of the old organization-owned `taskLookup` / `taskSummaries` indexes.
+- 2026-03-15 15: Workspace session-selection and dead task-status cleanup landed.
+  - Surfaced viewer-scoped `activeSessionId` through workspace task summary/detail DTOs, threaded it through the backend/client/mock surfaces, and added a dedicated workspace `select_session` mutation so session-tab selection now persists in `user_task_state` instead of living only in frontend local state.
+  - Removed dead task `diffStat` and sandbox `statusMessage` fields from the live workspace/task contracts and backend writes, and updated stale frontend/mock/e2e consumers to stop reading them.
+- 2026-03-15 16: GitHub sync progress is now live on the organization topic.
+  - Added persisted GitHub sync phase/generation/progress fields to the github-data actor meta row and the organization profile projection, and exposed them through `organizationUpdated` snapshots so workspace consumers no longer wait on stale app-topic state during repo imports.
+  - Chunked branch and pull-request fetches by repository batches, added generation markers to imported GitHub rows, switched sync refreshes to upsert+sweep instead of delete-then-replace, and updated the workspace shell/dev panel to show live sync phase progress from the organization subscription.
+- 2026-03-15 17: Foundry-local model lists now route through shared Sandbox Agent config resources.
+  - Removed the remaining duplicated hardcoded model tables from the frontend/client workspace view-model layer and switched backend default-model / agent-inference fallbacks to the shared catalog helpers in `shared/src/models.ts`.
+  - Updated mock/default app state to stop seeding deleted `claude-sonnet-4` / `claude-opus-4` ids, and aligned the user-profile default-model migration fallback with the shared catalog default.
+- 2026-03-15 17: Shared model catalog moved off the old fixed union.
+  - Replaced the shared `WorkspaceModelId` closed union with string ids, introduced a shared model catalog derived from the sandbox-agent agent-config resources, and switched the client/frontend picker label helpers to consume that catalog instead of maintaining separate hardcoded `MODEL_GROUPS` arrays.
+  - Updated backend default-model and model→agent fallback logic to use the shared catalog/default id, and relaxed e2e env parsing so new sandbox-agent model ids can flow through without patching Foundry first.
+- 2026-03-15 18: Workspace task status collapsed to a single live field.
+  - Removed the duplicate `runtimeStatus` field from workspace task/detail DTOs and all current backend/client/frontend consumers, so workspace task `status` is now the only task-state field on that surface.
+  - Removed the remaining synthetic `"new"` task status from the live workspace path; mock task creation now starts in the first concrete init state instead of exposing a frontend-only status.
+- 2026-03-15 19: GitHub sync now persists branch and PR batches as they are fetched.
+  - The branch and pull-request phases now upsert each fetched repository batch immediately and only sweep stale rows after the phase completes, instead of buffering the full dataset in memory until the end of the sync.
+  - This aligns chunked progress reporting with chunked persistence and tightens recovery behavior for large repository imports.
+- 2026-03-15 20: Repository-owned task projection artifacts are now aligned with runtime.
+  - Removed the last stale `task_lookup` Drizzle artifacts from the organization actor so the checked-in schema snapshots match the live repository-owned `tasks` projection.
+  - There are no remaining org/repo runtime references to the old org-side task lookup table.
+- 2026-03-15 21: Legacy task/runtime fields are fully gone from the live Foundry surface.
+  - Confirmed the old task-table/runtime fields from item `21` are removed across backend/shared/client/frontend, and renamed the last leftover `agentTypeForModel()` helper to the neutral `sandboxAgentIdForModel()`.
+  - Deleted the final dead frontend diff-stat formatter/test that only referenced already-removed task diff state.
+- 2026-03-15 22: Task status tracking is now fully collapsed to the canonical task status enum.
+  - With the earlier backend `statusMessage` removal plus this turn's workspace contract cleanup, the workspace/task surface now derives all task status UI from the canonical backend `status` enum.
+  - There are no remaining live workspace `runtimeStatus` or synthetic `"new"` task-state branches.
+- 2026-03-15 23: Per-user workspace UI state is fully sourced from the user actor overlay.
+  - Confirmed the shared task actor no longer stores per-user `activeSessionId`, unread, or draft columns; those values are persisted in `user_task_state` and only projected back into workspace DTOs for the current viewer.
+  - The remaining active-session/unread/draft references in client/frontend code are consumer fields of that user-scoped overlay, not shared task-actor storage.
+- 2026-03-15 24: Subscription topics are now fully normalized to single-snapshot events.
+  - Confirmed the shared realtime contracts now expose one full replacement event per topic (`appUpdated`, `organizationUpdated`, `taskUpdated`, `sessionUpdated`, `processesUpdated`) with matching wire event names and type fields.
+  - The client subscription manager already treats organization/task topics as full-snapshot refreshes, so there are no remaining multi-variant organization events or `taskDetailUpdated` name mismatches in live code.
+- 2026-03-15 25: Sidebar PR/task split dead branches trimmed further.
+  - Removed the remaining dead `pr:`-id sidebar branch and switched the workspace sidebar to the real `pullRequest.isDraft` field instead of stale `pullRequest.status` reads.
+  - This does not finish item `15`, but it reduces the remaining synthetic PR/task split surface in the frontend.
+- 2026-03-15 26: User-actor mutations now flow through a dedicated workflow queue.
+  - Added [user/workflow.ts](/home/nathan/sandbox-agent/foundry/packages/backend/src/actors/user/workflow.ts) plus shared query helpers, wired the user actor up with explicit queue names, and moved auth/profile/session/task-state mutations behind workflow handlers instead of direct action bodies.
+- 2026-03-15 27: Organization GitHub/shell/billing mutations now route through workflow queues.
+  - Added shared organization queue definitions in `organization/queues.ts`, taught the organization workflow to handle the remaining GitHub projection, org-profile, and billing mutation commands, and switched the app-shell, Better Auth, GitHub-data actor, and org-isolation test to send queue messages instead of calling direct org mutation actions.
+  - Deleted the dead organization shell mutation actions that no longer had callers (`applyOrganizationSyncCompleted`, `markOrganizationSyncFailed`, `applyGithubInstallationCreated`, `applyGithubInstallationRemoved`, `applyGithubRepositoryChanges`), which moves items `4`, `10`, and `12` forward even though the broader org action split is still open.
+- 2026-03-15 28: Organization action split trimmed more of the monolith and removed dead event types.
+  - Moved `starSandboxAgentRepo` into `organization/actions/onboarding.ts` and the admin GitHub reload actions into `organization/actions/github.ts`, so `organization/actions.ts` is carrying fewer unrelated app-shell responsibilities.
+  - Deleted the dead backend-only `actors/events.ts` type file after confirming nothing in Foundry still imports those old task/PR event interfaces.
+- 2026-03-15 29: Repo overview branch rows now carry a single PR object.
+  - Replaced the repo-overview branch DTO's scalar PR fields (`prNumber`, `prState`, `prUrl`, `reviewStatus`, `reviewer`) with `pullRequest: WorkspacePullRequestSummary | null`, and updated repository overview assembly plus the organization dashboard to consume that unified PR shape.
+  - This does not finish item `15`, but it removes another synthetic PR-only read surface and makes the repo overview align better with the task summary PR model.
+- 2026-03-15 30: Repo overview stopped falling back to raw GitHub PR rows.
+  - Changed repository overview assembly to read PR metadata only from the repo-owned task projection instead of rejoining live GitHub PR rows on read, so the dashboard is one step closer to treating PRs as task data rather than a separate UI entity.
+- 2026-03-15 31: GitHub organization-shell repair now uses the org workflow queue.
+  - Converted `syncOrganizationShellFromGithub` from a direct org action into a workflow-backed mutation command and updated the GitHub org sync path to send `organization.command.github.organization_shell.sync_from_github` instead of calling the action directly.
+  - Updated Better Auth adapter writes and task user-overlay writes to send directly to the user workflow queue, which partially lands item `4` and sets up item `11` for the user actor.
+- 2026-03-15 27: Workflow layout standardized and queue-only write paths expanded.
+  - Split the remaining inline actor workflows into dedicated files for `audit-log`, `repository`, `github-data`, and `organization`, and moved user read actions into `user/actions/*` with Better Auth-prefixed action names.
+  - Removed the task actor's public mutation action wrappers entirely, moved organization/repository/github-data/task coordination onto direct queue sends, and made repository metadata reads stop mutating `repo_meta` on cache misses.
+- 2026-03-15 28: PR-only admin/UI seams trimmed and PR branches now claim real tasks.
+  - Removed the remaining dedicated "reload pull requests" / "reload pull request" admin hooks from the backend/client/frontend surfaces and deleted the sidebar PR-only context action.
+  - Repository PR refresh now lazily creates a branch-owned task when a pull request arrives for an unclaimed branch, so PR-only branches stop living purely as a side table in GitHub sync flows.
+- 2026-03-15 29: Organization Better Auth writes now use workflow queues.
+  - Split the organization actor's Better Auth routing and verification reads into `organization/actions/better-auth.ts`, moved `APP_SHELL_ORGANIZATION_ID` to `organization/constants.ts`, and renamed the org Better Auth read surface to the `betterAuth*` form.
+  - Added dedicated organization workflow queue handlers for session/email/account index writes plus verification CRUD, and updated `services/better-auth.ts` to send those mutations directly to organization queues instead of calling mutation actions.
+- 2026-03-15 30: Shared model routing metadata is now centralized.
+  - Extended the shared model catalog with explicit `agentKind` and `sandboxAgentId` metadata, changed `WorkspaceAgentKind` to a dynamic string, and switched backend task session creation to resolve sandbox agent ids through the shared catalog instead of hardcoded `Codex` vs `Claude` branching.
+  - Updated the mock app/workspace and frontend model picker/new-task flows to consume the shared catalog/default model instead of forcing stale `Claude`/`Codex` fallbacks or a baked-in `gpt-5.3-codex` create-task default.
+- 2026-03-15 31: Dead GitHub-data PR reload surface removed and fixture PR shapes aligned.
+  - Deleted the unused GitHub-data `reloadPullRequest` workflow command plus the dead `listOpenPullRequests` / `getPullRequestForBranch` action surface that no longer has live Foundry callers.
+  - Fixed the stale client `workspace-model.ts` pull-request fixtures to use the live `WorkspacePullRequestSummary` shape, which removes the last targeted client type errors in the touched slice.
+- 2026-03-15 32: Organization action splitting continued past Better Auth.
+  - Moved the app snapshot/default-model/org-profile actions into `organization/actions/organization.ts`, onboarding actions into `organization/actions/onboarding.ts`, and app-level GitHub token/import actions into `organization/actions/github.ts`, then composed those files at the actor boundary.
+  - `organization/app-shell.ts` now exports shared helpers for those domains and no longer directly defines the moved action handlers, shrinking the remaining monolith and advancing item `10`.
+- 2026-03-15 33: Task PR detail now reads the repository-owned task projection.
+  - Removed duplicate scalar PR fields from `TaskRecord` and `WorkspaceTaskDetail`, switched the remaining frontend/client consumers to the canonical `pullRequest` object, and trimmed stale mock/test scaffolding that still populated those dead fields.
+  - Replaced the task actor's PR lookup path with a repository projection read (`getProjectedTaskSummary`) so task detail/summary no longer ask the repo actor to re-query GitHub PR rows by branch.
+- 2026-03-15 34: Workspace model catalogs now come from the live sandbox-agent API.
+  - Added a shared normalizer for `/v1/agents?config=true` payloads, exposed sandbox-scoped `listWorkspaceModelGroups()` from the task sandbox actor, and switched backend workspace session creation to resolve sandbox agent ids from the live sandbox catalog instead of only the checked-in default tables.
+  - Updated the frontend workspace model picker to query the active sandbox for model groups and use that live catalog for labels/options, while keeping the shared default catalog only as a fallback when no sandbox is available yet or the sandbox-agent connection is unavailable.
+- 2026-03-15 35: Backend-only organization snapshot refresh is now queue-backed.
+  - Added `organization.command.snapshot.broadcast` to the organization workflow, switched repository and app-import callers to send that queue message instead of calling the organization actor's `refreshOrganizationSnapshot` action directly, and removed the direct action wrapper.
+  - Deleted the dead `adminReconcileWorkspaceState` organization action/interface entry after confirming nothing in Foundry still calls it.
+- 2026-03-15 36: Dead backend actor export cleanup continued.
+  - Removed the stale `export * from "./events.js"` line from `backend/src/actors/index.ts`, which was left behind after deleting the dead backend event type file.
+  - This keeps the backend actor barrel aligned with the live file set and advances the final dead-code/event audit.
+- 2026-03-15 34: Item 17 removed from this checklist; do not leave started items half-finished.
+  - By request, item `17` (`Type all actor context parameters — remove c: any`) is deferred out of this Foundry task and should not block completion here.
+  - Process note for the remaining checklist work: once an item is started, finish that item to completion before opening a different partial seam. Item `15` is the current priority under that rule.
+- 2026-03-15 35: Task/PR unification now routes live PR changes through repository-owned task summaries only.
+  - GitHub PR sync and webhook handling now send concrete PR summaries directly to the repository coordinator, which lazily creates a real branch-owned task when needed and persists PR metadata on the task projection instead of re-querying raw `github_pull_requests` rows from repository reads.
+  - Cleared the last stale scalar PR test references (`prUrl`, `reviewStatus`, `reviewer`) so the remaining Foundry surfaces consistently use the canonical `pullRequest` object.
+- 2026-03-15 36: Organization action entrypoints are now fully organized under `actions/`, and the public mutation surface is queue-only.
+  - Moved organization task/workspace proxy actions plus `createTaskMutation` into `organization/actions/tasks.ts`, added `organization/actions/app.ts` so every composed org action bundle now lives under `organization/actions/*`, and removed dead `app-shell` exports that no longer had external callers.
+  - Audited the remaining public organization actor actions and confirmed the write paths go through organization/repository/task/github-data workflow queues instead of direct mutation actions, which closes item `4` and item `10`.
+- 2026-03-15 37: Organization dead-code audit completed.
+  - Removed the leftover exported-only Better Auth predicate helper from `organization/actions/better-auth.ts`; it is now module-private because nothing outside that file uses it.
+  - Audited the remaining organization actor surface and confirmed the live public reads/writes still in use are the composed `actions/*` bundles plus workflow mutation helpers. There are no remaining dead org action exports from the pre-refactor monolith.
+- 2026-03-15 38: Final dead-event and dead-surface audit completed for the in-scope Foundry refactor.
+  - Confirmed the live Foundry realtime topics each have a single event type (`appUpdated`, `organizationUpdated`, `taskUpdated`, `sessionUpdated`), and the deleted legacy event names (`workspaceUpdated`, `taskSummaryUpdated`, `taskDetailUpdated`, `pullRequestUpdated`, `pullRequestRemoved`) no longer exist in live Foundry code.
+  - Re-audited the major removed compatibility seams (`Workbench`, branch rename, PR-only sidebar ids, duplicate runtime task status, `getTaskEnriched`, organization-owned task lookup tables) and found no remaining live references beyond expected domain strings like GitHub webhook event names or CLI `pr` labels.
+- 2026-03-15 39: Item 15 was finished for real by moving PR ownership into the task actor.
+  - Added task-local `pull_request_json` storage, switched task detail/summary reads to the task DB, and added `task.command.pull_request.sync` so GitHub/repository flows update PR metadata through the task coordinator instead of overlaying it in the repository projection.
+  - The mock right sidebar now trusts the canonical `task.pullRequest.url` field instead of rebuilding a PR URL from repo name + PR number.
+- 2026-03-15 40: Better Auth user singleton constraint is now enforced without breaking the adapter contract.
+  - The user actor's `user` table now uses an integer singleton primary key with `CHECK (id = 1)` plus a separate `auth_user_id` column for Better Auth's external string identity.
+  - Updated the user actor query/join/mutation helpers so Better Auth still reads and writes logical `user.id` as the external string id while SQLite enforces the singleton row invariant locally.
+
+No backwards compatibility — delete old code, don't deprecate. If something is removed, remove it everywhere (backend, client, shared types, frontend, tests, mocks).
+
+### Suggested execution order (respects dependencies)
+
+**Wave 1 — no dependencies, can be done in any order:**
+1, 2, 3, 4, 5, 6, 13, 16, 20, 21, 23, 25
+
+**Wave 2 — depends on wave 1:**
+7 (after 1), 9 (after 13), 10 (after 1+6), 11 (after 4), 22 (after 1), 24 (after 21), 26 (after 25)
+
+**Wave 3 — depends on wave 2:**
+8 (after 7+25), 12 (after 10), 15 (after 9+13), 19 (after 21+24)
+
+**Wave 4 — depends on wave 3:**
+14 (after 15)
+
+**Final:**
+18 (after everything), final audit pass (after everything)
+
+### Index
+
+- [x] 1. Rename Auth User actor → User actor
+- [x] 2. Add Better Auth mapping comments to user/org actor tables
+- [x] 3. Enforce `id = 1` CHECK constraint on single-row tables
+- [x] 4. Move all mutation actions to queue messages
+- [x] 5. Migrate task actor raw SQL to Drizzle migrations
+- [x] 6. Rename History actor → Audit Log actor
+- [x] 7. Move starred/default model to user actor settings *(depends on: 1)*
+- [x] 8. Replace hardcoded model/agent lists with sandbox-agent API data *(depends on: 7, 25)*
+- [x] 9. Flatten `taskLookup` + `taskSummaries` into single `tasks` table *(depends on: 13)*
+- [x] 10. Reorganize user and org actor actions into `actions/` folders *(depends on: 1, 6)*
+- [x] 11. Standardize workflow file structure across all actors *(depends on: 4)*
+- [x] 12. Audit and remove dead code in organization actor *(depends on: 10)*
+- [x] 13. Enforce coordinator pattern and fix ownership violations
+- [x] 14. Standardize one event per subscription topic *(depends on: 15)*
+- [x] 15. Unify tasks and pull requests — PRs are just task data *(depends on: 9, 13)*
+- [x] 16. Chunk GitHub data sync and publish progress
+- [x] 18. Final pass: remove all dead code *(depends on: all other items)*
+- [x] 19. Remove duplicate data between `c.state` and SQLite *(depends on: 21, 24)*
+- [x] 20. Prefix admin/recovery actions with `admin`
+- [x] 21. Remove legacy/session-scoped fields from task table
+- [x] 22. Move per-user UI state from task actor to user actor *(depends on: 1)*
+- [x] 23. Delete `getTaskEnriched` and `enrichTaskRecord` (dead code)
+- [x] 24. Clean up task status tracking *(depends on: 21)*
+- [x] 25. Remove "Workbench" prefix from all types, functions, files, tables
+- [x] 26. Delete branch rename (branches immutable after creation) *(depends on: 25)*
+- [x] Final audit pass: dead events scan *(depends on: all other items)*
+
+Deferred follow-up outside this checklist:
+
+- 17. Type all actor context parameters — remove `c: any` *(removed from this task's scope by request)*
+
+---
+
+## [ ] 1. Rename Auth User actor → User actor
+
+**Rationale:** The actor is already a single per-user actor storing all user data. The "Auth" prefix is unnecessary.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/auth-user/`** → rename directory to `user/`
+  - `index.ts` — rename export `authUser` → `user`, display name `"Auth User"` → `"User"`
+  - `db/schema.ts`, `db/db.ts`, `db/migrations.ts`, `db/drizzle.config.ts` — update any auth-prefixed references
+- **`foundry/packages/backend/src/actors/keys.ts`** — `authUserKey()` → `userKey()`
+- **`foundry/packages/backend/src/actors/handles.ts`** — `getOrCreateAuthUser` → `getOrCreateUser`, `getAuthUser` → `getUser`, `selfAuthUser` → `selfUser`
+- **`foundry/packages/backend/src/actors/index.ts`** — update import path and registration
+- **`foundry/packages/backend/src/services/better-auth.ts`** — update all `authUser` references
+- **Action names** — consider dropping "Auth" prefix from `createAuthRecord`, `findOneAuthRecord`, `updateAuthRecord`, `deleteAuthRecord`, `countAuthRecords`, etc.
+
+---
+
+## [ ] 2. Add Better Auth mapping comments to user/org actor tables, actions, and queues
+
+**Rationale:** The user and organization actors contain a mix of Better Auth-driven and custom Foundry code. Tables, actions, and queues that exist to serve Better Auth's adapter need comments so developers know which pieces are constrained by Better Auth's schema/contract and which are ours to change freely.
+
+### Table mapping
+
+| Actor | Table | Better Auth? | Notes |
+|---|---|---|---|
+| user | `user` | Yes — 1:1 `user` model | All fields from Better Auth |
+| user | `session` | Yes — 1:1 `session` model | All fields from Better Auth |
+| user | `account` | Yes — 1:1 `account` model | All fields from Better Auth |
+| user | `user_profiles` | No — custom Foundry | GitHub login, role, eligible orgs, starter repo status |
+| user | `session_state` | No — custom Foundry | Active organization per session |
+| org | `auth_verification` | Yes — Better Auth `verification` model | Lives on org actor because verification happens before user exists |
+| org | `auth_session_index` | No — custom routing index | Maps session tokens → user actor IDs for Better Auth adapter routing |
+| org | `auth_email_index` | No — custom routing index | Maps emails → user actor IDs for Better Auth adapter routing |
+| org | `auth_account_index` | No — custom routing index | Maps OAuth accounts → user actor IDs for Better Auth adapter routing |
+
+### Action/queue mapping (user actor)
+
+| Action/Queue | Better Auth? | Notes |
+|---|---|---|
+| `createAuthRecord` | Yes — Better Auth adapter | Called by Better Auth adapter to create user/session/account records |
+| `findOneAuthRecord` | Yes — Better Auth adapter | Called by Better Auth adapter for single-record lookups with joins |
+| `findManyAuthRecords` | Yes — Better Auth adapter | Called by Better Auth adapter for multi-record queries |
+| `updateAuthRecord` | Yes — Better Auth adapter | Called by Better Auth adapter to update records |
+| `updateManyAuthRecords` | Yes — Better Auth adapter | Called by Better Auth adapter for bulk updates |
+| `deleteAuthRecord` | Yes — Better Auth adapter | Called by Better Auth adapter to delete records |
+| `deleteManyAuthRecords` | Yes — Better Auth adapter | Called by Better Auth adapter for bulk deletes |
+| `countAuthRecords` | Yes — Better Auth adapter | Called by Better Auth adapter for count queries |
+| `getAppAuthState` | No — custom Foundry | Aggregates auth state for frontend consumption |
+| `upsertUserProfile` | No — custom Foundry | Manages Foundry-specific user profile data |
+| `upsertSessionState` | No — custom Foundry | Manages Foundry-specific session state |
+
+### Action/queue mapping (organization actor app-shell)
+
+| Action/Queue | Better Auth? | Notes |
+|---|---|---|
+| App-shell auth index CRUD actions | Yes — Better Auth adapter routing | Maintain lookup indexes so the adapter can route by session/email/account to the correct user actor |
+| `auth_verification` CRUD | Yes — Better Auth `verification` model | Used for email verification and password resets |
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/auth-user/db/schema.ts`** — add doc comments to each table:
+  - `user`, `session`, `account`: "Better Auth core model — schema defined at https://better-auth.com/docs/concepts/database"
+  - `user_profiles`, `session_state`: "Custom Foundry table — not part of Better Auth"
+- **`foundry/packages/backend/src/actors/auth-user/index.ts`** — add doc comments to each action/queue:
+  - Better Auth adapter actions: "Better Auth adapter — called by the Better Auth adapter in better-auth.ts. Schema constrained by Better Auth."
+  - Custom actions: "Custom Foundry action — not part of Better Auth"
+- **`foundry/packages/backend/src/actors/organization/db/schema.ts`** — add doc comments to `auth_verification` (Better Auth core), and the three index tables (Better Auth adapter routing)
+- **`foundry/packages/backend/src/actors/organization/app-shell.ts`** — add doc comments to auth index actions marking them as Better Auth adapter routing infrastructure
+
+---
+
+## [x] 3. Enforce `id = 1` CHECK constraint on all single-row actor tables
+
+**Rationale:** When an actor instance represents a single entity, tables that hold exactly one row should enforce this at the DB level with a `CHECK (id = 1)` constraint. The task actor already does this correctly; other actors don't.
+
+### Tables needing the constraint
+
+| Actor | Table | Current enforcement | Fix needed |
+|---|---|---|---|
+| auth-user (→ user) | `user` | None | Add `CHECK (id = 1)`, use integer PK |
+| auth-user (→ user) | `user_profiles` | None | Add `CHECK (id = 1)`, use integer PK |
+| github-data | `github_meta` | Hardcoded `id=1` in code only | Add `CHECK (id = 1)` in schema |
+| organization | `organization_profile` | None | Add `CHECK (id = 1)`, use integer PK |
+| repository | `repo_meta` | Hardcoded `id=1` in code only | Add `CHECK (id = 1)` in schema |
+| task | `task` | CHECK constraint | Already correct |
+| task | `task_runtime` | CHECK constraint | Already correct |
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/auth-user/db/schema.ts`** — change `user` and `user_profiles` tables to integer PK with CHECK constraint
+- **`foundry/packages/backend/src/actors/auth-user/index.ts`** — update queries to use `id = 1` pattern
+- **`foundry/packages/backend/src/services/better-auth.ts`** — update adapter to use fixed `id = 1`
+- **`foundry/packages/backend/src/actors/github-data/db/schema.ts`** — add CHECK constraint to `github_meta` (already uses `id=1` in code)
+- **`foundry/packages/backend/src/actors/organization/db/schema.ts`** — change `organization_profile` to integer PK with CHECK constraint
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — update queries to use `id = 1`
+- **`foundry/packages/backend/src/actors/repository/db/schema.ts`** — add CHECK constraint to `repo_meta` (already uses `id=1` in code)
+- All affected actors — regenerate `db/migrations.ts`
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Single-row tables (tables that hold exactly one record per actor instance, e.g. metadata or profile tables) must use an integer primary key with a `CHECK (id = 1)` constraint to enforce the singleton invariant at the database level. Follow the pattern established in the task actor's `task` and `task_runtime` tables."
+
+---
+
+## [x] 4. Move all mutation actions to queue messages
+
+**Rationale:** Actions should be read-only (queries). All mutations (INSERT/UPDATE/DELETE) should go through queue messages processed by workflow handlers. This ensures single-writer consistency and aligns with the actor model. No actor currently does this correctly — the history actor has the mutation in the workflow handler, but the `append` action wraps a `wait: true` queue send, which is the same anti-pattern (callers should send to the queue directly).
+
+### Violations by actor
+
+**User actor (auth-user)** — `auth-user/index.ts` — 7 mutation actions:
+- `createAuthRecord` (INSERT, line 164)
+- `updateAuthRecord` (UPDATE, line 205)
+- `updateManyAuthRecords` (UPDATE, line 219)
+- `deleteAuthRecord` (DELETE, line 234)
+- `deleteManyAuthRecords` (DELETE, line 243)
+- `upsertUserProfile` (UPSERT, line 283)
+- `upsertSessionState` (UPSERT, line 331)
+
+**GitHub Data actor** — `github-data/index.ts` — 7 mutation actions:
+- `fullSync` (batch INSERT/DELETE/UPDATE, line 686)
+- `reloadOrganization` (batch, line 690)
+- `reloadAllPullRequests` (batch, line 694)
+- `reloadRepository` (INSERT/UPDATE, line 698)
+- `reloadPullRequest` (INSERT/DELETE/UPDATE, line 763)
+- `clearState` (batch DELETE, line 851)
+- `handlePullRequestWebhook` (INSERT/UPDATE/DELETE, line 879)
+
+**Organization actor — `actions.ts`** — 5 mutation actions:
+- `applyTaskSummaryUpdate` (UPSERT, line 464)
+- `removeTaskSummary` (DELETE, line 476)
+- `applyGithubRepositoryProjection` (UPSERT, line 521)
+- `applyGithubDataProjection` (INSERT/UPDATE/DELETE, line 547)
+- `recordGithubWebhookReceipt` (UPDATE, line 620)
+
+**Organization actor — `app-shell.ts`** — 38 mutation actions:
+
+Better Auth index mutations (11):
+- `authUpsertSessionIndex` (UPSERT)
+- `authDeleteSessionIndex` (DELETE)
+- `authUpsertEmailIndex` (UPSERT)
+- `authDeleteEmailIndex` (DELETE)
+- `authUpsertAccountIndex` (UPSERT)
+- `authDeleteAccountIndex` (DELETE)
+- `authCreateVerification` (INSERT)
+- `authUpdateVerification` (UPDATE)
+- `authUpdateManyVerification` (UPDATE)
+- `authDeleteVerification` (DELETE)
+- `authDeleteManyVerification` (DELETE)
+
+Organization profile/state mutations (13):
+- `updateOrganizationShellProfile` (UPDATE on organizationProfile)
+- `markOrganizationSyncStarted` (UPDATE on organizationProfile)
+- `applyOrganizationSyncCompleted` (UPDATE on organizationProfile)
+- `markOrganizationSyncFailed` (UPDATE on organizationProfile)
+- `applyOrganizationStripeCustomer` (UPDATE on organizationProfile)
+- `applyOrganizationStripeSubscription` (UPSERT on organizationProfile)
+- `applyOrganizationFreePlan` (UPDATE on organizationProfile)
+- `setOrganizationBillingPaymentMethod` (UPDATE on organizationProfile)
+- `setOrganizationBillingStatus` (UPDATE on organizationProfile)
+- `upsertOrganizationInvoice` (UPSERT on invoices)
+- `recordOrganizationSeatUsage` (UPSERT on seatAssignments)
+- `applyGithubInstallationCreated` (UPDATE on organizationProfile)
+- `applyGithubInstallationRemoved` (UPDATE on organizationProfile)
+
+App-level mutations that delegate + mutate (8):
+- `skipAppStarterRepo` (calls upsertUserProfile)
+- `starAppStarterRepo` (calls upsertUserProfile + child mutation)
+- `selectAppOrganization` (calls setActiveOrganization)
+- `triggerAppRepoImport` (calls markOrganizationSyncStarted)
+- `createAppCheckoutSession` (calls applyOrganizationFreePlan + applyOrganizationStripeCustomer)
+- `finalizeAppCheckoutSession` (calls applyOrganizationStripeCustomer)
+- `cancelAppScheduledRenewal` (calls setOrganizationBillingStatus)
+- `resumeAppSubscription` (calls setOrganizationBillingStatus)
+- `recordAppSeatUsage` (calls recordOrganizationSeatUsage)
+- `handleAppStripeWebhook` (calls multiple org mutations)
+- `handleAppGithubWebhook` (calls org mutations + github-data mutations)
+- `syncOrganizationShellFromGithub` (multiple DB operations)
+- `applyGithubRepositoryChanges` (calls applyGithubRepositoryProjection)
+
+**Task actor workbench** — `task/workbench.ts` — 14 mutation actions:
+- `renameWorkbenchTask` (UPDATE, line 970)
+- `renameWorkbenchBranch` (UPDATE, line 988)
+- `createWorkbenchSession` (INSERT, line 1039)
+- `renameWorkbenchSession` (UPDATE, line 1125)
+- `setWorkbenchSessionUnread` (UPDATE, line 1136)
+- `updateWorkbenchDraft` (UPDATE, line 1143)
+- `changeWorkbenchModel` (UPDATE, line 1152)
+- `sendWorkbenchMessage` (UPDATE, line 1205)
+- `stopWorkbenchSession` (UPDATE, line 1255)
+- `syncWorkbenchSessionStatus` (UPDATE, line 1265)
+- `closeWorkbenchSession` (UPDATE, line 1331)
+- `markWorkbenchUnread` (UPDATE, line 1363)
+- `publishWorkbenchPr` (UPDATE, line 1375)
+- `revertWorkbenchFile` (UPDATE, line 1403)
+
+**Repository actor** — `repository/actions.ts` — 5 mutation actions/helpers:
+- `createTask` → calls `createTaskMutation()` (INSERT on taskIndex + creates task actor)
+- `registerTaskBranch` → calls `registerTaskBranchMutation()` (INSERT/UPDATE on taskIndex)
+- `reinsertTaskIndexRow()` (INSERT/UPDATE, called from `getTaskEnriched`)
+- `deleteStaleTaskIndexRow()` (DELETE)
+- `persistRemoteUrl()` (INSERT/UPDATE on repoMeta, called from `getRepoOverview`)
+
+### History (audit log) actor — `append` action must also be removed
+
+The history actor's workflow handler is correct (mutation in queue handler), but the `append` action (line 77) is a `wait: true` wrapper around the queue send — same anti-pattern. Delete the `append` action. Callers (the `appendHistory()` helper in `task/workflow/common.ts`) should send directly to the `auditLog.command.append` queue with `wait: false` (audit log writes are fire-and-forget, no need to block the caller).
+
+### Reference patterns (queue handlers only, no action wrappers)
+- **Task actor core** — initialize, attach, push, sync, merge, archive, kill all use queue messages directly
+
+### Migration approach
+
+This is NOT about wrapping queue sends inside actions. The mutation actions must be **removed entirely** and replaced with queue messages that callers (including `packages/client`) send directly.
+
+Each actor needs:
+1. Define queue message types for each mutation
+2. Move mutation logic from action handlers into workflow/queue handlers
+3. **Delete the mutation actions** — do not wrap them
+4. Update `packages/client` to send queue messages directly to the actor instead of calling the old action
+5. Update any inter-actor callers (e.g. `better-auth.ts`, `app-shell.ts`, other actors) to send queue messages instead of calling actions
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Actions must be read-only. All database mutations (INSERT, UPDATE, DELETE, UPSERT) must be queue messages processed by workflow handlers. Callers (client, other actors, services) send messages directly to the queue — do not wrap queue sends inside actions. Follow the pattern established in the task workflow actor's queue handlers."
+
+---
+
+## [ ] 5. Migrate task actor raw SQL to Drizzle migrations
+
+**Rationale:** The task actor uses raw `db.execute()` with `ALTER TABLE ... ADD COLUMN` in `workbench.ts` and `workflow/init.ts` instead of proper Drizzle migrations. All actor DBs should use the standard Drizzle migration pattern.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** (lines 24-56) — remove `ALTER TABLE` raw SQL, add columns to `db/schema.ts` and generate a proper migration
+- **`foundry/packages/backend/src/actors/task/workflow/init.ts`** (lines 12-15) — same treatment
+- **`foundry/packages/backend/src/actors/task/db/schema.ts`** — add the missing columns that are currently added via `ALTER TABLE`
+- **`foundry/packages/backend/src/actors/task/db/migrations.ts`** — regenerate with new migration
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "All actor databases must use Drizzle ORM with proper schema definitions and generated migrations. No raw SQL (`db.execute()`, `ALTER TABLE`, etc.). Schema changes must go through `schema.ts` + migration generation."
+
+---
+
+## [ ] 6. Rename History actor → Audit Log actor
+
+**Rationale:** The actor functions as a comprehensive audit log tracking task lifecycle events. "Audit Log" better describes its purpose.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/history/`** → rename directory to `audit-log/`
+  - `index.ts` — rename export `history` → `auditLog`, display name `"History"` → `"Audit Log"`, queue `history.command.append` → `auditLog.command.append`
+  - Internal types: `HistoryInput` → `AuditLogInput`, `AppendHistoryCommand` → `AppendAuditLogCommand`, `ListHistoryParams` → `ListAuditLogParams`
+- **`foundry/packages/backend/src/actors/keys.ts`** — `historyKey()` → `auditLogKey()`
+- **`foundry/packages/backend/src/actors/handles.ts`** — `getOrCreateHistory` → `getOrCreateAuditLog`, `selfHistory` → `selfAuditLog`
+- **`foundry/packages/backend/src/actors/index.ts`** — update import path and registration
+- **`foundry/packages/shared/src/contracts.ts`** — `HistoryEvent` → `AuditLogEvent`
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — `history()` action → `auditLog()`, update imports
+- **`foundry/packages/backend/src/actors/repository/actions.ts`** — update `getOrCreateHistory` calls
+- **`foundry/packages/backend/src/actors/task/workflow/common.ts`** — `appendHistory()` → `appendAuditLog()`
+- **`foundry/packages/backend/src/actors/task/workflow/init.ts`** — update imports and calls
+- **`foundry/packages/backend/src/actors/task/workflow/commands.ts`** — update imports and calls
+- **`foundry/packages/backend/src/actors/task/workflow/push.ts`** — update imports and calls
+
+### Coverage gaps to fix
+
+The audit log only covers 9 of ~24 significant events (37.5%). The entire `task/workbench.ts` file has zero logging. Add audit log calls for:
+
+**High priority (missing lifecycle events):**
+- `task.switch` — in `task/workflow/index.ts` handleSwitchActivity
+- `task.session.created` — in `task/workbench.ts` createWorkbenchSession
+- `task.session.closed` — in `task/workbench.ts` closeWorkbenchSession
+- `task.session.stopped` — in `task/workbench.ts` stopWorkbenchSession
+
+**Medium priority (missing user actions):**
+- `task.session.renamed` — renameWorkbenchSession
+- `task.message.sent` — sendWorkbenchMessage
+- `task.model.changed` — changeWorkbenchModel
+- `task.title.changed` — renameWorkbenchTask
+- `task.branch.renamed` — renameWorkbenchBranch
+- `task.pr.published` — publishWorkbenchPr
+- `task.file.reverted` — revertWorkbenchFile
+
+**Low priority / debatable:**
+- `task.draft.updated`, `task.session.unread`, `task.derived.refreshed`, `task.transcript.refreshed`
+
+### CLAUDE.md updates needed
+
+- **`foundry/packages/backend/CLAUDE.md`** — rename `HistoryActor` → `AuditLogActor` in actor hierarchy, add maintenance rule: "Every new action or command handler that represents a user-visible or workflow-significant event must append to the audit log actor. The audit log must remain a comprehensive record of all significant operations."
+- **`foundry/CLAUDE.md`** — rename "History Events" section → "Audit Log Events", update the list to include all events above, add note: "When adding new task/workbench commands, always add a corresponding audit log event."
+
+---
+
+## [ ] 7. Move starred/default model to user actor settings
+
+**Dependencies:** item 1
+
+**Rationale:** The starred/default model preference is currently broken — the frontend stores it in local React state that resets on reload. The org actor's `organizationProfile` table has a `defaultModel` column but there's no action to update it and it's the wrong scope anyway. This is a per-user preference, not an org setting.
+
+### Current state (broken)
+
+- **Frontend** (`mock-layout.tsx` line 313) — `useState<ModelId>("claude-sonnet-4")` — local state, lost on reload
+- **Model picker UI** (`model-picker.tsx`) — has star icons + `onSetDefault` callback, but it only updates local state
+- **Org actor** (`organization/db/schema.ts` line 43) — `defaultModel` column exists but nothing writes to it
+- **No backend persistence** — starred model is not saved anywhere
+
+### Changes needed
+
+1. **Add `user_settings` table to user actor** (or add `defaultModel` column to `user_profiles`):
+   - `defaultModel` (text) — the user's starred/preferred model
+   - File: `foundry/packages/backend/src/actors/auth-user/db/schema.ts`
+
+2. **Add queue message to user actor** to update the default model:
+   - File: `foundry/packages/backend/src/actors/auth-user/index.ts`
+
+3. **Remove `defaultModel` from org actor** `organizationProfile` table (wrong scope):
+   - File: `foundry/packages/backend/src/actors/organization/db/schema.ts`
+
+4. **Update frontend** to read starred model from user settings (via `app` subscription) and send queue message on star click:
+   - File: `foundry/packages/frontend/src/components/mock-layout/model-picker.tsx`
+   - File: `foundry/packages/frontend/src/components/mock-layout.tsx`
+
+5. **Update shared types** — move `defaultModel` from `FoundryOrganizationSettings` to user settings type:
+   - File: `foundry/packages/shared/src/app-shell.ts`
+
+6. **Update client** to send the queue message to user actor:
+   - File: `foundry/packages/client/`
+
+---
+
+## [ ] 8. Replace hardcoded model/agent lists with sandbox-agent API data
+
+**Dependencies:** items 7, 25
+
+**Rationale:** The frontend hardcodes 8 models in a static list and ignores the sandbox-agent API's `GET /v1/agents` endpoint which already exposes the full agent config — models, modes, and reasoning/thought levels per agent. The frontend should consume this API 1:1 instead of maintaining its own stale copy.
+
+### Current state (hardcoded)
+
+- **`foundry/packages/frontend/src/components/mock-layout/view-model.ts`** (lines 20-39) — hardcoded `MODEL_GROUPS` with 8 models
+- **`foundry/packages/client/src/workbench-model.ts`** (lines 18-37) — identical hardcoded `MODEL_GROUPS` copy
+- **`foundry/packages/shared/src/workbench.ts`** (lines 5-13) — `WorkbenchModelId` hardcoded union type
+- No modes or thought/reasoning levels exposed in UI at all
+- No API calls to discover available models
+
+### What the sandbox-agent API already provides (`GET /v1/agents`)
+
+Per agent, the API returns:
+- **models** — full list with display names (Claude: 4, Codex: 6, Cursor: 35+, OpenCode: 239)
+- **modes** — execution modes (Claude: 5, Codex: 3, OpenCode: 2)
+- **thought_level** — reasoning levels (Codex: low/medium/high/xhigh, Mock: low/medium/high)
+- **capabilities** — plan_mode, reasoning, status support
+- **credentialsAvailable** / **installed** — agent availability
+
+### Changes needed
+
+1. **Remove hardcoded model lists** from:
+   - `foundry/packages/frontend/src/components/mock-layout/view-model.ts` — delete `MODEL_GROUPS`
+   - `foundry/packages/client/src/workbench-model.ts` — delete `MODEL_GROUPS`
+   - `foundry/packages/shared/src/workbench.ts` — replace `WorkbenchModelId` union type with `string` (dynamic from API)
+
+2. **Backend: fetch and cache agent config from sandbox-agent API**
+   - Add an action or startup flow that calls `GET /v1/agents?config=true` on the sandbox-agent API
+   - Cache the result (agent list + models + modes + thought levels) in the appropriate actor
+   - Expose it to the frontend via the existing subscription/event system
+
+3. **Frontend: consume API-driven config**
+   - Model picker reads available models from backend-provided agent config, not hardcoded list
+   - Expose modes selector per agent
+   - Expose thought/reasoning level selector for agents that support it (Codex, Mock)
+   - Group models by agent as the API does (not by arbitrary provider grouping)
+
+4. **Update shared types** — make model/mode/thought_level types dynamic strings rather than hardcoded unions:
+   - `foundry/packages/shared/src/workbench.ts`
+
+5. **No backwards compatibility needed** — we're cleaning up, not preserving old behavior
+
+---
+
+## [ ] 9. Flatten `taskLookup` + `taskSummaries` into single `tasks` table on org actor
+
+**Dependencies:** item 13
+
+**Rationale:** `taskLookup` (taskId → repoId) is a strict subset of `taskSummaries` (which also has repoId + title, status, branch, PR, sessions). There's no reason for two tables with the same primary key. Flatten into one `tasks` table.
+
+### Current state
+
+- **`taskLookup`** — `taskId` (PK), `repoId` — used only for taskId → repoId resolution
+- **`taskSummaries`** — `taskId` (PK), `repoId`, `title`, `status`, `repoName`, `updatedAtMs`, `branch`, `pullRequestJson`, `sessionsSummaryJson` — materialized sidebar data
+
+### Changes needed
+
+1. **Merge into single `tasks` table** in `foundry/packages/backend/src/actors/organization/db/schema.ts`:
+   - Drop `taskLookup` table
+   - Rename `taskSummaries` → `tasks`
+   - Keep all columns from `taskSummaries` (already includes `repoId`)
+
+2. **Update all references**:
+   - `foundry/packages/backend/src/actors/organization/actions.ts` — replace `taskLookup` queries with `tasks` table lookups
+   - `foundry/packages/backend/src/actors/organization/app-shell.ts` — if it references either table
+   - Any imports of the old table names from schema
+
+3. **Regenerate migrations** — `foundry/packages/backend/src/actors/organization/db/migrations.ts`
+
+---
+
+## [x] 10. Reorganize user and organization actor actions into `actions/` folders
+
+**Dependencies:** items 1, 6
+
+**Rationale:** Both actors cram too many concerns into single files. The organization actor has `app-shell.ts` (1,947 lines) + `actions.ts` mixing Better Auth, Stripe, GitHub, onboarding, workbench proxying, and org state. The user actor mixes Better Auth adapter CRUD with custom Foundry actions. Split into `actions/` folders grouped by domain, with `betterAuth` prefix on all Better Auth actions.
+
+### User actor → `user/actions/`
+
+| File | Actions | Source |
+|---|---|---|
+| `actions/better-auth.ts` | `betterAuthCreateRecord`, `betterAuthFindOneRecord`, `betterAuthFindManyRecords`, `betterAuthUpdateRecord`, `betterAuthUpdateManyRecords`, `betterAuthDeleteRecord`, `betterAuthDeleteManyRecords`, `betterAuthCountRecords` + all helper functions (`tableFor`, `columnFor`, `normalizeValue`, `clauseToExpr`, `buildWhere`, `applyJoinToRow`, `applyJoinToRows`) | Currently in `index.ts` |
+| `actions/user.ts` | `getAppAuthState`, `upsertUserProfile`, `upsertSessionState` | Currently in `index.ts` |
+
+### Organization actor → `organization/actions/`
+
+**Delete `app-shell.ts`** — split its ~50 actions + helpers across these files:
+
+| File | Actions | Source |
+|---|---|---|
+| `actions/better-auth.ts` | `betterAuthFindSessionIndex`, `betterAuthUpsertSessionIndex`, `betterAuthDeleteSessionIndex`, `betterAuthFindEmailIndex`, `betterAuthUpsertEmailIndex`, `betterAuthDeleteEmailIndex`, `betterAuthFindAccountIndex`, `betterAuthUpsertAccountIndex`, `betterAuthDeleteAccountIndex`, `betterAuthCreateVerification`, `betterAuthFindOneVerification`, `betterAuthFindManyVerification`, `betterAuthUpdateVerification`, `betterAuthUpdateManyVerification`, `betterAuthDeleteVerification`, `betterAuthDeleteManyVerification`, `betterAuthCountVerification` + auth clause builder helpers | Currently in `app-shell.ts` |
+| `actions/stripe.ts` | `createAppCheckoutSession`, `finalizeAppCheckoutSession`, `createAppBillingPortalSession`, `cancelAppScheduledRenewal`, `resumeAppSubscription`, `recordAppSeatUsage`, `handleAppStripeWebhook`, `applyOrganizationStripeCustomer`, `applyOrganizationStripeSubscription`, `applyOrganizationFreePlan`, `setOrganizationBillingPaymentMethod`, `setOrganizationBillingStatus`, `upsertOrganizationInvoice`, `recordOrganizationSeatUsage` | Currently in `app-shell.ts` |
+| `actions/github.ts` | `resolveAppGithubToken`, `beginAppGithubInstall`, `triggerAppRepoImport`, `handleAppGithubWebhook`, `syncOrganizationShellFromGithub`, `syncGithubOrganizations`, `applyGithubInstallationCreated`, `applyGithubInstallationRemoved`, `applyGithubRepositoryChanges`, `reloadGithubOrganization`, `reloadGithubPullRequests`, `reloadGithubRepository`, `reloadGithubPullRequest`, `applyGithubRepositoryProjection`, `applyGithubDataProjection`, `recordGithubWebhookReceipt`, `refreshTaskSummaryForGithubBranch` | Currently split across `app-shell.ts` and `actions.ts` |
+| `actions/onboarding.ts` | `skipAppStarterRepo`, `starAppStarterRepo`, `starSandboxAgentRepo`, `selectAppOrganization` | Currently in `app-shell.ts` |
+| `actions/organization.ts` | `getAppSnapshot`, `getOrganizationShellState`, `getOrganizationShellStateIfInitialized`, `updateOrganizationShellProfile`, `updateAppOrganizationProfile`, `markOrganizationSyncStarted`, `applyOrganizationSyncCompleted`, `markOrganizationSyncFailed`, `useOrganization`, `getOrganizationSummary`, `reconcileWorkbenchState` | Currently split across `app-shell.ts` and `actions.ts` |
+| `actions/tasks.ts` | `createTask`, `createWorkbenchTask`, `listTasks`, `getTask`, `switchTask`, `applyTaskSummaryUpdate`, `removeTaskSummary`, `findTaskForGithubBranch`, `applyOpenPullRequestUpdate`, `removeOpenPullRequest`, `attachTask`, `pushTask`, `syncTask`, `mergeTask`, `archiveTask`, `killTask` | Currently in `actions.ts` |
+| `actions/workbench.ts` | `markWorkbenchUnread`, `renameWorkbenchTask`, `renameWorkbenchBranch`, `createWorkbenchSession`, `renameWorkbenchSession`, `setWorkbenchSessionUnread`, `updateWorkbenchDraft`, `changeWorkbenchModel`, `sendWorkbenchMessage`, `stopWorkbenchSession`, `closeWorkbenchSession`, `publishWorkbenchPr`, `revertWorkbenchFile` | Currently in `actions.ts` (proxy calls to task actor) |
+| `actions/repos.ts` | `listRepos`, `getRepoOverview` | Currently in `actions.ts` |
+| `actions/history.ts` | `history` (→ `auditLog` after rename) | Currently in `actions.ts` |
+
+Also move:
+- `APP_SHELL_ORGANIZATION_ID` constant → `organization/constants.ts`
+- `runOrganizationWorkflow` → `organization/workflow.ts`
+- Private helpers (`buildAppSnapshot`, `assertAppOrganization`, `collectAllTaskSummaries`, etc.) → colocate with the action file that uses them
+
+### Files to update
+
+- **`foundry/packages/backend/src/services/better-auth.ts`** — update all action name references to use `betterAuth` prefix
+- **`foundry/packages/backend/src/actors/organization/index.ts`** — import and spread action objects from `actions/` files instead of `app-shell.ts` + `actions.ts`
+- **`foundry/packages/backend/src/actors/auth-user/index.ts`** (or `user/index.ts`) — import actions from `actions/` files
+
+---
+
+## [ ] 11. Standardize workflow file structure across all actors
+
+**Dependencies:** item 4
+
+**Rationale:** Workflow logic is inconsistently placed — inline in `index.ts`, in `actions.ts`, or in a `workflow/` directory. Standardize: every actor with a workflow gets a `workflow.ts` file. If the workflow is large, use `workflow/{index,...}.ts`.
+
+### Changes per actor
+
+| Actor | Current location | New location | Notes |
+|---|---|---|---|
+| user (auth-user) | None | `workflow.ts` (new) | Needs a workflow for mutations (item 4) |
+| github-data | Inline in `index.ts` (~57 lines) | `workflow.ts` | Extract `runGithubDataWorkflow` + handler |
+| history (→ audit-log) | Inline in `index.ts` (~18 lines) | `workflow.ts` | Extract `runHistoryWorkflow` + `appendHistoryRow` |
+| organization | In `actions.ts` (~51 lines) | `workflow.ts` | Extract `runOrganizationWorkflow` + queue handlers |
+| repository | In `actions.ts` (~42 lines) | `workflow.ts` | Extract `runRepositoryWorkflow` + queue handlers |
+| task | `workflow/` directory (926 lines) | `workflow/` directory — already correct | Keep as-is: `workflow/index.ts`, `workflow/queue.ts`, `workflow/common.ts`, `workflow/init.ts`, `workflow/commands.ts`, `workflow/push.ts` |
+| sandbox | None (wrapper) | N/A | No custom workflow needed |
+
+### Pattern
+
+- **Small workflows** (< ~200 lines): single `workflow.ts` file
+- **Large workflows** (> ~200 lines): `workflow/index.ts` holds the main loop, other files hold step groups:
+  - `workflow/index.ts` — main loop + handler dispatch
+  - `workflow/queue.ts` — queue name definitions (if many)
+  - `workflow/{group}.ts` — step/activity functions grouped by domain
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Every actor with a message queue must have its workflow logic in a dedicated `workflow.ts` file (or `workflow/index.ts` for complex actors). Do not inline workflow logic in `index.ts` or `actions.ts`. Actions are read-only handlers; workflow handlers process queue messages and perform mutations."
+
+---
+
+---
+
+## [ ] 12. Audit and remove dead code in organization actor
+
+**Dependencies:** item 10
+
+**Rationale:** The organization actor has ~50+ actions across `app-shell.ts` and `actions.ts`. Likely some are unused or vestigial. Audit all actions and queues for dead code and remove anything that has no callers.
+
+### Scope
+
+- All actions in `organization/actions.ts` and `organization/app-shell.ts`
+- All queue message types and their handlers
+- Helper functions that may no longer be called
+- Shared types in `packages/shared` that only served removed actions
+
+### Approach
+
+- Trace each action/queue from caller → handler to confirm it's live
+- Remove any action with no callers (client, other actors, services, HTTP endpoints)
+- Remove any queue handler with no senders
+- Remove associated types and helpers
+
+---
+
+## [ ] 13. Enforce coordinator pattern and fix ownership violations
+
+**Rationale:** The actor hierarchy follows a coordinator pattern: org → repo → task → session. The coordinator owns the index/summary of its children, handles create/destroy, and children push updates up to their coordinator. Several violations exist where levels are skipped.
+
+### Coordinator hierarchy (add to CLAUDE.md)
+
+```
+Organization (coordinator for repos)
+├── Repository (coordinator for tasks)
+│   └── Task (coordinator for sessions)
+│       └── Session
+```
+
+**Rules:**
+- The coordinator owns the index/summary table for its direct children
+- The coordinator handles create/destroy of its direct children
+- Children push summary updates UP to their direct coordinator (not skipping levels)
+- Read paths go through the coordinator, not direct cross-level access
+- No backwards compatibility needed — we're cleaning up
+
+### Violations to fix
+
+#### V1: Task index tables on wrong actor (HIGH)
+
+`taskLookup` and `taskSummaries` (item 9 merges these into `tasks`) are on the **organization** actor but should be on the **repository** actor, since repo is the coordinator for tasks.
+
+**Fix:**
+- Move the merged `tasks` table (from item 9) to `repository/db/schema.ts`
+- Repository owns task summaries, not organization
+- Organization gets a `repoSummaries` table instead (repo count, latest activity, etc.) — the repo pushes its summary up to org
+
+#### V2: Tasks push summaries directly to org, skipping repo (HIGH)
+
+Task actors call `organization.applyTaskSummaryUpdate()` directly (line 464 in `actions.ts`), bypassing the repository coordinator.
+
+**Fix:**
+- Task pushes summary to `repository.applyTaskSummaryUpdate()` instead
+- Repository updates its `tasks` table, then pushes a repo summary up to organization
+- Organization never receives task-level updates directly
+
+#### V3: Org resolves taskId → repoId from its own table (MEDIUM)
+
+`resolveRepoId(c, taskId)` in `organization/actions.ts` queries `taskLookup` directly. Used by `switchTask`, `attachTask`, `pushTask`, `syncTask`, `mergeTask`, `archiveTask`, `killTask` (7 actions).
+
+**Fix:**
+- Remove `resolveRepoId()` from org actor
+- Org must know the `repoId` from the caller (frontend already knows which repo a task belongs to) or query the repo actor
+- Update all 7 proxy actions to require `repoId` in their input instead of looking it up
+
+#### V4: Duplicate task creation bookkeeping at org level (MEDIUM)
+
+`createTaskMutation` in org actor calls `repository.createTask()`, then independently inserts `taskLookup` and seeds `taskSummaries`. Repository already inserts its own `taskIndex` row.
+
+**Fix:**
+- Org calls `repository.createTask()` — that's it
+- Repository handles all task index bookkeeping internally
+- Repository pushes the new task summary back up to org as part of its repo summary update
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/organization/db/schema.ts`** — remove `taskLookup` and `taskSummaries`, add `repoSummaries` if needed
+- **`foundry/packages/backend/src/actors/repository/db/schema.ts`** — add merged `tasks` table (task summaries)
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — remove `resolveRepoId()`, `applyTaskSummaryUpdate`, `removeTaskSummary`, `findTaskForGithubBranch`, `refreshTaskSummaryForGithubBranch`; update proxy actions to require `repoId` in input
+- **`foundry/packages/backend/src/actors/repository/actions.ts`** — add `applyTaskSummaryUpdate` action (receives from task), push repo summary to org
+- **`foundry/packages/backend/src/actors/task/workflow/common.ts`** — change summary push target from org → repo
+- **`foundry/packages/shared/src/contracts.ts`** — update input types to include `repoId` where needed
+- **`foundry/packages/client/`** — update calls to pass `repoId`
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add coordinator pattern rules:
+  ```
+  ## Coordinator Pattern
+
+  The actor hierarchy follows a strict coordinator pattern:
+  - Organization = coordinator for repositories
+  - Repository = coordinator for tasks
+  - Task = coordinator for sessions
+
+  Rules:
+  - Each coordinator owns the index/summary table for its direct children.
+  - Only the coordinator handles create/destroy of its direct children.
+  - Children push summary updates to their direct coordinator only (never skip levels).
+  - Cross-level access (e.g. org directly querying task state) is not allowed — go through the coordinator.
+  - Proxy actions at higher levels (e.g. org.pushTask) must delegate to the correct coordinator, not bypass it.
+  ```
+
+---
+
+---
+
+## [ ] 14. Standardize one event per subscription topic across all actors
+
+**Dependencies:** item 15
+
+**Rationale:** Each subscription topic should have exactly one event type carrying the full replacement snapshot. The organization topic currently violates this with 7 subtypes. Additionally, event naming is inconsistent across actors. Standardize all of them.
+
+### Current state
+
+| Topic | Wire event name | Event type field | Subtypes | Issue |
+|---|---|---|---|---|
+| `app` | `appUpdated` | `type: "appUpdated"` | 1 | Name is fine |
+| `organization` | `organizationUpdated` | 7 variants | **7** | Needs consolidation |
+| `task` | `taskUpdated` | `type: "taskDetailUpdated"` | 1 | Wire name ≠ type name |
+| `session` | `sessionUpdated` | `type: "sessionUpdated"` | 1 | Fine |
+| `sandboxProcesses` | `processesUpdated` | `type: "processesUpdated"` | 1 | Fine |
+
+### Target state
+
+Every topic gets exactly one event. Wire event name = type field = `{topic}Updated`. Each carries the full snapshot for that topic.
+
+| Topic | Event name | Payload |
+|---|---|---|
+| `app` | `appUpdated` | `FoundryAppSnapshot` |
+| `organization` | `organizationUpdated` | `OrganizationSummarySnapshot` |
+| `task` | `taskUpdated` | `WorkbenchTaskDetail` |
+| `session` | `sessionUpdated` | `WorkbenchSessionDetail` |
+| `sandboxProcesses` | `processesUpdated` | `SandboxProcessSnapshot[]` |
+
+### Organization — consolidate 7 subtypes into 1
+
+Remove the discriminated union. Replace all 7 subtypes:
+- `taskSummaryUpdated`, `taskRemoved`, `repoAdded`, `repoUpdated`, `repoRemoved`, `pullRequestUpdated`, `pullRequestRemoved`
+
+With a single `organizationUpdated` event carrying the full `OrganizationSummarySnapshot`. The client replaces its cached state — same pattern as every other topic.
+
+### Task — fix event type name mismatch
+
+Wire event is `taskUpdated` but the type field says `taskDetailUpdated`. Rename to `taskUpdated` everywhere for consistency.
+
+### Files to change
+
+- **`foundry/packages/shared/src/realtime-events.ts`** — replace `OrganizationEvent` union with single event type; rename `TaskEvent.type` from `taskDetailUpdated` → `taskUpdated`
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — update all 7 `c.broadcast("organizationUpdated", { type: "taskSummaryUpdated", ... })` calls to emit single event with full snapshot
+- **`foundry/packages/backend/src/actors/organization/app-shell.ts`** — same for any broadcasts here
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** — rename `taskDetailUpdated` → `taskUpdated` in broadcast calls
+- **`foundry/packages/client/src/subscription/topics.ts`** — simplify `applyEvent` for organization topic (no more discriminated union handling); update task event type name
+- **`foundry/packages/client/src/subscription/mock-manager.ts`** — update mock event handling
+- **`foundry/packages/frontend/`** — update any direct references to event type names
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Each subscription topic must have exactly one event type. The event carries the full replacement snapshot for that topic — no discriminated unions, no partial patches, no subtypes. Event name must match the pattern `{topic}Updated` (e.g. `organizationUpdated`, `taskUpdated`). When state changes, broadcast the full snapshot; the client replaces its cached state."
+
+---
+
+## [x] 15. Unify tasks and pull requests — PRs are just task data
+
+**Dependencies:** items 9, 13
+
+**Rationale:** From the client's perspective, tasks and PRs are the same thing — a branch with work on it. The frontend already merges them into one sorted list, converting PRs to synthetic task objects with `pr:{prId}` IDs. The distinction is artificial. A "task" should represent any branch, and the task actor lazily wraps it. PR metadata is just data the task holds.
+
+### Current state (separate entities)
+
+- **Tasks**: stored in task actor SQLite, surfaced via `WorkbenchTaskSummary`, events via `taskSummaryUpdated`
+- **PRs**: stored in GitHub data actor (`githubPullRequests` table), surfaced via `WorkbenchOpenPrSummary`, events via `pullRequestUpdated`/`pullRequestRemoved`
+- **Frontend hack**: converts PRs to fake task objects with `pr:{prId}` IDs, merges into one list
+- **Filtering logic**: org actor silently swallows `pullRequestUpdated` if a task claims the same branch — fragile coupling
+- **Two separate types**: `WorkbenchTaskSummary` and `WorkbenchOpenPrSummary` with overlapping fields
+
+### Target state (unified)
+
+- **One entity**: a "task" represents a branch. Task actors are lazily created when needed (user creates one, or a PR arrives for an unclaimed branch).
+- **PR data lives on the task**: the task actor stores PR metadata (number, title, state, url, isDraft, authorLogin, etc.) as part of its state, not as a separate entity
+- **One type**: `WorkbenchTaskSummary` includes full PR fields (nullable). No separate `WorkbenchOpenPrSummary`.
+- **One event**: `organizationUpdated` carries task summaries that include PR data. No separate PR events.
+- **No synthetic IDs**: every item in the sidebar is a real task with a real taskId
+
+### Changes needed
+
+1. **Remove `WorkbenchOpenPrSummary` type** from `packages/shared/src/workbench.ts` — merge its fields into `WorkbenchTaskSummary`
+2. **Expand task's `pullRequest` field** from `{ number, status }` to full PR metadata (number, title, state, url, headRefName, baseRefName, isDraft, authorLogin, updatedAtMs)
+3. **Remove `openPullRequests` from `OrganizationSummarySnapshot`** — all items are tasks now
+4. **Remove PR-specific events** from `realtime-events.ts`: `pullRequestUpdated`, `pullRequestRemoved`
+5. **Remove PR-specific actions** from organization actor: `applyOpenPullRequestUpdate`, `removeOpenPullRequest`
+6. **Remove branch-claiming filter logic** in org actor (the `if task claims branch, skip PR` check)
+7. **GitHub data actor PR sync**: when PRs arrive (webhook or sync), create/update a task for that branch lazily via the repository coordinator
+8. **Task actor**: store PR metadata in its DB (new columns or table), update when GitHub data pushes changes
+9. **Frontend**: remove `toOpenPrTaskModel` conversion, remove `pr:` ID prefix hack, remove separate `openPullRequests` state — sidebar is just tasks
+10. **Repository actor**: when a PR arrives for a branch with no task, lazily create a task actor for it (lightweight, no sandbox needed)
+
+### Implications for coordinator pattern (item 13)
+
+This reinforces: repo is the coordinator for tasks. When GitHub data detects a new PR for a branch, it tells the repo coordinator, which creates/updates the task. The task holds the PR data and pushes its summary to the repo coordinator.
+
+### No backwards compatibility needed
+
+The `authSessionIndex`, `authEmailIndex`, `authAccountIndex`, and `authVerification` tables stay on the org actor. They're routing indexes needed by the Better Auth adapter to resolve user identity before the user actor can be accessed (e.g. session token → userId lookup). Already covered in item 2 for adding comments explaining this.
+
+---
+
+## [ ] 16. Chunk GitHub data sync and publish progress
+
+**Rationale:** `runFullSync` in the github-data actor fetches everything at once (all repos, branches, members, PRs), replaces all tables atomically, and has a 5-minute timeout. For large orgs this will timeout or lose all data mid-sync (replace pattern deletes everything first). Needs to be chunked with incremental progress.
+
+### Current state (broken for large orgs)
+
+- `runFullSync()` (`github-data/index.ts` line 486-538):
+  1. Fetches ALL repos, branches, members, PRs in 4 sequential calls
+  2. `replaceRepositories/Branches/Members/PullRequests` — deletes all rows then inserts all new rows
+  3. Single 5-minute timeout wraps the entire operation
+  4. No progress reporting to the client — just "Syncing GitHub data..." → "Synced N repositories"
+  5. If it fails mid-sync, data is partially deleted with no recovery
+
+### Changes needed
+
+1. **Chunk the sync by repository** — sync repos first (paginated from GitHub API), then for each repo chunk, sync its branches and PRs. Members can be a separate chunk.
+
+2. **Incremental upsert, not replace** — don't delete-then-insert. Use upsert per row so partial sync doesn't lose data. Mark rows with a sync generation ID; after full sync completes, delete rows from previous generations.
+
+3. **Run in a loop, not a single step** — each chunk is a separate workflow step with its own timeout. If one chunk fails, previous chunks are persisted.
+
+4. **Publish progress per chunk** — after each chunk completes:
+   - Update `github_meta` with progress (e.g. `syncedRepos: 15/42`)
+   - Push progress to the organization actor
+   - Organization broadcasts to clients so the UI shows progress (e.g. "Syncing repositories... 15/42")
+
+5. **Initial sync uses the same chunked approach** — `github-data-initial-sync` step should kick off the chunked loop, not call `runFullSync` directly
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/github-data/index.ts`**:
+  - Refactor `runFullSync` into chunked loop
+  - Replace `replaceRepositories/Branches/Members/PullRequests` with upsert + generation sweep
+  - Add progress metadata to `github_meta` table
+  - Publish progress to org actor after each chunk
+- **`foundry/packages/backend/src/actors/github-data/db/schema.ts`** — add sync generation column to all tables, add progress fields to `github_meta`
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** (or `app-shell.ts`) — handle sync progress updates and broadcast to clients
+- **`foundry/packages/shared/src/app-shell.ts`** — add sync progress fields to `FoundryGithubState` (e.g. `syncProgress: { current: number; total: number } | null`)
+- **`foundry/packages/frontend/`** — show sync progress in UI (e.g. "Syncing repositories... 15/42")
+
+---
+
+---
+
+# Deferred follow-up outside this task
+
+## 17. Type all actor context parameters — remove `c: any`
+
+**Rationale:** 272+ instances of `c: any`, `ctx: any`, `loopCtx: any` across all actor code. This eliminates type safety for DB access, state access, broadcasts, and queue operations. All context parameters should use RivetKit's proper context types.
+
+### Scope (by file, approximate count)
+
+| File | `any` contexts |
+|---|---|
+| `organization/app-shell.ts` | ~108 |
+| `organization/actions.ts` | ~56 |
+| `task/workbench.ts` | ~53 |
+| `github-data/index.ts` | ~23 |
+| `repository/actions.ts` | ~22 |
+| `sandbox/index.ts` | ~21 |
+| `handles.ts` | ~19 |
+| `task/workflow/commands.ts` | ~10 |
+| `task/workflow/init.ts` | ~4 |
+| `auth-user/index.ts` | ~2 |
+| `history/index.ts` | ~2 |
+| `task/workflow/index.ts` | ~2 |
+| `task/workflow/common.ts` | ~2 |
+| `task/workflow/push.ts` | ~1 |
+| `polling.ts` | ~1 |
+
+### Changes needed
+
+1. **Determine correct RivetKit context types** — check RivetKit exports for `ActionContext`, `ActorContextOf`, `WorkflowContext`, `LoopContext`, or equivalent. Reference `polling.ts` which already defines typed contexts (`PollingActorContext<TState>`, `WorkflowPollingActorContext<TState>`).
+
+2. **Define per-actor context types** — each actor has its own state shape and DB schema, so the context type should be specific (e.g. `ActionContext<typeof organization>` or similar).
+
+3. **Replace all `c: any`** with the proper typed context across every file listed above.
+
+4. **Type workflow/loop contexts** — `ctx: any` in workflow functions and `loopCtx: any` in loop callbacks need proper types too.
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "All actor context parameters (`c`, `ctx`, `loopCtx`) must be properly typed using RivetKit's context types. Never use `any` for actor contexts. Each actor should define or derive its context type from the actor definition."
+
+---
+
+## [ ] 18. Final pass: remove all dead code
+
+**Dependencies:** all other items (do this last, after 17)
+
+**Rationale:** After completing all changes above, many actions, queues, SQLite tables, workflow steps, shared types, and helper functions will be orphaned. Do a full scan to find and remove everything that's dead.
+
+### Scope
+
+Scan the entire foundry codebase for:
+- **Dead actions** — actions with no callers (client, other actors, services, HTTP endpoints)
+- **Dead queues** — queue message types with no senders
+- **Dead SQLite tables** — tables with no reads or writes
+- **Dead workflow steps** — step names that are no longer referenced
+- **Dead shared types** — types in `packages/shared` that are no longer imported
+- **Dead helper functions** — private functions with no callers
+- **Dead imports** — unused imports across all files
+
+### When to do this
+
+After all items 1–17 are complete. Not before — removing code while other items are in progress will create conflicts.
+
+---
+
+## [ ] 19. Remove duplicate data between `c.state` and SQLite
+
+**Dependencies:** items 21, 24
+
+**Rationale:** Several actors store the same data in both `c.state` (RivetKit durable state) and their SQLite tables. Mutable fields that exist in both can silently diverge — `c.state` becomes stale when the SQLite copy is updated. Per the existing CLAUDE.md rule, `c.state` should hold only small scalars/identifiers; anything queryable or mutable belongs in SQLite.
+
+### Duplicates found
+
+**Task actor** — `c.state` (`createState` in `task/index.ts` lines 124-139) vs `task`/`taskRuntime` tables:
+
+| Field | In SQLite? | Mutable? | Verdict |
+|---|---|---|---|
+| `organizationId` | No | No | **KEEP** — identity field |
+| `repoId` | No | No | **KEEP** — identity field |
+| `taskId` | No | No | **KEEP** — identity field |
+| `repoRemote` | No (but org `repos` table has it) | No | **DELETE** — not needed on task, read from repo/org |
+| `branchName` | Yes (`task.branch_name`) | Yes | **REMOVE from c.state** — HIGH risk, goes stale on rename |
+| `title` | Yes (`task.title`) | Yes | **REMOVE from c.state** — HIGH risk, goes stale on rename |
+| `task` (description) | Yes (`task.task`) | No | **REMOVE from c.state** — redundant |
+| `sandboxProviderId` | Yes (`task.sandbox_provider_id`) | No | **REMOVE from c.state** — redundant |
+| `agentType` | Yes (`task.agent_type`) | Yes | **DELETE entirely** — session-specific (item 21) |
+| `explicitTitle` | No | No | **MOVE to SQLite** — creation metadata |
+| `explicitBranchName` | No | No | **MOVE to SQLite** — creation metadata |
+| `initialPrompt` | No | No | **DELETE entirely** — dead code, session-specific (item 21) |
+| `initialized` | No | Yes | **DELETE entirely** — dead code, `status` already tracks init progress |
+| `previousStatus` | No | No | **DELETE entirely** — never set, never read |
+
+**Repository actor** — `c.state` (`createState` in `repository/index.ts`) vs `repoMeta` table:
+
+| Field | Mutable? | Risk |
+|---|---|---|
+| `remoteUrl` | No | Low — redundant but safe |
+
+### Fix
+
+Remove all duplicated fields from `c.state`. Keep only identity fields needed for actor key resolution (e.g. `organizationId`, `repoId`, `taskId`). Read mutable data from SQLite.
+
+**Task actor `c.state` should become:**
+```typescript
+createState: (_c, input) => ({
+  organizationId: input.organizationId,
+  repoId: input.repoId,
+  taskId: input.taskId,
+})
+```
+
+Fields already in SQLite (`branchName`, `title`, `task`, `sandboxProviderId`) — remove from `c.state`, read from SQLite only. Fields not yet in SQLite (`explicitTitle`, `explicitBranchName`) — add to `task` table, remove from `c.state`. Dead code to delete entirely: `agentType`, `initialPrompt` (item 21), `initialized`, `previousStatus`, `repoRemote`.
+
+**Repository actor `c.state` should become:**
+```typescript
+createState: (_c, input) => ({
+  organizationId: input.organizationId,
+  repoId: input.repoId,
+})
+```
+
+`remoteUrl` is removed from repo actor `c.state` entirely. The repo actor reads `remoteUrl` from its own `repoMeta` SQLite table when needed. The org actor already stores `remoteUrl` in its `repos` table (source of truth from GitHub data). The `getOrCreateRepository()` helper in `handles.ts` currently requires `remoteUrl` as a parameter and passes it as `createWithInput` — this parameter must be removed. Every call site in `organization/actions.ts` and `organization/app-shell.ts` currently does a DB lookup for `remoteUrl` just to pass it to `getOrCreateRepository()` — all of those lookups go away. On actor creation, the repo actor should populate its `repoMeta.remoteUrl` by querying the org actor or github-data actor, not by receiving it as a create input.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/task/index.ts`** — trim `createState`, update all `c.state.*` reads for removed fields to read from SQLite instead
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** — update `c.state.*` reads
+- **`foundry/packages/backend/src/actors/task/workflow/*.ts`** — update `c.state.*` reads
+- **`foundry/packages/backend/src/actors/repository/index.ts`** — trim `createState`, remove `remoteUrl` from input type
+- **`foundry/packages/backend/src/actors/repository/actions.ts`** — update all `c.state.remoteUrl` reads to query `repoMeta` table; remove `persistRemoteUrl()` helper
+- **`foundry/packages/backend/src/actors/handles.ts`** — remove `remoteUrl` parameter from `getOrCreateRepository()`
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — remove all `remoteUrl` lookups done solely to pass to `getOrCreateRepository()` (~10 call sites)
+- **`foundry/packages/backend/src/actors/organization/app-shell.ts`** — same cleanup for app-shell call sites
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Never duplicate data between `c.state` and SQLite. `c.state` holds only immutable identity fields needed for actor key resolution (e.g. `organizationId`, `repoId`, `taskId`). All mutable data and anything queryable must live exclusively in SQLite. If a field can change after actor creation, it must not be in `c.state`."
+
+---
+
+## [ ] 20. Prefix all admin/recovery actions with `admin`
+
+**Rationale:** Several actions are admin-only recovery/rebuild operations but their names don't distinguish them from normal product flows. Prefix with `admin` so it's immediately clear these are not part of regular user flows.
+
+### Actions to rename
+
+**Organization actor:**
+
+| Current name | New name | Why it's admin |
+|---|---|---|
+| `reconcileWorkbenchState` | `adminReconcileWorkbenchState` | Full fan-out rebuild of task summary projection |
+| `reloadGithubOrganization` | `adminReloadGithubOrganization` | Manual trigger to refetch all org GitHub data |
+| `reloadGithubPullRequests` | `adminReloadGithubPullRequests` | Manual trigger to refetch all PR data |
+| `reloadGithubRepository` | `adminReloadGithubRepository` | Manual trigger to refetch single repo |
+| `reloadGithubPullRequest` | `adminReloadGithubPullRequest` | Manual trigger to refetch single PR |
+
+**GitHub Data actor:**
+
+| Current name | New name | Why it's admin |
+|---|---|---|
+| `fullSync` | `adminFullSync` | Full replace of all GitHub data — recovery operation |
+| `reloadOrganization` | `adminReloadOrganization` | Triggers full sync manually |
+| `reloadAllPullRequests` | `adminReloadAllPullRequests` | Triggers full sync manually |
+| `clearState` | `adminClearState` | Deletes all GitHub data — recovery from lost access |
+
+**NOT renamed** (these are triggered by webhooks/normal flows, not manual admin actions):
+- `reloadRepository` — called by push/create/delete webhooks (incremental, normal flow)
+- `reloadPullRequest` — called by PR webhooks (incremental, normal flow)
+- `handlePullRequestWebhook` — webhook handler (normal flow)
+- `syncGithubOrganizations` — called during OAuth callback (normal flow, though also used for repair)
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/github-data/index.ts`** — rename actions
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — rename actions
+- **`foundry/packages/client/src/backend-client.ts`** — update method names
+- **`foundry/packages/frontend/`** — update any references to renamed actions
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Admin-only actions (recovery, rebuild, manual resync, state reset) must be prefixed with `admin` (e.g. `adminReconcileState`, `adminClearState`). This makes it clear they are not part of normal product flows and should not be called from regular client code paths."
+
+---
+
+## [ ] 21. Remove legacy/session-scoped fields from task table
+
+**Rationale:** The `task` table has fields that either belong on the session, are redundant with data from other actors, or are dead code from the removed local git clone. These should be cleaned up.
+
+### Fields to remove from `task` table and `c.state`
+
+**`agentType`** — Legacy from when task = 1 session. Only used for `defaultModelForAgent(c.state.agentType)` to pick the default model when creating a new session. Sessions already have their own `model` column in `taskWorkbenchSessions`. The default model for new sessions should come from user settings (see item 16 — starred model stored in user actor). Remove `agentType` from task table, `c.state`, `createState`, `TaskRecord`, and all `defaultModelForAgent()` call sites. Replace with user settings lookup.
+
+**`initialPrompt`** — Stored on `c.state` at task creation but **never read anywhere**. Completely dead code. This is also session-specific, not task-specific — the initial prompt belongs on the first session, not the task. Remove from `c.state`, `createState` input type, and `CreateTaskCommand`/`CreateTaskInput` types. Remove from `repository/actions.ts` create flow.
+
+**`prSubmitted`** — Redundant boolean set when `submitPullRequest` runs. PR state already flows from GitHub webhooks → github-data actor → branch name lookup. This boolean can go stale (PR closed and reopened, PR deleted, etc.). Remove entirely — PR existence is derivable from github-data by branch name (already how `enrichTaskRecord` and `buildTaskSummary` work).
+
+### Dead fields on `taskRuntime` table
+
+**`provisionStage`** — Values: `"queued"`, `"ready"`, `"error"`. Redundant with `status` — `init_complete` implies ready, `error` implies error. Never read in business logic. Delete.
+
+**`provisionStageUpdatedAt`** — Timestamp for `provisionStage` changes. Never read anywhere. Delete.
+
+### Dead fields on `TaskRecord` (in `workflow/common.ts`)
+
+These are always hardcoded to `null` — remnants of the removed local git clone:
+
+- `diffStat` — was populated from `branches` table (deleted)
+- `hasUnpushed` — was populated from `branches` table (deleted)
+- `conflictsWithMain` — was populated from `branches` table (deleted)
+- `parentBranch` — was populated from `branches` table (deleted)
+
+Remove from `TaskRecord` type, `getCurrentRecord()`, and all consumers (contracts, mock client, tests, frontend).
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/task/db/schema.ts`** — remove `agentType` and `prSubmitted` columns from `task` table; remove `provisionStage` and `provisionStageUpdatedAt` from `taskRuntime` table
+- **`foundry/packages/backend/src/actors/task/index.ts`** — remove `agentType`, `initialPrompt`, `initialized`, `previousStatus`, `repoRemote` from `createState` and input type
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** — remove `defaultModelForAgent()`, `agentTypeForModel()`, update session creation to use user settings for default model; remove `prSubmitted` set in `submitPullRequest`
+- **`foundry/packages/backend/src/actors/task/workflow/common.ts`** — remove `agentType`, `prSubmitted`, `diffStat`, `hasUnpushed`, `conflictsWithMain`, `parentBranch` from `getCurrentRecord()` and `TaskRecord` construction
+- **`foundry/packages/backend/src/actors/task/workflow/init.ts`** — remove `agentType` from task row inserts
+- **`foundry/packages/shared/src/contracts.ts`** — remove `agentType`, `prSubmitted`, `diffStat`, `prUrl`, `hasUnpushed`, `conflictsWithMain`, `parentBranch` from `TaskRecord` schema (note: `prUrl` and `prAuthor` should stay if still populated by `enrichTaskRecord`, or move to the unified task/PR model from item 15)
+- **`foundry/packages/client/src/mock/backend-client.ts`** — update mock to remove dead fields
+- **`foundry/packages/client/test/view-model.test.ts`** — update test fixtures
+- **`foundry/packages/frontend/src/features/tasks/model.test.ts`** — update test fixtures
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — remove any references to `agentType` in task creation input
+- **`foundry/packages/backend/src/actors/repository/actions.ts`** — update `enrichTaskRecord()` to stop setting dead fields
+
+---
+
+## [ ] 22. Move per-user UI state from task actor to user actor
+
+**Dependencies:** item 1
+
+**Rationale:** The task actor stores UI-facing state that is user-specific, not task-global. With multiplayer (multiple users viewing the same task), this breaks — each user has their own active session, their own unread state, their own drafts. These must live on the user actor, keyed by `(taskId, sessionId)`, not on the shared task actor.
+
+### Per-user state currently on the task actor (wrong)
+
+**`taskRuntime.activeSessionId`** — Which session the user is "looking at." Used to:
+- Determine which session's status drives the task-level status (running/idle) — this is wrong, the task status should reflect ALL sessions, not one user's active tab
+- Return a "current" session in `attachTask` responses — this is per-user
+- Migration path for legacy single-session tasks in `ensureWorkbenchSeeded`
+
+This should move to the user actor as `activeSessionId` per `(userId, taskId)`.
+
+**`taskWorkbenchSessions.unread`** — Per-user unread state stored globally on the session. If user A reads a session, user B's unread state is also cleared. Move to user actor keyed by `(userId, taskId, sessionId)`.
+
+**`taskWorkbenchSessions.draftText` / `draftAttachmentsJson` / `draftUpdatedAt`** — Per-user draft state stored globally. If user A starts typing a draft, it overwrites user B's draft. Move to user actor keyed by `(userId, taskId, sessionId)`.
+
+### What stays on the task actor (correct — task-global state)
+
+- `taskRuntime.activeSandboxId` — which sandbox is running (global to the task)
+- `taskRuntime.activeSwitchTarget` / `activeCwd` — sandbox connection state (global)
+- `taskRuntime.statusMessage` — provisioning/runtime status (global)
+- `taskWorkbenchSessions.model` — which model the session uses (global)
+- `taskWorkbenchSessions.status` — session runtime status (global)
+- `taskWorkbenchSessions.transcriptJson` — session transcript (global)
+
+### Fix
+
+Add a `userTaskState` table to the user actor:
+
+```typescript
+export const userTaskState = sqliteTable("user_task_state", {
+  taskId: text("task_id").notNull(),
+  sessionId: text("session_id").notNull(),
+  activeSessionId: text("active_session_id"),  // per-user active tab
+  unread: integer("unread").notNull().default(0),
+  draftText: text("draft_text").notNull().default(""),
+  draftAttachmentsJson: text("draft_attachments_json").notNull().default("[]"),
+  draftUpdatedAt: integer("draft_updated_at"),
+  updatedAt: integer("updated_at").notNull(),
+}, (table) => ({
+  pk: primaryKey(table.taskId, table.sessionId),
+}));
+```
+
+Remove `activeSessionId` from `taskRuntime`. Remove `unread`, `draftText`, `draftAttachmentsJson`, `draftUpdatedAt` from `taskWorkbenchSessions`.
+
+The task-level status should be derived from ALL sessions (e.g., task is "running" if ANY session is running), not from one user's `activeSessionId`.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/auth-user/db/schema.ts`** — add `userTaskState` table
+- **`foundry/packages/backend/src/actors/task/db/schema.ts`** — remove `activeSessionId` from `taskRuntime`; remove `unread`, `draftText`, `draftAttachmentsJson`, `draftUpdatedAt` from `taskWorkbenchSessions`
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** — remove all `activeSessionId` reads/writes; remove draft/unread mutation functions; task status derivation should check all sessions
+- **`foundry/packages/backend/src/actors/task/workflow/common.ts`** — remove `activeSessionId` from `getCurrentRecord()`
+- **`foundry/packages/backend/src/actors/task/workflow/commands.ts`** — remove `activeSessionId` references in `attachTask`
+- **`foundry/packages/backend/src/actors/task/workflow/init.ts`** — remove `activeSessionId` initialization
+- **`foundry/packages/client/`** — draft/unread/activeSession operations route to user actor instead of task actor
+- **`foundry/packages/frontend/`** — update subscription to fetch per-user state from user actor
+
+### CLAUDE.md update
+
+- **`foundry/packages/backend/CLAUDE.md`** — add constraint: "Per-user UI state (active session tab, unread counts, draft text, draft attachments) must live on the user actor, not on shared task/session actors. Task actors hold only task-global state visible to all users. This is critical for multiplayer correctness — multiple users may view the same task simultaneously with different active sessions, unread states, and in-progress drafts."
+
+---
+
+## [ ] 23. Delete `getTaskEnriched` and `enrichTaskRecord` (dead code)
+
+**Rationale:** `getTaskEnriched` is dead code with zero callers from the client. It's also the worst fan-out pattern in the codebase: org → repo actor → task actor (`.get()`) → github-data actor (`listPullRequestsForRepository` fetches ALL PRs, then `.find()`s by branch name). This is exactly the pattern the coordinator model eliminates — task detail comes from `getTaskDetail` on the task actor, sidebar data comes from materialized `taskSummaries` on the org actor.
+
+### What to delete
+
+- **`enrichTaskRecord()`** — `repository/actions.ts:117-143`. Fetches all PRs for a repo to find one by branch name. Dead code.
+- **`getTaskEnriched` action** — `repository/actions.ts:432-450`. Only caller of `enrichTaskRecord`. Dead code.
+- **`getTaskEnriched` org proxy** — `organization/actions.ts:838-849`. Only caller of the repo action. Dead code.
+- **`GetTaskEnrichedCommand` type** — wherever defined.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/repository/actions.ts`** — delete `enrichTaskRecord()` and `getTaskEnriched` action
+- **`foundry/packages/backend/src/actors/organization/actions.ts`** — delete `getTaskEnriched` proxy action
+
+---
+
+## [ ] 24. Clean up task status tracking
+
+**Dependencies:** item 21
+
+**Rationale:** Task status tracking is spread across `c.state`, the `task` SQLite table, and the `taskRuntime` table with redundant and dead fields. Consolidate to a single `status` enum on the `task` table. Remove `statusMessage` — human-readable status text should be derived on the client from the `status` enum, not stored on the backend.
+
+### Fields to delete
+
+| Field | Location | Why |
+|---|---|---|
+| `initialized` | `c.state` | Dead code — never read. `status` already tracks init progress. |
+| `previousStatus` | `c.state` | Dead code — never set, never read. |
+| `statusMessage` | `taskRuntime` table | Client concern — the client should derive display text from the `status` enum. The backend should not store UI copy. |
+| `provisionStage` | `taskRuntime` table | Redundant — `status` already encodes provision progress (`init_bootstrap_db` → `init_enqueue_provision` → `init_complete`). |
+| `provisionStageUpdatedAt` | `taskRuntime` table | Dead — never read. |
+
+### What remains
+
+- **`status`** on the `task` table — the single canonical state machine enum. Values: `init_bootstrap_db`, `init_enqueue_provision`, `init_complete`, `running`, `idle`, `error`, `archive_*`, `kill_*`, `archived`, `killed`.
+
+### Files to change
+
+- **`foundry/packages/backend/src/actors/task/db/schema.ts`** — remove `statusMessage`, `provisionStage`, `provisionStageUpdatedAt` from `taskRuntime` table
+- **`foundry/packages/backend/src/actors/task/index.ts`** — remove `initialized`, `previousStatus` from `createState`
+- **`foundry/packages/backend/src/actors/task/workflow/common.ts`** — remove `statusMessage` parameter from `setTaskState()`, remove it from `getCurrentRecord()` query
+- **`foundry/packages/backend/src/actors/task/workflow/init.ts`** — remove `statusMessage`, `provisionStage`, `provisionStageUpdatedAt` from taskRuntime inserts/updates; remove `ensureTaskRuntimeCacheColumns()` raw ALTER TABLE for these columns
+- **`foundry/packages/backend/src/actors/task/workflow/commands.ts`** — remove `statusMessage` from handler updates
+- **`foundry/packages/backend/src/actors/task/workflow/push.ts`** — remove `statusMessage` updates
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** — remove `statusMessage` from `buildTaskDetail()`, remove `ensureTaskRuntimeCacheColumns()` for these columns
+- **`foundry/packages/shared/src/workbench.ts`** — remove `statusMessage` from `WorkbenchTaskDetail`
+- **`foundry/packages/frontend/`** — derive display text from `status` enum instead of reading `statusMessage`
+
+---
+
+## [ ] 25. Remove "Workbench" prefix from all types, functions, files, and tables
+
+**Rationale:** "Workbench" is not a real concept in the system. It's a namespace prefix applied to every type, function, file, and table name. The actual entities are Task, Session, Repository, Sandbox, Transcript, Draft, etc. — "Workbench" adds zero information and obscures what things actually are.
+
+### Rename strategy
+
+Drop "Workbench" everywhere. If the result collides with an existing name (e.g., auth `Session`), use the domain prefix (e.g., `TaskSession` vs auth `Session`).
+
+### Type renames (`shared/src/workbench.ts`)
+
+| Before | After |
+|---|---|
+| `WorkbenchTaskStatus` | `TaskStatus` (already exists as base, merge) |
+| `WorkbenchAgentKind` | `AgentKind` |
+| `WorkbenchModelId` | `ModelId` |
+| `WorkbenchSessionStatus` | `SessionStatus` |
+| `WorkbenchTranscriptEvent` | `TranscriptEvent` |
+| `WorkbenchComposerDraft` | `ComposerDraft` |
+| `WorkbenchSessionSummary` | `SessionSummary` |
+| `WorkbenchSessionDetail` | `SessionDetail` |
+| `WorkbenchFileChange` | `FileChange` |
+| `WorkbenchFileTreeNode` | `FileTreeNode` |
+| `WorkbenchLineAttachment` | `LineAttachment` |
+| `WorkbenchHistoryEvent` | `HistoryEvent` |
+| `WorkbenchDiffLineKind` | `DiffLineKind` |
+| `WorkbenchParsedDiffLine` | `ParsedDiffLine` |
+| `WorkbenchPullRequestSummary` | `PullRequestSummary` |
+| `WorkbenchOpenPrSummary` | `OpenPrSummary` |
+| `WorkbenchSandboxSummary` | `SandboxSummary` |
+| `WorkbenchTaskSummary` | `TaskSummary` |
+| `WorkbenchTaskDetail` | `TaskDetail` |
+| `WorkbenchRepositorySummary` | `RepositorySummary` |
+| `WorkbenchSession` | `TaskSession` (avoids auth `Session` collision) |
+| `WorkbenchTask` | `TaskSnapshot` (avoids `task` table collision) |
+| `WorkbenchRepo` | `RepoSnapshot` |
+| `WorkbenchRepositorySection` | `RepositorySection` |
+| `TaskWorkbenchSnapshot` | `DashboardSnapshot` |
+| `WorkbenchModelOption` | `ModelOption` |
+| `WorkbenchModelGroup` | `ModelGroup` |
+| `TaskWorkbenchSelectInput` | `SelectTaskInput` |
+| `TaskWorkbenchCreateTaskInput` | `CreateTaskInput` |
+| `TaskWorkbenchRenameInput` | `RenameTaskInput` |
+| `TaskWorkbenchSendMessageInput` | `SendMessageInput` |
+| `TaskWorkbenchSessionInput` | `SessionInput` |
+| `TaskWorkbenchRenameSessionInput` | `RenameSessionInput` |
+| `TaskWorkbenchChangeModelInput` | `ChangeModelInput` |
+| `TaskWorkbenchUpdateDraftInput` | `UpdateDraftInput` |
+| `TaskWorkbenchSetSessionUnreadInput` | `SetSessionUnreadInput` |
+| `TaskWorkbenchDiffInput` | `DiffInput` |
+| `TaskWorkbenchCreateTaskResponse` | `CreateTaskResponse` |
+| `TaskWorkbenchAddSessionResponse` | `AddSessionResponse` |
+
+### File renames
+
+| Before | After |
+|---|---|
+| `shared/src/workbench.ts` | `shared/src/types.ts` (or split into `task.ts`, `session.ts`, etc.) |
+| `backend/src/actors/task/workbench.ts` | `backend/src/actors/task/sessions.ts` (already planned in item 7) |
+| `client/src/workbench-client.ts` | `client/src/task-client.ts` |
+| `client/src/workbench-model.ts` | `client/src/model.ts` |
+| `client/src/remote/workbench-client.ts` | `client/src/remote/task-client.ts` |
+| `client/src/mock/workbench-client.ts` | `client/src/mock/task-client.ts` |
+
+### Table rename
+
+| Before | After |
+|---|---|
+| `task_workbench_sessions` | `task_sessions` |
+
+### Function renames (backend — drop "Workbench" infix)
+
+All functions in `backend/src/actors/task/workbench.ts`:
+- `createWorkbenchSession` → `createSession`
+- `closeWorkbenchSession` → `closeSession`
+- `changeWorkbenchModel` → `changeModel`
+- `sendWorkbenchMessage` → `sendMessage`
+- `stopWorkbenchSession` → `stopSession`
+- `renameWorkbenchBranch` → deleted (see item 26)
+- `renameWorkbenchTask` → `renameTask`
+- `renameWorkbenchSession` → `renameSession`
+- `revertWorkbenchFile` → `revertFile`
+- `publishWorkbenchPr` → `publishPr`
+- `updateWorkbenchDraft` → `updateDraft`
+- `setWorkbenchSessionUnread` → `setSessionUnread`
+- `markWorkbenchUnread` → `markUnread`
+- `syncWorkbenchSessionStatus` → `syncSessionStatus`
+- `ensureWorkbenchSeeded` → `ensureSessionSeeded`
+
+### Queue/command type renames (backend)
+
+- `TaskWorkbenchValueCommand` → `TaskValueCommand`
+- `TaskWorkbenchSessionTitleCommand` → `SessionTitleCommand`
+- `TaskWorkbenchSessionUnreadCommand` → `SessionUnreadCommand`
+
+### Scope
+
+~420 occurrences across shared (35+ types), backend (200+ refs), client (324 refs), frontend (96 refs). Mechanical find-and-replace once the rename map is settled.
+
+### Files to change
+
+- **`foundry/packages/shared/src/workbench.ts`** — rename file, rename all exported types
+- **`foundry/packages/shared/src/index.ts`** — update re-export path
+- **`foundry/packages/shared/src/app-shell.ts`** — update `WorkbenchModelId` → `ModelId` import
+- **`foundry/packages/shared/src/realtime-events.ts`** — update all `Workbench*` type imports
+- **`foundry/packages/backend/src/actors/task/workbench.ts`** — rename file + all functions
+- **`foundry/packages/backend/src/actors/task/index.ts`** — update imports and action registrations
+- **`foundry/packages/backend/src/actors/task/db/schema.ts`** — rename `taskWorkbenchSessions` → `taskSessions`
+- **`foundry/packages/backend/src/actors/task/workflow/`** — update all workbench references
+- **`foundry/packages/backend/src/actors/organization/`** — update type imports and action names
+- **`foundry/packages/backend/src/actors/repository/`** — update type imports
+- **`foundry/packages/client/src/`** — rename files + update all type/function references
+- **`foundry/packages/frontend/src/`** — update all type imports
+
+### CLAUDE.md update
+
+Update `foundry/packages/backend/CLAUDE.md` coordinator hierarchy diagram: `taskWorkbenchSessions` → `taskSessions`.
+
+---
+
+## [ ] 26. Delete branch rename (branches immutable after creation)
+
+**Dependencies:** item 25
+
+**Rationale:** Branch name is assigned once at task creation and never changes. Branch rename is unused in the frontend UI and SDK, adds ~80 lines of code, and creates a transactional consistency risk (git rename succeeds but index update fails).
+
+### Delete
+
+- **`task/workbench.ts`** — delete `renameWorkbenchBranch()` (~50 lines)
+- **`task/index.ts`** — delete `renameWorkbenchBranch` action
+- **`task/workflow/queue.ts`** — remove `"task.command.workbench.rename_branch"` queue type
+- **`task/workflow/index.ts`** — remove `"task.command.workbench.rename_branch"` handler
+- **`organization/actions.ts`** — delete `renameWorkbenchBranch` proxy action
+- **`repository/actions.ts`** — delete `registerTaskBranch` action (only caller was rename flow)
+- **`client/src/workbench-client.ts`** — remove `renameBranch` from interface
+- **`client/src/remote/workbench-client.ts`** — delete `renameBranch()` method
+- **`client/src/mock/workbench-client.ts`** — delete `renameBranch()` method
+- **`client/src/backend-client.ts`** — delete `renameWorkbenchBranch` from interface + implementation
+- **`client/src/mock/backend-client.ts`** — delete `renameWorkbenchBranch` implementation
+- **`frontend/src/components/mock-layout.tsx`** — remove `renameBranch` from client interface, delete `onRenameBranch` callbacks and all `renameBranch` wiring (~8 refs)
+- **`shared/src/workbench.ts`** — delete `TaskWorkbenchRenameInput` (if only used by branch rename; check if task title rename shares it)
+
+### Keep
+
+- `deriveFallbackTitle()` + `sanitizeBranchName()` + `resolveCreateFlowDecision()` — initial branch derivation at creation
+- `registerTaskBranchMutation()` — used during task creation for `onBranch` path
+- `renameWorkbenchTask()` — title rename is independent, stays
+- `taskIndex` table — still the coordinator index for branch→task mapping
+
+---
+
+## [ ] Final audit pass (run after all items above are complete)
+
+### Dead code scan
+
+Already tracked in item 18: once all changes are complete, do a full scan to find dead actions, queues, SQLite tables, and workflow steps that need to be removed.
+
+### Dead events audit
+
+Scan all event types emitted by actors (in `packages/shared/src/realtime-events.ts` and anywhere actors call `c.broadcast()` or similar). Cross-reference against all client subscribers (in `packages/client/` and `packages/frontend/`). Remove any events that are emitted but never subscribed to by any client. This includes events that may have been superseded by the consolidated single-topic-per-actor pattern (item 14).
diff --git a/foundry/README.md b/foundry/README.md
new file mode 100644
index 0000000..47501ef
--- /dev/null
+++ b/foundry/README.md
@@ -0,0 +1,24 @@
+# Foundry
+
+TypeScript organization task system powered by RivetKit actors, SQLite/Drizzle state, and OpenTUI.
+
+**Documentation**: see `../docs/` in the repository root
+
+## Quick Install
+
+```bash
+curl -fsSL https://bun.sh/install | bash
+pnpm install
+pnpm -w build
+```
+
+## Repository Goals
+
+- **Simple**: There's one screen. It has everything you need. You can use it blindfolded.
+- **Fast**: No waiting around.
+- **Collaborative**: Built for fast moving teams that need code reviewed & shipped fast.
+- **Pluggable**: Works for small side repositories to enterprise teams.
+
+## License
+
+MIT
diff --git a/foundry/compose.dev.yaml b/foundry/compose.dev.yaml
new file mode 100644
index 0000000..7fa492d
--- /dev/null
+++ b/foundry/compose.dev.yaml
@@ -0,0 +1,127 @@
+name: foundry
+
+services:
+  backend:
+    build:
+      context: ..
+      dockerfile: foundry/docker/backend.dev.Dockerfile
+    image: foundry-backend-dev
+    working_dir: /app
+    env_file:
+      - path: .env
+        required: false
+    environment:
+      HF_BACKEND_HOST: "0.0.0.0"
+      HF_BACKEND_PORT: "7741"
+      RIVETKIT_STORAGE_PATH: "/root/.local/share/foundry/rivetkit"
+      RIVET_LOG_ERROR_STACK: "${RIVET_LOG_ERROR_STACK:-1}"
+      RIVET_LOG_LEVEL: "${RIVET_LOG_LEVEL:-debug}"
+      RIVET_LOG_TIMESTAMP: "${RIVET_LOG_TIMESTAMP:-1}"
+      FOUNDRY_LOG_LEVEL: "${FOUNDRY_LOG_LEVEL:-debug}"
+      # Pass through credentials needed for agent execution + PR creation in dev/e2e.
+      # Do not hardcode secrets; set these in your environment when starting compose.
+      ANTHROPIC_API_KEY: "${ANTHROPIC_API_KEY:-}"
+      CLAUDE_API_KEY: "${CLAUDE_API_KEY:-${ANTHROPIC_API_KEY:-}}"
+      OPENAI_API_KEY: "${OPENAI_API_KEY:-}"
+      # sandbox-agent codex plugin currently expects CODEX_API_KEY. Map from OPENAI_API_KEY for convenience.
+      CODEX_API_KEY: "${CODEX_API_KEY:-${OPENAI_API_KEY:-}}"
+      # Support either GITHUB_TOKEN or GITHUB_PAT in local env files.
+      GITHUB_TOKEN: "${GITHUB_TOKEN:-${GITHUB_PAT:-}}"
+      GH_TOKEN: "${GH_TOKEN:-${GITHUB_TOKEN:-${GITHUB_PAT:-}}}"
+      APP_URL: "${APP_URL:-}"
+      BETTER_AUTH_URL: "${BETTER_AUTH_URL:-}"
+      BETTER_AUTH_SECRET: "${BETTER_AUTH_SECRET:-}"
+      GITHUB_CLIENT_ID: "${GITHUB_CLIENT_ID:-}"
+      GITHUB_CLIENT_SECRET: "${GITHUB_CLIENT_SECRET:-}"
+      GITHUB_REDIRECT_URI: "${GITHUB_REDIRECT_URI:-}"
+      GITHUB_APP_ID: "${GITHUB_APP_ID:-}"
+      GITHUB_APP_CLIENT_ID: "${GITHUB_APP_CLIENT_ID:-}"
+      GITHUB_APP_CLIENT_SECRET: "${GITHUB_APP_CLIENT_SECRET:-}"
+      GITHUB_APP_PRIVATE_KEY: "${GITHUB_APP_PRIVATE_KEY:-}"
+      GITHUB_WEBHOOK_SECRET: "${GITHUB_WEBHOOK_SECRET:-${GITHUB_APP_WEBHOOK_SECRET:-}}"
+      STRIPE_PUBLISHABLE_KEY: "${STRIPE_PUBLISHABLE_KEY:-}"
+      STRIPE_SECRET_KEY: "${STRIPE_SECRET_KEY:-}"
+      STRIPE_WEBHOOK_SECRET: "${STRIPE_WEBHOOK_SECRET:-}"
+      STRIPE_PRICE_TEAM: "${STRIPE_PRICE_TEAM:-}"
+      FOUNDRY_SANDBOX_PROVIDER: "${FOUNDRY_SANDBOX_PROVIDER:-local}"
+      HF_LOCAL_SANDBOX_IMAGE: "${HF_LOCAL_SANDBOX_IMAGE:-rivetdev/sandbox-agent:foundry-base-latest}"
+      E2B_API_KEY: "${E2B_API_KEY:-}"
+      E2B_TEMPLATE: "${E2B_TEMPLATE:-}"
+      HF_E2B_TEMPLATE: "${HF_E2B_TEMPLATE:-${E2B_TEMPLATE:-}}"
+      DAYTONA_ENDPOINT: "${DAYTONA_ENDPOINT:-}"
+      DAYTONA_API_KEY: "${DAYTONA_API_KEY:-}"
+      HF_DAYTONA_ENDPOINT: "${HF_DAYTONA_ENDPOINT:-}"
+      HF_DAYTONA_API_KEY: "${HF_DAYTONA_API_KEY:-}"
+    ports:
+      - "6420:6420"
+      - "7741:7741"
+    volumes:
+      - "..:/app"
+      # Reuse the host Codex auth profile for local sandbox-agent Codex sessions in dev.
+      - "${HOME}/.codex:/root/.codex"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      # Keep backend dependency installs Linux-native instead of using host node_modules.
+      - "foundry_backend_root_node_modules:/app/node_modules"
+      - "foundry_backend_backend_node_modules:/app/foundry/packages/backend/node_modules"
+      - "foundry_backend_shared_node_modules:/app/foundry/packages/shared/node_modules"
+      - "foundry_backend_typescript_node_modules:/app/sdks/typescript/node_modules"
+      - "foundry_backend_pnpm_store:/root/.local/share/pnpm/store"
+      # Persist RivetKit local storage across container restarts.
+      - "foundry_rivetkit_storage:/root/.local/share/foundry/rivetkit"
+
+  frontend:
+    build:
+      context: ..
+      dockerfile: foundry/docker/frontend.dev.Dockerfile
+    working_dir: /app
+    depends_on:
+      - backend
+    environment:
+      HOME: "/tmp"
+      HF_BACKEND_HTTP: "http://backend:7741"
+    ports:
+      - "4173:4173"
+    volumes:
+      - "..:/app"
+      # Ensure logs in .foundry/ persist on the host even if we change source mounts later.
+      - "./.foundry:/app/foundry/.foundry"
+      # Use Linux-native repo dependencies inside the container instead of host node_modules.
+      - "foundry_node_modules:/app/node_modules"
+      - "foundry_client_node_modules:/app/foundry/packages/client/node_modules"
+      - "foundry_frontend_node_modules:/app/foundry/packages/frontend/node_modules"
+      - "foundry_shared_node_modules:/app/foundry/packages/shared/node_modules"
+      - "foundry_pnpm_store:/tmp/.local/share/pnpm/store"
+
+  smee:
+    image: node:20-alpine
+    depends_on:
+      - backend
+    env_file:
+      - path: .env
+        required: false
+    environment:
+      SMEE_URL: "${SMEE_URL:-}"
+      SMEE_TARGET: "${SMEE_TARGET:-http://backend:7741/v1/webhooks/github}"
+    command:
+      - /bin/sh
+      - -lc
+      - |
+        if [ -z "$SMEE_URL" ]; then
+          echo "SMEE_URL is required for local GitHub webhook forwarding" >&2
+          exit 1
+        fi
+        exec npx --yes smee-client --url "$SMEE_URL" --target "$SMEE_TARGET"
+    restart: unless-stopped
+
+volumes:
+  foundry_backend_root_node_modules: {}
+  foundry_backend_backend_node_modules: {}
+  foundry_backend_shared_node_modules: {}
+  foundry_backend_typescript_node_modules: {}
+  foundry_backend_pnpm_store: {}
+  foundry_rivetkit_storage: {}
+  foundry_node_modules: {}
+  foundry_client_node_modules: {}
+  foundry_frontend_node_modules: {}
+  foundry_shared_node_modules: {}
+  foundry_pnpm_store: {}
diff --git a/foundry/compose.mock.yaml b/foundry/compose.mock.yaml
new file mode 100644
index 0000000..6c57875
--- /dev/null
+++ b/foundry/compose.mock.yaml
@@ -0,0 +1,29 @@
+name: foundry-mock
+
+services:
+  frontend:
+    build:
+      context: ..
+      dockerfile: foundry/docker/frontend.dev.Dockerfile
+    working_dir: /app
+    environment:
+      HOME: "/tmp"
+      FOUNDRY_FRONTEND_CLIENT_MODE: "mock"
+    ports:
+      - "4174:4174"
+    command: ["bash", "-lc", "pnpm install --force --frozen-lockfile --filter @sandbox-agent/foundry-frontend... && cd foundry/packages/frontend && exec pnpm vite --host 0.0.0.0 --port 4174"]
+    volumes:
+      - "..:/app"
+      - "./.foundry:/app/foundry/.foundry"
+      - "mock_node_modules:/app/node_modules"
+      - "mock_client_node_modules:/app/foundry/packages/client/node_modules"
+      - "mock_frontend_node_modules:/app/foundry/packages/frontend/node_modules"
+      - "mock_shared_node_modules:/app/foundry/packages/shared/node_modules"
+      - "mock_pnpm_store:/tmp/.local/share/pnpm/store"
+
+volumes:
+  mock_node_modules: {}
+  mock_client_node_modules: {}
+  mock_frontend_node_modules: {}
+  mock_shared_node_modules: {}
+  mock_pnpm_store: {}
diff --git a/foundry/compose.preview.yaml b/foundry/compose.preview.yaml
new file mode 100644
index 0000000..aa43b52
--- /dev/null
+++ b/foundry/compose.preview.yaml
@@ -0,0 +1,40 @@
+name: foundry-preview
+
+services:
+  backend:
+    build:
+      context: ..
+      dockerfile: foundry/docker/backend.preview.Dockerfile
+    image: foundry-backend-preview
+    environment:
+      HF_BACKEND_HOST: "0.0.0.0"
+      HF_BACKEND_PORT: "7841"
+      RIVETKIT_STORAGE_PATH: "/root/.local/share/foundry/rivetkit"
+      ANTHROPIC_API_KEY: "${ANTHROPIC_API_KEY:-}"
+      CLAUDE_API_KEY: "${CLAUDE_API_KEY:-${ANTHROPIC_API_KEY:-}}"
+      OPENAI_API_KEY: "${OPENAI_API_KEY:-}"
+      CODEX_API_KEY: "${CODEX_API_KEY:-${OPENAI_API_KEY:-}}"
+      GITHUB_TOKEN: "${GITHUB_TOKEN:-${GITHUB_PAT:-}}"
+      GH_TOKEN: "${GH_TOKEN:-${GITHUB_TOKEN:-${GITHUB_PAT:-}}}"
+      DAYTONA_ENDPOINT: "${DAYTONA_ENDPOINT:-}"
+      DAYTONA_API_KEY: "${DAYTONA_API_KEY:-}"
+      HF_DAYTONA_ENDPOINT: "${HF_DAYTONA_ENDPOINT:-}"
+      HF_DAYTONA_API_KEY: "${HF_DAYTONA_API_KEY:-}"
+    ports:
+      - "7841:7841"
+    volumes:
+      - "${HOME}/.codex:/root/.codex"
+      - "foundry_preview_rivetkit_storage:/root/.local/share/foundry/rivetkit"
+
+  frontend:
+    build:
+      context: ..
+      dockerfile: foundry/docker/frontend.preview.Dockerfile
+    image: foundry-frontend-preview
+    depends_on:
+      - backend
+    ports:
+      - "4273:4273"
+
+volumes:
+  foundry_preview_rivetkit_storage: {}
diff --git a/foundry/docker/backend.Dockerfile b/foundry/docker/backend.Dockerfile
new file mode 100644
index 0000000..ae14ddf
--- /dev/null
+++ b/foundry/docker/backend.Dockerfile
@@ -0,0 +1,40 @@
+# syntax=docker/dockerfile:1.7
+
+FROM node:22-bookworm-slim AS build
+ENV PNPM_HOME=/pnpm
+ENV PATH=$PNPM_HOME:$PATH
+WORKDIR /app
+RUN corepack enable && corepack prepare pnpm@10.28.2 --activate
+
+COPY . .
+
+RUN pnpm install --frozen-lockfile
+RUN pnpm --filter @sandbox-agent/foundry-shared build
+RUN pnpm --filter acp-http-client build
+RUN pnpm --filter @sandbox-agent/cli-shared build
+RUN SKIP_OPENAPI_GEN=1 pnpm --filter sandbox-agent build
+RUN pnpm --filter @sandbox-agent/foundry-backend build
+RUN pnpm --filter @sandbox-agent/foundry-backend deploy --prod /out
+
+FROM oven/bun:1.2 AS runtime
+ENV NODE_ENV=production
+ENV HOME=/home/task
+ENV RIVET_RUNNER_VERSION_FILE=/etc/foundry/rivet-runner-version
+WORKDIR /app
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    git \
+    gh \
+    openssh-client \
+  && rm -rf /var/lib/apt/lists/*
+RUN addgroup --system --gid 1001 task \
+  && adduser --system --uid 1001 --home /home/task --ingroup task task \
+  && mkdir -p /home/task \
+  && chown -R task:task /home/task /app
+RUN mkdir -p /etc/foundry \
+  && date +%s > /etc/foundry/rivet-runner-version
+COPY --from=build /out ./
+USER task
+EXPOSE 7741
+CMD ["bun", "dist/index.js", "start", "--host", "0.0.0.0"]
diff --git a/foundry/docker/backend.dev.Dockerfile b/foundry/docker/backend.dev.Dockerfile
new file mode 100644
index 0000000..c4b6c3a
--- /dev/null
+++ b/foundry/docker/backend.dev.Dockerfile
@@ -0,0 +1,34 @@
+# syntax=docker/dockerfile:1.7
+
+FROM oven/bun:1.3
+
+ARG SANDBOX_AGENT_VERSION=0.3.0
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    git \
+    gh \
+    nodejs \
+    npm \
+    openssh-client \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN npm install -g pnpm@10.28.2
+
+RUN curl -fsSL "https://releases.rivet.dev/sandbox-agent/${SANDBOX_AGENT_VERSION}/install.sh" | sh
+
+ENV PATH="/root/.local/bin:${PATH}"
+ENV SANDBOX_AGENT_BIN="/root/.local/bin/sandbox-agent"
+ENV RIVET_RUNNER_VERSION_FILE=/etc/foundry/rivet-runner-version
+RUN mkdir -p /etc/foundry \
+  && date +%s > /etc/foundry/rivet-runner-version
+
+WORKDIR /app
+
+# NOTE: Do NOT use `bun --hot` here. Bun's hot reloading re-initializes the
+# server on a new port (e.g. 6421 instead of 6420) while the container still
+# exposes the original port, breaking all client connections. Restart the
+# backend container instead: `just foundry-dev-down && just foundry-dev`
+CMD ["bash", "-lc", "git config --global --add safe.directory /app >/dev/null 2>&1 || true; pnpm install --frozen-lockfile --filter @sandbox-agent/foundry-backend... && exec bun foundry/packages/backend/src/index.ts start --host 0.0.0.0 --port 7741"]
diff --git a/foundry/docker/backend.preview.Dockerfile b/foundry/docker/backend.preview.Dockerfile
new file mode 100644
index 0000000..91cd7c7
--- /dev/null
+++ b/foundry/docker/backend.preview.Dockerfile
@@ -0,0 +1,36 @@
+# syntax=docker/dockerfile:1.7
+
+FROM oven/bun:1.3
+
+ARG SANDBOX_AGENT_VERSION=0.3.0
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    git \
+    gh \
+    nodejs \
+    npm \
+    openssh-client \
+  && npm install -g pnpm@10.28.2 \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL "https://releases.rivet.dev/sandbox-agent/${SANDBOX_AGENT_VERSION}/install.sh" | sh
+
+ENV PATH="/root/.local/bin:${PATH}"
+ENV SANDBOX_AGENT_BIN="/root/.local/bin/sandbox-agent"
+ENV RIVET_RUNNER_VERSION_FILE=/etc/foundry/rivet-runner-version
+RUN mkdir -p /etc/foundry \
+  && date +%s > /etc/foundry/rivet-runner-version
+
+WORKDIR /workspace/quebec
+
+COPY quebec /workspace/quebec
+
+RUN pnpm install --frozen-lockfile
+RUN pnpm --filter @sandbox-agent/foundry-shared build
+RUN pnpm --filter @sandbox-agent/foundry-client build
+RUN pnpm --filter @sandbox-agent/foundry-backend build
+
+CMD ["bash", "-lc", "git config --global --add safe.directory /workspace/quebec >/dev/null 2>&1 || true; exec bun packages/backend/dist/index.js start --host 0.0.0.0 --port 7841"]
diff --git a/foundry/docker/foundry-base.Dockerfile b/foundry/docker/foundry-base.Dockerfile
new file mode 100644
index 0000000..b4b9e26
--- /dev/null
+++ b/foundry/docker/foundry-base.Dockerfile
@@ -0,0 +1,190 @@
+# syntax=docker/dockerfile:1.10.0
+#
+# Foundry base sandbox image.
+#
+# Builds sandbox-agent from source (reusing the upstream Dockerfile.full build
+# stages) and layers Foundry-specific tooling on top: sudo, git, neovim, gh,
+# node, bun, chromium, and agent-browser.
+#
+# Build:
+#   docker build --platform linux/amd64 \
+#     -f foundry/docker/foundry-base.Dockerfile \
+#     -t rivetdev/sandbox-agent:foundry-base-<timestamp> .
+#
+# Must be invoked from the repository root so the COPY . picks up the full
+# source tree for the Rust + inspector build stages.
+
+# ============================================================================
+# Build inspector frontend
+# ============================================================================
+FROM --platform=linux/amd64 node:22-alpine AS inspector-build
+WORKDIR /app
+RUN npm install -g pnpm
+
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
+COPY sdks/cli-shared/package.json ./sdks/cli-shared/
+COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
+COPY sdks/react/package.json ./sdks/react/
+COPY sdks/typescript/package.json ./sdks/typescript/
+
+RUN pnpm install --filter @sandbox-agent/inspector...
+
+COPY docs/openapi.json ./docs/
+COPY sdks/cli-shared ./sdks/cli-shared
+COPY sdks/acp-http-client ./sdks/acp-http-client
+COPY sdks/react ./sdks/react
+COPY sdks/typescript ./sdks/typescript
+
+RUN cd sdks/cli-shared && pnpm exec tsup
+RUN cd sdks/acp-http-client && pnpm exec tsup
+RUN cd sdks/typescript && SKIP_OPENAPI_GEN=1 pnpm exec tsup
+RUN cd sdks/react && pnpm exec tsup
+
+COPY frontend/packages/inspector ./frontend/packages/inspector
+RUN cd frontend/packages/inspector && pnpm exec vite build
+
+# ============================================================================
+# AMD64 Builder - sandbox-agent static binary
+# ============================================================================
+FROM --platform=linux/amd64 rust:1.88.0 AS builder
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+    musl-tools \
+    musl-dev \
+    llvm-14-dev \
+    libclang-14-dev \
+    clang-14 \
+    libssl-dev \
+    pkg-config \
+    ca-certificates \
+    g++ \
+    g++-multilib \
+    git \
+    curl \
+    wget && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget -q https://github.com/cross-tools/musl-cross/releases/latest/download/x86_64-unknown-linux-musl.tar.xz && \
+    tar -xf x86_64-unknown-linux-musl.tar.xz -C /opt/ && \
+    rm x86_64-unknown-linux-musl.tar.xz && \
+    rustup target add x86_64-unknown-linux-musl
+
+ENV PATH="/opt/x86_64-unknown-linux-musl/bin:$PATH" \
+    LIBCLANG_PATH=/usr/lib/llvm-14/lib \
+    CLANG_PATH=/usr/bin/clang-14 \
+    CC_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-gcc \
+    CXX_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-g++ \
+    AR_x86_64_unknown_linux_musl=x86_64-unknown-linux-musl-ar \
+    CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-unknown-linux-musl-gcc \
+    CARGO_INCREMENTAL=0 \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true
+
+ENV SSL_VER=1.1.1w
+RUN wget https://www.openssl.org/source/openssl-$SSL_VER.tar.gz && \
+    tar -xzf openssl-$SSL_VER.tar.gz && \
+    cd openssl-$SSL_VER && \
+    ./Configure no-shared no-async --prefix=/musl --openssldir=/musl/ssl linux-x86_64 && \
+    make -j$(nproc) && \
+    make install_sw && \
+    cd .. && \
+    rm -rf openssl-$SSL_VER*
+
+ENV OPENSSL_DIR=/musl \
+    OPENSSL_INCLUDE_DIR=/musl/include \
+    OPENSSL_LIB_DIR=/musl/lib \
+    PKG_CONFIG_ALLOW_CROSS=1 \
+    RUSTFLAGS="-C target-feature=+crt-static -C link-arg=-static-libgcc"
+
+WORKDIR /build
+COPY . .
+
+COPY --from=inspector-build /app/frontend/packages/inspector/dist ./frontend/packages/inspector/dist
+
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \
+    cargo build -p sandbox-agent --release --target x86_64-unknown-linux-musl -j4 && \
+    cp target/x86_64-unknown-linux-musl/release/sandbox-agent /sandbox-agent
+
+# ============================================================================
+# Runtime - Foundry base sandbox image
+# ============================================================================
+FROM --platform=linux/amd64 node:22-bookworm-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# --- System packages --------------------------------------------------------
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    bash \
+    ca-certificates \
+    curl \
+    git \
+    gnupg \
+    neovim \
+    sudo \
+    unzip \
+    wget \
+    # Chromium and its runtime deps
+    chromium \
+    fonts-liberation \
+    libasound2 \
+    libatk-bridge2.0-0 \
+    libatk1.0-0 \
+    libcups2 \
+    libdbus-1-3 \
+    libdrm2 \
+    libgbm1 \
+    libgtk-3-0 \
+    libnspr4 \
+    libnss3 \
+    libx11-xcb1 \
+    libxcomposite1 \
+    libxdamage1 \
+    libxrandr2 \
+    xdg-utils \
+    && rm -rf /var/lib/apt/lists/*
+
+# --- GitHub CLI (gh) -------------------------------------------------------
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+      | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+      > /etc/apt/sources.list.d/github-cli.list \
+    && apt-get update && apt-get install -y gh \
+    && rm -rf /var/lib/apt/lists/*
+
+# --- Bun --------------------------------------------------------------------
+RUN curl -fsSL https://bun.sh/install | bash \
+    && mv /root/.bun/bin/bun /usr/local/bin/bun \
+    && ln -sf /usr/local/bin/bun /usr/local/bin/bunx \
+    && rm -rf /root/.bun
+
+# --- sandbox-agent binary (from local build) --------------------------------
+COPY --from=builder /sandbox-agent /usr/local/bin/sandbox-agent
+RUN chmod +x /usr/local/bin/sandbox-agent
+
+# --- sandbox user with passwordless sudo ------------------------------------
+RUN useradd -m -s /bin/bash sandbox \
+    && echo "sandbox ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/sandbox \
+    && chmod 0440 /etc/sudoers.d/sandbox
+
+USER sandbox
+WORKDIR /home/sandbox
+
+# Point Chromium/Playwright at the system binary
+ENV CHROME_PATH=/usr/bin/chromium
+ENV CHROMIUM_PATH=/usr/bin/chromium
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
+# --- Install all sandbox-agent agents + agent-browser -----------------------
+RUN sandbox-agent install-agent --all
+RUN sudo npm install -g agent-browser
+
+EXPOSE 2468
+
+ENTRYPOINT ["sandbox-agent"]
+CMD ["server", "--host", "0.0.0.0", "--port", "2468"]
diff --git a/foundry/docker/frontend-caddy-entrypoint.sh b/foundry/docker/frontend-caddy-entrypoint.sh
new file mode 100644
index 0000000..44a42ad
--- /dev/null
+++ b/foundry/docker/frontend-caddy-entrypoint.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -eu
+
+escape_js() {
+  printf '%s' "${1:-}" | sed 's/\\/\\\\/g; s/"/\\"/g'
+}
+
+normalize_backend_endpoint() {
+  case "${1:-}" in
+    */api/rivet)
+      printf '%s/v1/rivet' "${1%/api/rivet}"
+      ;;
+    *)
+      printf '%s' "${1:-}"
+      ;;
+  esac
+}
+
+cat > /srv/__foundry_runtime_config.js <<EOF
+window.__FOUNDRY_RUNTIME_CONFIG__ = {
+  backendEndpoint: "$(escape_js "$(normalize_backend_endpoint "${VITE_HF_BACKEND_ENDPOINT:-}")")",
+  defaultWorkspaceId: "$(escape_js "${VITE_HF_WORKSPACE:-}")",
+  frontendClientMode: "$(escape_js "${FOUNDRY_FRONTEND_CLIENT_MODE:-remote}")"
+};
+EOF
+
+exec caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
diff --git a/foundry/docker/frontend.Caddyfile b/foundry/docker/frontend.Caddyfile
new file mode 100644
index 0000000..2722cf8
--- /dev/null
+++ b/foundry/docker/frontend.Caddyfile
@@ -0,0 +1,11 @@
+{
+  auto_https off
+}
+
+:{$PORT:80} {
+  root * /srv
+  encode gzip zstd
+  header /__foundry_runtime_config.js Cache-Control "no-store"
+  try_files {path} /index.html
+  file_server
+}
diff --git a/foundry/docker/frontend.Dockerfile b/foundry/docker/frontend.Dockerfile
new file mode 100644
index 0000000..6f8eb65
--- /dev/null
+++ b/foundry/docker/frontend.Dockerfile
@@ -0,0 +1,29 @@
+# syntax=docker/dockerfile:1.7
+
+FROM node:22-bookworm-slim AS base
+ENV PNPM_HOME=/pnpm
+ENV PATH=$PNPM_HOME:$PATH
+WORKDIR /app
+RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
+
+FROM base AS build
+COPY . .
+RUN pnpm install --frozen-lockfile
+RUN pnpm --filter @sandbox-agent/foundry-shared build
+RUN pnpm --filter acp-http-client build
+RUN pnpm --filter @sandbox-agent/cli-shared build
+RUN SKIP_OPENAPI_GEN=1 pnpm --filter sandbox-agent build
+RUN pnpm --filter @sandbox-agent/react build
+RUN pnpm --filter @sandbox-agent/foundry-client build
+ENV FOUNDRY_FRONTEND_CLIENT_MODE=remote
+RUN pnpm --filter @sandbox-agent/foundry-frontend build
+
+FROM caddy:2.10-alpine AS runtime
+COPY foundry/docker/frontend.Caddyfile /etc/caddy/Caddyfile
+COPY foundry/docker/frontend-caddy-entrypoint.sh /usr/local/bin/foundry-frontend-entrypoint
+COPY --from=build /app/foundry/packages/frontend/dist /srv
+RUN chmod +x /usr/local/bin/foundry-frontend-entrypoint
+ENV PORT=80
+ENV FOUNDRY_FRONTEND_CLIENT_MODE=remote
+EXPOSE 80
+ENTRYPOINT ["/usr/local/bin/foundry-frontend-entrypoint"]
diff --git a/foundry/docker/frontend.dev.Dockerfile b/foundry/docker/frontend.dev.Dockerfile
new file mode 100644
index 0000000..dd74dd0
--- /dev/null
+++ b/foundry/docker/frontend.dev.Dockerfile
@@ -0,0 +1,11 @@
+# syntax=docker/dockerfile:1.7
+
+FROM node:22-bookworm-slim
+
+# Install pnpm into the image so we can run as a non-root user at runtime.
+# Using npm here avoids Corepack's first-run download behavior.
+RUN npm install -g pnpm@10.28.2
+
+WORKDIR /app
+
+CMD ["bash", "-lc", "pnpm install --frozen-lockfile --filter @sandbox-agent/foundry-frontend... && cd foundry/packages/frontend && exec pnpm vite --host 0.0.0.0 --port 4173"]
diff --git a/foundry/docker/frontend.mock.Dockerfile b/foundry/docker/frontend.mock.Dockerfile
new file mode 100644
index 0000000..8e3b7be
--- /dev/null
+++ b/foundry/docker/frontend.mock.Dockerfile
@@ -0,0 +1,29 @@
+# syntax=docker/dockerfile:1.7
+
+FROM node:22-bookworm-slim AS base
+ENV PNPM_HOME=/pnpm
+ENV PATH=$PNPM_HOME:$PATH
+WORKDIR /app
+RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
+
+FROM base AS build
+COPY . .
+RUN pnpm install --frozen-lockfile
+RUN pnpm --filter @sandbox-agent/foundry-shared build
+RUN pnpm --filter acp-http-client build
+RUN pnpm --filter @sandbox-agent/cli-shared build
+RUN SKIP_OPENAPI_GEN=1 pnpm --filter sandbox-agent build
+RUN pnpm --filter @sandbox-agent/react build
+RUN pnpm --filter @sandbox-agent/foundry-client build
+ENV FOUNDRY_FRONTEND_CLIENT_MODE=mock
+RUN pnpm --filter @sandbox-agent/foundry-frontend build
+
+FROM caddy:2.10-alpine AS runtime
+COPY foundry/docker/frontend.Caddyfile /etc/caddy/Caddyfile
+COPY foundry/docker/frontend-caddy-entrypoint.sh /usr/local/bin/foundry-frontend-entrypoint
+COPY --from=build /app/foundry/packages/frontend/dist /srv
+RUN chmod +x /usr/local/bin/foundry-frontend-entrypoint
+ENV PORT=80
+ENV FOUNDRY_FRONTEND_CLIENT_MODE=mock
+EXPOSE 80
+ENTRYPOINT ["/usr/local/bin/foundry-frontend-entrypoint"]
diff --git a/foundry/docker/frontend.preview.Dockerfile b/foundry/docker/frontend.preview.Dockerfile
new file mode 100644
index 0000000..dd10422
--- /dev/null
+++ b/foundry/docker/frontend.preview.Dockerfile
@@ -0,0 +1,21 @@
+# syntax=docker/dockerfile:1.7
+
+FROM node:22-bookworm-slim AS build
+
+RUN npm install -g pnpm@10.28.2
+
+WORKDIR /workspace/quebec
+
+COPY quebec /workspace/quebec
+
+RUN pnpm install --frozen-lockfile
+RUN pnpm --filter @sandbox-agent/foundry-shared build
+RUN pnpm --filter @sandbox-agent/foundry-client build
+RUN pnpm --filter @sandbox-agent/foundry-frontend build
+
+FROM nginx:1.27-alpine
+
+COPY quebec/docker/nginx.preview.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /workspace/quebec/packages/frontend/dist /usr/share/nginx/html
+
+EXPOSE 4273
diff --git a/foundry/docker/nginx.preview.conf b/foundry/docker/nginx.preview.conf
new file mode 100644
index 0000000..d36b4c8
--- /dev/null
+++ b/foundry/docker/nginx.preview.conf
@@ -0,0 +1,31 @@
+server {
+  listen 4273;
+  server_name _;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location /v1/ {
+    proxy_pass http://backend:7841/v1/;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+  }
+
+  location = /v1 {
+    proxy_pass http://backend:7841/v1;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+  }
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+}
diff --git a/foundry/e2e/wb-mmilw7yh.txt b/foundry/e2e/wb-mmilw7yh.txt
new file mode 100644
index 0000000..abf5887
--- /dev/null
+++ b/foundry/e2e/wb-mmilw7yh.txt
@@ -0,0 +1 @@
+wb-mmilw7yh
diff --git a/foundry/e2e/wb-mmilzdwf.txt b/foundry/e2e/wb-mmilzdwf.txt
new file mode 100644
index 0000000..8165966
--- /dev/null
+++ b/foundry/e2e/wb-mmilzdwf.txt
@@ -0,0 +1 @@
+wb-mmilzdwf
diff --git a/foundry/foundry-cloud.md b/foundry/foundry-cloud.md
new file mode 100644
index 0000000..5846f7d
--- /dev/null
+++ b/foundry/foundry-cloud.md
@@ -0,0 +1,12 @@
+# Foundry Cloud
+
+## Mock Server
+
+If you are running the mock server with Beat instead of `docker compose`, use a team accession for the process so it does not terminate when your message is finished.
+
+A detached `tmux` session is acceptable for this. Example:
+
+```bash
+tmux new-session -d -s mock-ui-4180 \
+  'cd /Users/nathan/conductor/workspaces/sandbox-agent/provo && FOUNDRY_FRONTEND_CLIENT_MODE=mock pnpm --filter @sandbox-agent/foundry-frontend exec vite --host localhost --port 4180'
+```
diff --git a/foundry/memory/roadmap.md b/foundry/memory/roadmap.md
new file mode 100644
index 0000000..1d0032d
--- /dev/null
+++ b/foundry/memory/roadmap.md
@@ -0,0 +1,82 @@
+## workflow
+
+### terminal
+
+1. hf create "do something"
+2. notifies via openclaw
+
+### claude code/opencode
+
+1. "task this task to do xxxx"
+2. ask clarifying questions
+3. works in background (attach opencode session with `hf attach` and switch to session with `hf switch`)
+4. automatically submits draft pr (if configured)
+5. notifies via openclaw (wip)
+
+### openclaw
+
+(similar to claude code)
+
+### mobile
+
+1. open opencode web ui
+
+## todo
+
+- add -a flag to add to create to attach to it
+- backend mode
+- fix our tests
+- update icons.rs to include colors for the icons
+
+## ideas
+
+- reminders (ctrl r)
+- notifications
+- check for duplicates/simlar prs
+- if plan -> searches for exsiting funcionality, creates plan asking clarying questions
+- automatically check off of todo list when done
+- fix opencode path, cannot find config file
+- unread indicato
+    - add inbox that is the source of truth for this
+    - show this on hf above everything else
+- sync command
+- refactor sessions: ~/.claude/plans/sleepy-frolicking-nest.md
+- keep switch active after archive
+- add an icon if there are merge conflicts
+- add `hf -`
+- ask -> do research in a codebase
+- todo list integrations (linear, github, etc)
+    - show issues due soon in switch
+    - search issues from cli
+    - create issues from cli
+- keep tmux window name in sync with the agent status
+- move all tools (github, graphite, git) too tools/ folder
+- show git tree
+- editor plugins
+    - vs code
+    - tmux
+    - zed
+    - opencode web
+- have hf switch periodically refresh on agent status
+- add new columns
+    - model (for the agent)
+- todo list & plan management -> with simplenote sync
+- sqlite (global)
+- list of all global task repos
+- heartbeat status to tell openclaw what it needs to send you
+- sandbox agent sdk support
+- serve command to run server
+- multi-repo support (list for all repos)
+- pluggable notification system
+- cron jobs
+- sandbox support
+    - auto-boot sandboxes for prs
+- menubar
+- notes integration
+
+## cool details
+
+- automatically uses your opencode theme
+- auto symlink target/node_modules/etc
+- auto-archives tasks when closed
+- shows agent status in the tmux window name
diff --git a/foundry/packages/backend/CLAUDE.md b/foundry/packages/backend/CLAUDE.md
new file mode 100644
index 0000000..f7e054d
--- /dev/null
+++ b/foundry/packages/backend/CLAUDE.md
@@ -0,0 +1,338 @@
+# Backend Notes
+
+## Actor Hierarchy
+
+Keep the backend actor tree aligned with this shape unless we explicitly decide to change it:
+
+```text
+OrganizationActor (direct coordinator for tasks)
+├─ AuditLogActor (organization-scoped global feed)
+├─ GithubDataActor
+├─ TaskActor(task)
+│  ├─ taskSessions      → session metadata/transcripts
+│  └─ taskSandboxes     → sandbox instance index
+└─ SandboxInstanceActor(sandboxProviderId, sandboxId) × N
+```
+
+## Coordinator Pattern
+
+Actors follow a coordinator pattern where each coordinator is responsible for:
+1. **Index tables** — keeping a local SQLite index/summary of its child actors' data
+2. **Create/destroy** — handling lifecycle of child actors
+3. **Routing** — resolving lookups to the correct child actor
+
+Children push updates **up** to their direct coordinator only. Coordinators broadcast changes to connected clients. This keeps the read path local (no fan-out to children).
+
+### Coordinator hierarchy and index tables
+
+```text
+OrganizationActor (coordinator for tasks + auth users)
+│
+│  Index tables:
+│  ├─ taskIndex          → TaskActor index (taskId → repoId + branchName)
+│  ├─ taskSummaries      → TaskActor materialized sidebar projection
+│  ├─ authSessionIndex   → UserActor index (session token → userId)
+│  ├─ authEmailIndex     → UserActor index (email → userId)
+│  └─ authAccountIndex   → UserActor index (OAuth account → userId)
+│
+├─ TaskActor (coordinator for sessions + sandboxes)
+│  │
+│  │  Index tables:
+│  │  ├─ taskWorkspaceSessions → Session index (session metadata + transcript)
+│  │  └─ taskSandboxes         → SandboxInstanceActor index (sandbox history)
+│  │
+│  └─ SandboxInstanceActor (leaf)
+│
+├─ AuditLogActor (organization-scoped audit log, not a coordinator)
+└─ GithubDataActor (GitHub API cache, not a coordinator)
+```
+
+When adding a new index table, annotate it in the schema file with a doc comment identifying it as a coordinator index and which child actor it indexes (see existing examples).
+
+## GitHub Sync Data Model
+
+The GithubDataActor syncs **repositories** and **pull requests** from GitHub, not branches. We only need repos (to know which repos exist and their metadata) and PRs (to lazily populate virtual tasks in the sidebar). Branch data is not synced because we only create tasks from PRs or fresh user-initiated creation, never from bare branches. Generated branch names for new tasks are treated as unique enough to skip conflict detection against remote branches.
+
+Tasks are either:
+1. **Created fresh** by the user (no PR yet, branch name generated from task description)
+2. **Lazily populated from pull requests** during PR sync (virtual task entries in org tables, no actor spawned)
+
+## Lazy Task Actor Creation — CRITICAL
+
+**Task actors must NEVER be created during GitHub sync or bulk operations.** Creating hundreds of task actors simultaneously causes OOM crashes. An org can have 200+ PRs; spawning an actor per PR kills the process.
+
+### The two creation points
+
+There are exactly **two** places that may create a task actor:
+
+1. **`createTaskMutation`** in `task-mutations.ts` — the only backend code that calls `getOrCreateTask`. Triggered by explicit user action ("New Task" button). One actor at a time.
+
+2. **`backend-client.ts` client helper** — calls `client.task.getOrCreate(...)`. This is the lazy materialization point: when a user clicks a virtual task in the sidebar, the client creates the actor, and it self-initializes in `getCurrentRecord()` (`workflow/common.ts`) by reading branch/title from the org's `getTaskIndexEntry` action.
+
+### The rule
+
+### The rule
+
+**Never use `getOrCreateTask` inside a sync loop, webhook handler, or any bulk operation.** That's what caused the OOM — 186 actors spawned simultaneously during PR sync.
+
+`getOrCreateTask` IS allowed in:
+- `createTaskMutation` — explicit user "New Task" action
+- `requireWorkspaceTask` — user-initiated actions (createSession, sendMessage, etc.) that may hit a virtual task
+- `getTask` action on the org — called by sandbox actor and client, needs to materialize virtual tasks
+- `backend-client.ts` client helper — lazy materialization when user views a task
+
+### Virtual tasks (PR-driven)
+
+During PR sync, `refreshTaskSummaryForBranchMutation` is called for every changed PR (via github-data's `emitPullRequestChangeEvents`). It writes **virtual task entries** to the org actor's local `taskIndex` + `taskSummaries` tables only. No task actor is spawned. No cross-actor calls to task actors.
+
+When the user interacts with a virtual task (clicks it, creates a session):
+1. Client or org actor calls `getOrCreate` on the task actor key → actor is created with empty DB
+2. Any action on the actor calls `getCurrentRecord()` → sees empty DB → reads branch/title from org's `getTaskIndexEntry` → calls `initBootstrapDbActivity` + `initCompleteActivity` → task is now real
+
+### Call sites to watch
+
+- `refreshTaskSummaryForBranchMutation` — called in bulk during sync. Must ONLY write to org local tables. Never create task actors or call task actor actions.
+- `emitPullRequestChangeEvents` in github-data — iterates all changed PRs. Must remain fire-and-forget with no actor fan-out.
+
+## Queue vs Action Decision Framework
+
+The default is a direct action. Use a queue only if the answer to one or more of these questions is **yes**.
+
+Actions are pure RPCs with no DB overhead on send — fast, but if the call fails the operation is lost. Queues persist the message to the database on send, guaranteeing it will be processed even if the target actor is busy, slow, or recovering. The tradeoff: queues add write overhead and serialize processing.
+
+### 1. Does this operation coordinate multi-step work?
+
+Does it involve external I/O (sandbox API, GitHub API, agent process management) or state machine transitions where interleaving would corrupt state? This is different from database-level serialization — a simple read-then-write on SQLite can use a transaction. The queue is for ordering operations that span DB writes + external I/O.
+
+**Queue examples:**
+- `workspace.send_message` — sends to sandbox agent, writes session status, does owner-swap. Multi-step with external I/O.
+- `push` / `sync` / `merge` — git operations in sandbox that must not interleave.
+- `createTask` — read-then-write across task index + actor creation. Returns result, so `wait: true`.
+
+**Action examples:**
+- `billing.stripe_customer.apply` — single column upsert, no external I/O.
+- `workspace.update_draft` — writes draft text, no coordination with sandbox ops.
+- `workspace.rename_task` — updates title column, queue handlers don't touch title.
+
+### 2. Must this message be processed no matter what?
+
+Is this a cross-actor fire-and-forget where the caller won't retry and data loss is unacceptable? A queue persists the message — if the target is down, it waits. An action RPC that fails is gone.
+
+**Queue examples:**
+- `audit.append` — caller must never be affected by audit failures, and audit entries must not be lost.
+- `applyTaskSummaryUpdate` — task actor pushes summary to org and moves on. Won't retry if org is busy.
+- `refreshTaskSummaryForBranch` — webhook-driven, won't be redelivered for the same event.
+
+**Action examples:**
+- `billing.invoice.upsert` — Stripe retries handle failures externally. No durability need on our side.
+- `workspace.mark_unread` — UI convenience state. Acceptable to lose on transient failure.
+- `github.webhook_receipt.record` — timestamp columns with no downstream effects.
+
+### Once on a queue: wait or fire-and-forget?
+
+If the caller needs a return value, use `wait: true`. If the UI updates via push events, use `wait: false`.
+
+Full migration plan: `QUEUE_TO_ACTION_MIGRATION.md`.
+
+## Ownership Rules
+
+- `OrganizationActor` is the organization coordinator, direct coordinator for tasks, and lookup/index owner. It owns the task index, task summaries, and repo catalog.
+- `AuditLogActor` is organization-scoped. There is one organization-level audit log feed.
+- `TaskActor` is one branch. Treat `1 task = 1 branch` once branch assignment is finalized.
+- `TaskActor` can have many sessions.
+- `TaskActor` can reference many sandbox instances historically, but should have only one active sandbox/session at a time.
+- Session unread state and draft prompts are backend-owned workspace state, not frontend-local state.
+- Branch names are immutable after task creation. Do not implement branch-rename flows.
+- `SandboxInstanceActor` stays separate from `TaskActor`; tasks/sessions reference it by identity.
+- The backend stores no local git state. No clones, no refs, no working trees, and no git-spice. Repository metadata comes from GitHub API data and webhook events. Any working-tree git operation runs inside a sandbox via `executeInSandbox()`.
+- When a backend request path must aggregate multiple independent actor calls or reads, prefer bounded parallelism over sequential fan-out when correctness permits. Do not serialize independent work by default.
+- Only a coordinator creates/destroys its children. Do not create child actors from outside the coordinator.
+- Children push state changes up to their direct coordinator only. Task actors push summary updates directly to the organization actor.
+- Read paths must use the coordinator's local index tables. Do not fan out to child actors on the hot read path.
+- Never build "enriched" read actions that chain through multiple actors (e.g., coordinator → child actor → sibling actor). If data from multiple actors is needed for a read, it should already be materialized in the coordinator's index tables via push updates. If it's not there, fix the write path to push it — do not add a fan-out read path.
+
+## Drizzle Migration Maintenance
+
+After changing any actor's `db/schema.ts`, you **must** regenerate the corresponding migration so the runtime creates the tables that match the schema. Forgetting this step causes `no such table` errors at runtime.
+
+1. **Generate a new drizzle migration.** Run from `packages/backend`:
+   ```bash
+   npx drizzle-kit generate --config=./src/actors/<actor>/db/drizzle.config.ts
+   ```
+   If the interactive prompt is unavailable (e.g. in a non-TTY), manually create a new `.sql` file under `./src/actors/<actor>/db/drizzle/` and add the corresponding entry to `meta/_journal.json`.
+
+2. **Regenerate the compiled `migrations.ts`.** Run from the foundry root:
+   ```bash
+   npx tsx packages/backend/src/actors/_scripts/generate-actor-migrations.ts
+   ```
+
+3. **Verify insert/upsert calls.** Every column with `.notNull()` (and no `.default(...)`) must be provided a value in all `insert()` and `onConflictDoUpdate()` calls. Missing a NOT NULL column causes a runtime constraint violation, not a type error.
+
+4. **Nuke RivetKit state in dev** after migration changes to start fresh:
+   ```bash
+   docker compose -f compose.dev.yaml down
+   docker volume rm foundry_foundry_rivetkit_storage
+   docker compose -f compose.dev.yaml up -d
+   ```
+
+Actors with drizzle migrations: `organization`, `audit-log`, `task`. Other actors (`user`, `github-data`) use inline migrations without drizzle.
+
+## Workflow Step Nesting — FORBIDDEN
+
+**Never call `c.step()` / `ctx.step()` from inside another step's `run` callback.** RivetKit workflow steps cannot be nested. Doing so causes the runtime error: *"Cannot start a new workflow entry while another is in progress."*
+
+This means:
+- Functions called from within a step `run` callback must NOT use `c.step()`, `c.loop()`, `c.sleep()`, or `c.queue.next()`.
+- If a mutation function needs to be called both from a step and standalone, it must only do plain DB/API work — no workflow primitives. The workflow step wrapping belongs in the workflow file, not in the mutation.
+- Helper wrappers that conditionally call `c.step()` (like a `runSyncStep` pattern) are dangerous — if the caller is already inside a step, the nested `c.step()` will crash at runtime with no compile-time warning.
+
+**Rule of thumb:** Workflow primitives (`step`, `loop`, `sleep`, `queue.next`) may only appear at the top level of a workflow function or inside a `loop` callback — never inside a step's `run`.
+
+## SQLite Constraints
+
+- Single-row tables must use an integer primary key with `CHECK (id = 1)` to enforce the singleton invariant at the database level.
+- Follow the task actor pattern for metadata/profile rows and keep the fixed row id in code as `1`, not a string sentinel.
+
+## Multiplayer Correctness
+
+Per-user UI state must live on the user actor, not on shared task/session actors. This is critical for multiplayer — multiple users may view the same task simultaneously with different active sessions, unread states, and in-progress drafts.
+
+**Per-user state (user actor):** active session tab, unread counts, draft text, draft attachments. Keyed by `(userId, taskId, sessionId)`.
+
+**Task-global state (task actor):** session transcript, session model, session runtime status, sandbox identity, task status, branch name, PR state. These are shared across all users viewing the task — that is correct behavior.
+
+Do not store per-user preferences, selections, or ephemeral UI state on shared actors. If a field's value should differ between two users looking at the same task, it belongs on the user actor.
+
+## Audit Log Maintenance
+
+Every new action or command handler that represents a user-visible or workflow-significant event must append to the audit log actor. The audit log must remain a comprehensive record of significant operations.
+
+## Debugging Actors
+
+### RivetKit Inspector UI
+
+The RivetKit inspector UI at `http://localhost:6420/ui/` is the most reliable way to debug actor state in local development. The inspector HTTP API (`/inspector/workflow-history`) has a known bug where it returns empty `{}` even when the workflow has entries — always cross-check with the UI.
+
+**Useful inspector URL pattern:**
+```
+http://localhost:6420/ui/?u=http%3A%2F%2F127.0.0.1%3A6420&ns=default&r=default&n=[%22<actor-name>%22]&actorId=<actor-id>&tab=<tab>
+```
+
+Tabs: `workflow`, `database`, `state`, `queue`, `connections`, `metadata`.
+
+**To find actor IDs:**
+```bash
+curl -s 'http://127.0.0.1:6420/actors?name=organization'
+```
+
+**To query actor DB via bun (inside container):**
+```bash
+docker compose -f compose.dev.yaml exec -T backend bun -e '
+  var Database = require("bun:sqlite");
+  var db = new Database("/root/.local/share/foundry/rivetkit/databases/<actor-id>.db", { readonly: true });
+  console.log(JSON.stringify(db.query("SELECT name FROM sqlite_master WHERE type=?").all("table")));
+'
+```
+
+**To call actor actions via inspector:**
+```bash
+curl -s -X POST 'http://127.0.0.1:6420/gateway/<actor-id>/inspector/action/<actionName>' \
+  -H 'Content-Type: application/json' -d '{"args":[{}]}'
+```
+
+### Known inspector API bugs
+
+- `GET /inspector/workflow-history` may return `{"history":{}}` even when workflow has run. Use the UI's Workflow tab instead.
+- `GET /inspector/queue` is reliable for checking pending messages.
+- `GET /inspector/state` is reliable for checking actor state.
+
+## Inbox & Notification System
+
+The user actor owns two per-user systems: a **task feed** (sidebar ordering) and **notifications** (discrete events). These are distinct concepts that share a common "bump" mechanism.
+
+### Core distinction: bumps vs. notifications
+
+A **bump** updates the task's position in the user's sidebar feed. A **notification** is a discrete event entry shown in the notification panel. Every notification also triggers a bump, but not every bump creates a notification.
+
+| Event | Bumps task? | Creates notification? |
+|-------|-------------|----------------------|
+| User sends a message | Yes | No |
+| User opens/clicks a task | Yes | No |
+| User creates a session | Yes | No |
+| Agent finishes responding | Yes | Yes |
+| PR review requested | Yes | Yes |
+| PR merged | Yes | Yes |
+| PR comment added | Yes | Yes |
+| Agent error/needs input | Yes | Yes |
+
+### Recipient resolution
+
+Notifications and bumps go to the **task owner** only. Each task has exactly one owner at a time (the user who last sent a message or explicitly took ownership). This is an acceptable race condition — it rarely makes sense for two users to work on the same task simultaneously, and ownership transfer is explicit.
+
+The system supports multiplayer (multiple users can view the same task), but the notification/bump target is always the single current owner. Each user has their own independent notification and unread state on their own user actor.
+
+### Tables (on user actor)
+
+Two new tables:
+
+- **`userTaskFeed`** — one row per task. Tracks `bumpedAtMs` and `bumpReason` for sidebar sort order. Does NOT denormalize task content (title, repo, etc.) — the frontend queries the org actor for task content and uses the feed only for ordering/filtering.
+- **`userNotifications`** — discrete notification entries with `type`, `message`, `read` state, and optional `sessionId`. Retention: notifications are retained for a configurable number of days after being marked read, then cleaned up.
+
+### Queue commands (user actor workflow)
+
+- `user.bump_task` — upserts `userTaskFeed` row, no notification created. Used for user-initiated actions (send message, open task, create session).
+- `user.notify` — inserts `userNotifications` row AND upserts `userTaskFeed` (auto-bump). Used for system events (agent finished, PR review requested).
+- `user.mark_read` — marks notifications read for a given `(taskId, sessionId?)`. Also updates `userTaskState.unread` for the session.
+
+### Data flow
+
+Task actor (or org actor) resolves the current task owner, then sends to the owner's user actor queue:
+1. `user.notify(...)` for notification-worthy events (auto-bumps the feed)
+2. `user.bump_task(...)` for non-notification bumps (send message, open task)
+
+The user actor processes the queue message, writes to its local tables, and broadcasts a `userFeedUpdated` event to connected clients.
+
+### Sidebar architecture change
+
+The left sidebar changes from showing the repo/PR tree to showing **recent tasks** ordered by `userTaskFeed.bumpedAtMs`. Two new buttons at the top of the sidebar:
+- **All Repositories** — navigates to a page showing the current repo + PR list (preserving existing functionality)
+- **Notifications** — navigates to a page showing the full notification list
+
+The sidebar reads from two sources:
+- **User actor** (`userTaskFeed`) — provides sort order and "which tasks are relevant to this user"
+- **Org actor** (`taskSummaries`) — provides task content (title, status, branch, PR state, session summaries)
+
+The frontend merges these: org snapshot gives task data, user feed gives sort order. Uses the existing subscription system (`useSubscription`) for both initial state fetch and streaming updates.
+
+### `updatedAtMs` column semantics
+
+The org actor's `taskSummaries.updatedAtMs` and the user actor's `userTaskFeed.bumpedAtMs` serve different purposes:
+- `taskSummaries.updatedAtMs` — updated by task actor push. Reflects the last time the task's global state changed (any mutation, any user). Used for "All Repositories" / "All Tasks" views.
+- `userTaskFeed.bumpedAtMs` — updated by bump/notify commands. Reflects the last time this specific user's attention was drawn to this task. Used for the per-user sidebar sort.
+
+Add doc comments on both columns clarifying the update source.
+
+### Unread semantics
+
+Each user has independent unread state. The existing `userTaskState` table tracks per-`(taskId, sessionId)` unread state. When the user clicks a session:
+1. `userTaskState.unread` is set to 0 for that session
+2. All `userNotifications` rows matching `(taskId, sessionId)` are marked `read = 1`
+
+These two unread systems must stay in sync via the `user.mark_read` queue command.
+
+## Better Auth: Actions, Not Queues
+
+All Better Auth adapter operations (verification CRUD, session/email/account index mutations, and user-actor auth record mutations) are exposed as **actions**, not queue commands. This is an intentional exception to the normal pattern of using queues for mutations.
+
+**Why:** The org actor's workflow queue is shared with GitHub sync, webhook processing, task mutations, and billing — 20+ queue names processed sequentially. During the OAuth callback, Better Auth needs to read/write verification records and upsert session/account indexes. If any long-running queue handler (e.g., a GitHub sync step) is ahead in the queue, auth operations time out (10s), `expectQueueResponse` throws a regular `Error`, and Better Auth's `parseState` catches it as a non-`StateError` → redirects to `?error=please_restart_the_process`.
+
+**Why it's safe:** Auth operations are simple SQLite reads/writes scoped to a single actor instance with no cross-actor side effects. They don't need workflow replay semantics or sequential ordering guarantees relative to other queue commands.
+
+**Rule:** Never move Better Auth operations back to queue commands. If new auth-related mutations are added, expose them as actions on the relevant actor.
+
+## Maintenance
+
+- Keep this file up to date whenever actor ownership, hierarchy, or lifecycle responsibilities change.
+- If the real actor tree diverges from this document, update this document in the same change.
+- When adding, removing, or renaming coordinator index tables, update the hierarchy diagram above in the same change.
+- When adding a new coordinator index table in a schema file, add a doc comment identifying which child actor it indexes (pattern: `/** Coordinator index of {ChildActor} instances. ... */`).
diff --git a/foundry/packages/backend/package.json b/foundry/packages/backend/package.json
new file mode 100644
index 0000000..562bab7
--- /dev/null
+++ b/foundry/packages/backend/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@sandbox-agent/foundry-backend",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsup src/index.ts --format esm",
+    "db:generate": "find src/actors -name drizzle.config.ts -exec pnpm exec drizzle-kit generate --config {} \\; && \"$HOME/.bun/bin/bun\" src/actors/_scripts/generate-actor-migrations.ts",
+    "typecheck": "tsc --noEmit",
+    "test": "$HOME/.bun/bin/bun x vitest run",
+    "start": "bun dist/index.js start"
+  },
+  "dependencies": {
+    "@e2b/code-interpreter": "^2.3.3",
+    "@hono/node-server": "^1.19.7",
+    "@hono/node-ws": "^1.3.0",
+    "@iarna/toml": "^2.2.5",
+    "@sandbox-agent/foundry-shared": "workspace:*",
+    "better-auth": "^1.5.5",
+    "dockerode": "^4.0.9",
+    "drizzle-kit": "^0.31.8",
+    "drizzle-orm": "^0.44.5",
+    "hono": "^4.11.9",
+    "pino": "^10.3.1",
+    "rivetkit": "https://pkg.pr.new/rivet-dev/rivet/rivetkit@791500a",
+    "sandbox-agent": "workspace:*",
+    "uuid": "^13.0.0",
+    "ws": "^8.19.0",
+    "zod": "^4.1.5"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.3.9",
+    "tsup": "^8.5.0"
+  }
+}
diff --git a/foundry/packages/backend/src/actors/_scripts/generate-actor-migrations.ts b/foundry/packages/backend/src/actors/_scripts/generate-actor-migrations.ts
new file mode 100644
index 0000000..6b74dd3
--- /dev/null
+++ b/foundry/packages/backend/src/actors/_scripts/generate-actor-migrations.ts
@@ -0,0 +1,138 @@
+import { mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
+import { createErrorContext, createFoundryLogger } from "@sandbox-agent/foundry-shared";
+
+type Journal = {
+  entries?: Array<{
+    idx: number;
+    when: number;
+    tag: string;
+    breakpoints?: boolean;
+    version?: string;
+  }>;
+};
+
+const logger = createFoundryLogger({
+  service: "foundry-backend-migrations",
+});
+
+function padMigrationKey(idx: number): string {
+  return `m${String(idx).padStart(4, "0")}`;
+}
+
+function escapeTemplateLiteral(value: string): string {
+  return value.replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+}
+
+async function fileExists(path: string): Promise<boolean> {
+  try {
+    await readFile(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function walkDirectories(root: string, onDir: (dir: string) => Promise<void>): Promise<void> {
+  const entries = await readdir(root, { withFileTypes: true });
+  await onDir(root);
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    if (entry.name === "node_modules" || entry.name === "dist" || entry.name.startsWith(".")) {
+      continue;
+    }
+    await walkDirectories(join(root, entry.name), onDir);
+  }
+}
+
+async function generateOne(drizzleDir: string): Promise<void> {
+  const metaDir = resolve(drizzleDir, "meta");
+  const journalPath = resolve(metaDir, "_journal.json");
+  if (!(await fileExists(journalPath))) {
+    return;
+  }
+
+  const drizzleEntries = (await readdir(drizzleDir, { withFileTypes: true }))
+    .filter((entry) => entry.isFile() && entry.name.endsWith(".sql"))
+    .map((entry) => entry.name)
+    .sort();
+
+  if (drizzleEntries.length === 0) {
+    return;
+  }
+
+  const journalRaw = await readFile(journalPath, "utf8");
+  const journal = JSON.parse(journalRaw) as Journal;
+  const entries = journal.entries ?? [];
+
+  const sqlByKey = new Map<string, string>();
+  for (const entry of entries) {
+    const file = drizzleEntries[entry.idx];
+    if (!file) {
+      throw new Error(`Missing migration SQL file for idx=${entry.idx} in ${drizzleDir}`);
+    }
+    const sqlPath = resolve(drizzleDir, file);
+    const sqlRaw = await readFile(sqlPath, "utf8");
+    sqlByKey.set(padMigrationKey(entry.idx), sqlRaw);
+  }
+
+  const migrationsObjectLines: string[] = [];
+  for (const entry of entries) {
+    const key = padMigrationKey(entry.idx);
+    const sql = sqlByKey.get(key);
+    if (!sql) continue;
+    migrationsObjectLines.push(`    ${key}: \`${escapeTemplateLiteral(sql)}\`,`);
+  }
+
+  const banner = `// This file is generated by src/actors/_scripts/generate-actor-migrations.ts.
+// Source of truth is drizzle-kit output under ./drizzle (meta/_journal.json + *.sql).
+// Do not hand-edit this file.
+`;
+
+  const journalLiteral = JSON.stringify(
+    {
+      entries: entries.map((entry) => ({
+        idx: entry.idx,
+        when: entry.when,
+        tag: entry.tag,
+        breakpoints: Boolean(entry.breakpoints),
+      })),
+    },
+    null,
+    2,
+  );
+
+  const outPath = resolve(drizzleDir, "..", "migrations.ts");
+  const content = `${banner}
+const journal = ${journalLiteral} as const;
+
+export default {
+  journal,
+  migrations: {
+${migrationsObjectLines.join("\n")}
+  } as const
+};
+`;
+
+  await mkdir(dirname(outPath), { recursive: true });
+  await writeFile(outPath, content, "utf8");
+
+  // drizzle-kit generates a JS helper file by default; delete to keep TS-only sources.
+  await rm(resolve(drizzleDir, "migrations.js"), { force: true });
+}
+
+async function main(): Promise<void> {
+  const packageRoot = resolve(import.meta.dirname, "..", "..", ".."); // packages/backend
+  const actorsRoot = resolve(packageRoot, "src", "actors");
+
+  await walkDirectories(actorsRoot, async (dir) => {
+    if (dir.endsWith(`${join("db", "drizzle")}`)) {
+      await generateOne(dir);
+    }
+  });
+}
+
+main().catch((error: unknown) => {
+  logger.error(createErrorContext(error), "generate_actor_migrations_failed");
+  process.exitCode = 1;
+});
diff --git a/foundry/packages/backend/src/actors/audit-log/db/db.ts b/foundry/packages/backend/src/actors/audit-log/db/db.ts
new file mode 100644
index 0000000..d808ec0
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/db.ts
@@ -0,0 +1,5 @@
+import { db } from "rivetkit/db/drizzle";
+import * as schema from "./schema.js";
+import migrations from "./migrations.js";
+
+export const auditLogDb = db({ schema, migrations });
diff --git a/foundry/packages/backend/src/actors/audit-log/db/drizzle.config.ts b/foundry/packages/backend/src/actors/audit-log/db/drizzle.config.ts
new file mode 100644
index 0000000..da5e904
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/drizzle.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from "rivetkit/db/drizzle";
+
+export default defineConfig({
+  out: "./src/actors/audit-log/db/drizzle",
+  schema: "./src/actors/audit-log/db/schema.ts",
+});
diff --git a/foundry/packages/backend/src/actors/audit-log/db/drizzle/0000_fluffy_kid_colt.sql b/foundry/packages/backend/src/actors/audit-log/db/drizzle/0000_fluffy_kid_colt.sql
new file mode 100644
index 0000000..697aac9
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/drizzle/0000_fluffy_kid_colt.sql
@@ -0,0 +1,8 @@
+CREATE TABLE `events` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`task_id` text,
+	`branch_name` text,
+	`kind` text NOT NULL,
+	`payload_json` text NOT NULL,
+	`created_at` integer NOT NULL
+);
diff --git a/foundry/packages/backend/src/actors/audit-log/db/drizzle/0001_add_repo_id.sql b/foundry/packages/backend/src/actors/audit-log/db/drizzle/0001_add_repo_id.sql
new file mode 100644
index 0000000..9ada559
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/drizzle/0001_add_repo_id.sql
@@ -0,0 +1 @@
+ALTER TABLE `events` ADD COLUMN `repo_id` text;
diff --git a/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/0000_snapshot.json b/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/0000_snapshot.json
new file mode 100644
index 0000000..afaadc4
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/0000_snapshot.json
@@ -0,0 +1,70 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "e592c829-141f-4740-88b7-09cf957a4405",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "tables": {
+    "events": {
+      "name": "events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_name": {
+          "name": "branch_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload_json": {
+          "name": "payload_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/0001_snapshot.json b/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/0001_snapshot.json
new file mode 100644
index 0000000..cf2910c
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/0001_snapshot.json
@@ -0,0 +1,77 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "a1b2c3d4-0001-4000-8000-000000000001",
+  "prevId": "e592c829-141f-4740-88b7-09cf957a4405",
+  "tables": {
+    "events": {
+      "name": "events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "repo_id": {
+          "name": "repo_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch_name": {
+          "name": "branch_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload_json": {
+          "name": "payload_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/_journal.json b/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/_journal.json
new file mode 100644
index 0000000..0393be2
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/drizzle/meta/_journal.json
@@ -0,0 +1,20 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1773376223815,
+      "tag": "0000_fluffy_kid_colt",
+      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1773376223816,
+      "tag": "0001_add_repo_id",
+      "breakpoints": true
+    }
+  ]
+}
diff --git a/foundry/packages/backend/src/actors/audit-log/db/migrations.ts b/foundry/packages/backend/src/actors/audit-log/db/migrations.ts
new file mode 100644
index 0000000..5bf9b5a
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/migrations.ts
@@ -0,0 +1,37 @@
+// This file is generated by src/actors/_scripts/generate-actor-migrations.ts.
+// Source of truth is drizzle-kit output under ./drizzle (meta/_journal.json + *.sql).
+// Do not hand-edit this file.
+
+const journal = {
+  entries: [
+    {
+      idx: 0,
+      when: 1773376223815,
+      tag: "0000_fluffy_kid_colt",
+      breakpoints: true,
+    },
+    {
+      idx: 1,
+      when: 1773376223816,
+      tag: "0001_add_repo_id",
+      breakpoints: true,
+    },
+  ],
+} as const;
+
+export default {
+  journal,
+  migrations: {
+    m0000: `CREATE TABLE \`events\` (
+	\`id\` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	\`task_id\` text,
+	\`branch_name\` text,
+	\`kind\` text NOT NULL,
+	\`payload_json\` text NOT NULL,
+	\`created_at\` integer NOT NULL
+);
+`,
+    m0001: `ALTER TABLE \`events\` ADD COLUMN \`repo_id\` text;
+`,
+  } as const,
+};
diff --git a/foundry/packages/backend/src/actors/audit-log/db/schema.ts b/foundry/packages/backend/src/actors/audit-log/db/schema.ts
new file mode 100644
index 0000000..d275dd4
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/db/schema.ts
@@ -0,0 +1,12 @@
+import { integer, sqliteTable, text } from "rivetkit/db/drizzle";
+
+export const events = sqliteTable("events", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  repoId: text("repo_id"),
+  taskId: text("task_id"),
+  branchName: text("branch_name"),
+  kind: text("kind").notNull(),
+  // Structured by the audit-log event kind definitions in application code.
+  payloadJson: text("payload_json").notNull(),
+  createdAt: integer("created_at").notNull(),
+});
diff --git a/foundry/packages/backend/src/actors/audit-log/index.ts b/foundry/packages/backend/src/actors/audit-log/index.ts
new file mode 100644
index 0000000..db32829
--- /dev/null
+++ b/foundry/packages/backend/src/actors/audit-log/index.ts
@@ -0,0 +1,180 @@
+// @ts-nocheck
+import { and, desc, eq } from "drizzle-orm";
+import { actor, queue } from "rivetkit";
+import { workflow, Loop } from "rivetkit/workflow";
+import type { AuditLogEvent } from "@sandbox-agent/foundry-shared";
+import { selfAuditLog } from "../handles.js";
+import { logActorWarning, resolveErrorMessage } from "../logging.js";
+import { auditLogDb } from "./db/db.js";
+import { events } from "./db/schema.js";
+
+export interface AuditLogInput {
+  organizationId: string;
+}
+
+export interface AppendAuditLogCommand {
+  kind: string;
+  repoId?: string;
+  taskId?: string;
+  branchName?: string;
+  payload: Record<string, unknown>;
+}
+
+export interface ListAuditLogParams {
+  repoId?: string;
+  branch?: string;
+  taskId?: string;
+  limit?: number;
+}
+
+// ---------------------------------------------------------------------------
+// Queue names
+// ---------------------------------------------------------------------------
+
+const AUDIT_LOG_QUEUE_NAMES = ["auditLog.command.append"] as const;
+
+type AuditLogQueueName = (typeof AUDIT_LOG_QUEUE_NAMES)[number];
+
+function auditLogWorkflowQueueName(name: AuditLogQueueName): AuditLogQueueName {
+  return name;
+}
+
+// ---------------------------------------------------------------------------
+// Mutation functions
+// ---------------------------------------------------------------------------
+
+async function appendMutation(c: any, body: AppendAuditLogCommand): Promise<{ ok: true }> {
+  const now = Date.now();
+  await c.db
+    .insert(events)
+    .values({
+      repoId: body.repoId ?? null,
+      taskId: body.taskId ?? null,
+      branchName: body.branchName ?? null,
+      kind: body.kind,
+      payloadJson: JSON.stringify(body.payload),
+      createdAt: now,
+    })
+    .run();
+  return { ok: true };
+}
+
+// ---------------------------------------------------------------------------
+// Workflow command loop
+// ---------------------------------------------------------------------------
+
+type AuditLogWorkflowHandler = (loopCtx: any, body: any) => Promise<any>;
+
+const AUDIT_LOG_COMMAND_HANDLERS: Record<AuditLogQueueName, AuditLogWorkflowHandler> = {
+  "auditLog.command.append": async (c, body) => appendMutation(c, body),
+};
+
+async function runAuditLogWorkflow(ctx: any): Promise<void> {
+  await ctx.loop("audit-log-command-loop", async (loopCtx: any) => {
+    const msg = await loopCtx.queue.next("next-audit-log-command", {
+      names: [...AUDIT_LOG_QUEUE_NAMES],
+      completable: true,
+    });
+
+    if (!msg) {
+      return Loop.continue(undefined);
+    }
+
+    const handler = AUDIT_LOG_COMMAND_HANDLERS[msg.name as AuditLogQueueName];
+    if (!handler) {
+      logActorWarning("auditLog", "unknown audit-log command", { command: msg.name });
+      await msg.complete({ error: `Unknown command: ${msg.name}` }).catch(() => {});
+      return Loop.continue(undefined);
+    }
+
+    try {
+      // Wrap in a step so c.state and c.db are accessible inside mutation functions.
+      const result = await loopCtx.step({
+        name: msg.name,
+        timeout: 60_000,
+        run: async () => handler(loopCtx, msg.body),
+      });
+      await msg.complete(result);
+    } catch (error) {
+      const message = resolveErrorMessage(error);
+      logActorWarning("auditLog", "audit-log workflow command failed", {
+        command: msg.name,
+        error: message,
+      });
+      await msg.complete({ error: message }).catch(() => {});
+    }
+
+    return Loop.continue(undefined);
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Actor definition
+// ---------------------------------------------------------------------------
+
+/**
+ * Organization-scoped audit log. One per org, not one per repo.
+ *
+ * The org is the coordinator for all tasks across repos, and we frequently need
+ * to query the full audit trail across repos (e.g. org-wide activity feed,
+ * compliance). A per-repo audit log would require fan-out reads every time.
+ * Keeping it org-scoped gives us a single queryable feed with optional repoId
+ * filtering when callers want a narrower view.
+ */
+export const auditLog = actor({
+  db: auditLogDb,
+  queues: Object.fromEntries(AUDIT_LOG_QUEUE_NAMES.map((name) => [name, queue()])),
+  options: {
+    name: "Audit Log",
+    icon: "database",
+  },
+  createState: (_c, input: AuditLogInput) => ({
+    organizationId: input.organizationId,
+  }),
+  actions: {
+    // Mutation — self-send to queue for workflow history
+    async append(c: any, body: AppendAuditLogCommand): Promise<{ ok: true }> {
+      const self = selfAuditLog(c);
+      await self.send(auditLogWorkflowQueueName("auditLog.command.append"), body, { wait: false });
+      return { ok: true };
+    },
+
+    // Read — direct action (no queue)
+    async list(c, params?: ListAuditLogParams): Promise<AuditLogEvent[]> {
+      const whereParts = [];
+      if (params?.repoId) {
+        whereParts.push(eq(events.repoId, params.repoId));
+      }
+      if (params?.taskId) {
+        whereParts.push(eq(events.taskId, params.taskId));
+      }
+      if (params?.branch) {
+        whereParts.push(eq(events.branchName, params.branch));
+      }
+
+      const base = c.db
+        .select({
+          id: events.id,
+          repoId: events.repoId,
+          taskId: events.taskId,
+          branchName: events.branchName,
+          kind: events.kind,
+          payloadJson: events.payloadJson,
+          createdAt: events.createdAt,
+        })
+        .from(events);
+
+      const rows = await (whereParts.length > 0 ? base.where(and(...whereParts)) : base)
+        .orderBy(desc(events.createdAt))
+        .limit(params?.limit ?? 100)
+        .all();
+
+      return rows.map((row) => ({
+        ...row,
+        organizationId: c.state.organizationId,
+        repoId: row.repoId ?? null,
+      }));
+    },
+  },
+  run: workflow(runAuditLogWorkflow),
+});
diff --git a/foundry/packages/backend/src/actors/context.ts b/foundry/packages/backend/src/actors/context.ts
new file mode 100644
index 0000000..3554a96
--- /dev/null
+++ b/foundry/packages/backend/src/actors/context.ts
@@ -0,0 +1,42 @@
+import type { AppConfig } from "@sandbox-agent/foundry-shared";
+import type { BackendDriver } from "../driver.js";
+import type { NotificationService } from "../notifications/index.js";
+import type { AppShellServices } from "../services/app-shell-runtime.js";
+
+let runtimeConfig: AppConfig | null = null;
+let notificationService: NotificationService | null = null;
+let runtimeDriver: BackendDriver | null = null;
+let appShellServices: AppShellServices | null = null;
+
+export function initActorRuntimeContext(config: AppConfig, notifications?: NotificationService, driver?: BackendDriver, appShell?: AppShellServices): void {
+  runtimeConfig = config;
+  notificationService = notifications ?? null;
+  runtimeDriver = driver ?? null;
+  appShellServices = appShell ?? null;
+}
+
+export function getActorRuntimeContext(): {
+  config: AppConfig;
+  notifications: NotificationService | null;
+  driver: BackendDriver;
+  appShell: AppShellServices;
+} {
+  if (!runtimeConfig) {
+    throw new Error("Actor runtime context not initialized");
+  }
+
+  if (!runtimeDriver) {
+    throw new Error("Actor runtime context missing driver");
+  }
+
+  if (!appShellServices) {
+    throw new Error("Actor runtime context missing app shell services");
+  }
+
+  return {
+    config: runtimeConfig,
+    notifications: notificationService,
+    driver: runtimeDriver,
+    appShell: appShellServices,
+  };
+}
diff --git a/foundry/packages/backend/src/actors/github-data/db/db.ts b/foundry/packages/backend/src/actors/github-data/db/db.ts
new file mode 100644
index 0000000..00e5a11
--- /dev/null
+++ b/foundry/packages/backend/src/actors/github-data/db/db.ts
@@ -0,0 +1,5 @@
+import { db } from "rivetkit/db/drizzle";
+import * as schema from "./schema.js";
+import migrations from "./migrations.js";
+
+export const githubDataDb = db({ schema, migrations });
diff --git a/foundry/packages/backend/src/actors/github-data/db/migrations.ts b/foundry/packages/backend/src/actors/github-data/db/migrations.ts
new file mode 100644
index 0000000..10e3804
--- /dev/null
+++ b/foundry/packages/backend/src/actors/github-data/db/migrations.ts
@@ -0,0 +1,114 @@
+const journal = {
+  entries: [
+    {
+      idx: 0,
+      when: 1773446400000,
+      tag: "0000_github_data",
+      breakpoints: true,
+    },
+    {
+      idx: 1,
+      when: 1773810002000,
+      tag: "0001_default_branch",
+      breakpoints: true,
+    },
+    {
+      idx: 2,
+      when: 1773810300000,
+      tag: "0002_github_branches",
+      breakpoints: true,
+    },
+    {
+      idx: 3,
+      when: 1773907200000,
+      tag: "0003_sync_progress",
+      breakpoints: true,
+    },
+    {
+      idx: 4,
+      when: 1773993600000,
+      tag: "0004_drop_github_branches",
+      breakpoints: true,
+    },
+  ],
+} as const;
+
+export default {
+  journal,
+  migrations: {
+    m0000: `CREATE TABLE \`github_meta\` (
+	\`id\` integer PRIMARY KEY NOT NULL,
+	\`connected_account\` text NOT NULL,
+	\`installation_status\` text NOT NULL,
+	\`sync_status\` text NOT NULL,
+	\`installation_id\` integer,
+	\`last_sync_label\` text NOT NULL,
+	\`last_sync_at\` integer,
+	\`updated_at\` integer NOT NULL,
+	CONSTRAINT \`github_meta_singleton_id_check\` CHECK(\`id\` = 1)
+);
+--> statement-breakpoint
+CREATE TABLE \`github_repositories\` (
+	\`repo_id\` text PRIMARY KEY NOT NULL,
+	\`full_name\` text NOT NULL,
+	\`clone_url\` text NOT NULL,
+	\`private\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`github_members\` (
+	\`member_id\` text PRIMARY KEY NOT NULL,
+	\`login\` text NOT NULL,
+	\`display_name\` text NOT NULL,
+	\`email\` text,
+	\`role\` text,
+	\`state\` text NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`github_pull_requests\` (
+	\`pr_id\` text PRIMARY KEY NOT NULL,
+	\`repo_id\` text NOT NULL,
+	\`repo_full_name\` text NOT NULL,
+	\`number\` integer NOT NULL,
+	\`title\` text NOT NULL,
+	\`body\` text,
+	\`state\` text NOT NULL,
+	\`url\` text NOT NULL,
+	\`head_ref_name\` text NOT NULL,
+	\`base_ref_name\` text NOT NULL,
+	\`author_login\` text,
+	\`is_draft\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+`,
+    m0001: `ALTER TABLE \`github_repositories\` ADD \`default_branch\` text NOT NULL DEFAULT 'main';
+`,
+    m0002: `CREATE TABLE \`github_branches\` (
+	\`branch_id\` text PRIMARY KEY NOT NULL,
+	\`repo_id\` text NOT NULL,
+	\`branch_name\` text NOT NULL,
+	\`commit_sha\` text NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+`,
+    m0003: `ALTER TABLE \`github_meta\` ADD \`sync_generation\` integer NOT NULL DEFAULT 0;
+--> statement-breakpoint
+ALTER TABLE \`github_meta\` ADD \`sync_phase\` text;
+--> statement-breakpoint
+ALTER TABLE \`github_meta\` ADD \`processed_repository_count\` integer NOT NULL DEFAULT 0;
+--> statement-breakpoint
+ALTER TABLE \`github_meta\` ADD \`total_repository_count\` integer NOT NULL DEFAULT 0;
+--> statement-breakpoint
+ALTER TABLE \`github_repositories\` ADD \`sync_generation\` integer NOT NULL DEFAULT 0;
+--> statement-breakpoint
+ALTER TABLE \`github_members\` ADD \`sync_generation\` integer NOT NULL DEFAULT 0;
+--> statement-breakpoint
+ALTER TABLE \`github_pull_requests\` ADD \`sync_generation\` integer NOT NULL DEFAULT 0;
+--> statement-breakpoint
+ALTER TABLE \`github_branches\` ADD \`sync_generation\` integer NOT NULL DEFAULT 0;
+`,
+    m0004: `DROP TABLE IF EXISTS \`github_branches\`;
+`,
+  } as const,
+};
diff --git a/foundry/packages/backend/src/actors/github-data/db/schema.ts b/foundry/packages/backend/src/actors/github-data/db/schema.ts
new file mode 100644
index 0000000..94b4edc
--- /dev/null
+++ b/foundry/packages/backend/src/actors/github-data/db/schema.ts
@@ -0,0 +1,59 @@
+import { check, integer, sqliteTable, text } from "rivetkit/db/drizzle";
+import { sql } from "drizzle-orm";
+
+export const githubMeta = sqliteTable(
+  "github_meta",
+  {
+    id: integer("id").primaryKey(),
+    connectedAccount: text("connected_account").notNull(),
+    installationStatus: text("installation_status").notNull(),
+    syncStatus: text("sync_status").notNull(),
+    installationId: integer("installation_id"),
+    lastSyncLabel: text("last_sync_label").notNull(),
+    lastSyncAt: integer("last_sync_at"),
+    syncGeneration: integer("sync_generation").notNull(),
+    syncPhase: text("sync_phase"),
+    processedRepositoryCount: integer("processed_repository_count").notNull(),
+    totalRepositoryCount: integer("total_repository_count").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => [check("github_meta_singleton_id_check", sql`${table.id} = 1`)],
+);
+
+export const githubRepositories = sqliteTable("github_repositories", {
+  repoId: text("repo_id").notNull().primaryKey(),
+  fullName: text("full_name").notNull(),
+  cloneUrl: text("clone_url").notNull(),
+  private: integer("private").notNull(),
+  defaultBranch: text("default_branch").notNull(),
+  syncGeneration: integer("sync_generation").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+export const githubMembers = sqliteTable("github_members", {
+  memberId: text("member_id").notNull().primaryKey(),
+  login: text("login").notNull(),
+  displayName: text("display_name").notNull(),
+  email: text("email"),
+  role: text("role"),
+  state: text("state").notNull(),
+  syncGeneration: integer("sync_generation").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+export const githubPullRequests = sqliteTable("github_pull_requests", {
+  prId: text("pr_id").notNull().primaryKey(),
+  repoId: text("repo_id").notNull(),
+  repoFullName: text("repo_full_name").notNull(),
+  number: integer("number").notNull(),
+  title: text("title").notNull(),
+  body: text("body"),
+  state: text("state").notNull(),
+  url: text("url").notNull(),
+  headRefName: text("head_ref_name").notNull(),
+  baseRefName: text("base_ref_name").notNull(),
+  authorLogin: text("author_login"),
+  isDraft: integer("is_draft").notNull(),
+  syncGeneration: integer("sync_generation").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
diff --git a/foundry/packages/backend/src/actors/github-data/index.ts b/foundry/packages/backend/src/actors/github-data/index.ts
new file mode 100644
index 0000000..d19732a
--- /dev/null
+++ b/foundry/packages/backend/src/actors/github-data/index.ts
@@ -0,0 +1,1010 @@
+// @ts-nocheck
+import { eq, inArray } from "drizzle-orm";
+import { actor, queue } from "rivetkit";
+import { workflow, Loop } from "rivetkit/workflow";
+import type { FoundryOrganization } from "@sandbox-agent/foundry-shared";
+import { getActorRuntimeContext } from "../context.js";
+import { getOrCreateOrganization, getTask } from "../handles.js";
+import { logActorWarning, resolveErrorMessage } from "../logging.js";
+import { taskWorkflowQueueName } from "../task/workflow/queue.js";
+import { repoIdFromRemote } from "../../services/repo.js";
+import { resolveOrganizationGithubAuth } from "../../services/github-auth.js";
+import { organizationWorkflowQueueName } from "../organization/queues.js";
+import { githubDataDb } from "./db/db.js";
+import { githubMembers, githubMeta, githubPullRequests, githubRepositories } from "./db/schema.js";
+
+const META_ROW_ID = 1;
+const SYNC_REPOSITORY_BATCH_SIZE = 10;
+
+type GithubSyncPhase = "discovering_repositories" | "syncing_repositories" | "syncing_members" | "syncing_pull_requests";
+
+interface GithubDataInput {
+  organizationId: string;
+}
+
+interface GithubMemberRecord {
+  id: string;
+  login: string;
+  name: string;
+  email?: string | null;
+  role?: string | null;
+  state?: string | null;
+}
+
+interface GithubRepositoryRecord {
+  fullName: string;
+  cloneUrl: string;
+  private: boolean;
+  defaultBranch: string;
+}
+
+interface GithubPullRequestRecord {
+  repoId: string;
+  repoFullName: string;
+  number: number;
+  title: string;
+  body: string | null;
+  state: string;
+  url: string;
+  headRefName: string;
+  baseRefName: string;
+  authorLogin: string | null;
+  isDraft: boolean;
+  updatedAt: number;
+}
+
+interface FullSyncInput {
+  connectedAccount?: string | null;
+  installationStatus?: FoundryOrganization["github"]["installationStatus"];
+  installationId?: number | null;
+  githubLogin?: string | null;
+  kind?: FoundryOrganization["kind"] | null;
+  accessToken?: string | null;
+  label?: string | null;
+}
+
+interface ClearStateInput {
+  connectedAccount: string;
+  installationStatus: FoundryOrganization["github"]["installationStatus"];
+  installationId: number | null;
+  label: string;
+}
+
+// Queue names for github-data actor
+export const GITHUB_DATA_QUEUE_NAMES = [
+  "githubData.command.syncRepos",
+  "githubData.command.handlePullRequestWebhook",
+  "githubData.command.clearState",
+] as const;
+
+type GithubDataQueueName = (typeof GITHUB_DATA_QUEUE_NAMES)[number];
+
+export function githubDataWorkflowQueueName(name: GithubDataQueueName): GithubDataQueueName {
+  return name;
+}
+
+interface PullRequestWebhookInput {
+  connectedAccount: string;
+  installationStatus: FoundryOrganization["github"]["installationStatus"];
+  installationId: number | null;
+  repository: {
+    fullName: string;
+    cloneUrl: string;
+    private: boolean;
+  };
+  pullRequest: {
+    number: number;
+    title: string;
+    body: string | null;
+    state: string;
+    url: string;
+    headRefName: string;
+    baseRefName: string;
+    authorLogin: string | null;
+    isDraft: boolean;
+    merged?: boolean;
+  };
+}
+
+interface GithubMetaState {
+  connectedAccount: string;
+  installationStatus: FoundryOrganization["github"]["installationStatus"];
+  syncStatus: FoundryOrganization["github"]["syncStatus"];
+  installationId: number | null;
+  lastSyncLabel: string;
+  lastSyncAt: number | null;
+  syncGeneration: number;
+  syncPhase: GithubSyncPhase | null;
+  processedRepositoryCount: number;
+  totalRepositoryCount: number;
+}
+
+function normalizePrStatus(input: { state: string; isDraft?: boolean; merged?: boolean }): "OPEN" | "DRAFT" | "CLOSED" | "MERGED" {
+  const state = input.state.trim().toUpperCase();
+  if (input.merged || state === "MERGED") return "MERGED";
+  if (state === "CLOSED") return "CLOSED";
+  return input.isDraft ? "DRAFT" : "OPEN";
+}
+
+function pullRequestSummaryFromRow(row: any) {
+  return {
+    prId: row.prId,
+    repoId: row.repoId,
+    repoFullName: row.repoFullName,
+    number: row.number,
+    status: Boolean(row.isDraft) ? "draft" : "ready",
+    title: row.title,
+    state: row.state,
+    url: row.url,
+    headRefName: row.headRefName,
+    baseRefName: row.baseRefName,
+    authorLogin: row.authorLogin ?? null,
+    isDraft: Boolean(row.isDraft),
+    updatedAtMs: row.updatedAt,
+  };
+}
+
+function chunkItems<T>(items: T[], size: number): T[][] {
+  if (items.length === 0) {
+    return [];
+  }
+  const chunks: T[][] = [];
+  for (let index = 0; index < items.length; index += size) {
+    chunks.push(items.slice(index, index + size));
+  }
+  return chunks;
+}
+
+export async function readMeta(c: any): Promise<GithubMetaState> {
+  const row = await c.db.select().from(githubMeta).where(eq(githubMeta.id, META_ROW_ID)).get();
+  return {
+    connectedAccount: row?.connectedAccount ?? "",
+    installationStatus: (row?.installationStatus ?? "install_required") as FoundryOrganization["github"]["installationStatus"],
+    syncStatus: (row?.syncStatus ?? "pending") as FoundryOrganization["github"]["syncStatus"],
+    installationId: row?.installationId ?? null,
+    lastSyncLabel: row?.lastSyncLabel ?? "Waiting for first import",
+    lastSyncAt: row?.lastSyncAt ?? null,
+    syncGeneration: row?.syncGeneration ?? 0,
+    syncPhase: (row?.syncPhase ?? null) as GithubSyncPhase | null,
+    processedRepositoryCount: row?.processedRepositoryCount ?? 0,
+    totalRepositoryCount: row?.totalRepositoryCount ?? 0,
+  };
+}
+
+async function writeMeta(c: any, patch: Partial<GithubMetaState>) {
+  const current = await readMeta(c);
+  const next = {
+    ...current,
+    ...patch,
+  };
+  await c.db
+    .insert(githubMeta)
+    .values({
+      id: META_ROW_ID,
+      connectedAccount: next.connectedAccount,
+      installationStatus: next.installationStatus,
+      syncStatus: next.syncStatus,
+      installationId: next.installationId,
+      lastSyncLabel: next.lastSyncLabel,
+      lastSyncAt: next.lastSyncAt,
+      syncGeneration: next.syncGeneration,
+      syncPhase: next.syncPhase,
+      processedRepositoryCount: next.processedRepositoryCount,
+      totalRepositoryCount: next.totalRepositoryCount,
+      updatedAt: Date.now(),
+    })
+    .onConflictDoUpdate({
+      target: githubMeta.id,
+      set: {
+        connectedAccount: next.connectedAccount,
+        installationStatus: next.installationStatus,
+        syncStatus: next.syncStatus,
+        installationId: next.installationId,
+        lastSyncLabel: next.lastSyncLabel,
+        lastSyncAt: next.lastSyncAt,
+        syncGeneration: next.syncGeneration,
+        syncPhase: next.syncPhase,
+        processedRepositoryCount: next.processedRepositoryCount,
+        totalRepositoryCount: next.totalRepositoryCount,
+        updatedAt: Date.now(),
+      },
+    })
+    .run();
+  return next;
+}
+
+async function publishSyncProgress(c: any, patch: Partial<GithubMetaState>): Promise<GithubMetaState> {
+  const meta = await writeMeta(c, patch);
+  const organization = await getOrCreateOrganization(c, c.state.organizationId);
+  await organization.send(
+    organizationWorkflowQueueName("organization.command.github.sync_progress.apply"),
+    {
+      connectedAccount: meta.connectedAccount,
+      installationStatus: meta.installationStatus,
+      installationId: meta.installationId,
+      syncStatus: meta.syncStatus,
+      lastSyncLabel: meta.lastSyncLabel,
+      lastSyncAt: meta.lastSyncAt,
+      syncGeneration: meta.syncGeneration,
+      syncPhase: meta.syncPhase,
+      processedRepositoryCount: meta.processedRepositoryCount,
+      totalRepositoryCount: meta.totalRepositoryCount,
+    },
+    { wait: false },
+  );
+  return meta;
+}
+
+async function getOrganizationContext(c: any, overrides?: FullSyncInput) {
+  // Try to read the org profile for fallback values, but don't require it.
+  // Webhook-triggered syncs can arrive before the user signs in and creates the
+  // org profile row. The webhook callers already pass the necessary overrides
+  // (connectedAccount, installationId, githubLogin, kind), so we can proceed
+  // without the profile as long as overrides cover the required fields.
+  const organizationHandle = await getOrCreateOrganization(c, c.state.organizationId);
+  const organizationState = await organizationHandle.getOrganizationShellStateIfInitialized({});
+
+  // If the org profile doesn't exist and overrides don't provide enough context, fail.
+  if (!organizationState && !overrides?.connectedAccount) {
+    throw new Error(`Organization ${c.state.organizationId} is not initialized and no override context was provided`);
+  }
+
+  const auth = await resolveOrganizationGithubAuth(c, c.state.organizationId);
+  return {
+    kind: overrides?.kind ?? organizationState?.snapshot.kind,
+    githubLogin: overrides?.githubLogin ?? organizationState?.githubLogin,
+    connectedAccount: overrides?.connectedAccount ?? organizationState?.snapshot.github.connectedAccount ?? organizationState?.githubLogin,
+    installationId: overrides?.installationId ?? organizationState?.githubInstallationId ?? null,
+    installationStatus:
+      overrides?.installationStatus ??
+      organizationState?.snapshot.github.installationStatus ??
+      (organizationState?.snapshot.kind === "personal" ? "connected" : "reconnect_required"),
+    accessToken: overrides?.accessToken ?? auth?.githubToken ?? null,
+  };
+}
+
+async function upsertRepositories(c: any, repositories: GithubRepositoryRecord[], updatedAt: number, syncGeneration: number) {
+  for (const repository of repositories) {
+    await c.db
+      .insert(githubRepositories)
+      .values({
+        repoId: repoIdFromRemote(repository.cloneUrl),
+        fullName: repository.fullName,
+        cloneUrl: repository.cloneUrl,
+        private: repository.private ? 1 : 0,
+        defaultBranch: repository.defaultBranch,
+        syncGeneration,
+        updatedAt,
+      })
+      .onConflictDoUpdate({
+        target: githubRepositories.repoId,
+        set: {
+          fullName: repository.fullName,
+          cloneUrl: repository.cloneUrl,
+          private: repository.private ? 1 : 0,
+          defaultBranch: repository.defaultBranch,
+          syncGeneration,
+          updatedAt,
+        },
+      })
+      .run();
+  }
+}
+
+async function sweepRepositories(c: any, syncGeneration: number) {
+  const rows = await c.db.select({ repoId: githubRepositories.repoId, syncGeneration: githubRepositories.syncGeneration }).from(githubRepositories).all();
+  for (const row of rows) {
+    if (row.syncGeneration === syncGeneration) {
+      continue;
+    }
+    await c.db.delete(githubRepositories).where(eq(githubRepositories.repoId, row.repoId)).run();
+  }
+}
+
+async function upsertMembers(c: any, members: GithubMemberRecord[], updatedAt: number, syncGeneration: number) {
+  for (const member of members) {
+    await c.db
+      .insert(githubMembers)
+      .values({
+        memberId: member.id,
+        login: member.login,
+        displayName: member.name || member.login,
+        email: member.email ?? null,
+        role: member.role ?? null,
+        state: member.state ?? "active",
+        syncGeneration,
+        updatedAt,
+      })
+      .onConflictDoUpdate({
+        target: githubMembers.memberId,
+        set: {
+          login: member.login,
+          displayName: member.name || member.login,
+          email: member.email ?? null,
+          role: member.role ?? null,
+          state: member.state ?? "active",
+          syncGeneration,
+          updatedAt,
+        },
+      })
+      .run();
+  }
+}
+
+async function sweepMembers(c: any, syncGeneration: number) {
+  const rows = await c.db.select({ memberId: githubMembers.memberId, syncGeneration: githubMembers.syncGeneration }).from(githubMembers).all();
+  for (const row of rows) {
+    if (row.syncGeneration === syncGeneration) {
+      continue;
+    }
+    await c.db.delete(githubMembers).where(eq(githubMembers.memberId, row.memberId)).run();
+  }
+}
+
+async function upsertPullRequests(c: any, pullRequests: GithubPullRequestRecord[], syncGeneration: number) {
+  for (const pullRequest of pullRequests) {
+    await c.db
+      .insert(githubPullRequests)
+      .values({
+        prId: `${pullRequest.repoId}#${pullRequest.number}`,
+        repoId: pullRequest.repoId,
+        repoFullName: pullRequest.repoFullName,
+        number: pullRequest.number,
+        title: pullRequest.title,
+        body: pullRequest.body ?? null,
+        state: pullRequest.state,
+        url: pullRequest.url,
+        headRefName: pullRequest.headRefName,
+        baseRefName: pullRequest.baseRefName,
+        authorLogin: pullRequest.authorLogin ?? null,
+        isDraft: pullRequest.isDraft ? 1 : 0,
+        syncGeneration,
+        updatedAt: pullRequest.updatedAt,
+      })
+      .onConflictDoUpdate({
+        target: githubPullRequests.prId,
+        set: {
+          repoId: pullRequest.repoId,
+          repoFullName: pullRequest.repoFullName,
+          number: pullRequest.number,
+          title: pullRequest.title,
+          body: pullRequest.body ?? null,
+          state: pullRequest.state,
+          url: pullRequest.url,
+          headRefName: pullRequest.headRefName,
+          baseRefName: pullRequest.baseRefName,
+          authorLogin: pullRequest.authorLogin ?? null,
+          isDraft: pullRequest.isDraft ? 1 : 0,
+          syncGeneration,
+          updatedAt: pullRequest.updatedAt,
+        },
+      })
+      .run();
+  }
+}
+
+async function sweepPullRequests(c: any, syncGeneration: number) {
+  const rows = await c.db.select({ prId: githubPullRequests.prId, syncGeneration: githubPullRequests.syncGeneration }).from(githubPullRequests).all();
+  for (const row of rows) {
+    if (row.syncGeneration === syncGeneration) {
+      continue;
+    }
+    await c.db.delete(githubPullRequests).where(eq(githubPullRequests.prId, row.prId)).run();
+  }
+}
+
+async function refreshTaskSummaryForBranch(c: any, repoId: string, branchName: string, pullRequest: ReturnType<typeof pullRequestSummaryFromRow> | null) {
+  const repositoryRecord = await c.db.select().from(githubRepositories).where(eq(githubRepositories.repoId, repoId)).get();
+  if (!repositoryRecord) {
+    return;
+  }
+  const organization = await getOrCreateOrganization(c, c.state.organizationId);
+  void organization
+    .send(
+      organizationWorkflowQueueName("organization.command.refreshTaskSummaryForBranch"),
+      { repoId, branchName, pullRequest, repoName: repositoryRecord.fullName ?? undefined },
+      { wait: false },
+    )
+    .catch(() => {});
+}
+
+async function emitPullRequestChangeEvents(c: any, beforeRows: any[], afterRows: any[]) {
+  const beforeById = new Map(beforeRows.map((row) => [row.prId, row]));
+  const afterById = new Map(afterRows.map((row) => [row.prId, row]));
+
+  for (const [prId, row] of afterById) {
+    const previous = beforeById.get(prId);
+    const changed =
+      !previous ||
+      previous.title !== row.title ||
+      previous.state !== row.state ||
+      previous.url !== row.url ||
+      previous.headRefName !== row.headRefName ||
+      previous.baseRefName !== row.baseRefName ||
+      previous.authorLogin !== row.authorLogin ||
+      previous.isDraft !== row.isDraft ||
+      previous.updatedAt !== row.updatedAt;
+    if (!changed) {
+      continue;
+    }
+    await refreshTaskSummaryForBranch(c, row.repoId, row.headRefName, pullRequestSummaryFromRow(row));
+  }
+
+  for (const [prId, row] of beforeById) {
+    if (afterById.has(prId)) {
+      continue;
+    }
+    await refreshTaskSummaryForBranch(c, row.repoId, row.headRefName, null);
+  }
+}
+
+async function autoArchiveTaskForClosedPullRequest(c: any, row: any) {
+  const repositoryRecord = await c.db.select().from(githubRepositories).where(eq(githubRepositories.repoId, row.repoId)).get();
+  if (!repositoryRecord) {
+    return;
+  }
+  const organization = await getOrCreateOrganization(c, c.state.organizationId);
+  const match = await organization.findTaskForBranch({
+    repoId: row.repoId,
+    branchName: row.headRefName,
+  });
+  if (!match?.taskId) {
+    return;
+  }
+  try {
+    const task = getTask(c, c.state.organizationId, row.repoId, match.taskId);
+    void task.send(taskWorkflowQueueName("task.command.archive"), { reason: `PR ${String(row.state).toLowerCase()}` }, { wait: false }).catch(() => {});
+  } catch {
+    // Best-effort only. Task summary refresh will still clear the PR state.
+  }
+}
+
+async function resolveRepositories(c: any, context: Awaited<ReturnType<typeof getOrganizationContext>>): Promise<GithubRepositoryRecord[]> {
+  const { appShell } = getActorRuntimeContext();
+  if (context.kind === "personal") {
+    if (!context.accessToken) {
+      return [];
+    }
+    return await appShell.github.listUserRepositories(context.accessToken);
+  }
+
+  if (context.installationId != null) {
+    try {
+      return await appShell.github.listInstallationRepositories(context.installationId);
+    } catch (error) {
+      if (!context.accessToken) {
+        throw error;
+      }
+    }
+  }
+
+  if (!context.accessToken) {
+    return [];
+  }
+
+  return (await appShell.github.listUserRepositories(context.accessToken)).filter((repository) => repository.fullName.startsWith(`${context.githubLogin}/`));
+}
+
+async function resolveMembers(c: any, context: Awaited<ReturnType<typeof getOrganizationContext>>): Promise<GithubMemberRecord[]> {
+  const { appShell } = getActorRuntimeContext();
+  if (context.kind === "personal") {
+    return [];
+  }
+  if (context.installationId != null) {
+    try {
+      return await appShell.github.listInstallationMembers(context.installationId, context.githubLogin);
+    } catch (error) {
+      if (!context.accessToken) {
+        throw error;
+      }
+    }
+  }
+  if (!context.accessToken) {
+    return [];
+  }
+  return await appShell.github.listOrganizationMembers(context.accessToken, context.githubLogin);
+}
+
+async function listPullRequestsForRepositories(
+  context: Awaited<ReturnType<typeof getOrganizationContext>>,
+  repositories: GithubRepositoryRecord[],
+): Promise<GithubPullRequestRecord[]> {
+  const { appShell } = getActorRuntimeContext();
+  if (repositories.length === 0) {
+    return [];
+  }
+
+  let pullRequests: Array<{
+    repoFullName: string;
+    cloneUrl: string;
+    number: number;
+    title: string;
+    body?: string | null;
+    state: string;
+    url: string;
+    headRefName: string;
+    baseRefName: string;
+    authorLogin?: string | null;
+    isDraft?: boolean;
+    merged?: boolean;
+  }> = [];
+
+  if (context.installationId != null) {
+    try {
+      pullRequests = await appShell.github.listInstallationPullRequestsForRepositories(context.installationId, repositories);
+    } catch (error) {
+      if (!context.accessToken) {
+        throw error;
+      }
+    }
+  }
+
+  if (pullRequests.length === 0 && context.accessToken) {
+    pullRequests = await appShell.github.listPullRequestsForUserRepositories(context.accessToken, repositories);
+  }
+
+  return pullRequests.map((pullRequest) => ({
+    repoId: repoIdFromRemote(pullRequest.cloneUrl),
+    repoFullName: pullRequest.repoFullName,
+    number: pullRequest.number,
+    title: pullRequest.title,
+    body: pullRequest.body ?? null,
+    state: normalizePrStatus(pullRequest),
+    url: pullRequest.url,
+    headRefName: pullRequest.headRefName,
+    baseRefName: pullRequest.baseRefName,
+    authorLogin: pullRequest.authorLogin ?? null,
+    isDraft: Boolean(pullRequest.isDraft),
+    updatedAt: Date.now(),
+  }));
+}
+
+async function readAllPullRequestRows(c: any) {
+  return await c.db.select().from(githubPullRequests).all();
+}
+
+/** Config returned by fullSyncSetup, passed to subsequent sync phases. */
+export interface FullSyncConfig {
+  syncGeneration: number;
+  startedAt: number;
+  totalRepositoryCount: number;
+  connectedAccount: string;
+  installationStatus: string;
+  installationId: number | null;
+  beforePrRows: any[];
+}
+
+async function readRepositoriesFromDb(c: any): Promise<GithubRepositoryRecord[]> {
+  const rows = await c.db.select().from(githubRepositories).all();
+  return rows.map((r: any) => ({
+    fullName: r.fullName,
+    cloneUrl: r.cloneUrl,
+    private: Boolean(r.private),
+    defaultBranch: r.defaultBranch,
+  }));
+}
+
+/**
+ * Phase 1: Discover repositories and persist them.
+ * Returns the config needed by all subsequent phases, or null if nothing to do.
+ */
+export async function fullSyncSetup(c: any, input: FullSyncInput = {}): Promise<FullSyncConfig> {
+  const startedAt = Date.now();
+  const beforePrRows = await readAllPullRequestRows(c);
+  const currentMeta = await readMeta(c);
+  const context = await getOrganizationContext(c, input);
+  const syncGeneration = currentMeta.syncGeneration + 1;
+
+  await publishSyncProgress(c, {
+    connectedAccount: context.connectedAccount,
+    installationStatus: context.installationStatus,
+    installationId: context.installationId,
+    syncStatus: "syncing",
+    lastSyncLabel: input.label?.trim() || "Syncing GitHub data...",
+    syncGeneration,
+    syncPhase: "discovering_repositories",
+    processedRepositoryCount: 0,
+    totalRepositoryCount: 0,
+  });
+
+  const repositories = await resolveRepositories(c, context);
+  const totalRepositoryCount = repositories.length;
+
+  await publishSyncProgress(c, {
+    connectedAccount: context.connectedAccount,
+    installationStatus: context.installationStatus,
+    installationId: context.installationId,
+    syncStatus: "syncing",
+    lastSyncLabel: totalRepositoryCount > 0 ? `Importing ${totalRepositoryCount} repositories...` : "No repositories available",
+    syncGeneration,
+    syncPhase: "syncing_repositories",
+    processedRepositoryCount: totalRepositoryCount,
+    totalRepositoryCount,
+  });
+
+  await upsertRepositories(c, repositories, startedAt, syncGeneration);
+
+  return {
+    syncGeneration,
+    startedAt,
+    totalRepositoryCount,
+    connectedAccount: context.connectedAccount,
+    installationStatus: context.installationStatus,
+    installationId: context.installationId,
+    beforePrRows,
+  };
+}
+
+/**
+ * Phase 2: Resolve, upsert, and sweep members.
+ */
+export async function fullSyncMembers(c: any, config: FullSyncConfig): Promise<void> {
+  await publishSyncProgress(c, {
+    connectedAccount: config.connectedAccount,
+    installationStatus: config.installationStatus,
+    installationId: config.installationId,
+    syncStatus: "syncing",
+    lastSyncLabel: "Syncing GitHub members...",
+    syncGeneration: config.syncGeneration,
+    syncPhase: "syncing_members",
+    processedRepositoryCount: config.totalRepositoryCount,
+    totalRepositoryCount: config.totalRepositoryCount,
+  });
+
+  const context = await getOrganizationContext(c, {
+    connectedAccount: config.connectedAccount,
+    installationStatus: config.installationStatus as any,
+    installationId: config.installationId,
+  });
+  const members = await resolveMembers(c, context);
+  await upsertMembers(c, members, config.startedAt, config.syncGeneration);
+  await sweepMembers(c, config.syncGeneration);
+}
+
+/**
+ * Phase 3 (per-batch): Fetch and upsert pull requests for one batch of repos.
+ * Returns true when all batches have been processed.
+ */
+export async function fullSyncPullRequestBatch(c: any, config: FullSyncConfig, batchIndex: number): Promise<boolean> {
+  const repos = await readRepositoriesFromDb(c);
+  const batches = chunkItems(repos, SYNC_REPOSITORY_BATCH_SIZE);
+  if (batchIndex >= batches.length) return true;
+
+  const batch = batches[batchIndex]!;
+  const context = await getOrganizationContext(c, {
+    connectedAccount: config.connectedAccount,
+    installationStatus: config.installationStatus as any,
+    installationId: config.installationId,
+  });
+  const batchPRs = await listPullRequestsForRepositories(context, batch);
+  await upsertPullRequests(c, batchPRs, config.syncGeneration);
+
+  const processedCount = Math.min((batchIndex + 1) * SYNC_REPOSITORY_BATCH_SIZE, repos.length);
+  await publishSyncProgress(c, {
+    connectedAccount: config.connectedAccount,
+    installationStatus: config.installationStatus,
+    installationId: config.installationId,
+    syncStatus: "syncing",
+    lastSyncLabel: `Synced pull requests for ${processedCount} of ${repos.length} repositories`,
+    syncGeneration: config.syncGeneration,
+    syncPhase: "syncing_pull_requests",
+    processedRepositoryCount: processedCount,
+    totalRepositoryCount: repos.length,
+  });
+
+  return false;
+}
+
+/**
+ * Phase 4: Sweep stale data, publish final state, emit PR change events.
+ */
+export async function fullSyncFinalize(c: any, config: FullSyncConfig): Promise<void> {
+  await sweepPullRequests(c, config.syncGeneration);
+  await sweepRepositories(c, config.syncGeneration);
+
+  await publishSyncProgress(c, {
+    connectedAccount: config.connectedAccount,
+    installationStatus: config.installationStatus,
+    installationId: config.installationId,
+    syncStatus: "synced",
+    lastSyncLabel: config.totalRepositoryCount > 0 ? `Synced ${config.totalRepositoryCount} repositories` : "No repositories available",
+    lastSyncAt: config.startedAt,
+    syncGeneration: config.syncGeneration,
+    syncPhase: null,
+    processedRepositoryCount: config.totalRepositoryCount,
+    totalRepositoryCount: config.totalRepositoryCount,
+  });
+
+  const afterRows = await readAllPullRequestRows(c);
+  await emitPullRequestChangeEvents(c, config.beforePrRows, afterRows);
+}
+
+/**
+ * Error handler: publish error sync state when a full sync fails.
+ */
+/**
+ * Single-shot full sync: runs all phases (setup, branches, members, PRs, finalize)
+ * using native JS loops. This must NOT use workflow primitives (step/loop/sleep)
+ * because it runs inside a workflow step. See workflow.ts for context on why
+ * sub-loops cause HistoryDivergedError.
+ */
+export async function runFullSync(c: any, input: FullSyncInput = {}): Promise<void> {
+  const config = await fullSyncSetup(c, input);
+
+  // Members
+  await fullSyncMembers(c, config);
+
+  // Pull requests — native loop over batches
+  for (let i = 0; ; i++) {
+    const done = await fullSyncPullRequestBatch(c, config, i);
+    if (done) break;
+  }
+
+  // Finalize
+  await fullSyncFinalize(c, config);
+}
+
+export async function fullSyncError(c: any, error: unknown): Promise<void> {
+  const currentMeta = await readMeta(c);
+  const message = error instanceof Error ? error.message : "GitHub import failed";
+  await publishSyncProgress(c, {
+    connectedAccount: currentMeta.connectedAccount,
+    installationStatus: currentMeta.installationStatus,
+    installationId: currentMeta.installationId,
+    syncStatus: "error",
+    lastSyncLabel: message,
+    syncGeneration: currentMeta.syncGeneration,
+    syncPhase: null,
+    processedRepositoryCount: 0,
+    totalRepositoryCount: 0,
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Workflow command loop
+// ---------------------------------------------------------------------------
+
+type GithubDataWorkflowHandler = (loopCtx: any, body: any) => Promise<any>;
+
+const GITHUB_DATA_COMMAND_HANDLERS: Record<GithubDataQueueName, GithubDataWorkflowHandler> = {
+  "githubData.command.syncRepos": async (c, body) => {
+    try {
+      await runFullSync(c, body);
+      return { ok: true };
+    } catch (error) {
+      try {
+        await fullSyncError(c, error);
+      } catch {
+        /* best effort */
+      }
+      throw error;
+    }
+  },
+  "githubData.command.handlePullRequestWebhook": async (c, body) => {
+    await handlePullRequestWebhookMutation(c, body);
+    return { ok: true };
+  },
+  "githubData.command.clearState": async (c, body) => {
+    await clearStateMutation(c, body);
+    return { ok: true };
+  },
+};
+
+async function runGithubDataWorkflow(ctx: any): Promise<void> {
+  await ctx.loop("github-data-command-loop", async (loopCtx: any) => {
+    const msg = await loopCtx.queue.next("next-github-data-command", {
+      names: [...GITHUB_DATA_QUEUE_NAMES],
+      completable: true,
+    });
+
+    if (!msg) {
+      return Loop.continue(undefined);
+    }
+
+    const handler = GITHUB_DATA_COMMAND_HANDLERS[msg.name as GithubDataQueueName];
+    if (!handler) {
+      logActorWarning("github-data", "unknown github-data command", { command: msg.name });
+      await msg.complete({ error: `Unknown command: ${msg.name}` }).catch(() => {});
+      return Loop.continue(undefined);
+    }
+
+    try {
+      // Wrap in a step so c.state and c.db are accessible inside mutation functions.
+      const result = await loopCtx.step({
+        name: msg.name,
+        timeout: 10 * 60_000,
+        run: async () => handler(loopCtx, msg.body),
+      });
+      await msg.complete(result);
+    } catch (error) {
+      const message = resolveErrorMessage(error);
+      logActorWarning("github-data", "github-data workflow command failed", {
+        command: msg.name,
+        error: message,
+      });
+      await msg.complete({ error: message }).catch(() => {});
+    }
+
+    return Loop.continue(undefined);
+  });
+}
+
+export const githubData = actor({
+  db: githubDataDb,
+  queues: Object.fromEntries(GITHUB_DATA_QUEUE_NAMES.map((name) => [name, queue()])),
+  options: {
+    name: "GitHub Data",
+    icon: "github",
+    actionTimeout: 10 * 60_000,
+  },
+  createState: (_c, input: GithubDataInput) => ({
+    organizationId: input.organizationId,
+  }),
+  actions: {
+    async getSummary(c) {
+      const repositories = await c.db.select().from(githubRepositories).all();
+      const members = await c.db.select().from(githubMembers).all();
+      const pullRequests = await c.db.select().from(githubPullRequests).all();
+      return {
+        ...(await readMeta(c)),
+        repositoryCount: repositories.length,
+        memberCount: members.length,
+        pullRequestCount: pullRequests.length,
+      };
+    },
+
+    async listRepositories(c) {
+      const rows = await c.db.select().from(githubRepositories).all();
+      return rows.map((row) => ({
+        repoId: row.repoId,
+        fullName: row.fullName,
+        cloneUrl: row.cloneUrl,
+        private: Boolean(row.private),
+        defaultBranch: row.defaultBranch,
+      }));
+    },
+
+    async getRepository(c, input: { repoId: string }) {
+      const row = await c.db.select().from(githubRepositories).where(eq(githubRepositories.repoId, input.repoId)).get();
+      if (!row) {
+        return null;
+      }
+      return {
+        repoId: row.repoId,
+        fullName: row.fullName,
+        cloneUrl: row.cloneUrl,
+        private: Boolean(row.private),
+        defaultBranch: row.defaultBranch,
+      };
+    },
+
+    async listOpenPullRequests(c) {
+      const rows = await c.db
+        .select()
+        .from(githubPullRequests)
+        .where(inArray(githubPullRequests.state, ["OPEN", "DRAFT"]))
+        .all();
+      return rows.map((row) => pullRequestSummaryFromRow(row));
+    },
+  },
+  run: workflow(runGithubDataWorkflow),
+});
+
+export async function clearStateMutation(c: any, input: ClearStateInput) {
+  const beforeRows = await readAllPullRequestRows(c);
+  const currentMeta = await readMeta(c);
+  await c.db.delete(githubPullRequests).run();
+  await c.db.delete(githubRepositories).run();
+  await c.db.delete(githubMembers).run();
+  await writeMeta(c, {
+    connectedAccount: input.connectedAccount,
+    installationStatus: input.installationStatus,
+    installationId: input.installationId,
+    syncStatus: "pending",
+    lastSyncLabel: input.label,
+    lastSyncAt: null,
+    syncGeneration: currentMeta.syncGeneration,
+    syncPhase: null,
+    processedRepositoryCount: 0,
+    totalRepositoryCount: 0,
+  });
+
+  await emitPullRequestChangeEvents(c, beforeRows, []);
+}
+
+export async function handlePullRequestWebhookMutation(c: any, input: PullRequestWebhookInput) {
+  const beforeRows = await readAllPullRequestRows(c);
+  const repoId = repoIdFromRemote(input.repository.cloneUrl);
+  const currentRepository = await c.db.select().from(githubRepositories).where(eq(githubRepositories.repoId, repoId)).get();
+  const updatedAt = Date.now();
+  const currentMeta = await readMeta(c);
+  const state = normalizePrStatus(input.pullRequest);
+  const prId = `${repoId}#${input.pullRequest.number}`;
+
+  await c.db
+    .insert(githubRepositories)
+    .values({
+      repoId,
+      fullName: input.repository.fullName,
+      cloneUrl: input.repository.cloneUrl,
+      private: input.repository.private ? 1 : 0,
+      defaultBranch: currentRepository?.defaultBranch ?? input.pullRequest.baseRefName ?? "main",
+      syncGeneration: currentMeta.syncGeneration,
+      updatedAt,
+    })
+    .onConflictDoUpdate({
+      target: githubRepositories.repoId,
+      set: {
+        fullName: input.repository.fullName,
+        cloneUrl: input.repository.cloneUrl,
+        private: input.repository.private ? 1 : 0,
+        defaultBranch: currentRepository?.defaultBranch ?? input.pullRequest.baseRefName ?? "main",
+        syncGeneration: currentMeta.syncGeneration,
+        updatedAt,
+      },
+    })
+    .run();
+
+  if (state === "CLOSED" || state === "MERGED") {
+    await c.db.delete(githubPullRequests).where(eq(githubPullRequests.prId, prId)).run();
+  } else {
+    await c.db
+      .insert(githubPullRequests)
+      .values({
+        prId,
+        repoId,
+        repoFullName: input.repository.fullName,
+        number: input.pullRequest.number,
+        title: input.pullRequest.title,
+        body: input.pullRequest.body ?? null,
+        state,
+        url: input.pullRequest.url,
+        headRefName: input.pullRequest.headRefName,
+        baseRefName: input.pullRequest.baseRefName,
+        authorLogin: input.pullRequest.authorLogin ?? null,
+        isDraft: input.pullRequest.isDraft ? 1 : 0,
+        syncGeneration: currentMeta.syncGeneration,
+        updatedAt,
+      })
+      .onConflictDoUpdate({
+        target: githubPullRequests.prId,
+        set: {
+          title: input.pullRequest.title,
+          body: input.pullRequest.body ?? null,
+          state,
+          url: input.pullRequest.url,
+          headRefName: input.pullRequest.headRefName,
+          baseRefName: input.pullRequest.baseRefName,
+          authorLogin: input.pullRequest.authorLogin ?? null,
+          isDraft: input.pullRequest.isDraft ? 1 : 0,
+          syncGeneration: currentMeta.syncGeneration,
+          updatedAt,
+        },
+      })
+      .run();
+  }
+
+  await publishSyncProgress(c, {
+    connectedAccount: input.connectedAccount,
+    installationStatus: input.installationStatus,
+    installationId: input.installationId,
+    syncStatus: "synced",
+    lastSyncLabel: "GitHub webhook received",
+    lastSyncAt: updatedAt,
+    syncPhase: null,
+    processedRepositoryCount: 0,
+    totalRepositoryCount: 0,
+  });
+
+  const afterRows = await readAllPullRequestRows(c);
+  await emitPullRequestChangeEvents(c, beforeRows, afterRows);
+  if (state === "CLOSED" || state === "MERGED") {
+    const previous = beforeRows.find((row) => row.prId === prId);
+    if (previous) {
+      await autoArchiveTaskForClosedPullRequest(c, {
+        ...previous,
+        state,
+      });
+    }
+  }
+}
diff --git a/foundry/packages/backend/src/actors/github-data/workflow.ts b/foundry/packages/backend/src/actors/github-data/workflow.ts
new file mode 100644
index 0000000..11ece75
--- /dev/null
+++ b/foundry/packages/backend/src/actors/github-data/workflow.ts
@@ -0,0 +1,73 @@
+// @ts-nocheck
+import { logActorWarning, resolveErrorMessage } from "../logging.js";
+
+// Dynamic imports to break circular dependency: index.ts imports workflow.ts,
+// and workflow.ts needs functions from index.ts.
+async function getIndexModule() {
+  return await import("./index.js");
+}
+
+export const GITHUB_DATA_QUEUE_NAMES = [
+  "githubData.command.syncRepos",
+  "githubData.command.handlePullRequestWebhook",
+  "githubData.command.clearState",
+] as const;
+
+export type GithubDataQueueName = (typeof GITHUB_DATA_QUEUE_NAMES)[number];
+
+export function githubDataWorkflowQueueName(name: GithubDataQueueName): GithubDataQueueName {
+  return name;
+}
+
+/**
+ * Plain run handler (no workflow engine). Drains the queue using `c.queue.iter()`
+ * with completable messages. This avoids the RivetKit bug where actors created
+ * from another actor's workflow context never start their `run: workflow(...)`.
+ */
+export async function runGithubDataCommandLoop(c: any): Promise<void> {
+  for await (const msg of c.queue.iter({ names: [...GITHUB_DATA_QUEUE_NAMES], completable: true })) {
+    try {
+      if (msg.name === "githubData.command.syncRepos") {
+        try {
+          const { runFullSync } = await getIndexModule();
+          await runFullSync(c, msg.body);
+          await msg.complete({ ok: true });
+        } catch (error) {
+          const { fullSyncError } = await getIndexModule();
+          try {
+            await fullSyncError(c, error);
+          } catch {
+            /* best effort */
+          }
+          const message = error instanceof Error ? error.message : String(error);
+          await msg.complete({ error: message }).catch(() => {});
+        }
+        continue;
+      }
+
+      if (msg.name === "githubData.command.handlePullRequestWebhook") {
+        const { handlePullRequestWebhookMutation } = await getIndexModule();
+        await handlePullRequestWebhookMutation(c, msg.body);
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === "githubData.command.clearState") {
+        const { clearStateMutation } = await getIndexModule();
+        await clearStateMutation(c, msg.body);
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      logActorWarning("githubData", "unknown queue message", { queueName: msg.name });
+      await msg.complete({ error: `Unknown command: ${msg.name}` });
+    } catch (error) {
+      const message = resolveErrorMessage(error);
+      logActorWarning("githubData", "github-data command failed", {
+        queueName: msg.name,
+        error: message,
+      });
+      await msg.complete({ error: message }).catch(() => {});
+    }
+  }
+}
diff --git a/foundry/packages/backend/src/actors/handles.ts b/foundry/packages/backend/src/actors/handles.ts
new file mode 100644
index 0000000..5aa5715
--- /dev/null
+++ b/foundry/packages/backend/src/actors/handles.ts
@@ -0,0 +1,85 @@
+import { auditLogKey, githubDataKey, organizationKey, taskKey, taskSandboxKey, userKey } from "./keys.js";
+
+export function actorClient(c: any) {
+  return c.client();
+}
+
+export async function getOrCreateOrganization(c: any, organizationId: string) {
+  return await actorClient(c).organization.getOrCreate(organizationKey(organizationId), {
+    createWithInput: organizationId,
+  });
+}
+
+export async function getOrCreateUser(c: any, userId: string) {
+  return await actorClient(c).user.getOrCreate(userKey(userId), {
+    createWithInput: { userId },
+  });
+}
+
+export function getUser(c: any, userId: string) {
+  return actorClient(c).user.get(userKey(userId));
+}
+
+export function getTask(c: any, organizationId: string, repoId: string, taskId: string) {
+  return actorClient(c).task.get(taskKey(organizationId, repoId, taskId));
+}
+
+export async function getOrCreateTask(c: any, organizationId: string, repoId: string, taskId: string, createWithInput: Record<string, unknown>) {
+  return await actorClient(c).task.getOrCreate(taskKey(organizationId, repoId, taskId), {
+    createWithInput,
+  });
+}
+
+export async function getOrCreateAuditLog(c: any, organizationId: string) {
+  return await actorClient(c).auditLog.getOrCreate(auditLogKey(organizationId), {
+    createWithInput: {
+      organizationId,
+    },
+  });
+}
+
+export async function getOrCreateGithubData(c: any, organizationId: string) {
+  return await actorClient(c).githubData.getOrCreate(githubDataKey(organizationId), {
+    createWithInput: {
+      organizationId,
+    },
+  });
+}
+
+export function getGithubData(c: any, organizationId: string) {
+  return actorClient(c).githubData.get(githubDataKey(organizationId));
+}
+
+export function getTaskSandbox(c: any, organizationId: string, sandboxId: string) {
+  return actorClient(c).taskSandbox.get(taskSandboxKey(organizationId, sandboxId));
+}
+
+export async function getOrCreateTaskSandbox(c: any, organizationId: string, sandboxId: string, createWithInput?: Record<string, unknown>) {
+  return await actorClient(c).taskSandbox.getOrCreate(taskSandboxKey(organizationId, sandboxId), {
+    createWithInput,
+  });
+}
+
+export function selfAuditLog(c: any) {
+  return actorClient(c).auditLog.getForId(c.actorId);
+}
+
+export function selfTask(c: any) {
+  return actorClient(c).task.getForId(c.actorId);
+}
+
+export function selfOrganization(c: any) {
+  return actorClient(c).organization.getForId(c.actorId);
+}
+
+export function selfUser(c: any) {
+  return actorClient(c).user.getForId(c.actorId);
+}
+
+export function selfGithubData(c: any) {
+  return actorClient(c).githubData.getForId(c.actorId);
+}
+
+export function selfTaskSandbox(c: any) {
+  return actorClient(c).taskSandbox.getForId(c.actorId);
+}
diff --git a/foundry/packages/backend/src/actors/index.ts b/foundry/packages/backend/src/actors/index.ts
new file mode 100644
index 0000000..74ede4a
--- /dev/null
+++ b/foundry/packages/backend/src/actors/index.ts
@@ -0,0 +1,38 @@
+import { user } from "./user/index.js";
+import { setup } from "rivetkit";
+import { githubData } from "./github-data/index.js";
+import { task } from "./task/index.js";
+import { auditLog } from "./audit-log/index.js";
+import { taskSandbox } from "./sandbox/index.js";
+import { organization } from "./organization/index.js";
+import { logger } from "../logging.js";
+import { resolveRunnerVersion } from "../config/runner-version.js";
+
+const runnerVersion = resolveRunnerVersion();
+
+export const registry = setup({
+  serverless: {
+    basePath: "/v1/rivet",
+  },
+  runner: { version: runnerVersion },
+  logging: {
+    baseLogger: logger,
+  },
+  use: {
+    user,
+    organization,
+    task,
+    taskSandbox,
+    auditLog,
+    githubData,
+  },
+});
+
+export * from "./context.js";
+export * from "./audit-log/index.js";
+export * from "./user/index.js";
+export * from "./github-data/index.js";
+export * from "./task/index.js";
+export * from "./keys.js";
+export * from "./sandbox/index.js";
+export * from "./organization/index.js";
diff --git a/foundry/packages/backend/src/actors/keys.ts b/foundry/packages/backend/src/actors/keys.ts
new file mode 100644
index 0000000..03bd014
--- /dev/null
+++ b/foundry/packages/backend/src/actors/keys.ts
@@ -0,0 +1,26 @@
+export type ActorKey = string[];
+
+export function organizationKey(organizationId: string): ActorKey {
+  return ["org", organizationId];
+}
+
+export function userKey(userId: string): ActorKey {
+  return ["org", "app", "user", userId];
+}
+
+export function taskKey(organizationId: string, repoId: string, taskId: string): ActorKey {
+  return ["org", organizationId, "task", repoId, taskId];
+}
+
+export function taskSandboxKey(organizationId: string, sandboxId: string): ActorKey {
+  return ["org", organizationId, "sandbox", sandboxId];
+}
+
+/** One audit log per org (not per repo) — see audit-log/index.ts for rationale. */
+export function auditLogKey(organizationId: string): ActorKey {
+  return ["org", organizationId, "audit-log"];
+}
+
+export function githubDataKey(organizationId: string): ActorKey {
+  return ["org", organizationId, "github-data"];
+}
diff --git a/foundry/packages/backend/src/actors/logging.ts b/foundry/packages/backend/src/actors/logging.ts
new file mode 100644
index 0000000..a61685f
--- /dev/null
+++ b/foundry/packages/backend/src/actors/logging.ts
@@ -0,0 +1,43 @@
+import { logger } from "../logging.js";
+
+export function resolveErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    let msg = error.message;
+    if (error.cause) {
+      msg += ` [cause: ${resolveErrorMessage(error.cause)}]`;
+    }
+    return msg;
+  }
+  return String(error);
+}
+
+export function isActorNotFoundError(error: unknown): boolean {
+  return resolveErrorMessage(error).includes("Actor not found:");
+}
+
+export function resolveErrorStack(error: unknown): string | undefined {
+  if (error instanceof Error && typeof error.stack === "string") {
+    return error.stack;
+  }
+  return undefined;
+}
+
+export function logActorInfo(scope: string, message: string, context?: Record<string, unknown>): void {
+  logger.info(
+    {
+      scope,
+      ...(context ?? {}),
+    },
+    message,
+  );
+}
+
+export function logActorWarning(scope: string, message: string, context?: Record<string, unknown>): void {
+  logger.warn(
+    {
+      scope,
+      ...(context ?? {}),
+    },
+    message,
+  );
+}
diff --git a/foundry/packages/backend/src/actors/organization/actions.ts b/foundry/packages/backend/src/actors/organization/actions.ts
new file mode 100644
index 0000000..2298cd9
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions.ts
@@ -0,0 +1,253 @@
+// @ts-nocheck
+import { desc, eq } from "drizzle-orm";
+import type {
+  RepoRecord,
+  WorkspaceRepositorySummary,
+  WorkspaceTaskSummary,
+  OrganizationEvent,
+  OrganizationGithubSummary,
+  OrganizationSummarySnapshot,
+  OrganizationUseInput,
+} from "@sandbox-agent/foundry-shared";
+import { logActorWarning, resolveErrorMessage } from "../logging.js";
+import { getOrCreateGithubData } from "../handles.js";
+import { organizationProfile, taskSummaries } from "./db/schema.js";
+import { organizationAppActions } from "./actions/app.js";
+import { organizationBetterAuthActions } from "./actions/better-auth.js";
+import { organizationOnboardingActions } from "./actions/onboarding.js";
+import { organizationGithubActions } from "./actions/github.js";
+import { organizationShellActions } from "./actions/organization.js";
+import { organizationTaskActions } from "./actions/tasks.js";
+import { updateOrganizationShellProfileMutation } from "./app-shell.js";
+
+interface OrganizationState {
+  organizationId: string;
+}
+
+const ORGANIZATION_PROFILE_ROW_ID = 1;
+
+function assertOrganization(c: { state: OrganizationState }, organizationId: string): void {
+  if (organizationId !== c.state.organizationId) {
+    throw new Error(`Organization actor mismatch: actor=${c.state.organizationId} command=${organizationId}`);
+  }
+}
+
+function repoLabelFromRemote(remoteUrl: string): string {
+  try {
+    const url = new URL(remoteUrl.startsWith("http") ? remoteUrl : `https://${remoteUrl}`);
+    const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+    if (parts.length >= 2) {
+      return `${parts[0]}/${(parts[1] ?? "").replace(/\.git$/, "")}`;
+    }
+  } catch {
+    // ignore
+  }
+
+  return remoteUrl;
+}
+
+function buildGithubSummary(profile: any, importedRepoCount: number): OrganizationGithubSummary {
+  return {
+    connectedAccount: profile?.githubConnectedAccount ?? "",
+    installationStatus: profile?.githubInstallationStatus ?? "install_required",
+    syncStatus: profile?.githubSyncStatus ?? "pending",
+    importedRepoCount,
+    lastSyncLabel: profile?.githubLastSyncLabel ?? "Waiting for first import",
+    lastSyncAt: profile?.githubLastSyncAt ?? null,
+    lastWebhookAt: profile?.githubLastWebhookAt ?? null,
+    lastWebhookEvent: profile?.githubLastWebhookEvent ?? "",
+    syncGeneration: profile?.githubSyncGeneration ?? 0,
+    syncPhase: profile?.githubSyncPhase ?? null,
+    processedRepositoryCount: profile?.githubProcessedRepositoryCount ?? 0,
+    totalRepositoryCount: profile?.githubTotalRepositoryCount ?? 0,
+  };
+}
+
+/**
+ * Reads the organization sidebar snapshot from local tables only — no fan-out
+ * to child actors. Task summaries are organization-owned and updated via push
+ * from task actors.
+ */
+async function getOrganizationSummarySnapshot(c: any): Promise<OrganizationSummarySnapshot> {
+  const profile = await c.db.select().from(organizationProfile).where(eq(organizationProfile.id, ORGANIZATION_PROFILE_ROW_ID)).get();
+
+  // Fetch repos + open PRs from github-data actor (single actor, not fan-out)
+  let repoRows: Array<{ repoId: string; fullName: string; cloneUrl: string; private: boolean; defaultBranch: string }> = [];
+  let openPullRequests: any[] = [];
+  try {
+    const githubData = await getOrCreateGithubData(c, c.state.organizationId);
+    [repoRows, openPullRequests] = await Promise.all([githubData.listRepositories({}), githubData.listOpenPullRequests({})]);
+  } catch {
+    // github-data actor may not exist yet
+  }
+
+  const summaryRows = await c.db.select().from(taskSummaries).orderBy(desc(taskSummaries.updatedAtMs)).all();
+  const summaries = summaryRows.map((row) => ({
+    id: row.taskId,
+    repoId: row.repoId,
+    title: row.title,
+    status: row.status,
+    repoName: row.repoName,
+    updatedAtMs: row.updatedAtMs,
+    branch: row.branch ?? null,
+    pullRequest: row.pullRequestJson
+      ? (() => {
+          try {
+            return JSON.parse(row.pullRequestJson);
+          } catch {
+            return null;
+          }
+        })()
+      : null,
+    sessionsSummary: row.sessionsSummaryJson
+      ? (() => {
+          try {
+            return JSON.parse(row.sessionsSummaryJson);
+          } catch {
+            return [];
+          }
+        })()
+      : [],
+  }));
+
+  return {
+    organizationId: c.state.organizationId,
+    github: buildGithubSummary(profile, repoRows.length),
+    repos: repoRows
+      .map((repo) => {
+        const repoTasks = summaries.filter((t) => t.repoId === repo.repoId);
+        const latestTaskMs = repoTasks.reduce((latest, t) => Math.max(latest, t.updatedAtMs), 0);
+        return {
+          id: repo.repoId,
+          label: repoLabelFromRemote(repo.cloneUrl),
+          taskCount: repoTasks.length,
+          latestActivityMs: latestTaskMs || Date.now(),
+        };
+      })
+      .sort((a, b) => b.latestActivityMs - a.latestActivityMs),
+    taskSummaries: summaries,
+    openPullRequests,
+  };
+}
+
+export async function refreshOrganizationSnapshotMutation(c: any): Promise<void> {
+  c.broadcast("organizationUpdated", {
+    type: "organizationUpdated",
+    snapshot: await getOrganizationSummarySnapshot(c),
+  } satisfies OrganizationEvent);
+}
+
+export const organizationActions = {
+  ...organizationBetterAuthActions,
+  ...organizationGithubActions,
+  ...organizationOnboardingActions,
+  ...organizationShellActions,
+  ...organizationAppActions,
+  ...organizationTaskActions,
+  async useOrganization(c: any, input: OrganizationUseInput): Promise<{ organizationId: string }> {
+    assertOrganization(c, input.organizationId);
+    return { organizationId: c.state.organizationId };
+  },
+
+  async listRepos(c: any, input: OrganizationUseInput): Promise<RepoRecord[]> {
+    assertOrganization(c, input.organizationId);
+    try {
+      const githubData = await getOrCreateGithubData(c, c.state.organizationId);
+      const rows = await githubData.listRepositories({});
+      return rows.map((row: any) => ({
+        organizationId: c.state.organizationId,
+        repoId: row.repoId,
+        remoteUrl: row.cloneUrl,
+        createdAt: row.updatedAt ?? Date.now(),
+        updatedAt: row.updatedAt ?? Date.now(),
+      }));
+    } catch {
+      return [];
+    }
+  },
+
+  async getOrganizationSummary(c: any, input: OrganizationUseInput): Promise<OrganizationSummarySnapshot> {
+    assertOrganization(c, input.organizationId);
+    return await getOrganizationSummarySnapshot(c);
+  },
+
+  // updateShellProfile stays as a direct action — called with await from HTTP handler where the user can retry
+  async updateShellProfile(c: any, input: { displayName?: string; slug?: string; primaryDomain?: string }): Promise<void> {
+    await updateOrganizationShellProfileMutation(c, input);
+  },
+};
+
+export async function applyGithubSyncProgressMutation(
+  c: any,
+  input: {
+    connectedAccount: string;
+    installationStatus: string;
+    installationId: number | null;
+    syncStatus: string;
+    lastSyncLabel: string;
+    lastSyncAt: number | null;
+    syncGeneration: number;
+    syncPhase: string | null;
+    processedRepositoryCount: number;
+    totalRepositoryCount: number;
+  },
+): Promise<void> {
+  const profile = await c.db
+    .select({ id: organizationProfile.id })
+    .from(organizationProfile)
+    .where(eq(organizationProfile.id, ORGANIZATION_PROFILE_ROW_ID))
+    .get();
+  if (!profile) {
+    return;
+  }
+
+  await c.db
+    .update(organizationProfile)
+    .set({
+      githubConnectedAccount: input.connectedAccount,
+      githubInstallationStatus: input.installationStatus,
+      githubSyncStatus: input.syncStatus,
+      githubInstallationId: input.installationId,
+      githubLastSyncLabel: input.lastSyncLabel,
+      githubLastSyncAt: input.lastSyncAt,
+      githubSyncGeneration: input.syncGeneration,
+      githubSyncPhase: input.syncPhase,
+      githubProcessedRepositoryCount: input.processedRepositoryCount,
+      githubTotalRepositoryCount: input.totalRepositoryCount,
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, ORGANIZATION_PROFILE_ROW_ID))
+    .run();
+
+  await refreshOrganizationSnapshotMutation(c);
+}
+
+export async function recordGithubWebhookReceiptMutation(
+  c: any,
+  input: {
+    organizationId: string;
+    event: string;
+    action?: string | null;
+    receivedAt?: number;
+  },
+): Promise<void> {
+  assertOrganization(c, input.organizationId);
+
+  const profile = await c.db
+    .select({ id: organizationProfile.id })
+    .from(organizationProfile)
+    .where(eq(organizationProfile.id, ORGANIZATION_PROFILE_ROW_ID))
+    .get();
+  if (!profile) {
+    return;
+  }
+
+  await c.db
+    .update(organizationProfile)
+    .set({
+      githubLastWebhookAt: input.receivedAt ?? Date.now(),
+      githubLastWebhookEvent: input.action ? `${input.event}.${input.action}` : input.event,
+    })
+    .where(eq(organizationProfile.id, ORGANIZATION_PROFILE_ROW_ID))
+    .run();
+}
diff --git a/foundry/packages/backend/src/actors/organization/actions/app.ts b/foundry/packages/backend/src/actors/organization/actions/app.ts
new file mode 100644
index 0000000..d3cc329
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/app.ts
@@ -0,0 +1 @@
+export { organizationAppActions } from "../app-shell.js";
diff --git a/foundry/packages/backend/src/actors/organization/actions/better-auth.ts b/foundry/packages/backend/src/actors/organization/actions/better-auth.ts
new file mode 100644
index 0000000..060ceed
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/better-auth.ts
@@ -0,0 +1,360 @@
+import { and, asc, count as sqlCount, desc, eq, gt, gte, inArray, isNotNull, isNull, like, lt, lte, ne, notInArray, or } from "drizzle-orm";
+import { authAccountIndex, authEmailIndex, authSessionIndex, authVerification } from "../db/schema.js";
+import { APP_SHELL_ORGANIZATION_ID } from "../constants.js";
+
+function assertAppOrganization(c: any): void {
+  if (c.state.organizationId !== APP_SHELL_ORGANIZATION_ID) {
+    throw new Error(`App shell action requires organization ${APP_SHELL_ORGANIZATION_ID}, got ${c.state.organizationId}`);
+  }
+}
+
+function organizationAuthColumn(table: any, field: string): any {
+  const column = table[field];
+  if (!column) {
+    throw new Error(`Unknown auth table field: ${field}`);
+  }
+  return column;
+}
+
+function normalizeAuthValue(value: unknown): unknown {
+  if (value instanceof Date) {
+    return value.getTime();
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => normalizeAuthValue(entry));
+  }
+  return value;
+}
+
+function organizationAuthClause(table: any, clause: { field: string; value: unknown; operator?: string }): any {
+  const column = organizationAuthColumn(table, clause.field);
+  const value = normalizeAuthValue(clause.value);
+  switch (clause.operator) {
+    case "ne":
+      return value === null ? isNotNull(column) : ne(column, value as any);
+    case "lt":
+      return lt(column, value as any);
+    case "lte":
+      return lte(column, value as any);
+    case "gt":
+      return gt(column, value as any);
+    case "gte":
+      return gte(column, value as any);
+    case "in":
+      return inArray(column, Array.isArray(value) ? (value as any[]) : [value as any]);
+    case "not_in":
+      return notInArray(column, Array.isArray(value) ? (value as any[]) : [value as any]);
+    case "contains":
+      return like(column, `%${String(value ?? "")}%`);
+    case "starts_with":
+      return like(column, `${String(value ?? "")}%`);
+    case "ends_with":
+      return like(column, `%${String(value ?? "")}`);
+    case "eq":
+    default:
+      return value === null ? isNull(column) : eq(column, value as any);
+  }
+}
+
+function organizationBetterAuthWhere(table: any, clauses: any[] | undefined): any {
+  if (!clauses || clauses.length === 0) {
+    return undefined;
+  }
+  let expr = organizationAuthClause(table, clauses[0]);
+  for (const clause of clauses.slice(1)) {
+    const next = organizationAuthClause(table, clause);
+    expr = clause.connector === "OR" ? or(expr, next) : and(expr, next);
+  }
+  return expr;
+}
+
+export async function betterAuthUpsertSessionIndexMutation(c: any, input: { sessionId: string; sessionToken: string; userId: string }) {
+  assertAppOrganization(c);
+
+  const now = Date.now();
+  await c.db
+    .insert(authSessionIndex)
+    .values({
+      sessionId: input.sessionId,
+      sessionToken: input.sessionToken,
+      userId: input.userId,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: authSessionIndex.sessionId,
+      set: {
+        sessionToken: input.sessionToken,
+        userId: input.userId,
+        updatedAt: now,
+      },
+    })
+    .run();
+  return await c.db.select().from(authSessionIndex).where(eq(authSessionIndex.sessionId, input.sessionId)).get();
+}
+
+export async function betterAuthDeleteSessionIndexMutation(c: any, input: { sessionId?: string; sessionToken?: string }) {
+  assertAppOrganization(c);
+
+  const clauses = [
+    ...(input.sessionId ? [{ field: "sessionId", value: input.sessionId }] : []),
+    ...(input.sessionToken ? [{ field: "sessionToken", value: input.sessionToken }] : []),
+  ];
+  if (clauses.length === 0) {
+    return;
+  }
+  const predicate = organizationBetterAuthWhere(authSessionIndex, clauses);
+  await c.db.delete(authSessionIndex).where(predicate!).run();
+}
+
+export async function betterAuthUpsertEmailIndexMutation(c: any, input: { email: string; userId: string }) {
+  assertAppOrganization(c);
+
+  const now = Date.now();
+  await c.db
+    .insert(authEmailIndex)
+    .values({
+      email: input.email,
+      userId: input.userId,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: authEmailIndex.email,
+      set: {
+        userId: input.userId,
+        updatedAt: now,
+      },
+    })
+    .run();
+  return await c.db.select().from(authEmailIndex).where(eq(authEmailIndex.email, input.email)).get();
+}
+
+export async function betterAuthDeleteEmailIndexMutation(c: any, input: { email: string }) {
+  assertAppOrganization(c);
+  await c.db.delete(authEmailIndex).where(eq(authEmailIndex.email, input.email)).run();
+}
+
+export async function betterAuthUpsertAccountIndexMutation(c: any, input: { id: string; providerId: string; accountId: string; userId: string }) {
+  assertAppOrganization(c);
+
+  const now = Date.now();
+  await c.db
+    .insert(authAccountIndex)
+    .values({
+      id: input.id,
+      providerId: input.providerId,
+      accountId: input.accountId,
+      userId: input.userId,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: authAccountIndex.id,
+      set: {
+        providerId: input.providerId,
+        accountId: input.accountId,
+        userId: input.userId,
+        updatedAt: now,
+      },
+    })
+    .run();
+  return await c.db.select().from(authAccountIndex).where(eq(authAccountIndex.id, input.id)).get();
+}
+
+export async function betterAuthDeleteAccountIndexMutation(c: any, input: { id?: string; providerId?: string; accountId?: string }) {
+  assertAppOrganization(c);
+
+  if (input.id) {
+    await c.db.delete(authAccountIndex).where(eq(authAccountIndex.id, input.id)).run();
+    return;
+  }
+  if (input.providerId && input.accountId) {
+    await c.db
+      .delete(authAccountIndex)
+      .where(and(eq(authAccountIndex.providerId, input.providerId), eq(authAccountIndex.accountId, input.accountId)))
+      .run();
+  }
+}
+
+export async function betterAuthCreateVerificationMutation(c: any, input: { data: Record<string, unknown> }) {
+  assertAppOrganization(c);
+
+  await c.db
+    .insert(authVerification)
+    .values(input.data as any)
+    .run();
+  return await c.db
+    .select()
+    .from(authVerification)
+    .where(eq(authVerification.id, input.data.id as string))
+    .get();
+}
+
+export async function betterAuthUpdateVerificationMutation(c: any, input: { where: any[]; update: Record<string, unknown> }) {
+  assertAppOrganization(c);
+
+  const predicate = organizationBetterAuthWhere(authVerification, input.where);
+  if (!predicate) {
+    return null;
+  }
+  await c.db
+    .update(authVerification)
+    .set(input.update as any)
+    .where(predicate)
+    .run();
+  return await c.db.select().from(authVerification).where(predicate).get();
+}
+
+export async function betterAuthUpdateManyVerificationMutation(c: any, input: { where: any[]; update: Record<string, unknown> }) {
+  assertAppOrganization(c);
+
+  const predicate = organizationBetterAuthWhere(authVerification, input.where);
+  if (!predicate) {
+    return 0;
+  }
+  await c.db
+    .update(authVerification)
+    .set(input.update as any)
+    .where(predicate)
+    .run();
+  const row = await c.db.select({ value: sqlCount() }).from(authVerification).where(predicate).get();
+  return row?.value ?? 0;
+}
+
+export async function betterAuthDeleteVerificationMutation(c: any, input: { where: any[] }) {
+  assertAppOrganization(c);
+
+  const predicate = organizationBetterAuthWhere(authVerification, input.where);
+  if (!predicate) {
+    return;
+  }
+  await c.db.delete(authVerification).where(predicate).run();
+}
+
+export async function betterAuthDeleteManyVerificationMutation(c: any, input: { where: any[] }) {
+  assertAppOrganization(c);
+
+  const predicate = organizationBetterAuthWhere(authVerification, input.where);
+  if (!predicate) {
+    return 0;
+  }
+  const rows = await c.db.select().from(authVerification).where(predicate).all();
+  await c.db.delete(authVerification).where(predicate).run();
+  return rows.length;
+}
+
+// Exception to the CLAUDE.md queue-for-mutations rule: Better Auth adapter operations
+// use direct actions even for mutations. Better Auth runs during OAuth callbacks on the
+// HTTP request path, not through the normal organization lifecycle. Routing through the
+// queue adds multiple sequential round-trips (each with actor wake-up + step overhead)
+// that cause 30-second OAuth callbacks and proxy retry storms. These mutations are simple
+// SQLite upserts/deletes with no cross-actor coordination or broadcast side effects.
+export const organizationBetterAuthActions = {
+  // --- Mutation actions (called by the Better Auth adapter in better-auth.ts) ---
+  async betterAuthUpsertSessionIndex(c: any, input: { sessionId: string; sessionToken: string; userId: string }) {
+    return await betterAuthUpsertSessionIndexMutation(c, input);
+  },
+  async betterAuthDeleteSessionIndex(c: any, input: { sessionId?: string; sessionToken?: string }) {
+    await betterAuthDeleteSessionIndexMutation(c, input);
+  },
+  async betterAuthUpsertEmailIndex(c: any, input: { email: string; userId: string }) {
+    return await betterAuthUpsertEmailIndexMutation(c, input);
+  },
+  async betterAuthDeleteEmailIndex(c: any, input: { email: string }) {
+    await betterAuthDeleteEmailIndexMutation(c, input);
+  },
+  async betterAuthUpsertAccountIndex(c: any, input: { id: string; providerId: string; accountId: string; userId: string }) {
+    return await betterAuthUpsertAccountIndexMutation(c, input);
+  },
+  async betterAuthDeleteAccountIndex(c: any, input: { id?: string; providerId?: string; accountId?: string }) {
+    await betterAuthDeleteAccountIndexMutation(c, input);
+  },
+  async betterAuthCreateVerification(c: any, input: { data: Record<string, unknown> }) {
+    return await betterAuthCreateVerificationMutation(c, input);
+  },
+  async betterAuthUpdateVerification(c: any, input: { where: any[]; update: Record<string, unknown> }) {
+    return await betterAuthUpdateVerificationMutation(c, input);
+  },
+  async betterAuthUpdateManyVerification(c: any, input: { where: any[]; update: Record<string, unknown> }) {
+    return await betterAuthUpdateManyVerificationMutation(c, input);
+  },
+  async betterAuthDeleteVerification(c: any, input: { where: any[] }) {
+    await betterAuthDeleteVerificationMutation(c, input);
+  },
+  async betterAuthDeleteManyVerification(c: any, input: { where: any[] }) {
+    return await betterAuthDeleteManyVerificationMutation(c, input);
+  },
+
+  // --- Read actions ---
+  async betterAuthFindSessionIndex(c: any, input: { sessionId?: string; sessionToken?: string }) {
+    assertAppOrganization(c);
+
+    const clauses = [
+      ...(input.sessionId ? [{ field: "sessionId", value: input.sessionId }] : []),
+      ...(input.sessionToken ? [{ field: "sessionToken", value: input.sessionToken }] : []),
+    ];
+    if (clauses.length === 0) {
+      return null;
+    }
+    const predicate = organizationBetterAuthWhere(authSessionIndex, clauses);
+    return await c.db.select().from(authSessionIndex).where(predicate!).get();
+  },
+
+  async betterAuthFindEmailIndex(c: any, input: { email: string }) {
+    assertAppOrganization(c);
+    return await c.db.select().from(authEmailIndex).where(eq(authEmailIndex.email, input.email)).get();
+  },
+
+  async betterAuthFindAccountIndex(c: any, input: { id?: string; providerId?: string; accountId?: string }) {
+    assertAppOrganization(c);
+
+    if (input.id) {
+      return await c.db.select().from(authAccountIndex).where(eq(authAccountIndex.id, input.id)).get();
+    }
+    if (!input.providerId || !input.accountId) {
+      return null;
+    }
+    return await c.db
+      .select()
+      .from(authAccountIndex)
+      .where(and(eq(authAccountIndex.providerId, input.providerId), eq(authAccountIndex.accountId, input.accountId)))
+      .get();
+  },
+
+  async betterAuthFindOneVerification(c: any, input: { where: any[] }) {
+    assertAppOrganization(c);
+
+    const predicate = organizationBetterAuthWhere(authVerification, input.where);
+    return predicate ? await c.db.select().from(authVerification).where(predicate).get() : null;
+  },
+
+  async betterAuthFindManyVerification(c: any, input: { where?: any[]; limit?: number; sortBy?: any; offset?: number }) {
+    assertAppOrganization(c);
+
+    const predicate = organizationBetterAuthWhere(authVerification, input.where);
+    let query = c.db.select().from(authVerification);
+    if (predicate) {
+      query = query.where(predicate);
+    }
+    if (input.sortBy?.field) {
+      const column = organizationAuthColumn(authVerification, input.sortBy.field);
+      query = query.orderBy(input.sortBy.direction === "asc" ? asc(column) : desc(column));
+    }
+    if (typeof input.limit === "number") {
+      query = query.limit(input.limit);
+    }
+    if (typeof input.offset === "number") {
+      query = query.offset(input.offset);
+    }
+    return await query.all();
+  },
+
+  async betterAuthCountVerification(c: any, input: { where?: any[] }) {
+    assertAppOrganization(c);
+
+    const predicate = organizationBetterAuthWhere(authVerification, input.where);
+    const row = predicate
+      ? await c.db.select({ value: sqlCount() }).from(authVerification).where(predicate).get()
+      : await c.db.select({ value: sqlCount() }).from(authVerification).get();
+    return row?.value ?? 0;
+  },
+};
diff --git a/foundry/packages/backend/src/actors/organization/actions/github.ts b/foundry/packages/backend/src/actors/organization/actions/github.ts
new file mode 100644
index 0000000..43818c0
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/github.ts
@@ -0,0 +1,80 @@
+import { desc } from "drizzle-orm";
+import type { FoundryAppSnapshot } from "@sandbox-agent/foundry-shared";
+import { getOrCreateGithubData, getOrCreateOrganization } from "../../handles.js";
+import { githubDataWorkflowQueueName } from "../../github-data/index.js";
+import { authSessionIndex } from "../db/schema.js";
+import { assertAppOrganization, buildAppSnapshot, requireEligibleOrganization, requireSignedInSession } from "../app-shell.js";
+import { getBetterAuthService } from "../../../services/better-auth.js";
+import { refreshOrganizationSnapshotMutation } from "../actions.js";
+import { organizationWorkflowQueueName } from "../queues.js";
+
+export const organizationGithubActions = {
+  async resolveAppGithubToken(
+    c: any,
+    input: { organizationId: string; requireRepoScope?: boolean },
+  ): Promise<{ accessToken: string; scopes: string[] } | null> {
+    assertAppOrganization(c);
+    const auth = getBetterAuthService();
+    const rows = await c.db.select().from(authSessionIndex).orderBy(desc(authSessionIndex.updatedAt)).all();
+
+    for (const row of rows) {
+      const authState = await auth.getAuthState(row.sessionId);
+      if (authState?.sessionState?.activeOrganizationId !== input.organizationId) {
+        continue;
+      }
+
+      const token = await auth.getAccessTokenForSession(row.sessionId);
+      if (!token?.accessToken) {
+        continue;
+      }
+
+      const scopes = token.scopes;
+      if (input.requireRepoScope !== false && scopes.length > 0 && !scopes.some((scope) => scope === "repo" || scope.startsWith("repo:"))) {
+        continue;
+      }
+
+      return {
+        accessToken: token.accessToken,
+        scopes,
+      };
+    }
+
+    return null;
+  },
+
+  async triggerAppRepoImport(c: any, input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+
+    const githubData = await getOrCreateGithubData(c, input.organizationId);
+    const summary = await githubData.getSummary({});
+    if (summary.syncStatus === "syncing") {
+      return await buildAppSnapshot(c, input.sessionId);
+    }
+
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    await organizationHandle.send(
+      organizationWorkflowQueueName("organization.command.shell.sync_started.mark"),
+      { label: "Importing repository catalog..." },
+      { wait: false },
+    );
+    await organizationHandle.send(organizationWorkflowQueueName("organization.command.snapshot.broadcast"), {}, { wait: false });
+
+    void githubData
+      .send(githubDataWorkflowQueueName("githubData.command.syncRepos"), { label: "Importing repository catalog..." }, { wait: false })
+      .catch(() => {});
+
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async adminReloadGithubOrganization(c: any): Promise<void> {
+    const githubData = await getOrCreateGithubData(c, c.state.organizationId);
+    await githubData.send(githubDataWorkflowQueueName("githubData.command.syncRepos"), { label: "Reloading GitHub organization..." }, { wait: false });
+  },
+
+  async adminReloadGithubRepository(c: any, _input: { repoId: string }): Promise<void> {
+    const githubData = await getOrCreateGithubData(c, c.state.organizationId);
+    await githubData.send(githubDataWorkflowQueueName("githubData.command.syncRepos"), { label: "Reloading repository..." }, { wait: false });
+  },
+};
diff --git a/foundry/packages/backend/src/actors/organization/actions/onboarding.ts b/foundry/packages/backend/src/actors/organization/actions/onboarding.ts
new file mode 100644
index 0000000..22153f4
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/onboarding.ts
@@ -0,0 +1,82 @@
+import { randomUUID } from "node:crypto";
+import type { FoundryAppSnapshot, StarSandboxAgentRepoInput, StarSandboxAgentRepoResult } from "@sandbox-agent/foundry-shared";
+import { getOrCreateGithubData, getOrCreateOrganization } from "../../handles.js";
+import {
+  assertAppOrganization,
+  buildAppSnapshot,
+  getOrganizationState,
+  requireEligibleOrganization,
+  requireSignedInSession,
+} from "../app-shell.js";
+import { getBetterAuthService } from "../../../services/better-auth.js";
+import { getActorRuntimeContext } from "../../context.js";
+import { resolveOrganizationGithubAuth } from "../../../services/github-auth.js";
+
+const SANDBOX_AGENT_REPO = "rivet-dev/sandbox-agent";
+
+export const organizationOnboardingActions = {
+  async skipAppStarterRepo(c: any, input: { sessionId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    await getBetterAuthService().upsertUserProfile(session.authUserId, {
+      starterRepoStatus: "skipped",
+      starterRepoSkippedAt: Date.now(),
+      starterRepoStarredAt: null,
+    });
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async starAppStarterRepo(c: any, input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const organization = await getOrCreateOrganization(c, input.organizationId);
+    await organization.starSandboxAgentRepo({
+      organizationId: input.organizationId,
+    });
+    await getBetterAuthService().upsertUserProfile(session.authUserId, {
+      starterRepoStatus: "starred",
+      starterRepoStarredAt: Date.now(),
+      starterRepoSkippedAt: null,
+    });
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async selectAppOrganization(c: any, input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    await getBetterAuthService().setActiveOrganization(input.sessionId, input.organizationId);
+    await getOrCreateGithubData(c, input.organizationId);
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async beginAppGithubInstall(c: any, input: { sessionId: string; organizationId: string }): Promise<{ url: string }> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const { appShell } = getActorRuntimeContext();
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    const organizationState = await getOrganizationState(organizationHandle);
+    if (organizationState.snapshot.kind !== "organization") {
+      return {
+        url: `${appShell.appUrl}/organizations/${input.organizationId}`,
+      };
+    }
+    return {
+      url: await appShell.github.buildInstallationUrl(organizationState.githubLogin, randomUUID()),
+    };
+  },
+
+  async starSandboxAgentRepo(c: any, input: StarSandboxAgentRepoInput): Promise<StarSandboxAgentRepoResult> {
+    const { driver } = getActorRuntimeContext();
+    const auth = await resolveOrganizationGithubAuth(c, c.state.organizationId);
+    await driver.github.starRepository(SANDBOX_AGENT_REPO, {
+      githubToken: auth?.githubToken ?? null,
+    });
+    return {
+      repo: SANDBOX_AGENT_REPO,
+      starredAt: Date.now(),
+    };
+  },
+};
diff --git a/foundry/packages/backend/src/actors/organization/actions/organization.ts b/foundry/packages/backend/src/actors/organization/actions/organization.ts
new file mode 100644
index 0000000..9e1cbd6
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/organization.ts
@@ -0,0 +1,53 @@
+import type { FoundryAppSnapshot, UpdateFoundryOrganizationProfileInput, WorkspaceModelId } from "@sandbox-agent/foundry-shared";
+import { getBetterAuthService } from "../../../services/better-auth.js";
+import { getOrCreateOrganization } from "../../handles.js";
+import {
+  assertAppOrganization,
+  assertOrganizationShell,
+  buildAppSnapshot,
+  buildOrganizationState,
+  buildOrganizationStateIfInitialized,
+  requireEligibleOrganization,
+  requireSignedInSession,
+} from "../app-shell.js";
+
+export const organizationShellActions = {
+  async getAppSnapshot(c: any, input: { sessionId: string }): Promise<FoundryAppSnapshot> {
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async setAppDefaultModel(c: any, input: { sessionId: string; defaultModel: WorkspaceModelId }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    await getBetterAuthService().upsertUserProfile(session.authUserId, {
+      defaultModel: input.defaultModel,
+    });
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async updateAppOrganizationProfile(
+    c: any,
+    input: { sessionId: string; organizationId: string } & UpdateFoundryOrganizationProfileInput,
+  ): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const organization = await getOrCreateOrganization(c, input.organizationId);
+    await organization.updateShellProfile({
+      displayName: input.displayName,
+      slug: input.slug,
+      primaryDomain: input.primaryDomain,
+    });
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async getOrganizationShellState(c: any): Promise<any> {
+    assertOrganizationShell(c);
+    return await buildOrganizationState(c);
+  },
+
+  async getOrganizationShellStateIfInitialized(c: any): Promise<any | null> {
+    assertOrganizationShell(c);
+    return await buildOrganizationStateIfInitialized(c);
+  },
+};
diff --git a/foundry/packages/backend/src/actors/organization/actions/task-mutations.ts b/foundry/packages/backend/src/actors/organization/actions/task-mutations.ts
new file mode 100644
index 0000000..3affccd
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/task-mutations.ts
@@ -0,0 +1,478 @@
+// @ts-nocheck
+import { randomUUID } from "node:crypto";
+import { and, desc, eq, isNotNull, ne } from "drizzle-orm";
+import type {
+  RepoOverview,
+  SandboxProviderId,
+  TaskRecord,
+  TaskSummary,
+  WorkspacePullRequestSummary,
+  WorkspaceSessionSummary,
+  WorkspaceTaskSummary,
+} from "@sandbox-agent/foundry-shared";
+import { getActorRuntimeContext } from "../../context.js";
+import { getGithubData, getOrCreateAuditLog, getOrCreateTask, getTask } from "../../handles.js";
+// task actions called directly (no queue)
+import { deriveFallbackTitle, resolveCreateFlowDecision } from "../../../services/create-flow.js";
+// actions return directly (no queue response unwrapping)
+import { isActorNotFoundError, logActorWarning, resolveErrorMessage } from "../../logging.js";
+import { defaultSandboxProviderId } from "../../../sandbox-config.js";
+import { taskWorkflowQueueName } from "../../task/workflow/queue.js";
+import { expectQueueResponse } from "../../../services/queue.js";
+import { taskIndex, taskSummaries } from "../db/schema.js";
+import { refreshOrganizationSnapshotMutation } from "../actions.js";
+
+interface CreateTaskCommand {
+  repoId: string;
+  task: string;
+  sandboxProviderId: SandboxProviderId;
+  explicitTitle: string | null;
+  explicitBranchName: string | null;
+  onBranch: string | null;
+}
+
+interface RegisterTaskBranchCommand {
+  repoId: string;
+  taskId: string;
+  branchName: string;
+}
+
+function isStaleTaskReferenceError(error: unknown): boolean {
+  const message = resolveErrorMessage(error);
+  return isActorNotFoundError(error) || message.startsWith("Task not found:");
+}
+
+function parseJsonValue<T>(value: string | null | undefined, fallback: T): T {
+  if (!value) {
+    return fallback;
+  }
+
+  try {
+    return JSON.parse(value) as T;
+  } catch {
+    return fallback;
+  }
+}
+
+function taskSummaryRowFromSummary(taskSummary: WorkspaceTaskSummary) {
+  return {
+    taskId: taskSummary.id,
+    repoId: taskSummary.repoId,
+    title: taskSummary.title,
+    status: taskSummary.status,
+    repoName: taskSummary.repoName,
+    updatedAtMs: taskSummary.updatedAtMs,
+    branch: taskSummary.branch,
+    pullRequestJson: JSON.stringify(taskSummary.pullRequest),
+    sessionsSummaryJson: JSON.stringify(taskSummary.sessionsSummary),
+    primaryUserLogin: taskSummary.primaryUserLogin ?? null,
+    primaryUserAvatarUrl: taskSummary.primaryUserAvatarUrl ?? null,
+  };
+}
+
+export function taskSummaryFromRow(repoId: string, row: any): WorkspaceTaskSummary {
+  return {
+    id: row.taskId,
+    repoId,
+    title: row.title,
+    status: row.status,
+    repoName: row.repoName,
+    updatedAtMs: row.updatedAtMs,
+    branch: row.branch ?? null,
+    pullRequest: parseJsonValue<WorkspacePullRequestSummary | null>(row.pullRequestJson, null),
+    sessionsSummary: parseJsonValue<WorkspaceSessionSummary[]>(row.sessionsSummaryJson, []),
+    primaryUserLogin: row.primaryUserLogin ?? null,
+    primaryUserAvatarUrl: row.primaryUserAvatarUrl ?? null,
+  };
+}
+
+export async function upsertTaskSummary(c: any, taskSummary: WorkspaceTaskSummary): Promise<void> {
+  await c.db
+    .insert(taskSummaries)
+    .values(taskSummaryRowFromSummary(taskSummary))
+    .onConflictDoUpdate({
+      target: taskSummaries.taskId,
+      set: taskSummaryRowFromSummary(taskSummary),
+    })
+    .run();
+}
+
+async function deleteStaleTaskIndexRow(c: any, taskId: string): Promise<void> {
+  try {
+    await c.db.delete(taskIndex).where(eq(taskIndex.taskId, taskId)).run();
+  } catch {
+    // Best effort cleanup only.
+  }
+}
+
+async function listKnownTaskBranches(c: any, repoId: string): Promise<string[]> {
+  const rows = await c.db
+    .select({ branchName: taskIndex.branchName })
+    .from(taskIndex)
+    .where(and(eq(taskIndex.repoId, repoId), isNotNull(taskIndex.branchName)))
+    .all();
+  return rows.map((row) => row.branchName).filter((value): value is string => typeof value === "string" && value.trim().length > 0);
+}
+
+async function resolveGitHubRepository(c: any, repoId: string) {
+  const githubData = getGithubData(c, c.state.organizationId);
+  return await githubData.getRepository({ repoId }).catch(() => null);
+}
+
+async function resolveRepositoryRemoteUrl(c: any, repoId: string): Promise<string> {
+  const repository = await resolveGitHubRepository(c, repoId);
+  const remoteUrl = repository?.cloneUrl?.trim();
+  if (!remoteUrl) {
+    throw new Error(`Missing remote URL for repo ${repoId}`);
+  }
+  return remoteUrl;
+}
+
+/**
+ * The ONLY backend code path that creates a task actor via getOrCreateTask.
+ * Called when a user explicitly creates a new task (not during sync/webhooks).
+ *
+ * All other code must use getTask (handles.ts) which calls .get() and will
+ * error if the actor doesn't exist. Virtual tasks created during PR sync
+ * are materialized lazily by the client's getOrCreate in backend-client.ts.
+ *
+ * NEVER call this from a sync loop or webhook handler.
+ */
+export async function createTaskMutation(c: any, cmd: CreateTaskCommand): Promise<TaskRecord> {
+  const organizationId = c.state.organizationId;
+  const repoId = cmd.repoId;
+  await resolveRepositoryRemoteUrl(c, repoId);
+  const onBranch = cmd.onBranch?.trim() || null;
+  const taskId = randomUUID();
+  let initialBranchName: string | null = null;
+  let initialTitle: string | null = null;
+
+  if (onBranch) {
+    initialBranchName = onBranch;
+    initialTitle = deriveFallbackTitle(cmd.task, cmd.explicitTitle ?? undefined);
+
+    await registerTaskBranchMutation(c, {
+      repoId,
+      taskId,
+      branchName: onBranch,
+    });
+  } else {
+    const reservedBranches = await listKnownTaskBranches(c, repoId);
+    const resolved = resolveCreateFlowDecision({
+      task: cmd.task,
+      explicitTitle: cmd.explicitTitle ?? undefined,
+      explicitBranchName: cmd.explicitBranchName ?? undefined,
+      localBranches: [],
+      taskBranches: reservedBranches,
+    });
+
+    initialBranchName = resolved.branchName;
+    initialTitle = resolved.title;
+
+    const now = Date.now();
+    await c.db
+      .insert(taskIndex)
+      .values({
+        taskId,
+        repoId,
+        branchName: resolved.branchName,
+        createdAt: now,
+        updatedAt: now,
+      })
+      .onConflictDoNothing()
+      .run();
+  }
+
+  let taskHandle: Awaited<ReturnType<typeof getOrCreateTask>>;
+  try {
+    taskHandle = await getOrCreateTask(c, organizationId, repoId, taskId, {
+      organizationId,
+      repoId,
+      taskId,
+    });
+  } catch (error) {
+    if (initialBranchName) {
+      await deleteStaleTaskIndexRow(c, taskId);
+    }
+    throw error;
+  }
+
+  const created = expectQueueResponse<TaskRecord>(
+    await taskHandle.send(
+      taskWorkflowQueueName("task.command.initialize"),
+      {
+        sandboxProviderId: cmd.sandboxProviderId,
+        branchName: initialBranchName,
+        title: initialTitle,
+        task: cmd.task,
+      },
+      { wait: true, timeout: 10_000 },
+    ),
+  );
+
+  try {
+    await upsertTaskSummary(c, await taskHandle.getTaskSummary({}));
+    await refreshOrganizationSnapshotMutation(c);
+  } catch (error) {
+    logActorWarning("organization", "failed seeding task summary after task creation", {
+      organizationId,
+      repoId,
+      taskId,
+      error: resolveErrorMessage(error),
+    });
+  }
+
+  const auditLog = await getOrCreateAuditLog(c, organizationId);
+  void auditLog.append({
+    kind: "task.created",
+    repoId,
+    taskId,
+    payload: {
+      repoId,
+      sandboxProviderId: cmd.sandboxProviderId,
+    },
+  });
+
+  try {
+    const taskSummary = await taskHandle.getTaskSummary({});
+    await upsertTaskSummary(c, taskSummary);
+  } catch (error) {
+    logActorWarning("organization", "failed seeding organization task projection", {
+      organizationId,
+      repoId,
+      taskId,
+      error: resolveErrorMessage(error),
+    });
+  }
+
+  return created;
+}
+
+export async function registerTaskBranchMutation(c: any, cmd: RegisterTaskBranchCommand): Promise<{ branchName: string }> {
+  const branchName = cmd.branchName.trim();
+  if (!branchName) {
+    throw new Error("branchName is required");
+  }
+
+  const existingOwner = await c.db
+    .select({ taskId: taskIndex.taskId })
+    .from(taskIndex)
+    .where(and(eq(taskIndex.branchName, branchName), eq(taskIndex.repoId, cmd.repoId), ne(taskIndex.taskId, cmd.taskId)))
+    .get();
+
+  if (existingOwner) {
+    let ownerMissing = false;
+    try {
+      await getTask(c, c.state.organizationId, cmd.repoId, existingOwner.taskId).get();
+    } catch (error) {
+      if (isStaleTaskReferenceError(error)) {
+        ownerMissing = true;
+        await deleteStaleTaskIndexRow(c, existingOwner.taskId);
+      } else {
+        throw error;
+      }
+    }
+    if (!ownerMissing) {
+      throw new Error(`branch is already assigned to a different task: ${branchName}`);
+    }
+  }
+
+  const now = Date.now();
+  await c.db
+    .insert(taskIndex)
+    .values({
+      taskId: cmd.taskId,
+      repoId: cmd.repoId,
+      branchName,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskIndex.taskId,
+      set: {
+        branchName,
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  return { branchName };
+}
+
+export async function applyTaskSummaryUpdateMutation(c: any, input: { taskSummary: WorkspaceTaskSummary }): Promise<void> {
+  await upsertTaskSummary(c, input.taskSummary);
+  await refreshOrganizationSnapshotMutation(c);
+}
+
+export async function removeTaskSummaryMutation(c: any, input: { taskId: string }): Promise<void> {
+  await c.db.delete(taskSummaries).where(eq(taskSummaries.taskId, input.taskId)).run();
+  await refreshOrganizationSnapshotMutation(c);
+}
+
+/**
+ * Called for every changed PR during sync and on webhook PR events.
+ * Runs in a bulk loop — MUST NOT create task actors or make cross-actor calls
+ * to task actors. Only writes to the org's local taskIndex/taskSummaries tables.
+ * Task actors are created lazily when the user views the task.
+ */
+export async function refreshTaskSummaryForBranchMutation(
+  c: any,
+  input: { repoId: string; branchName: string; pullRequest?: WorkspacePullRequestSummary | null; repoName?: string },
+): Promise<void> {
+  const pullRequest = input.pullRequest ?? null;
+  let rows = await c.db
+    .select({ taskId: taskSummaries.taskId })
+    .from(taskSummaries)
+    .where(and(eq(taskSummaries.branch, input.branchName), eq(taskSummaries.repoId, input.repoId)))
+    .all();
+
+  if (rows.length === 0 && pullRequest) {
+    // Create a virtual task entry in the org's local tables only.
+    // No task actor is spawned — it will be created lazily when the user
+    // clicks on the task in the sidebar (the "materialize" path).
+    const taskId = randomUUID();
+    const now = Date.now();
+    const title = pullRequest.title?.trim() || input.branchName;
+    const repoName = input.repoName ?? `${c.state.organizationId}/${input.repoId}`;
+
+    await c.db
+      .insert(taskIndex)
+      .values({ taskId, repoId: input.repoId, branchName: input.branchName, createdAt: now, updatedAt: now })
+      .onConflictDoNothing()
+      .run();
+
+    await c.db
+      .insert(taskSummaries)
+      .values({
+        taskId,
+        repoId: input.repoId,
+        title,
+        status: "init_complete",
+        repoName,
+        updatedAtMs: pullRequest.updatedAtMs ?? now,
+        branch: input.branchName,
+        pullRequestJson: JSON.stringify(pullRequest),
+        sessionsSummaryJson: "[]",
+      })
+      .onConflictDoNothing()
+      .run();
+
+    rows = [{ taskId }];
+  } else {
+    // Update PR data on existing task summaries locally.
+    // If a real task actor exists, also notify it.
+    for (const row of rows) {
+      // Update the local summary with the new PR data
+      await c.db
+        .update(taskSummaries)
+        .set({
+          pullRequestJson: pullRequest ? JSON.stringify(pullRequest) : null,
+          updatedAtMs: pullRequest?.updatedAtMs ?? Date.now(),
+        })
+        .where(eq(taskSummaries.taskId, row.taskId))
+        .run();
+
+      // Best-effort notify the task actor if it exists (fire-and-forget)
+      try {
+        const task = getTask(c, c.state.organizationId, input.repoId, row.taskId);
+        void task.syncPullRequest({ pullRequest }).catch(() => {});
+      } catch {
+        // Task actor doesn't exist yet — that's fine, it's virtual
+      }
+    }
+  }
+
+  await refreshOrganizationSnapshotMutation(c);
+}
+
+export async function listTaskSummariesForRepo(c: any, repoId: string, includeArchived = false): Promise<TaskSummary[]> {
+  const rows = await c.db.select().from(taskSummaries).where(eq(taskSummaries.repoId, repoId)).orderBy(desc(taskSummaries.updatedAtMs)).all();
+  return rows
+    .map((row) => ({
+      organizationId: c.state.organizationId,
+      repoId,
+      taskId: row.taskId,
+      branchName: row.branch ?? null,
+      title: row.title,
+      status: row.status,
+      updatedAt: row.updatedAtMs,
+      pullRequest: parseJsonValue<WorkspacePullRequestSummary | null>(row.pullRequestJson, null),
+    }))
+    .filter((row) => includeArchived || row.status !== "archived");
+}
+
+export async function listAllTaskSummaries(c: any, includeArchived = false): Promise<TaskSummary[]> {
+  const rows = await c.db.select().from(taskSummaries).orderBy(desc(taskSummaries.updatedAtMs)).all();
+  return rows
+    .map((row) => ({
+      organizationId: c.state.organizationId,
+      repoId: row.repoId,
+      taskId: row.taskId,
+      branchName: row.branch ?? null,
+      title: row.title,
+      status: row.status,
+      updatedAt: row.updatedAtMs,
+      pullRequest: parseJsonValue<WorkspacePullRequestSummary | null>(row.pullRequestJson, null),
+    }))
+    .filter((row) => includeArchived || row.status !== "archived");
+}
+
+export async function listWorkspaceTaskSummaries(c: any): Promise<WorkspaceTaskSummary[]> {
+  const rows = await c.db.select().from(taskSummaries).orderBy(desc(taskSummaries.updatedAtMs)).all();
+  return rows.map((row) => taskSummaryFromRow(row.repoId, row));
+}
+
+export async function getRepoOverviewFromOrg(c: any, repoId: string): Promise<RepoOverview> {
+  const now = Date.now();
+  const repository = await resolveGitHubRepository(c, repoId);
+  const remoteUrl = await resolveRepositoryRemoteUrl(c, repoId);
+  const taskRows = await c.db.select().from(taskSummaries).where(eq(taskSummaries.repoId, repoId)).all();
+
+  const branches = taskRows
+    .filter((row: any) => row.branch)
+    .map((row: any) => {
+      const pr = parseJsonValue<WorkspacePullRequestSummary | null>(row.pullRequestJson, null);
+      return {
+        branchName: row.branch!,
+        commitSha: "",
+        taskId: row.taskId,
+        taskTitle: row.title ?? null,
+        taskStatus: row.status ?? null,
+        pullRequest: pr,
+        ciStatus: null,
+        updatedAt: Math.max(row.updatedAtMs ?? 0, pr?.updatedAtMs ?? 0, now),
+      };
+    })
+    .sort((a: any, b: any) => b.updatedAt - a.updatedAt);
+
+  return {
+    organizationId: c.state.organizationId,
+    repoId,
+    remoteUrl,
+    baseRef: repository?.defaultBranch ?? null,
+    fetchedAt: now,
+    branches,
+  };
+}
+
+export async function getRepositoryMetadataFromOrg(
+  c: any,
+  repoId: string,
+): Promise<{ defaultBranch: string | null; fullName: string | null; remoteUrl: string }> {
+  const repository = await resolveGitHubRepository(c, repoId);
+  const remoteUrl = await resolveRepositoryRemoteUrl(c, repoId);
+  return {
+    defaultBranch: repository?.defaultBranch ?? null,
+    fullName: repository?.fullName ?? null,
+    remoteUrl,
+  };
+}
+
+export async function findTaskForBranch(c: any, repoId: string, branchName: string): Promise<{ taskId: string | null }> {
+  const row = await c.db
+    .select({ taskId: taskSummaries.taskId })
+    .from(taskSummaries)
+    .where(and(eq(taskSummaries.branch, branchName), eq(taskSummaries.repoId, repoId)))
+    .get();
+  return { taskId: row?.taskId ?? null };
+}
diff --git a/foundry/packages/backend/src/actors/organization/actions/tasks.ts b/foundry/packages/backend/src/actors/organization/actions/tasks.ts
new file mode 100644
index 0000000..80bb2f9
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/actions/tasks.ts
@@ -0,0 +1,377 @@
+// @ts-nocheck
+import { desc, eq } from "drizzle-orm";
+import type {
+  AuditLogEvent,
+  CreateTaskInput,
+  HistoryQueryInput,
+  ListTasksInput,
+  RepoOverview,
+  SwitchResult,
+  TaskRecord,
+  TaskSummary,
+  TaskWorkspaceChangeModelInput,
+  TaskWorkspaceChangeOwnerInput,
+  TaskWorkspaceCreateTaskInput,
+  TaskWorkspaceDiffInput,
+  TaskWorkspaceRenameInput,
+  TaskWorkspaceRenameSessionInput,
+  TaskWorkspaceSelectInput,
+  TaskWorkspaceSetSessionUnreadInput,
+  TaskWorkspaceSendMessageInput,
+  TaskWorkspaceSessionInput,
+  TaskWorkspaceUpdateDraftInput,
+} from "@sandbox-agent/foundry-shared";
+import { getActorRuntimeContext } from "../../context.js";
+import { getOrCreateAuditLog, getOrCreateTask, getTask as getTaskHandle } from "../../handles.js";
+import { defaultSandboxProviderId } from "../../../sandbox-config.js";
+import { logActorWarning, resolveErrorMessage } from "../../logging.js";
+import { taskWorkflowQueueName } from "../../task/workflow/queue.js";
+import { expectQueueResponse } from "../../../services/queue.js";
+import { taskIndex, taskSummaries } from "../db/schema.js";
+import {
+  createTaskMutation,
+  getRepoOverviewFromOrg,
+  getRepositoryMetadataFromOrg,
+  findTaskForBranch,
+  listTaskSummariesForRepo,
+  listAllTaskSummaries,
+} from "./task-mutations.js";
+
+function assertOrganization(c: { state: { organizationId: string } }, organizationId: string): void {
+  if (organizationId !== c.state.organizationId) {
+    throw new Error(`Organization actor mismatch: actor=${c.state.organizationId} command=${organizationId}`);
+  }
+}
+
+/**
+ * Look up the repoId for a task from the local task index.
+ * Used when callers (e.g. sandbox actor) only have taskId but need repoId
+ * to construct the task actor key.
+ */
+async function resolveTaskRepoId(c: any, taskId: string): Promise<string> {
+  const row = await c.db.select({ repoId: taskIndex.repoId }).from(taskIndex).where(eq(taskIndex.taskId, taskId)).get();
+  if (!row) {
+    throw new Error(`Task ${taskId} not found in task index`);
+  }
+  return row.repoId;
+}
+
+/**
+ * Get or lazily create a task actor for a user-initiated action.
+ * Uses getOrCreate because the user may be interacting with a virtual task
+ * (PR-driven) that has no actor yet. The task actor self-initializes in
+ * getCurrentRecord() from the org's getTaskIndexEntry data.
+ *
+ * This is safe because requireWorkspaceTask is only called from user-initiated
+ * actions (createSession, sendMessage, etc.), never from sync loops.
+ * See CLAUDE.md "Lazy Task Actor Creation".
+ */
+async function requireWorkspaceTask(c: any, repoId: string, taskId: string) {
+  return getOrCreateTask(c, c.state.organizationId, repoId, taskId, {
+    organizationId: c.state.organizationId,
+    repoId,
+    taskId,
+  });
+}
+
+interface GetTaskInput {
+  organizationId: string;
+  repoId: string;
+  taskId: string;
+}
+
+interface TaskProxyActionInput extends GetTaskInput {
+  reason?: string;
+}
+
+interface RepoOverviewInput {
+  organizationId: string;
+  repoId: string;
+}
+
+export { createTaskMutation };
+
+export const organizationTaskActions = {
+  async createTask(c: any, input: CreateTaskInput): Promise<TaskRecord> {
+    assertOrganization(c, input.organizationId);
+    const { config } = getActorRuntimeContext();
+    const sandboxProviderId = input.sandboxProviderId ?? defaultSandboxProviderId(config);
+
+    // Self-call: call the mutation directly since we're inside the org actor
+    return await createTaskMutation(c, {
+      repoId: input.repoId,
+      task: input.task,
+      sandboxProviderId,
+      explicitTitle: input.explicitTitle ?? null,
+      explicitBranchName: input.explicitBranchName ?? null,
+      onBranch: input.onBranch ?? null,
+    });
+  },
+
+  async materializeTask(c: any, input: { organizationId: string; repoId: string; virtualTaskId: string }): Promise<TaskRecord> {
+    assertOrganization(c, input.organizationId);
+    const { config } = getActorRuntimeContext();
+    // Self-call: call the mutation directly
+    return await createTaskMutation(c, {
+      repoId: input.repoId,
+      task: input.virtualTaskId,
+      sandboxProviderId: defaultSandboxProviderId(config),
+      explicitTitle: null,
+      explicitBranchName: null,
+      onBranch: null,
+    });
+  },
+
+  async createWorkspaceTask(c: any, input: TaskWorkspaceCreateTaskInput): Promise<{ taskId: string; sessionId?: string }> {
+    const created = await organizationTaskActions.createTask(c, {
+      organizationId: c.state.organizationId,
+      repoId: input.repoId,
+      task: input.task,
+      ...(input.title ? { explicitTitle: input.title } : {}),
+      ...(input.onBranch ? { onBranch: input.onBranch } : input.branch ? { explicitBranchName: input.branch } : {}),
+    });
+
+    const task = await requireWorkspaceTask(c, input.repoId, created.taskId);
+    void task
+      .send(
+        taskWorkflowQueueName("task.command.workspace.create_session_and_send"),
+        {
+          model: input.model,
+          text: input.task,
+          authSessionId: input.authSessionId,
+        },
+        { wait: false },
+      )
+      .catch(() => {});
+
+    return { taskId: created.taskId };
+  },
+
+  async markWorkspaceUnread(c: any, input: TaskWorkspaceSelectInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.markUnread({ authSessionId: input.authSessionId });
+  },
+
+  async renameWorkspaceTask(c: any, input: TaskWorkspaceRenameInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.renameTask({ value: input.value });
+  },
+
+  async createWorkspaceSession(c: any, input: TaskWorkspaceSelectInput & { model?: string }): Promise<{ sessionId: string }> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    return expectQueueResponse(
+      await task.send(
+        taskWorkflowQueueName("task.command.workspace.create_session"),
+        {
+          ...(input.model ? { model: input.model } : {}),
+          ...(input.authSessionId ? { authSessionId: input.authSessionId } : {}),
+        },
+        { wait: true, timeout: 10_000 },
+      ),
+    );
+  },
+
+  async renameWorkspaceSession(c: any, input: TaskWorkspaceRenameSessionInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.renameSession({ sessionId: input.sessionId, title: input.title });
+  },
+
+  async selectWorkspaceSession(c: any, input: TaskWorkspaceSessionInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.selectSession({ sessionId: input.sessionId, authSessionId: input.authSessionId });
+  },
+
+  async setWorkspaceSessionUnread(c: any, input: TaskWorkspaceSetSessionUnreadInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.setSessionUnread({ sessionId: input.sessionId, unread: input.unread, authSessionId: input.authSessionId });
+  },
+
+  async updateWorkspaceDraft(c: any, input: TaskWorkspaceUpdateDraftInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    void task
+      .updateDraft({
+        sessionId: input.sessionId,
+        text: input.text,
+        attachments: input.attachments,
+        authSessionId: input.authSessionId,
+      })
+      .catch(() => {});
+  },
+
+  async changeWorkspaceModel(c: any, input: TaskWorkspaceChangeModelInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.changeModel({ sessionId: input.sessionId, model: input.model, authSessionId: input.authSessionId });
+  },
+
+  async sendWorkspaceMessage(c: any, input: TaskWorkspaceSendMessageInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    void task
+      .send(
+        taskWorkflowQueueName("task.command.workspace.send_message"),
+        {
+          sessionId: input.sessionId,
+          text: input.text,
+          attachments: input.attachments,
+          authSessionId: input.authSessionId,
+        },
+        { wait: false },
+      )
+      .catch(() => {});
+  },
+
+  async stopWorkspaceSession(c: any, input: TaskWorkspaceSessionInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    void task
+      .send(taskWorkflowQueueName("task.command.workspace.stop_session"), { sessionId: input.sessionId, authSessionId: input.authSessionId }, { wait: false })
+      .catch(() => {});
+  },
+
+  async closeWorkspaceSession(c: any, input: TaskWorkspaceSessionInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    void task
+      .send(taskWorkflowQueueName("task.command.workspace.close_session"), { sessionId: input.sessionId, authSessionId: input.authSessionId }, { wait: false })
+      .catch(() => {});
+  },
+
+  async publishWorkspacePr(c: any, input: TaskWorkspaceSelectInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    void task.send(taskWorkflowQueueName("task.command.workspace.publish_pr"), {}, { wait: false }).catch(() => {});
+  },
+
+  async changeWorkspaceTaskOwner(c: any, input: TaskWorkspaceChangeOwnerInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    await task.send(
+      taskWorkflowQueueName("task.command.workspace.change_owner"),
+      {
+        primaryUserId: input.targetUserId,
+        primaryGithubLogin: input.targetUserName,
+        primaryGithubEmail: input.targetUserEmail,
+        primaryGithubAvatarUrl: null,
+      },
+      { wait: false },
+    );
+  },
+
+  async revertWorkspaceFile(c: any, input: TaskWorkspaceDiffInput): Promise<void> {
+    const task = await requireWorkspaceTask(c, input.repoId, input.taskId);
+    void task.send(taskWorkflowQueueName("task.command.workspace.revert_file"), input, { wait: false }).catch(() => {});
+  },
+
+  async getRepoOverview(c: any, input: RepoOverviewInput): Promise<RepoOverview> {
+    assertOrganization(c, input.organizationId);
+
+    return await getRepoOverviewFromOrg(c, input.repoId);
+  },
+
+  async listTasks(c: any, input: ListTasksInput): Promise<TaskSummary[]> {
+    assertOrganization(c, input.organizationId);
+    if (input.repoId) {
+      return await listTaskSummariesForRepo(c, input.repoId, true);
+    }
+    return await listAllTaskSummaries(c, true);
+  },
+
+  async switchTask(c: any, input: { repoId: string; taskId: string }): Promise<SwitchResult> {
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    const record = await h.get();
+    const switched = expectQueueResponse<{ switchTarget: string | null }>(
+      await h.send(taskWorkflowQueueName("task.command.switch"), {}, { wait: true, timeout: 10_000 }),
+    );
+    return {
+      organizationId: c.state.organizationId,
+      taskId: input.taskId,
+      sandboxProviderId: record.sandboxProviderId,
+      switchTarget: switched.switchTarget,
+    };
+  },
+
+  async auditLog(c: any, input: HistoryQueryInput): Promise<AuditLogEvent[]> {
+    assertOrganization(c, input.organizationId);
+    const auditLog = await getOrCreateAuditLog(c, c.state.organizationId);
+    return await auditLog.list({
+      repoId: input.repoId,
+      branch: input.branch,
+      taskId: input.taskId,
+      limit: input.limit ?? 20,
+    });
+  },
+
+  async getTask(c: any, input: GetTaskInput): Promise<TaskRecord> {
+    assertOrganization(c, input.organizationId);
+    // Resolve repoId from local task index if not provided (e.g. sandbox actor only has taskId)
+    const repoId = input.repoId || (await resolveTaskRepoId(c, input.taskId));
+    // Use getOrCreate — the task may be virtual (PR-driven, no actor yet).
+    // The task actor self-initializes in getCurrentRecord().
+    const handle = await getOrCreateTask(c, c.state.organizationId, repoId, input.taskId, {
+      organizationId: c.state.organizationId,
+      repoId,
+      taskId: input.taskId,
+    });
+    return await handle.get();
+  },
+
+  async attachTask(c: any, input: TaskProxyActionInput): Promise<{ target: string; sessionId: string | null }> {
+    assertOrganization(c, input.organizationId);
+
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    return expectQueueResponse(await h.send(taskWorkflowQueueName("task.command.attach"), { reason: input.reason }, { wait: true, timeout: 10_000 }));
+  },
+
+  async pushTask(c: any, input: TaskProxyActionInput): Promise<void> {
+    assertOrganization(c, input.organizationId);
+
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    void h.send(taskWorkflowQueueName("task.command.push"), { reason: input.reason }, { wait: false }).catch(() => {});
+  },
+
+  async syncTask(c: any, input: TaskProxyActionInput): Promise<void> {
+    assertOrganization(c, input.organizationId);
+
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    void h.send(taskWorkflowQueueName("task.command.sync"), { reason: input.reason }, { wait: false }).catch(() => {});
+  },
+
+  async mergeTask(c: any, input: TaskProxyActionInput): Promise<void> {
+    assertOrganization(c, input.organizationId);
+
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    void h.send(taskWorkflowQueueName("task.command.merge"), { reason: input.reason }, { wait: false }).catch(() => {});
+  },
+
+  async archiveTask(c: any, input: TaskProxyActionInput): Promise<void> {
+    assertOrganization(c, input.organizationId);
+
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    void h.send(taskWorkflowQueueName("task.command.archive"), { reason: input.reason }, { wait: false }).catch(() => {});
+  },
+
+  async killTask(c: any, input: TaskProxyActionInput): Promise<void> {
+    assertOrganization(c, input.organizationId);
+
+    const h = getTaskHandle(c, c.state.organizationId, input.repoId, input.taskId);
+    void h.send(taskWorkflowQueueName("task.command.kill"), { reason: input.reason }, { wait: false }).catch(() => {});
+  },
+
+  async getRepositoryMetadata(c: any, input: { repoId: string }): Promise<{ defaultBranch: string | null; fullName: string | null; remoteUrl: string }> {
+    return await getRepositoryMetadataFromOrg(c, input.repoId);
+  },
+
+  async findTaskForBranch(c: any, input: { repoId: string; branchName: string }): Promise<{ taskId: string | null }> {
+    return await findTaskForBranch(c, input.repoId, input.branchName);
+  },
+
+  /**
+   * Lightweight read of task index + summary data. Used by the task actor
+   * to self-initialize when lazily materialized from a virtual task.
+   * Does NOT trigger materialization — no circular dependency.
+   */
+  async getTaskIndexEntry(c: any, input: { taskId: string }): Promise<{ branchName: string | null; title: string | null } | null> {
+    const idx = await c.db.select({ branchName: taskIndex.branchName }).from(taskIndex).where(eq(taskIndex.taskId, input.taskId)).get();
+    const summary = await c.db.select({ title: taskSummaries.title }).from(taskSummaries).where(eq(taskSummaries.taskId, input.taskId)).get();
+    if (!idx && !summary) return null;
+    return {
+      branchName: idx?.branchName ?? null,
+      title: summary?.title ?? null,
+    };
+  },
+};
diff --git a/foundry/packages/backend/src/actors/organization/app-shell.ts b/foundry/packages/backend/src/actors/organization/app-shell.ts
new file mode 100644
index 0000000..ed1005a
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/app-shell.ts
@@ -0,0 +1,1455 @@
+import { desc, eq } from "drizzle-orm";
+import { randomUUID } from "node:crypto";
+import type {
+  FoundryAppSnapshot,
+  FoundryBillingPlanId,
+  FoundryBillingState,
+  FoundryOrganization,
+  FoundryOrganizationMember,
+  FoundryUser,
+  UpdateFoundryOrganizationProfileInput,
+  WorkspaceModelId,
+} from "@sandbox-agent/foundry-shared";
+import { DEFAULT_WORKSPACE_MODEL_ID } from "@sandbox-agent/foundry-shared";
+import { getActorRuntimeContext } from "../context.js";
+import { getOrCreateGithubData, getOrCreateOrganization, selfOrganization } from "../handles.js";
+import { GitHubAppError } from "../../services/app-github.js";
+import { getBetterAuthService } from "../../services/better-auth.js";
+import { repoLabelFromRemote } from "../../services/repo.js";
+import { logger } from "../../logging.js";
+import { githubDataWorkflowQueueName } from "../github-data/index.js";
+import { organizationWorkflowQueueName } from "./queues.js";
+import { invoices, organizationMembers, organizationProfile, seatAssignments, stripeLookup } from "./db/schema.js";
+import { APP_SHELL_ORGANIZATION_ID } from "./constants.js";
+
+const githubWebhookLogger = logger.child({
+  scope: "github-webhook",
+});
+
+const PROFILE_ROW_ID = 1;
+
+function roundDurationMs(start: number): number {
+  return Math.round((performance.now() - start) * 100) / 100;
+}
+
+export function assertAppOrganization(c: any): void {
+  if (c.state.organizationId !== APP_SHELL_ORGANIZATION_ID) {
+    throw new Error(`App shell action requires organization ${APP_SHELL_ORGANIZATION_ID}, got ${c.state.organizationId}`);
+  }
+}
+
+export function assertOrganizationShell(c: any): void {
+  if (c.state.organizationId === APP_SHELL_ORGANIZATION_ID) {
+    throw new Error("Organization action cannot run on the reserved app organization");
+  }
+}
+
+function slugify(value: string): string {
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "");
+}
+
+function personalOrganizationId(login: string): string {
+  return `personal-${slugify(login)}`;
+}
+
+function organizationOrganizationId(kind: FoundryOrganization["kind"], login: string): string {
+  return kind === "personal" ? personalOrganizationId(login) : slugify(login);
+}
+
+function parseEligibleOrganizationIds(value: string): string[] {
+  try {
+    const parsed = JSON.parse(value);
+    if (!Array.isArray(parsed)) {
+      return [];
+    }
+    return parsed.filter((entry): entry is string => typeof entry === "string" && entry.length > 0);
+  } catch {
+    return [];
+  }
+}
+
+function encodeEligibleOrganizationIds(value: string[]): string {
+  return JSON.stringify([...new Set(value)]);
+}
+
+function errorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+function seatsIncludedForPlan(planId: FoundryBillingPlanId): number {
+  switch (planId) {
+    case "free":
+      return 1;
+    case "team":
+      return 5;
+  }
+}
+
+function stripeStatusToBillingStatus(stripeStatus: string, cancelAtPeriodEnd: boolean): FoundryBillingState["status"] {
+  if (cancelAtPeriodEnd) {
+    return "scheduled_cancel";
+  }
+  if (stripeStatus === "trialing") {
+    return "trialing";
+  }
+  if (stripeStatus === "past_due" || stripeStatus === "unpaid" || stripeStatus === "incomplete") {
+    return "past_due";
+  }
+  return "active";
+}
+
+function formatUnixDate(value: number): string {
+  return new Date(value * 1000).toISOString().slice(0, 10);
+}
+
+function legacyRepoImportStatusToGithubSyncStatus(value: string | null | undefined): FoundryOrganization["github"]["syncStatus"] {
+  switch (value) {
+    case "ready":
+      return "synced";
+    case "importing":
+      return "syncing";
+    default:
+      return "pending";
+  }
+}
+
+function stringFromMetadata(metadata: unknown, key: string): string | null {
+  if (!metadata || typeof metadata !== "object") {
+    return null;
+  }
+  const value = (metadata as Record<string, unknown>)[key];
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+
+function stripeWebhookSubscription(event: any) {
+  const object = event.data.object as Record<string, unknown>;
+  const items = (object.items as { data?: Array<Record<string, unknown>> } | undefined)?.data ?? [];
+  const price = items[0]?.price as Record<string, unknown> | undefined;
+  return {
+    id: typeof object.id === "string" ? object.id : "",
+    customerId: typeof object.customer === "string" ? object.customer : "",
+    priceId: typeof price?.id === "string" ? price.id : null,
+    status: typeof object.status === "string" ? object.status : "active",
+    cancelAtPeriodEnd: object.cancel_at_period_end === true,
+    currentPeriodEnd: typeof object.current_period_end === "number" ? object.current_period_end : null,
+    trialEnd: typeof object.trial_end === "number" ? object.trial_end : null,
+    defaultPaymentMethodLabel: "Payment method on file",
+  };
+}
+
+// sendOrganizationCommand removed — org actions called directly
+
+export async function getOrganizationState(organization: any) {
+  return await organization.getOrganizationShellState({});
+}
+
+async function getOrganizationStateIfInitialized(organization: any) {
+  return await organization.getOrganizationShellStateIfInitialized({});
+}
+
+async function listSnapshotOrganizations(c: any, sessionId: string, organizationIds: string[]) {
+  const results = await Promise.all(
+    organizationIds.map(async (organizationId) => {
+      const organizationStartedAt = performance.now();
+      try {
+        const organization = await getOrCreateOrganization(c, organizationId);
+        const organizationState = await getOrganizationStateIfInitialized(organization);
+        if (!organizationState) {
+          logger.warn(
+            {
+              sessionId,
+              actorOrganizationId: c.state.organizationId,
+              organizationId,
+              durationMs: roundDurationMs(organizationStartedAt),
+            },
+            "build_app_snapshot_organization_uninitialized",
+          );
+          return { organizationId, snapshot: null, status: "uninitialized" as const };
+        }
+        logger.info(
+          {
+            sessionId,
+            actorOrganizationId: c.state.organizationId,
+            organizationId,
+            durationMs: roundDurationMs(organizationStartedAt),
+          },
+          "build_app_snapshot_organization_completed",
+        );
+        return { organizationId, snapshot: organizationState.snapshot, status: "ok" as const };
+      } catch (error) {
+        const message = errorMessage(error);
+        if (!message.includes("Actor not found")) {
+          logger.error(
+            {
+              sessionId,
+              actorOrganizationId: c.state.organizationId,
+              organizationId,
+              durationMs: roundDurationMs(organizationStartedAt),
+              errorMessage: message,
+              errorStack: error instanceof Error ? error.stack : undefined,
+            },
+            "build_app_snapshot_organization_failed",
+          );
+          throw error;
+        }
+        logger.info(
+          {
+            sessionId,
+            actorOrganizationId: c.state.organizationId,
+            organizationId,
+            durationMs: roundDurationMs(organizationStartedAt),
+          },
+          "build_app_snapshot_organization_missing",
+        );
+        return { organizationId, snapshot: null, status: "missing" as const };
+      }
+    }),
+  );
+
+  return {
+    organizations: results.map((result) => result.snapshot).filter((organization): organization is FoundryOrganization => organization !== null),
+    uninitializedOrganizationIds: results.filter((result) => result.status === "uninitialized").map((result) => result.organizationId),
+  };
+}
+
+export async function buildAppSnapshot(c: any, sessionId: string, allowOrganizationRepair = true): Promise<FoundryAppSnapshot> {
+  assertAppOrganization(c);
+  const startedAt = performance.now();
+  const auth = getBetterAuthService();
+  let authState = await auth.getAuthState(sessionId);
+  // Inline fallback: if the user is signed in but has no eligible organizations yet
+  // (e.g. first load after OAuth callback), sync GitHub orgs before building the snapshot.
+  if (authState?.user && parseEligibleOrganizationIds(authState.profile?.eligibleOrganizationIdsJson ?? "[]").length === 0) {
+    const token = await auth.getAccessTokenForSession(sessionId);
+    if (token?.accessToken) {
+      logger.info({ sessionId }, "build_app_snapshot_sync_orgs");
+      await syncGithubOrganizations(c, { sessionId, accessToken: token.accessToken });
+      authState = await auth.getAuthState(sessionId);
+    } else {
+      logger.warn({ sessionId }, "build_app_snapshot_no_access_token");
+    }
+  }
+
+  const session = authState?.session ?? null;
+  const user = authState?.user ?? null;
+  const profile = authState?.profile ?? null;
+  const currentSessionState = authState?.sessionState ?? null;
+  const githubAccount = authState?.accounts?.find((account: any) => account.providerId === "github") ?? null;
+  const eligibleOrganizationIds = parseEligibleOrganizationIds(profile?.eligibleOrganizationIdsJson ?? "[]");
+
+  logger.info(
+    {
+      sessionId,
+      organizationId: c.state.organizationId,
+      eligibleOrganizationCount: eligibleOrganizationIds.length,
+      eligibleOrganizationIds,
+    },
+    "build_app_snapshot_started",
+  );
+
+  let { organizations, uninitializedOrganizationIds } = await listSnapshotOrganizations(c, sessionId, eligibleOrganizationIds);
+
+  if (allowOrganizationRepair && uninitializedOrganizationIds.length > 0) {
+    const token = await auth.getAccessTokenForSession(sessionId);
+    if (token?.accessToken) {
+      logger.info(
+        {
+          sessionId,
+          organizationId: c.state.organizationId,
+          organizationIds: uninitializedOrganizationIds,
+        },
+        "build_app_snapshot_repairing_organizations",
+      );
+      await syncGithubOrganizationsInternal(c, { sessionId, accessToken: token.accessToken }, { broadcast: false });
+      return await buildAppSnapshot(c, sessionId, false);
+    }
+    logger.warn(
+      {
+        sessionId,
+        organizationId: c.state.organizationId,
+        organizationIds: uninitializedOrganizationIds,
+      },
+      "build_app_snapshot_repair_skipped_no_access_token",
+    );
+  }
+
+  const currentUser: FoundryUser | null = user
+    ? {
+        id: profile?.githubAccountId ?? githubAccount?.accountId ?? user.id,
+        name: user.name,
+        email: user.email,
+        githubLogin: profile?.githubLogin ?? "",
+        roleLabel: profile?.roleLabel ?? "GitHub user",
+        eligibleOrganizationIds,
+        defaultModel: profile?.defaultModel ?? DEFAULT_WORKSPACE_MODEL_ID,
+      }
+    : null;
+
+  const activeOrganizationId =
+    currentUser &&
+    currentSessionState?.activeOrganizationId &&
+    organizations.some((organization) => organization.id === currentSessionState.activeOrganizationId)
+      ? currentSessionState.activeOrganizationId
+      : currentUser && organizations.length === 1
+        ? (organizations[0]?.id ?? null)
+        : null;
+
+  const snapshot: FoundryAppSnapshot = {
+    auth: {
+      status: currentUser ? "signed_in" : "signed_out",
+      currentUserId: currentUser?.id ?? null,
+    },
+    activeOrganizationId,
+    onboarding: {
+      starterRepo: {
+        repoFullName: "rivet-dev/sandbox-agent",
+        repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+        status: profile?.starterRepoStatus ?? "pending",
+        starredAt: profile?.starterRepoStarredAt ?? null,
+        skippedAt: profile?.starterRepoSkippedAt ?? null,
+      },
+    },
+    users: currentUser ? [currentUser] : [],
+    organizations,
+  };
+
+  logger.info(
+    {
+      sessionId,
+      organizationId: c.state.organizationId,
+      eligibleOrganizationCount: eligibleOrganizationIds.length,
+      organizationCount: organizations.length,
+      durationMs: roundDurationMs(startedAt),
+    },
+    "build_app_snapshot_completed",
+  );
+
+  return snapshot;
+}
+
+export async function requireSignedInSession(c: any, sessionId: string) {
+  const auth = getBetterAuthService();
+  const authState = await auth.getAuthState(sessionId);
+  const user = authState?.user ?? null;
+  const profile = authState?.profile ?? null;
+  const githubAccount = authState?.accounts?.find((account: any) => account.providerId === "github") ?? null;
+  if (!authState?.session || !user?.email) {
+    throw new Error("User must be signed in");
+  }
+  const token = await auth.getAccessTokenForSession(sessionId);
+  return {
+    ...authState.session,
+    authUserId: user.id,
+    currentUserId: profile?.githubAccountId ?? githubAccount?.accountId ?? user.id,
+    currentUserName: user.name,
+    currentUserEmail: user.email,
+    currentUserGithubLogin: profile?.githubLogin ?? "",
+    currentUserRoleLabel: profile?.roleLabel ?? "GitHub user",
+    eligibleOrganizationIdsJson: profile?.eligibleOrganizationIdsJson ?? "[]",
+    githubAccessToken: token?.accessToken ?? null,
+    githubScope: (token?.scopes ?? []).join(","),
+    starterRepoStatus: profile?.starterRepoStatus ?? "pending",
+    starterRepoStarredAt: profile?.starterRepoStarredAt ?? null,
+    starterRepoSkippedAt: profile?.starterRepoSkippedAt ?? null,
+  };
+}
+
+export function requireEligibleOrganization(session: any, organizationId: string): void {
+  const eligibleOrganizationIds = parseEligibleOrganizationIds(session.eligibleOrganizationIdsJson);
+  if (!eligibleOrganizationIds.includes(organizationId)) {
+    throw new Error(`Organization ${organizationId} is not available in this app session`);
+  }
+}
+
+async function upsertStripeLookupEntries(c: any, organizationId: string, customerId: string | null, subscriptionId: string | null): Promise<void> {
+  assertAppOrganization(c);
+  const now = Date.now();
+  for (const lookupKey of [customerId ? `customer:${customerId}` : null, subscriptionId ? `subscription:${subscriptionId}` : null]) {
+    if (!lookupKey) {
+      continue;
+    }
+    await c.db
+      .insert(stripeLookup)
+      .values({
+        lookupKey,
+        organizationId,
+        updatedAt: now,
+      })
+      .onConflictDoUpdate({
+        target: stripeLookup.lookupKey,
+        set: {
+          organizationId,
+          updatedAt: now,
+        },
+      })
+      .run();
+  }
+}
+
+async function findOrganizationIdForStripeEvent(c: any, customerId: string | null, subscriptionId: string | null): Promise<string | null> {
+  assertAppOrganization(c);
+  const customerLookup = customerId
+    ? await c.db
+        .select({ organizationId: stripeLookup.organizationId })
+        .from(stripeLookup)
+        .where(eq(stripeLookup.lookupKey, `customer:${customerId}`))
+        .get()
+    : null;
+  if (customerLookup?.organizationId) {
+    return customerLookup.organizationId;
+  }
+
+  const subscriptionLookup = subscriptionId
+    ? await c.db
+        .select({ organizationId: stripeLookup.organizationId })
+        .from(stripeLookup)
+        .where(eq(stripeLookup.lookupKey, `subscription:${subscriptionId}`))
+        .get()
+    : null;
+  return subscriptionLookup?.organizationId ?? null;
+}
+
+async function safeListOrganizations(accessToken: string): Promise<any[]> {
+  const { appShell } = getActorRuntimeContext();
+  try {
+    return await appShell.github.listOrganizations(accessToken);
+  } catch (error) {
+    if (error instanceof GitHubAppError && error.status === 403) {
+      return [];
+    }
+    throw error;
+  }
+}
+
+async function safeListInstallations(accessToken: string): Promise<any[]> {
+  const { appShell } = getActorRuntimeContext();
+  try {
+    return await appShell.github.listInstallations(accessToken);
+  } catch (error) {
+    if (error instanceof GitHubAppError && (error.status === 403 || error.status === 404)) {
+      return [];
+    }
+    throw error;
+  }
+}
+
+/**
+ * Slow path: list GitHub orgs + installations, sync each org organization,
+ * and update the session's eligible organization list. Called from the
+ * workflow queue so it runs in the background after the callback has
+ * already returned a redirect to the browser.
+ */
+export async function syncGithubOrganizations(c: any, input: { sessionId: string; accessToken: string }): Promise<void> {
+  await syncGithubOrganizationsInternal(c, input, { broadcast: true });
+}
+
+async function syncGithubOrganizationsInternal(c: any, input: { sessionId: string; accessToken: string }, options: { broadcast: boolean }): Promise<void> {
+  assertAppOrganization(c);
+  const auth = getBetterAuthService();
+  const { appShell } = getActorRuntimeContext();
+  const { sessionId, accessToken } = input;
+  const authState = await auth.getAuthState(sessionId);
+  if (!authState?.user) {
+    throw new Error("User must be signed in");
+  }
+  const viewer = await appShell.github.getViewer(accessToken);
+  const organizations = await safeListOrganizations(accessToken);
+  const installations = await safeListInstallations(accessToken);
+  const authUserId = authState.user.id;
+  const githubUserId = String(viewer.id);
+
+  const linkedOrganizationIds: string[] = [];
+  const accounts = [
+    {
+      githubAccountId: viewer.id,
+      githubLogin: viewer.login,
+      githubAccountType: "User",
+      kind: "personal" as const,
+      displayName: viewer.name || viewer.login,
+    },
+    ...organizations.map((organization) => ({
+      githubAccountId: organization.id,
+      githubLogin: organization.login,
+      githubAccountType: "Organization",
+      kind: "organization" as const,
+      displayName: organization.name || organization.login,
+    })),
+  ];
+
+  for (const account of accounts) {
+    const organizationId = organizationOrganizationId(account.kind, account.githubLogin);
+    const installation = installations.find((candidate) => candidate.accountLogin === account.githubLogin) ?? null;
+    const organization = await getOrCreateOrganization(c, organizationId);
+    await organization.send(
+      organizationWorkflowQueueName("organization.command.github.organization_shell.sync_from_github"),
+      {
+        userId: githubUserId,
+        userName: viewer.name || viewer.login,
+        userEmail: viewer.email ?? `${viewer.login}@users.noreply.github.com`,
+        githubUserLogin: viewer.login,
+        githubAccountId: account.githubAccountId,
+        githubLogin: account.githubLogin,
+        githubAccountType: account.githubAccountType,
+        kind: account.kind,
+        displayName: account.displayName,
+        installationId: installation?.id ?? null,
+        appConfigured: appShell.github.isAppConfigured(),
+      },
+      { wait: true, timeout: 10_000 },
+    );
+    linkedOrganizationIds.push(organizationId);
+  }
+
+  const activeOrganizationId =
+    authState.sessionState?.activeOrganizationId && linkedOrganizationIds.includes(authState.sessionState.activeOrganizationId)
+      ? authState.sessionState.activeOrganizationId
+      : linkedOrganizationIds.length === 1
+        ? (linkedOrganizationIds[0] ?? null)
+        : null;
+
+  await auth.setActiveOrganization(sessionId, activeOrganizationId);
+  await auth.upsertUserProfile(authUserId, {
+    githubAccountId: String(viewer.id),
+    githubLogin: viewer.login,
+    roleLabel: "GitHub user",
+    eligibleOrganizationIdsJson: encodeEligibleOrganizationIds(linkedOrganizationIds),
+  });
+  if (!options.broadcast) {
+    return;
+  }
+  c.broadcast("appUpdated", {
+    type: "appUpdated",
+    snapshot: await buildAppSnapshot(c, sessionId),
+  });
+}
+
+async function readOrganizationProfileRow(c: any) {
+  assertOrganizationShell(c);
+  return await c.db.select().from(organizationProfile).where(eq(organizationProfile.id, PROFILE_ROW_ID)).get();
+}
+
+async function requireOrganizationProfileRow(c: any) {
+  const row = await readOrganizationProfileRow(c);
+  if (!row) {
+    throw new Error(`Organization profile is not initialized for organization ${c.state.organizationId}`);
+  }
+  return row;
+}
+
+async function listOrganizationMembers(c: any): Promise<FoundryOrganizationMember[]> {
+  assertOrganizationShell(c);
+  const rows = await c.db.select().from(organizationMembers).orderBy(organizationMembers.role, organizationMembers.name).all();
+  return rows.map((row) => ({
+    id: row.id,
+    name: row.name,
+    email: row.email,
+    role: row.role,
+    state: row.state,
+  }));
+}
+
+async function listOrganizationSeatAssignments(c: any): Promise<string[]> {
+  assertOrganizationShell(c);
+  const rows = await c.db.select({ email: seatAssignments.email }).from(seatAssignments).orderBy(seatAssignments.email).all();
+  return rows.map((row) => row.email);
+}
+
+async function listOrganizationInvoices(c: any): Promise<FoundryBillingState["invoices"]> {
+  assertOrganizationShell(c);
+  const rows = await c.db.select().from(invoices).orderBy(desc(invoices.issuedAt), desc(invoices.createdAt)).all();
+  return rows.map((row) => ({
+    id: row.id,
+    label: row.label,
+    issuedAt: row.issuedAt,
+    amountUsd: row.amountUsd,
+    status: row.status,
+  }));
+}
+
+async function listOrganizationRepoCatalog(c: any): Promise<string[]> {
+  assertOrganizationShell(c);
+  try {
+    const githubData = await getOrCreateGithubData(c, c.state.organizationId);
+    const rows = await githubData.listRepositories({});
+    return rows.map((row: any) => repoLabelFromRemote(row.cloneUrl)).sort((a: string, b: string) => a.localeCompare(b));
+  } catch {
+    return [];
+  }
+}
+
+export async function buildOrganizationState(c: any) {
+  const startedAt = performance.now();
+  const row = await requireOrganizationProfileRow(c);
+  return await buildOrganizationStateFromRow(c, row, startedAt);
+}
+
+export async function buildOrganizationStateIfInitialized(c: any) {
+  const startedAt = performance.now();
+  const row = await readOrganizationProfileRow(c);
+  if (!row) {
+    return null;
+  }
+  return await buildOrganizationStateFromRow(c, row, startedAt);
+}
+
+async function buildOrganizationStateFromRow(c: any, row: any, startedAt: number) {
+  const repoCatalog = await listOrganizationRepoCatalog(c);
+  const members = await listOrganizationMembers(c);
+  const seatAssignmentEmails = await listOrganizationSeatAssignments(c);
+  const invoiceRows = await listOrganizationInvoices(c);
+
+  const state = {
+    id: c.state.organizationId,
+    organizationId: c.state.organizationId,
+    kind: row.kind,
+    githubLogin: row.githubLogin,
+    githubInstallationId: row.githubInstallationId ?? null,
+    stripeCustomerId: row.stripeCustomerId ?? null,
+    stripeSubscriptionId: row.stripeSubscriptionId ?? null,
+    stripePriceId: row.stripePriceId ?? null,
+    billingPlanId: row.billingPlanId,
+    snapshot: {
+      id: c.state.organizationId,
+      organizationId: c.state.organizationId,
+      kind: row.kind,
+      settings: {
+        displayName: row.displayName,
+        slug: row.slug,
+        primaryDomain: row.primaryDomain,
+        seatAccrualMode: "first_prompt",
+        autoImportRepos: row.autoImportRepos === 1,
+      },
+      github: {
+        connectedAccount: row.githubConnectedAccount,
+        installationStatus: row.githubInstallationStatus,
+        syncStatus: row.githubSyncStatus ?? legacyRepoImportStatusToGithubSyncStatus(row.repoImportStatus),
+        importedRepoCount: repoCatalog.length,
+        lastSyncLabel: row.githubLastSyncLabel,
+        lastSyncAt: row.githubLastSyncAt ?? null,
+        lastWebhookAt: row.githubLastWebhookAt ?? null,
+        lastWebhookEvent: row.githubLastWebhookEvent ?? "",
+        syncGeneration: row.githubSyncGeneration ?? 0,
+        syncPhase: row.githubSyncPhase ?? null,
+        processedRepositoryCount: row.githubProcessedRepositoryCount ?? 0,
+        totalRepositoryCount: row.githubTotalRepositoryCount ?? 0,
+      },
+      billing: {
+        planId: row.billingPlanId,
+        status: row.billingStatus,
+        seatsIncluded: row.billingSeatsIncluded,
+        trialEndsAt: row.billingTrialEndsAt,
+        renewalAt: row.billingRenewalAt,
+        stripeCustomerId: row.stripeCustomerId ?? "",
+        paymentMethodLabel: row.billingPaymentMethodLabel,
+        invoices: invoiceRows,
+      },
+      members,
+      seatAssignments: seatAssignmentEmails,
+      repoCatalog,
+    },
+  };
+
+  logger.info(
+    {
+      organizationId: c.state.organizationId,
+      githubLogin: row.githubLogin,
+      repoCount: repoCatalog.length,
+      memberCount: members.length,
+      seatAssignmentCount: seatAssignmentEmails.length,
+      invoiceCount: invoiceRows.length,
+      durationMs: roundDurationMs(startedAt),
+    },
+    "build_organization_state_completed",
+  );
+
+  return state;
+}
+
+async function applySubscriptionState(
+  organization: any,
+  subscription: {
+    id: string;
+    customerId: string;
+    priceId: string | null;
+    status: string;
+    cancelAtPeriodEnd: boolean;
+    currentPeriodEnd: number | null;
+    trialEnd: number | null;
+    defaultPaymentMethodLabel: string;
+  },
+  fallbackPlanId: FoundryBillingPlanId,
+): Promise<void> {
+  await organization.send(
+    organizationWorkflowQueueName("organization.command.billing.stripe_subscription.apply"),
+    { subscription, fallbackPlanId },
+    { wait: true, timeout: 10_000 },
+  );
+}
+
+export const organizationAppActions = {
+  async createAppCheckoutSession(c: any, input: { sessionId: string; organizationId: string; planId: FoundryBillingPlanId }): Promise<{ url: string }> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const { appShell } = getActorRuntimeContext();
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    const organizationState = await getOrganizationState(organizationHandle);
+
+    if (input.planId === "free") {
+      await organizationHandle.send(
+        organizationWorkflowQueueName("organization.command.billing.free_plan.apply"),
+        { clearSubscription: false },
+        { wait: true, timeout: 10_000 },
+      );
+      return {
+        url: `${appShell.appUrl}/organizations/${input.organizationId}/billing`,
+      };
+    }
+
+    if (!appShell.stripe.isConfigured()) {
+      throw new Error("Stripe is not configured");
+    }
+
+    let customerId = organizationState.stripeCustomerId;
+    if (!customerId) {
+      customerId = (
+        await appShell.stripe.createCustomer({
+          organizationId: input.organizationId,
+          displayName: organizationState.snapshot.settings.displayName,
+          email: session.currentUserEmail,
+        })
+      ).id;
+      await organizationHandle.send(
+        organizationWorkflowQueueName("organization.command.billing.stripe_customer.apply"),
+        { customerId },
+        { wait: true, timeout: 10_000 },
+      );
+      await upsertStripeLookupEntries(c, input.organizationId, customerId, null);
+    }
+
+    return {
+      url: await appShell.stripe
+        .createCheckoutSession({
+          organizationId: input.organizationId,
+          customerId,
+          customerEmail: session.currentUserEmail,
+          planId: input.planId,
+          successUrl: `${appShell.apiUrl}/v1/billing/checkout/complete?organizationId=${encodeURIComponent(
+            input.organizationId,
+          )}&session_id={CHECKOUT_SESSION_ID}`,
+          cancelUrl: `${appShell.appUrl}/organizations/${input.organizationId}/billing`,
+        })
+        .then((checkout) => checkout.url),
+    };
+  },
+
+  async finalizeAppCheckoutSession(c: any, input: { sessionId: string; organizationId: string; checkoutSessionId: string }): Promise<{ redirectTo: string }> {
+    assertAppOrganization(c);
+    const { appShell } = getActorRuntimeContext();
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    const organizationState = await getOrganizationState(organizationHandle);
+    const completion = await appShell.stripe.retrieveCheckoutCompletion(input.checkoutSessionId);
+
+    if (completion.customerId) {
+      await organizationHandle.send(
+        organizationWorkflowQueueName("organization.command.billing.stripe_customer.apply"),
+        { customerId: completion.customerId },
+        { wait: true, timeout: 10_000 },
+      );
+    }
+    await upsertStripeLookupEntries(c, input.organizationId, completion.customerId, completion.subscriptionId);
+
+    if (completion.subscriptionId) {
+      const subscription = await appShell.stripe.retrieveSubscription(completion.subscriptionId);
+      await applySubscriptionState(organizationHandle, subscription, completion.planId ?? organizationState.billingPlanId);
+    }
+
+    if (completion.paymentMethodLabel) {
+      await organizationHandle.send(
+        organizationWorkflowQueueName("organization.command.billing.payment_method.set"),
+        { label: completion.paymentMethodLabel },
+        { wait: true, timeout: 10_000 },
+      );
+    }
+
+    return {
+      redirectTo: `${appShell.appUrl}/organizations/${input.organizationId}/billing`,
+    };
+  },
+
+  async createAppBillingPortalSession(c: any, input: { sessionId: string; organizationId: string }): Promise<{ url: string }> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const { appShell } = getActorRuntimeContext();
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    const organizationState = await getOrganizationState(organizationHandle);
+    if (!organizationState.stripeCustomerId) {
+      throw new Error("Stripe customer is not available for this organization");
+    }
+    const portal = await appShell.stripe.createPortalSession({
+      customerId: organizationState.stripeCustomerId,
+      returnUrl: `${appShell.appUrl}/organizations/${input.organizationId}/billing`,
+    });
+    return { url: portal.url };
+  },
+
+  async cancelAppScheduledRenewal(c: any, input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const { appShell } = getActorRuntimeContext();
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    const organizationState = await getOrganizationState(organizationHandle);
+
+    if (organizationState.stripeSubscriptionId && appShell.stripe.isConfigured()) {
+      const subscription = await appShell.stripe.updateSubscriptionCancellation(organizationState.stripeSubscriptionId, true);
+      await applySubscriptionState(organizationHandle, subscription, organizationState.billingPlanId);
+      await upsertStripeLookupEntries(c, input.organizationId, subscription.customerId ?? organizationState.stripeCustomerId, subscription.id);
+    } else {
+      await organizationHandle.send(
+        organizationWorkflowQueueName("organization.command.billing.status.set"),
+        { status: "scheduled_cancel" },
+        { wait: true, timeout: 10_000 },
+      );
+    }
+
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async resumeAppSubscription(c: any, input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const { appShell } = getActorRuntimeContext();
+    const organizationHandle = await getOrCreateOrganization(c, input.organizationId);
+    const organizationState = await getOrganizationState(organizationHandle);
+
+    if (organizationState.stripeSubscriptionId && appShell.stripe.isConfigured()) {
+      const subscription = await appShell.stripe.updateSubscriptionCancellation(organizationState.stripeSubscriptionId, false);
+      await applySubscriptionState(organizationHandle, subscription, organizationState.billingPlanId);
+      await upsertStripeLookupEntries(c, input.organizationId, subscription.customerId ?? organizationState.stripeCustomerId, subscription.id);
+    } else {
+      await organizationHandle.send(
+        organizationWorkflowQueueName("organization.command.billing.status.set"),
+        { status: "active" },
+        { wait: true, timeout: 10_000 },
+      );
+    }
+
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async recordAppSeatUsage(c: any, input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot> {
+    assertAppOrganization(c);
+    const session = await requireSignedInSession(c, input.sessionId);
+    requireEligibleOrganization(session, input.organizationId);
+    const organization = await getOrCreateOrganization(c, input.organizationId);
+    await organization.send(
+      organizationWorkflowQueueName("organization.command.billing.seat_usage.record"),
+      { email: session.currentUserEmail },
+      { wait: true, timeout: 10_000 },
+    );
+    return await buildAppSnapshot(c, input.sessionId);
+  },
+
+  async handleAppStripeWebhook(c: any, input: { payload: string; signatureHeader: string | null }): Promise<{ ok: true }> {
+    assertAppOrganization(c);
+    const { appShell } = getActorRuntimeContext();
+    const event = appShell.stripe.verifyWebhookEvent(input.payload, input.signatureHeader);
+
+    if (event.type === "checkout.session.completed") {
+      const object = event.data.object as Record<string, unknown>;
+      const organizationId =
+        stringFromMetadata(object.metadata, "organizationId") ??
+        (await findOrganizationIdForStripeEvent(
+          c,
+          typeof object.customer === "string" ? object.customer : null,
+          typeof object.subscription === "string" ? object.subscription : null,
+        ));
+      if (organizationId) {
+        const organization = await getOrCreateOrganization(c, organizationId);
+        if (typeof object.customer === "string") {
+          await organization.send(
+            organizationWorkflowQueueName("organization.command.billing.stripe_customer.apply"),
+            { customerId: object.customer },
+            { wait: true, timeout: 10_000 },
+          );
+        }
+        await upsertStripeLookupEntries(
+          c,
+          organizationId,
+          typeof object.customer === "string" ? object.customer : null,
+          typeof object.subscription === "string" ? object.subscription : null,
+        );
+      }
+      return { ok: true };
+    }
+
+    if (event.type === "customer.subscription.updated" || event.type === "customer.subscription.created") {
+      const subscription = stripeWebhookSubscription(event);
+      const organizationId = await findOrganizationIdForStripeEvent(c, subscription.customerId, subscription.id);
+      if (organizationId) {
+        const organizationHandle = await getOrCreateOrganization(c, organizationId);
+        const organizationState = await getOrganizationState(organizationHandle);
+        await applySubscriptionState(
+          organizationHandle,
+          subscription,
+          appShell.stripe.planIdForPriceId(subscription.priceId ?? "") ?? organizationState.billingPlanId,
+        );
+        await upsertStripeLookupEntries(c, organizationId, subscription.customerId, subscription.id);
+      }
+      return { ok: true };
+    }
+
+    if (event.type === "customer.subscription.deleted") {
+      const subscription = stripeWebhookSubscription(event);
+      const organizationId = await findOrganizationIdForStripeEvent(c, subscription.customerId, subscription.id);
+      if (organizationId) {
+        const organization = await getOrCreateOrganization(c, organizationId);
+        await organization.send(
+          organizationWorkflowQueueName("organization.command.billing.free_plan.apply"),
+          { clearSubscription: true },
+          { wait: true, timeout: 10_000 },
+        );
+      }
+      return { ok: true };
+    }
+
+    if (event.type === "invoice.paid" || event.type === "invoice.payment_failed") {
+      const invoice = event.data.object as Record<string, unknown>;
+      const organizationId = await findOrganizationIdForStripeEvent(c, typeof invoice.customer === "string" ? invoice.customer : null, null);
+      if (organizationId) {
+        const organization = await getOrCreateOrganization(c, organizationId);
+        const rawAmount = typeof invoice.amount_paid === "number" ? invoice.amount_paid : invoice.amount_due;
+        const amountUsd = Math.round((typeof rawAmount === "number" ? rawAmount : 0) / 100);
+        await organization.send(
+          organizationWorkflowQueueName("organization.command.billing.invoice.upsert"),
+          {
+            id: String(invoice.id),
+            label: typeof invoice.number === "string" ? `Invoice ${invoice.number}` : "Stripe invoice",
+            issuedAt: formatUnixDate(typeof invoice.created === "number" ? invoice.created : Math.floor(Date.now() / 1000)),
+            amountUsd: Number.isFinite(amountUsd) ? amountUsd : 0,
+            status: event.type === "invoice.paid" ? "paid" : "open",
+          },
+          { wait: true, timeout: 10_000 },
+        );
+      }
+    }
+
+    return { ok: true };
+  },
+
+  async handleAppGithubWebhook(c: any, input: { payload: string; signatureHeader: string | null; eventHeader: string | null }): Promise<{ ok: true }> {
+    assertAppOrganization(c);
+    const { appShell } = getActorRuntimeContext();
+    const { event, body } = appShell.github.verifyWebhookEvent(input.payload, input.signatureHeader, input.eventHeader);
+
+    const accountLogin = body.installation?.account?.login ?? body.repository?.owner?.login ?? body.organization?.login ?? null;
+    const accountType = body.installation?.account?.type ?? (body.organization?.login ? "Organization" : null);
+    if (!accountLogin) {
+      githubWebhookLogger.info(
+        {
+          event,
+          action: body.action ?? null,
+          reason: "missing_installation_account",
+        },
+        "ignored",
+      );
+      return { ok: true };
+    }
+
+    const kind: FoundryOrganization["kind"] = accountType === "User" ? "personal" : "organization";
+    const organizationId = organizationOrganizationId(kind, accountLogin);
+    const receivedAt = Date.now();
+    const organization = await getOrCreateOrganization(c, organizationId);
+    await organization.send(
+      organizationWorkflowQueueName("organization.command.github.webhook_receipt.record"),
+      { organizationId, event, action: body.action ?? null, receivedAt },
+      { wait: false },
+    );
+    const githubData = await getOrCreateGithubData(c, organizationId);
+
+    if (event === "installation" && (body.action === "created" || body.action === "deleted" || body.action === "suspend" || body.action === "unsuspend")) {
+      githubWebhookLogger.info(
+        {
+          event,
+          action: body.action,
+          accountLogin,
+          organizationId,
+        },
+        "installation_event",
+      );
+      if (body.action === "deleted") {
+        await githubData.send(
+          githubDataWorkflowQueueName("githubData.command.clearState"),
+          { connectedAccount: accountLogin, installationStatus: "install_required", installationId: null, label: "GitHub App installation removed" },
+          { wait: false },
+        );
+      } else if (body.action === "created") {
+        void githubData
+          .send(
+            githubDataWorkflowQueueName("githubData.command.syncRepos"),
+            {
+              connectedAccount: accountLogin,
+              installationStatus: "connected",
+              installationId: body.installation?.id ?? null,
+              githubLogin: accountLogin,
+              kind,
+              label: "Syncing GitHub data from installation webhook...",
+            },
+            { wait: false },
+          )
+          .catch(() => {});
+      } else if (body.action === "suspend") {
+        await githubData.send(
+          githubDataWorkflowQueueName("githubData.command.clearState"),
+          {
+            connectedAccount: accountLogin,
+            installationStatus: "reconnect_required",
+            installationId: body.installation?.id ?? null,
+            label: "GitHub App installation suspended",
+          },
+          { wait: false },
+        );
+      } else if (body.action === "unsuspend") {
+        void githubData
+          .send(
+            githubDataWorkflowQueueName("githubData.command.syncRepos"),
+            {
+              connectedAccount: accountLogin,
+              installationStatus: "connected",
+              installationId: body.installation?.id ?? null,
+              githubLogin: accountLogin,
+              kind,
+              label: "Resyncing GitHub data after unsuspend...",
+            },
+            { wait: false },
+          )
+          .catch(() => {});
+      }
+      return { ok: true };
+    }
+
+    if (event === "installation_repositories") {
+      githubWebhookLogger.info(
+        {
+          event,
+          action: body.action ?? null,
+          accountLogin,
+          organizationId,
+          repositoriesAdded: body.repositories_added?.length ?? 0,
+          repositoriesRemoved: body.repositories_removed?.length ?? 0,
+        },
+        "repository_membership_changed",
+      );
+      void githubData
+        .send(
+          githubDataWorkflowQueueName("githubData.command.syncRepos"),
+          {
+            connectedAccount: accountLogin,
+            installationStatus: "connected",
+            installationId: body.installation?.id ?? null,
+            githubLogin: accountLogin,
+            kind,
+            label: "Resyncing GitHub data after repository access change...",
+          },
+          { wait: false },
+        )
+        .catch(() => {});
+      return { ok: true };
+    }
+
+    if (
+      event === "push" ||
+      event === "pull_request" ||
+      event === "pull_request_review" ||
+      event === "pull_request_review_comment" ||
+      event === "check_run" ||
+      event === "check_suite" ||
+      event === "status" ||
+      event === "create" ||
+      event === "delete"
+    ) {
+      const repoFullName = body.repository?.full_name;
+      if (repoFullName) {
+        githubWebhookLogger.info(
+          {
+            event,
+            action: body.action ?? null,
+            accountLogin,
+            organizationId,
+            repoFullName,
+          },
+          "repository_event",
+        );
+        if (event === "pull_request" && body.repository?.clone_url && body.pull_request) {
+          await githubData.send(
+            githubDataWorkflowQueueName("githubData.command.handlePullRequestWebhook"),
+            {
+              connectedAccount: accountLogin,
+              installationStatus: "connected",
+              installationId: body.installation?.id ?? null,
+              repository: {
+                fullName: body.repository.full_name,
+                cloneUrl: body.repository.clone_url,
+                private: Boolean(body.repository.private),
+              },
+              pullRequest: {
+                number: body.pull_request.number,
+                status: body.pull_request.draft ? "draft" : "ready",
+                title: body.pull_request.title ?? "",
+                body: body.pull_request.body ?? null,
+                state: body.pull_request.state ?? "open",
+                url: body.pull_request.html_url ?? `https://github.com/${body.repository.full_name}/pull/${body.pull_request.number}`,
+                headRefName: body.pull_request.head?.ref ?? "",
+                baseRefName: body.pull_request.base?.ref ?? "",
+                authorLogin: body.pull_request.user?.login ?? null,
+                isDraft: Boolean(body.pull_request.draft),
+                merged: Boolean(body.pull_request.merged),
+              },
+            },
+            { wait: false },
+          );
+        }
+      }
+      return { ok: true };
+    }
+
+    githubWebhookLogger.info(
+      {
+        event,
+        action: body.action ?? null,
+        accountLogin,
+        organizationId,
+      },
+      "unhandled_event",
+    );
+    return { ok: true };
+  },
+};
+
+export async function syncOrganizationShellFromGithubMutation(
+  c: any,
+  input: {
+    userId: string;
+    userName: string;
+    userEmail: string;
+    githubUserLogin: string;
+    githubAccountId: string;
+    githubLogin: string;
+    githubAccountType: string;
+    kind: FoundryOrganization["kind"];
+    displayName: string;
+    installationId: number | null;
+    appConfigured: boolean;
+  },
+): Promise<{ organizationId: string }> {
+  assertOrganizationShell(c);
+  const now = Date.now();
+  const existing = await readOrganizationProfileRow(c);
+  const slug = existing?.slug ?? slugify(input.githubLogin);
+  const organizationId = organizationOrganizationId(input.kind, input.githubLogin);
+  if (organizationId !== c.state.organizationId) {
+    throw new Error(`Organization actor mismatch: actor=${c.state.organizationId} github=${organizationId}`);
+  }
+
+  const installationStatus =
+    input.kind === "personal" ? "connected" : input.installationId ? "connected" : input.appConfigured ? "install_required" : "reconnect_required";
+  const syncStatus = existing?.githubSyncStatus ?? legacyRepoImportStatusToGithubSyncStatus(existing?.repoImportStatus);
+  const lastSyncLabel =
+    syncStatus === "synced"
+      ? existing.githubLastSyncLabel
+      : installationStatus === "connected"
+        ? "Waiting for first import"
+        : installationStatus === "install_required"
+          ? "GitHub App installation required"
+          : "GitHub App configuration incomplete";
+  const hasStripeBillingState = Boolean(existing?.stripeCustomerId || existing?.stripeSubscriptionId || existing?.stripePriceId);
+  const defaultBillingPlanId = input.kind === "personal" || !hasStripeBillingState ? "free" : (existing?.billingPlanId ?? "team");
+  const defaultSeatsIncluded = input.kind === "personal" || !hasStripeBillingState ? 1 : (existing?.billingSeatsIncluded ?? 5);
+  const defaultPaymentMethodLabel =
+    input.kind === "personal"
+      ? "No card required"
+      : hasStripeBillingState
+        ? (existing?.billingPaymentMethodLabel ?? "Payment method on file")
+        : "No payment method on file";
+
+  await c.db
+    .insert(organizationProfile)
+    .values({
+      id: PROFILE_ROW_ID,
+      kind: input.kind,
+      githubAccountId: input.githubAccountId,
+      githubLogin: input.githubLogin,
+      githubAccountType: input.githubAccountType,
+      displayName: input.displayName,
+      slug,
+      defaultModel: existing?.defaultModel ?? DEFAULT_WORKSPACE_MODEL_ID,
+      primaryDomain: existing?.primaryDomain ?? (input.kind === "personal" ? "personal" : `${slug}.github`),
+      autoImportRepos: existing?.autoImportRepos ?? 1,
+      repoImportStatus: existing?.repoImportStatus ?? "not_started",
+      githubConnectedAccount: input.githubLogin,
+      githubInstallationStatus: installationStatus,
+      githubSyncStatus: syncStatus,
+      githubInstallationId: input.installationId,
+      githubLastSyncLabel: lastSyncLabel,
+      githubLastSyncAt: existing?.githubLastSyncAt ?? null,
+      githubSyncGeneration: existing?.githubSyncGeneration ?? 0,
+      githubSyncPhase: existing?.githubSyncPhase ?? null,
+      githubProcessedRepositoryCount: existing?.githubProcessedRepositoryCount ?? 0,
+      githubTotalRepositoryCount: existing?.githubTotalRepositoryCount ?? 0,
+      stripeCustomerId: existing?.stripeCustomerId ?? null,
+      stripeSubscriptionId: existing?.stripeSubscriptionId ?? null,
+      stripePriceId: existing?.stripePriceId ?? null,
+      billingPlanId: defaultBillingPlanId,
+      billingStatus: existing?.billingStatus ?? "active",
+      billingSeatsIncluded: defaultSeatsIncluded,
+      billingTrialEndsAt: existing?.billingTrialEndsAt ?? null,
+      billingRenewalAt: existing?.billingRenewalAt ?? null,
+      billingPaymentMethodLabel: defaultPaymentMethodLabel,
+      createdAt: existing?.createdAt ?? now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: organizationProfile.id,
+      set: {
+        kind: input.kind,
+        githubAccountId: input.githubAccountId,
+        githubLogin: input.githubLogin,
+        githubAccountType: input.githubAccountType,
+        displayName: input.displayName,
+        githubConnectedAccount: input.githubLogin,
+        githubInstallationStatus: installationStatus,
+        githubSyncStatus: syncStatus,
+        githubInstallationId: input.installationId,
+        githubLastSyncLabel: lastSyncLabel,
+        githubLastSyncAt: existing?.githubLastSyncAt ?? null,
+        githubSyncGeneration: existing?.githubSyncGeneration ?? 0,
+        githubSyncPhase: existing?.githubSyncPhase ?? null,
+        githubProcessedRepositoryCount: existing?.githubProcessedRepositoryCount ?? 0,
+        githubTotalRepositoryCount: existing?.githubTotalRepositoryCount ?? 0,
+        billingPlanId: defaultBillingPlanId,
+        billingSeatsIncluded: defaultSeatsIncluded,
+        billingPaymentMethodLabel: defaultPaymentMethodLabel,
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  await c.db
+    .insert(organizationMembers)
+    .values({
+      id: input.userId,
+      name: input.userName,
+      email: input.userEmail,
+      role: input.kind === "personal" ? "owner" : "admin",
+      state: "active",
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: organizationMembers.id,
+      set: {
+        name: input.userName,
+        email: input.userEmail,
+        role: input.kind === "personal" ? "owner" : "admin",
+        state: "active",
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  // Auto-trigger github-data sync when the org has a connected installation
+  // but hasn't synced yet. This handles the common case where a personal
+  // account or an org with an existing GitHub App installation signs in for
+  // the first time on a fresh DB — the installation webhook already fired
+  // before the org actor existed, so we kick off the sync here instead.
+  const needsInitialSync = installationStatus === "connected" && syncStatus === "pending";
+  if (needsInitialSync) {
+    const githubData = await getOrCreateGithubData(c, organizationId);
+    void githubData
+      .send(
+        githubDataWorkflowQueueName("githubData.command.syncRepos"),
+        {
+          connectedAccount: input.githubLogin,
+          installationStatus: "connected",
+          installationId: input.installationId,
+          githubLogin: input.githubLogin,
+          kind: input.kind,
+          label: "Initial repository sync...",
+        },
+        { wait: false },
+      )
+      .catch(() => {});
+  }
+
+  return { organizationId };
+}
+
+export async function updateOrganizationShellProfileMutation(
+  c: any,
+  input: Pick<UpdateFoundryOrganizationProfileInput, "displayName" | "slug" | "primaryDomain">,
+): Promise<void> {
+  assertOrganizationShell(c);
+  const existing = await requireOrganizationProfileRow(c);
+  await c.db
+    .update(organizationProfile)
+    .set({
+      displayName: input.displayName.trim() || existing.displayName,
+      slug: input.slug.trim() || existing.slug,
+      primaryDomain: input.primaryDomain.trim() || existing.primaryDomain,
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, PROFILE_ROW_ID))
+    .run();
+}
+
+export async function markOrganizationSyncStartedMutation(c: any, input: { label: string }): Promise<void> {
+  assertOrganizationShell(c);
+  await c.db
+    .update(organizationProfile)
+    .set({
+      githubSyncStatus: "syncing",
+      githubLastSyncLabel: input.label,
+      githubSyncPhase: "discovering_repositories",
+      githubProcessedRepositoryCount: 0,
+      githubTotalRepositoryCount: 0,
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, PROFILE_ROW_ID))
+    .run();
+}
+
+export async function applyOrganizationStripeCustomerMutation(c: any, input: { customerId: string }): Promise<void> {
+  assertOrganizationShell(c);
+  await c.db
+    .update(organizationProfile)
+    .set({
+      stripeCustomerId: input.customerId,
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, PROFILE_ROW_ID))
+    .run();
+}
+
+export async function applyOrganizationStripeSubscriptionMutation(
+  c: any,
+  input: {
+    subscription: {
+      id: string;
+      customerId: string;
+      priceId: string | null;
+      status: string;
+      cancelAtPeriodEnd: boolean;
+      currentPeriodEnd: number | null;
+      trialEnd: number | null;
+      defaultPaymentMethodLabel: string;
+    };
+    fallbackPlanId: FoundryBillingPlanId;
+  },
+): Promise<void> {
+  assertOrganizationShell(c);
+  const { appShell } = getActorRuntimeContext();
+  const planId = appShell.stripe.planIdForPriceId(input.subscription.priceId ?? "") ?? input.fallbackPlanId;
+  await c.db
+    .update(organizationProfile)
+    .set({
+      stripeCustomerId: input.subscription.customerId || null,
+      stripeSubscriptionId: input.subscription.id || null,
+      stripePriceId: input.subscription.priceId,
+      billingPlanId: planId,
+      billingStatus: stripeStatusToBillingStatus(input.subscription.status, input.subscription.cancelAtPeriodEnd),
+      billingSeatsIncluded: seatsIncludedForPlan(planId),
+      billingTrialEndsAt: input.subscription.trialEnd ? new Date(input.subscription.trialEnd * 1000).toISOString() : null,
+      billingRenewalAt: input.subscription.currentPeriodEnd ? new Date(input.subscription.currentPeriodEnd * 1000).toISOString() : null,
+      billingPaymentMethodLabel: input.subscription.defaultPaymentMethodLabel || "Payment method on file",
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, PROFILE_ROW_ID))
+    .run();
+}
+
+export async function applyOrganizationFreePlanMutation(c: any, input: { clearSubscription: boolean }): Promise<void> {
+  assertOrganizationShell(c);
+  const patch: Record<string, unknown> = {
+    billingPlanId: "free",
+    billingStatus: "active",
+    billingSeatsIncluded: 1,
+    billingTrialEndsAt: null,
+    billingRenewalAt: null,
+    billingPaymentMethodLabel: "No card required",
+    updatedAt: Date.now(),
+  };
+  if (input.clearSubscription) {
+    patch.stripeSubscriptionId = null;
+    patch.stripePriceId = null;
+  }
+  await c.db.update(organizationProfile).set(patch).where(eq(organizationProfile.id, PROFILE_ROW_ID)).run();
+}
+
+export async function setOrganizationBillingPaymentMethodMutation(c: any, input: { label: string }): Promise<void> {
+  assertOrganizationShell(c);
+  await c.db
+    .update(organizationProfile)
+    .set({
+      billingPaymentMethodLabel: input.label,
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, PROFILE_ROW_ID))
+    .run();
+}
+
+export async function setOrganizationBillingStatusMutation(c: any, input: { status: FoundryBillingState["status"] }): Promise<void> {
+  assertOrganizationShell(c);
+  await c.db
+    .update(organizationProfile)
+    .set({
+      billingStatus: input.status,
+      updatedAt: Date.now(),
+    })
+    .where(eq(organizationProfile.id, PROFILE_ROW_ID))
+    .run();
+}
+
+export async function upsertOrganizationInvoiceMutation(
+  c: any,
+  input: { id: string; label: string; issuedAt: string; amountUsd: number; status: "paid" | "open" },
+): Promise<void> {
+  assertOrganizationShell(c);
+  await c.db
+    .insert(invoices)
+    .values({
+      id: input.id,
+      label: input.label,
+      issuedAt: input.issuedAt,
+      amountUsd: input.amountUsd,
+      status: input.status,
+      createdAt: Date.now(),
+    })
+    .onConflictDoUpdate({
+      target: invoices.id,
+      set: {
+        label: input.label,
+        issuedAt: input.issuedAt,
+        amountUsd: input.amountUsd,
+        status: input.status,
+      },
+    })
+    .run();
+}
+
+export async function recordOrganizationSeatUsageMutation(c: any, input: { email: string }): Promise<void> {
+  assertOrganizationShell(c);
+  await c.db
+    .insert(seatAssignments)
+    .values({
+      email: input.email,
+      createdAt: Date.now(),
+    })
+    .onConflictDoNothing()
+    .run();
+}
diff --git a/foundry/packages/backend/src/actors/organization/constants.ts b/foundry/packages/backend/src/actors/organization/constants.ts
new file mode 100644
index 0000000..0b8e3c0
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/constants.ts
@@ -0,0 +1 @@
+export const APP_SHELL_ORGANIZATION_ID = "app";
diff --git a/foundry/packages/backend/src/actors/organization/db/db.ts b/foundry/packages/backend/src/actors/organization/db/db.ts
new file mode 100644
index 0000000..f7eb392
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/db.ts
@@ -0,0 +1,5 @@
+import { db } from "rivetkit/db/drizzle";
+import * as schema from "./schema.js";
+import migrations from "./migrations.js";
+
+export const organizationDb = db({ schema, migrations });
diff --git a/foundry/packages/backend/src/actors/organization/db/drizzle.config.ts b/foundry/packages/backend/src/actors/organization/db/drizzle.config.ts
new file mode 100644
index 0000000..eb43667
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/drizzle.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from "rivetkit/db/drizzle";
+
+export default defineConfig({
+  out: "./src/actors/organization/db/drizzle",
+  schema: "./src/actors/organization/db/schema.ts",
+});
diff --git a/foundry/packages/backend/src/actors/organization/db/drizzle/0000_melted_viper.sql b/foundry/packages/backend/src/actors/organization/db/drizzle/0000_melted_viper.sql
new file mode 100644
index 0000000..80be04f
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/drizzle/0000_melted_viper.sql
@@ -0,0 +1,92 @@
+CREATE TABLE `app_sessions` (
+	`id` text PRIMARY KEY NOT NULL,
+	`current_user_id` text,
+	`current_user_name` text,
+	`current_user_email` text,
+	`current_user_github_login` text,
+	`current_user_role_label` text,
+	`eligible_organization_ids_json` text NOT NULL,
+	`active_organization_id` text,
+	`github_access_token` text,
+	`github_scope` text NOT NULL,
+	`starter_repo_status` text NOT NULL,
+	`starter_repo_starred_at` integer,
+	`starter_repo_skipped_at` integer,
+	`oauth_state` text,
+	`oauth_state_expires_at` integer,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `invoices` (
+	`id` text PRIMARY KEY NOT NULL,
+	`label` text NOT NULL,
+	`issued_at` text NOT NULL,
+	`amount_usd` integer NOT NULL,
+	`status` text NOT NULL,
+	`created_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `organization_members` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`email` text NOT NULL,
+	`role` text NOT NULL,
+	`state` text NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `organization_profile` (
+	`id` text PRIMARY KEY NOT NULL,
+	`kind` text NOT NULL,
+	`github_account_id` text NOT NULL,
+	`github_login` text NOT NULL,
+	`github_account_type` text NOT NULL,
+	`display_name` text NOT NULL,
+	`slug` text NOT NULL,
+	`primary_domain` text NOT NULL,
+	`default_model` text NOT NULL,
+	`auto_import_repos` integer NOT NULL,
+	`repo_import_status` text NOT NULL,
+	`github_connected_account` text NOT NULL,
+	`github_installation_status` text NOT NULL,
+	`github_sync_status` text NOT NULL,
+	`github_installation_id` integer,
+	`github_last_sync_label` text NOT NULL,
+	`github_last_sync_at` integer,
+	`github_last_webhook_at` integer,
+	`github_last_webhook_event` text,
+	`github_sync_generation` integer NOT NULL,
+	`github_sync_phase` text,
+	`github_processed_repository_count` integer NOT NULL,
+	`github_total_repository_count` integer NOT NULL,
+	`stripe_customer_id` text,
+	`stripe_subscription_id` text,
+	`stripe_price_id` text,
+	`billing_plan_id` text NOT NULL,
+	`billing_status` text NOT NULL,
+	`billing_seats_included` integer NOT NULL,
+	`billing_trial_ends_at` text,
+	`billing_renewal_at` text,
+	`billing_payment_method_label` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `repos` (
+	`repo_id` text PRIMARY KEY NOT NULL,
+	`remote_url` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `seat_assignments` (
+	`email` text PRIMARY KEY NOT NULL,
+	`created_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `stripe_lookup` (
+	`lookup_key` text PRIMARY KEY NOT NULL,
+	`organization_id` text NOT NULL,
+	`updated_at` integer NOT NULL
+);
diff --git a/foundry/packages/backend/src/actors/organization/db/drizzle/0001_add_auth_and_task_tables.sql b/foundry/packages/backend/src/actors/organization/db/drizzle/0001_add_auth_and_task_tables.sql
new file mode 100644
index 0000000..fcd1b60
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/drizzle/0001_add_auth_and_task_tables.sql
@@ -0,0 +1,50 @@
+CREATE TABLE IF NOT EXISTS `auth_session_index` (
+	`session_id` text PRIMARY KEY NOT NULL,
+	`session_token` text NOT NULL,
+	`user_id` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `auth_email_index` (
+	`email` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `auth_account_index` (
+	`id` text PRIMARY KEY NOT NULL,
+	`provider_id` text NOT NULL,
+	`account_id` text NOT NULL,
+	`user_id` text NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `auth_verification` (
+	`id` text PRIMARY KEY NOT NULL,
+	`identifier` text NOT NULL,
+	`value` text NOT NULL,
+	`expires_at` integer NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `task_index` (
+	`task_id` text PRIMARY KEY NOT NULL,
+	`repo_id` text NOT NULL,
+	`branch_name` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS `task_summaries` (
+	`task_id` text PRIMARY KEY NOT NULL,
+	`repo_id` text NOT NULL,
+	`title` text NOT NULL,
+	`status` text NOT NULL,
+	`repo_name` text NOT NULL,
+	`updated_at_ms` integer NOT NULL,
+	`branch` text,
+	`pull_request_json` text,
+	`sessions_summary_json` text DEFAULT '[]' NOT NULL
+);
diff --git a/foundry/packages/backend/src/actors/organization/db/drizzle/meta/0000_snapshot.json b/foundry/packages/backend/src/actors/organization/db/drizzle/meta/0000_snapshot.json
new file mode 100644
index 0000000..a29c546
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/drizzle/meta/0000_snapshot.json
@@ -0,0 +1,592 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "0bef30e4-148a-4fe1-b2ca-a9721893c3ac",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "tables": {
+    "app_sessions": {
+      "name": "app_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "current_user_id": {
+          "name": "current_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "current_user_name": {
+          "name": "current_user_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "current_user_email": {
+          "name": "current_user_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "current_user_github_login": {
+          "name": "current_user_github_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "current_user_role_label": {
+          "name": "current_user_role_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "eligible_organization_ids_json": {
+          "name": "eligible_organization_ids_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_access_token": {
+          "name": "github_access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_scope": {
+          "name": "github_scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "starter_repo_status": {
+          "name": "starter_repo_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "starter_repo_starred_at": {
+          "name": "starter_repo_starred_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "starter_repo_skipped_at": {
+          "name": "starter_repo_skipped_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "oauth_state": {
+          "name": "oauth_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "oauth_state_expires_at": {
+          "name": "oauth_state_expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "invoices": {
+      "name": "invoices",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "issued_at": {
+          "name": "issued_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "amount_usd": {
+          "name": "amount_usd",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "organization_members": {
+      "name": "organization_members",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "organization_profile": {
+      "name": "organization_profile",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_account_id": {
+          "name": "github_account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_login": {
+          "name": "github_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_account_type": {
+          "name": "github_account_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "primary_domain": {
+          "name": "primary_domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "default_model": {
+          "name": "default_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auto_import_repos": {
+          "name": "auto_import_repos",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo_import_status": {
+          "name": "repo_import_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_connected_account": {
+          "name": "github_connected_account",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_installation_status": {
+          "name": "github_installation_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_sync_status": {
+          "name": "github_sync_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_installation_id": {
+          "name": "github_installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_last_sync_label": {
+          "name": "github_last_sync_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_last_sync_at": {
+          "name": "github_last_sync_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_last_webhook_at": {
+          "name": "github_last_webhook_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_last_webhook_event": {
+          "name": "github_last_webhook_event",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_sync_generation": {
+          "name": "github_sync_generation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_sync_phase": {
+          "name": "github_sync_phase",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_processed_repository_count": {
+          "name": "github_processed_repository_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_total_repository_count": {
+          "name": "github_total_repository_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "stripe_price_id": {
+          "name": "stripe_price_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "billing_plan_id": {
+          "name": "billing_plan_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "billing_status": {
+          "name": "billing_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "billing_seats_included": {
+          "name": "billing_seats_included",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "billing_trial_ends_at": {
+          "name": "billing_trial_ends_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "billing_renewal_at": {
+          "name": "billing_renewal_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "billing_payment_method_label": {
+          "name": "billing_payment_method_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "repos": {
+      "name": "repos",
+      "columns": {
+        "repo_id": {
+          "name": "repo_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_url": {
+          "name": "remote_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "seat_assignments": {
+      "name": "seat_assignments",
+      "columns": {
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "stripe_lookup": {
+      "name": "stripe_lookup",
+      "columns": {
+        "lookup_key": {
+          "name": "lookup_key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/foundry/packages/backend/src/actors/organization/db/drizzle/meta/_journal.json b/foundry/packages/backend/src/actors/organization/db/drizzle/meta/_journal.json
new file mode 100644
index 0000000..41ea23b
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/drizzle/meta/_journal.json
@@ -0,0 +1,20 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1773376221152,
+      "tag": "0000_melted_viper",
+      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1773840000000,
+      "tag": "0001_add_auth_and_task_tables",
+      "breakpoints": true
+    }
+  ]
+}
diff --git a/foundry/packages/backend/src/actors/organization/db/migrations.ts b/foundry/packages/backend/src/actors/organization/db/migrations.ts
new file mode 100644
index 0000000..2e8570b
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/migrations.ts
@@ -0,0 +1,180 @@
+// This file is generated by src/actors/_scripts/generate-actor-migrations.ts.
+// Source of truth is drizzle-kit output under ./drizzle (meta/_journal.json + *.sql).
+// Do not hand-edit this file.
+
+const journal = {
+  entries: [
+    {
+      idx: 0,
+      when: 1773376221152,
+      tag: "0000_melted_viper",
+      breakpoints: true,
+    },
+    {
+      idx: 1,
+      when: 1773840000000,
+      tag: "0001_add_auth_and_task_tables",
+      breakpoints: true,
+    },
+    {
+      idx: 2,
+      when: 1773984000000,
+      tag: "0002_add_task_owner_columns",
+      breakpoints: true,
+    },
+  ],
+} as const;
+
+export default {
+  journal,
+  migrations: {
+    m0000: `CREATE TABLE \`app_sessions\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`current_user_id\` text,
+	\`current_user_name\` text,
+	\`current_user_email\` text,
+	\`current_user_github_login\` text,
+	\`current_user_role_label\` text,
+	\`eligible_organization_ids_json\` text NOT NULL,
+	\`active_organization_id\` text,
+	\`github_access_token\` text,
+	\`github_scope\` text NOT NULL,
+	\`starter_repo_status\` text NOT NULL,
+	\`starter_repo_starred_at\` integer,
+	\`starter_repo_skipped_at\` integer,
+	\`oauth_state\` text,
+	\`oauth_state_expires_at\` integer,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`invoices\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`label\` text NOT NULL,
+	\`issued_at\` text NOT NULL,
+	\`amount_usd\` integer NOT NULL,
+	\`status\` text NOT NULL,
+	\`created_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`organization_members\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`name\` text NOT NULL,
+	\`email\` text NOT NULL,
+	\`role\` text NOT NULL,
+	\`state\` text NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`organization_profile\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`kind\` text NOT NULL,
+	\`github_account_id\` text NOT NULL,
+	\`github_login\` text NOT NULL,
+	\`github_account_type\` text NOT NULL,
+	\`display_name\` text NOT NULL,
+	\`slug\` text NOT NULL,
+	\`primary_domain\` text NOT NULL,
+	\`default_model\` text NOT NULL,
+	\`auto_import_repos\` integer NOT NULL,
+	\`repo_import_status\` text NOT NULL,
+	\`github_connected_account\` text NOT NULL,
+	\`github_installation_status\` text NOT NULL,
+	\`github_sync_status\` text NOT NULL,
+	\`github_installation_id\` integer,
+	\`github_last_sync_label\` text NOT NULL,
+	\`github_last_sync_at\` integer,
+	\`github_last_webhook_at\` integer,
+	\`github_last_webhook_event\` text,
+	\`github_sync_generation\` integer NOT NULL,
+	\`github_sync_phase\` text,
+	\`github_processed_repository_count\` integer NOT NULL,
+	\`github_total_repository_count\` integer NOT NULL,
+	\`stripe_customer_id\` text,
+	\`stripe_subscription_id\` text,
+	\`stripe_price_id\` text,
+	\`billing_plan_id\` text NOT NULL,
+	\`billing_status\` text NOT NULL,
+	\`billing_seats_included\` integer NOT NULL,
+	\`billing_trial_ends_at\` text,
+	\`billing_renewal_at\` text,
+	\`billing_payment_method_label\` text NOT NULL,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`repos\` (
+	\`repo_id\` text PRIMARY KEY NOT NULL,
+	\`remote_url\` text NOT NULL,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`seat_assignments\` (
+	\`email\` text PRIMARY KEY NOT NULL,
+	\`created_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`stripe_lookup\` (
+	\`lookup_key\` text PRIMARY KEY NOT NULL,
+	\`organization_id\` text NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+`,
+    m0001: `CREATE TABLE IF NOT EXISTS \`auth_session_index\` (
+	\`session_id\` text PRIMARY KEY NOT NULL,
+	\`session_token\` text NOT NULL,
+	\`user_id\` text NOT NULL,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS \`auth_email_index\` (
+	\`email\` text PRIMARY KEY NOT NULL,
+	\`user_id\` text NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS \`auth_account_index\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`provider_id\` text NOT NULL,
+	\`account_id\` text NOT NULL,
+	\`user_id\` text NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS \`auth_verification\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`identifier\` text NOT NULL,
+	\`value\` text NOT NULL,
+	\`expires_at\` integer NOT NULL,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS \`task_index\` (
+	\`task_id\` text PRIMARY KEY NOT NULL,
+	\`repo_id\` text NOT NULL,
+	\`branch_name\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS \`task_summaries\` (
+	\`task_id\` text PRIMARY KEY NOT NULL,
+	\`repo_id\` text NOT NULL,
+	\`title\` text NOT NULL,
+	\`status\` text NOT NULL,
+	\`repo_name\` text NOT NULL,
+	\`updated_at_ms\` integer NOT NULL,
+	\`branch\` text,
+	\`pull_request_json\` text,
+	\`sessions_summary_json\` text DEFAULT '[]' NOT NULL
+);
+`,
+    m0002: `ALTER TABLE \`task_summaries\` ADD COLUMN \`primary_user_login\` text;
+--> statement-breakpoint
+ALTER TABLE \`task_summaries\` ADD COLUMN \`primary_user_avatar_url\` text;
+`,
+  } as const,
+};
diff --git a/foundry/packages/backend/src/actors/organization/db/schema.ts b/foundry/packages/backend/src/actors/organization/db/schema.ts
new file mode 100644
index 0000000..3978a5f
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/db/schema.ts
@@ -0,0 +1,160 @@
+import { check, integer, sqliteTable, text } from "rivetkit/db/drizzle";
+import { sql } from "drizzle-orm";
+import { DEFAULT_WORKSPACE_MODEL_ID } from "@sandbox-agent/foundry-shared";
+
+// SQLite is per organization actor instance, so no organizationId column needed.
+
+/**
+ * Coordinator index of TaskActor instances.
+ * The organization actor is the direct coordinator for tasks (not a per-repo
+ * actor) because the sidebar needs to query all tasks across all repos on
+ * every snapshot. With many repos, fanning out to N repo actors on the hot
+ * read path is too expensive — owning the index here keeps that a single
+ * local table scan. Each row maps a taskId to its repo and immutable branch
+ * name. Used for branch conflict checking (scoped by repoId) and
+ * task-by-branch lookups.
+ */
+export const taskIndex = sqliteTable("task_index", {
+  taskId: text("task_id").notNull().primaryKey(),
+  repoId: text("repo_id").notNull(),
+  branchName: text("branch_name"),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+/**
+ * Organization-owned materialized task summary projection.
+ * Task actors push summary updates directly to the organization coordinator,
+ * which keeps this table local for fast list/lookups without fan-out.
+ * Same rationale as taskIndex: the sidebar repeatedly reads all tasks across
+ * all repos, so the org must own the materialized view to avoid O(repos)
+ * actor fan-out on the hot read path.
+ */
+export const taskSummaries = sqliteTable("task_summaries", {
+  taskId: text("task_id").notNull().primaryKey(),
+  repoId: text("repo_id").notNull(),
+  title: text("title").notNull(),
+  status: text("status").notNull(),
+  repoName: text("repo_name").notNull(),
+  updatedAtMs: integer("updated_at_ms").notNull(),
+  branch: text("branch"),
+  pullRequestJson: text("pull_request_json"),
+  sessionsSummaryJson: text("sessions_summary_json").notNull().default("[]"),
+  primaryUserLogin: text("primary_user_login"),
+  primaryUserAvatarUrl: text("primary_user_avatar_url"),
+});
+
+export const organizationProfile = sqliteTable(
+  "organization_profile",
+  {
+    id: integer("id").primaryKey(),
+    kind: text("kind").notNull(),
+    githubAccountId: text("github_account_id").notNull(),
+    githubLogin: text("github_login").notNull(),
+    githubAccountType: text("github_account_type").notNull(),
+    displayName: text("display_name").notNull(),
+    slug: text("slug").notNull(),
+    defaultModel: text("default_model").notNull().default(DEFAULT_WORKSPACE_MODEL_ID),
+    primaryDomain: text("primary_domain").notNull(),
+    autoImportRepos: integer("auto_import_repos").notNull(),
+    repoImportStatus: text("repo_import_status").notNull(),
+    githubConnectedAccount: text("github_connected_account").notNull(),
+    githubInstallationStatus: text("github_installation_status").notNull(),
+    githubSyncStatus: text("github_sync_status").notNull(),
+    githubInstallationId: integer("github_installation_id"),
+    githubLastSyncLabel: text("github_last_sync_label").notNull(),
+    githubLastSyncAt: integer("github_last_sync_at"),
+    githubLastWebhookAt: integer("github_last_webhook_at"),
+    githubLastWebhookEvent: text("github_last_webhook_event"),
+    githubSyncGeneration: integer("github_sync_generation").notNull(),
+    githubSyncPhase: text("github_sync_phase"),
+    githubProcessedRepositoryCount: integer("github_processed_repository_count").notNull(),
+    githubTotalRepositoryCount: integer("github_total_repository_count").notNull(),
+    stripeCustomerId: text("stripe_customer_id"),
+    stripeSubscriptionId: text("stripe_subscription_id"),
+    stripePriceId: text("stripe_price_id"),
+    billingPlanId: text("billing_plan_id").notNull(),
+    billingStatus: text("billing_status").notNull(),
+    billingSeatsIncluded: integer("billing_seats_included").notNull(),
+    billingTrialEndsAt: text("billing_trial_ends_at"),
+    billingRenewalAt: text("billing_renewal_at"),
+    billingPaymentMethodLabel: text("billing_payment_method_label").notNull(),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => [check("organization_profile_singleton_id_check", sql`${table.id} = 1`)],
+);
+
+export const organizationMembers = sqliteTable("organization_members", {
+  id: text("id").notNull().primaryKey(),
+  name: text("name").notNull(),
+  email: text("email").notNull(),
+  role: text("role").notNull(),
+  state: text("state").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+export const seatAssignments = sqliteTable("seat_assignments", {
+  email: text("email").notNull().primaryKey(),
+  createdAt: integer("created_at").notNull(),
+});
+
+export const invoices = sqliteTable("invoices", {
+  id: text("id").notNull().primaryKey(),
+  label: text("label").notNull(),
+  issuedAt: text("issued_at").notNull(),
+  amountUsd: integer("amount_usd").notNull(),
+  status: text("status").notNull(),
+  createdAt: integer("created_at").notNull(),
+});
+
+/**
+ * Coordinator index of AuthUserActor instances — routes session token → userId.
+ * Better Auth adapter uses this to resolve which user actor to query
+ * before the user identity is known.
+ */
+export const authSessionIndex = sqliteTable("auth_session_index", {
+  sessionId: text("session_id").notNull().primaryKey(),
+  sessionToken: text("session_token").notNull(),
+  userId: text("user_id").notNull(),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+/**
+ * Coordinator index of AuthUserActor instances — routes email → userId.
+ * Better Auth adapter uses this to resolve which user actor to query.
+ */
+export const authEmailIndex = sqliteTable("auth_email_index", {
+  email: text("email").notNull().primaryKey(),
+  userId: text("user_id").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+/**
+ * Coordinator index of AuthUserActor instances — routes OAuth account → userId.
+ * Better Auth adapter uses this to resolve which user actor to query.
+ */
+export const authAccountIndex = sqliteTable("auth_account_index", {
+  id: text("id").notNull().primaryKey(),
+  providerId: text("provider_id").notNull(),
+  accountId: text("account_id").notNull(),
+  userId: text("user_id").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+/** Better Auth core model — schema defined at https://better-auth.com/docs/concepts/database */
+export const authVerification = sqliteTable("auth_verification", {
+  id: text("id").notNull().primaryKey(),
+  identifier: text("identifier").notNull(),
+  value: text("value").notNull(),
+  expiresAt: integer("expires_at").notNull(),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+export const stripeLookup = sqliteTable("stripe_lookup", {
+  lookupKey: text("lookup_key").notNull().primaryKey(),
+  organizationId: text("organization_id").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
diff --git a/foundry/packages/backend/src/actors/organization/index.ts b/foundry/packages/backend/src/actors/organization/index.ts
new file mode 100644
index 0000000..9ceb27f
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/index.ts
@@ -0,0 +1,23 @@
+import { actor, queue } from "rivetkit";
+import { workflow } from "rivetkit/workflow";
+import { organizationDb } from "./db/db.js";
+import { organizationActions } from "./actions.js";
+import { runOrganizationWorkflow } from "./workflow.js";
+import { ORGANIZATION_QUEUE_NAMES } from "./queues.js";
+
+export const organization = actor({
+  db: organizationDb,
+  queues: Object.fromEntries(ORGANIZATION_QUEUE_NAMES.map((name) => [name, queue()])),
+  options: {
+    name: "Organization",
+    icon: "compass",
+    actionTimeout: 5 * 60_000,
+  },
+  createState: (_c, organizationId: string) => ({
+    organizationId,
+  }),
+  actions: {
+    ...organizationActions,
+  },
+  run: workflow(runOrganizationWorkflow),
+});
diff --git a/foundry/packages/backend/src/actors/organization/queues.ts b/foundry/packages/backend/src/actors/organization/queues.ts
new file mode 100644
index 0000000..2e67dc5
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/queues.ts
@@ -0,0 +1,26 @@
+export const ORGANIZATION_QUEUE_NAMES = [
+  "organization.command.createTask",
+  "organization.command.materializeTask",
+  "organization.command.applyTaskSummaryUpdate",
+  "organization.command.removeTaskSummary",
+  "organization.command.refreshTaskSummaryForBranch",
+  "organization.command.snapshot.broadcast",
+  "organization.command.syncGithubSession",
+  "organization.command.github.organization_shell.sync_from_github",
+  "organization.command.github.sync_progress.apply",
+  "organization.command.github.webhook_receipt.record",
+  "organization.command.shell.sync_started.mark",
+  "organization.command.billing.stripe_customer.apply",
+  "organization.command.billing.stripe_subscription.apply",
+  "organization.command.billing.free_plan.apply",
+  "organization.command.billing.payment_method.set",
+  "organization.command.billing.status.set",
+  "organization.command.billing.invoice.upsert",
+  "organization.command.billing.seat_usage.record",
+] as const;
+
+export type OrganizationQueueName = (typeof ORGANIZATION_QUEUE_NAMES)[number];
+
+export function organizationWorkflowQueueName(name: OrganizationQueueName): OrganizationQueueName {
+  return name;
+}
diff --git a/foundry/packages/backend/src/actors/organization/workflow.ts b/foundry/packages/backend/src/actors/organization/workflow.ts
new file mode 100644
index 0000000..e62e80d
--- /dev/null
+++ b/foundry/packages/backend/src/actors/organization/workflow.ts
@@ -0,0 +1,164 @@
+// @ts-nocheck
+/**
+ * Organization workflow — queue-based command loop.
+ *
+ * Mutations are dispatched through named queues and processed inside workflow
+ * steps so that every command appears in the RivetKit inspector's workflow
+ * history. Read actions remain direct (no queue).
+ *
+ * Callers send commands directly via `.send()` to the appropriate queue name.
+ */
+import { Loop } from "rivetkit/workflow";
+import { logActorWarning, resolveErrorMessage } from "../logging.js";
+import { ORGANIZATION_QUEUE_NAMES, type OrganizationQueueName } from "./queues.js";
+
+import { applyGithubSyncProgressMutation, recordGithubWebhookReceiptMutation, refreshOrganizationSnapshotMutation } from "./actions.js";
+import {
+  applyTaskSummaryUpdateMutation,
+  createTaskMutation,
+  refreshTaskSummaryForBranchMutation,
+  removeTaskSummaryMutation,
+} from "./actions/task-mutations.js";
+import {
+  applyOrganizationFreePlanMutation,
+  applyOrganizationStripeCustomerMutation,
+  applyOrganizationStripeSubscriptionMutation,
+  markOrganizationSyncStartedMutation,
+  recordOrganizationSeatUsageMutation,
+  setOrganizationBillingPaymentMethodMutation,
+  setOrganizationBillingStatusMutation,
+  syncOrganizationShellFromGithubMutation,
+  upsertOrganizationInvoiceMutation,
+} from "./app-shell.js";
+
+// ---------------------------------------------------------------------------
+// Workflow command loop — runs inside `run: workflow(runOrganizationWorkflow)`
+// ---------------------------------------------------------------------------
+
+type WorkflowHandler = (loopCtx: any, body: any) => Promise<any>;
+
+/**
+ * Maps queue names to their mutation handlers.
+ * Each handler receives the workflow loop context and the message body,
+ * executes the mutation, and returns the result (which is sent back via
+ * msg.complete).
+ */
+const COMMAND_HANDLERS: Record<OrganizationQueueName, WorkflowHandler> = {
+  // Task mutations
+  "organization.command.createTask": async (c, body) => createTaskMutation(c, body),
+  "organization.command.materializeTask": async (c, body) => createTaskMutation(c, body),
+  "organization.command.applyTaskSummaryUpdate": async (c, body) => {
+    await applyTaskSummaryUpdateMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.removeTaskSummary": async (c, body) => {
+    await removeTaskSummaryMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.refreshTaskSummaryForBranch": async (c, body) => {
+    await refreshTaskSummaryForBranchMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.snapshot.broadcast": async (c, _body) => {
+    await refreshOrganizationSnapshotMutation(c);
+    return { ok: true };
+  },
+  "organization.command.syncGithubSession": async (c, body) => {
+    const { syncGithubOrganizations } = await import("./app-shell.js");
+    await syncGithubOrganizations(c, body);
+    return { ok: true };
+  },
+
+  // GitHub organization shell sync (stays on queue)
+  "organization.command.github.organization_shell.sync_from_github": async (c, body) => syncOrganizationShellFromGithubMutation(c, body),
+
+  // GitHub sync progress + webhook receipt
+  "organization.command.github.sync_progress.apply": async (c, body) => {
+    await applyGithubSyncProgressMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.github.webhook_receipt.record": async (c, body) => {
+    await recordGithubWebhookReceiptMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.shell.sync_started.mark": async (c, body) => {
+    await markOrganizationSyncStartedMutation(c, body);
+    return { ok: true };
+  },
+
+  // Billing mutations
+  "organization.command.billing.stripe_customer.apply": async (c, body) => {
+    await applyOrganizationStripeCustomerMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.billing.stripe_subscription.apply": async (c, body) => {
+    await applyOrganizationStripeSubscriptionMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.billing.free_plan.apply": async (c, body) => {
+    await applyOrganizationFreePlanMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.billing.payment_method.set": async (c, body) => {
+    await setOrganizationBillingPaymentMethodMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.billing.status.set": async (c, body) => {
+    await setOrganizationBillingStatusMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.billing.invoice.upsert": async (c, body) => {
+    await upsertOrganizationInvoiceMutation(c, body);
+    return { ok: true };
+  },
+  "organization.command.billing.seat_usage.record": async (c, body) => {
+    await recordOrganizationSeatUsageMutation(c, body);
+    return { ok: true };
+  },
+};
+
+export async function runOrganizationWorkflow(ctx: any): Promise<void> {
+  await ctx.loop("organization-command-loop", async (loopCtx: any) => {
+    const msg = await loopCtx.queue.next("next-organization-command", {
+      names: [...ORGANIZATION_QUEUE_NAMES],
+      completable: true,
+    });
+
+    if (!msg) {
+      return Loop.continue(undefined);
+    }
+
+    const handler = COMMAND_HANDLERS[msg.name as OrganizationQueueName];
+    if (!handler) {
+      logActorWarning("organization", "unknown organization command", { command: msg.name });
+      await msg.complete({ error: `Unknown command: ${msg.name}` }).catch(() => {});
+      return Loop.continue(undefined);
+    }
+
+    try {
+      // Wrap in a step so c.state and c.db are accessible inside mutation functions.
+      const result = await loopCtx.step({
+        name: msg.name,
+        timeout: 10 * 60_000,
+        run: async () => handler(loopCtx, msg.body),
+      });
+      try {
+        await msg.complete(result);
+      } catch (completeError) {
+        logActorWarning("organization", "organization workflow failed completing response", {
+          command: msg.name,
+          error: resolveErrorMessage(completeError),
+        });
+      }
+    } catch (error) {
+      const message = resolveErrorMessage(error);
+      logActorWarning("organization", "organization workflow command failed", {
+        command: msg.name,
+        error: message,
+      });
+      await msg.complete({ error: message }).catch(() => {});
+    }
+
+    return Loop.continue(undefined);
+  });
+}
diff --git a/foundry/packages/backend/src/actors/polling.ts b/foundry/packages/backend/src/actors/polling.ts
new file mode 100644
index 0000000..8de9c34
--- /dev/null
+++ b/foundry/packages/backend/src/actors/polling.ts
@@ -0,0 +1,189 @@
+import { Loop } from "rivetkit/workflow";
+import { normalizeMessages } from "../services/queue.js";
+
+export interface PollingControlState {
+  intervalMs: number;
+  running: boolean;
+}
+
+export interface PollingControlQueueNames {
+  start: string;
+  stop: string;
+  setInterval: string;
+  force: string;
+}
+
+export interface PollingQueueMessage {
+  name: string;
+  body: unknown;
+  complete(response: unknown): Promise<void>;
+}
+
+interface PollingActorContext<TState extends PollingControlState> {
+  state: TState;
+  abortSignal: AbortSignal;
+  queue: {
+    nextBatch(options: { names: readonly string[]; timeout: number; count: number; completable: true }): Promise<PollingQueueMessage[]>;
+  };
+}
+
+interface RunPollingOptions<TState extends PollingControlState> {
+  control: PollingControlQueueNames;
+  onPoll(c: PollingActorContext<TState>): Promise<void>;
+}
+
+export async function runPollingControlLoop<TState extends PollingControlState>(
+  c: PollingActorContext<TState>,
+  options: RunPollingOptions<TState>,
+): Promise<void> {
+  while (!c.abortSignal.aborted) {
+    const messages = normalizeMessages(
+      await c.queue.nextBatch({
+        names: [options.control.start, options.control.stop, options.control.setInterval, options.control.force],
+        timeout: Math.max(500, c.state.intervalMs),
+        count: 16,
+        completable: true,
+      }),
+    ) as PollingQueueMessage[];
+
+    if (messages.length === 0) {
+      if (!c.state.running) {
+        continue;
+      }
+      await options.onPoll(c);
+      continue;
+    }
+
+    for (const msg of messages) {
+      if (msg.name === options.control.start) {
+        c.state.running = true;
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === options.control.stop) {
+        c.state.running = false;
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === options.control.setInterval) {
+        const intervalMs = Number((msg.body as { intervalMs?: unknown })?.intervalMs);
+        c.state.intervalMs = Number.isFinite(intervalMs) ? Math.max(500, intervalMs) : c.state.intervalMs;
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === options.control.force) {
+        await options.onPoll(c);
+        await msg.complete({ ok: true });
+      }
+    }
+  }
+}
+
+interface WorkflowPollingActorContext<TState extends PollingControlState> {
+  state: TState;
+  loop(config: { name: string; historyEvery: number; historyKeep: number; run(ctx: WorkflowPollingActorContext<TState>): Promise<unknown> }): Promise<void>;
+}
+
+interface WorkflowPollingQueueMessage extends PollingQueueMessage {}
+
+interface WorkflowPollingLoopContext<TState extends PollingControlState> {
+  state: TState;
+  queue: {
+    nextBatch(
+      name: string,
+      options: {
+        names: readonly string[];
+        timeout: number;
+        count: number;
+        completable: true;
+      },
+    ): Promise<WorkflowPollingQueueMessage[]>;
+  };
+  step<T>(
+    nameOrConfig:
+      | string
+      | {
+          name: string;
+          timeout?: number;
+          run: () => Promise<T>;
+        },
+    run?: () => Promise<T>,
+  ): Promise<T>;
+}
+
+export async function runWorkflowPollingLoop<TState extends PollingControlState>(
+  ctx: any,
+  options: RunPollingOptions<TState> & { loopName: string },
+): Promise<void> {
+  await ctx.loop(options.loopName, async (loopCtx: WorkflowPollingLoopContext<TState>) => {
+    const control = await loopCtx.step("read-control-state", async () => ({
+      intervalMs: Math.max(500, Number(loopCtx.state.intervalMs) || 500),
+      running: Boolean(loopCtx.state.running),
+    }));
+
+    const messages = normalizeMessages(
+      await loopCtx.queue.nextBatch("next-polling-control-batch", {
+        names: [options.control.start, options.control.stop, options.control.setInterval, options.control.force],
+        timeout: control.running ? control.intervalMs : 60_000,
+        count: 16,
+        completable: true,
+      }),
+    ) as WorkflowPollingQueueMessage[];
+
+    if (messages.length === 0) {
+      if (control.running) {
+        await loopCtx.step({
+          name: "poll-tick",
+          timeout: 5 * 60_000,
+          run: async () => {
+            await options.onPoll(loopCtx as unknown as PollingActorContext<TState>);
+          },
+        });
+      }
+      return Loop.continue(undefined);
+    }
+
+    for (const msg of messages) {
+      if (msg.name === options.control.start) {
+        await loopCtx.step("control-start", async () => {
+          loopCtx.state.running = true;
+        });
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === options.control.stop) {
+        await loopCtx.step("control-stop", async () => {
+          loopCtx.state.running = false;
+        });
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === options.control.setInterval) {
+        await loopCtx.step("control-set-interval", async () => {
+          const intervalMs = Number((msg.body as { intervalMs?: unknown })?.intervalMs);
+          loopCtx.state.intervalMs = Number.isFinite(intervalMs) ? Math.max(500, intervalMs) : loopCtx.state.intervalMs;
+        });
+        await msg.complete({ ok: true });
+        continue;
+      }
+
+      if (msg.name === options.control.force) {
+        await loopCtx.step({
+          name: "control-force",
+          timeout: 5 * 60_000,
+          run: async () => {
+            await options.onPoll(loopCtx as unknown as PollingActorContext<TState>);
+          },
+        });
+        await msg.complete({ ok: true });
+      }
+    }
+
+    return Loop.continue(undefined);
+  });
+}
diff --git a/foundry/packages/backend/src/actors/sandbox/index.ts b/foundry/packages/backend/src/actors/sandbox/index.ts
new file mode 100644
index 0000000..0444d9b
--- /dev/null
+++ b/foundry/packages/backend/src/actors/sandbox/index.ts
@@ -0,0 +1,646 @@
+// @ts-nocheck
+import { actor, queue } from "rivetkit";
+import { workflow, Loop } from "rivetkit/workflow";
+import { e2b, sandboxActor } from "rivetkit/sandbox";
+import { existsSync } from "node:fs";
+import Dockerode from "dockerode";
+import { DEFAULT_WORKSPACE_MODEL_GROUPS, workspaceModelGroupsFromSandboxAgents, type WorkspaceModelGroup } from "@sandbox-agent/foundry-shared";
+import { SandboxAgent } from "sandbox-agent";
+import { getActorRuntimeContext } from "../context.js";
+import { organizationKey } from "../keys.js";
+import { selfTaskSandbox } from "../handles.js";
+import { logActorWarning, resolveErrorMessage } from "../logging.js";
+import { expectQueueResponse } from "../../services/queue.js";
+import { resolveSandboxProviderId } from "../../sandbox-config.js";
+
+/**
+ * Default repo CWD inside the sandbox. The actual path is resolved dynamically
+ * via `$HOME/repo` because different sandbox providers run as different users
+ * (e.g. E2B uses `/home/user`, local Docker uses `/home/sandbox`).
+ */
+const DEFAULT_SANDBOX_REPO_CWD = "/home/user/repo";
+const DEFAULT_LOCAL_SANDBOX_IMAGE = "rivetdev/sandbox-agent:foundry-base-latest";
+const DEFAULT_LOCAL_SANDBOX_PORT = 2468;
+const dockerClient = new Dockerode({ socketPath: "/var/run/docker.sock" });
+
+function parseTaskSandboxKey(key: readonly string[]): { organizationId: string; taskId: string } {
+  if (key.length !== 4 || key[0] !== "org" || key[2] !== "sandbox") {
+    throw new Error(`Invalid task sandbox key: ${JSON.stringify(key)}`);
+  }
+
+  return {
+    organizationId: key[1]!,
+    taskId: key[3]!,
+  };
+}
+
+function preferredDockerHost(): string {
+  if (process.env.FOUNDRY_DOCKER_HOST?.trim()) {
+    return process.env.FOUNDRY_DOCKER_HOST.trim();
+  }
+
+  return existsSync("/.dockerenv") ? "host.docker.internal" : "127.0.0.1";
+}
+
+function preferredPublicDockerHost(): string {
+  if (process.env.FOUNDRY_PUBLIC_SANDBOX_HOST?.trim()) {
+    return process.env.FOUNDRY_PUBLIC_SANDBOX_HOST.trim();
+  }
+
+  return "127.0.0.1";
+}
+
+function localSandboxAgentPort(): number {
+  const raw = process.env.FOUNDRY_LOCAL_SANDBOX_PORT?.trim() ?? process.env.HF_LOCAL_SANDBOX_PORT?.trim() ?? "";
+  const parsed = Number(raw);
+  if (Number.isInteger(parsed) && parsed > 0 && parsed <= 65535) {
+    return parsed;
+  }
+  return DEFAULT_LOCAL_SANDBOX_PORT;
+}
+
+function sandboxEnvPairs(): string[] {
+  const openAiApiKey = process.env.OPENAI_API_KEY;
+  const entries = [
+    ["ANTHROPIC_API_KEY", process.env.ANTHROPIC_API_KEY],
+    ["CLAUDE_API_KEY", process.env.CLAUDE_API_KEY ?? process.env.ANTHROPIC_API_KEY],
+    ["OPENAI_API_KEY", openAiApiKey],
+    // Codex ACP prefers CODEX_API_KEY when present. In dev we want that to be the
+    // actual OpenAI API key, not an unrelated local Codex auth token.
+    ["CODEX_API_KEY", openAiApiKey ?? process.env.CODEX_API_KEY],
+    ["GH_TOKEN", process.env.GH_TOKEN ?? process.env.GITHUB_TOKEN],
+    ["GITHUB_TOKEN", process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN],
+    ["E2B_API_KEY", process.env.E2B_API_KEY],
+  ];
+
+  return entries
+    .filter((entry): entry is [string, string] => typeof entry[1] === "string" && entry[1].trim().length > 0)
+    .map(([key, value]) => `${key}=${value}`);
+}
+
+function sandboxEnvObject(): Record<string, string> {
+  return Object.fromEntries(
+    sandboxEnvPairs().map((entry) => {
+      const [key, ...rest] = entry.split("=");
+      return [key!, rest.join("=")];
+    }),
+  );
+}
+
+function modeIdForAgent(agent?: string | null): string | null {
+  switch (agent) {
+    case "codex":
+      return "full-access";
+    case "claude":
+      return "acceptEdits";
+    default:
+      return null;
+  }
+}
+
+async function getPublishedDockerPort(sandboxId: string, containerPort: number): Promise<number> {
+  const info = await dockerClient.getContainer(sandboxId).inspect();
+  const hostPort = info.NetworkSettings?.Ports?.[`${containerPort}/tcp`]?.[0]?.HostPort;
+  if (!hostPort) {
+    throw new Error(`docker sandbox-agent port ${containerPort} is not published`);
+  }
+  return Number(hostPort);
+}
+
+function createLocalSandboxProvider(image: string): any {
+  const agentPort = localSandboxAgentPort();
+  const backendHost = preferredDockerHost();
+  const publicHost = preferredPublicDockerHost();
+
+  return {
+    name: "docker",
+
+    async create(_context: any): Promise<string> {
+      const container = await dockerClient.createContainer({
+        Image: image,
+        Cmd: ["server", "--no-token", "--host", "0.0.0.0", "--port", String(agentPort)],
+        Env: sandboxEnvPairs(),
+        ExposedPorts: {
+          [`${agentPort}/tcp`]: {},
+        },
+        HostConfig: {
+          AutoRemove: true,
+          PortBindings: {
+            [`${agentPort}/tcp`]: [{ HostPort: "0" }],
+          },
+        },
+      });
+
+      await container.start();
+      return container.id;
+    },
+
+    async destroy(sandboxId: string): Promise<void> {
+      const container = dockerClient.getContainer(sandboxId);
+      try {
+        await container.stop({ t: 5 });
+      } catch {}
+      try {
+        await container.remove({ force: true });
+      } catch {}
+    },
+
+    async getUrl(sandboxId: string): Promise<string> {
+      const hostPort = await getPublishedDockerPort(sandboxId, agentPort);
+      return `http://${publicHost}:${hostPort}`;
+    },
+
+    async connectAgent(sandboxId: string, connectOptions: any): Promise<any> {
+      const hostPort = await getPublishedDockerPort(sandboxId, agentPort);
+      return await SandboxAgent.connect({
+        baseUrl: `http://${backendHost}:${hostPort}`,
+        ...connectOptions,
+      });
+    },
+  };
+}
+
+function sanitizeActorResult(value: unknown, seen = new WeakSet<object>()): unknown {
+  if (typeof value === "function" || value === undefined) {
+    return undefined;
+  }
+
+  if (value && typeof value === "object") {
+    const maybeToRecord = (value as { toRecord?: unknown }).toRecord;
+    if (typeof maybeToRecord === "function") {
+      return sanitizeActorResult(maybeToRecord.call(value), seen);
+    }
+  }
+
+  if (value === null || typeof value !== "object") {
+    return value;
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return value.map((entry) => sanitizeActorResult(entry, seen)).filter((entry) => entry !== undefined);
+  }
+
+  if (seen.has(value)) {
+    return undefined;
+  }
+  seen.add(value);
+
+  const next: Record<string, unknown> = {};
+  for (const [key, entry] of Object.entries(value)) {
+    const sanitized = sanitizeActorResult(entry, seen);
+    if (sanitized !== undefined) {
+      next[key] = sanitized;
+    }
+  }
+  return next;
+}
+
+const baseTaskSandbox = sandboxActor({
+  createProvider: async (c) => {
+    const { config } = getActorRuntimeContext();
+    const { organizationId, taskId } = parseTaskSandboxKey(c.key);
+    const organization = await c.client().organization.getOrCreate(organizationKey(organizationId), {
+      createWithInput: organizationId,
+    });
+    const task = await organization.getTask({ organizationId, taskId });
+    const sandboxProviderId = resolveSandboxProviderId(config, task.sandboxProviderId);
+
+    if (sandboxProviderId === "e2b") {
+      return e2b({
+        create: () => ({
+          template: config.sandboxProviders.e2b.template ?? "sandbox-agent-full-0.5.x",
+          envs: sandboxEnvObject(),
+          // TEMPORARY: Default E2B timeout is 5 minutes which is too short.
+          // Set to 1 hour as a stopgap. Remove this once the E2B provider in
+          // sandbox-agent uses betaCreate + autoPause (see
+          // .context/proposal-rivetkit-sandbox-resilience.md). At that point
+          // the provider handles timeout/pause lifecycle and this override is
+          // unnecessary.
+          timeoutMs: 60 * 60 * 1000,
+        }),
+        installAgents: ["claude", "codex"],
+      });
+    }
+
+    return createLocalSandboxProvider(config.sandboxProviders.local.image ?? process.env.HF_LOCAL_SANDBOX_IMAGE ?? DEFAULT_LOCAL_SANDBOX_IMAGE);
+  },
+});
+
+async function broadcastProcesses(c: any, actions: Record<string, (...args: any[]) => Promise<any>>): Promise<void> {
+  try {
+    const listed = await actions.listProcesses(c);
+    c.broadcast("processesUpdated", {
+      type: "processesUpdated",
+      processes: listed.processes ?? [],
+    });
+  } catch (error) {
+    // Process broadcasts are best-effort. Callers still receive the primary action result.
+    logActorWarning("taskSandbox", "broadcastProcesses failed", {
+      sandboxId: c.state?.sandboxId,
+      error: resolveErrorMessage(error),
+    });
+  }
+}
+
+async function providerForConnection(c: any): Promise<any | null> {
+  if (c.state.sandboxDestroyed || !c.state.sandboxId) {
+    return null;
+  }
+
+  if (c.vars.provider) {
+    return c.vars.provider;
+  }
+
+  const providerFactory = baseTaskSandbox.config.actions as Record<string, unknown>;
+  void providerFactory;
+  const { config } = getActorRuntimeContext();
+  const { organizationId, taskId } = parseTaskSandboxKey(c.key);
+  const organization = await c.client().organization.getOrCreate(organizationKey(organizationId), {
+    createWithInput: organizationId,
+  });
+  const task = await organization.getTask({ organizationId, taskId });
+  const sandboxProviderId = resolveSandboxProviderId(config, task.sandboxProviderId);
+
+  const provider =
+    sandboxProviderId === "e2b"
+      ? e2b({
+          create: () => ({
+            template: config.sandboxProviders.e2b.template ?? "sandbox-agent-full-0.5.x",
+            envs: sandboxEnvObject(),
+          }),
+          installAgents: ["claude", "codex"],
+        })
+      : createLocalSandboxProvider(config.sandboxProviders.local.image ?? process.env.HF_LOCAL_SANDBOX_IMAGE ?? DEFAULT_LOCAL_SANDBOX_IMAGE);
+
+  c.vars.provider = provider;
+  return provider;
+}
+
+async function listWorkspaceModelGroupsForSandbox(c: any): Promise<WorkspaceModelGroup[]> {
+  const provider = await providerForConnection(c);
+  if (!provider || !c.state.sandboxId || typeof provider.connectAgent !== "function") {
+    return DEFAULT_WORKSPACE_MODEL_GROUPS;
+  }
+
+  try {
+    const client = await provider.connectAgent(c.state.sandboxId, {
+      waitForHealth: {
+        timeoutMs: 15_000,
+      },
+    });
+    const listed = await client.listAgents({ config: true });
+    const groups = workspaceModelGroupsFromSandboxAgents(Array.isArray(listed?.agents) ? listed.agents : []);
+    return groups.length > 0 ? groups : DEFAULT_WORKSPACE_MODEL_GROUPS;
+  } catch {
+    return DEFAULT_WORKSPACE_MODEL_GROUPS;
+  }
+}
+
+const baseActions = baseTaskSandbox.config.actions as Record<string, (c: any, ...args: any[]) => Promise<any>>;
+
+// ---------------------------------------------------------------------------
+// Dynamic repo CWD resolution
+// ---------------------------------------------------------------------------
+
+let cachedRepoCwd: string | null = null;
+
+/**
+ * Resolve the repo CWD inside the sandbox by querying `$HOME`.
+ * Different providers run as different users (E2B: `/home/user`, local Docker:
+ * `/home/sandbox`), so the path must be resolved dynamically. The result is
+ * cached for the lifetime of this sandbox actor instance.
+ */
+async function resolveRepoCwd(c: any): Promise<string> {
+  if (cachedRepoCwd) return cachedRepoCwd;
+
+  try {
+    const result = await baseActions.runProcess(c, {
+      command: "bash",
+      args: ["-lc", "echo $HOME"],
+      cwd: "/",
+      timeoutMs: 10_000,
+    });
+    const home = (result.stdout ?? result.result ?? "").trim();
+    if (home && home.startsWith("/")) {
+      cachedRepoCwd = `${home}/repo`;
+      return cachedRepoCwd;
+    }
+  } catch (error) {
+    logActorWarning("taskSandbox", "failed to resolve $HOME, using default", {
+      error: resolveErrorMessage(error),
+    });
+  }
+
+  cachedRepoCwd = DEFAULT_SANDBOX_REPO_CWD;
+  return cachedRepoCwd;
+}
+
+// ---------------------------------------------------------------------------
+// Queue names for sandbox actor
+// ---------------------------------------------------------------------------
+
+const SANDBOX_QUEUE_NAMES = [
+  "sandbox.command.createSession",
+  "sandbox.command.resumeOrCreateSession",
+  "sandbox.command.destroySession",
+  "sandbox.command.createProcess",
+  "sandbox.command.stopProcess",
+  "sandbox.command.killProcess",
+  "sandbox.command.deleteProcess",
+] as const;
+
+type SandboxQueueName = (typeof SANDBOX_QUEUE_NAMES)[number];
+
+function sandboxWorkflowQueueName(name: SandboxQueueName): SandboxQueueName {
+  return name;
+}
+
+// ---------------------------------------------------------------------------
+// Mutation handlers — executed inside the workflow command loop
+// ---------------------------------------------------------------------------
+
+async function createSessionMutation(c: any, request: any): Promise<any> {
+  const session = await baseActions.createSession(c, request);
+  const sessionId = typeof request?.id === "string" && request.id.length > 0 ? request.id : session?.id;
+  const modeId = modeIdForAgent(request?.agent);
+  if (sessionId && modeId) {
+    try {
+      await baseActions.rawSendSessionMethod(c, sessionId, "session/set_mode", { modeId });
+    } catch {
+      // Session mode updates are best-effort.
+    }
+  }
+  return sanitizeActorResult(session);
+}
+
+async function resumeOrCreateSessionMutation(c: any, request: any): Promise<any> {
+  return sanitizeActorResult(await baseActions.resumeOrCreateSession(c, request));
+}
+
+async function destroySessionMutation(c: any, sessionId: string): Promise<any> {
+  return sanitizeActorResult(await baseActions.destroySession(c, sessionId));
+}
+
+async function createProcessMutation(c: any, request: any): Promise<any> {
+  const created = await baseActions.createProcess(c, request);
+  await broadcastProcesses(c, baseActions);
+  return created;
+}
+
+async function runProcessMutation(c: any, request: any): Promise<any> {
+  const result = await baseActions.runProcess(c, request);
+  await broadcastProcesses(c, baseActions);
+  return result;
+}
+
+async function stopProcessMutation(c: any, processId: string, query?: any): Promise<any> {
+  const stopped = await baseActions.stopProcess(c, processId, query);
+  await broadcastProcesses(c, baseActions);
+  return stopped;
+}
+
+async function killProcessMutation(c: any, processId: string, query?: any): Promise<any> {
+  const killed = await baseActions.killProcess(c, processId, query);
+  await broadcastProcesses(c, baseActions);
+  return killed;
+}
+
+async function deleteProcessMutation(c: any, processId: string): Promise<void> {
+  await baseActions.deleteProcess(c, processId);
+  await broadcastProcesses(c, baseActions);
+}
+
+// ---------------------------------------------------------------------------
+// Workflow command loop
+// ---------------------------------------------------------------------------
+
+type SandboxWorkflowHandler = (loopCtx: any, body: any) => Promise<any>;
+
+const SANDBOX_COMMAND_HANDLERS: Record<SandboxQueueName, SandboxWorkflowHandler> = {
+  "sandbox.command.createSession": async (c, body) => createSessionMutation(c, body),
+  "sandbox.command.resumeOrCreateSession": async (c, body) => resumeOrCreateSessionMutation(c, body),
+  "sandbox.command.destroySession": async (c, body) => destroySessionMutation(c, body?.sessionId),
+  "sandbox.command.createProcess": async (c, body) => createProcessMutation(c, body),
+  "sandbox.command.stopProcess": async (c, body) => stopProcessMutation(c, body?.processId, body?.query),
+  "sandbox.command.killProcess": async (c, body) => killProcessMutation(c, body?.processId, body?.query),
+  "sandbox.command.deleteProcess": async (c, body) => {
+    await deleteProcessMutation(c, body?.processId);
+    return { ok: true };
+  },
+};
+
+async function runSandboxWorkflow(ctx: any): Promise<void> {
+  await ctx.loop("sandbox-command-loop", async (loopCtx: any) => {
+    const msg = await loopCtx.queue.next("next-sandbox-command", {
+      names: [...SANDBOX_QUEUE_NAMES],
+      completable: true,
+    });
+
+    if (!msg) {
+      return Loop.continue(undefined);
+    }
+
+    const handler = SANDBOX_COMMAND_HANDLERS[msg.name as SandboxQueueName];
+    if (!handler) {
+      logActorWarning("taskSandbox", "unknown sandbox command", { command: msg.name });
+      await msg.complete({ error: `Unknown command: ${msg.name}` }).catch(() => {});
+      return Loop.continue(undefined);
+    }
+
+    try {
+      // Wrap in a step so c.state and c.db are accessible inside mutation functions.
+      const result = await loopCtx.step({
+        name: msg.name,
+        timeout: 10 * 60_000,
+        run: async () => handler(loopCtx, msg.body),
+      });
+      try {
+        await msg.complete(result);
+      } catch (completeError) {
+        logActorWarning("taskSandbox", "sandbox workflow failed completing response", {
+          command: msg.name,
+          error: resolveErrorMessage(completeError),
+        });
+      }
+    } catch (error) {
+      const message = resolveErrorMessage(error);
+      logActorWarning("taskSandbox", "sandbox workflow command failed", {
+        command: msg.name,
+        error: message,
+      });
+      await msg.complete({ error: message }).catch(() => {});
+    }
+
+    return Loop.continue(undefined);
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Actor definition
+// ---------------------------------------------------------------------------
+
+export const taskSandbox = actor({
+  ...baseTaskSandbox.config,
+  queues: Object.fromEntries(SANDBOX_QUEUE_NAMES.map((name) => [name, queue()])),
+  options: {
+    ...baseTaskSandbox.config.options,
+    actionTimeout: 10 * 60_000,
+  },
+  actions: {
+    ...baseActions,
+
+    // Read actions — direct (no queue)
+    async resumeSession(c: any, sessionId: string): Promise<any> {
+      return sanitizeActorResult(await baseActions.resumeSession(c, sessionId));
+    },
+
+    async getSession(c: any, sessionId: string): Promise<any> {
+      return sanitizeActorResult(await baseActions.getSession(c, sessionId));
+    },
+
+    async listSessions(c: any, query?: any): Promise<any> {
+      return sanitizeActorResult(await baseActions.listSessions(c, query));
+    },
+
+    async listProcesses(c: any): Promise<any> {
+      try {
+        return await baseActions.listProcesses(c);
+      } catch (error) {
+        // Sandbox may be gone (E2B timeout, destroyed, etc.) — degrade to empty
+        logActorWarning("taskSandbox", "listProcesses failed, sandbox may be expired", {
+          sandboxId: c.state.sandboxId,
+          error: resolveErrorMessage(error),
+        });
+        return { processes: [] };
+      }
+    },
+
+    async sandboxAgentConnection(c: any): Promise<{ endpoint: string; token?: string }> {
+      const provider = await providerForConnection(c);
+      if (!provider || !c.state.sandboxId) {
+        return { endpoint: "mock://terminal-unavailable" };
+      }
+
+      try {
+        return {
+          endpoint: await provider.getUrl(c.state.sandboxId),
+        };
+      } catch {
+        return { endpoint: "mock://terminal-unavailable" };
+      }
+    },
+
+    async listWorkspaceModelGroups(c: any): Promise<WorkspaceModelGroup[]> {
+      return await listWorkspaceModelGroupsForSandbox(c);
+    },
+
+    async providerState(c: any): Promise<{ sandboxProviderId: "e2b" | "local"; sandboxId: string; state: string; at: number }> {
+      const { config } = getActorRuntimeContext();
+      const { taskId } = parseTaskSandboxKey(c.key);
+      const at = Date.now();
+      const sandboxProviderId = resolveSandboxProviderId(config, c.state.providerName === "e2b" ? "e2b" : c.state.providerName === "docker" ? "local" : null);
+
+      if (c.state.sandboxDestroyed) {
+        return { sandboxProviderId, sandboxId: taskId, state: "destroyed", at };
+      }
+
+      if (!c.state.sandboxId) {
+        return { sandboxProviderId, sandboxId: taskId, state: "pending", at };
+      }
+
+      try {
+        const health = await baseActions.getHealth(c);
+        return {
+          sandboxProviderId,
+          sandboxId: taskId,
+          state: health.status === "ok" ? "running" : "degraded",
+          at,
+        };
+      } catch {
+        return {
+          sandboxProviderId,
+          sandboxId: taskId,
+          state: "error",
+          at,
+        };
+      }
+    },
+
+    async repoCwd(c: any): Promise<{ cwd: string }> {
+      const resolved = await resolveRepoCwd(c);
+      return { cwd: resolved };
+    },
+
+    // Long-running action — kept as direct action to avoid blocking the
+    // workflow loop (prompt responses can take minutes).
+    async sendPrompt(c: any, request: { sessionId: string; prompt: string }): Promise<any> {
+      const text = typeof request?.prompt === "string" ? request.prompt.trim() : "";
+      if (!text) {
+        return null;
+      }
+
+      const session = await baseActions.resumeSession(c, request.sessionId);
+      if (!session || typeof session.prompt !== "function") {
+        throw new Error(`session '${request.sessionId}' not found`);
+      }
+
+      return sanitizeActorResult(await session.prompt([{ type: "text", text }]));
+    },
+
+    // Mutation actions — self-send to queue for workflow history
+    async createSession(c: any, request: any): Promise<any> {
+      const self = selfTaskSandbox(c);
+      return expectQueueResponse(await self.send(sandboxWorkflowQueueName("sandbox.command.createSession"), request ?? {}, { wait: true, timeout: 10_000 }));
+    },
+
+    async resumeOrCreateSession(c: any, request: any): Promise<any> {
+      const self = selfTaskSandbox(c);
+      return expectQueueResponse(
+        await self.send(sandboxWorkflowQueueName("sandbox.command.resumeOrCreateSession"), request ?? {}, { wait: true, timeout: 10_000 }),
+      );
+    },
+
+    async destroySession(c: any, sessionId: string): Promise<any> {
+      const self = selfTaskSandbox(c);
+      return expectQueueResponse(await self.send(sandboxWorkflowQueueName("sandbox.command.destroySession"), { sessionId }, { wait: true, timeout: 10_000 }));
+    },
+
+    async createProcess(c: any, request: any): Promise<any> {
+      const self = selfTaskSandbox(c);
+      return expectQueueResponse(await self.send(sandboxWorkflowQueueName("sandbox.command.createProcess"), request ?? {}, { wait: true, timeout: 10_000 }));
+    },
+
+    // runProcess kept as direct action — response can exceed 128KB queue limit
+    async runProcess(c: any, request: any): Promise<any> {
+      const result = await baseActions.runProcess(c, request);
+      await broadcastProcesses(c, baseActions);
+      return result;
+    },
+
+    async stopProcess(c: any, processId: string, query?: any): Promise<any> {
+      const self = selfTaskSandbox(c);
+      return expectQueueResponse(
+        await self.send(sandboxWorkflowQueueName("sandbox.command.stopProcess"), { processId, query }, { wait: true, timeout: 10_000 }),
+      );
+    },
+
+    async killProcess(c: any, processId: string, query?: any): Promise<any> {
+      const self = selfTaskSandbox(c);
+      return expectQueueResponse(
+        await self.send(sandboxWorkflowQueueName("sandbox.command.killProcess"), { processId, query }, { wait: true, timeout: 10_000 }),
+      );
+    },
+
+    async deleteProcess(c: any, processId: string): Promise<void> {
+      const self = selfTaskSandbox(c);
+      await self.send(sandboxWorkflowQueueName("sandbox.command.deleteProcess"), { processId }, { wait: false });
+    },
+  },
+  run: workflow(runSandboxWorkflow),
+});
+
+export { DEFAULT_SANDBOX_REPO_CWD, resolveRepoCwd };
diff --git a/foundry/packages/backend/src/actors/task/db/db.ts b/foundry/packages/backend/src/actors/task/db/db.ts
new file mode 100644
index 0000000..128f856
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/db.ts
@@ -0,0 +1,5 @@
+import { db } from "rivetkit/db/drizzle";
+import * as schema from "./schema.js";
+import migrations from "./migrations.js";
+
+export const taskDb = db({ schema, migrations });
diff --git a/foundry/packages/backend/src/actors/task/db/drizzle.config.ts b/foundry/packages/backend/src/actors/task/db/drizzle.config.ts
new file mode 100644
index 0000000..d022c36
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/drizzle.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from "rivetkit/db/drizzle";
+
+export default defineConfig({
+  out: "./src/actors/task/db/drizzle",
+  schema: "./src/actors/task/db/schema.ts",
+});
diff --git a/foundry/packages/backend/src/actors/task/db/drizzle/0000_charming_maestro.sql b/foundry/packages/backend/src/actors/task/db/drizzle/0000_charming_maestro.sql
new file mode 100644
index 0000000..c6a346a
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/drizzle/0000_charming_maestro.sql
@@ -0,0 +1,49 @@
+CREATE TABLE `task` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`branch_name` text,
+	`title` text,
+	`task` text NOT NULL,
+	`sandbox_provider_id` text NOT NULL,
+	`status` text NOT NULL,
+	`pull_request_json` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	CONSTRAINT "task_singleton_id_check" CHECK("task"."id" = 1)
+);
+--> statement-breakpoint
+CREATE TABLE `task_runtime` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`active_sandbox_id` text,
+	`active_switch_target` text,
+	`active_cwd` text,
+	`git_state_json` text,
+	`git_state_updated_at` integer,
+	`updated_at` integer NOT NULL,
+	CONSTRAINT "task_runtime_singleton_id_check" CHECK("task_runtime"."id" = 1)
+);
+--> statement-breakpoint
+CREATE TABLE `task_sandboxes` (
+	`sandbox_id` text PRIMARY KEY NOT NULL,
+	`sandbox_provider_id` text NOT NULL,
+	`sandbox_actor_id` text,
+	`switch_target` text NOT NULL,
+	`cwd` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `task_workspace_sessions` (
+	`session_id` text PRIMARY KEY NOT NULL,
+	`sandbox_session_id` text,
+	`session_name` text NOT NULL,
+	`model` text NOT NULL,
+	`status` text DEFAULT 'ready' NOT NULL,
+	`error_message` text,
+	`transcript_json` text DEFAULT '[]' NOT NULL,
+	`transcript_updated_at` integer,
+	`created` integer DEFAULT 1 NOT NULL,
+	`closed` integer DEFAULT 0 NOT NULL,
+	`thinking_since_ms` integer,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
diff --git a/foundry/packages/backend/src/actors/task/db/drizzle/meta/0000_snapshot.json b/foundry/packages/backend/src/actors/task/db/drizzle/meta/0000_snapshot.json
new file mode 100644
index 0000000..7397b89
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/drizzle/meta/0000_snapshot.json
@@ -0,0 +1,324 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "6daaa6d5-3280-46fe-9261-40cabeba1b49",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "tables": {
+    "task": {
+      "name": "task",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch_name": {
+          "name": "branch_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "task": {
+          "name": "task",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sandbox_provider_id": {
+          "name": "sandbox_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_json": {
+          "name": "pull_request_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "task_singleton_id_check": {
+          "name": "task_singleton_id_check",
+          "value": "\"task\".\"id\" = 1"
+        }
+      }
+    },
+    "task_runtime": {
+      "name": "task_runtime",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "active_sandbox_id": {
+          "name": "active_sandbox_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "active_switch_target": {
+          "name": "active_switch_target",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "active_cwd": {
+          "name": "active_cwd",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "git_state_json": {
+          "name": "git_state_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "git_state_updated_at": {
+          "name": "git_state_updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "task_runtime_singleton_id_check": {
+          "name": "task_runtime_singleton_id_check",
+          "value": "\"task_runtime\".\"id\" = 1"
+        }
+      }
+    },
+    "task_sandboxes": {
+      "name": "task_sandboxes",
+      "columns": {
+        "sandbox_id": {
+          "name": "sandbox_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sandbox_provider_id": {
+          "name": "sandbox_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sandbox_actor_id": {
+          "name": "sandbox_actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "switch_target": {
+          "name": "switch_target",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cwd": {
+          "name": "cwd",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "task_workspace_sessions": {
+      "name": "task_workspace_sessions",
+      "columns": {
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sandbox_session_id": {
+          "name": "sandbox_session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "session_name": {
+          "name": "session_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'ready'"
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "transcript_json": {
+          "name": "transcript_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "transcript_updated_at": {
+          "name": "transcript_updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created": {
+          "name": "created",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "closed": {
+          "name": "closed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "thinking_since_ms": {
+          "name": "thinking_since_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/foundry/packages/backend/src/actors/task/db/drizzle/meta/_journal.json b/foundry/packages/backend/src/actors/task/db/drizzle/meta/_journal.json
new file mode 100644
index 0000000..1f9e97e
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/drizzle/meta/_journal.json
@@ -0,0 +1,13 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1773376222525,
+      "tag": "0000_charming_maestro",
+      "breakpoints": true
+    }
+  ]
+}
diff --git a/foundry/packages/backend/src/actors/task/db/migrations.ts b/foundry/packages/backend/src/actors/task/db/migrations.ts
new file mode 100644
index 0000000..61b0dff
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/migrations.ts
@@ -0,0 +1,86 @@
+// This file is generated by src/actors/_scripts/generate-actor-migrations.ts.
+// Source of truth is drizzle-kit output under ./drizzle (meta/_journal.json + *.sql).
+// Do not hand-edit this file.
+
+const journal = {
+  entries: [
+    {
+      idx: 0,
+      when: 1773376222525,
+      tag: "0000_charming_maestro",
+      breakpoints: true,
+    },
+    {
+      idx: 1,
+      when: 1773984000000,
+      tag: "0001_add_task_owner",
+      breakpoints: true,
+    },
+  ],
+} as const;
+
+export default {
+  journal,
+  migrations: {
+    m0000: `CREATE TABLE \`task\` (
+	\`id\` integer PRIMARY KEY NOT NULL,
+	\`branch_name\` text,
+	\`title\` text,
+	\`task\` text NOT NULL,
+	\`sandbox_provider_id\` text NOT NULL,
+	\`status\` text NOT NULL,
+	\`pull_request_json\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL,
+	CONSTRAINT "task_singleton_id_check" CHECK("task"."id" = 1)
+);
+--> statement-breakpoint
+CREATE TABLE \`task_runtime\` (
+	\`id\` integer PRIMARY KEY NOT NULL,
+	\`active_sandbox_id\` text,
+	\`active_switch_target\` text,
+	\`active_cwd\` text,
+	\`git_state_json\` text,
+	\`git_state_updated_at\` integer,
+	\`updated_at\` integer NOT NULL,
+	CONSTRAINT "task_runtime_singleton_id_check" CHECK("task_runtime"."id" = 1)
+);
+--> statement-breakpoint
+CREATE TABLE \`task_sandboxes\` (
+	\`sandbox_id\` text PRIMARY KEY NOT NULL,
+	\`sandbox_provider_id\` text NOT NULL,
+	\`sandbox_actor_id\` text,
+	\`switch_target\` text NOT NULL,
+	\`cwd\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE \`task_workspace_sessions\` (
+	\`session_id\` text PRIMARY KEY NOT NULL,
+	\`sandbox_session_id\` text,
+	\`session_name\` text NOT NULL,
+	\`model\` text NOT NULL,
+	\`status\` text DEFAULT 'ready' NOT NULL,
+	\`error_message\` text,
+	\`transcript_json\` text DEFAULT '[]' NOT NULL,
+	\`transcript_updated_at\` integer,
+	\`created\` integer DEFAULT 1 NOT NULL,
+	\`closed\` integer DEFAULT 0 NOT NULL,
+	\`thinking_since_ms\` integer,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+`,
+    m0001: `CREATE TABLE \`task_owner\` (
+	\`id\` integer PRIMARY KEY NOT NULL,
+	\`primary_user_id\` text,
+	\`primary_github_login\` text,
+	\`primary_github_email\` text,
+	\`primary_github_avatar_url\` text,
+	\`updated_at\` integer NOT NULL,
+	CONSTRAINT "task_owner_singleton_id_check" CHECK("task_owner"."id" = 1)
+);
+`,
+  } as const,
+};
diff --git a/foundry/packages/backend/src/actors/task/db/schema.ts b/foundry/packages/backend/src/actors/task/db/schema.ts
new file mode 100644
index 0000000..bdb7cf7
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/db/schema.ts
@@ -0,0 +1,88 @@
+import { check, integer, sqliteTable, text } from "rivetkit/db/drizzle";
+import { sql } from "drizzle-orm";
+
+// SQLite is per task actor instance, so these tables only ever store one row (id=1).
+export const task = sqliteTable(
+  "task",
+  {
+    id: integer("id").primaryKey(),
+    branchName: text("branch_name"),
+    title: text("title"),
+    task: text("task").notNull(),
+    sandboxProviderId: text("sandbox_provider_id").notNull(),
+    status: text("status").notNull(),
+    pullRequestJson: text("pull_request_json"),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => [check("task_singleton_id_check", sql`${table.id} = 1`)],
+);
+
+export const taskRuntime = sqliteTable(
+  "task_runtime",
+  {
+    id: integer("id").primaryKey(),
+    activeSandboxId: text("active_sandbox_id"),
+    activeSwitchTarget: text("active_switch_target"),
+    activeCwd: text("active_cwd"),
+    gitStateJson: text("git_state_json"),
+    gitStateUpdatedAt: integer("git_state_updated_at"),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => [check("task_runtime_singleton_id_check", sql`${table.id} = 1`)],
+);
+
+/**
+ * Coordinator index of SandboxInstanceActor instances.
+ * Tracks all sandbox instances provisioned for this task. Only one
+ * is active at a time (referenced by taskRuntime.activeSandboxId).
+ */
+export const taskSandboxes = sqliteTable("task_sandboxes", {
+  sandboxId: text("sandbox_id").notNull().primaryKey(),
+  sandboxProviderId: text("sandbox_provider_id").notNull(),
+  sandboxActorId: text("sandbox_actor_id"),
+  switchTarget: text("switch_target").notNull(),
+  cwd: text("cwd"),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+/**
+ * Single-row table tracking the primary user (owner) of this task.
+ * The owner's GitHub OAuth credentials are injected into the sandbox
+ * for git operations. Updated when a different user sends a message.
+ */
+export const taskOwner = sqliteTable(
+  "task_owner",
+  {
+    id: integer("id").primaryKey(),
+    primaryUserId: text("primary_user_id"),
+    primaryGithubLogin: text("primary_github_login"),
+    primaryGithubEmail: text("primary_github_email"),
+    primaryGithubAvatarUrl: text("primary_github_avatar_url"),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => [check("task_owner_singleton_id_check", sql`${table.id} = 1`)],
+);
+
+/**
+ * Coordinator index of workspace sessions within this task.
+ * The task actor is the coordinator for sessions. Each row holds session
+ * metadata, model, status, transcript, and draft state. Sessions are
+ * sub-entities of the task — no separate session actor in the DB.
+ */
+export const taskWorkspaceSessions = sqliteTable("task_workspace_sessions", {
+  sessionId: text("session_id").notNull().primaryKey(),
+  sandboxSessionId: text("sandbox_session_id"),
+  sessionName: text("session_name").notNull(),
+  model: text("model").notNull(),
+  status: text("status").notNull().default("ready"),
+  errorMessage: text("error_message"),
+  transcriptJson: text("transcript_json").notNull().default("[]"),
+  transcriptUpdatedAt: integer("transcript_updated_at"),
+  created: integer("created").notNull().default(1),
+  closed: integer("closed").notNull().default(0),
+  thinkingSinceMs: integer("thinking_since_ms"),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
diff --git a/foundry/packages/backend/src/actors/task/index.ts b/foundry/packages/backend/src/actors/task/index.ts
new file mode 100644
index 0000000..68bee1c
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/index.ts
@@ -0,0 +1,99 @@
+import { actor, queue } from "rivetkit";
+import { workflow } from "rivetkit/workflow";
+import type { TaskRecord } from "@sandbox-agent/foundry-shared";
+import { taskDb } from "./db/db.js";
+import { getCurrentRecord } from "./workflow/common.js";
+import {
+  changeWorkspaceModel,
+  getSessionDetail,
+  getTaskDetail,
+  getTaskSummary,
+  markWorkspaceUnread,
+  refreshWorkspaceDerivedState,
+  refreshWorkspaceSessionTranscript,
+  renameWorkspaceSession,
+  renameWorkspaceTask,
+  selectWorkspaceSession,
+  setWorkspaceSessionUnread,
+  syncTaskPullRequest,
+  syncWorkspaceSessionStatus,
+  updateWorkspaceDraft,
+} from "./workspace.js";
+import { runTaskWorkflow } from "./workflow/index.js";
+import { TASK_QUEUE_NAMES } from "./workflow/queue.js";
+
+export interface TaskInput {
+  organizationId: string;
+  repoId: string;
+  taskId: string;
+}
+
+export const task = actor({
+  db: taskDb,
+  queues: Object.fromEntries(TASK_QUEUE_NAMES.map((name) => [name, queue()])),
+  options: {
+    name: "Task",
+    icon: "wrench",
+    actionTimeout: 10 * 60_000,
+  },
+  createState: (_c, input: TaskInput) => ({
+    organizationId: input.organizationId,
+    repoId: input.repoId,
+    taskId: input.taskId,
+  }),
+  actions: {
+    async get(c): Promise<TaskRecord> {
+      return await getCurrentRecord(c);
+    },
+
+    async getTaskSummary(c) {
+      return await getTaskSummary(c);
+    },
+
+    async getTaskDetail(c, input?: { authSessionId?: string }) {
+      return await getTaskDetail(c, input?.authSessionId);
+    },
+
+    async getSessionDetail(c, input: { sessionId: string; authSessionId?: string }) {
+      return await getSessionDetail(c, input.sessionId, input.authSessionId);
+    },
+
+    // Direct actions migrated from queue:
+    async markUnread(c, input: { authSessionId?: string }) {
+      await markWorkspaceUnread(c, input?.authSessionId);
+    },
+    async renameTask(c, input: { value: string }) {
+      await renameWorkspaceTask(c, input.value);
+    },
+    async renameSession(c, input: { sessionId: string; title: string }) {
+      await renameWorkspaceSession(c, input.sessionId, input.title);
+    },
+    async selectSession(c, input: { sessionId: string; authSessionId?: string }) {
+      await selectWorkspaceSession(c, input.sessionId, input?.authSessionId);
+    },
+    async setSessionUnread(c, input: { sessionId: string; unread: boolean; authSessionId?: string }) {
+      await setWorkspaceSessionUnread(c, input.sessionId, input.unread, input?.authSessionId);
+    },
+    async updateDraft(c, input: { sessionId: string; text: string; attachments: any[]; authSessionId?: string }) {
+      await updateWorkspaceDraft(c, input.sessionId, input.text, input.attachments, input?.authSessionId);
+    },
+    async changeModel(c, input: { sessionId: string; model: string; authSessionId?: string }) {
+      await changeWorkspaceModel(c, input.sessionId, input.model, input?.authSessionId);
+    },
+    async refreshSessionTranscript(c, input: { sessionId: string }) {
+      await refreshWorkspaceSessionTranscript(c, input.sessionId);
+    },
+    async refreshDerived(c) {
+      await refreshWorkspaceDerivedState(c);
+    },
+    async syncSessionStatus(c, input: { sessionId: string; status: "running" | "idle" | "error"; at: number }) {
+      await syncWorkspaceSessionStatus(c, input.sessionId, input.status, input.at);
+    },
+    async syncPullRequest(c, input: { pullRequest: any }) {
+      await syncTaskPullRequest(c, input?.pullRequest ?? null);
+    },
+  },
+  run: workflow(runTaskWorkflow),
+});
+
+export { taskWorkflowQueueName } from "./workflow/index.js";
diff --git a/foundry/packages/backend/src/actors/task/workflow/commands.ts b/foundry/packages/backend/src/actors/task/workflow/commands.ts
new file mode 100644
index 0000000..7ba2d2b
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workflow/commands.ts
@@ -0,0 +1,119 @@
+// @ts-nocheck
+import { eq } from "drizzle-orm";
+import { getTaskSandbox } from "../../handles.js";
+import { logActorWarning, resolveErrorMessage } from "../../logging.js";
+import { task as taskTable } from "../db/schema.js";
+import { TASK_ROW_ID, appendAuditLog, getCurrentRecord, setTaskState } from "./common.js";
+import { pushActiveBranchActivity } from "./push.js";
+
+async function withTimeout<T>(promise: Promise<T>, timeoutMs: number, label: string): Promise<T> {
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise<T>((_resolve, reject) => {
+        timer = setTimeout(() => reject(new Error(`${label} timed out after ${timeoutMs}ms`)), timeoutMs);
+      }),
+    ]);
+  } finally {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  }
+}
+
+export async function handleAttachActivity(loopCtx: any, msg: any): Promise<void> {
+  const record = await getCurrentRecord(loopCtx);
+  let target = record.sandboxes.find((sandbox: any) => sandbox.sandboxId === record.activeSandboxId)?.switchTarget ?? "";
+  const sessionId = msg.body?.sessionId ?? null;
+
+  if (record.activeSandboxId) {
+    try {
+      const sandbox = getTaskSandbox(loopCtx, loopCtx.state.organizationId, record.activeSandboxId);
+      const connection = await sandbox.sandboxAgentConnection();
+      if (typeof connection?.endpoint === "string" && connection.endpoint.length > 0) {
+        target = connection.endpoint;
+      }
+    } catch {
+      // Best effort; keep the last known switch target if the sandbox actor is unavailable.
+    }
+  }
+
+  await appendAuditLog(loopCtx, "task.attach", {
+    target,
+    sessionId,
+  });
+
+  await msg.complete({
+    target,
+    sessionId,
+  });
+}
+
+export async function handleSwitchActivity(loopCtx: any, msg: any): Promise<void> {
+  const db = loopCtx.db;
+  const runtime = await db.select({ switchTarget: taskRuntime.activeSwitchTarget }).from(taskRuntime).where(eq(taskRuntime.id, TASK_ROW_ID)).get();
+
+  await msg.complete({ switchTarget: runtime?.switchTarget ?? "" });
+}
+
+export async function handlePushActivity(loopCtx: any, msg: any): Promise<void> {
+  await pushActiveBranchActivity(loopCtx, {
+    reason: msg.body?.reason ?? null,
+    historyKind: "task.push",
+  });
+  await msg.complete({ ok: true });
+}
+
+export async function handleSimpleCommandActivity(loopCtx: any, msg: any, historyKind: string): Promise<void> {
+  await appendAuditLog(loopCtx, historyKind, { reason: msg.body?.reason ?? null });
+  await msg.complete({ ok: true });
+}
+
+export async function handleArchiveActivity(loopCtx: any, msg: any): Promise<void> {
+  await setTaskState(loopCtx, "archive_stop_status_sync");
+  const record = await getCurrentRecord(loopCtx);
+
+  if (record.activeSandboxId) {
+    await setTaskState(loopCtx, "archive_release_sandbox");
+    void withTimeout(getTaskSandbox(loopCtx, loopCtx.state.organizationId, record.activeSandboxId).destroy(), 45_000, "sandbox destroy").catch((error) => {
+      logActorWarning("task.commands", "failed to release sandbox during archive", {
+        organizationId: loopCtx.state.organizationId,
+        repoId: loopCtx.state.repoId,
+        taskId: loopCtx.state.taskId,
+        sandboxId: record.activeSandboxId,
+        error: resolveErrorMessage(error),
+      });
+    });
+  }
+
+  const db = loopCtx.db;
+  await setTaskState(loopCtx, "archive_finalize");
+  await db.update(taskTable).set({ status: "archived", updatedAt: Date.now() }).where(eq(taskTable.id, TASK_ROW_ID)).run();
+
+  await appendAuditLog(loopCtx, "task.archive", { reason: msg.body?.reason ?? null });
+  await msg.complete({ ok: true });
+}
+
+export async function killDestroySandboxActivity(loopCtx: any): Promise<void> {
+  await setTaskState(loopCtx, "kill_destroy_sandbox");
+  const record = await getCurrentRecord(loopCtx);
+  if (!record.activeSandboxId) {
+    return;
+  }
+
+  await getTaskSandbox(loopCtx, loopCtx.state.organizationId, record.activeSandboxId).destroy();
+}
+
+export async function killWriteDbActivity(loopCtx: any, msg: any): Promise<void> {
+  await setTaskState(loopCtx, "kill_finalize");
+  const db = loopCtx.db;
+  await db.update(taskTable).set({ status: "killed", updatedAt: Date.now() }).where(eq(taskTable.id, TASK_ROW_ID)).run();
+
+  await appendAuditLog(loopCtx, "task.kill", { reason: msg.body?.reason ?? null });
+  await msg.complete({ ok: true });
+}
+
+export async function handleGetActivity(loopCtx: any, msg: any): Promise<void> {
+  await msg.complete(await getCurrentRecord(loopCtx));
+}
diff --git a/foundry/packages/backend/src/actors/task/workflow/common.ts b/foundry/packages/backend/src/actors/task/workflow/common.ts
new file mode 100644
index 0000000..cbe63e6
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workflow/common.ts
@@ -0,0 +1,201 @@
+// @ts-nocheck
+import { eq } from "drizzle-orm";
+import type { TaskRecord, TaskStatus } from "@sandbox-agent/foundry-shared";
+import { task as taskTable, taskRuntime, taskSandboxes } from "../db/schema.js";
+import { getOrCreateAuditLog, getOrCreateOrganization } from "../../handles.js";
+import { broadcastTaskUpdate } from "../workspace.js";
+import { getActorRuntimeContext } from "../../context.js";
+import { defaultSandboxProviderId } from "../../../sandbox-config.js";
+
+export const TASK_ROW_ID = 1;
+
+export function collectErrorMessages(error: unknown): string[] {
+  if (error == null) {
+    return [];
+  }
+
+  const out: string[] = [];
+  const seen = new Set<unknown>();
+  let current: unknown = error;
+
+  while (current != null && !seen.has(current)) {
+    seen.add(current);
+
+    if (current instanceof Error) {
+      const message = current.message?.trim();
+      if (message) {
+        out.push(message);
+      }
+      current = (current as { cause?: unknown }).cause;
+      continue;
+    }
+
+    if (typeof current === "string") {
+      const message = current.trim();
+      if (message) {
+        out.push(message);
+      }
+      break;
+    }
+
+    break;
+  }
+
+  return out.filter((msg, index) => out.indexOf(msg) === index);
+}
+
+export function resolveErrorDetail(error: unknown): string {
+  const messages = collectErrorMessages(error);
+  if (messages.length === 0) {
+    return String(error);
+  }
+
+  const nonWorkflowWrapper = messages.find((msg) => !/^Step\s+"[^"]+"\s+failed\b/i.test(msg));
+  return nonWorkflowWrapper ?? messages[0]!;
+}
+
+export function buildAgentPrompt(task: string): string {
+  return task.trim();
+}
+
+export async function setTaskState(ctx: any, status: TaskStatus): Promise<void> {
+  const now = Date.now();
+  const db = ctx.db;
+  await db.update(taskTable).set({ status, updatedAt: now }).where(eq(taskTable.id, TASK_ROW_ID)).run();
+
+  await broadcastTaskUpdate(ctx);
+}
+
+/**
+ * Read the task's current record from its local SQLite DB.
+ * If the task actor was lazily created (virtual task from PR sync) and has no
+ * DB rows yet, auto-initializes by reading branch/title from the org actor's
+ * getTaskIndexEntry. This is the self-initialization path for lazy task actors.
+ */
+export async function getCurrentRecord(ctx: any): Promise<TaskRecord> {
+  const db = ctx.db;
+  const organization = await getOrCreateOrganization(ctx, ctx.state.organizationId);
+  let row = await db
+    .select({
+      branchName: taskTable.branchName,
+      title: taskTable.title,
+      task: taskTable.task,
+      sandboxProviderId: taskTable.sandboxProviderId,
+      status: taskTable.status,
+      pullRequestJson: taskTable.pullRequestJson,
+      activeSandboxId: taskRuntime.activeSandboxId,
+      createdAt: taskTable.createdAt,
+      updatedAt: taskTable.updatedAt,
+    })
+    .from(taskTable)
+    .leftJoin(taskRuntime, eq(taskTable.id, taskRuntime.id))
+    .where(eq(taskTable.id, TASK_ROW_ID))
+    .get();
+
+  if (!row) {
+    // Virtual task — auto-initialize from org actor's task index data
+    let branchName: string | null = null;
+    let title = "Untitled";
+    try {
+      const entry = await organization.getTaskIndexEntry({ taskId: ctx.state.taskId });
+      branchName = entry?.branchName ?? null;
+      title = entry?.title ?? title;
+    } catch {}
+
+    const { config } = getActorRuntimeContext();
+    const { initBootstrapDbActivity, initCompleteActivity } = await import("./init.js");
+    await initBootstrapDbActivity(ctx, {
+      sandboxProviderId: defaultSandboxProviderId(config),
+      branchName,
+      title,
+      task: title,
+    });
+    await initCompleteActivity(ctx, { sandboxProviderId: defaultSandboxProviderId(config) });
+
+    // Re-read the row after initialization
+    const initialized = await db
+      .select({
+        branchName: taskTable.branchName,
+        title: taskTable.title,
+        task: taskTable.task,
+        sandboxProviderId: taskTable.sandboxProviderId,
+        status: taskTable.status,
+        pullRequestJson: taskTable.pullRequestJson,
+        activeSandboxId: taskRuntime.activeSandboxId,
+        createdAt: taskTable.createdAt,
+        updatedAt: taskTable.updatedAt,
+      })
+      .from(taskTable)
+      .leftJoin(taskRuntime, eq(taskTable.id, taskRuntime.id))
+      .where(eq(taskTable.id, TASK_ROW_ID))
+      .get();
+
+    if (!initialized) {
+      throw new Error(`Task not found after initialization: ${ctx.state.taskId}`);
+    }
+
+    row = initialized;
+  }
+
+  const repositoryMetadata = await organization.getRepositoryMetadata({ repoId: ctx.state.repoId });
+  let pullRequest = null;
+  if (row.pullRequestJson) {
+    try {
+      pullRequest = JSON.parse(row.pullRequestJson);
+    } catch {
+      pullRequest = null;
+    }
+  }
+
+  const sandboxes = await db
+    .select({
+      sandboxId: taskSandboxes.sandboxId,
+      sandboxProviderId: taskSandboxes.sandboxProviderId,
+      sandboxActorId: taskSandboxes.sandboxActorId,
+      switchTarget: taskSandboxes.switchTarget,
+      cwd: taskSandboxes.cwd,
+      createdAt: taskSandboxes.createdAt,
+      updatedAt: taskSandboxes.updatedAt,
+    })
+    .from(taskSandboxes)
+    .all();
+
+  return {
+    organizationId: ctx.state.organizationId,
+    repoId: ctx.state.repoId,
+    repoRemote: repositoryMetadata.remoteUrl,
+    taskId: ctx.state.taskId,
+    branchName: row.branchName,
+    title: row.title,
+    task: row.task,
+    sandboxProviderId: row.sandboxProviderId,
+    status: row.status,
+    activeSandboxId: row.activeSandboxId ?? null,
+    pullRequest,
+    sandboxes: sandboxes.map((sb) => ({
+      sandboxId: sb.sandboxId,
+      sandboxProviderId: sb.sandboxProviderId,
+      sandboxActorId: sb.sandboxActorId ?? null,
+      switchTarget: sb.switchTarget,
+      cwd: sb.cwd ?? null,
+      createdAt: sb.createdAt,
+      updatedAt: sb.updatedAt,
+    })),
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  } as TaskRecord;
+}
+
+export async function appendAuditLog(ctx: any, kind: string, payload: Record<string, unknown>): Promise<void> {
+  const row = await ctx.db.select({ branchName: taskTable.branchName }).from(taskTable).where(eq(taskTable.id, TASK_ROW_ID)).get();
+  const auditLog = await getOrCreateAuditLog(ctx, ctx.state.organizationId);
+  void auditLog.append({
+    kind,
+    repoId: ctx.state.repoId,
+    taskId: ctx.state.taskId,
+    branchName: row?.branchName ?? null,
+    payload,
+  });
+
+  await broadcastTaskUpdate(ctx);
+}
diff --git a/foundry/packages/backend/src/actors/task/workflow/index.ts b/foundry/packages/backend/src/actors/task/workflow/index.ts
new file mode 100644
index 0000000..75b2da3
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workflow/index.ts
@@ -0,0 +1,185 @@
+// @ts-nocheck
+/**
+ * Task workflow — queue-based command loop.
+ *
+ * Mutations are dispatched through named queues and processed inside the
+ * workflow command loop so that every command appears in the RivetKit
+ * inspector's workflow history. Read actions remain direct (no queue).
+ *
+ * Callers send commands directly via `.send(taskWorkflowQueueName(...), ...)`.
+ */
+import { Loop } from "rivetkit/workflow";
+import { logActorWarning, resolveErrorMessage } from "../../logging.js";
+import { TASK_QUEUE_NAMES, type TaskQueueName, taskWorkflowQueueName } from "./queue.js";
+import { getCurrentRecord } from "./common.js";
+import { initBootstrapDbActivity, initCompleteActivity, initEnqueueProvisionActivity, initFailedActivity } from "./init.js";
+import {
+  handleArchiveActivity,
+  handleAttachActivity,
+  handlePushActivity,
+  handleSimpleCommandActivity,
+  handleSwitchActivity,
+  killDestroySandboxActivity,
+  killWriteDbActivity,
+} from "./commands.js";
+import {
+  changeTaskOwnerManually,
+  closeWorkspaceSession,
+  createWorkspaceSession,
+  ensureWorkspaceSession,
+  publishWorkspacePr,
+  revertWorkspaceFile,
+  sendWorkspaceMessage,
+  stopWorkspaceSession,
+} from "../workspace.js";
+
+export { taskWorkflowQueueName } from "./queue.js";
+
+// ---------------------------------------------------------------------------
+// Workflow command loop — runs inside `run: workflow(runTaskWorkflow)`
+// ---------------------------------------------------------------------------
+
+type WorkflowHandler = (loopCtx: any, msg: any) => Promise<void>;
+
+const COMMAND_HANDLERS: Record<TaskQueueName, WorkflowHandler> = {
+  "task.command.initialize": async (loopCtx, msg) => {
+    await initBootstrapDbActivity(loopCtx, msg.body);
+    await initEnqueueProvisionActivity(loopCtx, msg.body);
+    const record = await getCurrentRecord(loopCtx);
+    await msg.complete(record);
+  },
+
+  "task.command.provision": async (loopCtx, msg) => {
+    try {
+      await initCompleteActivity(loopCtx, msg.body);
+      await msg.complete({ ok: true });
+    } catch (error) {
+      await initFailedActivity(loopCtx, error, msg.body);
+      await msg.complete({ ok: false, error: resolveErrorMessage(error) });
+    }
+  },
+
+  "task.command.attach": async (loopCtx, msg) => {
+    await handleAttachActivity(loopCtx, msg);
+  },
+
+  "task.command.switch": async (loopCtx, msg) => {
+    await handleSwitchActivity(loopCtx, msg);
+  },
+
+  "task.command.push": async (loopCtx, msg) => {
+    await handlePushActivity(loopCtx, msg);
+  },
+
+  "task.command.sync": async (loopCtx, msg) => {
+    await handleSimpleCommandActivity(loopCtx, msg, "task.sync");
+  },
+
+  "task.command.merge": async (loopCtx, msg) => {
+    await handleSimpleCommandActivity(loopCtx, msg, "task.merge");
+  },
+
+  "task.command.archive": async (loopCtx, msg) => {
+    await handleArchiveActivity(loopCtx, msg);
+  },
+
+  "task.command.kill": async (loopCtx, msg) => {
+    await killDestroySandboxActivity(loopCtx);
+    await killWriteDbActivity(loopCtx, msg);
+  },
+
+  "task.command.workspace.create_session": async (loopCtx, msg) => {
+    const result = await createWorkspaceSession(loopCtx, msg.body?.model, msg.body?.authSessionId);
+    await msg.complete(result);
+  },
+
+  "task.command.workspace.create_session_and_send": async (loopCtx, msg) => {
+    try {
+      const created = await createWorkspaceSession(loopCtx, msg.body?.model, msg.body?.authSessionId);
+      await sendWorkspaceMessage(loopCtx, created.sessionId, msg.body.text, [], msg.body?.authSessionId);
+    } catch (error) {
+      logActorWarning("task.workflow", "create_session_and_send failed", {
+        error: resolveErrorMessage(error),
+      });
+    }
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.ensure_session": async (loopCtx, msg) => {
+    await ensureWorkspaceSession(loopCtx, msg.body.sessionId, msg.body?.model, msg.body?.authSessionId);
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.send_message": async (loopCtx, msg) => {
+    await sendWorkspaceMessage(loopCtx, msg.body.sessionId, msg.body.text, msg.body.attachments, msg.body?.authSessionId);
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.stop_session": async (loopCtx, msg) => {
+    await stopWorkspaceSession(loopCtx, msg.body.sessionId);
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.close_session": async (loopCtx, msg) => {
+    await closeWorkspaceSession(loopCtx, msg.body.sessionId, msg.body?.authSessionId);
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.publish_pr": async (loopCtx, msg) => {
+    await publishWorkspacePr(loopCtx);
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.revert_file": async (loopCtx, msg) => {
+    await revertWorkspaceFile(loopCtx, msg.body.path);
+    await msg.complete({ ok: true });
+  },
+
+  "task.command.workspace.change_owner": async (loopCtx, msg) => {
+    await changeTaskOwnerManually(loopCtx, {
+      primaryUserId: msg.body.primaryUserId,
+      primaryGithubLogin: msg.body.primaryGithubLogin,
+      primaryGithubEmail: msg.body.primaryGithubEmail,
+      primaryGithubAvatarUrl: msg.body.primaryGithubAvatarUrl ?? null,
+    });
+    await msg.complete({ ok: true });
+  },
+};
+
+export async function runTaskWorkflow(ctx: any): Promise<void> {
+  await ctx.loop("task-command-loop", async (loopCtx: any) => {
+    const msg = await loopCtx.queue.next("next-task-command", {
+      names: [...TASK_QUEUE_NAMES],
+      completable: true,
+    });
+
+    if (!msg) {
+      return Loop.continue(undefined);
+    }
+
+    const handler = COMMAND_HANDLERS[msg.name as TaskQueueName];
+    if (!handler) {
+      logActorWarning("task.workflow", "unknown task command", { command: msg.name });
+      await msg.complete({ error: `Unknown command: ${msg.name}` }).catch(() => {});
+      return Loop.continue(undefined);
+    }
+
+    try {
+      // Wrap in a step so c.state and c.db are accessible inside mutation functions.
+      await loopCtx.step({
+        name: msg.name,
+        timeout: 10 * 60_000,
+        run: async () => handler(loopCtx, msg),
+      });
+    } catch (error) {
+      const message = resolveErrorMessage(error);
+      logActorWarning("task.workflow", "task workflow command failed", {
+        command: msg.name,
+        error: message,
+      });
+      await msg.complete({ error: message }).catch(() => {});
+    }
+
+    return Loop.continue(undefined);
+  });
+}
diff --git a/foundry/packages/backend/src/actors/task/workflow/init.ts b/foundry/packages/backend/src/actors/task/workflow/init.ts
new file mode 100644
index 0000000..ffdf1d4
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workflow/init.ts
@@ -0,0 +1,166 @@
+// @ts-nocheck
+import { eq } from "drizzle-orm";
+import { getActorRuntimeContext } from "../../context.js";
+import { selfTask } from "../../handles.js";
+import { resolveErrorMessage } from "../../logging.js";
+import { taskWorkflowQueueName } from "./queue.js";
+import { defaultSandboxProviderId } from "../../../sandbox-config.js";
+import { task as taskTable, taskRuntime } from "../db/schema.js";
+import { TASK_ROW_ID, appendAuditLog, collectErrorMessages, resolveErrorDetail, setTaskState } from "./common.js";
+// task actions called directly (no queue)
+
+export async function initBootstrapDbActivity(loopCtx: any, body: any): Promise<void> {
+  const { config } = getActorRuntimeContext();
+  const sandboxProviderId = body?.sandboxProviderId ?? defaultSandboxProviderId(config);
+  const task = body?.task;
+  if (typeof task !== "string" || task.trim().length === 0) {
+    throw new Error("task initialize requires the task prompt");
+  }
+  const now = Date.now();
+
+  await loopCtx.db
+    .insert(taskTable)
+    .values({
+      id: TASK_ROW_ID,
+      branchName: body?.branchName ?? null,
+      title: body?.title ?? null,
+      task,
+      sandboxProviderId,
+      status: "init_bootstrap_db",
+      pullRequestJson: null,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskTable.id,
+      set: {
+        branchName: body?.branchName ?? null,
+        title: body?.title ?? null,
+        task,
+        sandboxProviderId,
+        status: "init_bootstrap_db",
+        pullRequestJson: null,
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  await loopCtx.db
+    .insert(taskRuntime)
+    .values({
+      id: TASK_ROW_ID,
+      activeSandboxId: null,
+      activeSwitchTarget: null,
+      activeCwd: null,
+      gitStateJson: null,
+      gitStateUpdatedAt: null,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskRuntime.id,
+      set: {
+        activeSandboxId: null,
+        activeSwitchTarget: null,
+        activeCwd: null,
+        updatedAt: now,
+      },
+    })
+    .run();
+}
+
+export async function initEnqueueProvisionActivity(loopCtx: any, body: any): Promise<void> {
+  await setTaskState(loopCtx, "init_enqueue_provision");
+
+  const self = selfTask(loopCtx);
+  try {
+    void self.send(taskWorkflowQueueName("task.command.provision"), body ?? {}, { wait: false }).catch(() => {});
+  } catch (error) {
+    logActorWarning("task.init", "background provision command failed", {
+      organizationId: loopCtx.state.organizationId,
+      repoId: loopCtx.state.repoId,
+      taskId: loopCtx.state.taskId,
+      error: resolveErrorMessage(error),
+    });
+    throw error;
+  }
+}
+
+export async function initCompleteActivity(loopCtx: any, body: any): Promise<void> {
+  const now = Date.now();
+  const { config } = getActorRuntimeContext();
+  const sandboxProviderId = body?.sandboxProviderId ?? defaultSandboxProviderId(config);
+
+  await setTaskState(loopCtx, "init_complete");
+  await loopCtx.db
+    .update(taskRuntime)
+    .set({
+      updatedAt: now,
+    })
+    .where(eq(taskRuntime.id, TASK_ROW_ID))
+    .run();
+
+  await appendAuditLog(loopCtx, "task.initialized", {
+    payload: { sandboxProviderId },
+  });
+}
+
+export async function initFailedActivity(loopCtx: any, error: unknown, body?: any): Promise<void> {
+  const now = Date.now();
+  const detail = resolveErrorDetail(error);
+  const messages = collectErrorMessages(error);
+  const { config } = getActorRuntimeContext();
+  const sandboxProviderId = defaultSandboxProviderId(config);
+  const task = typeof body?.task === "string" ? body.task : null;
+
+  await loopCtx.db
+    .insert(taskTable)
+    .values({
+      id: TASK_ROW_ID,
+      branchName: body?.branchName ?? null,
+      title: body?.title ?? null,
+      task: task ?? detail,
+      sandboxProviderId,
+      status: "error",
+      pullRequestJson: null,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskTable.id,
+      set: {
+        branchName: body?.branchName ?? null,
+        title: body?.title ?? null,
+        task: task ?? detail,
+        sandboxProviderId,
+        status: "error",
+        pullRequestJson: null,
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  await loopCtx.db
+    .insert(taskRuntime)
+    .values({
+      id: TASK_ROW_ID,
+      activeSandboxId: null,
+      activeSwitchTarget: null,
+      activeCwd: null,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskRuntime.id,
+      set: {
+        activeSandboxId: null,
+        activeSwitchTarget: null,
+        activeCwd: null,
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  await appendAuditLog(loopCtx, "task.error", {
+    detail,
+    messages,
+  });
+}
diff --git a/foundry/packages/backend/src/actors/task/workflow/push.ts b/foundry/packages/backend/src/actors/task/workflow/push.ts
new file mode 100644
index 0000000..f15ab0b
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workflow/push.ts
@@ -0,0 +1,61 @@
+// @ts-nocheck
+import { getTaskSandbox } from "../../handles.js";
+import { resolveOrganizationGithubAuth } from "../../../services/github-auth.js";
+import { appendAuditLog, getCurrentRecord } from "./common.js";
+
+export interface PushActiveBranchOptions {
+  reason?: string | null;
+  historyKind?: string;
+}
+
+export async function pushActiveBranchActivity(loopCtx: any, options: PushActiveBranchOptions = {}): Promise<void> {
+  const record = await getCurrentRecord(loopCtx);
+  const activeSandboxId = record.activeSandboxId;
+  const branchName = record.branchName;
+
+  if (!activeSandboxId) {
+    throw new Error("cannot push: no active sandbox");
+  }
+  if (!branchName) {
+    throw new Error("cannot push: task branch is not set");
+  }
+
+  const activeSandbox = record.sandboxes.find((sandbox: any) => sandbox.sandboxId === activeSandboxId) ?? null;
+  const cwd = activeSandbox?.cwd ?? null;
+  if (!cwd) {
+    throw new Error("cannot push: active sandbox cwd is not set");
+  }
+
+  const script = [
+    "set -euo pipefail",
+    `cd ${JSON.stringify(cwd)}`,
+    "git rev-parse --verify HEAD >/dev/null",
+    "git config credential.helper '!f() { echo username=x-access-token; echo password=${GH_TOKEN:-$GITHUB_TOKEN}; }; f'",
+    `git push -u origin ${JSON.stringify(branchName)}`,
+  ].join("; ");
+
+  const sandbox = getTaskSandbox(loopCtx, loopCtx.state.organizationId, activeSandboxId);
+  const auth = await resolveOrganizationGithubAuth(loopCtx, loopCtx.state.organizationId);
+  const result = await sandbox.runProcess({
+    command: "bash",
+    args: ["-lc", script],
+    cwd: "/",
+    env: auth?.githubToken
+      ? {
+          GH_TOKEN: auth.githubToken,
+          GITHUB_TOKEN: auth.githubToken,
+        }
+      : undefined,
+    timeoutMs: 5 * 60_000,
+  });
+
+  if ((result.exitCode ?? 0) !== 0) {
+    throw new Error(`git push failed (${result.exitCode ?? 1}): ${[result.stdout, result.stderr].filter(Boolean).join("")}`);
+  }
+
+  await appendAuditLog(loopCtx, options.historyKind ?? "task.push", {
+    reason: options.reason ?? null,
+    branchName,
+    sandboxId: activeSandboxId,
+  });
+}
diff --git a/foundry/packages/backend/src/actors/task/workflow/queue.ts b/foundry/packages/backend/src/actors/task/workflow/queue.ts
new file mode 100644
index 0000000..a49c39a
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workflow/queue.ts
@@ -0,0 +1,26 @@
+export const TASK_QUEUE_NAMES = [
+  "task.command.initialize",
+  "task.command.provision",
+  "task.command.attach",
+  "task.command.switch",
+  "task.command.push",
+  "task.command.sync",
+  "task.command.merge",
+  "task.command.archive",
+  "task.command.kill",
+  "task.command.workspace.create_session",
+  "task.command.workspace.create_session_and_send",
+  "task.command.workspace.ensure_session",
+  "task.command.workspace.send_message",
+  "task.command.workspace.stop_session",
+  "task.command.workspace.close_session",
+  "task.command.workspace.publish_pr",
+  "task.command.workspace.revert_file",
+  "task.command.workspace.change_owner",
+] as const;
+
+export type TaskQueueName = (typeof TASK_QUEUE_NAMES)[number];
+
+export function taskWorkflowQueueName(name: string): string {
+  return name;
+}
diff --git a/foundry/packages/backend/src/actors/task/workspace.ts b/foundry/packages/backend/src/actors/task/workspace.ts
new file mode 100644
index 0000000..0856947
--- /dev/null
+++ b/foundry/packages/backend/src/actors/task/workspace.ts
@@ -0,0 +1,1651 @@
+// @ts-nocheck
+import { randomUUID } from "node:crypto";
+import { basename } from "node:path";
+import { asc, eq } from "drizzle-orm";
+import {
+  DEFAULT_WORKSPACE_MODEL_GROUPS,
+  DEFAULT_WORKSPACE_MODEL_ID,
+  workspaceAgentForModel,
+  workspaceSandboxAgentIdForModel,
+} from "@sandbox-agent/foundry-shared";
+import { getActorRuntimeContext } from "../context.js";
+import { getOrCreateOrganization, getOrCreateTaskSandbox, getOrCreateUser, getTaskSandbox, selfTask } from "../handles.js";
+import { logActorInfo, logActorWarning, resolveErrorMessage } from "../logging.js";
+import { resolveSandboxProviderId } from "../../sandbox-config.js";
+import { getBetterAuthService } from "../../services/better-auth.js";
+import { resolveOrganizationGithubAuth } from "../../services/github-auth.js";
+import { githubRepoFullNameFromRemote } from "../../services/repo.js";
+import { taskWorkflowQueueName } from "./workflow/queue.js";
+import { organizationWorkflowQueueName } from "../organization/queues.js";
+
+import { task as taskTable, taskOwner, taskRuntime, taskSandboxes, taskWorkspaceSessions } from "./db/schema.js";
+import { getCurrentRecord } from "./workflow/common.js";
+
+function emptyGitState() {
+  return {
+    fileChanges: [],
+    diffs: {},
+    fileTree: [],
+    updatedAt: null as number | null,
+  };
+}
+
+const FALLBACK_MODEL = DEFAULT_WORKSPACE_MODEL_ID;
+
+function agentKindForModel(model: string) {
+  return workspaceAgentForModel(model);
+}
+
+export function sandboxAgentIdForModel(model: string) {
+  return workspaceSandboxAgentIdForModel(model);
+}
+
+async function resolveWorkspaceModelGroups(c: any): Promise<any[]> {
+  try {
+    const sandbox = await getOrCreateTaskSandbox(c, c.state.organizationId, stableSandboxId(c));
+    const groups = await sandbox.listWorkspaceModelGroups();
+    return Array.isArray(groups) && groups.length > 0 ? groups : DEFAULT_WORKSPACE_MODEL_GROUPS;
+  } catch {
+    return DEFAULT_WORKSPACE_MODEL_GROUPS;
+  }
+}
+
+async function resolveSandboxAgentForModel(c: any, model: string): Promise<string> {
+  const groups = await resolveWorkspaceModelGroups(c);
+  return workspaceSandboxAgentIdForModel(model, groups);
+}
+
+function repoLabelFromRemote(remoteUrl: string): string {
+  const trimmed = remoteUrl.trim();
+  try {
+    const url = new URL(trimmed.startsWith("http") ? trimmed : `https://${trimmed}`);
+    const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+    if (parts.length >= 2) {
+      return `${parts[0]}/${(parts[1] ?? "").replace(/\.git$/, "")}`;
+    }
+  } catch {
+    // ignore
+  }
+
+  return basename(trimmed.replace(/\.git$/, ""));
+}
+
+async function getRepositoryMetadata(c: any): Promise<{ defaultBranch: string | null; fullName: string | null; remoteUrl: string }> {
+  const organization = await getOrCreateOrganization(c, c.state.organizationId);
+  return await organization.getRepositoryMetadata({ repoId: c.state.repoId });
+}
+
+function parseDraftAttachments(value: string | null | undefined): Array<any> {
+  if (!value) {
+    return [];
+  }
+
+  try {
+    const parsed = JSON.parse(value) as unknown;
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+
+function parseTranscript(value: string | null | undefined): Array<any> {
+  if (!value) {
+    return [];
+  }
+
+  try {
+    const parsed = JSON.parse(value) as unknown;
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+
+function parseGitState(value: string | null | undefined): { fileChanges: Array<any>; diffs: Record<string, string>; fileTree: Array<any> } {
+  if (!value) {
+    return emptyGitState();
+  }
+
+  try {
+    const parsed = JSON.parse(value) as {
+      fileChanges?: unknown;
+      diffs?: unknown;
+      fileTree?: unknown;
+    };
+    return {
+      fileChanges: Array.isArray(parsed.fileChanges) ? parsed.fileChanges : [],
+      diffs: parsed.diffs && typeof parsed.diffs === "object" ? (parsed.diffs as Record<string, string>) : {},
+      fileTree: Array.isArray(parsed.fileTree) ? parsed.fileTree : [],
+    };
+  } catch {
+    return emptyGitState();
+  }
+}
+
+async function readTaskOwner(c: any): Promise<{
+  primaryUserId: string | null;
+  primaryGithubLogin: string | null;
+  primaryGithubEmail: string | null;
+  primaryGithubAvatarUrl: string | null;
+} | null> {
+  const row = await c.db.select().from(taskOwner).where(eq(taskOwner.id, 1)).get();
+  if (!row) {
+    return null;
+  }
+  return {
+    primaryUserId: row.primaryUserId ?? null,
+    primaryGithubLogin: row.primaryGithubLogin ?? null,
+    primaryGithubEmail: row.primaryGithubEmail ?? null,
+    primaryGithubAvatarUrl: row.primaryGithubAvatarUrl ?? null,
+  };
+}
+
+async function upsertTaskOwner(
+  c: any,
+  owner: { primaryUserId: string; primaryGithubLogin: string; primaryGithubEmail: string; primaryGithubAvatarUrl: string | null },
+): Promise<void> {
+  const now = Date.now();
+  await c.db
+    .insert(taskOwner)
+    .values({
+      id: 1,
+      primaryUserId: owner.primaryUserId,
+      primaryGithubLogin: owner.primaryGithubLogin,
+      primaryGithubEmail: owner.primaryGithubEmail,
+      primaryGithubAvatarUrl: owner.primaryGithubAvatarUrl,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskOwner.id,
+      set: {
+        primaryUserId: owner.primaryUserId,
+        primaryGithubLogin: owner.primaryGithubLogin,
+        primaryGithubEmail: owner.primaryGithubEmail,
+        primaryGithubAvatarUrl: owner.primaryGithubAvatarUrl,
+        updatedAt: now,
+      },
+    })
+    .run();
+}
+
+/**
+ * Inject the user's GitHub OAuth token into the sandbox as a git credential store file.
+ * Also configures git user.name and user.email so commits are attributed correctly.
+ * The credential file is overwritten on each owner swap.
+ *
+ * Race condition note: If User A sends a message and the agent starts a long git operation,
+ * then User B triggers an owner swap, the in-flight git process still has User A's credentials
+ * (already read from the credential store). The next git operation uses User B's credentials.
+ */
+async function injectGitCredentials(sandbox: any, login: string, email: string, token: string): Promise<void> {
+  const script = [
+    "set -euo pipefail",
+    `git config --global user.name ${JSON.stringify(login)}`,
+    `git config --global user.email ${JSON.stringify(email)}`,
+    `git config --global credential.helper 'store --file=$HOME/.git-token'`,
+    `printf '%s\\n' ${JSON.stringify(`https://${login}:${token}@github.com`)} > $HOME/.git-token`,
+    `chmod 600 $HOME/.git-token`,
+  ];
+  const result = await sandbox.runProcess({
+    command: "bash",
+    args: ["-lc", script.join("; ")],
+    cwd: "/",
+    timeoutMs: 30_000,
+  });
+  if ((result.exitCode ?? 0) !== 0) {
+    logActorWarning("task", "git credential injection failed", {
+      exitCode: result.exitCode,
+      output: [result.stdout, result.stderr].filter(Boolean).join(""),
+    });
+  }
+}
+
+/**
+ * Resolves the current user's GitHub identity from their auth session.
+ * Returns null if the session is invalid or the user has no GitHub account.
+ */
+async function resolveGithubIdentity(authSessionId: string): Promise<{
+  userId: string;
+  login: string;
+  email: string;
+  avatarUrl: string | null;
+  accessToken: string;
+} | null> {
+  const authService = getBetterAuthService();
+  const authState = await authService.getAuthState(authSessionId);
+  if (!authState?.user?.id) {
+    return null;
+  }
+
+  const tokenResult = await authService.getAccessTokenForSession(authSessionId);
+  if (!tokenResult?.accessToken) {
+    return null;
+  }
+
+  const githubAccount = authState.accounts?.find((account: any) => account.providerId === "github");
+  if (!githubAccount) {
+    return null;
+  }
+
+  // Resolve the GitHub login from the API since Better Auth only stores the
+  // numeric account ID, not the login username.
+  let login = authState.user.name ?? "unknown";
+  let avatarUrl = authState.user.image ?? null;
+  try {
+    const resp = await fetch("https://api.github.com/user", {
+      headers: {
+        Authorization: `Bearer ${tokenResult.accessToken}`,
+        Accept: "application/vnd.github+json",
+      },
+    });
+    if (resp.ok) {
+      const ghUser = (await resp.json()) as { login?: string; avatar_url?: string };
+      if (ghUser.login) {
+        login = ghUser.login;
+      }
+      if (ghUser.avatar_url) {
+        avatarUrl = ghUser.avatar_url;
+      }
+    }
+  } catch (error) {
+    console.warn("resolveGithubIdentity: failed to fetch GitHub user", error);
+  }
+
+  return {
+    userId: authState.user.id,
+    login,
+    email: authState.user.email ?? `${githubAccount.accountId}@users.noreply.github.com`,
+    avatarUrl,
+    accessToken: tokenResult.accessToken,
+  };
+}
+
+/**
+ * Check if the task owner needs to swap, and if so, update the owner record
+ * and inject new git credentials into the sandbox.
+ * Returns true if an owner swap occurred.
+ */
+async function maybeSwapTaskOwner(c: any, authSessionId: string | null | undefined, sandbox: any | null): Promise<boolean> {
+  if (!authSessionId) {
+    return false;
+  }
+
+  const identity = await resolveGithubIdentity(authSessionId);
+  if (!identity) {
+    return false;
+  }
+
+  const currentOwner = await readTaskOwner(c);
+  if (currentOwner?.primaryUserId === identity.userId) {
+    return false;
+  }
+
+  await upsertTaskOwner(c, {
+    primaryUserId: identity.userId,
+    primaryGithubLogin: identity.login,
+    primaryGithubEmail: identity.email,
+    primaryGithubAvatarUrl: identity.avatarUrl,
+  });
+
+  if (sandbox) {
+    await injectGitCredentials(sandbox, identity.login, identity.email, identity.accessToken);
+  }
+
+  return true;
+}
+
+/**
+ * Manually change the task owner. Updates the owner record and broadcasts the
+ * change to subscribers. Git credentials are NOT injected here — they will be
+ * injected the next time the target user sends a message (auto-swap path).
+ */
+export async function changeTaskOwnerManually(
+  c: any,
+  input: { primaryUserId: string; primaryGithubLogin: string; primaryGithubEmail: string; primaryGithubAvatarUrl: string | null },
+): Promise<void> {
+  await upsertTaskOwner(c, input);
+  await broadcastTaskUpdate(c);
+}
+
+export function shouldMarkSessionUnreadForStatus(meta: { thinkingSinceMs?: number | null }, status: "running" | "idle" | "error"): boolean {
+  if (status === "running") {
+    return false;
+  }
+
+  // Only mark unread when we observe the transition out of an active thinking state.
+  // Repeated idle polls for an already-finished session must not flip unread back on.
+  return Boolean(meta.thinkingSinceMs);
+}
+
+export function shouldRecreateSessionForModelChange(meta: {
+  status: "pending_provision" | "pending_session_create" | "ready" | "error";
+  sandboxSessionId?: string | null;
+  created?: boolean;
+  transcript?: Array<any>;
+}): boolean {
+  if (meta.status !== "ready" || !meta.sandboxSessionId) {
+    return false;
+  }
+
+  if (meta.created) {
+    return false;
+  }
+
+  return !Array.isArray(meta.transcript) || meta.transcript.length === 0;
+}
+
+async function listSessionMetaRows(c: any, options?: { includeClosed?: boolean }): Promise<Array<any>> {
+  const rows = await c.db.select().from(taskWorkspaceSessions).orderBy(asc(taskWorkspaceSessions.createdAt)).all();
+  const mapped = rows.map((row: any) => ({
+    ...row,
+    id: row.sessionId,
+    sessionId: row.sessionId,
+    sandboxSessionId: row.sandboxSessionId ?? null,
+    status: row.status ?? "ready",
+    errorMessage: row.errorMessage ?? null,
+    transcript: parseTranscript(row.transcriptJson),
+    transcriptUpdatedAt: row.transcriptUpdatedAt ?? null,
+    created: row.created === 1,
+    closed: row.closed === 1,
+  }));
+
+  if (options?.includeClosed === true) {
+    return mapped;
+  }
+
+  return mapped.filter((row: any) => row.closed !== true);
+}
+
+async function nextSessionName(c: any): Promise<string> {
+  const rows = await listSessionMetaRows(c, { includeClosed: true });
+  return `Session ${rows.length + 1}`;
+}
+
+async function readSessionMeta(c: any, sessionId: string): Promise<any | null> {
+  const row = await c.db.select().from(taskWorkspaceSessions).where(eq(taskWorkspaceSessions.sessionId, sessionId)).get();
+
+  if (!row) {
+    return null;
+  }
+
+  return {
+    ...row,
+    id: row.sessionId,
+    sessionId: row.sessionId,
+    sandboxSessionId: row.sandboxSessionId ?? null,
+    status: row.status ?? "ready",
+    errorMessage: row.errorMessage ?? null,
+    transcript: parseTranscript(row.transcriptJson),
+    transcriptUpdatedAt: row.transcriptUpdatedAt ?? null,
+    created: row.created === 1,
+    closed: row.closed === 1,
+  };
+}
+
+async function getUserTaskState(c: any, authSessionId?: string | null): Promise<{ activeSessionId: string | null; bySessionId: Map<string, any> }> {
+  if (!authSessionId) {
+    return { activeSessionId: null, bySessionId: new Map() };
+  }
+
+  const authState = await getBetterAuthService().getAuthState(authSessionId);
+  const userId = authState?.user?.id;
+  if (typeof userId !== "string" || userId.length === 0) {
+    return { activeSessionId: null, bySessionId: new Map() };
+  }
+
+  const user = await getOrCreateUser(c, userId);
+  const state = await user.getTaskState({ taskId: c.state.taskId });
+  const bySessionId = new Map(
+    (state?.sessions ?? []).map((row: any) => [
+      row.sessionId,
+      {
+        unread: Boolean(row.unread),
+        draftText: row.draftText ?? "",
+        draftAttachments: parseDraftAttachments(row.draftAttachmentsJson),
+        draftUpdatedAtMs: row.draftUpdatedAt ?? null,
+      },
+    ]),
+  );
+  return {
+    activeSessionId: state?.activeSessionId ?? null,
+    bySessionId,
+  };
+}
+
+async function upsertUserTaskState(c: any, authSessionId: string | null | undefined, sessionId: string, patch: Record<string, unknown>): Promise<void> {
+  if (!authSessionId) {
+    return;
+  }
+
+  const authState = await getBetterAuthService().getAuthState(authSessionId);
+  const userId = authState?.user?.id;
+  if (typeof userId !== "string" || userId.length === 0) {
+    return;
+  }
+
+  const user = await getOrCreateUser(c, userId);
+  await user.upsertTaskState({
+    taskId: c.state.taskId,
+    sessionId,
+    patch,
+  });
+}
+
+async function deleteUserTaskState(c: any, authSessionId: string | null | undefined, sessionId: string): Promise<void> {
+  if (!authSessionId) {
+    return;
+  }
+
+  const authState = await getBetterAuthService().getAuthState(authSessionId);
+  const userId = authState?.user?.id;
+  if (typeof userId !== "string" || userId.length === 0) {
+    return;
+  }
+
+  const user = await getOrCreateUser(c, userId);
+  await user.deleteTaskState({
+    taskId: c.state.taskId,
+    sessionId,
+  });
+}
+
+async function resolveDefaultModel(c: any, authSessionId?: string | null): Promise<string> {
+  if (!authSessionId) {
+    return FALLBACK_MODEL;
+  }
+
+  const authState = await getBetterAuthService().getAuthState(authSessionId);
+  const userId = authState?.user?.id;
+  if (typeof userId !== "string" || userId.length === 0) {
+    return FALLBACK_MODEL;
+  }
+
+  const user = await getOrCreateUser(c, userId);
+  const userState = await user.getAppAuthState({ sessionId: authSessionId });
+  return userState?.profile?.defaultModel ?? FALLBACK_MODEL;
+}
+
+async function ensureSessionMeta(
+  c: any,
+  params: {
+    sessionId: string;
+    sandboxSessionId?: string | null;
+    model?: string;
+    authSessionId?: string | null;
+    sessionName?: string;
+    created?: boolean;
+    status?: "pending_provision" | "pending_session_create" | "ready" | "error";
+    errorMessage?: string | null;
+  },
+): Promise<any> {
+  const existing = await readSessionMeta(c, params.sessionId);
+  if (existing) {
+    return existing;
+  }
+
+  const now = Date.now();
+  const sessionName = params.sessionName ?? (await nextSessionName(c));
+  const model = params.model ?? (await resolveDefaultModel(c, params.authSessionId));
+
+  await c.db
+    .insert(taskWorkspaceSessions)
+    .values({
+      sessionId: params.sessionId,
+      sandboxSessionId: params.sandboxSessionId ?? null,
+      sessionName,
+      model,
+      status: params.status ?? "ready",
+      errorMessage: params.errorMessage ?? null,
+      transcriptJson: "[]",
+      transcriptUpdatedAt: null,
+      created: params.created === false ? 0 : 1,
+      closed: 0,
+      thinkingSinceMs: null,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .run();
+
+  return await readSessionMeta(c, params.sessionId);
+}
+
+async function updateSessionMeta(c: any, sessionId: string, values: Record<string, unknown>): Promise<any> {
+  await ensureSessionMeta(c, { sessionId });
+  await c.db
+    .update(taskWorkspaceSessions)
+    .set({
+      ...values,
+      updatedAt: Date.now(),
+    })
+    .where(eq(taskWorkspaceSessions.sessionId, sessionId))
+    .run();
+  return await readSessionMeta(c, sessionId);
+}
+
+async function readSessionMetaBySandboxSessionId(c: any, sandboxSessionId: string): Promise<any | null> {
+  const row = await c.db.select().from(taskWorkspaceSessions).where(eq(taskWorkspaceSessions.sandboxSessionId, sandboxSessionId)).get();
+  if (!row) {
+    return null;
+  }
+  return await readSessionMeta(c, row.sessionId);
+}
+
+async function requireReadySessionMeta(c: any, sessionId: string): Promise<any> {
+  const meta = await readSessionMeta(c, sessionId);
+  if (!meta) {
+    throw new Error(`Unknown workspace session: ${sessionId}`);
+  }
+  if (meta.status !== "ready" || !meta.sandboxSessionId) {
+    throw new Error(meta.errorMessage ?? "This workspace session is still preparing");
+  }
+  return meta;
+}
+
+export function requireSendableSessionMeta(meta: any, sessionId: string): any {
+  if (!meta) {
+    throw new Error(`Unknown workspace session: ${sessionId}`);
+  }
+  if (meta.status !== "ready" || !meta.sandboxSessionId) {
+    throw new Error(`Session is not ready (status: ${meta.status}). Wait for session provisioning to complete.`);
+  }
+  return meta;
+}
+
+function shellFragment(parts: string[]): string {
+  return parts.join(" && ");
+}
+
+function stableSandboxId(c: any): string {
+  return c.state.taskId;
+}
+
+async function getTaskSandboxRuntime(
+  c: any,
+  record: any,
+): Promise<{
+  sandbox: any;
+  sandboxId: string;
+  sandboxProviderId: string;
+  switchTarget: string;
+  cwd: string;
+}> {
+  const { config } = getActorRuntimeContext();
+  const sandboxId = stableSandboxId(c);
+  const sandboxProviderId = resolveSandboxProviderId(config, record.sandboxProviderId ?? null);
+  const sandbox = await getOrCreateTaskSandbox(c, c.state.organizationId, sandboxId, {});
+  const actorId = typeof sandbox.resolve === "function" ? await sandbox.resolve().catch(() => null) : null;
+  const switchTarget = sandboxProviderId === "local" ? `sandbox://local/${sandboxId}` : `sandbox://e2b/${sandboxId}`;
+
+  // Resolve the actual repo CWD from the sandbox's $HOME (differs by provider).
+  const repoCwdResult = await sandbox.repoCwd();
+  const cwd = repoCwdResult?.cwd ?? "$HOME/repo";
+  const now = Date.now();
+
+  await c.db
+    .insert(taskSandboxes)
+    .values({
+      sandboxId,
+      sandboxProviderId,
+      sandboxActorId: typeof actorId === "string" ? actorId : null,
+      switchTarget,
+      cwd,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: taskSandboxes.sandboxId,
+      set: {
+        sandboxProviderId,
+        sandboxActorId: typeof actorId === "string" ? actorId : null,
+        switchTarget,
+        cwd,
+        updatedAt: now,
+      },
+    })
+    .run();
+
+  await c.db
+    .update(taskRuntime)
+    .set({
+      activeSandboxId: sandboxId,
+      activeSwitchTarget: switchTarget,
+      activeCwd: cwd,
+      updatedAt: now,
+    })
+    .where(eq(taskRuntime.id, 1))
+    .run();
+
+  return {
+    sandbox,
+    sandboxId,
+    sandboxProviderId,
+    switchTarget,
+    cwd,
+  };
+}
+
+/**
+ * Track whether the sandbox repo has been fully prepared (cloned + fetched + checked out)
+ * for the current actor lifecycle. Subsequent calls can skip the expensive `git fetch`
+ * when `skipFetch` is true (used by sendWorkspaceMessage to avoid blocking on every prompt).
+ */
+let sandboxRepoPrepared = false;
+
+async function ensureSandboxRepo(c: any, sandbox: any, record: any, opts?: { skipFetchIfPrepared?: boolean; authSessionId?: string | null }): Promise<void> {
+  if (!record.branchName) {
+    throw new Error("cannot prepare a sandbox repo before the task branch exists");
+  }
+
+  // If the repo was already prepared and the caller allows skipping fetch, just return.
+  // The clone, fetch, and checkout already happened on a prior call.
+  if (opts?.skipFetchIfPrepared && sandboxRepoPrepared) {
+    logActorInfo("task.sandbox", "ensureSandboxRepo skipped (already prepared)");
+    return;
+  }
+
+  const repoStart = performance.now();
+
+  const t0 = performance.now();
+  const auth = await resolveOrganizationGithubAuth(c, c.state.organizationId);
+  const metadata = await getRepositoryMetadata(c);
+  logActorInfo("task.sandbox", "resolveAuth+metadata", { durationMs: Math.round(performance.now() - t0) });
+
+  const baseRef = metadata.defaultBranch ?? "main";
+  // Use $HOME inside the shell script so the path resolves correctly regardless
+  // of which user the sandbox runs as (E2B: "user", local Docker: "sandbox").
+  const script = [
+    "set -euo pipefail",
+    'REPO_DIR="$HOME/repo"',
+    'mkdir -p "$HOME"',
+    "git config --global credential.helper '!f() { echo username=x-access-token; echo password=${GH_TOKEN:-$GITHUB_TOKEN}; }; f'",
+    `if [ ! -d "$REPO_DIR/.git" ]; then rm -rf "$REPO_DIR" && git clone ${JSON.stringify(metadata.remoteUrl)} "$REPO_DIR"; fi`,
+    'cd "$REPO_DIR"',
+    "git fetch origin --prune",
+    `if git show-ref --verify --quiet refs/remotes/origin/${JSON.stringify(record.branchName).slice(1, -1)}; then target_ref=${JSON.stringify(
+      `origin/${record.branchName}`,
+    )}; else target_ref=${JSON.stringify(baseRef)}; fi`,
+    `git checkout -B ${JSON.stringify(record.branchName)} \"$target_ref\"`,
+  ];
+
+  const t1 = performance.now();
+  const result = await sandbox.runProcess({
+    command: "bash",
+    args: ["-lc", script.join("; ")],
+    cwd: "/",
+    env: auth?.githubToken
+      ? {
+          GH_TOKEN: auth.githubToken,
+          GITHUB_TOKEN: auth.githubToken,
+        }
+      : undefined,
+    timeoutMs: 5 * 60_000,
+  });
+  logActorInfo("task.sandbox", "git clone/fetch/checkout", {
+    branch: record.branchName,
+    repo: metadata.remoteUrl,
+    durationMs: Math.round(performance.now() - t1),
+  });
+
+  if ((result.exitCode ?? 0) !== 0) {
+    throw new Error(`sandbox repo preparation failed (${result.exitCode ?? 1}): ${[result.stdout, result.stderr].filter(Boolean).join("")}`);
+  }
+
+  // On first repo preparation, inject the task owner's git credentials into the sandbox
+  // so that push/commit operations are authenticated and attributed to the correct user.
+  if (!sandboxRepoPrepared && opts?.authSessionId) {
+    const t2 = performance.now();
+    await maybeSwapTaskOwner(c, opts.authSessionId, sandbox);
+    logActorInfo("task.sandbox", "maybeSwapTaskOwner", { durationMs: Math.round(performance.now() - t2) });
+  }
+
+  sandboxRepoPrepared = true;
+  logActorInfo("task.sandbox", "ensureSandboxRepo complete", { totalDurationMs: Math.round(performance.now() - repoStart) });
+}
+
+async function executeInSandbox(
+  c: any,
+  params: {
+    sandboxId: string;
+    cwd: string;
+    command: string;
+    label: string;
+  },
+): Promise<{ exitCode: number; result: string }> {
+  const record = await ensureWorkspaceSeeded(c);
+  const runtime = await getTaskSandboxRuntime(c, record);
+  await ensureSandboxRepo(c, runtime.sandbox, record);
+  const response = await runtime.sandbox.runProcess({
+    command: "bash",
+    args: ["-lc", shellFragment([`cd ${JSON.stringify(params.cwd)}`, params.command])],
+    cwd: "/",
+    timeoutMs: 5 * 60_000,
+  });
+
+  return {
+    exitCode: response.exitCode ?? 0,
+    result: [response.stdout, response.stderr].filter(Boolean).join(""),
+  };
+}
+
+function parseGitStatus(output: string): Array<{ path: string; type: "M" | "A" | "D" }> {
+  return output
+    .split("\n")
+    .map((line) => line.trimEnd())
+    .filter(Boolean)
+    .map((line) => {
+      const status = line.slice(0, 2).trim();
+      const rawPath = line.slice(3).trim();
+      const path = rawPath.includes(" -> ") ? (rawPath.split(" -> ").pop() ?? rawPath) : rawPath;
+      const type = status.includes("D") ? "D" : status.includes("A") || status === "??" ? "A" : "M";
+      return { path, type };
+    });
+}
+
+function parseNumstat(output: string): Map<string, { added: number; removed: number }> {
+  const map = new Map<string, { added: number; removed: number }>();
+  for (const line of output.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    const [addedRaw, removedRaw, ...pathParts] = trimmed.split("\t");
+    const path = pathParts.join("\t").trim();
+    if (!path) continue;
+    map.set(path, {
+      added: Number.parseInt(addedRaw ?? "0", 10) || 0,
+      removed: Number.parseInt(removedRaw ?? "0", 10) || 0,
+    });
+  }
+  return map;
+}
+
+function buildFileTree(paths: string[]): Array<any> {
+  const root = {
+    children: new Map<string, any>(),
+  };
+
+  for (const path of paths) {
+    const parts = path.split("/").filter(Boolean);
+    let current = root;
+    let currentPath = "";
+
+    for (let index = 0; index < parts.length; index += 1) {
+      const part = parts[index]!;
+      currentPath = currentPath ? `${currentPath}/${part}` : part;
+      const isDir = index < parts.length - 1;
+      let node = current.children.get(part);
+      if (!node) {
+        node = {
+          name: part,
+          path: currentPath,
+          isDir,
+          children: isDir ? new Map<string, any>() : undefined,
+        };
+        current.children.set(part, node);
+      } else if (isDir && !(node.children instanceof Map)) {
+        node.children = new Map<string, any>();
+      }
+      current = node;
+    }
+  }
+
+  function sortNodes(nodes: Iterable<any>): Array<any> {
+    return [...nodes]
+      .map((node) =>
+        node.isDir
+          ? {
+              name: node.name,
+              path: node.path,
+              isDir: true,
+              children: sortNodes(node.children?.values?.() ?? []),
+            }
+          : {
+              name: node.name,
+              path: node.path,
+              isDir: false,
+            },
+      )
+      .sort((left, right) => {
+        if (left.isDir !== right.isDir) {
+          return left.isDir ? -1 : 1;
+        }
+        return left.path.localeCompare(right.path);
+      });
+  }
+
+  return sortNodes(root.children.values());
+}
+
+async function collectWorkspaceGitState(c: any, record: any) {
+  const activeSandboxId = record.activeSandboxId;
+  const activeSandbox = activeSandboxId != null ? ((record.sandboxes ?? []).find((candidate: any) => candidate.sandboxId === activeSandboxId) ?? null) : null;
+  const cwd = activeSandbox?.cwd ?? record.sandboxes?.[0]?.cwd ?? null;
+  if (!activeSandboxId || !cwd) {
+    return {
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+    };
+  }
+
+  const statusResult = await executeInSandbox(c, {
+    sandboxId: activeSandboxId,
+    cwd,
+    command: "git status --porcelain=v1 -uall",
+    label: "git status",
+  });
+  if (statusResult.exitCode !== 0) {
+    return {
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+    };
+  }
+
+  const statusRows = parseGitStatus(statusResult.result);
+  const numstatResult = await executeInSandbox(c, {
+    sandboxId: activeSandboxId,
+    cwd,
+    command: "git diff --numstat",
+    label: "git diff numstat",
+  });
+  const numstat = parseNumstat(numstatResult.result);
+
+  const filesResult = await executeInSandbox(c, {
+    sandboxId: activeSandboxId,
+    cwd,
+    command: "git ls-files --cached --others --exclude-standard",
+    label: "git ls-files",
+  });
+  const allPaths = filesResult.result
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean);
+
+  const diffs: Record<string, string> = {};
+  for (const row of statusRows) {
+    const diffResult = await executeInSandbox(c, {
+      sandboxId: activeSandboxId,
+      cwd,
+      command: `git diff -- ${JSON.stringify(row.path)}`,
+      label: `git diff ${row.path}`,
+    });
+    diffs[row.path] = diffResult.exitCode === 0 ? diffResult.result : "";
+  }
+
+  return {
+    fileChanges: statusRows.map((row) => {
+      const counts = numstat.get(row.path) ?? { added: 0, removed: 0 };
+      return {
+        path: row.path,
+        added: counts.added,
+        removed: counts.removed,
+        type: row.type,
+      };
+    }),
+    diffs,
+    fileTree: buildFileTree(allPaths),
+  };
+}
+
+async function readCachedGitState(c: any): Promise<{ fileChanges: Array<any>; diffs: Record<string, string>; fileTree: Array<any>; updatedAt: number | null }> {
+  const row = await c.db
+    .select({
+      gitStateJson: taskRuntime.gitStateJson,
+      gitStateUpdatedAt: taskRuntime.gitStateUpdatedAt,
+    })
+    .from(taskRuntime)
+    .where(eq(taskRuntime.id, 1))
+    .get();
+  const parsed = parseGitState(row?.gitStateJson);
+  return {
+    ...parsed,
+    updatedAt: row?.gitStateUpdatedAt ?? null,
+  };
+}
+
+async function writeCachedGitState(c: any, gitState: { fileChanges: Array<any>; diffs: Record<string, string>; fileTree: Array<any> }): Promise<void> {
+  const now = Date.now();
+  await c.db
+    .update(taskRuntime)
+    .set({
+      gitStateJson: JSON.stringify(gitState),
+      gitStateUpdatedAt: now,
+      updatedAt: now,
+    })
+    .where(eq(taskRuntime.id, 1))
+    .run();
+}
+
+async function readSessionTranscript(c: any, record: any, sessionId: string) {
+  const sandboxId = record.activeSandboxId ?? stableSandboxId(c);
+  if (!sandboxId) {
+    return [];
+  }
+
+  const sandbox = getTaskSandbox(c, c.state.organizationId, sandboxId);
+  const page = await sandbox.getEvents({
+    sessionId,
+    limit: 100,
+  });
+  return page.items.map((event: any) => ({
+    id: event.id,
+    eventIndex: event.eventIndex,
+    sessionId: event.sessionId,
+    createdAt: event.createdAt,
+    connectionId: event.connectionId,
+    sender: event.sender,
+    payload: event.payload,
+  }));
+}
+
+async function writeSessionTranscript(c: any, sessionId: string, transcript: Array<any>): Promise<void> {
+  await updateSessionMeta(c, sessionId, {
+    transcriptJson: JSON.stringify(transcript),
+    transcriptUpdatedAt: Date.now(),
+  });
+}
+
+function fireRefreshDerived(c: any): void {
+  const self = selfTask(c);
+  void self.refreshDerived({}).catch(() => {});
+}
+
+function fireRefreshSessionTranscript(c: any, sessionId: string): void {
+  const self = selfTask(c);
+  void self.refreshSessionTranscript({ sessionId }).catch(() => {});
+}
+
+async function enqueueWorkspaceEnsureSession(c: any, sessionId: string): Promise<void> {
+  const self = selfTask(c);
+  await self.send(taskWorkflowQueueName("task.command.workspace.ensure_session" as any), { sessionId }, { wait: false });
+}
+
+function pendingWorkspaceSessionStatus(record: any): "pending_provision" | "pending_session_create" {
+  return record.activeSandboxId ? "pending_session_create" : "pending_provision";
+}
+
+async function maybeScheduleWorkspaceRefreshes(c: any, record: any, sessions: Array<any>): Promise<void> {
+  const gitState = await readCachedGitState(c);
+  if (record.activeSandboxId && !gitState.updatedAt) {
+    fireRefreshDerived(c);
+  }
+
+  for (const session of sessions) {
+    if (session.closed || session.status !== "ready" || !session.sandboxSessionId || session.transcriptUpdatedAt) {
+      continue;
+    }
+    fireRefreshSessionTranscript(c, session.sandboxSessionId);
+  }
+}
+
+function computeWorkspaceTaskStatus(record: any, sessions: Array<any>) {
+  if (record.status && String(record.status).startsWith("init_")) {
+    return record.status;
+  }
+  if (record.status === "archived" || record.status === "killed") {
+    return record.status;
+  }
+  if (sessions.some((session) => session.closed !== true && session.thinkingSinceMs)) {
+    return "running";
+  }
+  if (sessions.some((session) => session.closed !== true && session.status === "error")) {
+    return "error";
+  }
+  return "idle";
+}
+
+export async function ensureWorkspaceSeeded(c: any): Promise<any> {
+  return await getCurrentRecord(c);
+}
+
+function buildSessionSummary(meta: any, userState?: any): any {
+  const derivedSandboxSessionId = meta.status === "ready" ? (meta.sandboxSessionId ?? null) : null;
+  const sessionStatus =
+    meta.status === "pending_provision" || meta.status === "pending_session_create"
+      ? meta.status
+      : meta.thinkingSinceMs
+        ? "running"
+        : meta.status === "error"
+          ? "error"
+          : meta.status === "ready" && derivedSandboxSessionId
+            ? "idle"
+            : "ready";
+  let thinkingSinceMs = meta.thinkingSinceMs ?? null;
+  let unread = Boolean(userState?.unread);
+  if (thinkingSinceMs && sessionStatus !== "running") {
+    thinkingSinceMs = null;
+    unread = true;
+  }
+
+  return {
+    id: meta.id,
+    sessionId: meta.sessionId,
+    sandboxSessionId: derivedSandboxSessionId,
+    sessionName: meta.sessionName,
+    agent: agentKindForModel(meta.model),
+    model: meta.model,
+    status: sessionStatus,
+    thinkingSinceMs: sessionStatus === "running" ? thinkingSinceMs : null,
+    unread,
+    created: Boolean(meta.created || derivedSandboxSessionId),
+    errorMessage: meta.errorMessage ?? null,
+  };
+}
+
+function buildSessionDetailFromMeta(meta: any, userState?: any): any {
+  const summary = buildSessionSummary(meta, userState);
+  return {
+    sessionId: meta.sessionId,
+    sandboxSessionId: summary.sandboxSessionId ?? null,
+    sessionName: summary.sessionName,
+    agent: summary.agent,
+    model: summary.model,
+    status: summary.status,
+    thinkingSinceMs: summary.thinkingSinceMs,
+    unread: summary.unread,
+    created: summary.created,
+    errorMessage: summary.errorMessage,
+    draft: {
+      text: userState?.draftText ?? "",
+      attachments: Array.isArray(userState?.draftAttachments) ? userState.draftAttachments : [],
+      updatedAtMs: userState?.draftUpdatedAtMs ?? null,
+    },
+    transcript: meta.transcript ?? [],
+  };
+}
+
+/**
+ * Builds a WorkspaceTaskSummary from local task actor state. Task actors push
+ * this to the parent organization actor so organization sidebar reads stay local.
+ */
+export async function buildTaskSummary(c: any, authSessionId?: string | null): Promise<any> {
+  const record = await ensureWorkspaceSeeded(c);
+  const repositoryMetadata = await getRepositoryMetadata(c);
+  const sessions = await listSessionMetaRows(c);
+  await maybeScheduleWorkspaceRefreshes(c, record, sessions);
+  const userTaskState = await getUserTaskState(c, authSessionId);
+  const taskStatus = computeWorkspaceTaskStatus(record, sessions);
+  const activeSessionId =
+    userTaskState.activeSessionId && sessions.some((meta) => meta.sessionId === userTaskState.activeSessionId) ? userTaskState.activeSessionId : null;
+
+  const owner = await readTaskOwner(c);
+
+  return {
+    id: c.state.taskId,
+    repoId: c.state.repoId,
+    title: record.title ?? "New Task",
+    status: taskStatus,
+    repoName: repoLabelFromRemote(repositoryMetadata.remoteUrl),
+    updatedAtMs: record.updatedAt,
+    branch: record.branchName,
+    pullRequest: record.pullRequest ?? null,
+    activeSessionId,
+    sessionsSummary: sessions.map((meta) => buildSessionSummary(meta, userTaskState.bySessionId.get(meta.sessionId))),
+    primaryUserLogin: owner?.primaryGithubLogin ?? null,
+    primaryUserAvatarUrl: owner?.primaryGithubAvatarUrl ?? null,
+  };
+}
+
+/**
+ * Builds a WorkspaceTaskDetail from local task actor state for direct task
+ * subscribers. This is a full replacement payload, not a patch.
+ */
+export async function buildTaskDetail(c: any, authSessionId?: string | null): Promise<any> {
+  const record = await ensureWorkspaceSeeded(c);
+  const gitState = await readCachedGitState(c);
+  const sessions = await listSessionMetaRows(c);
+  await maybeScheduleWorkspaceRefreshes(c, record, sessions);
+  const summary = await buildTaskSummary(c, authSessionId);
+
+  return {
+    ...summary,
+    task: record.task,
+    fileChanges: gitState.fileChanges,
+    diffs: gitState.diffs,
+    fileTree: gitState.fileTree,
+    minutesUsed: 0,
+    sandboxes: await Promise.all(
+      (record.sandboxes ?? []).map(async (sandbox: any) => {
+        let url: string | null = null;
+        if (sandbox.sandboxId) {
+          try {
+            const handle = getTaskSandbox(c, c.state.organizationId, sandbox.sandboxId);
+            const conn = await handle.sandboxAgentConnection();
+            if (conn?.endpoint && !conn.endpoint.startsWith("mock://")) {
+              url = conn.endpoint;
+            }
+          } catch {
+            // Sandbox may not be running
+          }
+        }
+        return {
+          sandboxProviderId: sandbox.sandboxProviderId,
+          sandboxId: sandbox.sandboxId,
+          cwd: sandbox.cwd ?? null,
+          url,
+        };
+      }),
+    ),
+    activeSandboxId: record.activeSandboxId ?? null,
+  };
+}
+
+/**
+ * Builds a WorkspaceSessionDetail for a specific session.
+ */
+export async function buildSessionDetail(c: any, sessionId: string, authSessionId?: string | null): Promise<any> {
+  const record = await ensureWorkspaceSeeded(c);
+  const meta = await readSessionMeta(c, sessionId);
+  if (!meta || meta.closed) {
+    throw new Error(`Unknown workspace session: ${sessionId}`);
+  }
+  const userTaskState = await getUserTaskState(c, authSessionId);
+  const userSessionState = userTaskState.bySessionId.get(sessionId);
+
+  // Skip live transcript fetch if the sandbox session doesn't exist yet or
+  // the session is still provisioning — the sandbox API will block/timeout.
+  const isPending = meta.status === "pending_provision" || meta.status === "pending_session_create";
+  if (!meta.sandboxSessionId || isPending) {
+    return buildSessionDetailFromMeta(meta, userSessionState);
+  }
+
+  try {
+    const transcript = await readSessionTranscript(c, record, meta.sandboxSessionId);
+    if (JSON.stringify(meta.transcript ?? []) !== JSON.stringify(transcript)) {
+      await writeSessionTranscript(c, meta.sessionId, transcript);
+      return buildSessionDetailFromMeta(
+        {
+          ...meta,
+          transcript,
+          transcriptUpdatedAt: Date.now(),
+        },
+        userSessionState,
+      );
+    }
+  } catch (error) {
+    // Session detail reads degrade to cached transcript when sandbox is unavailable.
+    logActorWarning("task", "readSessionTranscript failed, using cached transcript", {
+      taskId: c.state.taskId,
+      sessionId,
+      error: resolveErrorMessage(error),
+    });
+  }
+
+  return buildSessionDetailFromMeta(meta, userSessionState);
+}
+
+export async function getTaskSummary(c: any): Promise<any> {
+  return await buildTaskSummary(c);
+}
+
+export async function getTaskDetail(c: any, authSessionId?: string): Promise<any> {
+  return await buildTaskDetail(c, authSessionId);
+}
+
+export async function getSessionDetail(c: any, sessionId: string, authSessionId?: string): Promise<any> {
+  return await buildSessionDetail(c, sessionId, authSessionId);
+}
+
+/**
+ * Replaces the old notifyWorkspaceUpdated pattern.
+ *
+ * The task actor emits two kinds of updates:
+ * - Push summary state up to the parent organization actor so the sidebar
+ *   materialized projection stays current.
+ * - Broadcast full detail/session payloads down to direct task subscribers.
+ */
+export async function broadcastTaskUpdate(c: any, options?: { sessionId?: string }): Promise<void> {
+  const organization = await getOrCreateOrganization(c, c.state.organizationId);
+  await organization.send(
+    organizationWorkflowQueueName("organization.command.applyTaskSummaryUpdate"),
+    { taskSummary: await buildTaskSummary(c) },
+    { wait: false },
+  );
+  c.broadcast("taskUpdated", {
+    type: "taskUpdated",
+    detail: await buildTaskDetail(c),
+  });
+
+  if (options?.sessionId) {
+    c.broadcast("sessionUpdated", {
+      type: "sessionUpdated",
+      session: await buildSessionDetail(c, options.sessionId),
+    });
+  }
+}
+
+export async function refreshWorkspaceDerivedState(c: any): Promise<void> {
+  const record = await ensureWorkspaceSeeded(c);
+  const gitState = await collectWorkspaceGitState(c, record);
+  await writeCachedGitState(c, gitState);
+  await broadcastTaskUpdate(c);
+}
+
+export async function refreshWorkspaceSessionTranscript(c: any, sessionId: string): Promise<void> {
+  const record = await ensureWorkspaceSeeded(c);
+  const meta = (await readSessionMetaBySandboxSessionId(c, sessionId)) ?? (await readSessionMeta(c, sessionId));
+  if (!meta?.sandboxSessionId) {
+    return;
+  }
+
+  const transcript = await readSessionTranscript(c, record, meta.sandboxSessionId);
+  await writeSessionTranscript(c, meta.sessionId, transcript);
+  await broadcastTaskUpdate(c, { sessionId: meta.sessionId });
+}
+
+export async function renameWorkspaceTask(c: any, value: string): Promise<void> {
+  const nextTitle = value.trim();
+  if (!nextTitle) {
+    throw new Error("task title is required");
+  }
+
+  await c.db
+    .update(taskTable)
+    .set({
+      title: nextTitle,
+      updatedAt: Date.now(),
+    })
+    .where(eq(taskTable.id, 1))
+    .run();
+  await broadcastTaskUpdate(c);
+}
+
+export async function syncTaskPullRequest(c: any, pullRequest: any): Promise<void> {
+  const now = pullRequest?.updatedAtMs ?? Date.now();
+  await c.db
+    .update(taskTable)
+    .set({
+      pullRequestJson: pullRequest ? JSON.stringify(pullRequest) : null,
+      updatedAt: now,
+    })
+    .where(eq(taskTable.id, 1))
+    .run();
+  await broadcastTaskUpdate(c);
+}
+
+export async function createWorkspaceSession(c: any, model?: string, authSessionId?: string): Promise<{ sessionId: string }> {
+  const sessionId = `session-${randomUUID()}`;
+  const record = await ensureWorkspaceSeeded(c);
+  await ensureSessionMeta(c, {
+    sessionId,
+    model: model ?? (await resolveDefaultModel(c, authSessionId)),
+    authSessionId,
+    sandboxSessionId: null,
+    status: pendingWorkspaceSessionStatus(record),
+    created: false,
+  });
+  await upsertUserTaskState(c, authSessionId, sessionId, {
+    activeSessionId: sessionId,
+    unread: false,
+  });
+  await broadcastTaskUpdate(c, { sessionId: sessionId });
+  await enqueueWorkspaceEnsureSession(c, sessionId);
+  return { sessionId };
+}
+
+export async function ensureWorkspaceSession(c: any, sessionId: string, model?: string, authSessionId?: string): Promise<void> {
+  const ensureStart = performance.now();
+  const meta = await readSessionMeta(c, sessionId);
+  if (!meta || meta.closed) {
+    return;
+  }
+
+  const record = await ensureWorkspaceSeeded(c);
+  if (meta.sandboxSessionId && meta.status === "ready") {
+    fireRefreshSessionTranscript(c, meta.sandboxSessionId);
+    await broadcastTaskUpdate(c, { sessionId: sessionId });
+    return;
+  }
+
+  await updateSessionMeta(c, sessionId, {
+    sandboxSessionId: meta.sandboxSessionId ?? sessionId,
+    status: "pending_session_create",
+    errorMessage: null,
+  });
+
+  try {
+    const t0 = performance.now();
+    const runtime = await getTaskSandboxRuntime(c, record);
+    logActorInfo("task.session", "getTaskSandboxRuntime", { sessionId, durationMs: Math.round(performance.now() - t0) });
+
+    const t1 = performance.now();
+    await ensureSandboxRepo(c, runtime.sandbox, record);
+    logActorInfo("task.session", "ensureSandboxRepo", { sessionId, durationMs: Math.round(performance.now() - t1) });
+
+    const resolvedModel = model ?? meta.model ?? (await resolveDefaultModel(c, authSessionId));
+    const resolvedAgent = await resolveSandboxAgentForModel(c, resolvedModel);
+
+    const t2 = performance.now();
+    await runtime.sandbox.createSession({
+      id: meta.sandboxSessionId ?? sessionId,
+      agent: resolvedAgent,
+      model: resolvedModel,
+      sessionInit: {
+        cwd: runtime.cwd,
+      },
+    });
+    logActorInfo("task.session", "createSession", { sessionId, agent: resolvedAgent, model: resolvedModel, durationMs: Math.round(performance.now() - t2) });
+
+    await updateSessionMeta(c, sessionId, {
+      sandboxSessionId: meta.sandboxSessionId ?? sessionId,
+      status: "ready",
+      errorMessage: null,
+    });
+    logActorInfo("task.session", "ensureWorkspaceSession complete", { sessionId, totalDurationMs: Math.round(performance.now() - ensureStart) });
+    fireRefreshSessionTranscript(c, meta.sandboxSessionId ?? sessionId);
+  } catch (error) {
+    await updateSessionMeta(c, sessionId, {
+      status: "error",
+      errorMessage: error instanceof Error ? error.message : String(error),
+    });
+  }
+
+  await broadcastTaskUpdate(c, { sessionId: sessionId });
+}
+
+export async function enqueuePendingWorkspaceSessions(c: any): Promise<void> {
+  const pending = (await listSessionMetaRows(c, { includeClosed: true })).filter(
+    (row) => row.closed !== true && row.status !== "ready" && row.status !== "error",
+  );
+
+  const self = selfTask(c);
+  for (const row of pending) {
+    await self.send(taskWorkflowQueueName("task.command.workspace.ensure_session" as any), { sessionId: row.sessionId, model: row.model }, { wait: false });
+  }
+}
+
+export async function renameWorkspaceSession(c: any, sessionId: string, title: string): Promise<void> {
+  const trimmed = title.trim();
+  if (!trimmed) {
+    throw new Error("session title is required");
+  }
+  await updateSessionMeta(c, sessionId, {
+    sessionName: trimmed,
+  });
+  await broadcastTaskUpdate(c, { sessionId });
+}
+
+export async function selectWorkspaceSession(c: any, sessionId: string, authSessionId?: string): Promise<void> {
+  const meta = await readSessionMeta(c, sessionId);
+  if (!meta || meta.closed) {
+    return;
+  }
+  await upsertUserTaskState(c, authSessionId, sessionId, {
+    activeSessionId: sessionId,
+  });
+  await broadcastTaskUpdate(c, { sessionId });
+}
+
+export async function setWorkspaceSessionUnread(c: any, sessionId: string, unread: boolean, authSessionId?: string): Promise<void> {
+  await upsertUserTaskState(c, authSessionId, sessionId, {
+    unread,
+  });
+  await broadcastTaskUpdate(c, { sessionId });
+}
+
+export async function updateWorkspaceDraft(c: any, sessionId: string, text: string, attachments: Array<any>, authSessionId?: string): Promise<void> {
+  await upsertUserTaskState(c, authSessionId, sessionId, {
+    draftText: text,
+    draftAttachmentsJson: JSON.stringify(attachments),
+    draftUpdatedAt: Date.now(),
+  });
+  await broadcastTaskUpdate(c, { sessionId });
+}
+
+export async function changeWorkspaceModel(c: any, sessionId: string, model: string, _authSessionId?: string): Promise<void> {
+  const meta = await readSessionMeta(c, sessionId);
+  if (!meta || meta.closed) {
+    return;
+  }
+
+  if (meta.model === model) {
+    return;
+  }
+
+  const record = await ensureWorkspaceSeeded(c);
+  let nextMeta = await updateSessionMeta(c, sessionId, {
+    model,
+  });
+  let shouldEnsure = nextMeta.status === "pending_provision" || nextMeta.status === "pending_session_create" || nextMeta.status === "error";
+
+  if (shouldRecreateSessionForModelChange(nextMeta)) {
+    const sandbox = getTaskSandbox(c, c.state.organizationId, stableSandboxId(c));
+    await sandbox.destroySession(nextMeta.sandboxSessionId);
+    nextMeta = await updateSessionMeta(c, sessionId, {
+      sandboxSessionId: null,
+      status: pendingWorkspaceSessionStatus(record),
+      errorMessage: null,
+      transcriptJson: "[]",
+      transcriptUpdatedAt: null,
+      thinkingSinceMs: null,
+    });
+    shouldEnsure = true;
+  } else if (nextMeta.status === "ready" && nextMeta.sandboxSessionId) {
+    const sandbox = getTaskSandbox(c, c.state.organizationId, stableSandboxId(c));
+    if (typeof sandbox.rawSendSessionMethod === "function") {
+      try {
+        await sandbox.rawSendSessionMethod(nextMeta.sandboxSessionId, "session/set_config_option", {
+          configId: "model",
+          value: model,
+        });
+      } catch {
+        // Some agents do not allow live model updates. Preserve the new preference in metadata.
+      }
+    }
+  } else if (nextMeta.status !== "ready") {
+    nextMeta = await updateSessionMeta(c, sessionId, {
+      status: pendingWorkspaceSessionStatus(record),
+      errorMessage: null,
+    });
+  }
+
+  if (shouldEnsure) {
+    await enqueueWorkspaceEnsureSession(c, sessionId);
+  }
+  await broadcastTaskUpdate(c, { sessionId });
+}
+
+export async function sendWorkspaceMessage(c: any, sessionId: string, text: string, attachments: Array<any>, authSessionId?: string): Promise<void> {
+  const sendStart = performance.now();
+  const meta = requireSendableSessionMeta(await readSessionMeta(c, sessionId), sessionId);
+  const record = await ensureWorkspaceSeeded(c);
+
+  const t0 = performance.now();
+  const runtime = await getTaskSandboxRuntime(c, record);
+  logActorInfo("task.message", "getTaskSandboxRuntime", { sessionId, durationMs: Math.round(performance.now() - t0) });
+
+  const t1 = performance.now();
+  // Skip git fetch on subsequent messages — the repo was already prepared during session
+  // creation. This avoids a 5-30s network round-trip to GitHub on every prompt.
+  await ensureSandboxRepo(c, runtime.sandbox, record, { skipFetchIfPrepared: true, authSessionId });
+  logActorInfo("task.message", "ensureSandboxRepo", { sessionId, durationMs: Math.round(performance.now() - t1) });
+
+  // Check if the task owner needs to swap. If a different user is sending this message,
+  // update the owner record and inject their git credentials into the sandbox.
+  const ownerSwapped = await maybeSwapTaskOwner(c, authSessionId, runtime.sandbox);
+  if (ownerSwapped) {
+    await broadcastTaskUpdate(c);
+  }
+  const prompt = [text.trim(), ...attachments.map((attachment: any) => `@ ${attachment.filePath}:${attachment.lineNumber}\n${attachment.lineContent}`)].filter(
+    Boolean,
+  );
+  if (prompt.length === 0) {
+    throw new Error("message text is required");
+  }
+
+  await updateSessionMeta(c, sessionId, {
+    created: 1,
+    thinkingSinceMs: Date.now(),
+  });
+  await upsertUserTaskState(c, authSessionId, sessionId, {
+    unread: false,
+    draftText: "",
+    draftAttachmentsJson: "[]",
+    draftUpdatedAt: Date.now(),
+    activeSessionId: sessionId,
+  });
+
+  await syncWorkspaceSessionStatus(c, meta.sandboxSessionId, "running", Date.now());
+
+  try {
+    const t2 = performance.now();
+    await runtime.sandbox.sendPrompt({
+      sessionId: meta.sandboxSessionId,
+      prompt: prompt.join("\n\n"),
+    });
+    logActorInfo("task.message", "sendPrompt", { sessionId, durationMs: Math.round(performance.now() - t2) });
+    await syncWorkspaceSessionStatus(c, meta.sandboxSessionId, "idle", Date.now());
+  } catch (error) {
+    await updateSessionMeta(c, sessionId, {
+      status: "error",
+      errorMessage: error instanceof Error ? error.message : String(error),
+    });
+    await syncWorkspaceSessionStatus(c, meta.sandboxSessionId, "error", Date.now());
+    throw error;
+  }
+  logActorInfo("task.message", "sendWorkspaceMessage complete", { sessionId, totalDurationMs: Math.round(performance.now() - sendStart) });
+}
+
+export async function stopWorkspaceSession(c: any, sessionId: string): Promise<void> {
+  const meta = await requireReadySessionMeta(c, sessionId);
+  const sandbox = getTaskSandbox(c, c.state.organizationId, stableSandboxId(c));
+  await sandbox.destroySession(meta.sandboxSessionId);
+  await updateSessionMeta(c, sessionId, {
+    thinkingSinceMs: null,
+  });
+  await broadcastTaskUpdate(c, { sessionId });
+}
+
+export async function syncWorkspaceSessionStatus(c: any, sessionId: string, status: "running" | "idle" | "error", at: number): Promise<void> {
+  const meta = (await readSessionMetaBySandboxSessionId(c, sessionId)) ?? (await ensureSessionMeta(c, { sessionId: sessionId, sandboxSessionId: sessionId }));
+  let changed = false;
+
+  if (status === "running") {
+    if (!meta.thinkingSinceMs) {
+      await updateSessionMeta(c, sessionId, {
+        thinkingSinceMs: at,
+      });
+      changed = true;
+    }
+  } else {
+    if (meta.thinkingSinceMs) {
+      await updateSessionMeta(c, sessionId, {
+        thinkingSinceMs: null,
+      });
+      changed = true;
+    }
+  }
+
+  if (changed) {
+    const sessions = await listSessionMetaRows(c, { includeClosed: true });
+    const nextStatus = computeWorkspaceTaskStatus(await ensureWorkspaceSeeded(c), sessions);
+    await c.db
+      .update(taskTable)
+      .set({
+        status: nextStatus,
+        updatedAt: at,
+      })
+      .where(eq(taskTable.id, 1))
+      .run();
+    fireRefreshSessionTranscript(c, sessionId);
+    if (status !== "running") {
+      fireRefreshDerived(c);
+    }
+    await broadcastTaskUpdate(c, { sessionId: meta.sessionId });
+  }
+}
+
+export async function closeWorkspaceSession(c: any, sessionId: string, authSessionId?: string): Promise<void> {
+  const sessions = await listSessionMetaRows(c);
+  if (sessions.filter((candidate) => candidate.closed !== true).length <= 1) {
+    return;
+  }
+
+  const meta = await readSessionMeta(c, sessionId);
+  if (!meta) {
+    return;
+  }
+  if (meta.sandboxSessionId) {
+    const sandbox = getTaskSandbox(c, c.state.organizationId, stableSandboxId(c));
+    await sandbox.destroySession(meta.sandboxSessionId);
+  }
+  await updateSessionMeta(c, sessionId, {
+    closed: 1,
+    thinkingSinceMs: null,
+  });
+  const remainingSessions = sessions.filter((candidate) => candidate.sessionId !== sessionId && candidate.closed !== true);
+  const userTaskState = await getUserTaskState(c, authSessionId);
+  if (userTaskState.activeSessionId === sessionId && remainingSessions[0]) {
+    await upsertUserTaskState(c, authSessionId, remainingSessions[0].sessionId, {
+      activeSessionId: remainingSessions[0].sessionId,
+    });
+  }
+  await deleteUserTaskState(c, authSessionId, sessionId);
+  await broadcastTaskUpdate(c);
+}
+
+export async function markWorkspaceUnread(c: any, authSessionId?: string): Promise<void> {
+  const sessions = await listSessionMetaRows(c);
+  const latest = sessions[sessions.length - 1];
+  if (!latest) {
+    return;
+  }
+  await upsertUserTaskState(c, authSessionId, latest.sessionId, {
+    unread: true,
+  });
+  await broadcastTaskUpdate(c, { sessionId: latest.sessionId });
+}
+
+export async function publishWorkspacePr(c: any): Promise<void> {
+  const record = await ensureWorkspaceSeeded(c);
+  if (!record.branchName) {
+    throw new Error("cannot publish PR without a branch");
+  }
+  const metadata = await getRepositoryMetadata(c);
+  const repoFullName = metadata.fullName ?? githubRepoFullNameFromRemote(metadata.remoteUrl);
+  if (!repoFullName) {
+    throw new Error(`Unable to resolve GitHub repository for ${metadata.remoteUrl}`);
+  }
+  const { driver } = getActorRuntimeContext();
+  const auth = await resolveOrganizationGithubAuth(c, c.state.organizationId);
+  const created = await driver.github.createPr(repoFullName, record.branchName, record.title ?? record.task, undefined, {
+    githubToken: auth?.githubToken ?? null,
+    baseBranch: metadata.defaultBranch ?? undefined,
+  });
+  await syncTaskPullRequest(c, {
+    number: created.number,
+    status: "ready",
+    title: record.title ?? record.task,
+    body: null,
+    state: "open",
+    url: created.url,
+    headRefName: record.branchName,
+    baseRefName: metadata.defaultBranch ?? "main",
+    authorLogin: null,
+    isDraft: false,
+    merged: false,
+    updatedAtMs: Date.now(),
+  });
+}
+
+export async function revertWorkspaceFile(c: any, path: string): Promise<void> {
+  const record = await ensureWorkspaceSeeded(c);
+  if (!record.activeSandboxId) {
+    throw new Error("cannot revert file without an active sandbox");
+  }
+  const activeSandbox = (record.sandboxes ?? []).find((candidate: any) => candidate.sandboxId === record.activeSandboxId) ?? null;
+  if (!activeSandbox?.cwd) {
+    throw new Error("cannot revert file without a sandbox cwd");
+  }
+
+  const result = await executeInSandbox(c, {
+    sandboxId: record.activeSandboxId,
+    cwd: activeSandbox.cwd,
+    command: `if git ls-files --error-unmatch -- ${JSON.stringify(path)} >/dev/null 2>&1; then git restore --staged --worktree -- ${JSON.stringify(path)} || git checkout -- ${JSON.stringify(path)}; else rm -f ${JSON.stringify(path)}; fi`,
+    label: `git restore ${path}`,
+  });
+  if (result.exitCode !== 0) {
+    throw new Error(`file revert failed (${result.exitCode}): ${result.result}`);
+  }
+  fireRefreshDerived(c);
+  await broadcastTaskUpdate(c);
+}
diff --git a/foundry/packages/backend/src/actors/user/actions/better-auth.ts b/foundry/packages/backend/src/actors/user/actions/better-auth.ts
new file mode 100644
index 0000000..3ef8656
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/actions/better-auth.ts
@@ -0,0 +1,105 @@
+import { asc, count as sqlCount, desc } from "drizzle-orm";
+import { applyJoinToRow, applyJoinToRows, buildWhere, columnFor, materializeRow, persistInput, persistPatch, tableFor } from "../query-helpers.js";
+
+// Exception to the CLAUDE.md queue-for-mutations rule: Better Auth adapter operations
+// use direct actions even for mutations. Better Auth runs during OAuth callbacks on the
+// HTTP request path, not through the normal organization lifecycle. Routing through the
+// queue adds multiple sequential round-trips (each with actor wake-up + step overhead)
+// that cause 30-second OAuth callbacks and proxy retry storms. These mutations are simple
+// SQLite upserts/deletes with no cross-actor coordination or broadcast side effects.
+export const betterAuthActions = {
+  // --- Mutation actions ---
+  async betterAuthCreateRecord(c, input: { model: string; data: Record<string, unknown> }) {
+    const table = tableFor(input.model);
+    const persisted = persistInput(input.model, input.data);
+    await c.db
+      .insert(table)
+      .values(persisted as any)
+      .run();
+    const row = await c.db
+      .select()
+      .from(table)
+      .where(buildWhere(table, [{ field: "id", value: input.data.id }])!)
+      .get();
+    return materializeRow(input.model, row);
+  },
+
+  async betterAuthUpdateRecord(c, input: { model: string; where: any[]; update: Record<string, unknown> }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    if (!predicate) throw new Error("betterAuthUpdateRecord requires a where clause");
+    await c.db
+      .update(table)
+      .set(persistPatch(input.model, input.update) as any)
+      .where(predicate)
+      .run();
+    return materializeRow(input.model, await c.db.select().from(table).where(predicate).get());
+  },
+
+  async betterAuthUpdateManyRecords(c, input: { model: string; where: any[]; update: Record<string, unknown> }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    if (!predicate) throw new Error("betterAuthUpdateManyRecords requires a where clause");
+    await c.db
+      .update(table)
+      .set(persistPatch(input.model, input.update) as any)
+      .where(predicate)
+      .run();
+    const row = await c.db.select({ value: sqlCount() }).from(table).where(predicate).get();
+    return row?.value ?? 0;
+  },
+
+  async betterAuthDeleteRecord(c, input: { model: string; where: any[] }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    if (!predicate) throw new Error("betterAuthDeleteRecord requires a where clause");
+    await c.db.delete(table).where(predicate).run();
+  },
+
+  async betterAuthDeleteManyRecords(c, input: { model: string; where: any[] }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    if (!predicate) throw new Error("betterAuthDeleteManyRecords requires a where clause");
+    const rows = await c.db.select().from(table).where(predicate).all();
+    await c.db.delete(table).where(predicate).run();
+    return rows.length;
+  },
+
+  // --- Read actions ---
+  async betterAuthFindOneRecord(c, input: { model: string; where: any[]; join?: any }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    const row = predicate ? await c.db.select().from(table).where(predicate).get() : await c.db.select().from(table).get();
+    return await applyJoinToRow(c, input.model, row ?? null, input.join);
+  },
+
+  async betterAuthFindManyRecords(c, input: { model: string; where?: any[]; limit?: number; offset?: number; sortBy?: any; join?: any }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    let query: any = c.db.select().from(table);
+    if (predicate) {
+      query = query.where(predicate);
+    }
+    if (input.sortBy?.field) {
+      const column = columnFor(input.model, table, input.sortBy.field);
+      query = query.orderBy(input.sortBy.direction === "asc" ? asc(column) : desc(column));
+    }
+    if (typeof input.limit === "number") {
+      query = query.limit(input.limit);
+    }
+    if (typeof input.offset === "number") {
+      query = query.offset(input.offset);
+    }
+    const rows = await query.all();
+    return await applyJoinToRows(c, input.model, rows, input.join);
+  },
+
+  async betterAuthCountRecords(c, input: { model: string; where?: any[] }) {
+    const table = tableFor(input.model);
+    const predicate = buildWhere(table, input.where);
+    const row = predicate
+      ? await c.db.select({ value: sqlCount() }).from(table).where(predicate).get()
+      : await c.db.select({ value: sqlCount() }).from(table).get();
+    return row?.value ?? 0;
+  },
+};
diff --git a/foundry/packages/backend/src/actors/user/actions/user.ts b/foundry/packages/backend/src/actors/user/actions/user.ts
new file mode 100644
index 0000000..f251c95
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/actions/user.ts
@@ -0,0 +1,188 @@
+import { eq, and } from "drizzle-orm";
+import { DEFAULT_WORKSPACE_MODEL_ID } from "@sandbox-agent/foundry-shared";
+import { authAccounts, authSessions, authUsers, sessionState, userProfiles, userTaskState } from "../db/schema.js";
+import { materializeRow } from "../query-helpers.js";
+
+export const userActions = {
+  // Custom Foundry action — not part of Better Auth.
+  async getAppAuthState(c, input: { sessionId: string }) {
+    const session = await c.db.select().from(authSessions).where(eq(authSessions.id, input.sessionId)).get();
+    if (!session) {
+      return null;
+    }
+    const [user, profile, currentSessionState, accounts] = await Promise.all([
+      c.db.select().from(authUsers).where(eq(authUsers.authUserId, session.userId)).get(),
+      c.db.select().from(userProfiles).where(eq(userProfiles.userId, session.userId)).get(),
+      c.db.select().from(sessionState).where(eq(sessionState.sessionId, input.sessionId)).get(),
+      c.db.select().from(authAccounts).where(eq(authAccounts.userId, session.userId)).all(),
+    ]);
+    return {
+      session,
+      user: materializeRow("user", user),
+      profile: profile ?? null,
+      sessionState: currentSessionState ?? null,
+      accounts,
+    };
+  },
+
+  // Custom Foundry action — not part of Better Auth.
+  async getTaskState(c, input: { taskId: string }) {
+    const rows = await c.db.select().from(userTaskState).where(eq(userTaskState.taskId, input.taskId)).all();
+    const activeSessionId = rows.find((row) => typeof row.activeSessionId === "string" && row.activeSessionId.length > 0)?.activeSessionId ?? null;
+    return {
+      taskId: input.taskId,
+      activeSessionId,
+      sessions: rows.map((row) => ({
+        sessionId: row.sessionId,
+        unread: row.unread === 1,
+        draftText: row.draftText,
+        draftAttachmentsJson: row.draftAttachmentsJson,
+        draftUpdatedAt: row.draftUpdatedAt ?? null,
+        updatedAt: row.updatedAt,
+      })),
+    };
+  },
+
+  // --- Mutation actions (migrated from queue) ---
+
+  async upsertProfile(
+    c,
+    input: {
+      userId: string;
+      patch: {
+        githubAccountId?: string | null;
+        githubLogin?: string | null;
+        roleLabel?: string;
+        defaultModel?: string;
+        eligibleOrganizationIdsJson?: string;
+        starterRepoStatus?: string;
+        starterRepoStarredAt?: number | null;
+        starterRepoSkippedAt?: number | null;
+      };
+    },
+  ) {
+    const now = Date.now();
+    await c.db
+      .insert(userProfiles)
+      .values({
+        id: 1,
+        userId: input.userId,
+        githubAccountId: input.patch.githubAccountId ?? null,
+        githubLogin: input.patch.githubLogin ?? null,
+        roleLabel: input.patch.roleLabel ?? "GitHub user",
+        defaultModel: input.patch.defaultModel ?? DEFAULT_WORKSPACE_MODEL_ID,
+        eligibleOrganizationIdsJson: input.patch.eligibleOrganizationIdsJson ?? "[]",
+        starterRepoStatus: input.patch.starterRepoStatus ?? "pending",
+        starterRepoStarredAt: input.patch.starterRepoStarredAt ?? null,
+        starterRepoSkippedAt: input.patch.starterRepoSkippedAt ?? null,
+        createdAt: now,
+        updatedAt: now,
+      })
+      .onConflictDoUpdate({
+        target: userProfiles.userId,
+        set: {
+          ...(input.patch.githubAccountId !== undefined ? { githubAccountId: input.patch.githubAccountId } : {}),
+          ...(input.patch.githubLogin !== undefined ? { githubLogin: input.patch.githubLogin } : {}),
+          ...(input.patch.roleLabel !== undefined ? { roleLabel: input.patch.roleLabel } : {}),
+          ...(input.patch.defaultModel !== undefined ? { defaultModel: input.patch.defaultModel } : {}),
+          ...(input.patch.eligibleOrganizationIdsJson !== undefined ? { eligibleOrganizationIdsJson: input.patch.eligibleOrganizationIdsJson } : {}),
+          ...(input.patch.starterRepoStatus !== undefined ? { starterRepoStatus: input.patch.starterRepoStatus } : {}),
+          ...(input.patch.starterRepoStarredAt !== undefined ? { starterRepoStarredAt: input.patch.starterRepoStarredAt } : {}),
+          ...(input.patch.starterRepoSkippedAt !== undefined ? { starterRepoSkippedAt: input.patch.starterRepoSkippedAt } : {}),
+          updatedAt: now,
+        },
+      })
+      .run();
+    return await c.db.select().from(userProfiles).where(eq(userProfiles.userId, input.userId)).get();
+  },
+
+  async upsertSessionState(c, input: { sessionId: string; activeOrganizationId: string | null }) {
+    const now = Date.now();
+    await c.db
+      .insert(sessionState)
+      .values({
+        sessionId: input.sessionId,
+        activeOrganizationId: input.activeOrganizationId,
+        createdAt: now,
+        updatedAt: now,
+      })
+      .onConflictDoUpdate({
+        target: sessionState.sessionId,
+        set: { activeOrganizationId: input.activeOrganizationId, updatedAt: now },
+      })
+      .run();
+    return await c.db.select().from(sessionState).where(eq(sessionState.sessionId, input.sessionId)).get();
+  },
+
+  async upsertTaskState(
+    c,
+    input: {
+      taskId: string;
+      sessionId: string;
+      patch: {
+        activeSessionId?: string | null;
+        unread?: boolean;
+        draftText?: string;
+        draftAttachmentsJson?: string;
+        draftUpdatedAt?: number | null;
+      };
+    },
+  ) {
+    const now = Date.now();
+    const existing = await c.db
+      .select()
+      .from(userTaskState)
+      .where(and(eq(userTaskState.taskId, input.taskId), eq(userTaskState.sessionId, input.sessionId)))
+      .get();
+
+    if (input.patch.activeSessionId !== undefined) {
+      await c.db
+        .update(userTaskState)
+        .set({ activeSessionId: input.patch.activeSessionId, updatedAt: now })
+        .where(eq(userTaskState.taskId, input.taskId))
+        .run();
+    }
+
+    await c.db
+      .insert(userTaskState)
+      .values({
+        taskId: input.taskId,
+        sessionId: input.sessionId,
+        activeSessionId: input.patch.activeSessionId ?? existing?.activeSessionId ?? null,
+        unread: input.patch.unread !== undefined ? (input.patch.unread ? 1 : 0) : (existing?.unread ?? 0),
+        draftText: input.patch.draftText ?? existing?.draftText ?? "",
+        draftAttachmentsJson: input.patch.draftAttachmentsJson ?? existing?.draftAttachmentsJson ?? "[]",
+        draftUpdatedAt: input.patch.draftUpdatedAt === undefined ? (existing?.draftUpdatedAt ?? null) : input.patch.draftUpdatedAt,
+        updatedAt: now,
+      })
+      .onConflictDoUpdate({
+        target: [userTaskState.taskId, userTaskState.sessionId],
+        set: {
+          ...(input.patch.activeSessionId !== undefined ? { activeSessionId: input.patch.activeSessionId } : {}),
+          ...(input.patch.unread !== undefined ? { unread: input.patch.unread ? 1 : 0 } : {}),
+          ...(input.patch.draftText !== undefined ? { draftText: input.patch.draftText } : {}),
+          ...(input.patch.draftAttachmentsJson !== undefined ? { draftAttachmentsJson: input.patch.draftAttachmentsJson } : {}),
+          ...(input.patch.draftUpdatedAt !== undefined ? { draftUpdatedAt: input.patch.draftUpdatedAt } : {}),
+          updatedAt: now,
+        },
+      })
+      .run();
+
+    return await c.db
+      .select()
+      .from(userTaskState)
+      .where(and(eq(userTaskState.taskId, input.taskId), eq(userTaskState.sessionId, input.sessionId)))
+      .get();
+  },
+
+  async deleteTaskState(c, input: { taskId: string; sessionId?: string }) {
+    if (input.sessionId) {
+      await c.db
+        .delete(userTaskState)
+        .where(and(eq(userTaskState.taskId, input.taskId), eq(userTaskState.sessionId, input.sessionId)))
+        .run();
+      return;
+    }
+    await c.db.delete(userTaskState).where(eq(userTaskState.taskId, input.taskId)).run();
+  },
+};
diff --git a/foundry/packages/backend/src/actors/user/db/db.ts b/foundry/packages/backend/src/actors/user/db/db.ts
new file mode 100644
index 0000000..a864893
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/db/db.ts
@@ -0,0 +1,5 @@
+import { db } from "rivetkit/db/drizzle";
+import * as schema from "./schema.js";
+import migrations from "./migrations.js";
+
+export const userDb = db({ schema, migrations });
diff --git a/foundry/packages/backend/src/actors/user/db/migrations.ts b/foundry/packages/backend/src/actors/user/db/migrations.ts
new file mode 100644
index 0000000..da92bdc
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/db/migrations.ts
@@ -0,0 +1,106 @@
+// This file is generated by src/actors/_scripts/generate-actor-migrations.ts.
+// Source of truth is drizzle-kit output under ./drizzle (meta/_journal.json + *.sql).
+// Do not hand-edit this file.
+
+const journal = {
+  entries: [
+    {
+      idx: 0,
+      when: 1773446400000,
+      tag: "0000_auth_user",
+      breakpoints: true,
+    },
+    {
+      idx: 1,
+      when: 1773532800000,
+      tag: "0001_user_task_state",
+      breakpoints: true,
+    },
+  ],
+} as const;
+
+export default {
+  journal,
+  migrations: {
+    m0000: `CREATE TABLE \`user\` (
+	\`id\` integer PRIMARY KEY NOT NULL,
+	\`auth_user_id\` text NOT NULL,
+	\`name\` text NOT NULL,
+	\`email\` text NOT NULL,
+	\`email_verified\` integer NOT NULL,
+	\`image\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL,
+	CONSTRAINT \`user_singleton_id_check\` CHECK(\`id\` = 1)
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX \`user_auth_user_id_idx\` ON \`user\` (\`auth_user_id\`);
+--> statement-breakpoint
+CREATE TABLE \`session\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`token\` text NOT NULL,
+	\`user_id\` text NOT NULL,
+	\`expires_at\` integer NOT NULL,
+	\`ip_address\` text,
+	\`user_agent\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX \`session_token_idx\` ON \`session\` (\`token\`);
+--> statement-breakpoint
+CREATE TABLE \`account\` (
+	\`id\` text PRIMARY KEY NOT NULL,
+	\`account_id\` text NOT NULL,
+	\`provider_id\` text NOT NULL,
+	\`user_id\` text NOT NULL,
+	\`access_token\` text,
+	\`refresh_token\` text,
+	\`id_token\` text,
+	\`access_token_expires_at\` integer,
+	\`refresh_token_expires_at\` integer,
+	\`scope\` text,
+	\`password\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX \`account_provider_account_idx\` ON \`account\` (\`provider_id\`, \`account_id\`);
+--> statement-breakpoint
+CREATE TABLE \`user_profiles\` (
+	\`id\` integer PRIMARY KEY NOT NULL,
+	\`user_id\` text NOT NULL,
+	\`github_account_id\` text,
+	\`github_login\` text,
+	\`role_label\` text NOT NULL,
+	\`default_model\` text DEFAULT 'gpt-5.3-codex' NOT NULL,
+	\`eligible_organization_ids_json\` text NOT NULL,
+	\`starter_repo_status\` text NOT NULL,
+	\`starter_repo_starred_at\` integer,
+	\`starter_repo_skipped_at\` integer,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL,
+	CONSTRAINT \`user_profiles_singleton_id_check\` CHECK(\`id\` = 1)
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX \`user_profiles_user_id_idx\` ON \`user_profiles\` (\`user_id\`);
+--> statement-breakpoint
+CREATE TABLE \`session_state\` (
+	\`session_id\` text PRIMARY KEY NOT NULL,
+	\`active_organization_id\` text,
+	\`created_at\` integer NOT NULL,
+	\`updated_at\` integer NOT NULL
+);`,
+    m0001: `CREATE TABLE \`user_task_state\` (
+	\`task_id\` text NOT NULL,
+	\`session_id\` text NOT NULL,
+	\`active_session_id\` text,
+	\`unread\` integer DEFAULT 0 NOT NULL,
+	\`draft_text\` text DEFAULT '' NOT NULL,
+	\`draft_attachments_json\` text DEFAULT '[]' NOT NULL,
+	\`draft_updated_at\` integer,
+	\`updated_at\` integer NOT NULL,
+	PRIMARY KEY(\`task_id\`, \`session_id\`)
+);`,
+  } as const,
+};
diff --git a/foundry/packages/backend/src/actors/user/db/schema.ts b/foundry/packages/backend/src/actors/user/db/schema.ts
new file mode 100644
index 0000000..6a87a11
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/db/schema.ts
@@ -0,0 +1,112 @@
+import { check, integer, primaryKey, sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";
+import { sql } from "drizzle-orm";
+import { DEFAULT_WORKSPACE_MODEL_ID } from "@sandbox-agent/foundry-shared";
+
+/** Better Auth core model — schema defined at https://better-auth.com/docs/concepts/database */
+export const authUsers = sqliteTable(
+  "user",
+  {
+    id: integer("id").primaryKey(),
+    authUserId: text("auth_user_id").notNull(),
+    name: text("name").notNull(),
+    email: text("email").notNull(),
+    emailVerified: integer("email_verified").notNull(),
+    image: text("image"),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => ({
+    authUserIdIdx: uniqueIndex("user_auth_user_id_idx").on(table.authUserId),
+    singletonCheck: check("user_singleton_id_check", sql`${table.id} = 1`),
+  }),
+);
+
+/** Better Auth core model — schema defined at https://better-auth.com/docs/concepts/database */
+export const authSessions = sqliteTable(
+  "session",
+  {
+    id: text("id").notNull().primaryKey(),
+    token: text("token").notNull(),
+    userId: text("user_id").notNull(),
+    expiresAt: integer("expires_at").notNull(),
+    ipAddress: text("ip_address"),
+    userAgent: text("user_agent"),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => ({
+    tokenIdx: uniqueIndex("session_token_idx").on(table.token),
+  }),
+);
+
+/** Better Auth core model — schema defined at https://better-auth.com/docs/concepts/database */
+export const authAccounts = sqliteTable(
+  "account",
+  {
+    id: text("id").notNull().primaryKey(),
+    accountId: text("account_id").notNull(),
+    providerId: text("provider_id").notNull(),
+    userId: text("user_id").notNull(),
+    accessToken: text("access_token"),
+    refreshToken: text("refresh_token"),
+    idToken: text("id_token"),
+    accessTokenExpiresAt: integer("access_token_expires_at"),
+    refreshTokenExpiresAt: integer("refresh_token_expires_at"),
+    scope: text("scope"),
+    password: text("password"),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => ({
+    providerAccountIdx: uniqueIndex("account_provider_account_idx").on(table.providerId, table.accountId),
+  }),
+);
+
+/** Custom Foundry table — not part of Better Auth. */
+export const userProfiles = sqliteTable(
+  "user_profiles",
+  {
+    id: integer("id").primaryKey(),
+    userId: text("user_id").notNull(),
+    githubAccountId: text("github_account_id"),
+    githubLogin: text("github_login"),
+    roleLabel: text("role_label").notNull(),
+    defaultModel: text("default_model").notNull().default(DEFAULT_WORKSPACE_MODEL_ID),
+    eligibleOrganizationIdsJson: text("eligible_organization_ids_json").notNull(),
+    starterRepoStatus: text("starter_repo_status").notNull(),
+    starterRepoStarredAt: integer("starter_repo_starred_at"),
+    starterRepoSkippedAt: integer("starter_repo_skipped_at"),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => ({
+    userIdIdx: uniqueIndex("user_profiles_user_id_idx").on(table.userId),
+    singletonCheck: check("user_profiles_singleton_id_check", sql`${table.id} = 1`),
+  }),
+);
+
+/** Custom Foundry table — not part of Better Auth. */
+export const sessionState = sqliteTable("session_state", {
+  sessionId: text("session_id").notNull().primaryKey(),
+  activeOrganizationId: text("active_organization_id"),
+  createdAt: integer("created_at").notNull(),
+  updatedAt: integer("updated_at").notNull(),
+});
+
+/** Custom Foundry table — not part of Better Auth. Stores per-user task/session UI state. */
+export const userTaskState = sqliteTable(
+  "user_task_state",
+  {
+    taskId: text("task_id").notNull(),
+    sessionId: text("session_id").notNull(),
+    activeSessionId: text("active_session_id"),
+    unread: integer("unread").notNull().default(0),
+    draftText: text("draft_text").notNull().default(""),
+    draftAttachmentsJson: text("draft_attachments_json").notNull().default("[]"),
+    draftUpdatedAt: integer("draft_updated_at"),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => ({
+    pk: primaryKey({ columns: [table.taskId, table.sessionId] }),
+  }),
+);
diff --git a/foundry/packages/backend/src/actors/user/index.ts b/foundry/packages/backend/src/actors/user/index.ts
new file mode 100644
index 0000000..0deb1cb
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/index.ts
@@ -0,0 +1,20 @@
+import { actor } from "rivetkit";
+import { userDb } from "./db/db.js";
+import { betterAuthActions } from "./actions/better-auth.js";
+import { userActions } from "./actions/user.js";
+
+export const user = actor({
+  db: userDb,
+  options: {
+    name: "User",
+    icon: "shield",
+    actionTimeout: 60_000,
+  },
+  createState: (_c, input: { userId: string }) => ({
+    userId: input.userId,
+  }),
+  actions: {
+    ...betterAuthActions,
+    ...userActions,
+  },
+});
diff --git a/foundry/packages/backend/src/actors/user/query-helpers.ts b/foundry/packages/backend/src/actors/user/query-helpers.ts
new file mode 100644
index 0000000..5bdee10
--- /dev/null
+++ b/foundry/packages/backend/src/actors/user/query-helpers.ts
@@ -0,0 +1,197 @@
+import { and, eq, inArray, isNotNull, isNull, like, lt, lte, gt, gte, ne, notInArray, or } from "drizzle-orm";
+import { authAccounts, authSessions, authUsers, sessionState, userProfiles, userTaskState } from "./db/schema.js";
+
+export const userTables = {
+  user: authUsers,
+  session: authSessions,
+  account: authAccounts,
+  userProfiles,
+  sessionState,
+  userTaskState,
+} as const;
+
+export function tableFor(model: string) {
+  const table = userTables[model as keyof typeof userTables];
+  if (!table) {
+    throw new Error(`Unsupported user model: ${model}`);
+  }
+  return table as any;
+}
+
+function dbFieldFor(model: string, field: string): string {
+  if (model === "user" && field === "id") {
+    return "authUserId";
+  }
+  return field;
+}
+
+export function materializeRow(model: string, row: any) {
+  if (!row || model !== "user") {
+    return row;
+  }
+
+  const { id: _singletonId, authUserId, ...rest } = row;
+  return {
+    id: authUserId,
+    ...rest,
+  };
+}
+
+export function persistInput(model: string, data: Record<string, unknown>) {
+  if (model !== "user") {
+    return data;
+  }
+
+  const { id, ...rest } = data;
+  return {
+    id: 1,
+    authUserId: id,
+    ...rest,
+  };
+}
+
+export function persistPatch(model: string, data: Record<string, unknown>) {
+  if (model !== "user") {
+    return data;
+  }
+
+  const { id, ...rest } = data;
+  return {
+    ...(id !== undefined ? { authUserId: id } : {}),
+    ...rest,
+  };
+}
+
+export function columnFor(model: string, table: any, field: string) {
+  const column = table[dbFieldFor(model, field)];
+  if (!column) {
+    throw new Error(`Unsupported user field: ${model}.${field}`);
+  }
+  return column;
+}
+
+export function normalizeValue(value: unknown): unknown {
+  if (value instanceof Date) {
+    return value.getTime();
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => normalizeValue(entry));
+  }
+  return value;
+}
+
+export function clauseToExpr(table: any, clause: any) {
+  const model = table === authUsers ? "user" : table === authSessions ? "session" : table === authAccounts ? "account" : "";
+  const column = columnFor(model, table, clause.field);
+  const value = normalizeValue(clause.value);
+
+  switch (clause.operator) {
+    case "ne":
+      return value === null ? isNotNull(column) : ne(column, value as any);
+    case "lt":
+      return lt(column, value as any);
+    case "lte":
+      return lte(column, value as any);
+    case "gt":
+      return gt(column, value as any);
+    case "gte":
+      return gte(column, value as any);
+    case "in":
+      return inArray(column, Array.isArray(value) ? (value as any[]) : [value as any]);
+    case "not_in":
+      return notInArray(column, Array.isArray(value) ? (value as any[]) : [value as any]);
+    case "contains":
+      return like(column, `%${String(value ?? "")}%`);
+    case "starts_with":
+      return like(column, `${String(value ?? "")}%`);
+    case "ends_with":
+      return like(column, `%${String(value ?? "")}`);
+    case "eq":
+    default:
+      return value === null ? isNull(column) : eq(column, value as any);
+  }
+}
+
+export function buildWhere(table: any, where: any[] | undefined) {
+  if (!where || where.length === 0) {
+    return undefined;
+  }
+
+  let expr = clauseToExpr(table, where[0]);
+  for (const clause of where.slice(1)) {
+    const next = clauseToExpr(table, clause);
+    expr = clause.connector === "OR" ? or(expr, next) : and(expr, next);
+  }
+  return expr;
+}
+
+export function applyJoinToRow(c: any, model: string, row: any, join: any) {
+  const materialized = materializeRow(model, row);
+  if (!materialized || !join) {
+    return materialized;
+  }
+
+  if (model === "session" && join.user) {
+    return c.db
+      .select()
+      .from(authUsers)
+      .where(eq(authUsers.authUserId, materialized.userId))
+      .get()
+      .then((user: any) => ({ ...materialized, user: materializeRow("user", user) ?? null }));
+  }
+
+  if (model === "account" && join.user) {
+    return c.db
+      .select()
+      .from(authUsers)
+      .where(eq(authUsers.authUserId, materialized.userId))
+      .get()
+      .then((user: any) => ({ ...materialized, user: materializeRow("user", user) ?? null }));
+  }
+
+  if (model === "user" && join.account) {
+    return c.db
+      .select()
+      .from(authAccounts)
+      .where(eq(authAccounts.userId, materialized.id))
+      .all()
+      .then((accounts: any[]) => ({ ...materialized, account: accounts }));
+  }
+
+  return Promise.resolve(materialized);
+}
+
+export async function applyJoinToRows(c: any, model: string, rows: any[], join: any) {
+  if (!join || rows.length === 0) {
+    return rows.map((row) => materializeRow(model, row));
+  }
+
+  if (model === "session" && join.user) {
+    const userIds = [...new Set(rows.map((row) => row.userId).filter(Boolean))];
+    const users = userIds.length > 0 ? await c.db.select().from(authUsers).where(inArray(authUsers.authUserId, userIds)).all() : [];
+    const userMap = new Map(users.map((user: any) => [user.authUserId, materializeRow("user", user)]));
+    return rows.map((row) => ({ ...row, user: userMap.get(row.userId) ?? null }));
+  }
+
+  if (model === "account" && join.user) {
+    const userIds = [...new Set(rows.map((row) => row.userId).filter(Boolean))];
+    const users = userIds.length > 0 ? await c.db.select().from(authUsers).where(inArray(authUsers.authUserId, userIds)).all() : [];
+    const userMap = new Map(users.map((user: any) => [user.authUserId, materializeRow("user", user)]));
+    return rows.map((row) => ({ ...row, user: userMap.get(row.userId) ?? null }));
+  }
+
+  if (model === "user" && join.account) {
+    const materializedRows = rows.map((row) => materializeRow("user", row));
+    const userIds = materializedRows.map((row) => row.id);
+    const accounts = userIds.length > 0 ? await c.db.select().from(authAccounts).where(inArray(authAccounts.userId, userIds)).all() : [];
+    const accountsByUserId = new Map<string, any[]>();
+    for (const account of accounts) {
+      const entries = accountsByUserId.get(account.userId) ?? [];
+      entries.push(account);
+      accountsByUserId.set(account.userId, entries);
+    }
+    return materializedRows.map((row) => ({ ...row, account: accountsByUserId.get(row.id) ?? [] }));
+  }
+
+  return rows.map((row) => materializeRow(model, row));
+}
diff --git a/foundry/packages/backend/src/config/backend.ts b/foundry/packages/backend/src/config/backend.ts
new file mode 100644
index 0000000..82d9bbe
--- /dev/null
+++ b/foundry/packages/backend/src/config/backend.ts
@@ -0,0 +1,22 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+import { homedir } from "node:os";
+import * as toml from "@iarna/toml";
+import { ConfigSchema, type AppConfig } from "@sandbox-agent/foundry-shared";
+
+export const CONFIG_PATH = `${homedir()}/.config/foundry/config.toml`;
+
+export function loadConfig(path = CONFIG_PATH): AppConfig {
+  if (!existsSync(path)) {
+    return ConfigSchema.parse({});
+  }
+
+  const raw = readFileSync(path, "utf8");
+  const parsed = toml.parse(raw) as unknown;
+  return ConfigSchema.parse(parsed);
+}
+
+export function saveConfig(config: AppConfig, path = CONFIG_PATH): void {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, toml.stringify(config), "utf8");
+}
diff --git a/foundry/packages/backend/src/config/organization.ts b/foundry/packages/backend/src/config/organization.ts
new file mode 100644
index 0000000..8b5c766
--- /dev/null
+++ b/foundry/packages/backend/src/config/organization.ts
@@ -0,0 +1,13 @@
+import type { AppConfig } from "@sandbox-agent/foundry-shared";
+
+export function defaultOrganization(config: AppConfig): string {
+  const organizationId = config.organization.default.trim();
+  return organizationId.length > 0 ? organizationId : "default";
+}
+
+export function resolveOrganization(flagOrganization: string | undefined, config: AppConfig): string {
+  if (flagOrganization && flagOrganization.trim().length > 0) {
+    return flagOrganization.trim();
+  }
+  return defaultOrganization(config);
+}
diff --git a/foundry/packages/backend/src/config/runner-version.ts b/foundry/packages/backend/src/config/runner-version.ts
new file mode 100644
index 0000000..5c33672
--- /dev/null
+++ b/foundry/packages/backend/src/config/runner-version.ts
@@ -0,0 +1,33 @@
+import { readFileSync } from "node:fs";
+
+function parseRunnerVersion(rawValue: string | undefined): number | undefined {
+  const value = rawValue?.trim();
+  if (!value) {
+    return undefined;
+  }
+
+  const parsed = Number.parseInt(value, 10);
+  if (Number.isNaN(parsed)) {
+    return undefined;
+  }
+
+  return parsed;
+}
+
+export function resolveRunnerVersion(): number | undefined {
+  const envVersion = parseRunnerVersion(process.env.RIVET_RUNNER_VERSION);
+  if (envVersion !== undefined) {
+    return envVersion;
+  }
+
+  const versionFilePath = process.env.RIVET_RUNNER_VERSION_FILE;
+  if (!versionFilePath) {
+    return undefined;
+  }
+
+  try {
+    return parseRunnerVersion(readFileSync(versionFilePath, "utf8"));
+  } catch {
+    return undefined;
+  }
+}
diff --git a/foundry/packages/backend/src/driver.ts b/foundry/packages/backend/src/driver.ts
new file mode 100644
index 0000000..5c01035
--- /dev/null
+++ b/foundry/packages/backend/src/driver.ts
@@ -0,0 +1,33 @@
+import { createPr, starRepository } from "./integrations/github/index.js";
+
+export interface GithubDriver {
+  createPr(
+    repoFullName: string,
+    headBranch: string,
+    title: string,
+    body?: string,
+    options?: { githubToken?: string | null; baseBranch?: string | null },
+  ): Promise<{ number: number; url: string }>;
+  starRepository(repoFullName: string, options?: { githubToken?: string | null }): Promise<void>;
+}
+
+export interface TmuxDriver {
+  setWindowStatus(branchName: string, status: string): number;
+}
+
+export interface BackendDriver {
+  github: GithubDriver;
+  tmux: TmuxDriver;
+}
+
+export function createDefaultDriver(): BackendDriver {
+  return {
+    github: {
+      createPr,
+      starRepository,
+    },
+    tmux: {
+      setWindowStatus: () => 0,
+    },
+  };
+}
diff --git a/foundry/packages/backend/src/index.ts b/foundry/packages/backend/src/index.ts
new file mode 100644
index 0000000..617bacc
--- /dev/null
+++ b/foundry/packages/backend/src/index.ts
@@ -0,0 +1,517 @@
+import { Hono } from "hono";
+import { cors } from "hono/cors";
+import { randomUUID } from "node:crypto";
+import { initActorRuntimeContext } from "./actors/context.js";
+import { registry } from "./actors/index.js";
+import { organizationKey } from "./actors/keys.js";
+import { loadConfig } from "./config/backend.js";
+import { createBackends, createNotificationService } from "./notifications/index.js";
+import { createDefaultDriver } from "./driver.js";
+import { createClient } from "rivetkit/client";
+import { initBetterAuthService } from "./services/better-auth.js";
+import { createDefaultAppShellServices } from "./services/app-shell-runtime.js";
+import { APP_SHELL_ORGANIZATION_ID } from "./actors/organization/constants.js";
+import { logger } from "./logging.js";
+
+export interface BackendStartOptions {
+  host?: string;
+  port?: number;
+}
+
+interface AppOrganizationLogContext {
+  action?: string;
+  cfConnectingIp?: string;
+  cfRay?: string;
+  forwardedFor?: string;
+  forwardedHost?: string;
+  forwardedProto?: string;
+  method?: string;
+  path?: string;
+  requestId?: string;
+  referer?: string;
+  secFetchDest?: string;
+  secFetchMode?: string;
+  secFetchSite?: string;
+  secFetchUser?: string;
+  sessionId?: string;
+  userAgent?: string;
+  xRealIp?: string;
+}
+
+function stripTrailingSlash(value: string): string {
+  return value.replace(/\/$/, "");
+}
+
+function isRivetRequest(request: Request): boolean {
+  const { pathname } = new URL(request.url);
+  return pathname === "/v1/rivet" || pathname.startsWith("/v1/rivet/");
+}
+
+export async function startBackend(options: BackendStartOptions = {}): Promise<void> {
+  // Prevent the sandbox-agent SDK's unhandled SQLite constraint errors from
+  // crashing the entire process. The SDK has a bug where duplicate event
+  // inserts (sandbox_agent_events UNIQUE constraint) throw from an internal
+  // async path with no catch. Log and continue.
+  process.on("uncaughtException", (error) => {
+    logger.error({ error: error?.message ?? String(error), stack: error?.stack }, "uncaughtException (kept alive)");
+  });
+  process.on("unhandledRejection", (reason) => {
+    const msg = reason instanceof Error ? reason.message : String(reason);
+    const stack = reason instanceof Error ? reason.stack : undefined;
+    logger.error({ error: msg, stack }, "unhandledRejection (kept alive)");
+  });
+
+  // sandbox-agent agent plugins vary on which env var they read for OpenAI/Codex auth.
+  // Normalize to keep local dev + docker-compose simple.
+  if (!process.env.CODEX_API_KEY && process.env.OPENAI_API_KEY) {
+    process.env.CODEX_API_KEY = process.env.OPENAI_API_KEY;
+  }
+
+  const config = loadConfig();
+  config.backend.host = options.host ?? config.backend.host;
+  config.backend.port = options.port ?? config.backend.port;
+
+  // Allow docker-compose/dev environments to supply provider config via env vars
+  // instead of writing into the container's config.toml.
+  const envFirst = (...keys: string[]): string | undefined => {
+    for (const key of keys) {
+      const raw = process.env[key];
+      if (raw && raw.trim().length > 0) return raw.trim();
+    }
+    return undefined;
+  };
+
+  config.sandboxProviders.e2b.apiKey = envFirst("E2B_API_KEY") ?? config.sandboxProviders.e2b.apiKey;
+  config.sandboxProviders.e2b.template = envFirst("HF_E2B_TEMPLATE", "E2B_TEMPLATE") ?? config.sandboxProviders.e2b.template;
+
+  const driver = createDefaultDriver();
+  const backends = await createBackends(config.notify);
+  const notifications = createNotificationService(backends);
+  const appShellServices = createDefaultAppShellServices();
+  initActorRuntimeContext(config, notifications, driver, appShellServices);
+
+  const actorClient = createClient({
+    endpoint: `http://127.0.0.1:${config.backend.port}/v1/rivet`,
+  }) as any;
+  const betterAuth = initBetterAuthService(actorClient, {
+    apiUrl: appShellServices.apiUrl,
+    appUrl: appShellServices.appUrl,
+  });
+
+  const requestHeaderContext = (c: any): AppOrganizationLogContext => ({
+    cfConnectingIp: c.req.header("cf-connecting-ip") ?? undefined,
+    cfRay: c.req.header("cf-ray") ?? undefined,
+    forwardedFor: c.req.header("x-forwarded-for") ?? undefined,
+    forwardedHost: c.req.header("x-forwarded-host") ?? undefined,
+    forwardedProto: c.req.header("x-forwarded-proto") ?? undefined,
+    referer: c.req.header("referer") ?? undefined,
+    secFetchDest: c.req.header("sec-fetch-dest") ?? undefined,
+    secFetchMode: c.req.header("sec-fetch-mode") ?? undefined,
+    secFetchSite: c.req.header("sec-fetch-site") ?? undefined,
+    secFetchUser: c.req.header("sec-fetch-user") ?? undefined,
+    userAgent: c.req.header("user-agent") ?? undefined,
+    xRealIp: c.req.header("x-real-ip") ?? undefined,
+  });
+
+  // Serve custom Foundry HTTP APIs alongside the RivetKit registry.
+  const app = new Hono<{ Variables: { requestId: string } }>();
+  const allowHeaders = [
+    "Content-Type",
+    "Authorization",
+    "x-rivet-token",
+    "x-rivet-encoding",
+    "x-rivet-query",
+    "x-rivet-conn-params",
+    "x-rivet-actor",
+    "x-rivet-target",
+    "x-rivet-namespace",
+    "x-rivet-endpoint",
+    "x-rivet-total-slots",
+    "x-rivet-runner-name",
+    "x-rivet-namespace-name",
+  ];
+  const exposeHeaders = ["Content-Type", "x-rivet-ray-id"];
+  const allowedOrigins = new Set([stripTrailingSlash(appShellServices.appUrl), stripTrailingSlash(appShellServices.apiUrl)]);
+  const corsConfig = {
+    origin: (origin: string) => (allowedOrigins.has(origin) ? origin : null) as string | undefined | null,
+    credentials: true,
+    allowHeaders,
+    allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
+    exposeHeaders,
+  };
+  app.use("/v1/*", cors(corsConfig));
+  app.use("/v1", cors(corsConfig));
+
+  // On-demand memory snapshot endpoint for diagnosing spikes (dev only).
+  // Usage: curl http://127.0.0.1:7741/debug/memory
+  // Trigger GC first: curl http://127.0.0.1:7741/debug/memory?gc=1
+  // Write JSC heap snapshot: curl http://127.0.0.1:7741/debug/memory?heap=1
+  //   (writes /tmp/foundry-heap-<timestamp>.json, inspect with chrome://tracing)
+  app.get("/debug/memory", async (c) => {
+    if (process.env.NODE_ENV !== "development") {
+      return c.json({ error: "debug endpoints disabled in production" }, 403);
+    }
+    const wantGc = c.req.query("gc") === "1";
+    if (wantGc && typeof Bun !== "undefined") {
+      // Bun.gc(true) triggers a synchronous full GC sweep in JavaScriptCore.
+      Bun.gc(true);
+    }
+    const mem = process.memoryUsage();
+    const rssMb = Math.round(mem.rss / 1024 / 1024);
+    const heapUsedMb = Math.round(mem.heapUsed / 1024 / 1024);
+    const heapTotalMb = Math.round(mem.heapTotal / 1024 / 1024);
+    const externalMb = Math.round(mem.external / 1024 / 1024);
+    const nonHeapMb = rssMb - heapUsedMb - externalMb;
+    // Bun.heapStats() gives JSC-specific breakdown: object counts, typed array
+    // bytes, extra memory (native allocations tracked by JSC). Useful for
+    // distinguishing JS object bloat from native/WASM memory.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const BunAny = Bun as any;
+    const heapStats = typeof BunAny.heapStats === "function" ? BunAny.heapStats() : null;
+    const snapshot = {
+      rssMb,
+      heapUsedMb,
+      heapTotalMb,
+      externalMb,
+      nonHeapMb,
+      gcTriggered: wantGc,
+      rssBytes: mem.rss,
+      heapUsedBytes: mem.heapUsed,
+      heapTotalBytes: mem.heapTotal,
+      externalBytes: mem.external,
+      ...(heapStats ? { bunHeapStats: heapStats } : {}),
+    };
+    // Optionally write a full JSC heap snapshot for offline analysis.
+    let heapSnapshotPath: string | null = null;
+    const wantHeap = c.req.query("heap") === "1";
+    if (wantHeap && typeof Bun !== "undefined") {
+      heapSnapshotPath = `/tmp/foundry-heap-${Date.now()}.json`;
+      // Bun.generateHeapSnapshot("v8") returns a V8-compatible JSON string.
+      const heapJson = Bun.generateHeapSnapshot("v8");
+      await Bun.write(heapSnapshotPath, heapJson);
+    }
+    logger.info(snapshot, "memory_usage_debug");
+    return c.json({ ...snapshot, ...(heapSnapshotPath ? { heapSnapshotPath } : {}) });
+  });
+
+  app.use("*", async (c, next) => {
+    const requestId = c.req.header("x-request-id")?.trim() || randomUUID();
+    const start = performance.now();
+    c.set("requestId", requestId);
+    c.header("x-request-id", requestId);
+
+    try {
+      await next();
+    } catch (error) {
+      logger.error(
+        {
+          ...requestHeaderContext(c),
+          requestId,
+          method: c.req.method,
+          path: c.req.path,
+          errorMessage: error instanceof Error ? error.message : String(error),
+          errorStack: error instanceof Error ? error.stack : undefined,
+        },
+        "http_request_failed",
+      );
+      throw error;
+    }
+
+    logger.info(
+      {
+        ...requestHeaderContext(c),
+        requestId,
+        method: c.req.method,
+        path: c.req.path,
+        status: c.res.status,
+        durationMs: Math.round((performance.now() - start) * 100) / 100,
+      },
+      "http_request",
+    );
+  });
+
+  // Cache the app organization actor handle for the lifetime of this backend process.
+  // The "app" organization is a singleton coordinator for auth indexes, org state, and
+  // billing. Caching avoids repeated getOrCreate round-trips on every HTTP request.
+  let cachedAppOrganization: any | null = null;
+
+  const appOrganization = async (context: AppOrganizationLogContext = {}) => {
+    if (cachedAppOrganization) return cachedAppOrganization;
+
+    const start = performance.now();
+    try {
+      const handle = await actorClient.organization.getOrCreate(organizationKey(APP_SHELL_ORGANIZATION_ID), {
+        createWithInput: APP_SHELL_ORGANIZATION_ID,
+      });
+      cachedAppOrganization = handle;
+      logger.info(
+        {
+          ...context,
+          cache: "miss",
+          durationMs: Math.round((performance.now() - start) * 100) / 100,
+        },
+        "app_organization_resolve",
+      );
+      return handle;
+    } catch (error) {
+      logger.error(
+        {
+          ...context,
+          cache: "miss",
+          durationMs: Math.round((performance.now() - start) * 100) / 100,
+          errorMessage: error instanceof Error ? error.message : String(error),
+          errorStack: error instanceof Error ? error.stack : undefined,
+        },
+        "app_organization_resolve_failed",
+      );
+      throw error;
+    }
+  };
+
+  const requestLogContext = (c: any, sessionId?: string): AppOrganizationLogContext => ({
+    ...requestHeaderContext(c),
+    method: c.req.method,
+    path: c.req.path,
+    requestId: c.get("requestId"),
+    sessionId,
+  });
+
+  const resolveSessionId = async (c: any): Promise<string | null> => {
+    const session = await betterAuth.resolveSession(c.req.raw.headers);
+    return session?.session?.id ?? null;
+  };
+
+  // Deduplicate OAuth callback requests. The production proxy chain
+  // (Cloudflare -> Fastly -> Railway) retries callback requests when they take
+  // >10s. The first request deletes the verification record on success, so the
+  // retry fails with "verification not found" -> ?error=please_restart_the_process.
+  // This map tracks in-flight callbacks by state param so retries wait for and
+  // reuse the first request's response.
+  const inflightCallbacks = new Map<string, Promise<Response>>();
+
+  app.all("/v1/auth/*", async (c) => {
+    const authPath = c.req.path;
+    const authMethod = c.req.method;
+    const isCallback = authPath.includes("/callback/");
+
+    // Deduplicate callback requests by OAuth state parameter
+    if (isCallback) {
+      const url = new URL(c.req.url);
+      const state = url.searchParams.get("state");
+      if (state) {
+        const existing = inflightCallbacks.get(state);
+        if (existing) {
+          logger.info({ path: authPath, state: state.slice(0, 8) + "..." }, "auth_callback_dedup");
+          const original = await existing;
+          return original.clone();
+        }
+
+        const promise = (async () => {
+          logger.info({ path: authPath, method: authMethod, state: state.slice(0, 8) + "..." }, "auth_callback_start");
+          const start = performance.now();
+          const response = await betterAuth.auth.handler(c.req.raw);
+          const durationMs = Math.round((performance.now() - start) * 100) / 100;
+          const location = response.headers.get("location");
+          logger.info({ path: authPath, status: response.status, durationMs, location: location ?? undefined }, "auth_callback_complete");
+          if (location && location.includes("error=")) {
+            logger.error({ path: authPath, status: response.status, durationMs, location }, "auth_callback_error_redirect");
+          }
+          return response;
+        })();
+
+        inflightCallbacks.set(state, promise);
+        try {
+          const response = await promise;
+          return response.clone();
+        } finally {
+          // Keep entry briefly so late retries still hit the cache
+          setTimeout(() => inflightCallbacks.delete(state), 30_000);
+        }
+      }
+    }
+
+    return await betterAuth.auth.handler(c.req.raw);
+  });
+
+  app.post("/v1/app/sign-out", async (c) => {
+    const sessionId = await resolveSessionId(c);
+    if (sessionId) {
+      const signOutResponse = await betterAuth.signOut(c.req.raw.headers);
+      const setCookie = signOutResponse.headers.get("set-cookie");
+      if (setCookie) {
+        c.header("set-cookie", setCookie);
+      }
+    }
+    return c.json({
+      auth: { status: "signed_out", currentUserId: null },
+      activeOrganizationId: null,
+      onboarding: {
+        starterRepo: {
+          repoFullName: "rivet-dev/sandbox-agent",
+          repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+          status: "pending",
+          starredAt: null,
+          skippedAt: null,
+        },
+      },
+      users: [],
+      organizations: [],
+    });
+  });
+
+  app.get("/v1/billing/checkout/complete", async (c) => {
+    const organizationId = c.req.query("organizationId");
+    const checkoutSessionId = c.req.query("session_id");
+    if (!organizationId || !checkoutSessionId) {
+      return c.text("Missing Stripe checkout completion parameters", 400);
+    }
+    const sessionId = await resolveSessionId(c);
+    if (!sessionId) {
+      return c.text("Unauthorized", 401);
+    }
+    const result = await (await appOrganization(requestLogContext(c, sessionId))).finalizeAppCheckoutSession({
+      organizationId,
+      sessionId,
+      checkoutSessionId,
+    });
+    return Response.redirect(result.redirectTo, 302);
+  });
+
+  const handleStripeWebhook = async (c: any) => {
+    const payload = await c.req.text();
+    await (await appOrganization(requestLogContext(c))).handleAppStripeWebhook({
+      payload,
+      signatureHeader: c.req.header("stripe-signature") ?? null,
+    });
+    return c.json({ ok: true });
+  };
+
+  app.post("/v1/webhooks/stripe", handleStripeWebhook);
+
+  app.post("/v1/webhooks/github", async (c) => {
+    const payload = await c.req.text();
+    await (await appOrganization(requestLogContext(c))).handleAppGithubWebhook({
+      payload,
+      signatureHeader: c.req.header("x-hub-signature-256") ?? null,
+      eventHeader: c.req.header("x-github-event") ?? null,
+    });
+    return c.json({ ok: true });
+  });
+
+  const server = Bun.serve({
+    fetch: (request) => {
+      if (isRivetRequest(request)) {
+        return registry.handler(request);
+      }
+      return app.fetch(request);
+    },
+    hostname: config.backend.host,
+    port: config.backend.port,
+    // Bun defaults to 10s idle timeout. Actor RPCs go through the gateway
+    // tunnel (not direct HTTP), and the SSE stream has a 1s ping interval
+    // (RUNNER_SSE_PING_INTERVAL in rivetkit), so the idle timeout likely
+    // never fires in practice. Set high as a safety net regardless.
+    idleTimeout: 255,
+  });
+
+  logger.info(
+    {
+      host: config.backend.host,
+      port: config.backend.port,
+    },
+    "backend_started",
+  );
+
+  // Periodic memory usage reporting for diagnosing memory spikes (dev only).
+  // Logs JS heap, RSS, and external (native/WASM) separately so we can tell
+  // whether spikes come from JS objects, Bun/JSC internals, or native addons
+  // like SQLite/WASM.
+  if (process.env.NODE_ENV === "development") {
+    let prevRss = 0;
+    setInterval(() => {
+      const mem = process.memoryUsage();
+      const rssMb = Math.round(mem.rss / 1024 / 1024);
+      const heapUsedMb = Math.round(mem.heapUsed / 1024 / 1024);
+      const heapTotalMb = Math.round(mem.heapTotal / 1024 / 1024);
+      const externalMb = Math.round(mem.external / 1024 / 1024);
+      // Non-heap RSS: memory not accounted for by JS heap or external buffers.
+      // Large values here point to native allocations (WASM, mmap, child process
+      // bookkeeping, Bun's internal arena, etc.).
+      const nonHeapMb = rssMb - heapUsedMb - externalMb;
+      const deltaRss = rssMb - prevRss;
+      prevRss = rssMb;
+      logger.info(
+        {
+          rssMb,
+          heapUsedMb,
+          heapTotalMb,
+          externalMb,
+          nonHeapMb,
+          deltaRssMb: deltaRss,
+          rssBytes: mem.rss,
+          heapUsedBytes: mem.heapUsed,
+          heapTotalBytes: mem.heapTotal,
+          externalBytes: mem.external,
+        },
+        "memory_usage",
+      );
+    }, 60_000);
+  }
+
+  process.on("SIGINT", async () => {
+    server.stop();
+    process.exit(0);
+  });
+
+  process.on("SIGTERM", async () => {
+    server.stop();
+    process.exit(0);
+  });
+
+  // Keep process alive.
+  await new Promise<void>(() => undefined);
+}
+
+function parseArg(flag: string): string | undefined {
+  const idx = process.argv.indexOf(flag);
+  if (idx < 0) return undefined;
+  return process.argv[idx + 1];
+}
+
+function parseEnvPort(value: string | undefined): number | undefined {
+  if (!value) {
+    return undefined;
+  }
+  const port = Number(value);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+    return undefined;
+  }
+  return port;
+}
+
+async function main(): Promise<void> {
+  const cmd = process.argv[2] ?? "start";
+  if (cmd !== "start") {
+    throw new Error(`Unsupported backend command: ${cmd}`);
+  }
+
+  const host = parseArg("--host") ?? process.env.HOST ?? process.env.HF_BACKEND_HOST;
+  const port = parseArg("--port") ?? process.env.PORT ?? process.env.HF_BACKEND_PORT;
+  await startBackend({
+    host,
+    port: parseEnvPort(port),
+  });
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+  main().catch((err: unknown) => {
+    logger.fatal(
+      {
+        errorMessage: err instanceof Error ? err.message : String(err),
+        errorStack: err instanceof Error ? err.stack : undefined,
+      },
+      "backend_start_failed",
+    );
+    process.exit(1);
+  });
+}
diff --git a/foundry/packages/backend/src/integrations/github/index.ts b/foundry/packages/backend/src/integrations/github/index.ts
new file mode 100644
index 0000000..87fc996
--- /dev/null
+++ b/foundry/packages/backend/src/integrations/github/index.ts
@@ -0,0 +1,80 @@
+interface GithubAuthOptions {
+  githubToken?: string | null;
+  baseBranch?: string | null;
+}
+
+function authHeaders(options?: GithubAuthOptions): HeadersInit {
+  const token = options?.githubToken?.trim();
+  if (!token) {
+    throw new Error("GitHub token is required for this operation");
+  }
+  return {
+    Accept: "application/vnd.github+json",
+    Authorization: `Bearer ${token}`,
+    "X-GitHub-Api-Version": "2022-11-28",
+  };
+}
+
+async function githubRequest(path: string, init: RequestInit, options?: GithubAuthOptions): Promise<Response> {
+  return await fetch(`https://api.github.com${path}`, {
+    ...init,
+    headers: {
+      ...authHeaders(options),
+      ...(init.headers ?? {}),
+    },
+  });
+}
+
+export async function createPr(
+  repoFullName: string,
+  headBranch: string,
+  title: string,
+  body?: string,
+  options?: GithubAuthOptions,
+): Promise<{ number: number; url: string }> {
+  const baseBranch = options?.baseBranch?.trim() || "main";
+  const response = await githubRequest(
+    `/repos/${repoFullName}/pulls`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        title,
+        head: headBranch,
+        base: baseBranch,
+        body: body ?? "",
+      }),
+    },
+    options,
+  );
+
+  const payload = (await response.json()) as { number?: number; html_url?: string; message?: string };
+  if (!response.ok || !payload.number || !payload.html_url) {
+    throw new Error(payload.message ?? `Failed to create pull request for ${repoFullName}`);
+  }
+
+  return {
+    number: payload.number,
+    url: payload.html_url,
+  };
+}
+
+export async function starRepository(repoFullName: string, options?: GithubAuthOptions): Promise<void> {
+  const response = await githubRequest(
+    `/user/starred/${repoFullName}`,
+    {
+      method: "PUT",
+      headers: {
+        "Content-Length": "0",
+      },
+    },
+    options,
+  );
+
+  if (!response.ok) {
+    const payload = (await response.json().catch(() => null)) as { message?: string } | null;
+    throw new Error(payload?.message ?? `Failed to star GitHub repository ${repoFullName}`);
+  }
+}
diff --git a/foundry/packages/backend/src/integrations/sandbox-agent/client.ts b/foundry/packages/backend/src/integrations/sandbox-agent/client.ts
new file mode 100644
index 0000000..f936db3
--- /dev/null
+++ b/foundry/packages/backend/src/integrations/sandbox-agent/client.ts
@@ -0,0 +1,418 @@
+import type { AgentType } from "@sandbox-agent/foundry-shared";
+import type {
+  ListEventsRequest,
+  ListPage,
+  ListPageRequest,
+  ProcessCreateRequest,
+  ProcessInfo,
+  ProcessLogFollowQuery,
+  ProcessLogsResponse,
+  ProcessSignalQuery,
+  SessionEvent,
+  SessionPersistDriver,
+  SessionRecord,
+} from "sandbox-agent";
+import { SandboxAgent } from "sandbox-agent";
+
+export type AgentId = AgentType | "opencode";
+
+export interface SandboxSession {
+  id: string;
+  status: "running" | "idle" | "error";
+}
+
+export interface SandboxSessionCreateRequest {
+  prompt?: string;
+  cwd?: string;
+  agent?: AgentId;
+}
+
+export interface SandboxSessionPromptRequest {
+  sessionId: string;
+  prompt: string;
+  notification?: boolean;
+}
+
+export interface SandboxAgentClientOptions {
+  endpoint: string;
+  token?: string;
+  agent?: AgentId;
+  persist?: SessionPersistDriver;
+}
+
+const DEFAULT_AGENT: AgentId = "codex";
+
+function modeIdForAgent(agent: AgentId): string | null {
+  switch (agent) {
+    case "codex":
+      return "full-access";
+    case "claude":
+      return "acceptEdits";
+    default:
+      return null;
+  }
+}
+
+function normalizeStatusFromMessage(payload: unknown): SandboxSession["status"] | null {
+  if (payload && typeof payload === "object") {
+    const envelope = payload as {
+      error?: unknown;
+      method?: unknown;
+      result?: unknown;
+    };
+
+    const maybeError = envelope.error;
+    if (maybeError) {
+      return "error";
+    }
+
+    if (envelope.result && typeof envelope.result === "object") {
+      const stopReason = (envelope.result as { stopReason?: unknown }).stopReason;
+      if (typeof stopReason === "string" && stopReason.length > 0) {
+        return "idle";
+      }
+    }
+
+    const method = envelope.method;
+    if (typeof method === "string") {
+      const lowered = method.toLowerCase();
+      if (lowered.includes("error") || lowered.includes("failed")) {
+        return "error";
+      }
+      if (lowered.includes("ended") || lowered.includes("complete") || lowered.includes("stopped")) {
+        return "idle";
+      }
+    }
+  }
+
+  return null;
+}
+
+export class SandboxAgentClient {
+  readonly endpoint: string;
+  readonly token?: string;
+  readonly agent: AgentId;
+  readonly persist?: SessionPersistDriver;
+  private sdkPromise?: Promise<SandboxAgent>;
+  private readonly statusBySessionId = new Map<string, SandboxSession["status"]>();
+
+  constructor(options: SandboxAgentClientOptions) {
+    this.endpoint = options.endpoint.replace(/\/$/, "");
+    this.token = options.token;
+    this.agent = options.agent ?? DEFAULT_AGENT;
+    this.persist = options.persist;
+  }
+
+  private async sdk(): Promise<SandboxAgent> {
+    if (!this.sdkPromise) {
+      this.sdkPromise = SandboxAgent.connect({
+        baseUrl: this.endpoint,
+        token: this.token,
+        persist: this.persist,
+      });
+    }
+
+    return this.sdkPromise;
+  }
+
+  private setStatus(sessionId: string, status: SandboxSession["status"]): void {
+    this.statusBySessionId.set(sessionId, status);
+  }
+
+  private isLikelyPromptTimeout(err: unknown): boolean {
+    const message = err instanceof Error ? err.message : String(err);
+    const lowered = message.toLowerCase();
+    // sandbox-agent server times out long-running ACP prompts and returns a 504-like error.
+    return lowered.includes("timeout waiting for agent response") || lowered.includes("timed out waiting for agent response") || lowered.includes("504");
+  }
+
+  async createSession(request: string | SandboxSessionCreateRequest): Promise<SandboxSession> {
+    const normalized: SandboxSessionCreateRequest = typeof request === "string" ? { prompt: request } : request;
+    const sdk = await this.sdk();
+    // Do not wrap createSession in a local Promise.race timeout. The underlying SDK
+    // call is not abortable, so local timeout races create overlapping ACP requests and
+    // can produce duplicate/orphaned sessions while the original request is still running.
+    const session = await sdk.createSession({
+      agent: normalized.agent ?? this.agent,
+      sessionInit: {
+        cwd: normalized.cwd ?? "/",
+        mcpServers: [],
+      },
+    });
+    const modeId = modeIdForAgent(normalized.agent ?? this.agent);
+
+    // Codex defaults to a restrictive "read-only" preset in some environments.
+    // Foundry automation needs edits, command execution, and network access.
+    // access (git push / PR creation). Use full-access where supported.
+    //
+    // If the agent doesn't support session modes, ignore.
+    //
+    // Do this in the background: ACP mode updates can occasionally time out (504),
+    // and waiting here can stall session creation long enough to trip task init
+    // step timeouts even though the session itself was created.
+    if (modeId) {
+      void session.rawSend("session/set_mode", { modeId }).catch(() => {
+        // ignore
+      });
+    }
+
+    const prompt = normalized.prompt?.trim();
+    if (!prompt) {
+      this.setStatus(session.id, "idle");
+      return {
+        id: session.id,
+        status: "idle",
+      };
+    }
+
+    // Fire the first turn in the background. We intentionally do not await this:
+    // session creation must remain fast, and we observe completion via events/stopReason.
+    //
+    // Note: sandbox-agent's ACP adapter for Codex may take >2 minutes to respond.
+    // sandbox-agent can return a timeout error (504) even though the agent continues
+    // running. Treat that timeout as non-fatal and keep polling events.
+    void session
+      .prompt([{ type: "text", text: prompt }])
+      .then(() => {
+        this.setStatus(session.id, "idle");
+      })
+      .catch((err) => {
+        if (this.isLikelyPromptTimeout(err)) {
+          this.setStatus(session.id, "running");
+          return;
+        }
+        this.setStatus(session.id, "error");
+      });
+
+    this.setStatus(session.id, "running");
+    return {
+      id: session.id,
+      status: "running",
+    };
+  }
+
+  async createSessionNoTask(dir: string): Promise<SandboxSession> {
+    return this.createSession({
+      cwd: dir,
+    });
+  }
+
+  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
+    const sdk = await this.sdk();
+    const page = await sdk.listSessions(request);
+    return {
+      items: page.items.map((session) => session.toRecord()),
+      nextCursor: page.nextCursor,
+    };
+  }
+
+  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
+    const sdk = await this.sdk();
+    return sdk.getEvents(request);
+  }
+
+  async createProcess(request: ProcessCreateRequest): Promise<ProcessInfo> {
+    const sdk = await this.sdk();
+    return await sdk.createProcess(request);
+  }
+
+  async listProcesses(): Promise<{ processes: ProcessInfo[] }> {
+    const sdk = await this.sdk();
+    return await sdk.listProcesses();
+  }
+
+  async getProcessLogs(processId: string, query: ProcessLogFollowQuery = {}): Promise<ProcessLogsResponse> {
+    const sdk = await this.sdk();
+    return await sdk.getProcessLogs(processId, query);
+  }
+
+  async stopProcess(processId: string, query?: ProcessSignalQuery): Promise<ProcessInfo> {
+    const sdk = await this.sdk();
+    return await sdk.stopProcess(processId, query);
+  }
+
+  async killProcess(processId: string, query?: ProcessSignalQuery): Promise<ProcessInfo> {
+    const sdk = await this.sdk();
+    return await sdk.killProcess(processId, query);
+  }
+
+  async deleteProcess(processId: string): Promise<void> {
+    const sdk = await this.sdk();
+    await sdk.deleteProcess(processId);
+  }
+
+  async sendPrompt(request: SandboxSessionPromptRequest): Promise<void> {
+    const sdk = await this.sdk();
+    const existing = await sdk.getSession(request.sessionId);
+    if (!existing) {
+      throw new Error(`session '${request.sessionId}' not found`);
+    }
+
+    const session = await sdk.resumeSession(request.sessionId);
+    const modeId = modeIdForAgent(this.agent);
+    // Keep mode update best-effort and non-blocking for the same reason as createSession.
+    if (modeId) {
+      void session.rawSend("session/set_mode", { modeId }).catch(() => {
+        // ignore
+      });
+    }
+    const text = request.prompt.trim();
+    if (!text) return;
+
+    // sandbox-agent's Session.send(notification=true) forwards an extNotification with
+    // method "session/prompt", which some agents (e.g. codex-acp) do not implement.
+    // Use Session.prompt and treat notification=true as "fire-and-forget".
+    const fireAndForget = request.notification ?? true;
+    if (fireAndForget) {
+      void session
+        .prompt([{ type: "text", text }])
+        .then(() => {
+          this.setStatus(request.sessionId, "idle");
+        })
+        .catch((err) => {
+          if (this.isLikelyPromptTimeout(err)) {
+            this.setStatus(request.sessionId, "running");
+            return;
+          }
+          this.setStatus(request.sessionId, "error");
+        });
+    } else {
+      try {
+        await session.prompt([{ type: "text", text }]);
+        this.setStatus(request.sessionId, "idle");
+      } catch (err) {
+        if (this.isLikelyPromptTimeout(err)) {
+          this.setStatus(request.sessionId, "running");
+          return;
+        }
+        throw err;
+      }
+    }
+    this.setStatus(request.sessionId, "running");
+  }
+
+  async cancelSession(sessionId: string): Promise<void> {
+    const sdk = await this.sdk();
+    const existing = await sdk.getSession(sessionId);
+    if (!existing) {
+      throw new Error(`session '${sessionId}' not found`);
+    }
+
+    const session = await sdk.resumeSession(sessionId);
+    await session.rawSend("session/cancel", {});
+    this.setStatus(sessionId, "idle");
+  }
+
+  async destroySession(sessionId: string): Promise<void> {
+    const sdk = await this.sdk();
+    await sdk.destroySession(sessionId);
+    this.setStatus(sessionId, "idle");
+  }
+
+  async sessionStatus(sessionId: string): Promise<SandboxSession> {
+    const cached = this.statusBySessionId.get(sessionId);
+    if (cached && cached !== "running") {
+      return { id: sessionId, status: cached };
+    }
+
+    const sdk = await this.sdk();
+    const session = await sdk.getSession(sessionId);
+
+    if (!session) {
+      this.setStatus(sessionId, "error");
+      return { id: sessionId, status: "error" };
+    }
+
+    const record = session.toRecord();
+    if (record.destroyedAt) {
+      this.setStatus(sessionId, "idle");
+      return { id: sessionId, status: "idle" };
+    }
+
+    const events = await sdk.getEvents({
+      sessionId,
+      limit: 25,
+    });
+
+    for (let i = events.items.length - 1; i >= 0; i--) {
+      const item = events.items[i];
+      if (!item) continue;
+      const status = normalizeStatusFromMessage(item.payload);
+      if (status) {
+        this.setStatus(sessionId, status);
+        return { id: sessionId, status };
+      }
+    }
+
+    this.setStatus(sessionId, "running");
+    return { id: sessionId, status: "running" };
+  }
+
+  async killSessionsInDirectory(dir: string): Promise<void> {
+    const sdk = await this.sdk();
+    let cursor: string | undefined;
+
+    do {
+      const page = await sdk.listSessions({
+        cursor,
+        limit: 100,
+      });
+
+      for (const session of page.items) {
+        const initCwd = session.toRecord().sessionInit?.cwd;
+        if (initCwd !== dir) {
+          continue;
+        }
+        await sdk.destroySession(session.id);
+        this.statusBySessionId.delete(session.id);
+      }
+
+      cursor = page.nextCursor;
+    } while (cursor);
+  }
+
+  async generateCommitMessage(dir: string, spec: string, task: string): Promise<string> {
+    const prompt = [
+      "Generate a conventional commit message for the following changes.",
+      "Return ONLY the commit message, no explanation or markdown formatting.",
+      "",
+      `Task: ${task}`,
+      "",
+      `Spec/diff:\n${spec}`,
+    ].join("\n");
+
+    const sdk = await this.sdk();
+    const session = await sdk.createSession({
+      agent: this.agent,
+      sessionInit: {
+        cwd: dir,
+        mcpServers: [],
+      },
+    });
+
+    await session.prompt([{ type: "text", text: prompt }]);
+    this.setStatus(session.id, "idle");
+
+    const events = await sdk.getEvents({
+      sessionId: session.id,
+      limit: 100,
+    });
+
+    for (let i = events.items.length - 1; i >= 0; i--) {
+      const event = events.items[i];
+      if (!event) continue;
+      if (event.sender !== "agent") continue;
+
+      const payload = event.payload as Record<string, unknown>;
+      const params = payload.params;
+      if (!params || typeof params !== "object") continue;
+
+      const text = (params as { text?: unknown }).text;
+      if (typeof text === "string" && text.trim().length > 0) {
+        return text.trim();
+      }
+    }
+
+    throw new Error("sandbox-agent commit message response was empty");
+  }
+}
diff --git a/foundry/packages/backend/src/logging.ts b/foundry/packages/backend/src/logging.ts
new file mode 100644
index 0000000..5b96d92
--- /dev/null
+++ b/foundry/packages/backend/src/logging.ts
@@ -0,0 +1,6 @@
+import { createFoundryLogger } from "@sandbox-agent/foundry-shared";
+
+export const logger = createFoundryLogger({
+  service: "foundry-backend",
+  format: "logfmt",
+});
diff --git a/foundry/packages/backend/src/notifications/backends.ts b/foundry/packages/backend/src/notifications/backends.ts
new file mode 100644
index 0000000..9429298
--- /dev/null
+++ b/foundry/packages/backend/src/notifications/backends.ts
@@ -0,0 +1,124 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+
+const execFileAsync = promisify(execFile);
+
+export type NotifyUrgency = "low" | "normal" | "high";
+
+export interface NotifyBackend {
+  name: string;
+  available(): Promise<boolean>;
+  send(title: string, body: string, urgency: NotifyUrgency): Promise<boolean>;
+}
+
+async function isOnPath(binary: string): Promise<boolean> {
+  try {
+    await execFileAsync("which", [binary]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export class OpenclawBackend implements NotifyBackend {
+  readonly name = "openclaw";
+
+  async available(): Promise<boolean> {
+    return isOnPath("openclaw");
+  }
+
+  async send(title: string, body: string, _urgency: NotifyUrgency): Promise<boolean> {
+    try {
+      await execFileAsync("openclaw", ["wake", "--title", title, "--body", body]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+export class MacOsNotifyBackend implements NotifyBackend {
+  readonly name = "macos-osascript";
+
+  async available(): Promise<boolean> {
+    return process.platform === "darwin";
+  }
+
+  async send(title: string, body: string, _urgency: NotifyUrgency): Promise<boolean> {
+    try {
+      const escaped_body = body.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+      const escaped_title = title.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+      const script = `display notification "${escaped_body}" with title "${escaped_title}"`;
+      await execFileAsync("osascript", ["-e", script]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+export class LinuxNotifySendBackend implements NotifyBackend {
+  readonly name = "linux-notify-send";
+
+  async available(): Promise<boolean> {
+    return isOnPath("notify-send");
+  }
+
+  async send(title: string, body: string, urgency: NotifyUrgency): Promise<boolean> {
+    const urgencyMap: Record<NotifyUrgency, string> = {
+      low: "low",
+      normal: "normal",
+      high: "critical",
+    };
+
+    try {
+      await execFileAsync("notify-send", ["-u", urgencyMap[urgency], title, body]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+export class TerminalBellBackend implements NotifyBackend {
+  readonly name = "terminal";
+
+  async available(): Promise<boolean> {
+    return true;
+  }
+
+  async send(title: string, body: string, _urgency: NotifyUrgency): Promise<boolean> {
+    try {
+      process.stderr.write("\x07");
+      process.stderr.write(`[${title}] ${body}\n`);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+const backendFactories: Record<string, () => NotifyBackend> = {
+  openclaw: () => new OpenclawBackend(),
+  "macos-osascript": () => new MacOsNotifyBackend(),
+  "linux-notify-send": () => new LinuxNotifySendBackend(),
+  terminal: () => new TerminalBellBackend(),
+};
+
+export async function createBackends(configOrder: string[]): Promise<NotifyBackend[]> {
+  const backends: NotifyBackend[] = [];
+
+  for (const name of configOrder) {
+    const backendBuilder = backendFactories[name];
+    if (!backendBuilder) {
+      continue;
+    }
+
+    const backend = backendBuilder();
+    if (await backend.available()) {
+      backends.push(backend);
+    }
+  }
+
+  return backends;
+}
diff --git a/foundry/packages/backend/src/notifications/index.ts b/foundry/packages/backend/src/notifications/index.ts
new file mode 100644
index 0000000..32b89ba
--- /dev/null
+++ b/foundry/packages/backend/src/notifications/index.ts
@@ -0,0 +1,63 @@
+import type { NotifyBackend, NotifyUrgency } from "./backends.js";
+
+export type { NotifyUrgency } from "./backends.js";
+export { createBackends } from "./backends.js";
+
+export interface NotificationService {
+  notify(title: string, body: string, urgency: NotifyUrgency): Promise<void>;
+  agentIdle(branchName: string): Promise<void>;
+  agentError(branchName: string, error: string): Promise<void>;
+  ciPassed(branchName: string, prNumber: number): Promise<void>;
+  ciFailed(branchName: string, prNumber: number): Promise<void>;
+  prApproved(branchName: string, prNumber: number, reviewer: string): Promise<void>;
+  changesRequested(branchName: string, prNumber: number, reviewer: string): Promise<void>;
+  prMerged(branchName: string, prNumber: number): Promise<void>;
+  taskCreated(branchName: string): Promise<void>;
+}
+
+export function createNotificationService(backends: NotifyBackend[]): NotificationService {
+  async function notify(title: string, body: string, urgency: NotifyUrgency): Promise<void> {
+    for (const backend of backends) {
+      const sent = await backend.send(title, body, urgency);
+      if (sent) {
+        return;
+      }
+    }
+  }
+
+  return {
+    notify,
+
+    async agentIdle(branchName: string): Promise<void> {
+      await notify("Agent Idle", `Agent finished on ${branchName}`, "normal");
+    },
+
+    async agentError(branchName: string, error: string): Promise<void> {
+      await notify("Agent Error", `Agent error on ${branchName}: ${error}`, "high");
+    },
+
+    async ciPassed(branchName: string, prNumber: number): Promise<void> {
+      await notify("CI Passed", `CI passed on ${branchName} (PR #${prNumber})`, "low");
+    },
+
+    async ciFailed(branchName: string, prNumber: number): Promise<void> {
+      await notify("CI Failed", `CI failed on ${branchName} (PR #${prNumber})`, "high");
+    },
+
+    async prApproved(branchName: string, prNumber: number, reviewer: string): Promise<void> {
+      await notify("PR Approved", `PR #${prNumber} on ${branchName} approved by ${reviewer}`, "normal");
+    },
+
+    async changesRequested(branchName: string, prNumber: number, reviewer: string): Promise<void> {
+      await notify("Changes Requested", `Changes requested on PR #${prNumber} (${branchName}) by ${reviewer}`, "high");
+    },
+
+    async prMerged(branchName: string, prNumber: number): Promise<void> {
+      await notify("PR Merged", `PR #${prNumber} on ${branchName} merged`, "normal");
+    },
+
+    async taskCreated(branchName: string): Promise<void> {
+      await notify("Task Created", `New task on ${branchName}`, "low");
+    },
+  };
+}
diff --git a/foundry/packages/backend/src/notifications/state-tracker.ts b/foundry/packages/backend/src/notifications/state-tracker.ts
new file mode 100644
index 0000000..24250cf
--- /dev/null
+++ b/foundry/packages/backend/src/notifications/state-tracker.ts
@@ -0,0 +1,43 @@
+export type CiState = "running" | "pass" | "fail" | "unknown";
+export type ReviewState = "approved" | "changes_requested" | "pending" | "none" | "unknown";
+
+export interface PrStateTransition {
+  type: "ci_passed" | "ci_failed" | "pr_approved" | "changes_requested";
+  branchName: string;
+  prNumber: number;
+  reviewer?: string;
+}
+
+export class PrStateTracker {
+  private states: Map<string, { ci: CiState; review: ReviewState }>;
+
+  constructor() {
+    this.states = new Map();
+  }
+
+  update(repoId: string, branchName: string, prNumber: number, ci: CiState, review: ReviewState, reviewer?: string): PrStateTransition[] {
+    const key = `${repoId}:${branchName}`;
+    const prev = this.states.get(key);
+    const transitions: PrStateTransition[] = [];
+
+    if (prev) {
+      // CI transitions: only fire when moving from "running" to a terminal state
+      if (prev.ci === "running" && ci === "pass") {
+        transitions.push({ type: "ci_passed", branchName, prNumber });
+      } else if (prev.ci === "running" && ci === "fail") {
+        transitions.push({ type: "ci_failed", branchName, prNumber });
+      }
+
+      // Review transitions: only fire when moving from "pending" to a terminal state
+      if (prev.review === "pending" && review === "approved") {
+        transitions.push({ type: "pr_approved", branchName, prNumber, reviewer });
+      } else if (prev.review === "pending" && review === "changes_requested") {
+        transitions.push({ type: "changes_requested", branchName, prNumber, reviewer });
+      }
+    }
+
+    this.states.set(key, { ci, review });
+
+    return transitions;
+  }
+}
diff --git a/foundry/packages/backend/src/sandbox-config.ts b/foundry/packages/backend/src/sandbox-config.ts
new file mode 100644
index 0000000..9d85f51
--- /dev/null
+++ b/foundry/packages/backend/src/sandbox-config.ts
@@ -0,0 +1,39 @@
+import type { AppConfig, SandboxProviderId } from "@sandbox-agent/foundry-shared";
+
+function hasE2BApiKey(config: AppConfig): boolean {
+  return Boolean(config.sandboxProviders.e2b.apiKey?.trim());
+}
+
+function forcedSandboxProviderId(): SandboxProviderId | null {
+  const raw = process.env.FOUNDRY_SANDBOX_PROVIDER?.trim() ?? process.env.HF_SANDBOX_PROVIDER?.trim() ?? null;
+  if (raw === "local" || raw === "e2b") {
+    return raw;
+  }
+  return null;
+}
+
+export function defaultSandboxProviderId(config: AppConfig): SandboxProviderId {
+  const forced = forcedSandboxProviderId();
+  if (forced === "local") {
+    return "local";
+  }
+  if (forced === "e2b") {
+    if (!hasE2BApiKey(config)) {
+      throw new Error("FOUNDRY_SANDBOX_PROVIDER=e2b requires E2B_API_KEY to be configured.");
+    }
+    return "e2b";
+  }
+  return hasE2BApiKey(config) ? "e2b" : "local";
+}
+
+export function availableSandboxProviderIds(config: AppConfig): SandboxProviderId[] {
+  return hasE2BApiKey(config) ? ["e2b", "local"] : ["local"];
+}
+
+export function resolveSandboxProviderId(config: AppConfig, requested?: SandboxProviderId | null): SandboxProviderId {
+  if (requested === "e2b" && !hasE2BApiKey(config)) {
+    throw new Error("E2B provider is not configured. Set E2B_API_KEY before selecting the e2b provider.");
+  }
+
+  return requested ?? defaultSandboxProviderId(config);
+}
diff --git a/foundry/packages/backend/src/services/app-github.ts b/foundry/packages/backend/src/services/app-github.ts
new file mode 100644
index 0000000..52e5308
--- /dev/null
+++ b/foundry/packages/backend/src/services/app-github.ts
@@ -0,0 +1,718 @@
+import { createHmac, createPrivateKey, createSign, timingSafeEqual } from "node:crypto";
+import { logger } from "../logging.js";
+
+export class GitHubAppError extends Error {
+  readonly status: number;
+
+  constructor(message: string, status = 500) {
+    super(message);
+    this.name = "GitHubAppError";
+    this.status = status;
+  }
+}
+
+export interface GitHubOAuthSession {
+  accessToken: string;
+  scopes: string[];
+}
+
+export interface GitHubViewerIdentity {
+  id: string;
+  login: string;
+  name: string;
+  email: string | null;
+}
+
+export interface GitHubOrgIdentity {
+  id: string;
+  login: string;
+  name: string | null;
+}
+
+export interface GitHubInstallationRecord {
+  id: number;
+  accountLogin: string;
+}
+
+export interface GitHubRepositoryRecord {
+  fullName: string;
+  cloneUrl: string;
+  private: boolean;
+  defaultBranch: string;
+}
+
+export interface GitHubMemberRecord {
+  id: string;
+  login: string;
+  name: string;
+  email: string | null;
+  role: string | null;
+  state: string;
+}
+
+export interface GitHubPullRequestRecord {
+  repoFullName: string;
+  cloneUrl: string;
+  number: number;
+  title: string;
+  body: string | null;
+  state: string;
+  url: string;
+  headRefName: string;
+  baseRefName: string;
+  authorLogin: string | null;
+  isDraft: boolean;
+  merged: boolean;
+}
+
+interface GitHubTokenResponse {
+  access_token?: string;
+  scope?: string;
+  error?: string;
+  error_description?: string;
+}
+
+interface GitHubPageResponse<T> {
+  items: T[];
+  nextUrl: string | null;
+}
+
+const githubOAuthLogger = logger.child({
+  scope: "github-oauth",
+});
+
+export interface GitHubWebhookEvent {
+  action?: string;
+  organization?: { login?: string; id?: number };
+  installation?: { id: number; account?: { login?: string; type?: string; id?: number } | null };
+  repositories_added?: Array<{ id: number; full_name: string; private: boolean }>;
+  repositories_removed?: Array<{ id: number; full_name: string }>;
+  repository?: { id: number; full_name: string; clone_url?: string; private?: boolean; owner?: { login?: string } };
+  pull_request?: {
+    number: number;
+    title?: string;
+    body?: string | null;
+    state?: string;
+    html_url?: string;
+    draft?: boolean;
+    merged?: boolean;
+    user?: { login?: string } | null;
+    head?: { ref?: string };
+    base?: { ref?: string };
+  };
+  sender?: { login?: string; id?: number };
+  [key: string]: unknown;
+}
+
+export interface GitHubAppClientOptions {
+  apiBaseUrl?: string;
+  authBaseUrl?: string;
+  clientId?: string;
+  clientSecret?: string;
+  redirectUri?: string;
+  appId?: string;
+  appPrivateKey?: string;
+  webhookSecret?: string;
+}
+
+function normalizePem(value: string | undefined): string | undefined {
+  if (!value) {
+    return value;
+  }
+
+  return value.includes("\\n") ? value.replace(/\\n/g, "\n") : value;
+}
+
+export class GitHubAppClient {
+  private readonly apiBaseUrl: string;
+  private readonly authBaseUrl: string;
+  private readonly clientId?: string;
+  private readonly clientSecret?: string;
+  private readonly redirectUri?: string;
+  private readonly appId?: string;
+  private readonly appPrivateKey?: string;
+  private readonly webhookSecret?: string;
+
+  constructor(options: GitHubAppClientOptions = {}) {
+    this.apiBaseUrl = (options.apiBaseUrl ?? "https://api.github.com").replace(/\/$/, "");
+    this.authBaseUrl = (options.authBaseUrl ?? "https://github.com").replace(/\/$/, "");
+    this.clientId = options.clientId ?? process.env.GITHUB_CLIENT_ID;
+    this.clientSecret = options.clientSecret ?? process.env.GITHUB_CLIENT_SECRET;
+    this.redirectUri = options.redirectUri ?? process.env.GITHUB_REDIRECT_URI;
+    this.appId = options.appId ?? process.env.GITHUB_APP_ID;
+    this.appPrivateKey = normalizePem(options.appPrivateKey ?? process.env.GITHUB_APP_PRIVATE_KEY);
+    this.webhookSecret = options.webhookSecret ?? process.env.GITHUB_WEBHOOK_SECRET;
+  }
+
+  isOauthConfigured(): boolean {
+    return Boolean(this.clientId && this.clientSecret && this.redirectUri);
+  }
+
+  isAppConfigured(): boolean {
+    return Boolean(this.appId && this.appPrivateKey);
+  }
+
+  isWebhookConfigured(): boolean {
+    return Boolean(this.webhookSecret);
+  }
+
+  verifyWebhookEvent(payload: string, signatureHeader: string | null, eventHeader: string | null): { event: string; body: GitHubWebhookEvent } {
+    if (!this.webhookSecret) {
+      throw new GitHubAppError("GitHub webhook secret is not configured", 500);
+    }
+    if (!signatureHeader) {
+      throw new GitHubAppError("Missing GitHub signature header", 400);
+    }
+    if (!eventHeader) {
+      throw new GitHubAppError("Missing GitHub event header", 400);
+    }
+
+    const expectedSignature = signatureHeader.startsWith("sha256=") ? signatureHeader.slice(7) : null;
+    if (!expectedSignature) {
+      throw new GitHubAppError("Malformed GitHub signature header", 400);
+    }
+
+    const computed = createHmac("sha256", this.webhookSecret).update(payload).digest("hex");
+    const computedBuffer = Buffer.from(computed, "utf8");
+    const expectedBuffer = Buffer.from(expectedSignature, "utf8");
+    if (computedBuffer.length !== expectedBuffer.length || !timingSafeEqual(computedBuffer, expectedBuffer)) {
+      throw new GitHubAppError("GitHub webhook signature verification failed", 400);
+    }
+
+    return {
+      event: eventHeader,
+      body: JSON.parse(payload) as GitHubWebhookEvent,
+    };
+  }
+
+  buildAuthorizeUrl(state: string): string {
+    if (!this.clientId || !this.redirectUri) {
+      throw new GitHubAppError("GitHub OAuth is not configured", 500);
+    }
+
+    const url = new URL(`${this.authBaseUrl}/login/oauth/authorize`);
+    url.searchParams.set("client_id", this.clientId);
+    url.searchParams.set("redirect_uri", this.redirectUri);
+    url.searchParams.set("scope", "read:user user:email read:org repo");
+    url.searchParams.set("state", state);
+    return url.toString();
+  }
+
+  async exchangeCode(code: string): Promise<GitHubOAuthSession> {
+    if (!this.clientId || !this.clientSecret || !this.redirectUri) {
+      throw new GitHubAppError("GitHub OAuth is not configured", 500);
+    }
+
+    const exchangeBody = {
+      client_id: this.clientId,
+      client_secret: this.clientSecret,
+      code,
+      redirect_uri: this.redirectUri,
+    };
+    githubOAuthLogger.debug(
+      {
+        url: `${this.authBaseUrl}/login/oauth/access_token`,
+        clientId: this.clientId,
+        redirectUri: this.redirectUri,
+        codeLength: code.length,
+        codePrefix: code.slice(0, 6),
+      },
+      "exchange_code_request",
+    );
+
+    const response = await fetch(`${this.authBaseUrl}/login/oauth/access_token`, {
+      method: "POST",
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(exchangeBody),
+    });
+
+    const responseText = await response.text();
+    githubOAuthLogger.debug(
+      {
+        status: response.status,
+        bodyPreview: responseText.slice(0, 300),
+      },
+      "exchange_code_response",
+    );
+    let payload: GitHubTokenResponse;
+    try {
+      payload = JSON.parse(responseText) as GitHubTokenResponse;
+    } catch {
+      // GitHub may return URL-encoded responses despite Accept: application/json
+      const params = new URLSearchParams(responseText);
+      if (params.has("access_token")) {
+        payload = {
+          access_token: params.get("access_token")!,
+          scope: params.get("scope") ?? "",
+        };
+      } else {
+        throw new GitHubAppError(
+          params.get("error_description") ?? params.get("error") ?? `GitHub token exchange failed: ${responseText.slice(0, 200)}`,
+          response.status || 502,
+        );
+      }
+    }
+    if (!response.ok || !payload.access_token) {
+      throw new GitHubAppError(payload.error_description ?? payload.error ?? `GitHub token exchange failed with ${response.status}`, response.status);
+    }
+
+    return {
+      accessToken: payload.access_token,
+      scopes:
+        payload.scope
+          ?.split(",")
+          .map((value) => value.trim())
+          .filter((value) => value.length > 0) ?? [],
+    };
+  }
+
+  async getViewer(accessToken: string): Promise<GitHubViewerIdentity> {
+    const user = await this.requestJson<{
+      id: number;
+      login: string;
+      name?: string | null;
+      email?: string | null;
+    }>("/user", accessToken);
+
+    let email = user.email ?? null;
+    if (!email) {
+      try {
+        const emails = await this.requestJson<Array<{ email: string; primary?: boolean; verified?: boolean }>>("/user/emails", accessToken);
+        const primary = emails.find((candidate) => candidate.primary && candidate.verified) ?? emails[0] ?? null;
+        email = primary?.email ?? null;
+      } catch (error) {
+        if (!(error instanceof GitHubAppError) || error.status !== 404) {
+          throw error;
+        }
+      }
+    }
+
+    return {
+      id: String(user.id),
+      login: user.login,
+      name: user.name?.trim() || user.login,
+      email,
+    };
+  }
+
+  async listOrganizations(accessToken: string): Promise<GitHubOrgIdentity[]> {
+    const organizations = await this.paginate<{ id: number; login: string; name?: string | null }>("/user/orgs?per_page=100", accessToken);
+    return organizations.map((organization) => ({
+      id: String(organization.id),
+      login: organization.login,
+      name: organization.name?.trim() || organization.login,
+    }));
+  }
+
+  async listInstallations(accessToken: string): Promise<GitHubInstallationRecord[]> {
+    if (!this.isAppConfigured()) {
+      return [];
+    }
+    try {
+      const payload = await this.requestJson<{
+        installations?: Array<{ id: number; account?: { login?: string } | null }>;
+      }>("/user/installations", accessToken);
+
+      return (payload.installations ?? [])
+        .map((installation) => ({
+          id: installation.id,
+          accountLogin: installation.account?.login?.trim() ?? "",
+        }))
+        .filter((installation) => installation.accountLogin.length > 0);
+    } catch (error) {
+      if (!(error instanceof GitHubAppError) || (error.status !== 401 && error.status !== 403)) {
+        throw error;
+      }
+    }
+
+    const installations = await this.paginateApp<{ id: number; account?: { login?: string } | null }>("/app/installations?per_page=100");
+    return installations
+      .map((installation) => ({
+        id: installation.id,
+        accountLogin: installation.account?.login?.trim() ?? "",
+      }))
+      .filter((installation) => installation.accountLogin.length > 0);
+  }
+
+  async listUserRepositories(accessToken: string): Promise<GitHubRepositoryRecord[]> {
+    const repositories = await this.paginate<{
+      full_name: string;
+      clone_url: string;
+      private: boolean;
+      default_branch: string;
+    }>("/user/repos?per_page=100&affiliation=owner,collaborator,organization_member&sort=updated", accessToken);
+
+    return repositories.map((repository) => ({
+      fullName: repository.full_name,
+      cloneUrl: repository.clone_url,
+      private: repository.private,
+      defaultBranch: repository.default_branch,
+    }));
+  }
+
+  async listInstallationRepositories(installationId: number): Promise<GitHubRepositoryRecord[]> {
+    const accessToken = await this.createInstallationAccessToken(installationId);
+    const repositories = await this.paginate<{
+      full_name: string;
+      clone_url: string;
+      private: boolean;
+      default_branch: string;
+    }>("/installation/repositories?per_page=100", accessToken);
+
+    return repositories.map((repository) => ({
+      fullName: repository.full_name,
+      cloneUrl: repository.clone_url,
+      private: repository.private,
+      defaultBranch: repository.default_branch,
+    }));
+  }
+
+  async getUserRepository(accessToken: string, fullName: string): Promise<GitHubRepositoryRecord | null> {
+    try {
+      const repository = await this.requestJson<{
+        full_name: string;
+        clone_url: string;
+        private: boolean;
+        default_branch: string;
+      }>(`/repos/${fullName}`, accessToken);
+      return {
+        fullName: repository.full_name,
+        cloneUrl: repository.clone_url,
+        private: repository.private,
+        defaultBranch: repository.default_branch,
+      };
+    } catch (error) {
+      if (error instanceof GitHubAppError && error.status === 404) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
+  async getInstallationRepository(installationId: number, fullName: string): Promise<GitHubRepositoryRecord | null> {
+    const accessToken = await this.createInstallationAccessToken(installationId);
+    return await this.getUserRepository(accessToken, fullName);
+  }
+
+  async listOrganizationMembers(accessToken: string, organizationLogin: string): Promise<GitHubMemberRecord[]> {
+    const members = await this.paginate<{
+      id: number;
+      login: string;
+      role?: string | null;
+    }>(`/orgs/${organizationLogin}/members?per_page=100&role=all`, accessToken);
+
+    const detailedMembers = await Promise.all(
+      members.map(async (member) => {
+        try {
+          const detail = await this.requestJson<{
+            id: number;
+            login: string;
+            name?: string | null;
+            email?: string | null;
+          }>(`/users/${member.login}`, accessToken);
+          return {
+            id: String(detail.id),
+            login: detail.login,
+            name: detail.name?.trim() || detail.login,
+            email: detail.email ?? null,
+            role: member.role ?? null,
+            state: "active",
+          };
+        } catch {
+          return {
+            id: String(member.id),
+            login: member.login,
+            name: member.login,
+            email: null,
+            role: member.role ?? null,
+            state: "active",
+          };
+        }
+      }),
+    );
+
+    return detailedMembers;
+  }
+
+  async listInstallationMembers(installationId: number, organizationLogin: string): Promise<GitHubMemberRecord[]> {
+    const accessToken = await this.createInstallationAccessToken(installationId);
+    return await this.listOrganizationMembers(accessToken, organizationLogin);
+  }
+
+  async listPullRequestsForUserRepositories(accessToken: string, repositories: GitHubRepositoryRecord[]): Promise<GitHubPullRequestRecord[]> {
+    return (await Promise.all(repositories.map((repository) => this.listRepositoryPullRequests(accessToken, repository.fullName, repository.cloneUrl)))).flat();
+  }
+
+  async listInstallationPullRequestsForRepositories(installationId: number, repositories: GitHubRepositoryRecord[]): Promise<GitHubPullRequestRecord[]> {
+    const accessToken = await this.createInstallationAccessToken(installationId);
+    return await this.listPullRequestsForUserRepositories(accessToken, repositories);
+  }
+
+  async getUserPullRequest(accessToken: string, fullName: string, prNumber: number): Promise<GitHubPullRequestRecord | null> {
+    try {
+      const pullRequest = await this.requestJson<{
+        number: number;
+        title: string;
+        body?: string | null;
+        state: string;
+        html_url: string;
+        draft?: boolean;
+        merged?: boolean;
+        user?: { login?: string } | null;
+        head?: { ref?: string } | null;
+        base?: { ref?: string } | null;
+      }>(`/repos/${fullName}/pulls/${prNumber}`, accessToken);
+      const repository = await this.getUserRepository(accessToken, fullName);
+      if (!repository) {
+        return null;
+      }
+      return {
+        repoFullName: fullName,
+        cloneUrl: repository.cloneUrl,
+        number: pullRequest.number,
+        title: pullRequest.title,
+        body: pullRequest.body ?? null,
+        state: pullRequest.state,
+        url: pullRequest.html_url,
+        headRefName: pullRequest.head?.ref?.trim() ?? "",
+        baseRefName: pullRequest.base?.ref?.trim() ?? "",
+        authorLogin: pullRequest.user?.login?.trim() ?? null,
+        isDraft: Boolean(pullRequest.draft),
+        merged: Boolean(pullRequest.merged),
+      };
+    } catch (error) {
+      if (error instanceof GitHubAppError && error.status === 404) {
+        return null;
+      }
+      throw error;
+    }
+  }
+
+  async getInstallationPullRequest(installationId: number, fullName: string, prNumber: number): Promise<GitHubPullRequestRecord | null> {
+    const accessToken = await this.createInstallationAccessToken(installationId);
+    return await this.getUserPullRequest(accessToken, fullName, prNumber);
+  }
+
+  async buildInstallationUrl(organizationLogin: string, state: string): Promise<string> {
+    if (!this.isAppConfigured()) {
+      throw new GitHubAppError("GitHub App is not configured", 500);
+    }
+    const app = await this.requestAppJson<{ slug?: string }>("/app");
+    if (!app.slug) {
+      throw new GitHubAppError("GitHub App slug is unavailable", 500);
+    }
+    const url = new URL(`${this.authBaseUrl}/apps/${app.slug}/installations/new`);
+    url.searchParams.set("state", state);
+    void organizationLogin;
+    return url.toString();
+  }
+
+  private async createInstallationAccessToken(installationId: number): Promise<string> {
+    if (!this.appId || !this.appPrivateKey) {
+      throw new GitHubAppError("GitHub App is not configured", 500);
+    }
+
+    const response = await fetch(`${this.apiBaseUrl}/app/installations/${installationId}/access_tokens`, {
+      method: "POST",
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${this.createAppJwt()}`,
+        "X-GitHub-Api-Version": "2022-11-28",
+      },
+    });
+
+    const payload = (await response.json()) as { token?: string; message?: string };
+    if (!response.ok || !payload.token) {
+      throw new GitHubAppError(payload.message ?? "Unable to mint GitHub installation token", response.status);
+    }
+    return payload.token;
+  }
+
+  private createAppJwt(): string {
+    if (!this.appId || !this.appPrivateKey) {
+      throw new GitHubAppError("GitHub App is not configured", 500);
+    }
+
+    const header = base64UrlEncode(JSON.stringify({ alg: "RS256", typ: "JWT" }));
+    const now = Math.floor(Date.now() / 1000);
+    const payload = base64UrlEncode(
+      JSON.stringify({
+        iat: now - 60,
+        exp: now + 540,
+        iss: this.appId,
+      }),
+    );
+    const signer = createSign("RSA-SHA256");
+    signer.update(`${header}.${payload}`);
+    signer.end();
+    const key = createPrivateKey(this.appPrivateKey);
+    const signature = signer.sign(key);
+    return `${header}.${payload}.${base64UrlEncode(signature)}`;
+  }
+
+  private async requestAppJson<T>(path: string): Promise<T> {
+    const response = await fetch(`${this.apiBaseUrl}${path}`, {
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${this.createAppJwt()}`,
+        "X-GitHub-Api-Version": "2022-11-28",
+      },
+    });
+
+    const payload = (await response.json()) as T | { message?: string };
+    if (!response.ok) {
+      throw new GitHubAppError(
+        typeof payload === "object" && payload && "message" in payload ? (payload.message ?? "GitHub request failed") : "GitHub request failed",
+        response.status,
+      );
+    }
+    return payload as T;
+  }
+
+  private async paginateApp<T>(path: string): Promise<T[]> {
+    let nextUrl = `${this.apiBaseUrl}${path.startsWith("/") ? path : `/${path}`}`;
+    const items: T[] = [];
+
+    while (nextUrl) {
+      const page = await this.requestAppPage<T>(nextUrl);
+      items.push(...page.items);
+      nextUrl = page.nextUrl ?? "";
+    }
+
+    return items;
+  }
+
+  private async requestJson<T>(path: string, accessToken: string): Promise<T> {
+    const response = await fetch(`${this.apiBaseUrl}${path}`, {
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${accessToken}`,
+        "X-GitHub-Api-Version": "2022-11-28",
+      },
+    });
+
+    const payload = (await response.json()) as T | { message?: string };
+    if (!response.ok) {
+      throw new GitHubAppError(
+        typeof payload === "object" && payload && "message" in payload ? (payload.message ?? "GitHub request failed") : "GitHub request failed",
+        response.status,
+      );
+    }
+    return payload as T;
+  }
+
+  private async listRepositoryPullRequests(accessToken: string, fullName: string, cloneUrl: string): Promise<GitHubPullRequestRecord[]> {
+    const pullRequests = await this.paginate<{
+      number: number;
+      title: string;
+      body?: string | null;
+      state: string;
+      html_url: string;
+      draft?: boolean;
+      merged?: boolean;
+      user?: { login?: string } | null;
+      head?: { ref?: string } | null;
+      base?: { ref?: string } | null;
+    }>(`/repos/${fullName}/pulls?state=open&per_page=100&sort=updated&direction=desc`, accessToken);
+
+    return pullRequests.map((pullRequest) => ({
+      repoFullName: fullName,
+      cloneUrl,
+      number: pullRequest.number,
+      title: pullRequest.title,
+      body: pullRequest.body ?? null,
+      state: pullRequest.state,
+      url: pullRequest.html_url,
+      headRefName: pullRequest.head?.ref?.trim() ?? "",
+      baseRefName: pullRequest.base?.ref?.trim() ?? "",
+      authorLogin: pullRequest.user?.login?.trim() ?? null,
+      isDraft: Boolean(pullRequest.draft),
+      merged: Boolean(pullRequest.merged),
+    }));
+  }
+
+  private async paginate<T>(path: string, accessToken: string): Promise<T[]> {
+    let nextUrl = `${this.apiBaseUrl}${path.startsWith("/") ? path : `/${path}`}`;
+    const items: T[] = [];
+
+    while (nextUrl) {
+      const page = await this.requestPage<T>(nextUrl, accessToken);
+      items.push(...page.items);
+      nextUrl = page.nextUrl ?? "";
+    }
+
+    return items;
+  }
+
+  private async requestPage<T>(url: string, accessToken: string): Promise<GitHubPageResponse<T>> {
+    const response = await fetch(url, {
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${accessToken}`,
+        "X-GitHub-Api-Version": "2022-11-28",
+      },
+    });
+
+    const payload = (await response.json()) as T[] | { repositories?: T[]; message?: string };
+    if (!response.ok) {
+      throw new GitHubAppError(
+        typeof payload === "object" && payload && "message" in payload ? (payload.message ?? "GitHub request failed") : "GitHub request failed",
+        response.status,
+      );
+    }
+
+    const items = Array.isArray(payload) ? payload : (payload.repositories ?? []);
+    return {
+      items,
+      nextUrl: parseNextLink(response.headers.get("link")),
+    };
+  }
+
+  private async requestAppPage<T>(url: string): Promise<GitHubPageResponse<T>> {
+    const response = await fetch(url, {
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${this.createAppJwt()}`,
+        "X-GitHub-Api-Version": "2022-11-28",
+      },
+    });
+
+    const payload = (await response.json()) as T[] | { installations?: T[]; message?: string };
+    if (!response.ok) {
+      throw new GitHubAppError(
+        typeof payload === "object" && payload && "message" in payload ? (payload.message ?? "GitHub request failed") : "GitHub request failed",
+        response.status,
+      );
+    }
+
+    const items = Array.isArray(payload) ? payload : (payload.installations ?? []);
+    return {
+      items,
+      nextUrl: parseNextLink(response.headers.get("link")),
+    };
+  }
+}
+
+function parseNextLink(linkHeader: string | null): string | null {
+  if (!linkHeader) {
+    return null;
+  }
+
+  for (const part of linkHeader.split(",")) {
+    const [urlPart, relPart] = part.split(";").map((value) => value.trim());
+    if (!urlPart || !relPart || !relPart.includes('rel="next"')) {
+      continue;
+    }
+    return urlPart.replace(/^<|>$/g, "");
+  }
+
+  return null;
+}
+
+function base64UrlEncode(value: string | Buffer): string {
+  const source = typeof value === "string" ? Buffer.from(value, "utf8") : value;
+  return source.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
+}
diff --git a/foundry/packages/backend/src/services/app-shell-runtime.ts b/foundry/packages/backend/src/services/app-shell-runtime.ts
new file mode 100644
index 0000000..84cb326
--- /dev/null
+++ b/foundry/packages/backend/src/services/app-shell-runtime.ts
@@ -0,0 +1,84 @@
+import {
+  GitHubAppClient,
+  type GitHubInstallationRecord,
+  type GitHubOAuthSession,
+  type GitHubOrgIdentity,
+  type GitHubRepositoryRecord,
+  type GitHubViewerIdentity,
+  type GitHubWebhookEvent,
+} from "./app-github.js";
+import {
+  StripeAppClient,
+  type StripeCheckoutCompletion,
+  type StripeCheckoutSession,
+  type StripePortalSession,
+  type StripeSubscriptionSnapshot,
+  type StripeWebhookEvent,
+} from "./app-stripe.js";
+import type { FoundryBillingPlanId } from "@sandbox-agent/foundry-shared";
+
+export type AppShellGithubClient = Pick<
+  GitHubAppClient,
+  | "isAppConfigured"
+  | "isWebhookConfigured"
+  | "buildAuthorizeUrl"
+  | "exchangeCode"
+  | "getViewer"
+  | "listOrganizations"
+  | "listInstallations"
+  | "listUserRepositories"
+  | "listInstallationRepositories"
+  | "buildInstallationUrl"
+  | "verifyWebhookEvent"
+>;
+
+export type AppShellStripeClient = Pick<
+  StripeAppClient,
+  | "isConfigured"
+  | "createCustomer"
+  | "createCheckoutSession"
+  | "retrieveCheckoutCompletion"
+  | "retrieveSubscription"
+  | "createPortalSession"
+  | "updateSubscriptionCancellation"
+  | "verifyWebhookEvent"
+  | "planIdForPriceId"
+>;
+
+export interface AppShellServices {
+  appUrl: string;
+  apiUrl: string;
+  github: AppShellGithubClient;
+  stripe: AppShellStripeClient;
+}
+
+export interface CreateAppShellServicesOptions {
+  appUrl?: string;
+  apiUrl?: string;
+  github?: AppShellGithubClient;
+  stripe?: AppShellStripeClient;
+}
+
+export function createDefaultAppShellServices(options: CreateAppShellServicesOptions = {}): AppShellServices {
+  return {
+    appUrl: (options.appUrl ?? process.env.APP_URL ?? "http://localhost:4173").replace(/\/$/, ""),
+    apiUrl: (options.apiUrl ?? process.env.BETTER_AUTH_URL ?? process.env.APP_URL ?? "http://localhost:7741").replace(/\/$/, ""),
+    github: options.github ?? new GitHubAppClient(),
+    stripe: options.stripe ?? new StripeAppClient(),
+  };
+}
+
+export type {
+  GitHubInstallationRecord,
+  GitHubOAuthSession,
+  GitHubOrgIdentity,
+  GitHubRepositoryRecord,
+  GitHubViewerIdentity,
+  GitHubWebhookEvent,
+  StripeCheckoutCompletion,
+  StripeCheckoutSession,
+  StripePortalSession,
+  StripeSubscriptionSnapshot,
+  StripeWebhookEvent,
+  FoundryBillingPlanId,
+};
diff --git a/foundry/packages/backend/src/services/app-stripe.ts b/foundry/packages/backend/src/services/app-stripe.ts
new file mode 100644
index 0000000..9cb249e
--- /dev/null
+++ b/foundry/packages/backend/src/services/app-stripe.ts
@@ -0,0 +1,284 @@
+import { createHmac, timingSafeEqual } from "node:crypto";
+import type { FoundryBillingPlanId } from "@sandbox-agent/foundry-shared";
+
+export class StripeAppError extends Error {
+  readonly status: number;
+
+  constructor(message: string, status = 500) {
+    super(message);
+    this.name = "StripeAppError";
+    this.status = status;
+  }
+}
+
+export interface StripeCheckoutSession {
+  id: string;
+  url: string;
+}
+
+export interface StripePortalSession {
+  url: string;
+}
+
+export interface StripeSubscriptionSnapshot {
+  id: string;
+  customerId: string;
+  priceId: string | null;
+  status: string;
+  cancelAtPeriodEnd: boolean;
+  currentPeriodEnd: number | null;
+  trialEnd: number | null;
+  defaultPaymentMethodLabel: string;
+}
+
+export interface StripeCheckoutCompletion {
+  customerId: string | null;
+  subscriptionId: string | null;
+  planId: FoundryBillingPlanId | null;
+  paymentMethodLabel: string;
+}
+
+export interface StripeWebhookEvent<T = unknown> {
+  id: string;
+  type: string;
+  data: {
+    object: T;
+  };
+}
+
+export interface StripeAppClientOptions {
+  apiBaseUrl?: string;
+  secretKey?: string;
+  webhookSecret?: string;
+  teamPriceId?: string;
+}
+
+export class StripeAppClient {
+  private readonly apiBaseUrl: string;
+  private readonly secretKey?: string;
+  private readonly webhookSecret?: string;
+  private readonly teamPriceId?: string;
+
+  constructor(options: StripeAppClientOptions = {}) {
+    this.apiBaseUrl = (options.apiBaseUrl ?? "https://api.stripe.com").replace(/\/$/, "");
+    this.secretKey = options.secretKey ?? process.env.STRIPE_SECRET_KEY;
+    this.webhookSecret = options.webhookSecret ?? process.env.STRIPE_WEBHOOK_SECRET;
+    this.teamPriceId = options.teamPriceId ?? process.env.STRIPE_PRICE_TEAM;
+  }
+
+  isConfigured(): boolean {
+    return Boolean(this.secretKey);
+  }
+
+  createCheckoutSession(input: {
+    organizationId: string;
+    customerId: string;
+    customerEmail: string | null;
+    planId: Exclude<FoundryBillingPlanId, "free">;
+    successUrl: string;
+    cancelUrl: string;
+  }): Promise<StripeCheckoutSession> {
+    const priceId = this.priceIdForPlan(input.planId);
+    return this.formRequest<StripeCheckoutSession>("/v1/checkout/sessions", {
+      mode: "subscription",
+      success_url: input.successUrl,
+      cancel_url: input.cancelUrl,
+      customer: input.customerId,
+      "line_items[0][price]": priceId,
+      "line_items[0][quantity]": "1",
+      "metadata[organizationId]": input.organizationId,
+      "metadata[planId]": input.planId,
+      "subscription_data[metadata][organizationId]": input.organizationId,
+      "subscription_data[metadata][planId]": input.planId,
+    });
+  }
+
+  createPortalSession(input: { customerId: string; returnUrl: string }): Promise<StripePortalSession> {
+    return this.formRequest<StripePortalSession>("/v1/billing_portal/sessions", {
+      customer: input.customerId,
+      return_url: input.returnUrl,
+    });
+  }
+
+  createCustomer(input: { organizationId: string; displayName: string; email: string | null }): Promise<{ id: string }> {
+    return this.formRequest<{ id: string }>("/v1/customers", {
+      name: input.displayName,
+      ...(input.email ? { email: input.email } : {}),
+      "metadata[organizationId]": input.organizationId,
+    });
+  }
+
+  async updateSubscriptionCancellation(subscriptionId: string, cancelAtPeriodEnd: boolean): Promise<StripeSubscriptionSnapshot> {
+    const payload = await this.formRequest<Record<string, unknown>>(`/v1/subscriptions/${subscriptionId}`, {
+      cancel_at_period_end: cancelAtPeriodEnd ? "true" : "false",
+    });
+    return stripeSubscriptionSnapshot(payload);
+  }
+
+  async retrieveCheckoutCompletion(sessionId: string): Promise<StripeCheckoutCompletion> {
+    const payload = await this.requestJson<Record<string, unknown>>(`/v1/checkout/sessions/${sessionId}?expand[]=subscription.default_payment_method`);
+
+    const subscription = typeof payload.subscription === "object" && payload.subscription ? (payload.subscription as Record<string, unknown>) : null;
+    const subscriptionId =
+      typeof payload.subscription === "string" ? payload.subscription : subscription && typeof subscription.id === "string" ? subscription.id : null;
+    const priceId = firstStripePriceId(subscription);
+
+    return {
+      customerId: typeof payload.customer === "string" ? payload.customer : null,
+      subscriptionId,
+      planId: priceId ? this.planIdForPriceId(priceId) : planIdFromMetadata(payload.metadata),
+      paymentMethodLabel: subscription ? paymentMethodLabelFromObject(subscription.default_payment_method) : "Card on file",
+    };
+  }
+
+  async retrieveSubscription(subscriptionId: string): Promise<StripeSubscriptionSnapshot> {
+    const payload = await this.requestJson<Record<string, unknown>>(`/v1/subscriptions/${subscriptionId}?expand[]=default_payment_method`);
+    return stripeSubscriptionSnapshot(payload);
+  }
+
+  verifyWebhookEvent(payload: string, signatureHeader: string | null): StripeWebhookEvent {
+    if (!this.webhookSecret) {
+      throw new StripeAppError("Stripe webhook secret is not configured", 500);
+    }
+    if (!signatureHeader) {
+      throw new StripeAppError("Missing Stripe signature header", 400);
+    }
+
+    const parts = Object.fromEntries(
+      signatureHeader
+        .split(",")
+        .map((entry) => entry.split("="))
+        .filter((entry): entry is [string, string] => entry.length === 2),
+    );
+    const timestamp = parts.t;
+    const signature = parts.v1;
+    if (!timestamp || !signature) {
+      throw new StripeAppError("Malformed Stripe signature header", 400);
+    }
+
+    const expected = createHmac("sha256", this.webhookSecret).update(`${timestamp}.${payload}`).digest("hex");
+
+    const expectedBuffer = Buffer.from(expected, "utf8");
+    const actualBuffer = Buffer.from(signature, "utf8");
+    if (expectedBuffer.length !== actualBuffer.length || !timingSafeEqual(expectedBuffer, actualBuffer)) {
+      throw new StripeAppError("Stripe signature verification failed", 400);
+    }
+
+    return JSON.parse(payload) as StripeWebhookEvent;
+  }
+
+  planIdForPriceId(priceId: string): FoundryBillingPlanId | null {
+    if (priceId === this.teamPriceId) {
+      return "team";
+    }
+    return null;
+  }
+
+  priceIdForPlan(planId: Exclude<FoundryBillingPlanId, "free">): string {
+    const priceId = this.teamPriceId;
+    if (!priceId) {
+      throw new StripeAppError(`Stripe price ID is not configured for ${planId}`, 500);
+    }
+    return priceId;
+  }
+
+  private async requestJson<T>(path: string): Promise<T> {
+    if (!this.secretKey) {
+      throw new StripeAppError("Stripe is not configured", 500);
+    }
+
+    const response = await fetch(`${this.apiBaseUrl}${path}`, {
+      headers: {
+        Authorization: `Bearer ${this.secretKey}`,
+      },
+    });
+
+    const payload = (await response.json()) as T | { error?: { message?: string } };
+    if (!response.ok) {
+      throw new StripeAppError(
+        typeof payload === "object" && payload && "error" in payload ? (payload.error?.message ?? "Stripe request failed") : "Stripe request failed",
+        response.status,
+      );
+    }
+    return payload as T;
+  }
+
+  private async formRequest<T>(path: string, body: Record<string, string>): Promise<T> {
+    if (!this.secretKey) {
+      throw new StripeAppError("Stripe is not configured", 500);
+    }
+
+    const form = new URLSearchParams();
+    for (const [key, value] of Object.entries(body)) {
+      form.set(key, value);
+    }
+
+    const response = await fetch(`${this.apiBaseUrl}${path}`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${this.secretKey}`,
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      body: form,
+    });
+
+    const payload = (await response.json()) as T | { error?: { message?: string } };
+    if (!response.ok) {
+      throw new StripeAppError(
+        typeof payload === "object" && payload && "error" in payload ? (payload.error?.message ?? "Stripe request failed") : "Stripe request failed",
+        response.status,
+      );
+    }
+    return payload as T;
+  }
+}
+
+function planIdFromMetadata(metadata: unknown): FoundryBillingPlanId | null {
+  if (!metadata || typeof metadata !== "object") {
+    return null;
+  }
+  const planId = (metadata as Record<string, unknown>).planId;
+  return planId === "team" || planId === "free" ? planId : null;
+}
+
+function firstStripePriceId(subscription: Record<string, unknown> | null): string | null {
+  if (!subscription || typeof subscription.items !== "object" || !subscription.items) {
+    return null;
+  }
+  const data = (subscription.items as { data?: Array<Record<string, unknown>> }).data;
+  const first = data?.[0];
+  if (!first || typeof first.price !== "object" || !first.price) {
+    return null;
+  }
+  return typeof (first.price as Record<string, unknown>).id === "string" ? ((first.price as Record<string, unknown>).id as string) : null;
+}
+
+function paymentMethodLabelFromObject(paymentMethod: unknown): string {
+  if (!paymentMethod || typeof paymentMethod !== "object") {
+    return "Card on file";
+  }
+  const card = (paymentMethod as Record<string, unknown>).card;
+  if (card && typeof card === "object") {
+    const brand = typeof (card as Record<string, unknown>).brand === "string" ? ((card as Record<string, unknown>).brand as string) : "Card";
+    const last4 = typeof (card as Record<string, unknown>).last4 === "string" ? ((card as Record<string, unknown>).last4 as string) : "file";
+    return `${capitalize(brand)} ending in ${last4}`;
+  }
+  return "Payment method on file";
+}
+
+function stripeSubscriptionSnapshot(payload: Record<string, unknown>): StripeSubscriptionSnapshot {
+  return {
+    id: typeof payload.id === "string" ? payload.id : "",
+    customerId: typeof payload.customer === "string" ? payload.customer : "",
+    priceId: firstStripePriceId(payload),
+    status: typeof payload.status === "string" ? payload.status : "active",
+    cancelAtPeriodEnd: payload.cancel_at_period_end === true,
+    currentPeriodEnd: typeof payload.current_period_end === "number" ? payload.current_period_end : null,
+    trialEnd: typeof payload.trial_end === "number" ? payload.trial_end : null,
+    defaultPaymentMethodLabel: paymentMethodLabelFromObject(payload.default_payment_method),
+  };
+}
+
+function capitalize(value: string): string {
+  return value.length > 0 ? `${value[0]!.toUpperCase()}${value.slice(1)}` : value;
+}
diff --git a/foundry/packages/backend/src/services/better-auth.ts b/foundry/packages/backend/src/services/better-auth.ts
new file mode 100644
index 0000000..23d227f
--- /dev/null
+++ b/foundry/packages/backend/src/services/better-auth.ts
@@ -0,0 +1,559 @@
+import { betterAuth } from "better-auth";
+import { createAdapterFactory } from "better-auth/adapters";
+import { APP_SHELL_ORGANIZATION_ID } from "../actors/organization/constants.js";
+import { organizationKey, userKey } from "../actors/keys.js";
+import { logger } from "../logging.js";
+
+const AUTH_BASE_PATH = "/v1/auth";
+const SESSION_COOKIE = "better-auth.session_token";
+
+let betterAuthService: BetterAuthService | null = null;
+
+function requireEnv(name: string): string {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    throw new Error(`${name} is required`);
+  }
+  return value;
+}
+
+function stripTrailingSlash(value: string): string {
+  return value.replace(/\/$/, "");
+}
+
+function buildCookieHeaders(sessionToken: string): Headers {
+  return new Headers({
+    cookie: `${SESSION_COOKIE}=${encodeURIComponent(sessionToken)}`,
+  });
+}
+
+async function readJsonSafe(response: Response): Promise<any> {
+  const text = await response.text();
+  if (!text) {
+    return null;
+  }
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+
+async function callAuthEndpoint(auth: any, url: string, init?: RequestInit): Promise<Response> {
+  return await auth.handler(new Request(url, init));
+}
+
+function resolveRouteUserId(organization: any, resolved: any): string | null {
+  if (!resolved) {
+    return null;
+  }
+  if (typeof resolved === "string") {
+    return resolved;
+  }
+  if (typeof resolved.userId === "string" && resolved.userId.length > 0) {
+    return resolved.userId;
+  }
+  if (typeof resolved.id === "string" && resolved.id.length > 0) {
+    return resolved.id;
+  }
+  return null;
+}
+
+export interface BetterAuthService {
+  auth: any;
+  resolveSession(headers: Headers): Promise<{ session: any; user: any } | null>;
+  signOut(headers: Headers): Promise<Response>;
+  getAuthState(sessionId: string): Promise<any | null>;
+  upsertUserProfile(userId: string, patch: Record<string, unknown>): Promise<any>;
+  setActiveOrganization(sessionId: string, activeOrganizationId: string | null): Promise<any>;
+  getAccessTokenForSession(sessionId: string): Promise<{ accessToken: string; scopes: string[] } | null>;
+}
+
+export function initBetterAuthService(actorClient: any, options: { apiUrl: string; appUrl: string }): BetterAuthService {
+  if (betterAuthService) {
+    return betterAuthService;
+  }
+
+  // getOrCreate is intentional here: the adapter runs during Better Auth callbacks
+  // which can fire before any explicit create path. The app organization and user
+  // actors must exist by the time the adapter needs them.
+  const appOrganization = () =>
+    actorClient.organization.getOrCreate(organizationKey(APP_SHELL_ORGANIZATION_ID), {
+      createWithInput: APP_SHELL_ORGANIZATION_ID,
+    });
+
+  // getOrCreate is intentional: Better Auth creates user records during OAuth
+  // callbacks, so the user actor must be lazily provisioned on first access.
+  const getUser = async (userId: string) =>
+    await actorClient.user.getOrCreate(userKey(userId), {
+      createWithInput: { userId },
+    });
+
+  const adapter = createAdapterFactory({
+    config: {
+      adapterId: "rivetkit-actor",
+      adapterName: "RivetKit Actor Adapter",
+      supportsBooleans: false,
+      supportsDates: false,
+      supportsJSON: false,
+    },
+    adapter: ({ transformInput, transformOutput, transformWhereClause }) => {
+      const resolveUserIdForQuery = async (model: string, where?: any[], data?: Record<string, unknown>): Promise<string | null> => {
+        const clauses = where ?? [];
+        const direct = (field: string) => clauses.find((entry) => entry.field === field)?.value;
+
+        if (model === "user") {
+          const fromId = direct("id") ?? data?.id;
+          if (typeof fromId === "string" && fromId.length > 0) {
+            return fromId;
+          }
+          const email = direct("email");
+          if (typeof email === "string" && email.length > 0) {
+            const organization = await appOrganization();
+            const resolved = await organization.betterAuthFindEmailIndex({ email: email.toLowerCase() });
+            return resolveRouteUserId(organization, resolved);
+          }
+          return null;
+        }
+
+        if (model === "session") {
+          const fromUserId = direct("userId") ?? data?.userId;
+          if (typeof fromUserId === "string" && fromUserId.length > 0) {
+            return fromUserId;
+          }
+          const sessionId = direct("id") ?? data?.id;
+          const sessionToken = direct("token") ?? data?.token;
+          if (typeof sessionId === "string" || typeof sessionToken === "string") {
+            const organization = await appOrganization();
+            const resolved = await organization.betterAuthFindSessionIndex({
+              ...(typeof sessionId === "string" ? { sessionId } : {}),
+              ...(typeof sessionToken === "string" ? { sessionToken } : {}),
+            });
+            return resolveRouteUserId(organization, resolved);
+          }
+          return null;
+        }
+
+        if (model === "account") {
+          const fromUserId = direct("userId") ?? data?.userId;
+          if (typeof fromUserId === "string" && fromUserId.length > 0) {
+            return fromUserId;
+          }
+          const accountRecordId = direct("id") ?? data?.id;
+          const providerId = direct("providerId") ?? data?.providerId;
+          const accountId = direct("accountId") ?? data?.accountId;
+          const organization = await appOrganization();
+          if (typeof accountRecordId === "string" && accountRecordId.length > 0) {
+            const resolved = await organization.betterAuthFindAccountIndex({ id: accountRecordId });
+            return resolveRouteUserId(organization, resolved);
+          }
+          if (typeof providerId === "string" && providerId.length > 0 && typeof accountId === "string" && accountId.length > 0) {
+            const resolved = await organization.betterAuthFindAccountIndex({ providerId, accountId });
+            return resolveRouteUserId(organization, resolved);
+          }
+          return null;
+        }
+
+        return null;
+      };
+
+      return {
+        options: {
+          useDatabaseGeneratedIds: false,
+        },
+
+        create: async ({ model, data }) => {
+          const transformed = await transformInput(data, model, "create", true);
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthCreateVerification({ data: transformed });
+          }
+
+          const userId = await resolveUserIdForQuery(model, undefined, transformed);
+          if (!userId) {
+            throw new Error(`Unable to resolve auth actor for create(${model})`);
+          }
+
+          const userActor = await getUser(userId);
+          const created = await userActor.betterAuthCreateRecord({ model, data: transformed });
+          const organization = await appOrganization();
+
+          if (model === "user" && typeof transformed.email === "string" && transformed.email.length > 0) {
+            await organization.betterAuthUpsertEmailIndex({
+              email: transformed.email.toLowerCase(),
+              userId,
+            });
+          }
+
+          if (model === "session") {
+            await organization.betterAuthUpsertSessionIndex({
+              sessionId: String(created.id),
+              sessionToken: String(created.token),
+              userId,
+            });
+          }
+
+          if (model === "account") {
+            await organization.betterAuthUpsertAccountIndex({
+              id: String(created.id),
+              providerId: String(created.providerId),
+              accountId: String(created.accountId),
+              userId,
+            });
+          }
+
+          return (await transformOutput(created, model)) as any;
+        },
+
+        findOne: async ({ model, where, join }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "findOne" });
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthFindOneVerification({ where: transformedWhere, join });
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere);
+          if (!userId) {
+            return null;
+          }
+
+          const userActor = await getUser(userId);
+          const found = await userActor.betterAuthFindOneRecord({ model, where: transformedWhere, join });
+          return found ? ((await transformOutput(found, model, undefined, join)) as any) : null;
+        },
+
+        findMany: async ({ model, where, limit, sortBy, offset, join }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "findMany" });
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthFindManyVerification({
+              where: transformedWhere,
+              limit,
+              sortBy,
+              offset,
+              join,
+            });
+          }
+
+          if (model === "session") {
+            const tokenClause = transformedWhere?.find((entry: any) => entry.field === "token" && entry.operator === "in");
+            if (tokenClause && Array.isArray(tokenClause.value)) {
+              const organization = await appOrganization();
+              const resolved = await Promise.all(
+                (tokenClause.value as string[]).map(async (sessionToken: string) => ({
+                  sessionToken,
+                  route: await organization.betterAuthFindSessionIndex({ sessionToken }),
+                })),
+              );
+              const byUser = new Map<string, string[]>();
+              for (const item of resolved) {
+                if (!item.route?.userId) {
+                  continue;
+                }
+                const tokens = byUser.get(item.route.userId) ?? [];
+                tokens.push(item.sessionToken);
+                byUser.set(item.route.userId, tokens);
+              }
+
+              const rows = [];
+              for (const [userId, tokens] of byUser) {
+                const userActor = await getUser(userId);
+                const scopedWhere = transformedWhere.map((entry: any) =>
+                  entry.field === "token" && entry.operator === "in" ? { ...entry, value: tokens } : entry,
+                );
+                const found = await userActor.betterAuthFindManyRecords({ model, where: scopedWhere, limit, sortBy, offset, join });
+                rows.push(...found);
+              }
+              return await Promise.all(rows.map(async (row: any) => await transformOutput(row, model, undefined, join)));
+            }
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere);
+          if (!userId) {
+            return [];
+          }
+
+          const userActor = await getUser(userId);
+          const found = await userActor.betterAuthFindManyRecords({ model, where: transformedWhere, limit, sortBy, offset, join });
+          return await Promise.all(found.map(async (row: any) => await transformOutput(row, model, undefined, join)));
+        },
+
+        update: async ({ model, where, update }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "update" });
+          const transformedUpdate = (await transformInput(update as Record<string, unknown>, model, "update", true)) as Record<string, unknown>;
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthUpdateVerification({
+              where: transformedWhere,
+              update: transformedUpdate,
+            });
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere, transformedUpdate);
+          if (!userId) {
+            return null;
+          }
+
+          const userActor = await getUser(userId);
+          const before =
+            model === "user"
+              ? await userActor.betterAuthFindOneRecord({ model, where: transformedWhere })
+              : model === "account"
+                ? await userActor.betterAuthFindOneRecord({ model, where: transformedWhere })
+                : model === "session"
+                  ? await userActor.betterAuthFindOneRecord({ model, where: transformedWhere })
+                  : null;
+          const updated = await userActor.betterAuthUpdateRecord({
+            model,
+            where: transformedWhere,
+            update: transformedUpdate,
+          });
+          const organization = await appOrganization();
+
+          if (model === "user" && updated) {
+            if (before?.email && before.email !== updated.email) {
+              await organization.betterAuthDeleteEmailIndex({
+                email: before.email.toLowerCase(),
+              });
+            }
+            if (updated.email) {
+              await organization.betterAuthUpsertEmailIndex({
+                email: updated.email.toLowerCase(),
+                userId,
+              });
+            }
+          }
+
+          if (model === "session" && updated) {
+            await organization.betterAuthUpsertSessionIndex({
+              sessionId: String(updated.id),
+              sessionToken: String(updated.token),
+              userId,
+            });
+          }
+
+          if (model === "account" && updated) {
+            await organization.betterAuthUpsertAccountIndex({
+              id: String(updated.id),
+              providerId: String(updated.providerId),
+              accountId: String(updated.accountId),
+              userId,
+            });
+          }
+
+          return updated ? ((await transformOutput(updated, model)) as any) : null;
+        },
+
+        updateMany: async ({ model, where, update }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "updateMany" });
+          const transformedUpdate = (await transformInput(update as Record<string, unknown>, model, "update", true)) as Record<string, unknown>;
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthUpdateManyVerification({
+              where: transformedWhere,
+              update: transformedUpdate,
+            });
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere, transformedUpdate);
+          if (!userId) {
+            return 0;
+          }
+
+          const userActor = await getUser(userId);
+          return await userActor.betterAuthUpdateManyRecords({
+            model,
+            where: transformedWhere,
+            update: transformedUpdate,
+          });
+        },
+
+        delete: async ({ model, where }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "delete" });
+          if (model === "verification") {
+            const organization = await appOrganization();
+            await organization.betterAuthDeleteVerification({ where: transformedWhere });
+            return;
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere);
+          if (!userId) {
+            return;
+          }
+
+          const userActor = await getUser(userId);
+          const organization = await appOrganization();
+          const before = await userActor.betterAuthFindOneRecord({ model, where: transformedWhere });
+          await userActor.betterAuthDeleteRecord({ model, where: transformedWhere });
+
+          if (model === "session" && before) {
+            await organization.betterAuthDeleteSessionIndex({
+              sessionId: before.id,
+              sessionToken: before.token,
+            });
+          }
+
+          if (model === "account" && before) {
+            await organization.betterAuthDeleteAccountIndex({
+              id: before.id,
+              providerId: before.providerId,
+              accountId: before.accountId,
+            });
+          }
+
+          if (model === "user" && before?.email) {
+            await organization.betterAuthDeleteEmailIndex({
+              email: before.email.toLowerCase(),
+            });
+          }
+        },
+
+        deleteMany: async ({ model, where }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "deleteMany" });
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthDeleteManyVerification({ where: transformedWhere });
+          }
+
+          if (model === "session") {
+            const userId = await resolveUserIdForQuery(model, transformedWhere);
+            if (!userId) {
+              return 0;
+            }
+            const userActor = await getUser(userId);
+            const organization = await appOrganization();
+            const sessions = await userActor.betterAuthFindManyRecords({ model, where: transformedWhere, limit: 5000 });
+            const deleted = await userActor.betterAuthDeleteManyRecords({ model, where: transformedWhere });
+            for (const session of sessions) {
+              await organization.betterAuthDeleteSessionIndex({
+                sessionId: session.id,
+                sessionToken: session.token,
+              });
+            }
+            return deleted;
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere);
+          if (!userId) {
+            return 0;
+          }
+
+          const userActor = await getUser(userId);
+          return await userActor.betterAuthDeleteManyRecords({ model, where: transformedWhere });
+        },
+
+        count: async ({ model, where }) => {
+          const transformedWhere = transformWhereClause({ model, where, action: "count" });
+          if (model === "verification") {
+            const organization = await appOrganization();
+            return await organization.betterAuthCountVerification({ where: transformedWhere });
+          }
+
+          const userId = await resolveUserIdForQuery(model, transformedWhere);
+          if (!userId) {
+            return 0;
+          }
+
+          const userActor = await getUser(userId);
+          return await userActor.betterAuthCountRecords({ model, where: transformedWhere });
+        },
+      };
+    },
+  });
+
+  const auth = betterAuth({
+    baseURL: stripTrailingSlash(process.env.BETTER_AUTH_URL ?? options.apiUrl),
+    basePath: AUTH_BASE_PATH,
+    secret: requireEnv("BETTER_AUTH_SECRET"),
+    database: adapter,
+    trustedOrigins: [stripTrailingSlash(options.appUrl), stripTrailingSlash(options.apiUrl)],
+    session: {
+      cookieCache: {
+        enabled: true,
+        maxAge: 5 * 60,
+        strategy: "compact",
+      },
+    },
+    onAPIError: {
+      errorURL: stripTrailingSlash(options.appUrl) + "/signin",
+    },
+    socialProviders: {
+      github: {
+        clientId: requireEnv("GITHUB_CLIENT_ID"),
+        clientSecret: requireEnv("GITHUB_CLIENT_SECRET"),
+        scope: ["read:org", "repo"],
+        redirectURI: process.env.GITHUB_REDIRECT_URI || undefined,
+      },
+    },
+  });
+
+  betterAuthService = {
+    auth,
+
+    async resolveSession(headers: Headers) {
+      return (await auth.api.getSession({ headers })) ?? null;
+    },
+
+    async signOut(headers: Headers) {
+      return await callAuthEndpoint(auth, `${stripTrailingSlash(process.env.BETTER_AUTH_URL ?? options.apiUrl)}${AUTH_BASE_PATH}/sign-out`, {
+        method: "POST",
+        headers,
+      });
+    },
+
+    async getAuthState(sessionId: string) {
+      const organization = await appOrganization();
+      const route = await organization.betterAuthFindSessionIndex({ sessionId });
+      if (!route?.userId) {
+        return null;
+      }
+      const userActor = await getUser(route.userId);
+      return await userActor.getAppAuthState({ sessionId });
+    },
+
+    async upsertUserProfile(userId: string, patch: Record<string, unknown>) {
+      const userActor = await getUser(userId);
+      return await userActor.upsertProfile({ userId, patch });
+    },
+
+    async setActiveOrganization(sessionId: string, activeOrganizationId: string | null) {
+      const authState = await this.getAuthState(sessionId);
+      if (!authState?.user?.id) {
+        throw new Error(`Unknown auth session ${sessionId}`);
+      }
+      const userActor = await getUser(authState.user.id);
+      return await userActor.upsertSessionState({ sessionId, activeOrganizationId });
+    },
+
+    async getAccessTokenForSession(sessionId: string) {
+      // Read the GitHub access token directly from the account record stored in the
+      // auth user actor. Better Auth's internal /get-access-token endpoint requires
+      // session middleware resolution which fails for server-side internal calls (403),
+      // so we bypass it and read the stored token from our adapter layer directly.
+      const authState = await this.getAuthState(sessionId);
+      if (!authState?.user?.id || !authState?.accounts) {
+        return null;
+      }
+
+      const githubAccount = authState.accounts.find((account: any) => account.providerId === "github");
+      if (!githubAccount?.accessToken) {
+        logger.warn({ sessionId, userId: authState.user.id }, "get_access_token_no_github_account");
+        return null;
+      }
+
+      return {
+        accessToken: githubAccount.accessToken,
+        scopes: githubAccount.scope ? githubAccount.scope.split(/[, ]+/) : [],
+      };
+    },
+  };
+
+  return betterAuthService;
+}
+
+export function getBetterAuthService(): BetterAuthService {
+  if (!betterAuthService) {
+    throw new Error("BetterAuth service is not initialized");
+  }
+  return betterAuthService;
+}
diff --git a/foundry/packages/backend/src/services/branch-name-prefixes.ts b/foundry/packages/backend/src/services/branch-name-prefixes.ts
new file mode 100644
index 0000000..aaccaee
--- /dev/null
+++ b/foundry/packages/backend/src/services/branch-name-prefixes.ts
@@ -0,0 +1,584 @@
+// Auto-generated list of branch name prefixes.
+// Source: McMaster-Carr product catalog.
+export const BRANCH_NAME_PREFIXES: readonly string[] = [
+  "abrasive-blasters",
+  "ac-motors",
+  "access-doors",
+  "adjustable-handles",
+  "aerosol-paint",
+  "air-cleaners",
+  "air-cylinders",
+  "air-filters",
+  "air-hose",
+  "air-knives",
+  "air-nozzles",
+  "air-regulators",
+  "air-ride-wheels",
+  "air-slides",
+  "alligator-clips",
+  "alloy-steel",
+  "aluminum-honeycomb",
+  "angle-indicators",
+  "antiseize-lubricants",
+  "antislip-fluid",
+  "backlight-panel-kits",
+  "ball-bearings",
+  "ball-end-mills",
+  "ball-joint-linkages",
+  "ball-transfers",
+  "band-clamps",
+  "band-saw-blades",
+  "bar-clamps",
+  "bar-grating",
+  "barbed-hose-fittings",
+  "barbed-tube-fittings",
+  "basket-strainers",
+  "batch-cans",
+  "battery-chargers",
+  "battery-holders",
+  "bead-chain",
+  "beam-clamps",
+  "belt-conveyors",
+  "bench-scales",
+  "bench-vises",
+  "bin-boxes",
+  "bin-storage",
+  "binding-posts",
+  "blank-tags",
+  "blasting-cabinets",
+  "blind-rivets",
+  "bluetooth-padlocks",
+  "boring-lathe-tools",
+  "box-reducers",
+  "box-wrenches",
+  "braided-hose",
+  "brass-pipe-fittings",
+  "breather-vents",
+  "butt-splices",
+  "c-clamps",
+  "cable-cutters",
+  "cable-holders",
+  "cable-tie-mounts",
+  "cable-ties",
+  "cam-handles",
+  "cam-latches",
+  "cam-locks",
+  "cap-nuts",
+  "captive-panel-screws",
+  "carbide-burs",
+  "carbide-inserts",
+  "carbon-fiber",
+  "carbon-steel",
+  "cardstock-tags",
+  "carriage-bolts",
+  "cast-acrylic",
+  "cast-iron",
+  "cast-nylon",
+  "casting-compounds",
+  "ceiling-lights",
+  "ceramic-adhesives",
+  "chain-slings",
+  "check-valves",
+  "chemical-hose",
+  "chemistry-meters",
+  "chemistry-testing",
+  "chip-clearing-tools",
+  "chucking-reamers",
+  "cinching-straps",
+  "circuit-breakers",
+  "circular-saw-blades",
+  "circular-saws",
+  "clamping-hangers",
+  "clevis-pins",
+  "clevis-rod-ends",
+  "clip-on-nuts",
+  "coaxial-connectors",
+  "coaxial-cords",
+  "coiled-spring-pins",
+  "compact-connectors",
+  "computer-adapters",
+  "concrete-adhesives",
+  "concrete-repair",
+  "contour-transfers",
+  "conveyor-belt-lacing",
+  "conveyor-belting",
+  "conveyor-brushes",
+  "conveyor-rollers",
+  "coolant-hose",
+  "copper-tube-fittings",
+  "copper-tubing",
+  "cord-grips",
+  "cord-reels",
+  "cotter-pins",
+  "coupling-nuts",
+  "cpvc-pipe-fittings",
+  "cup-brushes",
+  "cutoff-wheels",
+  "cylinder-hones",
+  "cylinder-racks",
+  "cylinder-trucks",
+  "data-cable",
+  "data-connectors",
+  "dc-motors",
+  "dead-blow-hammers",
+  "delrin-acetal-resin",
+  "desiccant-air-dryers",
+  "desktop-cranes",
+  "dial-calipers",
+  "dial-indicators",
+  "die-springs",
+  "direct-heaters",
+  "disconnect-switches",
+  "dispensing-needles",
+  "dispensing-pumps",
+  "disposable-clothing",
+  "disposable-gloves",
+  "document-protectors",
+  "door-closers",
+  "door-handles",
+  "door-holders",
+  "dowel-pins",
+  "drafting-equipment",
+  "drain-cleaners",
+  "drainage-mats",
+  "draw-latches",
+  "drawer-cabinets",
+  "drawer-slides",
+  "drill-bit-sets",
+  "drill-bits",
+  "drill-bushings",
+  "drill-chucks",
+  "drill-presses",
+  "drilling-screws",
+  "drinking-fountains",
+  "drive-anchors",
+  "drive-rollers",
+  "drive-shafts",
+  "drum-faucets",
+  "drum-pumps",
+  "drum-top-vacuums",
+  "drum-trucks",
+  "dry-box-gloves",
+  "dry-erase-boards",
+  "dry-film-lubricants",
+  "duct-fans",
+  "duct-hose",
+  "duct-tape",
+  "dust-collectors",
+  "dustless-chalk",
+  "edge-trim",
+  "electric-actuators",
+  "electric-drills",
+  "electric-drum-pumps",
+  "electric-mixers",
+  "electrical-switches",
+  "electrical-tape",
+  "electronic-calipers",
+  "enclosure-heaters",
+  "enclosure-panels",
+  "ethernet-cords",
+  "exhaust-fans",
+  "exit-lights",
+  "expansion-joints",
+  "expansion-plugs",
+  "extension-cords",
+  "extension-springs",
+  "fabric-snaps",
+  "fan-blades",
+  "fep-tubing",
+  "fiberglass-grating",
+  "file-holders",
+  "filter-bag-housings",
+  "filter-bags",
+  "filter-cartridges",
+  "fire-fighting-hose",
+  "first-aid-supplies",
+  "fixture-clamps",
+  "flange-locknuts",
+  "flange-mount-seals",
+  "flap-sanding-discs",
+  "flap-sanding-wheels",
+  "flared-tube-fittings",
+  "flashing-lights",
+  "flat-washers",
+  "flexible-shafts",
+  "flexible-shank-burs",
+  "flexible-trays",
+  "float-valves",
+  "floor-locks",
+  "floor-marking-tape",
+  "floor-scales",
+  "floor-squeegees",
+  "flow-sights",
+  "flow-switches",
+  "flowmeter-totalizers",
+  "foot-switches",
+  "force-gauges",
+  "fume-exhausters",
+  "garbage-bags",
+  "garden-hose",
+  "gas-hose",
+  "gas-regulators",
+  "gas-springs",
+  "gauge-blocks",
+  "glass-sights",
+  "gold-wire",
+  "grab-latches",
+  "grease-fittings",
+  "grinding-bits",
+  "grinding-wheels",
+  "hand-brushes",
+  "hand-chain-hoists",
+  "hand-reamers",
+  "hand-trucks",
+  "hand-wheels",
+  "hand-winches",
+  "hanging-scales",
+  "hard-hats",
+  "hardened-shafts",
+  "hardness-testers",
+  "heat-exchangers",
+  "heat-guns",
+  "heat-lamps",
+  "heat-sealable-bags",
+  "heat-set-inserts",
+  "heat-shrink-tubing",
+  "heat-sinks",
+  "heated-scrapers",
+  "helical-inserts",
+  "hex-bit-sockets",
+  "hex-head-screws",
+  "hex-nuts",
+  "high-accuracy-rulers",
+  "high-amp-relays",
+  "high-vacuum-filters",
+  "high-vacuum-sights",
+  "hinge-adjusters",
+  "hoist-rings",
+  "hole-saws",
+  "hose-couplings",
+  "hose-reels",
+  "hot-melt-glue",
+  "hydraulic-cylinders",
+  "hydraulic-hose",
+  "hydraulic-jacks",
+  "iec-connectors",
+  "immersion-heaters",
+  "impression-foam",
+  "indicating-lights",
+  "inflatable-wedges",
+  "ink-markers",
+  "insertion-heaters",
+  "inspection-mirrors",
+  "instrument-carts",
+  "insulation-jacketing",
+  "jam-removers",
+  "jigsaw-blades",
+  "key-cabinets",
+  "key-locking-inserts",
+  "key-stock",
+  "keyed-drive-shafts",
+  "keyseat-end-mills",
+  "l-key-sets",
+  "l-keys",
+  "label-holders",
+  "latching-connectors",
+  "lathe-tools",
+  "lavatory-partitions",
+  "lead-screws",
+  "leveling-lasers",
+  "leveling-mounts",
+  "lid-supports",
+  "lift-off-hinges",
+  "lift-trucks",
+  "light-bulbs",
+  "limit-switches",
+  "linear-ball-bearings",
+  "liquid-level-gauges",
+  "lock-washers",
+  "lockout-devices",
+  "loop-clamps",
+  "loop-hangers",
+  "machine-brackets",
+  "machine-handles",
+  "machine-keys",
+  "magnetic-base-drills",
+  "magnetic-bumpers",
+  "masking-tape",
+  "masonry-drill-bits",
+  "medium-amp-relays",
+  "metal-cable-ties",
+  "metal-panels",
+  "metal-plates",
+  "metal-tags",
+  "metering-pumps",
+  "metric-o-rings",
+  "mil-spec-connectors",
+  "mobile-lift-tables",
+  "motor-controls",
+  "motor-starters",
+  "mountable-cable-ties",
+  "mounting-tape",
+  "neoprene-foam",
+  "nickel-titanium",
+  "nonmarring-hammers",
+  "nonslip-bumpers",
+  "nylon-rivets",
+  "nylon-tubing",
+  "o-rings",
+  "oil-level-indicators",
+  "oil-reservoirs",
+  "oil-skimmers",
+  "on-off-valves",
+  "open-end-wrenches",
+  "outlet-boxes",
+  "outlet-strips",
+  "packaging-tape",
+  "paint-brushes",
+  "paint-markers",
+  "paint-sprayers",
+  "pallet-racks",
+  "pallet-trucks",
+  "panel-air-filters",
+  "parts-baskets",
+  "pendant-switches",
+  "perforated-sheets",
+  "pest-control",
+  "petroleum-hose",
+  "piano-hinges",
+  "pipe-couplings",
+  "pipe-gaskets",
+  "pipe-markers",
+  "pipe-wrenches",
+  "plank-grating",
+  "plastic-clamps",
+  "plastic-mesh",
+  "plate-lifting-clamps",
+  "platinum-wire",
+  "plier-clamps",
+  "plug-gauges",
+  "portable-lights",
+  "power-cords",
+  "power-supplied",
+  "power-supplies",
+  "precision-knives",
+  "press-fit-nuts",
+  "press-in-nuts",
+  "protecting-tape",
+  "protective-coatings",
+  "protective-curtains",
+  "protective-panels",
+  "protective-wrap",
+  "proximity-switches",
+  "pull-handles",
+  "push-brooms",
+  "push-nuts",
+  "push-on-seals",
+  "pvc-pipe-fittings",
+  "pvc-tubing",
+  "quick-release-pins",
+  "ratchet-pullers",
+  "recycled-plastics",
+  "repair-adhesives",
+  "repair-clamps",
+  "reusable-cable-ties",
+  "ring-terminals",
+  "rivet-nuts",
+  "robot-base-mounts",
+  "robot-bases",
+  "rocker-switches",
+  "rod-wipers",
+  "roller-bearings",
+  "roller-chain",
+  "roller-conveyors",
+  "roof-exhaust-fans",
+  "roof-repair",
+  "rotary-broaches",
+  "rotary-hammers",
+  "rotary-shaft-seals",
+  "rotating-cranes",
+  "rotating-joints",
+  "router-bits",
+  "rtd-probes",
+  "rubber-edge-seals",
+  "rubber-tread-wheels",
+  "rubber-tubing",
+  "safety-cabinets",
+  "safety-glasses",
+  "safety-mirrors",
+  "sanding-belts",
+  "sanding-discs",
+  "sanding-guides",
+  "sanding-rolls",
+  "sanding-sheets",
+  "screw-extractors",
+  "screw-jacks",
+  "scrub-brushes",
+  "sealing-washers",
+  "security-lights",
+  "sensor-connectors",
+  "set-screws",
+  "setup-clamps",
+  "shaft-collars",
+  "shaft-couplings",
+  "shaft-repair-sleeves",
+  "shaft-supports",
+  "sharpening-stones",
+  "sheet-metal-cutters",
+  "shelf-cabinets",
+  "shim-stock",
+  "shim-tape",
+  "shipping-pails",
+  "shock-absorbers",
+  "shoulder-screws",
+  "shower-stations",
+  "silicone-foam",
+  "sleeve-bearings",
+  "slide-bolts",
+  "slitting-saws",
+  "slotted-spring-pins",
+  "sludge-samplers",
+  "small-parts-storage",
+  "snap-acting-switches",
+  "soap-dispensers",
+  "socket-head-screws",
+  "socket-organizers",
+  "socket-wrenches",
+  "soldering-irons",
+  "solid-rivets",
+  "solid-rod-ends",
+  "sound-insulation",
+  "space-heaters",
+  "spacing-beads",
+  "spanner-wrenches",
+  "specialty-pliers",
+  "specialty-vises",
+  "specialty-washers",
+  "speed-reducers",
+  "splicing-connectors",
+  "spray-bottles",
+  "spray-nozzles",
+  "spring-clamps",
+  "spring-plungers",
+  "spring-steel",
+  "square-drive-sockets",
+  "square-end-mills",
+  "square-nuts",
+  "squeeze-bottles",
+  "stack-lights",
+  "stainless-steel",
+  "stair-treads",
+  "static-control-mats",
+  "steel-carts",
+  "steel-pipe-fittings",
+  "steel-pipe-flanges",
+  "steel-stamps",
+  "steel-tubing",
+  "step-ladders",
+  "stepper-motors",
+  "storage-bags",
+  "storage-boxes",
+  "storage-chests",
+  "straight-ladders",
+  "strap-hinges",
+  "stretch-wrap",
+  "strip-doors",
+  "strip-springs",
+  "strobe-lights",
+  "structural-adhesives",
+  "strut-channel",
+  "strut-channel-nuts",
+  "strut-mount-clamps",
+  "suction-cup-lifters",
+  "suction-strainers",
+  "super-absorbent-foam",
+  "super-flexible-glass",
+  "surface-fillers",
+  "surface-mount-hinges",
+  "t-handle-keys",
+  "t-slotted-framing",
+  "tamper-seals",
+  "tank-level-measurers",
+  "tape-dispensers",
+  "tape-measures",
+  "taper-pins",
+  "tapping-screws",
+  "teflon-ptfe",
+  "terminal-blocks",
+  "test-indicators",
+  "test-leads",
+  "test-weights",
+  "tethered-knobs",
+  "thermal-insulation",
+  "thread-adapters",
+  "thread-sealant-tape",
+  "thread-sealants",
+  "threaded-inserts",
+  "threaded-standoffs",
+  "threaded-studs",
+  "thrust-ball-bearings",
+  "thrust-bearings",
+  "thumb-nuts",
+  "thumb-screws",
+  "tie-down-rings",
+  "time-clocks",
+  "timer-relays",
+  "timer-switches",
+  "toggle-clamps",
+  "toggle-switches",
+  "tool-holders",
+  "tool-sets",
+  "tool-steel",
+  "torque-wrenches",
+  "torsion-springs",
+  "tote-boxes",
+  "touch-bars",
+  "track-casters",
+  "track-rollers",
+  "track-wheels",
+  "traction-mats",
+  "trolley-systems",
+  "tube-brushes",
+  "tube-fittings",
+  "tubular-light-bulbs",
+  "turn-lock-connectors",
+  "twist-ties",
+  "u-bolts",
+  "u-joints",
+  "ul-class-fuses",
+  "unthreaded-spacers",
+  "usb-adapters",
+  "usb-cords",
+  "utility-knives",
+  "v-belts",
+  "vacuum-cups",
+  "vacuum-pumps",
+  "wall-louvers",
+  "wash-fountains",
+  "wash-guns",
+  "waste-containers",
+  "water-deionizers",
+  "water-filters",
+  "water-hose",
+  "water-removal-pumps",
+  "weather-stations",
+  "web-slings",
+  "weld-nuts",
+  "welding-clothing",
+  "welding-helmets",
+  "wet-dry-vacuums",
+  "wet-mops",
+  "wheel-brushes",
+  "wing-nuts",
+  "wire-cloth",
+  "wire-connectors",
+  "wire-cutting-pliers",
+  "wire-partitions",
+  "wire-rope",
+  "wire-rope-clamps",
+  "wire-wrap",
+  "wool-felt",
+  "work-platforms",
+  "workbench-legs",
+  "woven-wire-cloth",
+] as const;
diff --git a/foundry/packages/backend/src/services/create-flow.ts b/foundry/packages/backend/src/services/create-flow.ts
new file mode 100644
index 0000000..eb9e53f
--- /dev/null
+++ b/foundry/packages/backend/src/services/create-flow.ts
@@ -0,0 +1,136 @@
+import { BRANCH_NAME_PREFIXES } from "./branch-name-prefixes.js";
+
+export interface ResolveCreateFlowDecisionInput {
+  task: string;
+  explicitTitle?: string;
+  explicitBranchName?: string;
+  localBranches: string[];
+  taskBranches: string[];
+}
+
+export interface ResolveCreateFlowDecisionResult {
+  title: string;
+  branchName: string;
+}
+
+function firstNonEmptyLine(input: string): string {
+  const lines = input
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0);
+  return lines[0] ?? "";
+}
+
+export function deriveFallbackTitle(task: string, explicitTitle?: string): string {
+  const source = (explicitTitle && explicitTitle.trim()) || firstNonEmptyLine(task) || "update task";
+  const explicitPrefixMatch = source.match(/^\s*(feat|fix|docs|refactor):\s+(.+)$/i);
+  if (explicitPrefixMatch) {
+    const explicitTypePrefix = explicitPrefixMatch[1]!.toLowerCase();
+    const explicitSummary = explicitPrefixMatch[2]!
+      .split("")
+      .map((char) => (/^[a-zA-Z0-9 -]$/.test(char) ? char : " "))
+      .join("")
+      .split(/\s+/)
+      .filter((token) => token.length > 0)
+      .join(" ")
+      .slice(0, 62)
+      .trim();
+
+    return `${explicitTypePrefix}: ${explicitSummary || "update task"}`;
+  }
+
+  const lowered = source.toLowerCase();
+
+  const typePrefix =
+    lowered.includes("fix") || lowered.includes("bug")
+      ? "fix"
+      : lowered.includes("doc") || lowered.includes("readme")
+        ? "docs"
+        : lowered.includes("refactor")
+          ? "refactor"
+          : "feat";
+
+  const cleaned = source
+    .split("")
+    .map((char) => (/^[a-zA-Z0-9 -]$/.test(char) ? char : " "))
+    .join("")
+    .split(/\s+/)
+    .filter((token) => token.length > 0)
+    .join(" ");
+
+  const summary = (cleaned || "update task").slice(0, 62).trim();
+  return `${typePrefix}: ${summary}`.trim();
+}
+
+export function sanitizeBranchName(input: string): string {
+  const normalized = input
+    .toLowerCase()
+    .split("")
+    .map((char) => (/^[a-z0-9]$/.test(char) ? char : "-"))
+    .join("");
+
+  let result = "";
+  let previousDash = false;
+  for (const char of normalized) {
+    if (char === "-") {
+      if (!previousDash && result.length > 0) {
+        result += char;
+      }
+      previousDash = true;
+      continue;
+    }
+
+    result += char;
+    previousDash = false;
+  }
+
+  const trimmed = result.replace(/-+$/g, "");
+  if (trimmed.length <= 50) {
+    return trimmed;
+  }
+  return trimmed.slice(0, 50).replace(/-+$/g, "");
+}
+
+function generateRandomSuffix(length: number): string {
+  const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+  let result = "";
+  for (let i = 0; i < length; i++) {
+    result += chars[Math.floor(Math.random() * chars.length)];
+  }
+  return result;
+}
+
+function generateBranchName(): string {
+  const prefix = BRANCH_NAME_PREFIXES[Math.floor(Math.random() * BRANCH_NAME_PREFIXES.length)]!;
+  const suffix = generateRandomSuffix(4);
+  return `${prefix}-${suffix}`;
+}
+
+export function resolveCreateFlowDecision(input: ResolveCreateFlowDecisionInput): ResolveCreateFlowDecisionResult {
+  const explicitBranch = input.explicitBranchName?.trim();
+  const title = deriveFallbackTitle(input.task, input.explicitTitle);
+
+  const existingBranches = new Set(input.localBranches.map((value) => value.trim()).filter((value) => value.length > 0));
+  const existingTaskBranches = new Set(input.taskBranches.map((value) => value.trim()).filter((value) => value.length > 0));
+  const conflicts = (name: string): boolean => existingBranches.has(name) || existingTaskBranches.has(name);
+
+  if (explicitBranch && explicitBranch.length > 0) {
+    if (conflicts(explicitBranch)) {
+      throw new Error(`Branch '${explicitBranch}' already exists. Choose a different --name/--branch value.`);
+    }
+    return { title, branchName: explicitBranch };
+  }
+
+  // Generate a random McMaster-Carr-style branch name, retrying on conflicts
+  let candidate = generateBranchName();
+  let attempts = 0;
+  while (conflicts(candidate) && attempts < 100) {
+    candidate = generateBranchName();
+    attempts += 1;
+  }
+
+  return {
+    title,
+    branchName: candidate,
+  };
+}
diff --git a/foundry/packages/backend/src/services/github-auth.ts b/foundry/packages/backend/src/services/github-auth.ts
new file mode 100644
index 0000000..aa475b0
--- /dev/null
+++ b/foundry/packages/backend/src/services/github-auth.ts
@@ -0,0 +1,30 @@
+import { getOrCreateOrganization } from "../actors/handles.js";
+import { APP_SHELL_ORGANIZATION_ID } from "../actors/organization/constants.js";
+
+export interface ResolvedGithubAuth {
+  githubToken: string;
+  scopes: string[];
+}
+
+export async function resolveOrganizationGithubAuth(c: any, organizationId: string): Promise<ResolvedGithubAuth | null> {
+  if (!organizationId || organizationId === APP_SHELL_ORGANIZATION_ID) {
+    return null;
+  }
+
+  try {
+    const appOrganization = await getOrCreateOrganization(c, APP_SHELL_ORGANIZATION_ID);
+    const resolved = await appOrganization.resolveAppGithubToken({
+      organizationId: organizationId,
+      requireRepoScope: true,
+    });
+    if (!resolved?.accessToken) {
+      return null;
+    }
+    return {
+      githubToken: resolved.accessToken,
+      scopes: Array.isArray(resolved.scopes) ? resolved.scopes : [],
+    };
+  } catch {
+    return null;
+  }
+}
diff --git a/foundry/packages/backend/src/services/queue.ts b/foundry/packages/backend/src/services/queue.ts
new file mode 100644
index 0000000..34e697c
--- /dev/null
+++ b/foundry/packages/backend/src/services/queue.ts
@@ -0,0 +1,24 @@
+interface QueueSendResult {
+  status: "completed" | "timedOut";
+  response?: unknown;
+}
+
+export function expectQueueResponse<T>(result: QueueSendResult | void): T {
+  if (!result || result.status === "timedOut") {
+    throw new Error("Queue command timed out");
+  }
+  if (
+    result.response &&
+    typeof result.response === "object" &&
+    "error" in result.response &&
+    typeof (result.response as { error?: unknown }).error === "string"
+  ) {
+    throw new Error((result.response as { error: string }).error);
+  }
+  return result.response as T;
+}
+
+export function normalizeMessages<T>(input: T | T[] | null | undefined): T[] {
+  if (!input) return [];
+  return Array.isArray(input) ? input : [input];
+}
diff --git a/foundry/packages/backend/src/services/repo.ts b/foundry/packages/backend/src/services/repo.ts
new file mode 100644
index 0000000..fb673cc
--- /dev/null
+++ b/foundry/packages/backend/src/services/repo.ts
@@ -0,0 +1,111 @@
+import { createHash } from "node:crypto";
+import { basename, sep } from "node:path";
+
+export function normalizeRemoteUrl(remoteUrl: string): string {
+  let value = remoteUrl.trim();
+  if (!value) return "";
+
+  // Strip trailing slashes to make hashing stable.
+  value = value.replace(/\/+$/, "");
+
+  // GitHub shorthand: owner/repo -> https://github.com/owner/repo.git
+  if (/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(value)) {
+    return `https://github.com/${value}.git`;
+  }
+
+  // If a user pastes "github.com/owner/repo", treat it as HTTPS.
+  if (/^(?:www\.)?github\.com\/.+/i.test(value)) {
+    value = `https://${value.replace(/^www\./i, "")}`;
+  }
+
+  // Canonicalize GitHub URLs to the repo clone URL (drop /tree/*, issues, etc).
+  // This makes "https://github.com/owner/repo" and ".../tree/main" map to the same repoId.
+  try {
+    if (/^https?:\/\//i.test(value)) {
+      const url = new URL(value);
+      const hostname = url.hostname.replace(/^www\./i, "");
+      if (hostname.toLowerCase() === "github.com") {
+        const parts = url.pathname.split("/").filter(Boolean);
+        if (parts.length >= 2) {
+          const owner = parts[0]!;
+          const repo = parts[1]!;
+          const base = `${url.protocol}//${hostname}/${owner}/${repo.replace(/\.git$/i, "")}.git`;
+          return base;
+        }
+      }
+      // Drop query/fragment for stability.
+      url.search = "";
+      url.hash = "";
+      return url.toString().replace(/\/+$/, "");
+    }
+  } catch {
+    // ignore parse failures; fall through to raw value
+  }
+
+  return value;
+}
+
+export function repoIdFromRemote(remoteUrl: string): string {
+  const normalized = normalizeRemoteUrl(remoteUrl);
+  return createHash("sha1").update(normalized).digest("hex").slice(0, 16);
+}
+
+export function repoLabelFromRemote(remoteUrl: string): string {
+  const trimmed = remoteUrl.trim();
+  if (!trimmed) {
+    return "";
+  }
+
+  try {
+    if (/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed) || trimmed.startsWith("file:")) {
+      const url = new URL(trimmed);
+      const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+      if (parts.length >= 2) {
+        return `${parts[parts.length - 2]}/${(parts[parts.length - 1] ?? "").replace(/\.git$/i, "")}`;
+      }
+    } else {
+      const url = new URL(trimmed.startsWith("http") ? trimmed : `https://${trimmed}`);
+      const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+      if (parts.length >= 2) {
+        return `${parts[0]}/${(parts[1] ?? "").replace(/\.git$/i, "")}`;
+      }
+    }
+  } catch {
+    // Fall through to path-based parsing.
+  }
+
+  const normalizedPath = trimmed.replace(/\\/g, sep);
+  const segments = normalizedPath.split(sep).filter(Boolean);
+  if (segments.length >= 2) {
+    return `${segments[segments.length - 2]}/${segments[segments.length - 1]!.replace(/\.git$/i, "")}`;
+  }
+
+  return basename(trimmed.replace(/\.git$/i, ""));
+}
+
+export function githubRepoFullNameFromRemote(remoteUrl: string): string | null {
+  const normalized = normalizeRemoteUrl(remoteUrl);
+  if (!normalized) {
+    return null;
+  }
+
+  try {
+    const url = new URL(normalized);
+    const hostname = url.hostname.replace(/^www\./i, "").toLowerCase();
+    if (hostname !== "github.com") {
+      return null;
+    }
+    const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+    if (parts.length < 2) {
+      return null;
+    }
+    const owner = parts[0]?.trim();
+    const repo = (parts[1] ?? "").replace(/\.git$/i, "").trim();
+    if (!owner || !repo) {
+      return null;
+    }
+    return `${owner}/${repo}`;
+  } catch {
+    return null;
+  }
+}
diff --git a/foundry/packages/backend/src/services/tmux.ts b/foundry/packages/backend/src/services/tmux.ts
new file mode 100644
index 0000000..646b1d9
--- /dev/null
+++ b/foundry/packages/backend/src/services/tmux.ts
@@ -0,0 +1,59 @@
+import { execFileSync, spawnSync } from "node:child_process";
+
+const SYMBOL_RUNNING = "▶";
+const SYMBOL_IDLE = "✓";
+
+function stripStatusPrefix(windowName: string): string {
+  return windowName
+    .trimStart()
+    .replace(new RegExp(`^${SYMBOL_RUNNING}\\s+`), "")
+    .replace(new RegExp(`^${SYMBOL_IDLE}\\s+`), "")
+    .trim();
+}
+
+export function setWindowStatus(branchName: string, status: string): number {
+  let symbol: string;
+  if (status === "running") {
+    symbol = SYMBOL_RUNNING;
+  } else if (status === "idle") {
+    symbol = SYMBOL_IDLE;
+  } else {
+    return 0;
+  }
+
+  let stdout: string;
+  try {
+    stdout = execFileSync("tmux", ["list-windows", "-a", "-F", "#{session_name}:#{window_id}:#{window_name}"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    });
+  } catch {
+    return 0;
+  }
+
+  const lines = stdout.split(/\r?\n/).filter((line) => line.trim().length > 0);
+  let count = 0;
+
+  for (const line of lines) {
+    const parts = line.split(":", 3);
+    if (parts.length !== 3) {
+      continue;
+    }
+
+    const sessionName = parts[0] ?? "";
+    const windowId = parts[1] ?? "";
+    const windowName = parts[2] ?? "";
+    const clean = stripStatusPrefix(windowName);
+    if (clean !== branchName) {
+      continue;
+    }
+
+    const newName = `${symbol} ${branchName}`;
+    spawnSync("tmux", ["rename-window", "-t", `${sessionName}:${windowId}`, newName], {
+      stdio: "ignore",
+    });
+    count += 1;
+  }
+
+  return count;
+}
diff --git a/foundry/packages/backend/test/create-flow.test.ts b/foundry/packages/backend/test/create-flow.test.ts
new file mode 100644
index 0000000..8c66cb4
--- /dev/null
+++ b/foundry/packages/backend/test/create-flow.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it } from "vitest";
+import { deriveFallbackTitle, resolveCreateFlowDecision, sanitizeBranchName } from "../src/services/create-flow.js";
+import { BRANCH_NAME_PREFIXES } from "../src/services/branch-name-prefixes.js";
+
+describe("create flow decision", () => {
+  it("derives a conventional-style fallback title from task text", () => {
+    const title = deriveFallbackTitle("Fix OAuth callback bug in handler");
+    expect(title).toBe("fix: Fix OAuth callback bug in handler");
+  });
+
+  it("preserves an explicit conventional prefix without duplicating it", () => {
+    const title = deriveFallbackTitle("Reply with exactly: READY", "feat: Browser UI Flow");
+    expect(title).toBe("feat: Browser UI Flow");
+  });
+
+  it("sanitizes generated branch names", () => {
+    expect(sanitizeBranchName("feat: Add @mentions & #hashtags")).toBe("feat-add-mentions-hashtags");
+    expect(sanitizeBranchName("  spaces  everywhere  ")).toBe("spaces-everywhere");
+  });
+
+  it("generates a McMaster-Carr-style branch name with random suffix", () => {
+    const resolved = resolveCreateFlowDecision({
+      task: "Add auth",
+      localBranches: [],
+      taskBranches: [],
+    });
+
+    expect(resolved.title).toBe("feat: Add auth");
+    // Branch name should be "<prefix>-<4-char-suffix>" where prefix is from BRANCH_NAME_PREFIXES
+    const lastDash = resolved.branchName.lastIndexOf("-");
+    const prefix = resolved.branchName.slice(0, lastDash);
+    const suffix = resolved.branchName.slice(lastDash + 1);
+    expect(BRANCH_NAME_PREFIXES).toContain(prefix);
+    expect(suffix).toMatch(/^[a-z0-9]{4}$/);
+  });
+
+  it("avoids conflicts by generating a different random name", () => {
+    // Even with a conflicting branch, it should produce something different
+    const resolved = resolveCreateFlowDecision({
+      task: "Add auth",
+      localBranches: [],
+      taskBranches: [],
+    });
+
+    // Running again with the first result as a conflict should produce a different name
+    const resolved2 = resolveCreateFlowDecision({
+      task: "Add auth",
+      localBranches: [resolved.branchName],
+      taskBranches: [],
+    });
+
+    expect(resolved2.branchName).not.toBe(resolved.branchName);
+  });
+
+  it("uses explicit branch name when provided", () => {
+    const resolved = resolveCreateFlowDecision({
+      task: "new task",
+      explicitBranchName: "my-branch",
+      localBranches: [],
+      taskBranches: [],
+    });
+
+    expect(resolved.branchName).toBe("my-branch");
+  });
+
+  it("fails when explicit branch already exists", () => {
+    expect(() =>
+      resolveCreateFlowDecision({
+        task: "new task",
+        explicitBranchName: "existing-branch",
+        localBranches: ["existing-branch"],
+        taskBranches: [],
+      }),
+    ).toThrow("already exists");
+  });
+});
diff --git a/foundry/packages/backend/test/helpers/test-context.ts b/foundry/packages/backend/test/helpers/test-context.ts
new file mode 100644
index 0000000..be169a8
--- /dev/null
+++ b/foundry/packages/backend/test/helpers/test-context.ts
@@ -0,0 +1,34 @@
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { ConfigSchema, type AppConfig } from "@sandbox-agent/foundry-shared";
+import type { BackendDriver } from "../../src/driver.js";
+import { initActorRuntimeContext } from "../../src/actors/context.js";
+import { createDefaultAppShellServices } from "../../src/services/app-shell-runtime.js";
+
+export function createTestConfig(overrides?: Partial<AppConfig>): AppConfig {
+  return ConfigSchema.parse({
+    auto_submit: true,
+    notify: ["terminal" as const],
+    organization: { default: "default" },
+    backend: {
+      host: "127.0.0.1",
+      port: 7741,
+      dbPath: join(tmpdir(), `hf-test-${Date.now()}-${Math.random().toString(16).slice(2)}.db`),
+      opencode_poll_interval: 2,
+      github_poll_interval: 30,
+      backup_interval_secs: 3600,
+      backup_retention_days: 7,
+    },
+    sandboxProviders: {
+      local: {},
+      e2b: {},
+    },
+    ...overrides,
+  });
+}
+
+export function createTestRuntimeContext(driver: BackendDriver, configOverrides?: Partial<AppConfig>): { config: AppConfig } {
+  const config = createTestConfig(configOverrides);
+  initActorRuntimeContext(config, undefined, driver, createDefaultAppShellServices());
+  return { config };
+}
diff --git a/foundry/packages/backend/test/helpers/test-driver.ts b/foundry/packages/backend/test/helpers/test-driver.ts
new file mode 100644
index 0000000..39975e5
--- /dev/null
+++ b/foundry/packages/backend/test/helpers/test-driver.ts
@@ -0,0 +1,26 @@
+import type { BackendDriver, GithubDriver, TmuxDriver } from "../../src/driver.js";
+
+export function createTestDriver(overrides?: Partial<BackendDriver>): BackendDriver {
+  return {
+    github: overrides?.github ?? createTestGithubDriver(),
+    tmux: overrides?.tmux ?? createTestTmuxDriver(),
+  };
+}
+
+export function createTestGithubDriver(overrides?: Partial<GithubDriver>): GithubDriver {
+  return {
+    createPr: async (_repoFullName, _headBranch, _title) => ({
+      number: 1,
+      url: `https://github.com/test/repo/pull/1`,
+    }),
+    starRepository: async () => {},
+    ...overrides,
+  };
+}
+
+export function createTestTmuxDriver(overrides?: Partial<TmuxDriver>): TmuxDriver {
+  return {
+    setWindowStatus: () => 0,
+    ...overrides,
+  };
+}
diff --git a/foundry/packages/backend/test/keys.test.ts b/foundry/packages/backend/test/keys.test.ts
new file mode 100644
index 0000000..c3b2a10
--- /dev/null
+++ b/foundry/packages/backend/test/keys.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+import { auditLogKey, githubDataKey, organizationKey, taskKey, taskSandboxKey } from "../src/actors/keys.js";
+
+describe("actor keys", () => {
+  it("prefixes every key with organization namespace", () => {
+    const keys = [
+      organizationKey("default"),
+      taskKey("default", "repo", "task"),
+      taskSandboxKey("default", "sbx"),
+      auditLogKey("default"),
+      githubDataKey("default"),
+    ];
+
+    for (const key of keys) {
+      expect(key[0]).toBe("org");
+      expect(key[1]).toBe("default");
+    }
+  });
+});
diff --git a/foundry/packages/backend/test/malformed-uri.test.ts b/foundry/packages/backend/test/malformed-uri.test.ts
new file mode 100644
index 0000000..2aed74b
--- /dev/null
+++ b/foundry/packages/backend/test/malformed-uri.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, it } from "vitest";
+
+describe("malformed URI handling", () => {
+  it("safeFetch wrapper returns 400 on URIError", async () => {
+    // Simulate the pattern used in backend/src/index.ts
+    const mockApp = {
+      fetch: async (_req: Request): Promise<Response> => {
+        // Simulate what happens when rivetkit's router encounters a malformed URI
+        throw new URIError("URI malformed");
+      },
+    };
+
+    const safeFetch = async (req: Request): Promise<Response> => {
+      try {
+        return await mockApp.fetch(req);
+      } catch (err) {
+        if (err instanceof URIError) {
+          return new Response("Bad Request: Malformed URI", { status: 400 });
+        }
+        throw err;
+      }
+    };
+
+    const response = await safeFetch(new Request("http://localhost/%ZZ"));
+    expect(response.status).toBe(400);
+    expect(await response.text()).toBe("Bad Request: Malformed URI");
+  });
+
+  it("safeFetch wrapper re-throws non-URI errors", async () => {
+    const mockApp = {
+      fetch: async (_req: Request): Promise<Response> => {
+        throw new TypeError("some other error");
+      },
+    };
+
+    const safeFetch = async (req: Request): Promise<Response> => {
+      try {
+        return await mockApp.fetch(req);
+      } catch (err) {
+        if (err instanceof URIError) {
+          return new Response("Bad Request: Malformed URI", { status: 400 });
+        }
+        throw err;
+      }
+    };
+
+    await expect(safeFetch(new Request("http://localhost/test"))).rejects.toThrow(TypeError);
+  });
+
+  it("safeFetch wrapper passes through valid requests", async () => {
+    const mockApp = {
+      fetch: async (_req: Request): Promise<Response> => {
+        return new Response("OK", { status: 200 });
+      },
+    };
+
+    const safeFetch = async (req: Request): Promise<Response> => {
+      try {
+        return await mockApp.fetch(req);
+      } catch (err) {
+        if (err instanceof URIError) {
+          return new Response("Bad Request: Malformed URI", { status: 400 });
+        }
+        throw err;
+      }
+    };
+
+    const response = await safeFetch(new Request("http://localhost/valid/path"));
+    expect(response.status).toBe(200);
+    expect(await response.text()).toBe("OK");
+  });
+
+  it("decodeURIComponent throws on malformed percent-encoding", () => {
+    // Validates the core issue: decodeURIComponent throws URIError on malformed input
+    expect(() => decodeURIComponent("%ZZ")).toThrow(URIError);
+    expect(() => decodeURIComponent("%")).toThrow(URIError);
+    expect(() => decodeURIComponent("%E0%A4%A")).toThrow(URIError);
+
+    // Valid encoding should not throw
+    expect(decodeURIComponent("%20")).toBe(" ");
+    expect(decodeURIComponent("hello%20world")).toBe("hello world");
+  });
+});
diff --git a/foundry/packages/backend/test/organization-isolation.test.ts b/foundry/packages/backend/test/organization-isolation.test.ts
new file mode 100644
index 0000000..f5d58f2
--- /dev/null
+++ b/foundry/packages/backend/test/organization-isolation.test.ts
@@ -0,0 +1,85 @@
+// @ts-nocheck
+import { mkdtempSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { execFileSync } from "node:child_process";
+import { setTimeout as delay } from "node:timers/promises";
+import { describe, expect, it } from "vitest";
+import { setupTest } from "rivetkit/test";
+import { organizationKey } from "../src/actors/keys.js";
+import { registry } from "../src/actors/index.js";
+import { organizationWorkflowQueueName } from "../src/actors/organization/queues.js";
+import { repoIdFromRemote } from "../src/services/repo.js";
+import { createTestDriver } from "./helpers/test-driver.js";
+import { createTestRuntimeContext } from "./helpers/test-context.js";
+
+const runActorIntegration = process.env.HF_ENABLE_ACTOR_INTEGRATION_TESTS === "1";
+
+function createRepo(): { repoPath: string } {
+  const repoPath = mkdtempSync(join(tmpdir(), "hf-isolation-repo-"));
+  execFileSync("git", ["init"], { cwd: repoPath });
+  execFileSync("git", ["config", "user.email", "test@example.com"], { cwd: repoPath });
+  execFileSync("git", ["config", "user.name", "Foundry Test"], { cwd: repoPath });
+  writeFileSync(join(repoPath, "README.md"), "hello\n", "utf8");
+  execFileSync("git", ["add", "README.md"], { cwd: repoPath });
+  execFileSync("git", ["commit", "-m", "init"], { cwd: repoPath });
+  return { repoPath };
+}
+
+async function waitForOrganizationRows(ws: any, organizationId: string, expectedCount: number) {
+  for (let attempt = 0; attempt < 40; attempt += 1) {
+    const rows = await ws.listTasks({ organizationId });
+    if (rows.length >= expectedCount) {
+      return rows;
+    }
+    await delay(50);
+  }
+  return ws.listTasks({ organizationId });
+}
+
+describe("organization isolation", () => {
+  it.skipIf(!runActorIntegration)("keeps task lists isolated by organization", async (t) => {
+    const testDriver = createTestDriver();
+    createTestRuntimeContext(testDriver);
+
+    const { client } = await setupTest(t, registry);
+    const wsA = await client.organization.getOrCreate(organizationKey("alpha"), {
+      createWithInput: "alpha",
+    });
+    const wsB = await client.organization.getOrCreate(organizationKey("beta"), {
+      createWithInput: "beta",
+    });
+
+    const { repoPath } = createRepo();
+    const repoId = repoIdFromRemote(repoPath);
+    await wsA.send(organizationWorkflowQueueName("organization.command.github.repository_projection.apply"), { repoId, remoteUrl: repoPath }, { wait: true });
+    await wsB.send(organizationWorkflowQueueName("organization.command.github.repository_projection.apply"), { repoId, remoteUrl: repoPath }, { wait: true });
+
+    await wsA.createTask({
+      organizationId: "alpha",
+      repoId,
+      task: "task A",
+      sandboxProviderId: "local",
+      explicitBranchName: "feature/a",
+      explicitTitle: "A",
+    });
+
+    await wsB.createTask({
+      organizationId: "beta",
+      repoId,
+      task: "task B",
+      sandboxProviderId: "local",
+      explicitBranchName: "feature/b",
+      explicitTitle: "B",
+    });
+
+    const aRows = await waitForOrganizationRows(wsA, "alpha", 1);
+    const bRows = await waitForOrganizationRows(wsB, "beta", 1);
+
+    expect(aRows.length).toBe(1);
+    expect(bRows.length).toBe(1);
+    expect(aRows[0]?.organizationId).toBe("alpha");
+    expect(bRows[0]?.organizationId).toBe("beta");
+    expect(aRows[0]?.taskId).not.toBe(bRows[0]?.taskId);
+  });
+});
diff --git a/foundry/packages/backend/test/organization-star-sandbox-agent-repo.test.ts b/foundry/packages/backend/test/organization-star-sandbox-agent-repo.test.ts
new file mode 100644
index 0000000..b3a2410
--- /dev/null
+++ b/foundry/packages/backend/test/organization-star-sandbox-agent-repo.test.ts
@@ -0,0 +1,39 @@
+// @ts-nocheck
+import { describe, expect, it } from "vitest";
+import { setupTest } from "rivetkit/test";
+import { organizationKey } from "../src/actors/keys.js";
+import { registry } from "../src/actors/index.js";
+import { createTestDriver } from "./helpers/test-driver.js";
+import { createTestRuntimeContext } from "./helpers/test-context.js";
+
+const runActorIntegration = process.env.HF_ENABLE_ACTOR_INTEGRATION_TESTS === "1";
+
+describe("organization star sandbox agent repo", () => {
+  it.skipIf(!runActorIntegration)("stars the sandbox agent repo through the github driver", async (t) => {
+    const calls: string[] = [];
+    const testDriver = createTestDriver({
+      github: {
+        listPullRequests: async () => [],
+        createPr: async () => ({
+          number: 1,
+          url: "https://github.com/test/repo/pull/1",
+        }),
+        starRepository: async (repoFullName) => {
+          calls.push(repoFullName);
+        },
+      },
+    });
+    createTestRuntimeContext(testDriver);
+
+    const { client } = await setupTest(t, registry);
+    const ws = await client.organization.getOrCreate(organizationKey("alpha"), {
+      createWithInput: "alpha",
+    });
+
+    const result = await ws.starSandboxAgentRepo({ organizationId: "alpha" });
+
+    expect(calls).toEqual(["rivet-dev/sandbox-agent"]);
+    expect(result.repo).toBe("rivet-dev/sandbox-agent");
+    expect(typeof result.starredAt).toBe("number");
+  });
+});
diff --git a/foundry/packages/backend/test/repo-normalize.test.ts b/foundry/packages/backend/test/repo-normalize.test.ts
new file mode 100644
index 0000000..e391952
--- /dev/null
+++ b/foundry/packages/backend/test/repo-normalize.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, test } from "vitest";
+import { normalizeRemoteUrl, repoIdFromRemote } from "../src/services/repo.js";
+
+describe("normalizeRemoteUrl", () => {
+  test("accepts GitHub shorthand owner/repo", () => {
+    expect(normalizeRemoteUrl("rivet-dev/sandbox-agent")).toBe("https://github.com/rivet-dev/sandbox-agent.git");
+  });
+
+  test("accepts github.com/owner/repo without scheme", () => {
+    expect(normalizeRemoteUrl("github.com/rivet-dev/sandbox-agent")).toBe("https://github.com/rivet-dev/sandbox-agent.git");
+  });
+
+  test("canonicalizes GitHub repo URLs without .git", () => {
+    expect(normalizeRemoteUrl("https://github.com/rivet-dev/sandbox-agent")).toBe("https://github.com/rivet-dev/sandbox-agent.git");
+  });
+
+  test("canonicalizes GitHub non-clone URLs (e.g. /tree/main)", () => {
+    expect(normalizeRemoteUrl("https://github.com/rivet-dev/sandbox-agent/tree/main")).toBe("https://github.com/rivet-dev/sandbox-agent.git");
+  });
+
+  test("does not rewrite scp-style ssh remotes", () => {
+    expect(normalizeRemoteUrl("git@github.com:rivet-dev/sandbox-agent.git")).toBe("git@github.com:rivet-dev/sandbox-agent.git");
+  });
+});
+
+describe("repoIdFromRemote", () => {
+  test("repoId is stable across equivalent GitHub inputs", () => {
+    const a = repoIdFromRemote("rivet-dev/sandbox-agent");
+    const b = repoIdFromRemote("https://github.com/rivet-dev/sandbox-agent.git");
+    const c = repoIdFromRemote("https://github.com/rivet-dev/sandbox-agent/tree/main");
+    expect(a).toBe(b);
+    expect(b).toBe(c);
+  });
+});
diff --git a/foundry/packages/backend/test/sandbox-config.test.ts b/foundry/packages/backend/test/sandbox-config.test.ts
new file mode 100644
index 0000000..354f794
--- /dev/null
+++ b/foundry/packages/backend/test/sandbox-config.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from "vitest";
+import { ConfigSchema, type AppConfig } from "@sandbox-agent/foundry-shared";
+import { availableSandboxProviderIds, defaultSandboxProviderId, resolveSandboxProviderId } from "../src/sandbox-config.js";
+
+function makeConfig(overrides?: Partial<AppConfig>): AppConfig {
+  return ConfigSchema.parse({
+    auto_submit: true,
+    notify: ["terminal"],
+    organization: { default: "default" },
+    backend: {
+      host: "127.0.0.1",
+      port: 7741,
+      dbPath: "~/.local/share/foundry/task.db",
+      opencode_poll_interval: 2,
+      github_poll_interval: 30,
+      backup_interval_secs: 3600,
+      backup_retention_days: 7,
+    },
+    sandboxProviders: {
+      local: {},
+      e2b: {},
+    },
+    ...overrides,
+  });
+}
+
+describe("sandbox config", () => {
+  it("defaults to local when e2b is not configured", () => {
+    const config = makeConfig();
+    expect(defaultSandboxProviderId(config)).toBe("local");
+    expect(availableSandboxProviderIds(config)).toEqual(["local"]);
+  });
+
+  it("prefers e2b when an api key is configured", () => {
+    const config = makeConfig({
+      sandboxProviders: {
+        local: {},
+        e2b: { apiKey: "test-token" },
+      },
+    });
+    expect(defaultSandboxProviderId(config)).toBe("e2b");
+    expect(availableSandboxProviderIds(config)).toEqual(["e2b", "local"]);
+    expect(resolveSandboxProviderId(config, "e2b")).toBe("e2b");
+  });
+
+  it("rejects selecting e2b without an api key", () => {
+    const config = makeConfig();
+    expect(() => resolveSandboxProviderId(config, "e2b")).toThrow("E2B provider is not configured");
+  });
+});
diff --git a/foundry/packages/backend/test/setup.ts b/foundry/packages/backend/test/setup.ts
new file mode 100644
index 0000000..cfb7223
--- /dev/null
+++ b/foundry/packages/backend/test/setup.ts
@@ -0,0 +1,9 @@
+// Suppress RivetKit traces driver flush errors that occur during test cleanup.
+// These happen when the traces driver tries to write after actor state is unloaded.
+process.on("unhandledRejection", (reason) => {
+  if (reason instanceof Error && reason.message.includes("state not loaded")) {
+    return;
+  }
+  // Re-throw non-suppressed rejections
+  throw reason;
+});
diff --git a/foundry/packages/backend/test/workspace-unread.test.ts b/foundry/packages/backend/test/workspace-unread.test.ts
new file mode 100644
index 0000000..5f7221a
--- /dev/null
+++ b/foundry/packages/backend/test/workspace-unread.test.ts
@@ -0,0 +1,86 @@
+import { describe, expect, it } from "vitest";
+import { requireSendableSessionMeta, shouldMarkSessionUnreadForStatus, shouldRecreateSessionForModelChange } from "../src/actors/task/workspace.js";
+
+describe("workspace unread status transitions", () => {
+  it("marks unread when a running session first becomes idle", () => {
+    expect(shouldMarkSessionUnreadForStatus({ thinkingSinceMs: Date.now() - 1_000 }, "idle")).toBe(true);
+  });
+
+  it("does not re-mark unread on repeated idle polls after thinking has cleared", () => {
+    expect(shouldMarkSessionUnreadForStatus({ thinkingSinceMs: null }, "idle")).toBe(false);
+  });
+
+  it("does not mark unread while the session is still running", () => {
+    expect(shouldMarkSessionUnreadForStatus({ thinkingSinceMs: Date.now() - 1_000 }, "running")).toBe(false);
+  });
+});
+
+describe("workspace model changes", () => {
+  it("recreates an unused ready session so the selected model takes effect", () => {
+    expect(
+      shouldRecreateSessionForModelChange({
+        status: "ready",
+        sandboxSessionId: "session-1",
+        created: false,
+        transcript: [],
+      }),
+    ).toBe(true);
+  });
+
+  it("does not recreate a session once the conversation has started", () => {
+    expect(
+      shouldRecreateSessionForModelChange({
+        status: "ready",
+        sandboxSessionId: "session-1",
+        created: true,
+        transcript: [],
+      }),
+    ).toBe(false);
+  });
+
+  it("does not recreate pending or anonymous sessions", () => {
+    expect(
+      shouldRecreateSessionForModelChange({
+        status: "pending_session_create",
+        sandboxSessionId: "session-1",
+        created: false,
+        transcript: [],
+      }),
+    ).toBe(false);
+    expect(
+      shouldRecreateSessionForModelChange({
+        status: "ready",
+        sandboxSessionId: null,
+        created: false,
+        transcript: [],
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("workspace send readiness", () => {
+  it("rejects unknown sessions", () => {
+    expect(() => requireSendableSessionMeta(null, "session-1")).toThrow("Unknown workspace session: session-1");
+  });
+
+  it("rejects pending sessions", () => {
+    expect(() =>
+      requireSendableSessionMeta(
+        {
+          status: "pending_session_create",
+          sandboxSessionId: null,
+        },
+        "session-2",
+      ),
+    ).toThrow("Session is not ready (status: pending_session_create). Wait for session provisioning to complete.");
+  });
+
+  it("accepts ready sessions with a sandbox session id", () => {
+    const meta = {
+      status: "ready",
+      sandboxSessionId: "session-1",
+    };
+
+    expect(requireSendableSessionMeta(meta, "session-3")).toBe(meta);
+  });
+});
diff --git a/foundry/packages/backend/tsconfig.json b/foundry/packages/backend/tsconfig.json
new file mode 100644
index 0000000..6a579df
--- /dev/null
+++ b/foundry/packages/backend/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "strict": false,
+    "declaration": false
+  },
+  "include": ["src", "test"]
+}
diff --git a/foundry/packages/backend/vitest.config.ts b/foundry/packages/backend/vitest.config.ts
new file mode 100644
index 0000000..2cc7491
--- /dev/null
+++ b/foundry/packages/backend/vitest.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    fileParallelism: false,
+    testTimeout: 15_000,
+    hookTimeout: 20_000,
+    setupFiles: ["./test/setup.ts"],
+  },
+});
diff --git a/foundry/packages/cli/package.json b/foundry/packages/cli/package.json
new file mode 100644
index 0000000..de75c1f
--- /dev/null
+++ b/foundry/packages/cli/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@sandbox-agent/foundry-cli",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "bin": {
+    "hf": "dist/index.js"
+  },
+  "scripts": {
+    "build": "tsup --config tsup.config.ts",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "@opentui/core": "^0.1.77",
+    "@sandbox-agent/foundry-client": "workspace:*",
+    "@sandbox-agent/foundry-shared": "workspace:*",
+    "zod": "^4.1.5"
+  },
+  "devDependencies": {
+    "tsup": "^8.5.0"
+  }
+}
diff --git a/foundry/packages/cli/src/backend/manager.ts b/foundry/packages/cli/src/backend/manager.ts
new file mode 100644
index 0000000..c120d47
--- /dev/null
+++ b/foundry/packages/cli/src/backend/manager.ts
@@ -0,0 +1,438 @@
+import * as childProcess from "node:child_process";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { checkBackendHealth } from "@sandbox-agent/foundry-client";
+import type { AppConfig } from "@sandbox-agent/foundry-shared";
+import { CLI_BUILD_ID } from "../build-id.js";
+import { logger } from "../logging.js";
+
+const HEALTH_TIMEOUT_MS = 1_500;
+const START_TIMEOUT_MS = 30_000;
+const STOP_TIMEOUT_MS = 5_000;
+const POLL_INTERVAL_MS = 150;
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
+}
+
+function sanitizeHost(host: string): string {
+  return host
+    .split("")
+    .map((ch) => (/[a-zA-Z0-9]/.test(ch) ? ch : "-"))
+    .join("");
+}
+
+function backendStateDir(): string {
+  const override = process.env.HF_BACKEND_STATE_DIR?.trim();
+  if (override) {
+    return override;
+  }
+
+  const xdgDataHome = process.env.XDG_DATA_HOME?.trim();
+  if (xdgDataHome) {
+    return join(xdgDataHome, "foundry", "backend");
+  }
+
+  return join(homedir(), ".local", "share", "foundry", "backend");
+}
+
+function backendPidPath(host: string, port: number): string {
+  return join(backendStateDir(), `backend-${sanitizeHost(host)}-${port}.pid`);
+}
+
+function backendVersionPath(host: string, port: number): string {
+  return join(backendStateDir(), `backend-${sanitizeHost(host)}-${port}.version`);
+}
+
+function backendLogPath(host: string, port: number): string {
+  return join(backendStateDir(), `backend-${sanitizeHost(host)}-${port}.log`);
+}
+
+function readText(path: string): string | null {
+  try {
+    return readFileSync(path, "utf8").trim();
+  } catch {
+    return null;
+  }
+}
+
+function readPid(host: string, port: number): number | null {
+  const raw = readText(backendPidPath(host, port));
+  if (!raw) {
+    return null;
+  }
+
+  const pid = Number.parseInt(raw, 10);
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return null;
+  }
+  return pid;
+}
+
+function writePid(host: string, port: number, pid: number): void {
+  const path = backendPidPath(host, port);
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, String(pid), "utf8");
+}
+
+function removePid(host: string, port: number): void {
+  const path = backendPidPath(host, port);
+  if (existsSync(path)) {
+    rmSync(path);
+  }
+}
+
+function readBackendVersion(host: string, port: number): string | null {
+  return readText(backendVersionPath(host, port));
+}
+
+function writeBackendVersion(host: string, port: number, buildId: string): void {
+  const path = backendVersionPath(host, port);
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, buildId, "utf8");
+}
+
+function removeBackendVersion(host: string, port: number): void {
+  const path = backendVersionPath(host, port);
+  if (existsSync(path)) {
+    rmSync(path);
+  }
+}
+
+function readCliBuildId(): string {
+  const override = process.env.HF_BUILD_ID?.trim();
+  if (override) {
+    return override;
+  }
+
+  return CLI_BUILD_ID;
+}
+
+function isVersionCurrent(host: string, port: number): boolean {
+  return readBackendVersion(host, port) === readCliBuildId();
+}
+
+function isProcessRunning(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException | undefined)?.code === "EPERM") {
+      return true;
+    }
+    return false;
+  }
+}
+
+function removeStateFiles(host: string, port: number): void {
+  removePid(host, port);
+  removeBackendVersion(host, port);
+}
+
+async function checkHealth(host: string, port: number): Promise<boolean> {
+  return await checkBackendHealth({
+    endpoint: `http://${host}:${port}/v1/rivet`,
+    timeoutMs: HEALTH_TIMEOUT_MS,
+  });
+}
+
+async function waitForHealth(host: string, port: number, timeoutMs: number, pid?: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+
+  while (Date.now() < deadline) {
+    if (pid && !isProcessRunning(pid)) {
+      throw new Error(`backend process ${pid} exited before becoming healthy`);
+    }
+
+    if (await checkHealth(host, port)) {
+      return;
+    }
+
+    await sleep(POLL_INTERVAL_MS);
+  }
+
+  throw new Error(`backend did not become healthy within ${timeoutMs}ms`);
+}
+
+async function waitForChildPid(child: childProcess.ChildProcess): Promise<number | null> {
+  if (child.pid && child.pid > 0) {
+    return child.pid;
+  }
+
+  for (let i = 0; i < 20; i += 1) {
+    await sleep(50);
+    if (child.pid && child.pid > 0) {
+      return child.pid;
+    }
+  }
+
+  return null;
+}
+
+interface LaunchSpec {
+  command: string;
+  args: string[];
+  cwd: string;
+}
+
+function resolveBunCommand(): string {
+  const override = process.env.HF_BUN?.trim();
+  if (override && (override === "bun" || existsSync(override))) {
+    return override;
+  }
+
+  const homeBun = join(homedir(), ".bun", "bin", "bun");
+  if (existsSync(homeBun)) {
+    return homeBun;
+  }
+
+  return "bun";
+}
+
+function resolveLaunchSpec(host: string, port: number): LaunchSpec {
+  const repoRoot = resolve(fileURLToPath(new URL("../../..", import.meta.url)));
+  const backendEntry = resolve(fileURLToPath(new URL("../../backend/dist/index.js", import.meta.url)));
+
+  if (existsSync(backendEntry)) {
+    return {
+      command: resolveBunCommand(),
+      args: [backendEntry, "start", "--host", host, "--port", String(port)],
+      cwd: repoRoot,
+    };
+  }
+
+  return {
+    command: "pnpm",
+    args: ["--filter", "@sandbox-agent/foundry-backend", "exec", "bun", "src/index.ts", "start", "--host", host, "--port", String(port)],
+    cwd: repoRoot,
+  };
+}
+
+async function startBackend(host: string, port: number): Promise<void> {
+  if (await checkHealth(host, port)) {
+    return;
+  }
+
+  const existingPid = readPid(host, port);
+  if (existingPid && isProcessRunning(existingPid)) {
+    await waitForHealth(host, port, START_TIMEOUT_MS, existingPid);
+    return;
+  }
+
+  if (existingPid) {
+    removeStateFiles(host, port);
+  }
+
+  const logPath = backendLogPath(host, port);
+  mkdirSync(dirname(logPath), { recursive: true });
+  const fd = openSync(logPath, "a");
+
+  const launch = resolveLaunchSpec(host, port);
+  const child = childProcess.spawn(launch.command, launch.args, {
+    cwd: launch.cwd,
+    detached: true,
+    stdio: ["ignore", fd, fd],
+    env: process.env,
+  });
+
+  child.on("error", (error) => {
+    logger.error(
+      {
+        host,
+        port,
+        command: launch.command,
+        args: launch.args,
+        errorMessage: error instanceof Error ? error.message : String(error),
+        errorStack: error instanceof Error ? error.stack : undefined,
+      },
+      "failed_to_launch_backend",
+    );
+  });
+
+  child.unref();
+  closeSync(fd);
+
+  const pid = await waitForChildPid(child);
+
+  writeBackendVersion(host, port, readCliBuildId());
+  if (pid) {
+    writePid(host, port, pid);
+  }
+
+  try {
+    await waitForHealth(host, port, START_TIMEOUT_MS, pid ?? undefined);
+  } catch (error) {
+    if (pid) {
+      removeStateFiles(host, port);
+    } else {
+      removeBackendVersion(host, port);
+    }
+    throw error;
+  }
+}
+
+function trySignal(pid: number, signal: NodeJS.Signals): boolean {
+  try {
+    process.kill(pid, signal);
+    return true;
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException | undefined)?.code === "ESRCH") {
+      return false;
+    }
+    throw error;
+  }
+}
+
+function findProcessOnPort(port: number): number | null {
+  try {
+    const out = childProcess
+      .execFileSync("lsof", ["-i", `:${port}`, "-t", "-sTCP:LISTEN"], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+      })
+      .trim();
+
+    const pidRaw = out.split("\n")[0]?.trim();
+    if (!pidRaw) {
+      return null;
+    }
+
+    const pid = Number.parseInt(pidRaw, 10);
+    if (!Number.isInteger(pid) || pid <= 0) {
+      return null;
+    }
+
+    return pid;
+  } catch {
+    return null;
+  }
+}
+
+export async function stopBackend(host: string, port: number): Promise<void> {
+  let pid = readPid(host, port);
+
+  if (!pid) {
+    if (!(await checkHealth(host, port))) {
+      removeStateFiles(host, port);
+      return;
+    }
+
+    pid = findProcessOnPort(port);
+    if (!pid) {
+      throw new Error(`backend is healthy at ${host}:${port} but no PID could be resolved`);
+    }
+  }
+
+  if (!isProcessRunning(pid)) {
+    removeStateFiles(host, port);
+    return;
+  }
+
+  trySignal(pid, "SIGTERM");
+
+  const deadline = Date.now() + STOP_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    if (!isProcessRunning(pid)) {
+      removeStateFiles(host, port);
+      return;
+    }
+    await sleep(100);
+  }
+
+  trySignal(pid, "SIGKILL");
+  removeStateFiles(host, port);
+}
+
+export interface BackendStatus {
+  running: boolean;
+  pid: number | null;
+  version: string | null;
+  versionCurrent: boolean;
+  logPath: string;
+}
+
+export async function getBackendStatus(host: string, port: number): Promise<BackendStatus> {
+  const logPath = backendLogPath(host, port);
+  const pid = readPid(host, port);
+
+  if (pid) {
+    if (isProcessRunning(pid)) {
+      return {
+        running: true,
+        pid,
+        version: readBackendVersion(host, port),
+        versionCurrent: isVersionCurrent(host, port),
+        logPath,
+      };
+    }
+    removeStateFiles(host, port);
+  }
+
+  if (await checkHealth(host, port)) {
+    return {
+      running: true,
+      pid: null,
+      version: readBackendVersion(host, port),
+      versionCurrent: isVersionCurrent(host, port),
+      logPath,
+    };
+  }
+
+  return {
+    running: false,
+    pid: null,
+    version: readBackendVersion(host, port),
+    versionCurrent: false,
+    logPath,
+  };
+}
+
+export async function ensureBackendRunning(config: AppConfig): Promise<void> {
+  const host = config.backend.host;
+  const port = config.backend.port;
+
+  if (await checkHealth(host, port)) {
+    if (!isVersionCurrent(host, port)) {
+      await stopBackend(host, port);
+      await startBackend(host, port);
+    }
+    return;
+  }
+
+  const pid = readPid(host, port);
+  if (pid && isProcessRunning(pid)) {
+    try {
+      await waitForHealth(host, port, START_TIMEOUT_MS, pid);
+      if (!isVersionCurrent(host, port)) {
+        await stopBackend(host, port);
+        await startBackend(host, port);
+      }
+      return;
+    } catch {
+      await stopBackend(host, port);
+      await startBackend(host, port);
+      return;
+    }
+  }
+
+  if (pid) {
+    removeStateFiles(host, port);
+  }
+
+  await startBackend(host, port);
+}
+
+export function parseBackendPort(value: string | undefined, fallback: number): number {
+  if (!value) {
+    return fallback;
+  }
+
+  const port = Number(value);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+    throw new Error(`Invalid backend port: ${value}`);
+  }
+
+  return port;
+}
diff --git a/foundry/packages/cli/src/build-id.ts b/foundry/packages/cli/src/build-id.ts
new file mode 100644
index 0000000..c8f02a2
--- /dev/null
+++ b/foundry/packages/cli/src/build-id.ts
@@ -0,0 +1,3 @@
+declare const __HF_BUILD_ID__: string | undefined;
+
+export const CLI_BUILD_ID = typeof __HF_BUILD_ID__ === "string" && __HF_BUILD_ID__.trim().length > 0 ? __HF_BUILD_ID__.trim() : "dev";
diff --git a/foundry/packages/cli/src/index.ts b/foundry/packages/cli/src/index.ts
new file mode 100644
index 0000000..fdf5a19
--- /dev/null
+++ b/foundry/packages/cli/src/index.ts
@@ -0,0 +1,823 @@
+#!/usr/bin/env bun
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { AgentTypeSchema, CreateTaskInputSchema, type TaskRecord } from "@sandbox-agent/foundry-shared";
+import { readBackendMetadata, createBackendClientFromConfig, formatRelativeAge, groupTaskStatus, summarizeTasks } from "@sandbox-agent/foundry-client";
+import { ensureBackendRunning, getBackendStatus, parseBackendPort, stopBackend } from "./backend/manager.js";
+import { writeStderr, writeStdout } from "./io.js";
+import { openEditorForTask } from "./task-editor.js";
+import { spawnCreateTmuxWindow } from "./tmux.js";
+import { loadConfig, resolveOrganization, saveConfig } from "./organization/config.js";
+
+async function ensureBunRuntime(): Promise<void> {
+  if (typeof (globalThis as { Bun?: unknown }).Bun !== "undefined") {
+    return;
+  }
+
+  const preferred = process.env.HF_BUN?.trim();
+  const candidates = [preferred, `${homedir()}/.bun/bin/bun`, "bun"].filter((item): item is string => Boolean(item && item.length > 0));
+
+  for (const candidate of candidates) {
+    const command = candidate;
+    const canExec = command === "bun" || existsSync(command);
+    if (!canExec) {
+      continue;
+    }
+
+    const child = spawnSync(command, [process.argv[1] ?? "", ...process.argv.slice(2)], {
+      stdio: "inherit",
+      env: process.env,
+    });
+
+    if (child.error) {
+      continue;
+    }
+
+    const code = child.status ?? 1;
+    process.exit(code);
+  }
+
+  throw new Error("hf requires Bun runtime. Set HF_BUN or install Bun at ~/.bun/bin/bun.");
+}
+
+async function runTuiCommand(config: ReturnType<typeof loadConfig>, organizationId: string): Promise<void> {
+  const mod = await import("./tui.js");
+  await mod.runTui(config, organizationId);
+}
+
+function readOption(args: string[], flag: string): string | undefined {
+  const idx = args.indexOf(flag);
+  if (idx < 0) return undefined;
+  return args[idx + 1];
+}
+
+function hasFlag(args: string[], flag: string): boolean {
+  return args.includes(flag);
+}
+
+function parseIntOption(value: string | undefined, fallback: number, label: string): number {
+  if (!value) {
+    return fallback;
+  }
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isInteger(parsed) || parsed <= 0) {
+    throw new Error(`Invalid ${label}: ${value}`);
+  }
+  return parsed;
+}
+
+function positionals(args: string[]): string[] {
+  const out: string[] = [];
+  for (let i = 0; i < args.length; i += 1) {
+    const item = args[i];
+    if (!item) {
+      continue;
+    }
+
+    if (item.startsWith("--")) {
+      const next = args[i + 1];
+      if (next && !next.startsWith("--")) {
+        i += 1;
+      }
+      continue;
+    }
+    out.push(item);
+  }
+  return out;
+}
+
+function normalizeRepoSelector(value: string): string {
+  let normalized = value.trim();
+  if (!normalized) {
+    return "";
+  }
+
+  normalized = normalized.replace(/\/+$/, "");
+  if (/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(normalized)) {
+    return `https://github.com/${normalized}.git`;
+  }
+
+  if (/^(?:www\.)?github\.com\/.+/i.test(normalized)) {
+    normalized = `https://${normalized.replace(/^www\./i, "")}`;
+  }
+
+  try {
+    if (/^https?:\/\//i.test(normalized)) {
+      const url = new URL(normalized);
+      const hostname = url.hostname.replace(/^www\./i, "");
+      if (hostname.toLowerCase() === "github.com") {
+        const parts = url.pathname.split("/").filter(Boolean);
+        if (parts.length >= 2) {
+          return `${url.protocol}//${hostname}/${parts[0]}/${(parts[1] ?? "").replace(/\.git$/i, "")}.git`;
+        }
+      }
+      url.search = "";
+      url.hash = "";
+      return url.toString().replace(/\/+$/, "");
+    }
+  } catch {
+    // Keep the selector as-is for matching below.
+  }
+
+  return normalized;
+}
+
+function githubRepoFullNameFromSelector(value: string): string | null {
+  const normalized = normalizeRepoSelector(value);
+  try {
+    const url = new URL(normalized);
+    if (url.hostname.replace(/^www\./i, "").toLowerCase() !== "github.com") {
+      return null;
+    }
+    const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+    if (parts.length < 2) {
+      return null;
+    }
+    return `${parts[0]}/${(parts[1] ?? "").replace(/\.git$/i, "")}`;
+  } catch {
+    return null;
+  }
+}
+
+async function resolveImportedRepo(
+  client: ReturnType<typeof createBackendClientFromConfig>,
+  organizationId: string,
+  repoSelector: string,
+): Promise<Awaited<ReturnType<typeof client.listRepos>>[number]> {
+  const selector = repoSelector.trim();
+  if (!selector) {
+    throw new Error("Missing required --repo <repo-id|git-remote|owner/repo>");
+  }
+
+  const normalizedSelector = normalizeRepoSelector(selector);
+  const selectorFullName = githubRepoFullNameFromSelector(selector);
+  const repos = await client.listRepos(organizationId);
+  const match = repos.find((repo) => {
+    if (repo.repoId === selector) {
+      return true;
+    }
+    if (normalizeRepoSelector(repo.remoteUrl) === normalizedSelector) {
+      return true;
+    }
+    const repoFullName = githubRepoFullNameFromSelector(repo.remoteUrl);
+    return Boolean(selectorFullName && repoFullName && repoFullName === selectorFullName);
+  });
+
+  if (!match) {
+    throw new Error(
+      `Repo not available in organization ${organizationId}: ${repoSelector}. Create it in GitHub first, then sync repos in Foundry before running hf create.`,
+    );
+  }
+
+  return match;
+}
+
+function printUsage(): void {
+  writeStdout(`
+Usage:
+  hf backend start [--host HOST] [--port PORT]
+  hf backend stop [--host HOST] [--port PORT]
+  hf backend status
+  hf backend inspect
+  hf status [--organization ORG] [--json]
+  hf history [--organization ORG] [--limit N] [--branch NAME] [--task ID] [--json]
+  hf organization use <name>
+  hf tui [--organization ORG]
+
+  hf create [task] [--organization ORG] --repo <repo-id|git-remote|owner/repo> [--name NAME|--branch NAME] [--title TITLE] [--agent claude|codex] [--on BRANCH]
+  hf list [--organization ORG] [--format table|json] [--full]
+  hf switch [task-id | -] [--organization ORG]
+  hf attach <task-id> [--organization ORG]
+  hf merge <task-id> [--organization ORG]
+  hf archive <task-id> [--organization ORG]
+  hf push <task-id> [--organization ORG]
+  hf sync <task-id> [--organization ORG]
+  hf kill <task-id> [--organization ORG] [--delete-branch] [--abandon]
+  hf prune [--organization ORG] [--dry-run] [--yes]
+  hf statusline [--organization ORG] [--format table|claude-code]
+  hf db path
+  hf db nuke
+
+Tips:
+  hf status --help    Show status output format and examples
+  hf history --help   Show history output format and examples
+  hf switch -         Switch to most recently updated task
+`);
+}
+
+function printStatusUsage(): void {
+  writeStdout(`
+Usage:
+  hf status [--organization ORG] [--json]
+
+Text Output:
+  organization=<organization-id>
+  backend running=<true|false> pid=<pid|unknown> version=<version|unknown>
+  tasks total=<number>
+  status queued=<n> running=<n> idle=<n> archived=<n> killed=<n> error=<n>
+  sandboxProviders <provider-id>=<count> ...
+  sandboxProviders -
+
+JSON Output:
+  {
+    "organizationId": "default",
+    "backend": { ...backend status object... },
+    "tasks": {
+      "total": 4,
+      "byStatus": { "queued": 0, "running": 1, "idle": 2, "archived": 1, "killed": 0, "error": 0 },
+      "byProvider": { "local": 4 }
+    }
+  }
+`);
+}
+
+function printHistoryUsage(): void {
+  writeStdout(`
+Usage:
+  hf history [--organization ORG] [--limit N] [--branch NAME] [--task ID] [--json]
+
+Text Output:
+  <iso8601>\t<event-kind>\t<branch|task|repo|->\t<payload-json>
+  <iso8601>\t<event-kind>\t<branch|task|repo|->\t<payload-json...>
+  no events
+
+Notes:
+  - payload is truncated to 120 characters in text mode.
+  - --limit defaults to 20.
+
+JSON Output:
+  [
+    {
+      "id": "...",
+      "organizationId": "default",
+      "kind": "task.created",
+      "taskId": "...",
+      "repoId": "...",
+      "branchName": "feature/foo",
+      "payloadJson": "{\\"sandboxProviderId\\":\\"local\\"}",
+      "createdAt": 1770607522229
+    }
+  ]
+`);
+}
+
+async function listDetailedTasks(client: ReturnType<typeof createBackendClientFromConfig>, organizationId: string): Promise<TaskRecord[]> {
+  const rows = await client.listTasks(organizationId);
+  return await Promise.all(rows.map(async (row) => await client.getTask(organizationId, row.taskId)));
+}
+
+async function handleBackend(args: string[]): Promise<void> {
+  const sub = args[0] ?? "start";
+  const config = loadConfig();
+  const host = readOption(args, "--host") ?? config.backend.host;
+  const port = parseBackendPort(readOption(args, "--port"), config.backend.port);
+  const backendConfig = {
+    ...config,
+    backend: {
+      ...config.backend,
+      host,
+      port,
+    },
+  };
+
+  if (sub === "start") {
+    await ensureBackendRunning(backendConfig);
+    const status = await getBackendStatus(host, port);
+    const pid = status.pid ?? "unknown";
+    const version = status.version ?? "unknown";
+    const stale = status.running && !status.versionCurrent ? " [outdated]" : "";
+    writeStdout(`running=true pid=${pid} version=${version}${stale} log=${status.logPath}`);
+    return;
+  }
+
+  if (sub === "stop") {
+    await stopBackend(host, port);
+    writeStdout(`running=false host=${host} port=${port}`);
+    return;
+  }
+
+  if (sub === "status") {
+    const status = await getBackendStatus(host, port);
+    const pid = status.pid ?? "unknown";
+    const version = status.version ?? "unknown";
+    const stale = status.running && !status.versionCurrent ? " [outdated]" : "";
+    writeStdout(`running=${status.running} pid=${pid} version=${version}${stale} host=${host} port=${port} log=${status.logPath}`);
+    return;
+  }
+
+  if (sub === "inspect") {
+    await ensureBackendRunning(backendConfig);
+    const metadata = await readBackendMetadata({
+      endpoint: `http://${host}:${port}/v1/rivet`,
+      timeoutMs: 4_000,
+    });
+    const managerEndpoint = metadata.clientEndpoint ?? `http://${host}:${port}`;
+    const inspectorUrl = `https://inspect.rivet.dev?u=${encodeURIComponent(managerEndpoint)}`;
+    const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
+    spawnSync(openCmd, [inspectorUrl], { stdio: "ignore" });
+    writeStdout(inspectorUrl);
+    return;
+  }
+
+  throw new Error(`Unknown backend subcommand: ${sub}`);
+}
+
+async function handleOrganization(args: string[]): Promise<void> {
+  const sub = args[0];
+  if (sub !== "use") {
+    throw new Error("Usage: hf organization use <name>");
+  }
+
+  const name = args[1];
+  if (!name) {
+    throw new Error("Missing organization name");
+  }
+
+  const config = loadConfig();
+  config.organization.default = name;
+  saveConfig(config);
+
+  const client = createBackendClientFromConfig(config);
+  try {
+    await client.useOrganization(name);
+  } catch {
+    // Backend may not be running yet. Config is already updated.
+  }
+
+  writeStdout(`organization=${name}`);
+}
+
+async function handleList(args: string[]): Promise<void> {
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const format = readOption(args, "--format") ?? "table";
+  const full = hasFlag(args, "--full");
+  const client = createBackendClientFromConfig(config);
+  const rows = await listDetailedTasks(client, organizationId);
+
+  if (format === "json") {
+    writeStdout(JSON.stringify(rows, null, 2));
+    return;
+  }
+
+  if (rows.length === 0) {
+    writeStdout("no tasks");
+    return;
+  }
+
+  for (const row of rows) {
+    const age = formatRelativeAge(row.updatedAt);
+    let line = `${row.taskId}\t${row.branchName}\t${row.status}\t${row.sandboxProviderId}\t${age}`;
+    if (full) {
+      const preview = row.task.length > 60 ? `${row.task.slice(0, 57)}...` : row.task;
+      line += `\t${row.title}\t${preview}\t${row.activeSessionId ?? "-"}\t${row.activeSandboxId ?? "-"}`;
+    }
+    writeStdout(line);
+  }
+}
+
+async function handlePush(args: string[]): Promise<void> {
+  const taskId = positionals(args)[0];
+  if (!taskId) {
+    throw new Error("Missing task id for push");
+  }
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const client = createBackendClientFromConfig(config);
+  await client.runAction(organizationId, taskId, "push");
+  writeStdout("ok");
+}
+
+async function handleSync(args: string[]): Promise<void> {
+  const taskId = positionals(args)[0];
+  if (!taskId) {
+    throw new Error("Missing task id for sync");
+  }
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const client = createBackendClientFromConfig(config);
+  await client.runAction(organizationId, taskId, "sync");
+  writeStdout("ok");
+}
+
+async function handleKill(args: string[]): Promise<void> {
+  const taskId = positionals(args)[0];
+  if (!taskId) {
+    throw new Error("Missing task id for kill");
+  }
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const deleteBranch = hasFlag(args, "--delete-branch");
+  const abandon = hasFlag(args, "--abandon");
+
+  if (deleteBranch) {
+    writeStdout("info: --delete-branch flag set, branch will be deleted after kill");
+  }
+  if (abandon) {
+    writeStdout("info: --abandon flag set, Graphite abandon will be attempted");
+  }
+
+  const client = createBackendClientFromConfig(config);
+  await client.runAction(organizationId, taskId, "kill");
+  writeStdout("ok");
+}
+
+async function handlePrune(args: string[]): Promise<void> {
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const dryRun = hasFlag(args, "--dry-run");
+  const yes = hasFlag(args, "--yes");
+  const client = createBackendClientFromConfig(config);
+  const rows = await listDetailedTasks(client, organizationId);
+  const prunable = rows.filter((r) => r.status === "archived" || r.status === "killed");
+
+  if (prunable.length === 0) {
+    writeStdout("nothing to prune");
+    return;
+  }
+
+  for (const row of prunable) {
+    const age = formatRelativeAge(row.updatedAt);
+    writeStdout(`${dryRun ? "[dry-run] " : ""}${row.taskId}\t${row.branchName}\t${row.status}\t${age}`);
+  }
+
+  if (dryRun) {
+    writeStdout(`\n${prunable.length} task(s) would be pruned`);
+    return;
+  }
+
+  if (!yes) {
+    writeStdout("\nnot yet implemented: auto-pruning requires confirmation");
+    return;
+  }
+
+  writeStdout(`\n${prunable.length} task(s) would be pruned (pruning not yet implemented)`);
+}
+
+async function handleStatusline(args: string[]): Promise<void> {
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const format = readOption(args, "--format") ?? "table";
+  const client = createBackendClientFromConfig(config);
+  const rows = await listDetailedTasks(client, organizationId);
+  const summary = summarizeTasks(rows);
+  const running = summary.byStatus.running;
+  const idle = summary.byStatus.idle;
+  const errorCount = summary.byStatus.error;
+
+  if (format === "claude-code") {
+    writeStdout(`hf:${running}R/${idle}I/${errorCount}E`);
+    return;
+  }
+
+  writeStdout(`running=${running} idle=${idle} error=${errorCount}`);
+}
+
+async function handleDb(args: string[]): Promise<void> {
+  const sub = args[0];
+  if (sub === "path") {
+    const config = loadConfig();
+    const dbPath = config.backend.dbPath.replace(/^~/, homedir());
+    writeStdout(dbPath);
+    return;
+  }
+
+  if (sub === "nuke") {
+    writeStdout("WARNING: hf db nuke would delete the entire database. This is a placeholder and does not delete anything.");
+    return;
+  }
+
+  throw new Error("Usage: hf db path | hf db nuke");
+}
+
+async function waitForTaskReady(
+  client: ReturnType<typeof createBackendClientFromConfig>,
+  organizationId: string,
+  taskId: string,
+  timeoutMs: number,
+): Promise<TaskRecord> {
+  const start = Date.now();
+  let delayMs = 250;
+
+  for (;;) {
+    const record = await client.getTask(organizationId, taskId);
+    const hasName = Boolean(record.branchName && record.title);
+    const hasSandbox = Boolean(record.activeSandboxId);
+
+    if (record.status === "error") {
+      throw new Error(`task entered error state while provisioning: ${taskId}`);
+    }
+    if (hasName && hasSandbox) {
+      return record;
+    }
+
+    if (Date.now() - start > timeoutMs) {
+      throw new Error(`timed out waiting for task provisioning: ${taskId}`);
+    }
+
+    await new Promise((r) => setTimeout(r, delayMs));
+    delayMs = Math.min(Math.round(delayMs * 1.5), 2_000);
+  }
+}
+
+async function handleCreate(args: string[]): Promise<void> {
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+
+  const repoSelector = readOption(args, "--repo");
+  if (!repoSelector) {
+    throw new Error("Missing required --repo <repo-id|git-remote|owner/repo>");
+  }
+  const explicitBranchName = readOption(args, "--name") ?? readOption(args, "--branch");
+  const explicitTitle = readOption(args, "--title");
+
+  const agentRaw = readOption(args, "--agent");
+  const agentType = agentRaw ? AgentTypeSchema.parse(agentRaw) : undefined;
+  const onBranch = readOption(args, "--on");
+
+  const taskFromArgs = positionals(args).join(" ").trim();
+  const taskPrompt = taskFromArgs || openEditorForTask();
+
+  const client = createBackendClientFromConfig(config);
+  const repo = await resolveImportedRepo(client, organizationId, repoSelector);
+
+  const payload = CreateTaskInputSchema.parse({
+    organizationId,
+    repoId: repo.repoId,
+    task: taskPrompt,
+    explicitTitle: explicitTitle || undefined,
+    explicitBranchName: explicitBranchName || undefined,
+    agentType,
+    onBranch,
+  });
+
+  const created = await client.createTask(payload);
+  const createdTask = await waitForTaskReady(client, organizationId, created.taskId, 180_000);
+  const switched = await client.switchTask(organizationId, createdTask.taskId);
+  const attached = await client.attachTask(organizationId, createdTask.taskId);
+
+  writeStdout(`Branch:   ${createdTask.branchName ?? "-"}`);
+  writeStdout(`Task:  ${createdTask.taskId}`);
+  writeStdout(`Provider: ${createdTask.sandboxProviderId}`);
+  writeStdout(`Session:  ${attached.sessionId ?? "none"}`);
+  writeStdout(`Target:   ${switched.switchTarget || attached.target}`);
+  writeStdout(`Title:    ${createdTask.title ?? "-"}`);
+
+  const tmuxResult = spawnCreateTmuxWindow({
+    branchName: createdTask.branchName ?? createdTask.taskId,
+    targetPath: switched.switchTarget || attached.target,
+    sessionId: attached.sessionId,
+  });
+
+  if (tmuxResult.created) {
+    writeStdout(`Window:   created (${createdTask.branchName})`);
+    return;
+  }
+
+  writeStdout("");
+  writeStdout(`Run: hf switch ${createdTask.taskId}`);
+  if ((switched.switchTarget || attached.target).startsWith("/")) {
+    writeStdout(`cd ${switched.switchTarget || attached.target}`);
+  }
+}
+
+async function handleTui(args: string[]): Promise<void> {
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  await runTuiCommand(config, organizationId);
+}
+
+async function handleStatus(args: string[]): Promise<void> {
+  if (hasFlag(args, "--help") || hasFlag(args, "-h")) {
+    printStatusUsage();
+    return;
+  }
+
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const client = createBackendClientFromConfig(config);
+  const backendStatus = await getBackendStatus(config.backend.host, config.backend.port);
+  const rows = await listDetailedTasks(client, organizationId);
+  const summary = summarizeTasks(rows);
+
+  if (hasFlag(args, "--json")) {
+    writeStdout(
+      JSON.stringify(
+        {
+          organizationId,
+          backend: backendStatus,
+          tasks: {
+            total: summary.total,
+            byStatus: summary.byStatus,
+            byProvider: summary.byProvider,
+          },
+        },
+        null,
+        2,
+      ),
+    );
+    return;
+  }
+
+  writeStdout(`organization=${organizationId}`);
+  writeStdout(`backend running=${backendStatus.running} pid=${backendStatus.pid ?? "unknown"} version=${backendStatus.version ?? "unknown"}`);
+  writeStdout(`tasks total=${summary.total}`);
+  writeStdout(
+    `status queued=${summary.byStatus.queued} running=${summary.byStatus.running} idle=${summary.byStatus.idle} archived=${summary.byStatus.archived} killed=${summary.byStatus.killed} error=${summary.byStatus.error}`,
+  );
+  const providerSummary = Object.entries(summary.byProvider)
+    .map(([provider, count]) => `${provider}=${count}`)
+    .join(" ");
+  writeStdout(`sandboxProviders ${providerSummary || "-"}`);
+}
+
+async function handleHistory(args: string[]): Promise<void> {
+  if (hasFlag(args, "--help") || hasFlag(args, "-h")) {
+    printHistoryUsage();
+    return;
+  }
+
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const limit = parseIntOption(readOption(args, "--limit"), 20, "limit");
+  const branch = readOption(args, "--branch");
+  const taskId = readOption(args, "--task");
+  const client = createBackendClientFromConfig(config);
+  const rows = await client.listHistory({
+    organizationId,
+    limit,
+    branch: branch || undefined,
+    taskId: taskId || undefined,
+  });
+
+  if (hasFlag(args, "--json")) {
+    writeStdout(JSON.stringify(rows, null, 2));
+    return;
+  }
+
+  if (rows.length === 0) {
+    writeStdout("no events");
+    return;
+  }
+
+  for (const row of rows) {
+    const ts = new Date(row.createdAt).toISOString();
+    const target = row.branchName || row.taskId || row.repoId || "-";
+    let payload = row.payloadJson;
+    if (payload.length > 120) {
+      payload = `${payload.slice(0, 117)}...`;
+    }
+    writeStdout(`${ts}\t${row.kind}\t${target}\t${payload}`);
+  }
+}
+
+async function handleSwitchLike(cmd: string, args: string[]): Promise<void> {
+  let taskId = positionals(args)[0];
+  if (!taskId && cmd === "switch") {
+    await handleTui(args);
+    return;
+  }
+
+  if (!taskId) {
+    throw new Error(`Missing task id for ${cmd}`);
+  }
+
+  const config = loadConfig();
+  const organizationId = resolveOrganization(readOption(args, "--organization"), config);
+  const client = createBackendClientFromConfig(config);
+
+  if (cmd === "switch" && taskId === "-") {
+    const rows = await listDetailedTasks(client, organizationId);
+    const active = rows.filter((r) => {
+      const group = groupTaskStatus(r.status);
+      return group === "running" || group === "idle" || group === "queued";
+    });
+    const sorted = active.sort((a, b) => b.updatedAt - a.updatedAt);
+    const target = sorted[0];
+    if (!target) {
+      throw new Error("No active tasks to switch to");
+    }
+    taskId = target.taskId;
+  }
+
+  if (cmd === "switch") {
+    const result = await client.switchTask(organizationId, taskId);
+    writeStdout(`cd ${result.switchTarget}`);
+    return;
+  }
+
+  if (cmd === "attach") {
+    const result = await client.attachTask(organizationId, taskId);
+    writeStdout(`target=${result.target} session=${result.sessionId ?? "none"}`);
+    return;
+  }
+
+  if (cmd === "merge" || cmd === "archive") {
+    await client.runAction(organizationId, taskId, cmd);
+    writeStdout("ok");
+    return;
+  }
+
+  throw new Error(`Unsupported action: ${cmd}`);
+}
+
+async function main(): Promise<void> {
+  await ensureBunRuntime();
+
+  const args = process.argv.slice(2);
+  const cmd = args[0];
+  const rest = args.slice(1);
+
+  if (cmd === "help" || cmd === "--help" || cmd === "-h") {
+    printUsage();
+    return;
+  }
+
+  if (cmd === "backend") {
+    await handleBackend(rest);
+    return;
+  }
+
+  const config = loadConfig();
+  await ensureBackendRunning(config);
+
+  if (!cmd || cmd.startsWith("--")) {
+    await handleTui(args);
+    return;
+  }
+
+  if (cmd === "organization") {
+    await handleOrganization(rest);
+    return;
+  }
+
+  if (cmd === "create") {
+    await handleCreate(rest);
+    return;
+  }
+
+  if (cmd === "list") {
+    await handleList(rest);
+    return;
+  }
+
+  if (cmd === "tui") {
+    await handleTui(rest);
+    return;
+  }
+
+  if (cmd === "status") {
+    await handleStatus(rest);
+    return;
+  }
+
+  if (cmd === "history") {
+    await handleHistory(rest);
+    return;
+  }
+
+  if (cmd === "push") {
+    await handlePush(rest);
+    return;
+  }
+
+  if (cmd === "sync") {
+    await handleSync(rest);
+    return;
+  }
+
+  if (cmd === "kill") {
+    await handleKill(rest);
+    return;
+  }
+
+  if (cmd === "prune") {
+    await handlePrune(rest);
+    return;
+  }
+
+  if (cmd === "statusline") {
+    await handleStatusline(rest);
+    return;
+  }
+
+  if (cmd === "db") {
+    await handleDb(rest);
+    return;
+  }
+
+  if (["switch", "attach", "merge", "archive"].includes(cmd)) {
+    await handleSwitchLike(cmd, rest);
+    return;
+  }
+
+  printUsage();
+  throw new Error(`Unknown command: ${cmd}`);
+}
+
+main().catch((err: unknown) => {
+  const msg = err instanceof Error ? (err.stack ?? err.message) : String(err);
+  writeStderr(msg);
+  process.exit(1);
+});
diff --git a/foundry/packages/cli/src/io.ts b/foundry/packages/cli/src/io.ts
new file mode 100644
index 0000000..b188206
--- /dev/null
+++ b/foundry/packages/cli/src/io.ts
@@ -0,0 +1,7 @@
+export function writeStdout(message = ""): void {
+  process.stdout.write(`${message}\n`);
+}
+
+export function writeStderr(message = ""): void {
+  process.stderr.write(`${message}\n`);
+}
diff --git a/foundry/packages/cli/src/logging.ts b/foundry/packages/cli/src/logging.ts
new file mode 100644
index 0000000..a7c5892
--- /dev/null
+++ b/foundry/packages/cli/src/logging.ts
@@ -0,0 +1,5 @@
+import { createFoundryLogger } from "@sandbox-agent/foundry-shared";
+
+export const logger = createFoundryLogger({
+  service: "foundry-cli",
+});
diff --git a/foundry/packages/cli/src/organization/config.ts b/foundry/packages/cli/src/organization/config.ts
new file mode 100644
index 0000000..cfaebfe
--- /dev/null
+++ b/foundry/packages/cli/src/organization/config.ts
@@ -0,0 +1,25 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+import { homedir } from "node:os";
+import * as toml from "@iarna/toml";
+import { ConfigSchema, resolveOrganizationId, type AppConfig } from "@sandbox-agent/foundry-shared";
+
+export const CONFIG_PATH = `${homedir()}/.config/foundry/config.toml`;
+
+export function loadConfig(path = CONFIG_PATH): AppConfig {
+  if (!existsSync(path)) {
+    return ConfigSchema.parse({});
+  }
+
+  const raw = readFileSync(path, "utf8");
+  return ConfigSchema.parse(toml.parse(raw));
+}
+
+export function saveConfig(config: AppConfig, path = CONFIG_PATH): void {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, toml.stringify(config), "utf8");
+}
+
+export function resolveOrganization(flagOrganization: string | undefined, config: AppConfig): string {
+  return resolveOrganizationId(flagOrganization, config);
+}
diff --git a/foundry/packages/cli/src/task-editor.ts b/foundry/packages/cli/src/task-editor.ts
new file mode 100644
index 0000000..502aa13
--- /dev/null
+++ b/foundry/packages/cli/src/task-editor.ts
@@ -0,0 +1,41 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { spawnSync } from "node:child_process";
+
+const DEFAULT_EDITOR_TEMPLATE = ["# Enter task task details below.", "# Lines starting with # are ignored.", ""].join("\n");
+
+export function sanitizeEditorTask(input: string): string {
+  return input
+    .split(/\r?\n/)
+    .filter((line) => !line.trim().startsWith("#"))
+    .join("\n")
+    .trim();
+}
+
+export function openEditorForTask(): string {
+  const editor = process.env.VISUAL?.trim() || process.env.EDITOR?.trim() || "vi";
+  const tempDir = mkdtempSync(join(tmpdir(), "hf-task-"));
+  const taskPath = join(tempDir, "task.md");
+
+  try {
+    writeFileSync(taskPath, DEFAULT_EDITOR_TEMPLATE, "utf8");
+    const result = spawnSync(editor, [taskPath], { stdio: "inherit" });
+
+    if (result.error) {
+      throw result.error;
+    }
+    if ((result.status ?? 1) !== 0) {
+      throw new Error(`Editor exited with status ${result.status ?? "unknown"}`);
+    }
+
+    const raw = readFileSync(taskPath, "utf8");
+    const task = sanitizeEditorTask(raw);
+    if (!task) {
+      throw new Error("Missing task task text");
+    }
+    return task;
+  } finally {
+    rmSync(tempDir, { recursive: true, force: true });
+  }
+}
diff --git a/foundry/packages/cli/src/theme.ts b/foundry/packages/cli/src/theme.ts
new file mode 100644
index 0000000..633c079
--- /dev/null
+++ b/foundry/packages/cli/src/theme.ts
@@ -0,0 +1,792 @@
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, join, resolve } from "node:path";
+import { cwd } from "node:process";
+import * as toml from "@iarna/toml";
+import type { AppConfig } from "@sandbox-agent/foundry-shared";
+import opencodeThemePackJson from "./themes/opencode-pack.json" with { type: "json" };
+
+export type ThemeMode = "dark" | "light";
+
+export interface TuiTheme {
+  background: string;
+  text: string;
+  muted: string;
+  header: string;
+  status: string;
+  highlightBg: string;
+  highlightFg: string;
+  selectionBorder: string;
+  success: string;
+  warning: string;
+  error: string;
+  info: string;
+  diffAdd: string;
+  diffDel: string;
+  diffSep: string;
+  agentRunning: string;
+  agentIdle: string;
+  agentNone: string;
+  agentError: string;
+  prUnpushed: string;
+  author: string;
+  ciRunning: string;
+  ciPass: string;
+  ciFail: string;
+  ciNone: string;
+  reviewApproved: string;
+  reviewChanges: string;
+  reviewPending: string;
+  reviewNone: string;
+}
+
+export interface TuiThemeResolution {
+  theme: TuiTheme;
+  name: string;
+  source: string;
+  mode: ThemeMode;
+}
+
+interface ThemeCandidate {
+  theme: TuiTheme;
+  name: string;
+}
+
+type JsonObject = Record<string, unknown>;
+
+type ConfigLike = AppConfig & { theme?: string };
+
+const DEFAULT_THEME: TuiTheme = {
+  background: "#282828",
+  text: "#ffffff",
+  muted: "#6b7280",
+  header: "#6b7280",
+  status: "#6b7280",
+  highlightBg: "#282828",
+  highlightFg: "#ffffff",
+  selectionBorder: "#d946ef",
+  success: "#22c55e",
+  warning: "#eab308",
+  error: "#ef4444",
+  info: "#22d3ee",
+  diffAdd: "#22c55e",
+  diffDel: "#ef4444",
+  diffSep: "#6b7280",
+  agentRunning: "#22c55e",
+  agentIdle: "#eab308",
+  agentNone: "#6b7280",
+  agentError: "#ef4444",
+  prUnpushed: "#eab308",
+  author: "#22d3ee",
+  ciRunning: "#eab308",
+  ciPass: "#22c55e",
+  ciFail: "#ef4444",
+  ciNone: "#6b7280",
+  reviewApproved: "#22c55e",
+  reviewChanges: "#ef4444",
+  reviewPending: "#eab308",
+  reviewNone: "#6b7280",
+};
+
+const OPENCODE_THEME_PACK = opencodeThemePackJson as Record<string, unknown>;
+
+export function resolveTuiTheme(config: AppConfig, baseDir = cwd()): TuiThemeResolution {
+  const mode = opencodeStateThemeMode() ?? "dark";
+  const configWithTheme = config as ConfigLike;
+  const override = typeof configWithTheme.theme === "string" ? configWithTheme.theme.trim() : "";
+
+  if (override) {
+    const candidate = loadFromSpec(override, [], mode, baseDir);
+    if (candidate) {
+      return {
+        theme: candidate.theme,
+        name: candidate.name,
+        source: "foundry config",
+        mode,
+      };
+    }
+  }
+
+  const fromConfig = loadOpencodeThemeFromConfig(mode, baseDir);
+  if (fromConfig) {
+    return fromConfig;
+  }
+
+  const fromState = loadOpencodeThemeFromState(mode, baseDir);
+  if (fromState) {
+    return fromState;
+  }
+
+  return {
+    theme: DEFAULT_THEME,
+    name: "opencode-default",
+    source: "default",
+    mode,
+  };
+}
+
+function loadOpencodeThemeFromConfig(mode: ThemeMode, baseDir: string): TuiThemeResolution | null {
+  for (const path of opencodeConfigPaths(baseDir)) {
+    if (!existsSync(path)) {
+      continue;
+    }
+
+    const value = readJsonWithComments(path);
+    if (!value) {
+      continue;
+    }
+
+    const themeValue = findOpencodeThemeValue(value);
+    if (themeValue === undefined) {
+      continue;
+    }
+
+    const candidate = themeFromOpencodeValue(themeValue, opencodeThemeDirs(dirname(path), baseDir), mode, baseDir);
+    if (!candidate) {
+      continue;
+    }
+
+    return {
+      theme: candidate.theme,
+      name: candidate.name,
+      source: `opencode config (${path})`,
+      mode,
+    };
+  }
+
+  return null;
+}
+
+function loadOpencodeThemeFromState(mode: ThemeMode, baseDir: string): TuiThemeResolution | null {
+  const path = opencodeStatePath();
+  if (!path || !existsSync(path)) {
+    return null;
+  }
+
+  const value = readJsonWithComments(path);
+  if (!isObject(value)) {
+    return null;
+  }
+
+  const spec = value.theme;
+  if (typeof spec !== "string" || !spec.trim()) {
+    return null;
+  }
+
+  const candidate = loadFromSpec(spec.trim(), opencodeThemeDirs(undefined, baseDir), mode, baseDir);
+  if (!candidate) {
+    return null;
+  }
+
+  return {
+    theme: candidate.theme,
+    name: candidate.name,
+    source: `opencode state (${path})`,
+    mode,
+  };
+}
+
+function loadFromSpec(spec: string, searchDirs: string[], mode: ThemeMode, baseDir: string): ThemeCandidate | null {
+  if (isDefaultThemeName(spec)) {
+    return {
+      theme: DEFAULT_THEME,
+      name: "opencode-default",
+    };
+  }
+
+  if (isPathLike(spec)) {
+    const resolved = resolvePath(spec, baseDir);
+    if (existsSync(resolved)) {
+      const candidate = loadThemeFromPath(resolved, mode);
+      if (candidate) {
+        return candidate;
+      }
+    }
+  }
+
+  for (const dir of searchDirs) {
+    for (const ext of ["json", "toml"]) {
+      const path = join(dir, `${spec}.${ext}`);
+      if (!existsSync(path)) {
+        continue;
+      }
+
+      const candidate = loadThemeFromPath(path, mode);
+      if (candidate) {
+        return candidate;
+      }
+    }
+  }
+
+  const builtIn = OPENCODE_THEME_PACK[spec];
+  if (builtIn !== undefined) {
+    const theme = themeFromOpencodeJson(builtIn, mode);
+    if (theme) {
+      return {
+        theme,
+        name: spec,
+      };
+    }
+  }
+
+  return null;
+}
+
+function loadThemeFromPath(path: string, mode: ThemeMode): ThemeCandidate | null {
+  const content = safeReadText(path);
+  if (!content) {
+    return null;
+  }
+
+  const lower = path.toLowerCase();
+  if (lower.endsWith(".toml")) {
+    try {
+      const parsed = toml.parse(content);
+      const theme = themeFromAny(parsed);
+      if (!theme) {
+        return null;
+      }
+      return {
+        theme,
+        name: themeNameFromPath(path),
+      };
+    } catch {
+      return null;
+    }
+  }
+
+  const value = parseJsonWithComments(content);
+  if (!value) {
+    return null;
+  }
+
+  const opencodeTheme = themeFromOpencodeJson(value, mode);
+  if (opencodeTheme) {
+    return {
+      theme: opencodeTheme,
+      name: themeNameFromPath(path),
+    };
+  }
+
+  const paletteTheme = themeFromAny(value);
+  if (!paletteTheme) {
+    return null;
+  }
+
+  return {
+    theme: paletteTheme,
+    name: themeNameFromPath(path),
+  };
+}
+
+function themeNameFromPath(path: string): string {
+  const base = path.split(/[\\/]/).pop() ?? path;
+  if (base.endsWith(".json") || base.endsWith(".toml")) {
+    return base.replace(/\.(json|toml)$/i, "");
+  }
+  return base;
+}
+
+function themeFromOpencodeValue(value: unknown, searchDirs: string[], mode: ThemeMode, baseDir: string): ThemeCandidate | null {
+  if (typeof value === "string") {
+    return loadFromSpec(value, searchDirs, mode, baseDir);
+  }
+
+  if (!isObject(value)) {
+    return null;
+  }
+
+  if (value.theme !== undefined) {
+    const theme = themeFromOpencodeJson(value, mode);
+    if (theme) {
+      return {
+        theme,
+        name: typeof value.name === "string" ? value.name : "inline",
+      };
+    }
+  }
+
+  const paletteTheme = themeFromAny(value.colors ?? value.palette ?? value);
+  if (paletteTheme) {
+    return {
+      theme: paletteTheme,
+      name: typeof value.name === "string" ? value.name : "inline",
+    };
+  }
+
+  if (typeof value.name === "string") {
+    const named = loadFromSpec(value.name, searchDirs, mode, baseDir);
+    if (named) {
+      return named;
+    }
+  }
+
+  const pathLike = value.path ?? value.file;
+  if (typeof pathLike === "string") {
+    const resolved = resolvePath(pathLike, baseDir);
+    const candidate = loadThemeFromPath(resolved, mode);
+    if (candidate) {
+      return candidate;
+    }
+  }
+
+  return null;
+}
+
+function themeFromOpencodeJson(value: unknown, mode: ThemeMode): TuiTheme | null {
+  if (!isObject(value)) {
+    return null;
+  }
+
+  const themeMap = value.theme;
+  if (!isObject(themeMap)) {
+    return null;
+  }
+
+  const defs = isObject(value.defs) ? value.defs : {};
+
+  const background =
+    opencodeColor(themeMap, defs, mode, "background") ??
+    opencodeColor(themeMap, defs, mode, "backgroundPanel") ??
+    opencodeColor(themeMap, defs, mode, "backgroundElement") ??
+    DEFAULT_THEME.background;
+
+  const text = opencodeColor(themeMap, defs, mode, "text") ?? DEFAULT_THEME.text;
+  const muted = opencodeColor(themeMap, defs, mode, "textMuted") ?? DEFAULT_THEME.muted;
+  const highlightBg = opencodeColor(themeMap, defs, mode, "text") ?? text;
+  const highlightFg =
+    opencodeColor(themeMap, defs, mode, "backgroundElement") ??
+    opencodeColor(themeMap, defs, mode, "backgroundPanel") ??
+    opencodeColor(themeMap, defs, mode, "background") ??
+    DEFAULT_THEME.highlightFg;
+
+  const selectionBorder =
+    opencodeColor(themeMap, defs, mode, "secondary") ??
+    opencodeColor(themeMap, defs, mode, "accent") ??
+    opencodeColor(themeMap, defs, mode, "primary") ??
+    DEFAULT_THEME.selectionBorder;
+
+  const success = opencodeColor(themeMap, defs, mode, "success") ?? DEFAULT_THEME.success;
+  const warning = opencodeColor(themeMap, defs, mode, "warning") ?? DEFAULT_THEME.warning;
+  const error = opencodeColor(themeMap, defs, mode, "error") ?? DEFAULT_THEME.error;
+  const info = opencodeColor(themeMap, defs, mode, "info") ?? DEFAULT_THEME.info;
+  const diffAdd = opencodeColor(themeMap, defs, mode, "diffAdded") ?? success;
+  const diffDel = opencodeColor(themeMap, defs, mode, "diffRemoved") ?? error;
+  const diffSep = opencodeColor(themeMap, defs, mode, "diffContext") ?? opencodeColor(themeMap, defs, mode, "diffHunkHeader") ?? muted;
+
+  return {
+    background,
+    text,
+    muted,
+    header: muted,
+    status: muted,
+    highlightBg,
+    highlightFg,
+    selectionBorder,
+    success,
+    warning,
+    error,
+    info,
+    diffAdd,
+    diffDel,
+    diffSep,
+    agentRunning: success,
+    agentIdle: warning,
+    agentNone: muted,
+    agentError: error,
+    prUnpushed: warning,
+    author: info,
+    ciRunning: warning,
+    ciPass: success,
+    ciFail: error,
+    ciNone: muted,
+    reviewApproved: success,
+    reviewChanges: error,
+    reviewPending: warning,
+    reviewNone: muted,
+  };
+}
+
+function opencodeColor(themeMap: JsonObject, defs: JsonObject, mode: ThemeMode, key: string): string | null {
+  const raw = themeMap[key];
+  if (raw === undefined) {
+    return null;
+  }
+  return resolveOpencodeColor(raw, themeMap, defs, mode, 0);
+}
+
+function resolveOpencodeColor(value: unknown, themeMap: JsonObject, defs: JsonObject, mode: ThemeMode, depth: number): string | null {
+  if (depth > 12) {
+    return null;
+  }
+
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed || trimmed.toLowerCase() === "transparent" || trimmed.toLowerCase() === "none") {
+      return null;
+    }
+
+    const fromDefs = defs[trimmed];
+    if (fromDefs !== undefined) {
+      return resolveOpencodeColor(fromDefs, themeMap, defs, mode, depth + 1);
+    }
+
+    const fromTheme = themeMap[trimmed];
+    if (fromTheme !== undefined) {
+      return resolveOpencodeColor(fromTheme, themeMap, defs, mode, depth + 1);
+    }
+
+    if (isColorLike(trimmed)) {
+      return trimmed;
+    }
+
+    return null;
+  }
+
+  if (isObject(value)) {
+    const nested = value[mode];
+    if (nested !== undefined) {
+      return resolveOpencodeColor(nested, themeMap, defs, mode, depth + 1);
+    }
+  }
+
+  return null;
+}
+
+function themeFromAny(value: unknown): TuiTheme | null {
+  const palette = extractPalette(value);
+  if (!palette) {
+    return null;
+  }
+
+  const pick = (keys: string[], fallback: string): string => {
+    for (const key of keys) {
+      const v = palette[normalizeKey(key)];
+      if (v && isColorLike(v)) {
+        return v;
+      }
+    }
+    return fallback;
+  };
+
+  const background = pick(["background", "bg", "base", "background_color"], DEFAULT_THEME.background);
+  const text = pick(["text", "foreground", "fg", "primary"], DEFAULT_THEME.text);
+  const muted = pick(["muted", "subtle", "secondary", "dim"], DEFAULT_THEME.muted);
+  const header = pick(["header", "header_text"], muted);
+  const status = pick(["status", "status_text"], muted);
+  const highlightBg = pick(["highlight_bg", "selection", "highlight", "accent_bg"], DEFAULT_THEME.highlightBg);
+  const highlightFg = pick(["highlight_fg", "selection_fg", "accent_fg"], text);
+  const selectionBorder = pick(["selection_border", "highlight_border", "accent", "secondary"], DEFAULT_THEME.selectionBorder);
+  const success = pick(["success", "green"], DEFAULT_THEME.success);
+  const warning = pick(["warning", "yellow"], DEFAULT_THEME.warning);
+  const error = pick(["error", "red"], DEFAULT_THEME.error);
+  const info = pick(["info", "cyan", "blue"], DEFAULT_THEME.info);
+  const diffAdd = pick(["diff_add", "diff_addition", "add"], success);
+  const diffDel = pick(["diff_del", "diff_deletion", "delete"], error);
+  const diffSep = pick(["diff_sep", "diff_separator", "separator"], muted);
+
+  return {
+    background,
+    text,
+    muted,
+    header,
+    status,
+    highlightBg,
+    highlightFg,
+    selectionBorder,
+    success,
+    warning,
+    error,
+    info,
+    diffAdd,
+    diffDel,
+    diffSep,
+    agentRunning: pick(["agent_running", "running"], success),
+    agentIdle: pick(["agent_idle", "idle"], warning),
+    agentNone: pick(["agent_none", "none"], muted),
+    agentError: pick(["agent_error", "agent_failed"], error),
+    prUnpushed: pick(["pr_unpushed", "unpushed"], warning),
+    author: pick(["author"], info),
+    ciRunning: pick(["ci_running"], warning),
+    ciPass: pick(["ci_pass", "ci_success"], success),
+    ciFail: pick(["ci_fail", "ci_error"], error),
+    ciNone: pick(["ci_none", "ci_unknown"], muted),
+    reviewApproved: pick(["review_approved", "approved"], success),
+    reviewChanges: pick(["review_changes", "changes"], error),
+    reviewPending: pick(["review_pending", "pending"], warning),
+    reviewNone: pick(["review_none", "review_unknown"], muted),
+  };
+}
+
+function extractPalette(value: unknown): Record<string, string> | null {
+  if (!isObject(value)) {
+    return null;
+  }
+
+  const colors = isObject(value.colors) ? value.colors : undefined;
+  const palette = isObject(value.palette) ? value.palette : undefined;
+  const source = colors ?? palette ?? value;
+  if (!isObject(source)) {
+    return null;
+  }
+
+  const out: Record<string, string> = {};
+  for (const [key, raw] of Object.entries(source)) {
+    if (typeof raw !== "string") {
+      continue;
+    }
+    out[normalizeKey(key)] = raw;
+  }
+
+  return Object.keys(out).length > 0 ? out : null;
+}
+
+function normalizeKey(key: string): string {
+  return key.toLowerCase().replace(/[\-\s.]/g, "_");
+}
+
+function isColorLike(value: string): boolean {
+  const lower = value.trim().toLowerCase();
+  if (!lower) {
+    return false;
+  }
+
+  if (/^#[0-9a-f]{3}$/.test(lower) || /^#[0-9a-f]{6}$/.test(lower) || /^#[0-9a-f]{8}$/.test(lower)) {
+    return true;
+  }
+
+  if (/^rgba?\(\s*\d+\s*,\s*\d+\s*,\s*\d+(\s*,\s*[\d.]+)?\s*\)$/.test(lower)) {
+    return true;
+  }
+
+  return /^[a-z_\-]+$/.test(lower);
+}
+
+function findOpencodeThemeValue(value: unknown): unknown {
+  if (!isObject(value)) {
+    return undefined;
+  }
+
+  if (value.theme !== undefined) {
+    return value.theme;
+  }
+
+  return pointer(value, ["ui", "theme"]) ?? pointer(value, ["tui", "theme"]) ?? pointer(value, ["options", "theme"]);
+}
+
+function pointer(obj: JsonObject, parts: string[]): unknown {
+  let current: unknown = obj;
+  for (const part of parts) {
+    if (!isObject(current)) {
+      return undefined;
+    }
+    current = current[part];
+  }
+  return current;
+}
+
+function opencodeConfigPaths(baseDir: string): string[] {
+  const paths: string[] = [];
+
+  const rootish = opencodeRepositoryConfigPaths(baseDir);
+  paths.push(...rootish);
+
+  const configDir = process.env.XDG_CONFIG_HOME || join(homedir(), ".config");
+  const opencodeDir = join(configDir, "opencode");
+  paths.push(join(opencodeDir, "opencode.json"));
+  paths.push(join(opencodeDir, "opencode.jsonc"));
+  paths.push(join(opencodeDir, "config.json"));
+
+  return paths;
+}
+
+function opencodeThemeDirs(configDir: string | undefined, baseDir: string): string[] {
+  const dirs: string[] = [];
+
+  if (configDir) {
+    dirs.push(join(configDir, "themes"));
+  }
+
+  const xdgConfig = process.env.XDG_CONFIG_HOME || join(homedir(), ".config");
+  dirs.push(join(xdgConfig, "opencode", "themes"));
+  dirs.push(join(homedir(), ".opencode", "themes"));
+
+  dirs.push(...opencodeRepositoryThemeDirs(baseDir));
+
+  return dirs;
+}
+
+function opencodeRepositoryConfigPaths(baseDir: string): string[] {
+  const dirs = ancestorDirs(baseDir);
+  const out: string[] = [];
+  for (const dir of dirs) {
+    out.push(join(dir, "opencode.json"));
+    out.push(join(dir, "opencode.jsonc"));
+    out.push(join(dir, ".opencode", "opencode.json"));
+    out.push(join(dir, ".opencode", "opencode.jsonc"));
+  }
+  return out;
+}
+
+function opencodeRepositoryThemeDirs(baseDir: string): string[] {
+  const dirs = ancestorDirs(baseDir);
+  const out: string[] = [];
+  for (const dir of dirs) {
+    out.push(join(dir, ".opencode", "themes"));
+  }
+  return out;
+}
+
+function ancestorDirs(start: string): string[] {
+  const out: string[] = [];
+  let current = resolve(start);
+
+  while (true) {
+    out.push(current);
+    const parent = dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+
+  return out;
+}
+
+function opencodeStatePath(): string | null {
+  const stateHome = process.env.XDG_STATE_HOME || join(homedir(), ".local", "state");
+  return join(stateHome, "opencode", "kv.json");
+}
+
+function opencodeStateThemeMode(): ThemeMode | null {
+  const path = opencodeStatePath();
+  if (!path || !existsSync(path)) {
+    return null;
+  }
+
+  const value = readJsonWithComments(path);
+  if (!isObject(value)) {
+    return null;
+  }
+
+  const mode = value.theme_mode;
+  if (typeof mode !== "string") {
+    return null;
+  }
+
+  const lower = mode.toLowerCase();
+  if (lower === "dark" || lower === "light") {
+    return lower;
+  }
+
+  return null;
+}
+
+function parseJsonWithComments(content: string): unknown {
+  try {
+    return JSON.parse(content);
+  } catch {
+    // Fall through.
+  }
+
+  try {
+    return JSON.parse(stripJsoncComments(content));
+  } catch {
+    return null;
+  }
+}
+
+function readJsonWithComments(path: string): unknown {
+  const content = safeReadText(path);
+  if (!content) {
+    return null;
+  }
+  return parseJsonWithComments(content);
+}
+
+function stripJsoncComments(input: string): string {
+  let output = "";
+  let i = 0;
+  let inString = false;
+  let escaped = false;
+
+  while (i < input.length) {
+    const ch = input[i];
+
+    if (inString) {
+      output += ch;
+      if (escaped) {
+        escaped = false;
+      } else if (ch === "\\") {
+        escaped = true;
+      } else if (ch === '"') {
+        inString = false;
+      }
+      i += 1;
+      continue;
+    }
+
+    if (ch === '"') {
+      inString = true;
+      output += ch;
+      i += 1;
+      continue;
+    }
+
+    if (ch === "/" && input[i + 1] === "/") {
+      i += 2;
+      while (i < input.length && input[i] !== "\n") {
+        i += 1;
+      }
+      continue;
+    }
+
+    if (ch === "/" && input[i + 1] === "*") {
+      i += 2;
+      while (i < input.length) {
+        if (input[i] === "*" && input[i + 1] === "/") {
+          i += 2;
+          break;
+        }
+        i += 1;
+      }
+      continue;
+    }
+
+    output += ch;
+    i += 1;
+  }
+
+  return output;
+}
+
+function safeReadText(path: string): string | null {
+  try {
+    return readFileSync(path, "utf8");
+  } catch {
+    return null;
+  }
+}
+
+function resolvePath(path: string, baseDir: string): string {
+  if (path.startsWith("~/")) {
+    return join(homedir(), path.slice(2));
+  }
+  if (isAbsolute(path)) {
+    return path;
+  }
+  return resolve(baseDir, path);
+}
+
+function isPathLike(spec: string): boolean {
+  return spec.includes("/") || spec.includes("\\") || spec.endsWith(".json") || spec.endsWith(".toml");
+}
+
+function isDefaultThemeName(spec: string): boolean {
+  const lower = spec.toLowerCase();
+  return lower === "default" || lower === "opencode" || lower === "opencode-default" || lower === "system";
+}
+
+function isObject(value: unknown): value is JsonObject {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
diff --git a/foundry/packages/cli/src/themes/opencode-pack.json b/foundry/packages/cli/src/themes/opencode-pack.json
new file mode 100644
index 0000000..391bca1
--- /dev/null
+++ b/foundry/packages/cli/src/themes/opencode-pack.json
@@ -0,0 +1,7408 @@
+{
+  "aura": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg": "#0f0f0f",
+      "darkBgPanel": "#15141b",
+      "darkBorder": "#2d2d2d",
+      "darkFgMuted": "#6d6d6d",
+      "darkFg": "#edecee",
+      "purple": "#a277ff",
+      "pink": "#f694ff",
+      "blue": "#82e2ff",
+      "red": "#ff6767",
+      "orange": "#ffca85",
+      "cyan": "#61ffca",
+      "green": "#9dff65"
+    },
+    "theme": {
+      "primary": "purple",
+      "secondary": "pink",
+      "accent": "purple",
+      "error": "red",
+      "warning": "orange",
+      "success": "cyan",
+      "info": "purple",
+      "text": "darkFg",
+      "textMuted": "darkFgMuted",
+      "background": "darkBg",
+      "backgroundPanel": "darkBgPanel",
+      "backgroundElement": "darkBgPanel",
+      "border": "darkBorder",
+      "borderActive": "darkFgMuted",
+      "borderSubtle": "darkBorder",
+      "diffAdded": "cyan",
+      "diffRemoved": "red",
+      "diffContext": "darkFgMuted",
+      "diffHunkHeader": "darkFgMuted",
+      "diffHighlightAdded": "cyan",
+      "diffHighlightRemoved": "red",
+      "diffAddedBg": "#354933",
+      "diffRemovedBg": "#3f191a",
+      "diffContextBg": "darkBgPanel",
+      "diffLineNumber": "darkBorder",
+      "diffAddedLineNumberBg": "#162620",
+      "diffRemovedLineNumberBg": "#26161a",
+      "markdownText": "darkFg",
+      "markdownHeading": "purple",
+      "markdownLink": "pink",
+      "markdownLinkText": "purple",
+      "markdownCode": "cyan",
+      "markdownBlockQuote": "darkFgMuted",
+      "markdownEmph": "orange",
+      "markdownStrong": "purple",
+      "markdownHorizontalRule": "darkFgMuted",
+      "markdownListItem": "purple",
+      "markdownListEnumeration": "purple",
+      "markdownImage": "pink",
+      "markdownImageText": "purple",
+      "markdownCodeBlock": "darkFg",
+      "syntaxComment": "darkFgMuted",
+      "syntaxKeyword": "pink",
+      "syntaxFunction": "purple",
+      "syntaxVariable": "purple",
+      "syntaxString": "cyan",
+      "syntaxNumber": "green",
+      "syntaxType": "purple",
+      "syntaxOperator": "pink",
+      "syntaxPunctuation": "darkFg"
+    }
+  },
+  "ayu": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg": "#0B0E14",
+      "darkBgAlt": "#0D1017",
+      "darkLine": "#11151C",
+      "darkPanel": "#0F131A",
+      "darkFg": "#BFBDB6",
+      "darkFgMuted": "#565B66",
+      "darkGutter": "#6C7380",
+      "darkTag": "#39BAE6",
+      "darkFunc": "#FFB454",
+      "darkEntity": "#59C2FF",
+      "darkString": "#AAD94C",
+      "darkRegexp": "#95E6CB",
+      "darkMarkup": "#F07178",
+      "darkKeyword": "#FF8F40",
+      "darkSpecial": "#E6B673",
+      "darkComment": "#ACB6BF",
+      "darkConstant": "#D2A6FF",
+      "darkOperator": "#F29668",
+      "darkAdded": "#7FD962",
+      "darkRemoved": "#F26D78",
+      "darkAccent": "#E6B450",
+      "darkError": "#D95757",
+      "darkIndentActive": "#6C7380"
+    },
+    "theme": {
+      "primary": "darkEntity",
+      "secondary": "darkConstant",
+      "accent": "darkAccent",
+      "error": "darkError",
+      "warning": "darkSpecial",
+      "success": "darkAdded",
+      "info": "darkTag",
+      "text": "darkFg",
+      "textMuted": "darkFgMuted",
+      "background": "darkBg",
+      "backgroundPanel": "darkPanel",
+      "backgroundElement": "darkBgAlt",
+      "border": "darkGutter",
+      "borderActive": "darkIndentActive",
+      "borderSubtle": "darkLine",
+      "diffAdded": "darkAdded",
+      "diffRemoved": "darkRemoved",
+      "diffContext": "darkComment",
+      "diffHunkHeader": "darkComment",
+      "diffHighlightAdded": "darkString",
+      "diffHighlightRemoved": "darkMarkup",
+      "diffAddedBg": "#20303b",
+      "diffRemovedBg": "#37222c",
+      "diffContextBg": "darkPanel",
+      "diffLineNumber": "darkGutter",
+      "diffAddedLineNumberBg": "#1b2b34",
+      "diffRemovedLineNumberBg": "#2d1f26",
+      "markdownText": "darkFg",
+      "markdownHeading": "darkConstant",
+      "markdownLink": "darkEntity",
+      "markdownLinkText": "darkTag",
+      "markdownCode": "darkString",
+      "markdownBlockQuote": "darkSpecial",
+      "markdownEmph": "darkSpecial",
+      "markdownStrong": "darkFunc",
+      "markdownHorizontalRule": "darkFgMuted",
+      "markdownListItem": "darkEntity",
+      "markdownListEnumeration": "darkTag",
+      "markdownImage": "darkEntity",
+      "markdownImageText": "darkTag",
+      "markdownCodeBlock": "darkFg",
+      "syntaxComment": "darkComment",
+      "syntaxKeyword": "darkKeyword",
+      "syntaxFunction": "darkFunc",
+      "syntaxVariable": "darkEntity",
+      "syntaxString": "darkString",
+      "syntaxNumber": "darkConstant",
+      "syntaxType": "darkSpecial",
+      "syntaxOperator": "darkOperator",
+      "syntaxPunctuation": "darkFg"
+    }
+  },
+  "carbonfox": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "bg0": "#0d0d0d",
+      "bg1": "#161616",
+      "bg1a": "#1a1a1a",
+      "bg2": "#1e1e1e",
+      "bg3": "#262626",
+      "bg4": "#303030",
+      "fg0": "#ffffff",
+      "fg1": "#f2f4f8",
+      "fg2": "#a9afbc",
+      "fg3": "#7d848f",
+      "lbg0": "#ffffff",
+      "lbg1": "#f4f4f4",
+      "lbg2": "#e8e8e8",
+      "lbg3": "#dcdcdc",
+      "lfg0": "#000000",
+      "lfg1": "#161616",
+      "lfg2": "#525252",
+      "lfg3": "#6f6f6f",
+      "red": "#ee5396",
+      "green": "#25be6a",
+      "yellow": "#08bdba",
+      "blue": "#78a9ff",
+      "magenta": "#be95ff",
+      "cyan": "#33b1ff",
+      "white": "#dfdfe0",
+      "orange": "#3ddbd9",
+      "pink": "#ff7eb6",
+      "blueBright": "#8cb6ff",
+      "cyanBright": "#52c7ff",
+      "greenBright": "#46c880",
+      "redLight": "#9f1853",
+      "greenLight": "#198038",
+      "yellowLight": "#007d79",
+      "blueLight": "#0043ce",
+      "magentaLight": "#6929c4",
+      "cyanLight": "#0072c3",
+      "warning": "#f1c21b",
+      "diffGreen": "#50fa7b",
+      "diffRed": "#ff6b6b",
+      "diffGreenBg": "#0f2418",
+      "diffRedBg": "#2a1216"
+    },
+    "theme": {
+      "primary": {
+        "dark": "cyan",
+        "light": "blueLight"
+      },
+      "secondary": {
+        "dark": "blue",
+        "light": "blueLight"
+      },
+      "accent": {
+        "dark": "pink",
+        "light": "redLight"
+      },
+      "error": {
+        "dark": "red",
+        "light": "redLight"
+      },
+      "warning": {
+        "dark": "warning",
+        "light": "yellowLight"
+      },
+      "success": {
+        "dark": "green",
+        "light": "greenLight"
+      },
+      "info": {
+        "dark": "blue",
+        "light": "blueLight"
+      },
+      "text": {
+        "dark": "fg1",
+        "light": "lfg1"
+      },
+      "textMuted": {
+        "dark": "fg3",
+        "light": "lfg3"
+      },
+      "background": {
+        "dark": "bg1",
+        "light": "lbg0"
+      },
+      "backgroundPanel": {
+        "dark": "bg1a",
+        "light": "lbg1"
+      },
+      "backgroundElement": {
+        "dark": "bg2",
+        "light": "lbg1"
+      },
+      "border": {
+        "dark": "bg4",
+        "light": "lbg3"
+      },
+      "borderActive": {
+        "dark": "cyan",
+        "light": "blueLight"
+      },
+      "borderSubtle": {
+        "dark": "bg3",
+        "light": "lbg2"
+      },
+      "diffAdded": {
+        "dark": "diffGreen",
+        "light": "greenLight"
+      },
+      "diffRemoved": {
+        "dark": "diffRed",
+        "light": "redLight"
+      },
+      "diffContext": {
+        "dark": "fg3",
+        "light": "lfg3"
+      },
+      "diffHunkHeader": {
+        "dark": "blue",
+        "light": "blueLight"
+      },
+      "diffHighlightAdded": {
+        "dark": "#7dffaa",
+        "light": "greenLight"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#ff9999",
+        "light": "redLight"
+      },
+      "diffAddedBg": {
+        "dark": "diffGreenBg",
+        "light": "#defbe6"
+      },
+      "diffRemovedBg": {
+        "dark": "diffRedBg",
+        "light": "#fff1f1"
+      },
+      "diffContextBg": {
+        "dark": "bg1",
+        "light": "lbg1"
+      },
+      "diffLineNumber": {
+        "dark": "fg3",
+        "light": "lfg3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "diffGreenBg",
+        "light": "#defbe6"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "diffRedBg",
+        "light": "#fff1f1"
+      },
+      "markdownText": {
+        "dark": "fg1",
+        "light": "lfg1"
+      },
+      "markdownHeading": {
+        "dark": "blueBright",
+        "light": "blueLight"
+      },
+      "markdownLink": {
+        "dark": "blue",
+        "light": "blueLight"
+      },
+      "markdownLinkText": {
+        "dark": "cyan",
+        "light": "cyanLight"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "greenLight"
+      },
+      "markdownBlockQuote": {
+        "dark": "fg3",
+        "light": "lfg3"
+      },
+      "markdownEmph": {
+        "dark": "magenta",
+        "light": "magentaLight"
+      },
+      "markdownStrong": {
+        "dark": "fg0",
+        "light": "lfg0"
+      },
+      "markdownHorizontalRule": {
+        "dark": "bg4",
+        "light": "lbg3"
+      },
+      "markdownListItem": {
+        "dark": "cyan",
+        "light": "cyanLight"
+      },
+      "markdownListEnumeration": {
+        "dark": "cyan",
+        "light": "cyanLight"
+      },
+      "markdownImage": {
+        "dark": "blue",
+        "light": "blueLight"
+      },
+      "markdownImageText": {
+        "dark": "cyan",
+        "light": "cyanLight"
+      },
+      "markdownCodeBlock": {
+        "dark": "fg2",
+        "light": "lfg2"
+      },
+      "syntaxComment": {
+        "dark": "fg3",
+        "light": "lfg3"
+      },
+      "syntaxKeyword": {
+        "dark": "magenta",
+        "light": "magentaLight"
+      },
+      "syntaxFunction": {
+        "dark": "blueBright",
+        "light": "blueLight"
+      },
+      "syntaxVariable": {
+        "dark": "white",
+        "light": "lfg1"
+      },
+      "syntaxString": {
+        "dark": "green",
+        "light": "greenLight"
+      },
+      "syntaxNumber": {
+        "dark": "orange",
+        "light": "yellowLight"
+      },
+      "syntaxType": {
+        "dark": "yellow",
+        "light": "yellowLight"
+      },
+      "syntaxOperator": {
+        "dark": "fg2",
+        "light": "lfg2"
+      },
+      "syntaxPunctuation": {
+        "dark": "fg2",
+        "light": "lfg1"
+      }
+    }
+  },
+  "catppuccin-frappe": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "frappeRosewater": "#f2d5cf",
+      "frappeFlamingo": "#eebebe",
+      "frappePink": "#f4b8e4",
+      "frappeMauve": "#ca9ee6",
+      "frappeRed": "#e78284",
+      "frappeMaroon": "#ea999c",
+      "frappePeach": "#ef9f76",
+      "frappeYellow": "#e5c890",
+      "frappeGreen": "#a6d189",
+      "frappeTeal": "#81c8be",
+      "frappeSky": "#99d1db",
+      "frappeSapphire": "#85c1dc",
+      "frappeBlue": "#8da4e2",
+      "frappeLavender": "#babbf1",
+      "frappeText": "#c6d0f5",
+      "frappeSubtext1": "#b5bfe2",
+      "frappeSubtext0": "#a5adce",
+      "frappeOverlay2": "#949cb8",
+      "frappeOverlay1": "#838ba7",
+      "frappeOverlay0": "#737994",
+      "frappeSurface2": "#626880",
+      "frappeSurface1": "#51576d",
+      "frappeSurface0": "#414559",
+      "frappeBase": "#303446",
+      "frappeMantle": "#292c3c",
+      "frappeCrust": "#232634"
+    },
+    "theme": {
+      "primary": {
+        "dark": "frappeBlue",
+        "light": "frappeBlue"
+      },
+      "secondary": {
+        "dark": "frappeMauve",
+        "light": "frappeMauve"
+      },
+      "accent": {
+        "dark": "frappePink",
+        "light": "frappePink"
+      },
+      "error": {
+        "dark": "frappeRed",
+        "light": "frappeRed"
+      },
+      "warning": {
+        "dark": "frappeYellow",
+        "light": "frappeYellow"
+      },
+      "success": {
+        "dark": "frappeGreen",
+        "light": "frappeGreen"
+      },
+      "info": {
+        "dark": "frappeTeal",
+        "light": "frappeTeal"
+      },
+      "text": {
+        "dark": "frappeText",
+        "light": "frappeText"
+      },
+      "textMuted": {
+        "dark": "frappeSubtext1",
+        "light": "frappeSubtext1"
+      },
+      "background": {
+        "dark": "frappeBase",
+        "light": "frappeBase"
+      },
+      "backgroundPanel": {
+        "dark": "frappeMantle",
+        "light": "frappeMantle"
+      },
+      "backgroundElement": {
+        "dark": "frappeCrust",
+        "light": "frappeCrust"
+      },
+      "border": {
+        "dark": "frappeSurface0",
+        "light": "frappeSurface0"
+      },
+      "borderActive": {
+        "dark": "frappeSurface1",
+        "light": "frappeSurface1"
+      },
+      "borderSubtle": {
+        "dark": "frappeSurface2",
+        "light": "frappeSurface2"
+      },
+      "diffAdded": {
+        "dark": "frappeGreen",
+        "light": "frappeGreen"
+      },
+      "diffRemoved": {
+        "dark": "frappeRed",
+        "light": "frappeRed"
+      },
+      "diffContext": {
+        "dark": "frappeOverlay2",
+        "light": "frappeOverlay2"
+      },
+      "diffHunkHeader": {
+        "dark": "frappePeach",
+        "light": "frappePeach"
+      },
+      "diffHighlightAdded": {
+        "dark": "frappeGreen",
+        "light": "frappeGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "frappeRed",
+        "light": "frappeRed"
+      },
+      "diffAddedBg": {
+        "dark": "#29342b",
+        "light": "#29342b"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a2a31",
+        "light": "#3a2a31"
+      },
+      "diffContextBg": {
+        "dark": "frappeMantle",
+        "light": "frappeMantle"
+      },
+      "diffLineNumber": {
+        "dark": "frappeSurface1",
+        "light": "frappeSurface1"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#223025",
+        "light": "#223025"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2f242b",
+        "light": "#2f242b"
+      },
+      "markdownText": {
+        "dark": "frappeText",
+        "light": "frappeText"
+      },
+      "markdownHeading": {
+        "dark": "frappeMauve",
+        "light": "frappeMauve"
+      },
+      "markdownLink": {
+        "dark": "frappeBlue",
+        "light": "frappeBlue"
+      },
+      "markdownLinkText": {
+        "dark": "frappeSky",
+        "light": "frappeSky"
+      },
+      "markdownCode": {
+        "dark": "frappeGreen",
+        "light": "frappeGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "frappeYellow",
+        "light": "frappeYellow"
+      },
+      "markdownEmph": {
+        "dark": "frappeYellow",
+        "light": "frappeYellow"
+      },
+      "markdownStrong": {
+        "dark": "frappePeach",
+        "light": "frappePeach"
+      },
+      "markdownHorizontalRule": {
+        "dark": "frappeSubtext0",
+        "light": "frappeSubtext0"
+      },
+      "markdownListItem": {
+        "dark": "frappeBlue",
+        "light": "frappeBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "frappeSky",
+        "light": "frappeSky"
+      },
+      "markdownImage": {
+        "dark": "frappeBlue",
+        "light": "frappeBlue"
+      },
+      "markdownImageText": {
+        "dark": "frappeSky",
+        "light": "frappeSky"
+      },
+      "markdownCodeBlock": {
+        "dark": "frappeText",
+        "light": "frappeText"
+      },
+      "syntaxComment": {
+        "dark": "frappeOverlay2",
+        "light": "frappeOverlay2"
+      },
+      "syntaxKeyword": {
+        "dark": "frappeMauve",
+        "light": "frappeMauve"
+      },
+      "syntaxFunction": {
+        "dark": "frappeBlue",
+        "light": "frappeBlue"
+      },
+      "syntaxVariable": {
+        "dark": "frappeRed",
+        "light": "frappeRed"
+      },
+      "syntaxString": {
+        "dark": "frappeGreen",
+        "light": "frappeGreen"
+      },
+      "syntaxNumber": {
+        "dark": "frappePeach",
+        "light": "frappePeach"
+      },
+      "syntaxType": {
+        "dark": "frappeYellow",
+        "light": "frappeYellow"
+      },
+      "syntaxOperator": {
+        "dark": "frappeSky",
+        "light": "frappeSky"
+      },
+      "syntaxPunctuation": {
+        "dark": "frappeText",
+        "light": "frappeText"
+      }
+    }
+  },
+  "catppuccin-macchiato": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "macRosewater": "#f4dbd6",
+      "macFlamingo": "#f0c6c6",
+      "macPink": "#f5bde6",
+      "macMauve": "#c6a0f6",
+      "macRed": "#ed8796",
+      "macMaroon": "#ee99a0",
+      "macPeach": "#f5a97f",
+      "macYellow": "#eed49f",
+      "macGreen": "#a6da95",
+      "macTeal": "#8bd5ca",
+      "macSky": "#91d7e3",
+      "macSapphire": "#7dc4e4",
+      "macBlue": "#8aadf4",
+      "macLavender": "#b7bdf8",
+      "macText": "#cad3f5",
+      "macSubtext1": "#b8c0e0",
+      "macSubtext0": "#a5adcb",
+      "macOverlay2": "#939ab7",
+      "macOverlay1": "#8087a2",
+      "macOverlay0": "#6e738d",
+      "macSurface2": "#5b6078",
+      "macSurface1": "#494d64",
+      "macSurface0": "#363a4f",
+      "macBase": "#24273a",
+      "macMantle": "#1e2030",
+      "macCrust": "#181926"
+    },
+    "theme": {
+      "primary": {
+        "dark": "macBlue",
+        "light": "macBlue"
+      },
+      "secondary": {
+        "dark": "macMauve",
+        "light": "macMauve"
+      },
+      "accent": {
+        "dark": "macPink",
+        "light": "macPink"
+      },
+      "error": {
+        "dark": "macRed",
+        "light": "macRed"
+      },
+      "warning": {
+        "dark": "macYellow",
+        "light": "macYellow"
+      },
+      "success": {
+        "dark": "macGreen",
+        "light": "macGreen"
+      },
+      "info": {
+        "dark": "macTeal",
+        "light": "macTeal"
+      },
+      "text": {
+        "dark": "macText",
+        "light": "macText"
+      },
+      "textMuted": {
+        "dark": "macSubtext1",
+        "light": "macSubtext1"
+      },
+      "background": {
+        "dark": "macBase",
+        "light": "macBase"
+      },
+      "backgroundPanel": {
+        "dark": "macMantle",
+        "light": "macMantle"
+      },
+      "backgroundElement": {
+        "dark": "macCrust",
+        "light": "macCrust"
+      },
+      "border": {
+        "dark": "macSurface0",
+        "light": "macSurface0"
+      },
+      "borderActive": {
+        "dark": "macSurface1",
+        "light": "macSurface1"
+      },
+      "borderSubtle": {
+        "dark": "macSurface2",
+        "light": "macSurface2"
+      },
+      "diffAdded": {
+        "dark": "macGreen",
+        "light": "macGreen"
+      },
+      "diffRemoved": {
+        "dark": "macRed",
+        "light": "macRed"
+      },
+      "diffContext": {
+        "dark": "macOverlay2",
+        "light": "macOverlay2"
+      },
+      "diffHunkHeader": {
+        "dark": "macPeach",
+        "light": "macPeach"
+      },
+      "diffHighlightAdded": {
+        "dark": "macGreen",
+        "light": "macGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "macRed",
+        "light": "macRed"
+      },
+      "diffAddedBg": {
+        "dark": "#29342b",
+        "light": "#29342b"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a2a31",
+        "light": "#3a2a31"
+      },
+      "diffContextBg": {
+        "dark": "macMantle",
+        "light": "macMantle"
+      },
+      "diffLineNumber": {
+        "dark": "macSurface1",
+        "light": "macSurface1"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#223025",
+        "light": "#223025"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2f242b",
+        "light": "#2f242b"
+      },
+      "markdownText": {
+        "dark": "macText",
+        "light": "macText"
+      },
+      "markdownHeading": {
+        "dark": "macMauve",
+        "light": "macMauve"
+      },
+      "markdownLink": {
+        "dark": "macBlue",
+        "light": "macBlue"
+      },
+      "markdownLinkText": {
+        "dark": "macSky",
+        "light": "macSky"
+      },
+      "markdownCode": {
+        "dark": "macGreen",
+        "light": "macGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "macYellow",
+        "light": "macYellow"
+      },
+      "markdownEmph": {
+        "dark": "macYellow",
+        "light": "macYellow"
+      },
+      "markdownStrong": {
+        "dark": "macPeach",
+        "light": "macPeach"
+      },
+      "markdownHorizontalRule": {
+        "dark": "macSubtext0",
+        "light": "macSubtext0"
+      },
+      "markdownListItem": {
+        "dark": "macBlue",
+        "light": "macBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "macSky",
+        "light": "macSky"
+      },
+      "markdownImage": {
+        "dark": "macBlue",
+        "light": "macBlue"
+      },
+      "markdownImageText": {
+        "dark": "macSky",
+        "light": "macSky"
+      },
+      "markdownCodeBlock": {
+        "dark": "macText",
+        "light": "macText"
+      },
+      "syntaxComment": {
+        "dark": "macOverlay2",
+        "light": "macOverlay2"
+      },
+      "syntaxKeyword": {
+        "dark": "macMauve",
+        "light": "macMauve"
+      },
+      "syntaxFunction": {
+        "dark": "macBlue",
+        "light": "macBlue"
+      },
+      "syntaxVariable": {
+        "dark": "macRed",
+        "light": "macRed"
+      },
+      "syntaxString": {
+        "dark": "macGreen",
+        "light": "macGreen"
+      },
+      "syntaxNumber": {
+        "dark": "macPeach",
+        "light": "macPeach"
+      },
+      "syntaxType": {
+        "dark": "macYellow",
+        "light": "macYellow"
+      },
+      "syntaxOperator": {
+        "dark": "macSky",
+        "light": "macSky"
+      },
+      "syntaxPunctuation": {
+        "dark": "macText",
+        "light": "macText"
+      }
+    }
+  },
+  "catppuccin": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "lightRosewater": "#dc8a78",
+      "lightFlamingo": "#dd7878",
+      "lightPink": "#ea76cb",
+      "lightMauve": "#8839ef",
+      "lightRed": "#d20f39",
+      "lightMaroon": "#e64553",
+      "lightPeach": "#fe640b",
+      "lightYellow": "#df8e1d",
+      "lightGreen": "#40a02b",
+      "lightTeal": "#179299",
+      "lightSky": "#04a5e5",
+      "lightSapphire": "#209fb5",
+      "lightBlue": "#1e66f5",
+      "lightLavender": "#7287fd",
+      "lightText": "#4c4f69",
+      "lightSubtext1": "#5c5f77",
+      "lightSubtext0": "#6c6f85",
+      "lightOverlay2": "#7c7f93",
+      "lightOverlay1": "#8c8fa1",
+      "lightOverlay0": "#9ca0b0",
+      "lightSurface2": "#acb0be",
+      "lightSurface1": "#bcc0cc",
+      "lightSurface0": "#ccd0da",
+      "lightBase": "#eff1f5",
+      "lightMantle": "#e6e9ef",
+      "lightCrust": "#dce0e8",
+      "darkRosewater": "#f5e0dc",
+      "darkFlamingo": "#f2cdcd",
+      "darkPink": "#f5c2e7",
+      "darkMauve": "#cba6f7",
+      "darkRed": "#f38ba8",
+      "darkMaroon": "#eba0ac",
+      "darkPeach": "#fab387",
+      "darkYellow": "#f9e2af",
+      "darkGreen": "#a6e3a1",
+      "darkTeal": "#94e2d5",
+      "darkSky": "#89dceb",
+      "darkSapphire": "#74c7ec",
+      "darkBlue": "#89b4fa",
+      "darkLavender": "#b4befe",
+      "darkText": "#cdd6f4",
+      "darkSubtext1": "#bac2de",
+      "darkSubtext0": "#a6adc8",
+      "darkOverlay2": "#9399b2",
+      "darkOverlay1": "#7f849c",
+      "darkOverlay0": "#6c7086",
+      "darkSurface2": "#585b70",
+      "darkSurface1": "#45475a",
+      "darkSurface0": "#313244",
+      "darkBase": "#1e1e2e",
+      "darkMantle": "#181825",
+      "darkCrust": "#11111b"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "secondary": {
+        "dark": "darkMauve",
+        "light": "lightMauve"
+      },
+      "accent": {
+        "dark": "darkPink",
+        "light": "lightPink"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkTeal",
+        "light": "lightTeal"
+      },
+      "text": {
+        "dark": "darkText",
+        "light": "lightText"
+      },
+      "textMuted": {
+        "dark": "darkSubtext1",
+        "light": "lightSubtext1"
+      },
+      "background": {
+        "dark": "darkBase",
+        "light": "lightBase"
+      },
+      "backgroundPanel": {
+        "dark": "darkMantle",
+        "light": "lightMantle"
+      },
+      "backgroundElement": {
+        "dark": "darkCrust",
+        "light": "lightCrust"
+      },
+      "border": {
+        "dark": "darkSurface0",
+        "light": "lightSurface0"
+      },
+      "borderActive": {
+        "dark": "darkSurface1",
+        "light": "lightSurface1"
+      },
+      "borderSubtle": {
+        "dark": "darkSurface2",
+        "light": "lightSurface2"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkOverlay2",
+        "light": "lightOverlay2"
+      },
+      "diffHunkHeader": {
+        "dark": "darkPeach",
+        "light": "lightPeach"
+      },
+      "diffHighlightAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffAddedBg": {
+        "dark": "#24312b",
+        "light": "#d6f0d9"
+      },
+      "diffRemovedBg": {
+        "dark": "#3c2a32",
+        "light": "#f6dfe2"
+      },
+      "diffContextBg": {
+        "dark": "darkMantle",
+        "light": "lightMantle"
+      },
+      "diffLineNumber": {
+        "dark": "darkSurface1",
+        "light": "lightSurface1"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1e2a25",
+        "light": "#c9e3cb"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#32232a",
+        "light": "#e9d3d6"
+      },
+      "markdownText": {
+        "dark": "darkText",
+        "light": "lightText"
+      },
+      "markdownHeading": {
+        "dark": "darkMauve",
+        "light": "lightMauve"
+      },
+      "markdownLink": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownLinkText": {
+        "dark": "darkSky",
+        "light": "lightSky"
+      },
+      "markdownCode": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkPeach",
+        "light": "lightPeach"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkSubtext0",
+        "light": "lightSubtext0"
+      },
+      "markdownListItem": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkSky",
+        "light": "lightSky"
+      },
+      "markdownImage": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownImageText": {
+        "dark": "darkSky",
+        "light": "lightSky"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkText",
+        "light": "lightText"
+      },
+      "syntaxComment": {
+        "dark": "darkOverlay2",
+        "light": "lightOverlay2"
+      },
+      "syntaxKeyword": {
+        "dark": "darkMauve",
+        "light": "lightMauve"
+      },
+      "syntaxFunction": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkPeach",
+        "light": "lightPeach"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkSky",
+        "light": "lightSky"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkText",
+        "light": "lightText"
+      }
+    }
+  },
+  "cobalt2": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "background": "#193549",
+      "backgroundAlt": "#122738",
+      "backgroundPanel": "#1f4662",
+      "foreground": "#ffffff",
+      "foregroundMuted": "#adb7c9",
+      "yellow": "#ffc600",
+      "yellowBright": "#ffe14c",
+      "orange": "#ff9d00",
+      "orangeBright": "#ffb454",
+      "mint": "#2affdf",
+      "mintBright": "#7efff5",
+      "blue": "#0088ff",
+      "blueBright": "#5cb7ff",
+      "pink": "#ff628c",
+      "pinkBright": "#ff86a5",
+      "green": "#9eff80",
+      "greenBright": "#b9ff9f",
+      "purple": "#9a5feb",
+      "purpleBright": "#b88cfd",
+      "red": "#ff0088",
+      "redBright": "#ff5fb3"
+    },
+    "theme": {
+      "primary": {
+        "dark": "blue",
+        "light": "#0066cc"
+      },
+      "secondary": {
+        "dark": "purple",
+        "light": "#7c4dff"
+      },
+      "accent": {
+        "dark": "mint",
+        "light": "#00acc1"
+      },
+      "error": {
+        "dark": "red",
+        "light": "#e91e63"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "#ff9800"
+      },
+      "success": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "text": {
+        "dark": "foreground",
+        "light": "#193549"
+      },
+      "textMuted": {
+        "dark": "foregroundMuted",
+        "light": "#5c6b7d"
+      },
+      "background": {
+        "dark": "#193549",
+        "light": "#ffffff"
+      },
+      "backgroundPanel": {
+        "dark": "#122738",
+        "light": "#f5f7fa"
+      },
+      "backgroundElement": {
+        "dark": "#1f4662",
+        "light": "#e8ecf1"
+      },
+      "border": {
+        "dark": "#1f4662",
+        "light": "#d3dae3"
+      },
+      "borderActive": {
+        "dark": "blue",
+        "light": "#0066cc"
+      },
+      "borderSubtle": {
+        "dark": "#0e1e2e",
+        "light": "#e8ecf1"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "#e91e63"
+      },
+      "diffContext": {
+        "dark": "foregroundMuted",
+        "light": "#5c6b7d"
+      },
+      "diffHunkHeader": {
+        "dark": "mint",
+        "light": "#00acc1"
+      },
+      "diffHighlightAdded": {
+        "dark": "greenBright",
+        "light": "#4caf50"
+      },
+      "diffHighlightRemoved": {
+        "dark": "redBright",
+        "light": "#e91e63"
+      },
+      "diffAddedBg": {
+        "dark": "#1a3a2a",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a1a2a",
+        "light": "#ffebee"
+      },
+      "diffContextBg": {
+        "dark": "#122738",
+        "light": "#f5f7fa"
+      },
+      "diffLineNumber": {
+        "dark": "#2d5a7b",
+        "light": "#b0bec5"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1a3a2a",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3a1a2a",
+        "light": "#ffebee"
+      },
+      "markdownText": {
+        "dark": "foreground",
+        "light": "#193549"
+      },
+      "markdownHeading": {
+        "dark": "yellow",
+        "light": "#ff9800"
+      },
+      "markdownLink": {
+        "dark": "blue",
+        "light": "#0066cc"
+      },
+      "markdownLinkText": {
+        "dark": "mint",
+        "light": "#00acc1"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "markdownBlockQuote": {
+        "dark": "foregroundMuted",
+        "light": "#5c6b7d"
+      },
+      "markdownEmph": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "markdownStrong": {
+        "dark": "pink",
+        "light": "#e91e63"
+      },
+      "markdownHorizontalRule": {
+        "dark": "#2d5a7b",
+        "light": "#d3dae3"
+      },
+      "markdownListItem": {
+        "dark": "blue",
+        "light": "#0066cc"
+      },
+      "markdownListEnumeration": {
+        "dark": "mint",
+        "light": "#00acc1"
+      },
+      "markdownImage": {
+        "dark": "blue",
+        "light": "#0066cc"
+      },
+      "markdownImageText": {
+        "dark": "mint",
+        "light": "#00acc1"
+      },
+      "markdownCodeBlock": {
+        "dark": "foreground",
+        "light": "#193549"
+      },
+      "syntaxComment": {
+        "dark": "#0088ff",
+        "light": "#5c6b7d"
+      },
+      "syntaxKeyword": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "syntaxFunction": {
+        "dark": "yellow",
+        "light": "#ff9800"
+      },
+      "syntaxVariable": {
+        "dark": "foreground",
+        "light": "#193549"
+      },
+      "syntaxString": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "syntaxNumber": {
+        "dark": "pink",
+        "light": "#e91e63"
+      },
+      "syntaxType": {
+        "dark": "mint",
+        "light": "#00acc1"
+      },
+      "syntaxOperator": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "syntaxPunctuation": {
+        "dark": "foreground",
+        "light": "#193549"
+      }
+    }
+  },
+  "cursor": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg": "#181818",
+      "darkPanel": "#141414",
+      "darkElement": "#262626",
+      "darkFg": "#e4e4e4",
+      "darkMuted": "#e4e4e45e",
+      "darkBorder": "#e4e4e413",
+      "darkBorderActive": "#e4e4e426",
+      "darkCyan": "#88c0d0",
+      "darkBlue": "#81a1c1",
+      "darkGreen": "#3fa266",
+      "darkGreenBright": "#70b489",
+      "darkRed": "#e34671",
+      "darkRedBright": "#fc6b83",
+      "darkYellow": "#f1b467",
+      "darkOrange": "#d2943e",
+      "darkPink": "#E394DC",
+      "darkPurple": "#AAA0FA",
+      "darkTeal": "#82D2CE",
+      "darkSyntaxYellow": "#F8C762",
+      "darkSyntaxOrange": "#EFB080",
+      "darkSyntaxGreen": "#A8CC7C",
+      "darkSyntaxBlue": "#87C3FF",
+      "lightBg": "#fcfcfc",
+      "lightPanel": "#f3f3f3",
+      "lightElement": "#ededed",
+      "lightFg": "#141414",
+      "lightMuted": "#141414ad",
+      "lightBorder": "#14141413",
+      "lightBorderActive": "#14141426",
+      "lightTeal": "#6f9ba6",
+      "lightBlue": "#3c7cab",
+      "lightBlueDark": "#206595",
+      "lightGreen": "#1f8a65",
+      "lightGreenBright": "#55a583",
+      "lightRed": "#cf2d56",
+      "lightRedBright": "#e75e78",
+      "lightOrange": "#db704b",
+      "lightYellow": "#c08532",
+      "lightPurple": "#9e94d5",
+      "lightPurpleDark": "#6049b3",
+      "lightPink": "#b8448b",
+      "lightMagenta": "#b3003f"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkCyan",
+        "light": "lightTeal"
+      },
+      "secondary": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "accent": {
+        "dark": "darkCyan",
+        "light": "lightTeal"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkYellow",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "text": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "textMuted": {
+        "dark": "darkMuted",
+        "light": "lightMuted"
+      },
+      "background": {
+        "dark": "darkBg",
+        "light": "lightBg"
+      },
+      "backgroundPanel": {
+        "dark": "darkPanel",
+        "light": "lightPanel"
+      },
+      "backgroundElement": {
+        "dark": "darkElement",
+        "light": "lightElement"
+      },
+      "border": {
+        "dark": "darkBorder",
+        "light": "lightBorder"
+      },
+      "borderActive": {
+        "dark": "darkCyan",
+        "light": "lightTeal"
+      },
+      "borderSubtle": {
+        "dark": "#0f0f0f",
+        "light": "#e0e0e0"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkMuted",
+        "light": "lightMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "darkMuted",
+        "light": "lightMuted"
+      },
+      "diffHighlightAdded": {
+        "dark": "darkGreenBright",
+        "light": "lightGreenBright"
+      },
+      "diffHighlightRemoved": {
+        "dark": "darkRedBright",
+        "light": "lightRedBright"
+      },
+      "diffAddedBg": {
+        "dark": "#3fa26633",
+        "light": "#1f8a651f"
+      },
+      "diffRemovedBg": {
+        "dark": "#b8004933",
+        "light": "#cf2d5614"
+      },
+      "diffContextBg": {
+        "dark": "darkPanel",
+        "light": "lightPanel"
+      },
+      "diffLineNumber": {
+        "dark": "#e4e4e442",
+        "light": "#1414147a"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#3fa26633",
+        "light": "#1f8a651f"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#b8004933",
+        "light": "#cf2d5614"
+      },
+      "markdownText": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "markdownHeading": {
+        "dark": "darkPurple",
+        "light": "lightBlueDark"
+      },
+      "markdownLink": {
+        "dark": "darkTeal",
+        "light": "lightBlueDark"
+      },
+      "markdownLinkText": {
+        "dark": "darkBlue",
+        "light": "lightMuted"
+      },
+      "markdownCode": {
+        "dark": "darkPink",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkMuted",
+        "light": "lightMuted"
+      },
+      "markdownEmph": {
+        "dark": "darkTeal",
+        "light": "lightFg"
+      },
+      "markdownStrong": {
+        "dark": "darkSyntaxYellow",
+        "light": "lightFg"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkMuted",
+        "light": "lightMuted"
+      },
+      "markdownListItem": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightMuted"
+      },
+      "markdownImage": {
+        "dark": "darkCyan",
+        "light": "lightBlueDark"
+      },
+      "markdownImageText": {
+        "dark": "darkBlue",
+        "light": "lightMuted"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxComment": {
+        "dark": "darkMuted",
+        "light": "lightMuted"
+      },
+      "syntaxKeyword": {
+        "dark": "darkTeal",
+        "light": "lightMagenta"
+      },
+      "syntaxFunction": {
+        "dark": "darkSyntaxOrange",
+        "light": "lightOrange"
+      },
+      "syntaxVariable": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxString": {
+        "dark": "darkPink",
+        "light": "lightPurple"
+      },
+      "syntaxNumber": {
+        "dark": "darkSyntaxYellow",
+        "light": "lightPink"
+      },
+      "syntaxType": {
+        "dark": "darkSyntaxOrange",
+        "light": "lightBlueDark"
+      },
+      "syntaxOperator": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      }
+    }
+  },
+  "dracula": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "background": "#282a36",
+      "currentLine": "#44475a",
+      "selection": "#44475a",
+      "foreground": "#f8f8f2",
+      "comment": "#6272a4",
+      "cyan": "#8be9fd",
+      "green": "#50fa7b",
+      "orange": "#ffb86c",
+      "pink": "#ff79c6",
+      "purple": "#bd93f9",
+      "red": "#ff5555",
+      "yellow": "#f1fa8c"
+    },
+    "theme": {
+      "primary": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "secondary": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "accent": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "error": {
+        "dark": "red",
+        "light": "red"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "yellow"
+      },
+      "success": {
+        "dark": "green",
+        "light": "green"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "orange"
+      },
+      "text": {
+        "dark": "foreground",
+        "light": "#282a36"
+      },
+      "textMuted": {
+        "dark": "comment",
+        "light": "#6272a4"
+      },
+      "background": {
+        "dark": "#282a36",
+        "light": "#f8f8f2"
+      },
+      "backgroundPanel": {
+        "dark": "#21222c",
+        "light": "#e8e8e2"
+      },
+      "backgroundElement": {
+        "dark": "currentLine",
+        "light": "#d8d8d2"
+      },
+      "border": {
+        "dark": "currentLine",
+        "light": "#c8c8c2"
+      },
+      "borderActive": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "borderSubtle": {
+        "dark": "#191a21",
+        "light": "#e0e0e0"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "green"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "red"
+      },
+      "diffContext": {
+        "dark": "comment",
+        "light": "#6272a4"
+      },
+      "diffHunkHeader": {
+        "dark": "comment",
+        "light": "#6272a4"
+      },
+      "diffHighlightAdded": {
+        "dark": "green",
+        "light": "green"
+      },
+      "diffHighlightRemoved": {
+        "dark": "red",
+        "light": "red"
+      },
+      "diffAddedBg": {
+        "dark": "#1a3a1a",
+        "light": "#e0ffe0"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a1a1a",
+        "light": "#ffe0e0"
+      },
+      "diffContextBg": {
+        "dark": "#21222c",
+        "light": "#e8e8e2"
+      },
+      "diffLineNumber": {
+        "dark": "currentLine",
+        "light": "#c8c8c2"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1a3a1a",
+        "light": "#e0ffe0"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3a1a1a",
+        "light": "#ffe0e0"
+      },
+      "markdownText": {
+        "dark": "foreground",
+        "light": "#282a36"
+      },
+      "markdownHeading": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "markdownLink": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "markdownLinkText": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "green"
+      },
+      "markdownBlockQuote": {
+        "dark": "comment",
+        "light": "#6272a4"
+      },
+      "markdownEmph": {
+        "dark": "yellow",
+        "light": "yellow"
+      },
+      "markdownStrong": {
+        "dark": "orange",
+        "light": "orange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "comment",
+        "light": "#6272a4"
+      },
+      "markdownListItem": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "markdownListEnumeration": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "markdownImage": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "markdownImageText": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "markdownCodeBlock": {
+        "dark": "foreground",
+        "light": "#282a36"
+      },
+      "syntaxComment": {
+        "dark": "comment",
+        "light": "#6272a4"
+      },
+      "syntaxKeyword": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "syntaxFunction": {
+        "dark": "green",
+        "light": "green"
+      },
+      "syntaxVariable": {
+        "dark": "foreground",
+        "light": "#282a36"
+      },
+      "syntaxString": {
+        "dark": "yellow",
+        "light": "yellow"
+      },
+      "syntaxNumber": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "syntaxType": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "syntaxOperator": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "syntaxPunctuation": {
+        "dark": "foreground",
+        "light": "#282a36"
+      }
+    }
+  },
+  "everforest": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkStep1": "#2d353b",
+      "darkStep2": "#333c43",
+      "darkStep3": "#343f44",
+      "darkStep4": "#3d484d",
+      "darkStep5": "#475258",
+      "darkStep6": "#7a8478",
+      "darkStep7": "#859289",
+      "darkStep8": "#9da9a0",
+      "darkStep9": "#a7c080",
+      "darkStep10": "#83c092",
+      "darkStep11": "#7a8478",
+      "darkStep12": "#d3c6aa",
+      "darkRed": "#e67e80",
+      "darkOrange": "#e69875",
+      "darkGreen": "#a7c080",
+      "darkCyan": "#83c092",
+      "darkYellow": "#dbbc7f",
+      "lightStep1": "#fdf6e3",
+      "lightStep2": "#efebd4",
+      "lightStep3": "#f4f0d9",
+      "lightStep4": "#efebd4",
+      "lightStep5": "#e6e2cc",
+      "lightStep6": "#a6b0a0",
+      "lightStep7": "#939f91",
+      "lightStep8": "#829181",
+      "lightStep9": "#8da101",
+      "lightStep10": "#35a77c",
+      "lightStep11": "#a6b0a0",
+      "lightStep12": "#5c6a72",
+      "lightRed": "#f85552",
+      "lightOrange": "#f57d26",
+      "lightGreen": "#8da101",
+      "lightCyan": "#35a77c",
+      "lightYellow": "#dfa000"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "secondary": {
+        "dark": "#7fbbb3",
+        "light": "#3a94c5"
+      },
+      "accent": {
+        "dark": "#d699b6",
+        "light": "#df69ba"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "text": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "textMuted": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "background": {
+        "dark": "darkStep1",
+        "light": "lightStep1"
+      },
+      "backgroundPanel": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "backgroundElement": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "border": {
+        "dark": "darkStep7",
+        "light": "lightStep7"
+      },
+      "borderActive": {
+        "dark": "darkStep8",
+        "light": "lightStep8"
+      },
+      "borderSubtle": {
+        "dark": "darkStep6",
+        "light": "lightStep6"
+      },
+      "diffAdded": {
+        "dark": "#4fd6be",
+        "light": "#1e725c"
+      },
+      "diffRemoved": {
+        "dark": "#c53b53",
+        "light": "#c53b53"
+      },
+      "diffContext": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHunkHeader": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHighlightAdded": {
+        "dark": "#b8db87",
+        "light": "#4db380"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#e26a75",
+        "light": "#f52a65"
+      },
+      "diffAddedBg": {
+        "dark": "#20303b",
+        "light": "#d5e5d5"
+      },
+      "diffRemovedBg": {
+        "dark": "#37222c",
+        "light": "#f7d8db"
+      },
+      "diffContextBg": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "diffLineNumber": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1b2b34",
+        "light": "#c5d5c5"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2d1f26",
+        "light": "#e7c8cb"
+      },
+      "markdownText": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "markdownHeading": {
+        "dark": "#d699b6",
+        "light": "#df69ba"
+      },
+      "markdownLink": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "markdownListItem": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "syntaxComment": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "syntaxKeyword": {
+        "dark": "#d699b6",
+        "light": "#df69ba"
+      },
+      "syntaxFunction": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      }
+    }
+  },
+  "flexoki": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "black": "#100F0F",
+      "base950": "#1C1B1A",
+      "base900": "#282726",
+      "base850": "#343331",
+      "base800": "#403E3C",
+      "base700": "#575653",
+      "base600": "#6F6E69",
+      "base500": "#878580",
+      "base300": "#B7B5AC",
+      "base200": "#CECDC3",
+      "base150": "#DAD8CE",
+      "base100": "#E6E4D9",
+      "base50": "#F2F0E5",
+      "paper": "#FFFCF0",
+      "red400": "#D14D41",
+      "red600": "#AF3029",
+      "orange400": "#DA702C",
+      "orange600": "#BC5215",
+      "yellow400": "#D0A215",
+      "yellow600": "#AD8301",
+      "green400": "#879A39",
+      "green600": "#66800B",
+      "cyan400": "#3AA99F",
+      "cyan600": "#24837B",
+      "blue400": "#4385BE",
+      "blue600": "#205EA6",
+      "purple400": "#8B7EC8",
+      "purple600": "#5E409D",
+      "magenta400": "#CE5D97",
+      "magenta600": "#A02F6F"
+    },
+    "theme": {
+      "primary": {
+        "dark": "orange400",
+        "light": "blue600"
+      },
+      "secondary": {
+        "dark": "blue400",
+        "light": "purple600"
+      },
+      "accent": {
+        "dark": "purple400",
+        "light": "orange600"
+      },
+      "error": {
+        "dark": "red400",
+        "light": "red600"
+      },
+      "warning": {
+        "dark": "orange400",
+        "light": "orange600"
+      },
+      "success": {
+        "dark": "green400",
+        "light": "green600"
+      },
+      "info": {
+        "dark": "cyan400",
+        "light": "cyan600"
+      },
+      "text": {
+        "dark": "base200",
+        "light": "black"
+      },
+      "textMuted": {
+        "dark": "base600",
+        "light": "base600"
+      },
+      "background": {
+        "dark": "black",
+        "light": "paper"
+      },
+      "backgroundPanel": {
+        "dark": "base950",
+        "light": "base50"
+      },
+      "backgroundElement": {
+        "dark": "base900",
+        "light": "base100"
+      },
+      "border": {
+        "dark": "base700",
+        "light": "base300"
+      },
+      "borderActive": {
+        "dark": "base600",
+        "light": "base500"
+      },
+      "borderSubtle": {
+        "dark": "base800",
+        "light": "base200"
+      },
+      "diffAdded": {
+        "dark": "green400",
+        "light": "green600"
+      },
+      "diffRemoved": {
+        "dark": "red400",
+        "light": "red600"
+      },
+      "diffContext": {
+        "dark": "base600",
+        "light": "base600"
+      },
+      "diffHunkHeader": {
+        "dark": "blue400",
+        "light": "blue600"
+      },
+      "diffHighlightAdded": {
+        "dark": "green400",
+        "light": "green600"
+      },
+      "diffHighlightRemoved": {
+        "dark": "red400",
+        "light": "red600"
+      },
+      "diffAddedBg": {
+        "dark": "#1A2D1A",
+        "light": "#D5E5D5"
+      },
+      "diffRemovedBg": {
+        "dark": "#2D1A1A",
+        "light": "#F7D8DB"
+      },
+      "diffContextBg": {
+        "dark": "base950",
+        "light": "base50"
+      },
+      "diffLineNumber": {
+        "dark": "base600",
+        "light": "base600"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#152515",
+        "light": "#C5D5C5"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#251515",
+        "light": "#E7C8CB"
+      },
+      "markdownText": {
+        "dark": "base200",
+        "light": "black"
+      },
+      "markdownHeading": {
+        "dark": "purple400",
+        "light": "purple600"
+      },
+      "markdownLink": {
+        "dark": "blue400",
+        "light": "blue600"
+      },
+      "markdownLinkText": {
+        "dark": "cyan400",
+        "light": "cyan600"
+      },
+      "markdownCode": {
+        "dark": "cyan400",
+        "light": "cyan600"
+      },
+      "markdownBlockQuote": {
+        "dark": "yellow400",
+        "light": "yellow600"
+      },
+      "markdownEmph": {
+        "dark": "yellow400",
+        "light": "yellow600"
+      },
+      "markdownStrong": {
+        "dark": "orange400",
+        "light": "orange600"
+      },
+      "markdownHorizontalRule": {
+        "dark": "base600",
+        "light": "base600"
+      },
+      "markdownListItem": {
+        "dark": "orange400",
+        "light": "orange600"
+      },
+      "markdownListEnumeration": {
+        "dark": "cyan400",
+        "light": "cyan600"
+      },
+      "markdownImage": {
+        "dark": "magenta400",
+        "light": "magenta600"
+      },
+      "markdownImageText": {
+        "dark": "cyan400",
+        "light": "cyan600"
+      },
+      "markdownCodeBlock": {
+        "dark": "base200",
+        "light": "black"
+      },
+      "syntaxComment": {
+        "dark": "base600",
+        "light": "base600"
+      },
+      "syntaxKeyword": {
+        "dark": "green400",
+        "light": "green600"
+      },
+      "syntaxFunction": {
+        "dark": "orange400",
+        "light": "orange600"
+      },
+      "syntaxVariable": {
+        "dark": "blue400",
+        "light": "blue600"
+      },
+      "syntaxString": {
+        "dark": "cyan400",
+        "light": "cyan600"
+      },
+      "syntaxNumber": {
+        "dark": "purple400",
+        "light": "purple600"
+      },
+      "syntaxType": {
+        "dark": "yellow400",
+        "light": "yellow600"
+      },
+      "syntaxOperator": {
+        "dark": "base300",
+        "light": "base600"
+      },
+      "syntaxPunctuation": {
+        "dark": "base300",
+        "light": "base600"
+      }
+    }
+  },
+  "github": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg": "#0d1117",
+      "darkBgAlt": "#010409",
+      "darkBgPanel": "#161b22",
+      "darkFg": "#c9d1d9",
+      "darkFgMuted": "#8b949e",
+      "darkBlue": "#58a6ff",
+      "darkGreen": "#3fb950",
+      "darkRed": "#f85149",
+      "darkOrange": "#d29922",
+      "darkPurple": "#bc8cff",
+      "darkPink": "#ff7b72",
+      "darkYellow": "#e3b341",
+      "darkCyan": "#39c5cf",
+      "lightBg": "#ffffff",
+      "lightBgAlt": "#f6f8fa",
+      "lightBgPanel": "#f0f3f6",
+      "lightFg": "#24292f",
+      "lightFgMuted": "#57606a",
+      "lightBlue": "#0969da",
+      "lightGreen": "#1a7f37",
+      "lightRed": "#cf222e",
+      "lightOrange": "#bc4c00",
+      "lightPurple": "#8250df",
+      "lightPink": "#bf3989",
+      "lightYellow": "#9a6700",
+      "lightCyan": "#1b7c83"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "secondary": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "accent": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "text": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "textMuted": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "background": {
+        "dark": "darkBg",
+        "light": "lightBg"
+      },
+      "backgroundPanel": {
+        "dark": "darkBgAlt",
+        "light": "lightBgAlt"
+      },
+      "backgroundElement": {
+        "dark": "darkBgPanel",
+        "light": "lightBgPanel"
+      },
+      "border": {
+        "dark": "#30363d",
+        "light": "#d0d7de"
+      },
+      "borderActive": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "borderSubtle": {
+        "dark": "#21262d",
+        "light": "#d8dee4"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "diffHighlightAdded": {
+        "dark": "#3fb950",
+        "light": "#1a7f37"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#f85149",
+        "light": "#cf222e"
+      },
+      "diffAddedBg": {
+        "dark": "#033a16",
+        "light": "#dafbe1"
+      },
+      "diffRemovedBg": {
+        "dark": "#67060c",
+        "light": "#ffebe9"
+      },
+      "diffContextBg": {
+        "dark": "darkBgAlt",
+        "light": "lightBgAlt"
+      },
+      "diffLineNumber": {
+        "dark": "#484f58",
+        "light": "#afb8c1"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#033a16",
+        "light": "#dafbe1"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#67060c",
+        "light": "#ffebe9"
+      },
+      "markdownText": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "markdownHeading": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownLink": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkPink",
+        "light": "lightPink"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "#30363d",
+        "light": "#d0d7de"
+      },
+      "markdownListItem": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxComment": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "syntaxKeyword": {
+        "dark": "darkPink",
+        "light": "lightRed"
+      },
+      "syntaxFunction": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "syntaxVariable": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxString": {
+        "dark": "darkCyan",
+        "light": "lightBlue"
+      },
+      "syntaxNumber": {
+        "dark": "darkBlue",
+        "light": "lightCyan"
+      },
+      "syntaxType": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxOperator": {
+        "dark": "darkPink",
+        "light": "lightRed"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      }
+    }
+  },
+  "gruvbox": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg0": "#282828",
+      "darkBg1": "#3c3836",
+      "darkBg2": "#504945",
+      "darkBg3": "#665c54",
+      "darkFg0": "#fbf1c7",
+      "darkFg1": "#ebdbb2",
+      "darkGray": "#928374",
+      "darkRed": "#cc241d",
+      "darkGreen": "#98971a",
+      "darkYellow": "#d79921",
+      "darkBlue": "#458588",
+      "darkPurple": "#b16286",
+      "darkAqua": "#689d6a",
+      "darkOrange": "#d65d0e",
+      "darkRedBright": "#fb4934",
+      "darkGreenBright": "#b8bb26",
+      "darkYellowBright": "#fabd2f",
+      "darkBlueBright": "#83a598",
+      "darkPurpleBright": "#d3869b",
+      "darkAquaBright": "#8ec07c",
+      "darkOrangeBright": "#fe8019",
+      "lightBg0": "#fbf1c7",
+      "lightBg1": "#ebdbb2",
+      "lightBg2": "#d5c4a1",
+      "lightBg3": "#bdae93",
+      "lightFg0": "#282828",
+      "lightFg1": "#3c3836",
+      "lightGray": "#7c6f64",
+      "lightRed": "#9d0006",
+      "lightGreen": "#79740e",
+      "lightYellow": "#b57614",
+      "lightBlue": "#076678",
+      "lightPurple": "#8f3f71",
+      "lightAqua": "#427b58",
+      "lightOrange": "#af3a03"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkBlueBright",
+        "light": "lightBlue"
+      },
+      "secondary": {
+        "dark": "darkPurpleBright",
+        "light": "lightPurple"
+      },
+      "accent": {
+        "dark": "darkAquaBright",
+        "light": "lightAqua"
+      },
+      "error": {
+        "dark": "darkRedBright",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkOrangeBright",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkYellowBright",
+        "light": "lightYellow"
+      },
+      "text": {
+        "dark": "darkFg1",
+        "light": "lightFg1"
+      },
+      "textMuted": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "background": {
+        "dark": "darkBg0",
+        "light": "lightBg0"
+      },
+      "backgroundPanel": {
+        "dark": "darkBg1",
+        "light": "lightBg1"
+      },
+      "backgroundElement": {
+        "dark": "darkBg2",
+        "light": "lightBg2"
+      },
+      "border": {
+        "dark": "darkBg3",
+        "light": "lightBg3"
+      },
+      "borderActive": {
+        "dark": "darkFg1",
+        "light": "lightFg1"
+      },
+      "borderSubtle": {
+        "dark": "darkBg2",
+        "light": "lightBg2"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "diffHunkHeader": {
+        "dark": "darkAqua",
+        "light": "lightAqua"
+      },
+      "diffHighlightAdded": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "darkRedBright",
+        "light": "lightRed"
+      },
+      "diffAddedBg": {
+        "dark": "#32302f",
+        "light": "#dcd8a4"
+      },
+      "diffRemovedBg": {
+        "dark": "#322929",
+        "light": "#e2c7c3"
+      },
+      "diffContextBg": {
+        "dark": "darkBg1",
+        "light": "lightBg1"
+      },
+      "diffLineNumber": {
+        "dark": "darkBg3",
+        "light": "lightBg3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#2a2827",
+        "light": "#cec99e"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2a2222",
+        "light": "#d3bdb9"
+      },
+      "markdownText": {
+        "dark": "darkFg1",
+        "light": "lightFg1"
+      },
+      "markdownHeading": {
+        "dark": "darkBlueBright",
+        "light": "lightBlue"
+      },
+      "markdownLink": {
+        "dark": "darkAquaBright",
+        "light": "lightAqua"
+      },
+      "markdownLinkText": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "markdownCode": {
+        "dark": "darkYellowBright",
+        "light": "lightYellow"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "markdownEmph": {
+        "dark": "darkPurpleBright",
+        "light": "lightPurple"
+      },
+      "markdownStrong": {
+        "dark": "darkOrangeBright",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "markdownListItem": {
+        "dark": "darkBlueBright",
+        "light": "lightBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkAquaBright",
+        "light": "lightAqua"
+      },
+      "markdownImage": {
+        "dark": "darkAquaBright",
+        "light": "lightAqua"
+      },
+      "markdownImageText": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkFg1",
+        "light": "lightFg1"
+      },
+      "syntaxComment": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "syntaxKeyword": {
+        "dark": "darkRedBright",
+        "light": "lightRed"
+      },
+      "syntaxFunction": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "syntaxVariable": {
+        "dark": "darkBlueBright",
+        "light": "lightBlue"
+      },
+      "syntaxString": {
+        "dark": "darkYellowBright",
+        "light": "lightYellow"
+      },
+      "syntaxNumber": {
+        "dark": "darkPurpleBright",
+        "light": "lightPurple"
+      },
+      "syntaxType": {
+        "dark": "darkAquaBright",
+        "light": "lightAqua"
+      },
+      "syntaxOperator": {
+        "dark": "darkOrangeBright",
+        "light": "lightOrange"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkFg1",
+        "light": "lightFg1"
+      }
+    }
+  },
+  "kanagawa": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "sumiInk0": "#1F1F28",
+      "sumiInk1": "#2A2A37",
+      "sumiInk2": "#363646",
+      "sumiInk3": "#54546D",
+      "fujiWhite": "#DCD7BA",
+      "oldWhite": "#C8C093",
+      "fujiGray": "#727169",
+      "oniViolet": "#957FB8",
+      "crystalBlue": "#7E9CD8",
+      "carpYellow": "#C38D9D",
+      "sakuraPink": "#D27E99",
+      "waveAqua": "#76946A",
+      "roninYellow": "#D7A657",
+      "dragonRed": "#E82424",
+      "lotusGreen": "#98BB6C",
+      "waveBlue": "#2D4F67",
+      "lightBg": "#F2E9DE",
+      "lightPaper": "#EAE4D7",
+      "lightText": "#54433A",
+      "lightGray": "#9E9389"
+    },
+    "theme": {
+      "primary": {
+        "dark": "crystalBlue",
+        "light": "waveBlue"
+      },
+      "secondary": {
+        "dark": "oniViolet",
+        "light": "oniViolet"
+      },
+      "accent": {
+        "dark": "sakuraPink",
+        "light": "sakuraPink"
+      },
+      "error": {
+        "dark": "dragonRed",
+        "light": "dragonRed"
+      },
+      "warning": {
+        "dark": "roninYellow",
+        "light": "roninYellow"
+      },
+      "success": {
+        "dark": "lotusGreen",
+        "light": "lotusGreen"
+      },
+      "info": {
+        "dark": "waveAqua",
+        "light": "waveAqua"
+      },
+      "text": {
+        "dark": "fujiWhite",
+        "light": "lightText"
+      },
+      "textMuted": {
+        "dark": "fujiGray",
+        "light": "lightGray"
+      },
+      "background": {
+        "dark": "sumiInk0",
+        "light": "lightBg"
+      },
+      "backgroundPanel": {
+        "dark": "sumiInk1",
+        "light": "lightPaper"
+      },
+      "backgroundElement": {
+        "dark": "sumiInk2",
+        "light": "#E3DCD2"
+      },
+      "border": {
+        "dark": "sumiInk3",
+        "light": "#D4CBBF"
+      },
+      "borderActive": {
+        "dark": "carpYellow",
+        "light": "carpYellow"
+      },
+      "borderSubtle": {
+        "dark": "sumiInk2",
+        "light": "#DCD4C9"
+      },
+      "diffAdded": {
+        "dark": "lotusGreen",
+        "light": "lotusGreen"
+      },
+      "diffRemoved": {
+        "dark": "dragonRed",
+        "light": "dragonRed"
+      },
+      "diffContext": {
+        "dark": "fujiGray",
+        "light": "lightGray"
+      },
+      "diffHunkHeader": {
+        "dark": "waveBlue",
+        "light": "waveBlue"
+      },
+      "diffHighlightAdded": {
+        "dark": "#A9D977",
+        "light": "#89AF5B"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#F24A4A",
+        "light": "#D61F1F"
+      },
+      "diffAddedBg": {
+        "dark": "#252E25",
+        "light": "#EAF3E4"
+      },
+      "diffRemovedBg": {
+        "dark": "#362020",
+        "light": "#FBE6E6"
+      },
+      "diffContextBg": {
+        "dark": "sumiInk1",
+        "light": "lightPaper"
+      },
+      "diffLineNumber": {
+        "dark": "sumiInk3",
+        "light": "#C7BEB4"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#202820",
+        "light": "#DDE8D6"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2D1C1C",
+        "light": "#F2DADA"
+      },
+      "markdownText": {
+        "dark": "fujiWhite",
+        "light": "lightText"
+      },
+      "markdownHeading": {
+        "dark": "oniViolet",
+        "light": "oniViolet"
+      },
+      "markdownLink": {
+        "dark": "crystalBlue",
+        "light": "waveBlue"
+      },
+      "markdownLinkText": {
+        "dark": "waveAqua",
+        "light": "waveAqua"
+      },
+      "markdownCode": {
+        "dark": "lotusGreen",
+        "light": "lotusGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "fujiGray",
+        "light": "lightGray"
+      },
+      "markdownEmph": {
+        "dark": "carpYellow",
+        "light": "carpYellow"
+      },
+      "markdownStrong": {
+        "dark": "roninYellow",
+        "light": "roninYellow"
+      },
+      "markdownHorizontalRule": {
+        "dark": "fujiGray",
+        "light": "lightGray"
+      },
+      "markdownListItem": {
+        "dark": "crystalBlue",
+        "light": "waveBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "waveAqua",
+        "light": "waveAqua"
+      },
+      "markdownImage": {
+        "dark": "crystalBlue",
+        "light": "waveBlue"
+      },
+      "markdownImageText": {
+        "dark": "waveAqua",
+        "light": "waveAqua"
+      },
+      "markdownCodeBlock": {
+        "dark": "fujiWhite",
+        "light": "lightText"
+      },
+      "syntaxComment": {
+        "dark": "fujiGray",
+        "light": "lightGray"
+      },
+      "syntaxKeyword": {
+        "dark": "oniViolet",
+        "light": "oniViolet"
+      },
+      "syntaxFunction": {
+        "dark": "crystalBlue",
+        "light": "waveBlue"
+      },
+      "syntaxVariable": {
+        "dark": "fujiWhite",
+        "light": "lightText"
+      },
+      "syntaxString": {
+        "dark": "lotusGreen",
+        "light": "lotusGreen"
+      },
+      "syntaxNumber": {
+        "dark": "roninYellow",
+        "light": "roninYellow"
+      },
+      "syntaxType": {
+        "dark": "carpYellow",
+        "light": "carpYellow"
+      },
+      "syntaxOperator": {
+        "dark": "sakuraPink",
+        "light": "sakuraPink"
+      },
+      "syntaxPunctuation": {
+        "dark": "fujiWhite",
+        "light": "lightText"
+      }
+    }
+  },
+  "lucent-orng": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkStep6": "#3c3c3c",
+      "darkStep11": "#808080",
+      "darkStep12": "#eeeeee",
+      "darkSecondary": "#EE7948",
+      "darkAccent": "#FFF7F1",
+      "darkRed": "#e06c75",
+      "darkOrange": "#EC5B2B",
+      "darkBlue": "#6ba1e6",
+      "darkCyan": "#56b6c2",
+      "darkYellow": "#e5c07b",
+      "darkPanelBg": "#2a1a1599",
+      "lightStep6": "#d4d4d4",
+      "lightStep11": "#8a8a8a",
+      "lightStep12": "#1a1a1a",
+      "lightSecondary": "#EE7948",
+      "lightAccent": "#c94d24",
+      "lightRed": "#d1383d",
+      "lightOrange": "#EC5B2B",
+      "lightBlue": "#0062d1",
+      "lightCyan": "#318795",
+      "lightYellow": "#b0851f",
+      "lightPanelBg": "#fff5f099"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "secondary": {
+        "dark": "darkSecondary",
+        "light": "lightSecondary"
+      },
+      "accent": {
+        "dark": "darkAccent",
+        "light": "lightAccent"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "info": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "text": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "textMuted": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "selectedListItemText": {
+        "dark": "#0a0a0a",
+        "light": "#ffffff"
+      },
+      "background": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "backgroundPanel": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "backgroundElement": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "backgroundMenu": {
+        "dark": "darkPanelBg",
+        "light": "lightPanelBg"
+      },
+      "border": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "borderActive": {
+        "dark": "darkSecondary",
+        "light": "lightAccent"
+      },
+      "borderSubtle": {
+        "dark": "darkStep6",
+        "light": "lightStep6"
+      },
+      "diffAdded": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "diffRemoved": {
+        "dark": "#c53b53",
+        "light": "#c53b53"
+      },
+      "diffContext": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHunkHeader": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHighlightAdded": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#e26a75",
+        "light": "#f52a65"
+      },
+      "diffAddedBg": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "diffRemovedBg": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "diffContextBg": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "diffLineNumber": {
+        "dark": "#666666",
+        "light": "#999999"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "transparent",
+        "light": "transparent"
+      },
+      "markdownText": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "markdownHeading": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownLink": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkAccent",
+        "light": "lightYellow"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkSecondary",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "markdownListItem": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "syntaxComment": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "syntaxKeyword": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxFunction": {
+        "dark": "darkSecondary",
+        "light": "lightAccent"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "syntaxNumber": {
+        "dark": "darkAccent",
+        "light": "lightOrange"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      }
+    }
+  },
+  "material": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg": "#263238",
+      "darkBgAlt": "#1e272c",
+      "darkBgPanel": "#37474f",
+      "darkFg": "#eeffff",
+      "darkFgMuted": "#546e7a",
+      "darkRed": "#f07178",
+      "darkPink": "#f78c6c",
+      "darkOrange": "#ffcb6b",
+      "darkYellow": "#ffcb6b",
+      "darkGreen": "#c3e88d",
+      "darkCyan": "#89ddff",
+      "darkBlue": "#82aaff",
+      "darkPurple": "#c792ea",
+      "darkViolet": "#bb80b3",
+      "lightBg": "#fafafa",
+      "lightBgAlt": "#f5f5f5",
+      "lightBgPanel": "#e7e7e8",
+      "lightFg": "#263238",
+      "lightFgMuted": "#90a4ae",
+      "lightRed": "#e53935",
+      "lightPink": "#ec407a",
+      "lightOrange": "#f4511e",
+      "lightYellow": "#ffb300",
+      "lightGreen": "#91b859",
+      "lightCyan": "#39adb5",
+      "lightBlue": "#6182b8",
+      "lightPurple": "#7c4dff",
+      "lightViolet": "#945eb8"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "secondary": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "accent": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "text": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "textMuted": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "background": {
+        "dark": "darkBg",
+        "light": "lightBg"
+      },
+      "backgroundPanel": {
+        "dark": "darkBgAlt",
+        "light": "lightBgAlt"
+      },
+      "backgroundElement": {
+        "dark": "darkBgPanel",
+        "light": "lightBgPanel"
+      },
+      "border": {
+        "dark": "#37474f",
+        "light": "#e0e0e0"
+      },
+      "borderActive": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "borderSubtle": {
+        "dark": "#1e272c",
+        "light": "#eeeeee"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "diffHighlightAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffAddedBg": {
+        "dark": "#2e3c2b",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedBg": {
+        "dark": "#3c2b2b",
+        "light": "#ffebee"
+      },
+      "diffContextBg": {
+        "dark": "darkBgAlt",
+        "light": "lightBgAlt"
+      },
+      "diffLineNumber": {
+        "dark": "#37474f",
+        "light": "#cfd8dc"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#2e3c2b",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3c2b2b",
+        "light": "#ffebee"
+      },
+      "markdownText": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "markdownHeading": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownLink": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownLinkText": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "markdownCode": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "#37474f",
+        "light": "#e0e0e0"
+      },
+      "markdownListItem": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImageText": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxComment": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "syntaxKeyword": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "syntaxFunction": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "syntaxVariable": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxString": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      }
+    }
+  },
+  "matrix": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "matrixInk0": "#0a0e0a",
+      "matrixInk1": "#0e130d",
+      "matrixInk2": "#141c12",
+      "matrixInk3": "#1e2a1b",
+      "rainGreen": "#2eff6a",
+      "rainGreenDim": "#1cc24b",
+      "rainGreenHi": "#62ff94",
+      "rainCyan": "#00efff",
+      "rainTeal": "#24f6d9",
+      "rainPurple": "#c770ff",
+      "rainOrange": "#ffa83d",
+      "alertRed": "#ff4b4b",
+      "alertYellow": "#e6ff57",
+      "alertBlue": "#30b3ff",
+      "rainGray": "#8ca391",
+      "lightBg": "#eef3ea",
+      "lightPaper": "#e4ebe1",
+      "lightInk1": "#dae1d7",
+      "lightText": "#203022",
+      "lightGray": "#748476"
+    },
+    "theme": {
+      "primary": {
+        "dark": "rainGreen",
+        "light": "rainGreenDim"
+      },
+      "secondary": {
+        "dark": "rainCyan",
+        "light": "rainTeal"
+      },
+      "accent": {
+        "dark": "rainPurple",
+        "light": "rainPurple"
+      },
+      "error": {
+        "dark": "alertRed",
+        "light": "alertRed"
+      },
+      "warning": {
+        "dark": "alertYellow",
+        "light": "alertYellow"
+      },
+      "success": {
+        "dark": "rainGreenHi",
+        "light": "rainGreenDim"
+      },
+      "info": {
+        "dark": "alertBlue",
+        "light": "alertBlue"
+      },
+      "text": {
+        "dark": "rainGreenHi",
+        "light": "lightText"
+      },
+      "textMuted": {
+        "dark": "rainGray",
+        "light": "lightGray"
+      },
+      "background": {
+        "dark": "matrixInk0",
+        "light": "lightBg"
+      },
+      "backgroundPanel": {
+        "dark": "matrixInk1",
+        "light": "lightPaper"
+      },
+      "backgroundElement": {
+        "dark": "matrixInk2",
+        "light": "lightInk1"
+      },
+      "border": {
+        "dark": "matrixInk3",
+        "light": "lightGray"
+      },
+      "borderActive": {
+        "dark": "rainGreen",
+        "light": "rainGreenDim"
+      },
+      "borderSubtle": {
+        "dark": "matrixInk2",
+        "light": "lightInk1"
+      },
+      "diffAdded": {
+        "dark": "rainGreenDim",
+        "light": "rainGreenDim"
+      },
+      "diffRemoved": {
+        "dark": "alertRed",
+        "light": "alertRed"
+      },
+      "diffContext": {
+        "dark": "rainGray",
+        "light": "lightGray"
+      },
+      "diffHunkHeader": {
+        "dark": "alertBlue",
+        "light": "alertBlue"
+      },
+      "diffHighlightAdded": {
+        "dark": "#77ffaf",
+        "light": "#5dac7e"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#ff7171",
+        "light": "#d53a3a"
+      },
+      "diffAddedBg": {
+        "dark": "#132616",
+        "light": "#e0efde"
+      },
+      "diffRemovedBg": {
+        "dark": "#261212",
+        "light": "#f9e5e5"
+      },
+      "diffContextBg": {
+        "dark": "matrixInk1",
+        "light": "lightPaper"
+      },
+      "diffLineNumber": {
+        "dark": "matrixInk3",
+        "light": "lightGray"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#0f1b11",
+        "light": "#d6e7d2"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#1b1414",
+        "light": "#f2d2d2"
+      },
+      "markdownText": {
+        "dark": "rainGreenHi",
+        "light": "lightText"
+      },
+      "markdownHeading": {
+        "dark": "rainCyan",
+        "light": "rainTeal"
+      },
+      "markdownLink": {
+        "dark": "alertBlue",
+        "light": "alertBlue"
+      },
+      "markdownLinkText": {
+        "dark": "rainTeal",
+        "light": "rainTeal"
+      },
+      "markdownCode": {
+        "dark": "rainGreenDim",
+        "light": "rainGreenDim"
+      },
+      "markdownBlockQuote": {
+        "dark": "rainGray",
+        "light": "lightGray"
+      },
+      "markdownEmph": {
+        "dark": "rainOrange",
+        "light": "rainOrange"
+      },
+      "markdownStrong": {
+        "dark": "alertYellow",
+        "light": "alertYellow"
+      },
+      "markdownHorizontalRule": {
+        "dark": "rainGray",
+        "light": "lightGray"
+      },
+      "markdownListItem": {
+        "dark": "alertBlue",
+        "light": "alertBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "rainTeal",
+        "light": "rainTeal"
+      },
+      "markdownImage": {
+        "dark": "alertBlue",
+        "light": "alertBlue"
+      },
+      "markdownImageText": {
+        "dark": "rainTeal",
+        "light": "rainTeal"
+      },
+      "markdownCodeBlock": {
+        "dark": "rainGreenHi",
+        "light": "lightText"
+      },
+      "syntaxComment": {
+        "dark": "rainGray",
+        "light": "lightGray"
+      },
+      "syntaxKeyword": {
+        "dark": "rainPurple",
+        "light": "rainPurple"
+      },
+      "syntaxFunction": {
+        "dark": "alertBlue",
+        "light": "alertBlue"
+      },
+      "syntaxVariable": {
+        "dark": "rainGreenHi",
+        "light": "lightText"
+      },
+      "syntaxString": {
+        "dark": "rainGreenDim",
+        "light": "rainGreenDim"
+      },
+      "syntaxNumber": {
+        "dark": "rainOrange",
+        "light": "rainOrange"
+      },
+      "syntaxType": {
+        "dark": "alertYellow",
+        "light": "alertYellow"
+      },
+      "syntaxOperator": {
+        "dark": "rainTeal",
+        "light": "rainTeal"
+      },
+      "syntaxPunctuation": {
+        "dark": "rainGreenHi",
+        "light": "lightText"
+      }
+    }
+  },
+  "mercury": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "purple-800": "#3442a6",
+      "purple-700": "#465bd1",
+      "purple-600": "#5266eb",
+      "purple-400": "#8da4f5",
+      "purple-300": "#a7b6f8",
+      "red-700": "#b0175f",
+      "red-600": "#d03275",
+      "red-400": "#fc92b4",
+      "green-700": "#036e43",
+      "green-600": "#188554",
+      "green-400": "#77c599",
+      "orange-700": "#a44200",
+      "orange-600": "#c45000",
+      "orange-400": "#fc9b6f",
+      "blue-600": "#007f95",
+      "blue-400": "#77becf",
+      "neutral-1000": "#10101a",
+      "neutral-950": "#171721",
+      "neutral-900": "#1e1e2a",
+      "neutral-800": "#272735",
+      "neutral-700": "#363644",
+      "neutral-600": "#535461",
+      "neutral-500": "#70707d",
+      "neutral-400": "#9d9da8",
+      "neutral-300": "#c3c3cc",
+      "neutral-200": "#dddde5",
+      "neutral-100": "#f4f5f9",
+      "neutral-050": "#fbfcfd",
+      "neutral-000": "#ffffff",
+      "neutral-150": "#ededf3",
+      "border-light": "#7073931a",
+      "border-light-subtle": "#7073930f",
+      "border-dark": "#b4b7c81f",
+      "border-dark-subtle": "#b4b7c814",
+      "diff-added-light": "#1885541a",
+      "diff-removed-light": "#d032751a",
+      "diff-added-dark": "#77c59933",
+      "diff-removed-dark": "#fc92b433"
+    },
+    "theme": {
+      "primary": {
+        "light": "purple-600",
+        "dark": "purple-400"
+      },
+      "secondary": {
+        "light": "purple-700",
+        "dark": "purple-300"
+      },
+      "accent": {
+        "light": "purple-400",
+        "dark": "purple-400"
+      },
+      "error": {
+        "light": "red-700",
+        "dark": "red-400"
+      },
+      "warning": {
+        "light": "orange-700",
+        "dark": "orange-400"
+      },
+      "success": {
+        "light": "green-700",
+        "dark": "green-400"
+      },
+      "info": {
+        "light": "blue-600",
+        "dark": "blue-400"
+      },
+      "text": {
+        "light": "neutral-700",
+        "dark": "neutral-200"
+      },
+      "textMuted": {
+        "light": "neutral-500",
+        "dark": "neutral-400"
+      },
+      "background": {
+        "light": "neutral-000",
+        "dark": "neutral-950"
+      },
+      "backgroundPanel": {
+        "light": "neutral-050",
+        "dark": "neutral-1000"
+      },
+      "backgroundElement": {
+        "light": "neutral-100",
+        "dark": "neutral-800"
+      },
+      "border": {
+        "light": "border-light",
+        "dark": "border-dark"
+      },
+      "borderActive": {
+        "light": "purple-600",
+        "dark": "purple-400"
+      },
+      "borderSubtle": {
+        "light": "border-light-subtle",
+        "dark": "border-dark-subtle"
+      },
+      "diffAdded": {
+        "light": "green-700",
+        "dark": "green-400"
+      },
+      "diffRemoved": {
+        "light": "red-700",
+        "dark": "red-400"
+      },
+      "diffContext": {
+        "light": "neutral-500",
+        "dark": "neutral-400"
+      },
+      "diffHunkHeader": {
+        "light": "neutral-500",
+        "dark": "neutral-400"
+      },
+      "diffHighlightAdded": {
+        "light": "green-700",
+        "dark": "green-400"
+      },
+      "diffHighlightRemoved": {
+        "light": "red-700",
+        "dark": "red-400"
+      },
+      "diffAddedBg": {
+        "light": "diff-added-light",
+        "dark": "diff-added-dark"
+      },
+      "diffRemovedBg": {
+        "light": "diff-removed-light",
+        "dark": "diff-removed-dark"
+      },
+      "diffContextBg": {
+        "light": "neutral-050",
+        "dark": "neutral-900"
+      },
+      "diffLineNumber": {
+        "light": "neutral-600",
+        "dark": "neutral-300"
+      },
+      "diffAddedLineNumberBg": {
+        "light": "diff-added-light",
+        "dark": "diff-added-dark"
+      },
+      "diffRemovedLineNumberBg": {
+        "light": "diff-removed-light",
+        "dark": "diff-removed-dark"
+      },
+      "markdownText": {
+        "light": "neutral-700",
+        "dark": "neutral-200"
+      },
+      "markdownHeading": {
+        "light": "neutral-900",
+        "dark": "neutral-000"
+      },
+      "markdownLink": {
+        "light": "purple-700",
+        "dark": "purple-400"
+      },
+      "markdownLinkText": {
+        "light": "purple-600",
+        "dark": "purple-300"
+      },
+      "markdownCode": {
+        "light": "green-700",
+        "dark": "green-400"
+      },
+      "markdownBlockQuote": {
+        "light": "neutral-500",
+        "dark": "neutral-400"
+      },
+      "markdownEmph": {
+        "light": "orange-700",
+        "dark": "orange-400"
+      },
+      "markdownStrong": {
+        "light": "neutral-900",
+        "dark": "neutral-100"
+      },
+      "markdownHorizontalRule": {
+        "light": "border-light",
+        "dark": "border-dark"
+      },
+      "markdownListItem": {
+        "light": "neutral-900",
+        "dark": "neutral-000"
+      },
+      "markdownListEnumeration": {
+        "light": "purple-600",
+        "dark": "purple-400"
+      },
+      "markdownImage": {
+        "light": "purple-700",
+        "dark": "purple-400"
+      },
+      "markdownImageText": {
+        "light": "purple-600",
+        "dark": "purple-300"
+      },
+      "markdownCodeBlock": {
+        "light": "neutral-700",
+        "dark": "neutral-200"
+      },
+      "syntaxComment": {
+        "light": "neutral-500",
+        "dark": "neutral-400"
+      },
+      "syntaxKeyword": {
+        "light": "purple-700",
+        "dark": "purple-400"
+      },
+      "syntaxFunction": {
+        "light": "purple-600",
+        "dark": "purple-400"
+      },
+      "syntaxVariable": {
+        "light": "blue-600",
+        "dark": "blue-400"
+      },
+      "syntaxString": {
+        "light": "green-700",
+        "dark": "green-400"
+      },
+      "syntaxNumber": {
+        "light": "orange-700",
+        "dark": "orange-400"
+      },
+      "syntaxType": {
+        "light": "blue-600",
+        "dark": "blue-400"
+      },
+      "syntaxOperator": {
+        "light": "purple-700",
+        "dark": "purple-400"
+      },
+      "syntaxPunctuation": {
+        "light": "neutral-700",
+        "dark": "neutral-200"
+      }
+    }
+  },
+  "monokai": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "background": "#272822",
+      "backgroundAlt": "#1e1f1c",
+      "backgroundPanel": "#3e3d32",
+      "foreground": "#f8f8f2",
+      "comment": "#75715e",
+      "red": "#f92672",
+      "orange": "#fd971f",
+      "lightOrange": "#e69f66",
+      "yellow": "#e6db74",
+      "green": "#a6e22e",
+      "cyan": "#66d9ef",
+      "blue": "#66d9ef",
+      "purple": "#ae81ff",
+      "pink": "#f92672"
+    },
+    "theme": {
+      "primary": {
+        "dark": "cyan",
+        "light": "blue"
+      },
+      "secondary": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "accent": {
+        "dark": "green",
+        "light": "green"
+      },
+      "error": {
+        "dark": "red",
+        "light": "red"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "orange"
+      },
+      "success": {
+        "dark": "green",
+        "light": "green"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "orange"
+      },
+      "text": {
+        "dark": "foreground",
+        "light": "#272822"
+      },
+      "textMuted": {
+        "dark": "comment",
+        "light": "#75715e"
+      },
+      "background": {
+        "dark": "#272822",
+        "light": "#fafafa"
+      },
+      "backgroundPanel": {
+        "dark": "#1e1f1c",
+        "light": "#f0f0f0"
+      },
+      "backgroundElement": {
+        "dark": "#3e3d32",
+        "light": "#e0e0e0"
+      },
+      "border": {
+        "dark": "#3e3d32",
+        "light": "#d0d0d0"
+      },
+      "borderActive": {
+        "dark": "cyan",
+        "light": "blue"
+      },
+      "borderSubtle": {
+        "dark": "#1e1f1c",
+        "light": "#e8e8e8"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "green"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "red"
+      },
+      "diffContext": {
+        "dark": "comment",
+        "light": "#75715e"
+      },
+      "diffHunkHeader": {
+        "dark": "comment",
+        "light": "#75715e"
+      },
+      "diffHighlightAdded": {
+        "dark": "green",
+        "light": "green"
+      },
+      "diffHighlightRemoved": {
+        "dark": "red",
+        "light": "red"
+      },
+      "diffAddedBg": {
+        "dark": "#1a3a1a",
+        "light": "#e0ffe0"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a1a1a",
+        "light": "#ffe0e0"
+      },
+      "diffContextBg": {
+        "dark": "#1e1f1c",
+        "light": "#f0f0f0"
+      },
+      "diffLineNumber": {
+        "dark": "#3e3d32",
+        "light": "#d0d0d0"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1a3a1a",
+        "light": "#e0ffe0"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3a1a1a",
+        "light": "#ffe0e0"
+      },
+      "markdownText": {
+        "dark": "foreground",
+        "light": "#272822"
+      },
+      "markdownHeading": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "markdownLink": {
+        "dark": "cyan",
+        "light": "blue"
+      },
+      "markdownLinkText": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "green"
+      },
+      "markdownBlockQuote": {
+        "dark": "comment",
+        "light": "#75715e"
+      },
+      "markdownEmph": {
+        "dark": "yellow",
+        "light": "orange"
+      },
+      "markdownStrong": {
+        "dark": "orange",
+        "light": "orange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "comment",
+        "light": "#75715e"
+      },
+      "markdownListItem": {
+        "dark": "cyan",
+        "light": "blue"
+      },
+      "markdownListEnumeration": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "markdownImage": {
+        "dark": "cyan",
+        "light": "blue"
+      },
+      "markdownImageText": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "markdownCodeBlock": {
+        "dark": "foreground",
+        "light": "#272822"
+      },
+      "syntaxComment": {
+        "dark": "comment",
+        "light": "#75715e"
+      },
+      "syntaxKeyword": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "syntaxFunction": {
+        "dark": "green",
+        "light": "green"
+      },
+      "syntaxVariable": {
+        "dark": "foreground",
+        "light": "#272822"
+      },
+      "syntaxString": {
+        "dark": "yellow",
+        "light": "orange"
+      },
+      "syntaxNumber": {
+        "dark": "purple",
+        "light": "purple"
+      },
+      "syntaxType": {
+        "dark": "cyan",
+        "light": "blue"
+      },
+      "syntaxOperator": {
+        "dark": "pink",
+        "light": "pink"
+      },
+      "syntaxPunctuation": {
+        "dark": "foreground",
+        "light": "#272822"
+      }
+    }
+  },
+  "nightowl": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "nightOwlBg": "#011627",
+      "nightOwlFg": "#d6deeb",
+      "nightOwlBlue": "#82AAFF",
+      "nightOwlCyan": "#7fdbca",
+      "nightOwlGreen": "#c5e478",
+      "nightOwlYellow": "#ecc48d",
+      "nightOwlOrange": "#F78C6C",
+      "nightOwlRed": "#EF5350",
+      "nightOwlPink": "#ff5874",
+      "nightOwlPurple": "#c792ea",
+      "nightOwlMuted": "#5f7e97",
+      "nightOwlGray": "#637777",
+      "nightOwlLightGray": "#89a4bb",
+      "nightOwlPanel": "#0b253a"
+    },
+    "theme": {
+      "primary": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "secondary": {
+        "dark": "nightOwlCyan",
+        "light": "nightOwlCyan"
+      },
+      "accent": {
+        "dark": "nightOwlPurple",
+        "light": "nightOwlPurple"
+      },
+      "error": {
+        "dark": "nightOwlRed",
+        "light": "nightOwlRed"
+      },
+      "warning": {
+        "dark": "nightOwlYellow",
+        "light": "nightOwlYellow"
+      },
+      "success": {
+        "dark": "nightOwlGreen",
+        "light": "nightOwlGreen"
+      },
+      "info": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "text": {
+        "dark": "nightOwlFg",
+        "light": "nightOwlFg"
+      },
+      "textMuted": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "background": {
+        "dark": "nightOwlBg",
+        "light": "nightOwlBg"
+      },
+      "backgroundPanel": {
+        "dark": "nightOwlPanel",
+        "light": "nightOwlPanel"
+      },
+      "backgroundElement": {
+        "dark": "nightOwlPanel",
+        "light": "nightOwlPanel"
+      },
+      "border": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "borderActive": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "borderSubtle": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "diffAdded": {
+        "dark": "nightOwlGreen",
+        "light": "nightOwlGreen"
+      },
+      "diffRemoved": {
+        "dark": "nightOwlRed",
+        "light": "nightOwlRed"
+      },
+      "diffContext": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "diffHighlightAdded": {
+        "dark": "nightOwlGreen",
+        "light": "nightOwlGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "nightOwlRed",
+        "light": "nightOwlRed"
+      },
+      "diffAddedBg": {
+        "dark": "#0a2e1a",
+        "light": "#0a2e1a"
+      },
+      "diffRemovedBg": {
+        "dark": "#2d1b1b",
+        "light": "#2d1b1b"
+      },
+      "diffContextBg": {
+        "dark": "nightOwlPanel",
+        "light": "nightOwlPanel"
+      },
+      "diffLineNumber": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#0a2e1a",
+        "light": "#0a2e1a"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2d1b1b",
+        "light": "#2d1b1b"
+      },
+      "markdownText": {
+        "dark": "nightOwlFg",
+        "light": "nightOwlFg"
+      },
+      "markdownHeading": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "markdownLink": {
+        "dark": "nightOwlCyan",
+        "light": "nightOwlCyan"
+      },
+      "markdownLinkText": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "markdownCode": {
+        "dark": "nightOwlGreen",
+        "light": "nightOwlGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "markdownEmph": {
+        "dark": "nightOwlPurple",
+        "light": "nightOwlPurple"
+      },
+      "markdownStrong": {
+        "dark": "nightOwlYellow",
+        "light": "nightOwlYellow"
+      },
+      "markdownHorizontalRule": {
+        "dark": "nightOwlMuted",
+        "light": "nightOwlMuted"
+      },
+      "markdownListItem": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "nightOwlCyan",
+        "light": "nightOwlCyan"
+      },
+      "markdownImage": {
+        "dark": "nightOwlCyan",
+        "light": "nightOwlCyan"
+      },
+      "markdownImageText": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "markdownCodeBlock": {
+        "dark": "nightOwlFg",
+        "light": "nightOwlFg"
+      },
+      "syntaxComment": {
+        "dark": "nightOwlGray",
+        "light": "nightOwlGray"
+      },
+      "syntaxKeyword": {
+        "dark": "nightOwlPurple",
+        "light": "nightOwlPurple"
+      },
+      "syntaxFunction": {
+        "dark": "nightOwlBlue",
+        "light": "nightOwlBlue"
+      },
+      "syntaxVariable": {
+        "dark": "nightOwlFg",
+        "light": "nightOwlFg"
+      },
+      "syntaxString": {
+        "dark": "nightOwlYellow",
+        "light": "nightOwlYellow"
+      },
+      "syntaxNumber": {
+        "dark": "nightOwlOrange",
+        "light": "nightOwlOrange"
+      },
+      "syntaxType": {
+        "dark": "nightOwlGreen",
+        "light": "nightOwlGreen"
+      },
+      "syntaxOperator": {
+        "dark": "nightOwlCyan",
+        "light": "nightOwlCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "nightOwlFg",
+        "light": "nightOwlFg"
+      }
+    }
+  },
+  "nord": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "nord0": "#2E3440",
+      "nord1": "#3B4252",
+      "nord2": "#434C5E",
+      "nord3": "#4C566A",
+      "nord4": "#D8DEE9",
+      "nord5": "#E5E9F0",
+      "nord6": "#ECEFF4",
+      "nord7": "#8FBCBB",
+      "nord8": "#88C0D0",
+      "nord9": "#81A1C1",
+      "nord10": "#5E81AC",
+      "nord11": "#BF616A",
+      "nord12": "#D08770",
+      "nord13": "#EBCB8B",
+      "nord14": "#A3BE8C",
+      "nord15": "#B48EAD"
+    },
+    "theme": {
+      "primary": {
+        "dark": "nord8",
+        "light": "nord10"
+      },
+      "secondary": {
+        "dark": "nord9",
+        "light": "nord9"
+      },
+      "accent": {
+        "dark": "nord7",
+        "light": "nord7"
+      },
+      "error": {
+        "dark": "nord11",
+        "light": "nord11"
+      },
+      "warning": {
+        "dark": "nord12",
+        "light": "nord12"
+      },
+      "success": {
+        "dark": "nord14",
+        "light": "nord14"
+      },
+      "info": {
+        "dark": "nord8",
+        "light": "nord10"
+      },
+      "text": {
+        "dark": "nord6",
+        "light": "nord0"
+      },
+      "textMuted": {
+        "dark": "#8B95A7",
+        "light": "nord1"
+      },
+      "background": {
+        "dark": "nord0",
+        "light": "nord6"
+      },
+      "backgroundPanel": {
+        "dark": "nord1",
+        "light": "nord5"
+      },
+      "backgroundElement": {
+        "dark": "nord2",
+        "light": "nord4"
+      },
+      "border": {
+        "dark": "nord2",
+        "light": "nord3"
+      },
+      "borderActive": {
+        "dark": "nord3",
+        "light": "nord2"
+      },
+      "borderSubtle": {
+        "dark": "nord2",
+        "light": "nord3"
+      },
+      "diffAdded": {
+        "dark": "nord14",
+        "light": "nord14"
+      },
+      "diffRemoved": {
+        "dark": "nord11",
+        "light": "nord11"
+      },
+      "diffContext": {
+        "dark": "#8B95A7",
+        "light": "nord3"
+      },
+      "diffHunkHeader": {
+        "dark": "#8B95A7",
+        "light": "nord3"
+      },
+      "diffHighlightAdded": {
+        "dark": "nord14",
+        "light": "nord14"
+      },
+      "diffHighlightRemoved": {
+        "dark": "nord11",
+        "light": "nord11"
+      },
+      "diffAddedBg": {
+        "dark": "#3B4252",
+        "light": "#E5E9F0"
+      },
+      "diffRemovedBg": {
+        "dark": "#3B4252",
+        "light": "#E5E9F0"
+      },
+      "diffContextBg": {
+        "dark": "nord1",
+        "light": "nord5"
+      },
+      "diffLineNumber": {
+        "dark": "nord2",
+        "light": "nord4"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#3B4252",
+        "light": "#E5E9F0"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3B4252",
+        "light": "#E5E9F0"
+      },
+      "markdownText": {
+        "dark": "nord4",
+        "light": "nord0"
+      },
+      "markdownHeading": {
+        "dark": "nord8",
+        "light": "nord10"
+      },
+      "markdownLink": {
+        "dark": "nord9",
+        "light": "nord9"
+      },
+      "markdownLinkText": {
+        "dark": "nord7",
+        "light": "nord7"
+      },
+      "markdownCode": {
+        "dark": "nord14",
+        "light": "nord14"
+      },
+      "markdownBlockQuote": {
+        "dark": "#8B95A7",
+        "light": "nord3"
+      },
+      "markdownEmph": {
+        "dark": "nord12",
+        "light": "nord12"
+      },
+      "markdownStrong": {
+        "dark": "nord13",
+        "light": "nord13"
+      },
+      "markdownHorizontalRule": {
+        "dark": "#8B95A7",
+        "light": "nord3"
+      },
+      "markdownListItem": {
+        "dark": "nord8",
+        "light": "nord10"
+      },
+      "markdownListEnumeration": {
+        "dark": "nord7",
+        "light": "nord7"
+      },
+      "markdownImage": {
+        "dark": "nord9",
+        "light": "nord9"
+      },
+      "markdownImageText": {
+        "dark": "nord7",
+        "light": "nord7"
+      },
+      "markdownCodeBlock": {
+        "dark": "nord4",
+        "light": "nord0"
+      },
+      "syntaxComment": {
+        "dark": "#8B95A7",
+        "light": "nord3"
+      },
+      "syntaxKeyword": {
+        "dark": "nord9",
+        "light": "nord9"
+      },
+      "syntaxFunction": {
+        "dark": "nord8",
+        "light": "nord8"
+      },
+      "syntaxVariable": {
+        "dark": "nord7",
+        "light": "nord7"
+      },
+      "syntaxString": {
+        "dark": "nord14",
+        "light": "nord14"
+      },
+      "syntaxNumber": {
+        "dark": "nord15",
+        "light": "nord15"
+      },
+      "syntaxType": {
+        "dark": "nord7",
+        "light": "nord7"
+      },
+      "syntaxOperator": {
+        "dark": "nord9",
+        "light": "nord9"
+      },
+      "syntaxPunctuation": {
+        "dark": "nord4",
+        "light": "nord0"
+      }
+    }
+  },
+  "one-dark": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg": "#282c34",
+      "darkBgAlt": "#21252b",
+      "darkBgPanel": "#353b45",
+      "darkFg": "#abb2bf",
+      "darkFgMuted": "#5c6370",
+      "darkPurple": "#c678dd",
+      "darkBlue": "#61afef",
+      "darkRed": "#e06c75",
+      "darkGreen": "#98c379",
+      "darkYellow": "#e5c07b",
+      "darkOrange": "#d19a66",
+      "darkCyan": "#56b6c2",
+      "lightBg": "#fafafa",
+      "lightBgAlt": "#f0f0f1",
+      "lightBgPanel": "#eaeaeb",
+      "lightFg": "#383a42",
+      "lightFgMuted": "#a0a1a7",
+      "lightPurple": "#a626a4",
+      "lightBlue": "#4078f2",
+      "lightRed": "#e45649",
+      "lightGreen": "#50a14f",
+      "lightYellow": "#c18401",
+      "lightOrange": "#986801",
+      "lightCyan": "#0184bc"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "secondary": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "accent": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "text": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "textMuted": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "background": {
+        "dark": "darkBg",
+        "light": "lightBg"
+      },
+      "backgroundPanel": {
+        "dark": "darkBgAlt",
+        "light": "lightBgAlt"
+      },
+      "backgroundElement": {
+        "dark": "darkBgPanel",
+        "light": "lightBgPanel"
+      },
+      "border": {
+        "dark": "#393f4a",
+        "light": "#d1d1d2"
+      },
+      "borderActive": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "borderSubtle": {
+        "dark": "#2c313a",
+        "light": "#e0e0e1"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "diffHighlightAdded": {
+        "dark": "#aad482",
+        "light": "#489447"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#e8828b",
+        "light": "#d65145"
+      },
+      "diffAddedBg": {
+        "dark": "#2c382b",
+        "light": "#eafbe9"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a2d2f",
+        "light": "#fce9e8"
+      },
+      "diffContextBg": {
+        "dark": "darkBgAlt",
+        "light": "lightBgAlt"
+      },
+      "diffLineNumber": {
+        "dark": "#495162",
+        "light": "#c9c9ca"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#283427",
+        "light": "#e1f3df"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#36292b",
+        "light": "#f5e2e1"
+      },
+      "markdownText": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "markdownHeading": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "markdownLink": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "markdownListItem": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      },
+      "syntaxComment": {
+        "dark": "darkFgMuted",
+        "light": "lightFgMuted"
+      },
+      "syntaxKeyword": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "syntaxFunction": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkFg",
+        "light": "lightFg"
+      }
+    }
+  },
+  "opencode": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkStep1": "#0a0a0a",
+      "darkStep2": "#141414",
+      "darkStep3": "#1e1e1e",
+      "darkStep4": "#282828",
+      "darkStep5": "#323232",
+      "darkStep6": "#3c3c3c",
+      "darkStep7": "#484848",
+      "darkStep8": "#606060",
+      "darkStep9": "#fab283",
+      "darkStep10": "#ffc09f",
+      "darkStep11": "#808080",
+      "darkStep12": "#eeeeee",
+      "darkSecondary": "#5c9cf5",
+      "darkAccent": "#9d7cd8",
+      "darkRed": "#e06c75",
+      "darkOrange": "#f5a742",
+      "darkGreen": "#7fd88f",
+      "darkCyan": "#56b6c2",
+      "darkYellow": "#e5c07b",
+      "lightStep1": "#ffffff",
+      "lightStep2": "#fafafa",
+      "lightStep3": "#f5f5f5",
+      "lightStep4": "#ebebeb",
+      "lightStep5": "#e1e1e1",
+      "lightStep6": "#d4d4d4",
+      "lightStep7": "#b8b8b8",
+      "lightStep8": "#a0a0a0",
+      "lightStep9": "#3b7dd8",
+      "lightStep10": "#2968c3",
+      "lightStep11": "#8a8a8a",
+      "lightStep12": "#1a1a1a",
+      "lightSecondary": "#7b5bb6",
+      "lightAccent": "#d68c27",
+      "lightRed": "#d1383d",
+      "lightOrange": "#d68c27",
+      "lightGreen": "#3d9a57",
+      "lightCyan": "#318795",
+      "lightYellow": "#b0851f"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "secondary": {
+        "dark": "darkSecondary",
+        "light": "lightSecondary"
+      },
+      "accent": {
+        "dark": "darkAccent",
+        "light": "lightAccent"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "text": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "textMuted": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "background": {
+        "dark": "darkStep1",
+        "light": "lightStep1"
+      },
+      "backgroundPanel": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "backgroundElement": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "border": {
+        "dark": "darkStep7",
+        "light": "lightStep7"
+      },
+      "borderActive": {
+        "dark": "darkStep8",
+        "light": "lightStep8"
+      },
+      "borderSubtle": {
+        "dark": "darkStep6",
+        "light": "lightStep6"
+      },
+      "diffAdded": {
+        "dark": "#4fd6be",
+        "light": "#1e725c"
+      },
+      "diffRemoved": {
+        "dark": "#c53b53",
+        "light": "#c53b53"
+      },
+      "diffContext": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHunkHeader": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHighlightAdded": {
+        "dark": "#b8db87",
+        "light": "#4db380"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#e26a75",
+        "light": "#f52a65"
+      },
+      "diffAddedBg": {
+        "dark": "#20303b",
+        "light": "#d5e5d5"
+      },
+      "diffRemovedBg": {
+        "dark": "#37222c",
+        "light": "#f7d8db"
+      },
+      "diffContextBg": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "diffLineNumber": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1b2b34",
+        "light": "#c5d5c5"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2d1f26",
+        "light": "#e7c8cb"
+      },
+      "markdownText": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "markdownHeading": {
+        "dark": "darkAccent",
+        "light": "lightAccent"
+      },
+      "markdownLink": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "markdownListItem": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "syntaxComment": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "syntaxKeyword": {
+        "dark": "darkAccent",
+        "light": "lightAccent"
+      },
+      "syntaxFunction": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      }
+    }
+  },
+  "orng": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkStep1": "#0a0a0a",
+      "darkStep2": "#141414",
+      "darkStep3": "#1e1e1e",
+      "darkStep4": "#282828",
+      "darkStep5": "#323232",
+      "darkStep6": "#3c3c3c",
+      "darkStep7": "#484848",
+      "darkStep8": "#606060",
+      "darkStep9": "#EC5B2B",
+      "darkStep10": "#EE7948",
+      "darkStep11": "#808080",
+      "darkStep12": "#eeeeee",
+      "darkSecondary": "#EE7948",
+      "darkAccent": "#FFF7F1",
+      "darkRed": "#e06c75",
+      "darkOrange": "#EC5B2B",
+      "darkBlue": "#6ba1e6",
+      "darkCyan": "#56b6c2",
+      "darkYellow": "#e5c07b",
+      "lightStep1": "#ffffff",
+      "lightStep2": "#FFF7F1",
+      "lightStep3": "#f5f0eb",
+      "lightStep4": "#ebebeb",
+      "lightStep5": "#e1e1e1",
+      "lightStep6": "#d4d4d4",
+      "lightStep7": "#b8b8b8",
+      "lightStep8": "#a0a0a0",
+      "lightStep9": "#EC5B2B",
+      "lightStep10": "#c94d24",
+      "lightStep11": "#8a8a8a",
+      "lightStep12": "#1a1a1a",
+      "lightSecondary": "#EE7948",
+      "lightAccent": "#c94d24",
+      "lightRed": "#d1383d",
+      "lightOrange": "#EC5B2B",
+      "lightBlue": "#0062d1",
+      "lightCyan": "#318795",
+      "lightYellow": "#b0851f"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "secondary": {
+        "dark": "darkSecondary",
+        "light": "lightSecondary"
+      },
+      "accent": {
+        "dark": "darkAccent",
+        "light": "lightAccent"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "info": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "text": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "textMuted": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "selectedListItemText": {
+        "dark": "#0a0a0a",
+        "light": "#ffffff"
+      },
+      "background": {
+        "dark": "darkStep1",
+        "light": "lightStep1"
+      },
+      "backgroundPanel": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "backgroundElement": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "border": {
+        "dark": "#EC5B2B",
+        "light": "#EC5B2B"
+      },
+      "borderActive": {
+        "dark": "#EE7948",
+        "light": "#c94d24"
+      },
+      "borderSubtle": {
+        "dark": "darkStep6",
+        "light": "lightStep6"
+      },
+      "diffAdded": {
+        "dark": "#6ba1e6",
+        "light": "#0062d1"
+      },
+      "diffRemoved": {
+        "dark": "#c53b53",
+        "light": "#c53b53"
+      },
+      "diffContext": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHunkHeader": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHighlightAdded": {
+        "dark": "#6ba1e6",
+        "light": "#0062d1"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#e26a75",
+        "light": "#f52a65"
+      },
+      "diffAddedBg": {
+        "dark": "#1a2a3d",
+        "light": "#e0edfa"
+      },
+      "diffRemovedBg": {
+        "dark": "#37222c",
+        "light": "#f7d8db"
+      },
+      "diffContextBg": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "diffLineNumber": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#162535",
+        "light": "#d0e5f5"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2d1f26",
+        "light": "#e7c8cb"
+      },
+      "markdownText": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "markdownHeading": {
+        "dark": "#EC5B2B",
+        "light": "#EC5B2B"
+      },
+      "markdownLink": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "markdownBlockQuote": {
+        "dark": "#FFF7F1",
+        "light": "lightYellow"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "#EE7948",
+        "light": "#EC5B2B"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "markdownListItem": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "syntaxComment": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "syntaxKeyword": {
+        "dark": "#EC5B2B",
+        "light": "#EC5B2B"
+      },
+      "syntaxFunction": {
+        "dark": "#EE7948",
+        "light": "#c94d24"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "syntaxNumber": {
+        "dark": "#FFF7F1",
+        "light": "#EC5B2B"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      }
+    }
+  },
+  "osaka-jade": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkBg0": "#111c18",
+      "darkBg1": "#1a2520",
+      "darkBg2": "#23372B",
+      "darkBg3": "#3d4a44",
+      "darkFg0": "#C1C497",
+      "darkFg1": "#9aa88a",
+      "darkGray": "#53685B",
+      "darkRed": "#FF5345",
+      "darkGreen": "#549e6a",
+      "darkYellow": "#459451",
+      "darkBlue": "#509475",
+      "darkMagenta": "#D2689C",
+      "darkCyan": "#2DD5B7",
+      "darkWhite": "#F6F5DD",
+      "darkRedBright": "#db9f9c",
+      "darkGreenBright": "#63b07a",
+      "darkYellowBright": "#E5C736",
+      "darkBlueBright": "#ACD4CF",
+      "darkMagentaBright": "#75bbb3",
+      "darkCyanBright": "#8CD3CB",
+      "lightBg0": "#F6F5DD",
+      "lightBg1": "#E8E7CC",
+      "lightBg2": "#D5D4B8",
+      "lightBg3": "#A8A78C",
+      "lightFg0": "#111c18",
+      "lightFg1": "#1a2520",
+      "lightGray": "#53685B",
+      "lightRed": "#c7392d",
+      "lightGreen": "#3d7a52",
+      "lightYellow": "#b5a020",
+      "lightBlue": "#3d7560",
+      "lightMagenta": "#a8527a",
+      "lightCyan": "#1faa90"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "secondary": {
+        "dark": "darkMagenta",
+        "light": "lightMagenta"
+      },
+      "accent": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkYellowBright",
+        "light": "lightYellow"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "text": {
+        "dark": "darkFg0",
+        "light": "lightFg0"
+      },
+      "textMuted": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "background": {
+        "dark": "darkBg0",
+        "light": "lightBg0"
+      },
+      "backgroundPanel": {
+        "dark": "darkBg1",
+        "light": "lightBg1"
+      },
+      "backgroundElement": {
+        "dark": "darkBg2",
+        "light": "lightBg2"
+      },
+      "border": {
+        "dark": "darkBg3",
+        "light": "lightBg3"
+      },
+      "borderActive": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "borderSubtle": {
+        "dark": "darkBg2",
+        "light": "lightBg2"
+      },
+      "diffAdded": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "diffRemoved": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "diffContext": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "diffHunkHeader": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "diffHighlightAdded": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "diffHighlightRemoved": {
+        "dark": "darkRedBright",
+        "light": "lightRed"
+      },
+      "diffAddedBg": {
+        "dark": "#15241c",
+        "light": "#e0eee5"
+      },
+      "diffRemovedBg": {
+        "dark": "#241515",
+        "light": "#eee0e0"
+      },
+      "diffContextBg": {
+        "dark": "darkBg1",
+        "light": "lightBg1"
+      },
+      "diffLineNumber": {
+        "dark": "darkBg3",
+        "light": "lightBg3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#121f18",
+        "light": "#d5e5da"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#1f1212",
+        "light": "#e5d5d5"
+      },
+      "markdownText": {
+        "dark": "darkFg0",
+        "light": "lightFg0"
+      },
+      "markdownHeading": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownLink": {
+        "dark": "darkCyanBright",
+        "light": "lightCyan"
+      },
+      "markdownLinkText": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownCode": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "markdownEmph": {
+        "dark": "darkMagenta",
+        "light": "lightMagenta"
+      },
+      "markdownStrong": {
+        "dark": "darkFg0",
+        "light": "lightFg0"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "markdownListItem": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyanBright",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkCyanBright",
+        "light": "lightCyan"
+      },
+      "markdownImageText": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkFg0",
+        "light": "lightFg0"
+      },
+      "syntaxComment": {
+        "dark": "darkGray",
+        "light": "lightGray"
+      },
+      "syntaxKeyword": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxFunction": {
+        "dark": "darkBlue",
+        "light": "lightBlue"
+      },
+      "syntaxVariable": {
+        "dark": "darkFg0",
+        "light": "lightFg0"
+      },
+      "syntaxString": {
+        "dark": "darkGreenBright",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkMagenta",
+        "light": "lightMagenta"
+      },
+      "syntaxType": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxOperator": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkFg0",
+        "light": "lightFg0"
+      }
+    }
+  },
+  "palenight": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "background": "#292d3e",
+      "backgroundAlt": "#1e2132",
+      "backgroundPanel": "#32364a",
+      "foreground": "#a6accd",
+      "foregroundBright": "#bfc7d5",
+      "comment": "#676e95",
+      "red": "#f07178",
+      "orange": "#f78c6c",
+      "yellow": "#ffcb6b",
+      "green": "#c3e88d",
+      "cyan": "#89ddff",
+      "blue": "#82aaff",
+      "purple": "#c792ea",
+      "magenta": "#ff5370",
+      "pink": "#f07178"
+    },
+    "theme": {
+      "primary": {
+        "dark": "blue",
+        "light": "#4976eb"
+      },
+      "secondary": {
+        "dark": "purple",
+        "light": "#a854f2"
+      },
+      "accent": {
+        "dark": "cyan",
+        "light": "#00acc1"
+      },
+      "error": {
+        "dark": "red",
+        "light": "#e53935"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "#ffb300"
+      },
+      "success": {
+        "dark": "green",
+        "light": "#91b859"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "#f4511e"
+      },
+      "text": {
+        "dark": "foreground",
+        "light": "#292d3e"
+      },
+      "textMuted": {
+        "dark": "comment",
+        "light": "#8796b0"
+      },
+      "background": {
+        "dark": "#292d3e",
+        "light": "#fafafa"
+      },
+      "backgroundPanel": {
+        "dark": "#1e2132",
+        "light": "#f5f5f5"
+      },
+      "backgroundElement": {
+        "dark": "#32364a",
+        "light": "#e7e7e8"
+      },
+      "border": {
+        "dark": "#32364a",
+        "light": "#e0e0e0"
+      },
+      "borderActive": {
+        "dark": "blue",
+        "light": "#4976eb"
+      },
+      "borderSubtle": {
+        "dark": "#1e2132",
+        "light": "#eeeeee"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "#91b859"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "#e53935"
+      },
+      "diffContext": {
+        "dark": "comment",
+        "light": "#8796b0"
+      },
+      "diffHunkHeader": {
+        "dark": "cyan",
+        "light": "#00acc1"
+      },
+      "diffHighlightAdded": {
+        "dark": "green",
+        "light": "#91b859"
+      },
+      "diffHighlightRemoved": {
+        "dark": "red",
+        "light": "#e53935"
+      },
+      "diffAddedBg": {
+        "dark": "#2e3c2b",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedBg": {
+        "dark": "#3c2b2b",
+        "light": "#ffebee"
+      },
+      "diffContextBg": {
+        "dark": "#1e2132",
+        "light": "#f5f5f5"
+      },
+      "diffLineNumber": {
+        "dark": "#444760",
+        "light": "#cfd8dc"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#2e3c2b",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3c2b2b",
+        "light": "#ffebee"
+      },
+      "markdownText": {
+        "dark": "foreground",
+        "light": "#292d3e"
+      },
+      "markdownHeading": {
+        "dark": "purple",
+        "light": "#a854f2"
+      },
+      "markdownLink": {
+        "dark": "blue",
+        "light": "#4976eb"
+      },
+      "markdownLinkText": {
+        "dark": "cyan",
+        "light": "#00acc1"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "#91b859"
+      },
+      "markdownBlockQuote": {
+        "dark": "comment",
+        "light": "#8796b0"
+      },
+      "markdownEmph": {
+        "dark": "yellow",
+        "light": "#ffb300"
+      },
+      "markdownStrong": {
+        "dark": "orange",
+        "light": "#f4511e"
+      },
+      "markdownHorizontalRule": {
+        "dark": "comment",
+        "light": "#8796b0"
+      },
+      "markdownListItem": {
+        "dark": "blue",
+        "light": "#4976eb"
+      },
+      "markdownListEnumeration": {
+        "dark": "cyan",
+        "light": "#00acc1"
+      },
+      "markdownImage": {
+        "dark": "blue",
+        "light": "#4976eb"
+      },
+      "markdownImageText": {
+        "dark": "cyan",
+        "light": "#00acc1"
+      },
+      "markdownCodeBlock": {
+        "dark": "foreground",
+        "light": "#292d3e"
+      },
+      "syntaxComment": {
+        "dark": "comment",
+        "light": "#8796b0"
+      },
+      "syntaxKeyword": {
+        "dark": "purple",
+        "light": "#a854f2"
+      },
+      "syntaxFunction": {
+        "dark": "blue",
+        "light": "#4976eb"
+      },
+      "syntaxVariable": {
+        "dark": "foreground",
+        "light": "#292d3e"
+      },
+      "syntaxString": {
+        "dark": "green",
+        "light": "#91b859"
+      },
+      "syntaxNumber": {
+        "dark": "orange",
+        "light": "#f4511e"
+      },
+      "syntaxType": {
+        "dark": "yellow",
+        "light": "#ffb300"
+      },
+      "syntaxOperator": {
+        "dark": "cyan",
+        "light": "#00acc1"
+      },
+      "syntaxPunctuation": {
+        "dark": "foreground",
+        "light": "#292d3e"
+      }
+    }
+  },
+  "rosepine": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "base": "#191724",
+      "surface": "#1f1d2e",
+      "overlay": "#26233a",
+      "muted": "#6e6a86",
+      "subtle": "#908caa",
+      "text": "#e0def4",
+      "love": "#eb6f92",
+      "gold": "#f6c177",
+      "rose": "#ebbcba",
+      "pine": "#31748f",
+      "foam": "#9ccfd8",
+      "iris": "#c4a7e7",
+      "highlightLow": "#21202e",
+      "highlightMed": "#403d52",
+      "highlightHigh": "#524f67",
+      "moonBase": "#232136",
+      "moonSurface": "#2a273f",
+      "moonOverlay": "#393552",
+      "moonMuted": "#6e6a86",
+      "moonSubtle": "#908caa",
+      "moonText": "#e0def4",
+      "dawnBase": "#faf4ed",
+      "dawnSurface": "#fffaf3",
+      "dawnOverlay": "#f2e9e1",
+      "dawnMuted": "#9893a5",
+      "dawnSubtle": "#797593",
+      "dawnText": "#575279"
+    },
+    "theme": {
+      "primary": {
+        "dark": "foam",
+        "light": "pine"
+      },
+      "secondary": {
+        "dark": "iris",
+        "light": "#907aa9"
+      },
+      "accent": {
+        "dark": "rose",
+        "light": "#d7827e"
+      },
+      "error": {
+        "dark": "love",
+        "light": "#b4637a"
+      },
+      "warning": {
+        "dark": "gold",
+        "light": "#ea9d34"
+      },
+      "success": {
+        "dark": "pine",
+        "light": "#286983"
+      },
+      "info": {
+        "dark": "foam",
+        "light": "#56949f"
+      },
+      "text": {
+        "dark": "#e0def4",
+        "light": "#575279"
+      },
+      "textMuted": {
+        "dark": "muted",
+        "light": "dawnMuted"
+      },
+      "background": {
+        "dark": "base",
+        "light": "dawnBase"
+      },
+      "backgroundPanel": {
+        "dark": "surface",
+        "light": "dawnSurface"
+      },
+      "backgroundElement": {
+        "dark": "overlay",
+        "light": "dawnOverlay"
+      },
+      "border": {
+        "dark": "highlightMed",
+        "light": "#dfdad9"
+      },
+      "borderActive": {
+        "dark": "foam",
+        "light": "pine"
+      },
+      "borderSubtle": {
+        "dark": "highlightLow",
+        "light": "#f4ede8"
+      },
+      "diffAdded": {
+        "dark": "pine",
+        "light": "#286983"
+      },
+      "diffRemoved": {
+        "dark": "love",
+        "light": "#b4637a"
+      },
+      "diffContext": {
+        "dark": "muted",
+        "light": "dawnMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "iris",
+        "light": "#907aa9"
+      },
+      "diffHighlightAdded": {
+        "dark": "pine",
+        "light": "#286983"
+      },
+      "diffHighlightRemoved": {
+        "dark": "love",
+        "light": "#b4637a"
+      },
+      "diffAddedBg": {
+        "dark": "#1f2d3a",
+        "light": "#e5f2f3"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a1f2d",
+        "light": "#fce5e8"
+      },
+      "diffContextBg": {
+        "dark": "surface",
+        "light": "dawnSurface"
+      },
+      "diffLineNumber": {
+        "dark": "muted",
+        "light": "dawnMuted"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1f2d3a",
+        "light": "#e5f2f3"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3a1f2d",
+        "light": "#fce5e8"
+      },
+      "markdownText": {
+        "dark": "#e0def4",
+        "light": "#575279"
+      },
+      "markdownHeading": {
+        "dark": "iris",
+        "light": "#907aa9"
+      },
+      "markdownLink": {
+        "dark": "foam",
+        "light": "pine"
+      },
+      "markdownLinkText": {
+        "dark": "rose",
+        "light": "#d7827e"
+      },
+      "markdownCode": {
+        "dark": "pine",
+        "light": "#286983"
+      },
+      "markdownBlockQuote": {
+        "dark": "muted",
+        "light": "dawnMuted"
+      },
+      "markdownEmph": {
+        "dark": "gold",
+        "light": "#ea9d34"
+      },
+      "markdownStrong": {
+        "dark": "love",
+        "light": "#b4637a"
+      },
+      "markdownHorizontalRule": {
+        "dark": "highlightMed",
+        "light": "#dfdad9"
+      },
+      "markdownListItem": {
+        "dark": "foam",
+        "light": "pine"
+      },
+      "markdownListEnumeration": {
+        "dark": "rose",
+        "light": "#d7827e"
+      },
+      "markdownImage": {
+        "dark": "foam",
+        "light": "pine"
+      },
+      "markdownImageText": {
+        "dark": "rose",
+        "light": "#d7827e"
+      },
+      "markdownCodeBlock": {
+        "dark": "#e0def4",
+        "light": "#575279"
+      },
+      "syntaxComment": {
+        "dark": "muted",
+        "light": "dawnMuted"
+      },
+      "syntaxKeyword": {
+        "dark": "pine",
+        "light": "#286983"
+      },
+      "syntaxFunction": {
+        "dark": "rose",
+        "light": "#d7827e"
+      },
+      "syntaxVariable": {
+        "dark": "#e0def4",
+        "light": "#575279"
+      },
+      "syntaxString": {
+        "dark": "gold",
+        "light": "#ea9d34"
+      },
+      "syntaxNumber": {
+        "dark": "iris",
+        "light": "#907aa9"
+      },
+      "syntaxType": {
+        "dark": "foam",
+        "light": "#56949f"
+      },
+      "syntaxOperator": {
+        "dark": "subtle",
+        "light": "dawnSubtle"
+      },
+      "syntaxPunctuation": {
+        "dark": "subtle",
+        "light": "dawnSubtle"
+      }
+    }
+  },
+  "solarized": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "base03": "#002b36",
+      "base02": "#073642",
+      "base01": "#586e75",
+      "base00": "#657b83",
+      "base0": "#839496",
+      "base1": "#93a1a1",
+      "base2": "#eee8d5",
+      "base3": "#fdf6e3",
+      "yellow": "#b58900",
+      "orange": "#cb4b16",
+      "red": "#dc322f",
+      "magenta": "#d33682",
+      "violet": "#6c71c4",
+      "blue": "#268bd2",
+      "cyan": "#2aa198",
+      "green": "#859900"
+    },
+    "theme": {
+      "primary": {
+        "dark": "blue",
+        "light": "blue"
+      },
+      "secondary": {
+        "dark": "violet",
+        "light": "violet"
+      },
+      "accent": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "error": {
+        "dark": "red",
+        "light": "red"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "yellow"
+      },
+      "success": {
+        "dark": "green",
+        "light": "green"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "orange"
+      },
+      "text": {
+        "dark": "base0",
+        "light": "base00"
+      },
+      "textMuted": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "background": {
+        "dark": "base03",
+        "light": "base3"
+      },
+      "backgroundPanel": {
+        "dark": "base02",
+        "light": "base2"
+      },
+      "backgroundElement": {
+        "dark": "#073642",
+        "light": "#eee8d5"
+      },
+      "border": {
+        "dark": "base02",
+        "light": "base2"
+      },
+      "borderActive": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "borderSubtle": {
+        "dark": "#073642",
+        "light": "#eee8d5"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "green"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "red"
+      },
+      "diffContext": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "diffHunkHeader": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "diffHighlightAdded": {
+        "dark": "green",
+        "light": "green"
+      },
+      "diffHighlightRemoved": {
+        "dark": "red",
+        "light": "red"
+      },
+      "diffAddedBg": {
+        "dark": "#073642",
+        "light": "#eee8d5"
+      },
+      "diffRemovedBg": {
+        "dark": "#073642",
+        "light": "#eee8d5"
+      },
+      "diffContextBg": {
+        "dark": "base02",
+        "light": "base2"
+      },
+      "diffLineNumber": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#073642",
+        "light": "#eee8d5"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#073642",
+        "light": "#eee8d5"
+      },
+      "markdownText": {
+        "dark": "base0",
+        "light": "base00"
+      },
+      "markdownHeading": {
+        "dark": "blue",
+        "light": "blue"
+      },
+      "markdownLink": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "markdownLinkText": {
+        "dark": "violet",
+        "light": "violet"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "green"
+      },
+      "markdownBlockQuote": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "markdownEmph": {
+        "dark": "yellow",
+        "light": "yellow"
+      },
+      "markdownStrong": {
+        "dark": "orange",
+        "light": "orange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "markdownListItem": {
+        "dark": "blue",
+        "light": "blue"
+      },
+      "markdownListEnumeration": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "markdownImage": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "markdownImageText": {
+        "dark": "violet",
+        "light": "violet"
+      },
+      "markdownCodeBlock": {
+        "dark": "base0",
+        "light": "base00"
+      },
+      "syntaxComment": {
+        "dark": "base01",
+        "light": "base1"
+      },
+      "syntaxKeyword": {
+        "dark": "green",
+        "light": "green"
+      },
+      "syntaxFunction": {
+        "dark": "blue",
+        "light": "blue"
+      },
+      "syntaxVariable": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "syntaxString": {
+        "dark": "cyan",
+        "light": "cyan"
+      },
+      "syntaxNumber": {
+        "dark": "magenta",
+        "light": "magenta"
+      },
+      "syntaxType": {
+        "dark": "yellow",
+        "light": "yellow"
+      },
+      "syntaxOperator": {
+        "dark": "green",
+        "light": "green"
+      },
+      "syntaxPunctuation": {
+        "dark": "base0",
+        "light": "base00"
+      }
+    }
+  },
+  "synthwave84": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "background": "#262335",
+      "backgroundAlt": "#1e1a29",
+      "backgroundPanel": "#2a2139",
+      "foreground": "#ffffff",
+      "foregroundMuted": "#848bbd",
+      "pink": "#ff7edb",
+      "pinkBright": "#ff92df",
+      "cyan": "#36f9f6",
+      "cyanBright": "#72f1f8",
+      "yellow": "#fede5d",
+      "yellowBright": "#fff95d",
+      "orange": "#ff8b39",
+      "orangeBright": "#ff9f43",
+      "purple": "#b084eb",
+      "purpleBright": "#c792ea",
+      "red": "#fe4450",
+      "redBright": "#ff5e5b",
+      "green": "#72f1b8",
+      "greenBright": "#97f1d8"
+    },
+    "theme": {
+      "primary": {
+        "dark": "cyan",
+        "light": "#00bcd4"
+      },
+      "secondary": {
+        "dark": "pink",
+        "light": "#e91e63"
+      },
+      "accent": {
+        "dark": "purple",
+        "light": "#9c27b0"
+      },
+      "error": {
+        "dark": "red",
+        "light": "#f44336"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "#ff9800"
+      },
+      "success": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "text": {
+        "dark": "foreground",
+        "light": "#262335"
+      },
+      "textMuted": {
+        "dark": "foregroundMuted",
+        "light": "#5c5c8a"
+      },
+      "background": {
+        "dark": "#262335",
+        "light": "#fafafa"
+      },
+      "backgroundPanel": {
+        "dark": "#1e1a29",
+        "light": "#f5f5f5"
+      },
+      "backgroundElement": {
+        "dark": "#2a2139",
+        "light": "#eeeeee"
+      },
+      "border": {
+        "dark": "#495495",
+        "light": "#e0e0e0"
+      },
+      "borderActive": {
+        "dark": "cyan",
+        "light": "#00bcd4"
+      },
+      "borderSubtle": {
+        "dark": "#241b2f",
+        "light": "#f0f0f0"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "#f44336"
+      },
+      "diffContext": {
+        "dark": "foregroundMuted",
+        "light": "#5c5c8a"
+      },
+      "diffHunkHeader": {
+        "dark": "purple",
+        "light": "#9c27b0"
+      },
+      "diffHighlightAdded": {
+        "dark": "greenBright",
+        "light": "#4caf50"
+      },
+      "diffHighlightRemoved": {
+        "dark": "redBright",
+        "light": "#f44336"
+      },
+      "diffAddedBg": {
+        "dark": "#1a3a2a",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedBg": {
+        "dark": "#3a1a2a",
+        "light": "#ffebee"
+      },
+      "diffContextBg": {
+        "dark": "#1e1a29",
+        "light": "#f5f5f5"
+      },
+      "diffLineNumber": {
+        "dark": "#495495",
+        "light": "#b0b0b0"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1a3a2a",
+        "light": "#e8f5e9"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3a1a2a",
+        "light": "#ffebee"
+      },
+      "markdownText": {
+        "dark": "foreground",
+        "light": "#262335"
+      },
+      "markdownHeading": {
+        "dark": "pink",
+        "light": "#e91e63"
+      },
+      "markdownLink": {
+        "dark": "cyan",
+        "light": "#00bcd4"
+      },
+      "markdownLinkText": {
+        "dark": "purple",
+        "light": "#9c27b0"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "#4caf50"
+      },
+      "markdownBlockQuote": {
+        "dark": "foregroundMuted",
+        "light": "#5c5c8a"
+      },
+      "markdownEmph": {
+        "dark": "yellow",
+        "light": "#ff9800"
+      },
+      "markdownStrong": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "markdownHorizontalRule": {
+        "dark": "#495495",
+        "light": "#e0e0e0"
+      },
+      "markdownListItem": {
+        "dark": "cyan",
+        "light": "#00bcd4"
+      },
+      "markdownListEnumeration": {
+        "dark": "purple",
+        "light": "#9c27b0"
+      },
+      "markdownImage": {
+        "dark": "cyan",
+        "light": "#00bcd4"
+      },
+      "markdownImageText": {
+        "dark": "purple",
+        "light": "#9c27b0"
+      },
+      "markdownCodeBlock": {
+        "dark": "foreground",
+        "light": "#262335"
+      },
+      "syntaxComment": {
+        "dark": "foregroundMuted",
+        "light": "#5c5c8a"
+      },
+      "syntaxKeyword": {
+        "dark": "pink",
+        "light": "#e91e63"
+      },
+      "syntaxFunction": {
+        "dark": "orange",
+        "light": "#ff5722"
+      },
+      "syntaxVariable": {
+        "dark": "foreground",
+        "light": "#262335"
+      },
+      "syntaxString": {
+        "dark": "yellow",
+        "light": "#ff9800"
+      },
+      "syntaxNumber": {
+        "dark": "purple",
+        "light": "#9c27b0"
+      },
+      "syntaxType": {
+        "dark": "cyan",
+        "light": "#00bcd4"
+      },
+      "syntaxOperator": {
+        "dark": "pink",
+        "light": "#e91e63"
+      },
+      "syntaxPunctuation": {
+        "dark": "foreground",
+        "light": "#262335"
+      }
+    }
+  },
+  "tokyonight": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "darkStep1": "#1a1b26",
+      "darkStep2": "#1e2030",
+      "darkStep3": "#222436",
+      "darkStep4": "#292e42",
+      "darkStep5": "#3b4261",
+      "darkStep6": "#545c7e",
+      "darkStep7": "#737aa2",
+      "darkStep8": "#9099b2",
+      "darkStep9": "#82aaff",
+      "darkStep10": "#89b4fa",
+      "darkStep11": "#828bb8",
+      "darkStep12": "#c8d3f5",
+      "darkRed": "#ff757f",
+      "darkOrange": "#ff966c",
+      "darkYellow": "#ffc777",
+      "darkGreen": "#c3e88d",
+      "darkCyan": "#86e1fc",
+      "darkPurple": "#c099ff",
+      "lightStep1": "#e1e2e7",
+      "lightStep2": "#d5d6db",
+      "lightStep3": "#c8c9ce",
+      "lightStep4": "#b9bac1",
+      "lightStep5": "#a8aecb",
+      "lightStep6": "#9699a8",
+      "lightStep7": "#737a8c",
+      "lightStep8": "#5a607d",
+      "lightStep9": "#2e7de9",
+      "lightStep10": "#1a6ce7",
+      "lightStep11": "#8990a3",
+      "lightStep12": "#3760bf",
+      "lightRed": "#f52a65",
+      "lightOrange": "#b15c00",
+      "lightYellow": "#8c6c3e",
+      "lightGreen": "#587539",
+      "lightCyan": "#007197",
+      "lightPurple": "#9854f1"
+    },
+    "theme": {
+      "primary": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "secondary": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "accent": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "error": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "warning": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "success": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "info": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "text": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "textMuted": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "background": {
+        "dark": "darkStep1",
+        "light": "lightStep1"
+      },
+      "backgroundPanel": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "backgroundElement": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "border": {
+        "dark": "darkStep7",
+        "light": "lightStep7"
+      },
+      "borderActive": {
+        "dark": "darkStep8",
+        "light": "lightStep8"
+      },
+      "borderSubtle": {
+        "dark": "darkStep6",
+        "light": "lightStep6"
+      },
+      "diffAdded": {
+        "dark": "#4fd6be",
+        "light": "#1e725c"
+      },
+      "diffRemoved": {
+        "dark": "#c53b53",
+        "light": "#c53b53"
+      },
+      "diffContext": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHunkHeader": {
+        "dark": "#828bb8",
+        "light": "#7086b5"
+      },
+      "diffHighlightAdded": {
+        "dark": "#b8db87",
+        "light": "#4db380"
+      },
+      "diffHighlightRemoved": {
+        "dark": "#e26a75",
+        "light": "#f52a65"
+      },
+      "diffAddedBg": {
+        "dark": "#20303b",
+        "light": "#d5e5d5"
+      },
+      "diffRemovedBg": {
+        "dark": "#37222c",
+        "light": "#f7d8db"
+      },
+      "diffContextBg": {
+        "dark": "darkStep2",
+        "light": "lightStep2"
+      },
+      "diffLineNumber": {
+        "dark": "darkStep3",
+        "light": "lightStep3"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#1b2b34",
+        "light": "#c5d5c5"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#2d1f26",
+        "light": "#e7c8cb"
+      },
+      "markdownText": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "markdownHeading": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "markdownLink": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownLinkText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCode": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "markdownBlockQuote": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownEmph": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "markdownStrong": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "markdownHorizontalRule": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "markdownListItem": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownListEnumeration": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownImage": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "markdownImageText": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "markdownCodeBlock": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      },
+      "syntaxComment": {
+        "dark": "darkStep11",
+        "light": "lightStep11"
+      },
+      "syntaxKeyword": {
+        "dark": "darkPurple",
+        "light": "lightPurple"
+      },
+      "syntaxFunction": {
+        "dark": "darkStep9",
+        "light": "lightStep9"
+      },
+      "syntaxVariable": {
+        "dark": "darkRed",
+        "light": "lightRed"
+      },
+      "syntaxString": {
+        "dark": "darkGreen",
+        "light": "lightGreen"
+      },
+      "syntaxNumber": {
+        "dark": "darkOrange",
+        "light": "lightOrange"
+      },
+      "syntaxType": {
+        "dark": "darkYellow",
+        "light": "lightYellow"
+      },
+      "syntaxOperator": {
+        "dark": "darkCyan",
+        "light": "lightCyan"
+      },
+      "syntaxPunctuation": {
+        "dark": "darkStep12",
+        "light": "lightStep12"
+      }
+    }
+  },
+  "vercel": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "background100": "#0A0A0A",
+      "background200": "#000000",
+      "gray100": "#1A1A1A",
+      "gray200": "#1F1F1F",
+      "gray300": "#292929",
+      "gray400": "#2E2E2E",
+      "gray500": "#454545",
+      "gray600": "#878787",
+      "gray700": "#8F8F8F",
+      "gray900": "#A1A1A1",
+      "gray1000": "#EDEDED",
+      "blue600": "#0099FF",
+      "blue700": "#0070F3",
+      "blue900": "#52A8FF",
+      "blue1000": "#EBF8FF",
+      "red700": "#E5484D",
+      "red900": "#FF6166",
+      "red1000": "#FDECED",
+      "amber700": "#FFB224",
+      "amber900": "#F2A700",
+      "amber1000": "#FDF4DC",
+      "green700": "#46A758",
+      "green900": "#63C46D",
+      "green1000": "#E6F9E9",
+      "teal700": "#12A594",
+      "teal900": "#0AC7AC",
+      "purple700": "#8E4EC6",
+      "purple900": "#BF7AF0",
+      "pink700": "#E93D82",
+      "pink900": "#F75590",
+      "highlightPink": "#FF0080",
+      "highlightPurple": "#F81CE5",
+      "cyan": "#50E3C2",
+      "lightBackground": "#FFFFFF",
+      "lightGray100": "#FAFAFA",
+      "lightGray200": "#EAEAEA",
+      "lightGray600": "#666666",
+      "lightGray1000": "#171717"
+    },
+    "theme": {
+      "primary": {
+        "dark": "blue700",
+        "light": "blue700"
+      },
+      "secondary": {
+        "dark": "blue900",
+        "light": "#0062D1"
+      },
+      "accent": {
+        "dark": "purple700",
+        "light": "purple700"
+      },
+      "error": {
+        "dark": "red700",
+        "light": "#DC3545"
+      },
+      "warning": {
+        "dark": "amber700",
+        "light": "#FF9500"
+      },
+      "success": {
+        "dark": "green700",
+        "light": "#388E3C"
+      },
+      "info": {
+        "dark": "blue900",
+        "light": "blue700"
+      },
+      "text": {
+        "dark": "gray1000",
+        "light": "lightGray1000"
+      },
+      "textMuted": {
+        "dark": "gray600",
+        "light": "lightGray600"
+      },
+      "background": {
+        "dark": "background200",
+        "light": "lightBackground"
+      },
+      "backgroundPanel": {
+        "dark": "gray100",
+        "light": "lightGray100"
+      },
+      "backgroundElement": {
+        "dark": "gray300",
+        "light": "lightGray200"
+      },
+      "border": {
+        "dark": "gray200",
+        "light": "lightGray200"
+      },
+      "borderActive": {
+        "dark": "gray500",
+        "light": "#999999"
+      },
+      "borderSubtle": {
+        "dark": "gray100",
+        "light": "#EAEAEA"
+      },
+      "diffAdded": {
+        "dark": "green900",
+        "light": "green700"
+      },
+      "diffRemoved": {
+        "dark": "red900",
+        "light": "red700"
+      },
+      "diffContext": {
+        "dark": "gray600",
+        "light": "lightGray600"
+      },
+      "diffHunkHeader": {
+        "dark": "gray600",
+        "light": "lightGray600"
+      },
+      "diffHighlightAdded": {
+        "dark": "green900",
+        "light": "green700"
+      },
+      "diffHighlightRemoved": {
+        "dark": "red900",
+        "light": "red700"
+      },
+      "diffAddedBg": {
+        "dark": "#0B1D0F",
+        "light": "#E6F9E9"
+      },
+      "diffRemovedBg": {
+        "dark": "#2A1314",
+        "light": "#FDECED"
+      },
+      "diffContextBg": {
+        "dark": "background200",
+        "light": "lightBackground"
+      },
+      "diffLineNumber": {
+        "dark": "gray600",
+        "light": "lightGray600"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#0F2613",
+        "light": "#D6F5D6"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#3C1618",
+        "light": "#FFE5E5"
+      },
+      "markdownText": {
+        "dark": "gray1000",
+        "light": "lightGray1000"
+      },
+      "markdownHeading": {
+        "dark": "purple900",
+        "light": "purple700"
+      },
+      "markdownLink": {
+        "dark": "blue900",
+        "light": "blue700"
+      },
+      "markdownLinkText": {
+        "dark": "teal900",
+        "light": "teal700"
+      },
+      "markdownCode": {
+        "dark": "green900",
+        "light": "green700"
+      },
+      "markdownBlockQuote": {
+        "dark": "gray600",
+        "light": "lightGray600"
+      },
+      "markdownEmph": {
+        "dark": "amber900",
+        "light": "amber700"
+      },
+      "markdownStrong": {
+        "dark": "pink900",
+        "light": "pink700"
+      },
+      "markdownHorizontalRule": {
+        "dark": "gray500",
+        "light": "#999999"
+      },
+      "markdownListItem": {
+        "dark": "gray1000",
+        "light": "lightGray1000"
+      },
+      "markdownListEnumeration": {
+        "dark": "blue900",
+        "light": "blue700"
+      },
+      "markdownImage": {
+        "dark": "teal900",
+        "light": "teal700"
+      },
+      "markdownImageText": {
+        "dark": "cyan",
+        "light": "teal700"
+      },
+      "markdownCodeBlock": {
+        "dark": "gray1000",
+        "light": "lightGray1000"
+      },
+      "syntaxComment": {
+        "dark": "gray600",
+        "light": "#888888"
+      },
+      "syntaxKeyword": {
+        "dark": "pink900",
+        "light": "pink700"
+      },
+      "syntaxFunction": {
+        "dark": "purple900",
+        "light": "purple700"
+      },
+      "syntaxVariable": {
+        "dark": "blue900",
+        "light": "blue700"
+      },
+      "syntaxString": {
+        "dark": "green900",
+        "light": "green700"
+      },
+      "syntaxNumber": {
+        "dark": "amber900",
+        "light": "amber700"
+      },
+      "syntaxType": {
+        "dark": "teal900",
+        "light": "teal700"
+      },
+      "syntaxOperator": {
+        "dark": "pink900",
+        "light": "pink700"
+      },
+      "syntaxPunctuation": {
+        "dark": "gray1000",
+        "light": "lightGray1000"
+      }
+    }
+  },
+  "vesper": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "vesperBg": "#101010",
+      "vesperFg": "#FFF",
+      "vesperComment": "#8b8b8b",
+      "vesperKeyword": "#A0A0A0",
+      "vesperFunction": "#FFC799",
+      "vesperString": "#99FFE4",
+      "vesperNumber": "#FFC799",
+      "vesperError": "#FF8080",
+      "vesperWarning": "#FFC799",
+      "vesperSuccess": "#99FFE4",
+      "vesperMuted": "#A0A0A0"
+    },
+    "theme": {
+      "primary": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "secondary": {
+        "dark": "#99FFE4",
+        "light": "#99FFE4"
+      },
+      "accent": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "error": {
+        "dark": "vesperError",
+        "light": "vesperError"
+      },
+      "warning": {
+        "dark": "vesperWarning",
+        "light": "vesperWarning"
+      },
+      "success": {
+        "dark": "vesperSuccess",
+        "light": "vesperSuccess"
+      },
+      "info": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "text": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "textMuted": {
+        "dark": "vesperMuted",
+        "light": "vesperMuted"
+      },
+      "background": {
+        "dark": "vesperBg",
+        "light": "#FFF"
+      },
+      "backgroundPanel": {
+        "dark": "vesperBg",
+        "light": "#F0F0F0"
+      },
+      "backgroundElement": {
+        "dark": "vesperBg",
+        "light": "#E0E0E0"
+      },
+      "border": {
+        "dark": "#282828",
+        "light": "#D0D0D0"
+      },
+      "borderActive": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "borderSubtle": {
+        "dark": "#1C1C1C",
+        "light": "#E8E8E8"
+      },
+      "diffAdded": {
+        "dark": "vesperSuccess",
+        "light": "vesperSuccess"
+      },
+      "diffRemoved": {
+        "dark": "vesperError",
+        "light": "vesperError"
+      },
+      "diffContext": {
+        "dark": "vesperMuted",
+        "light": "vesperMuted"
+      },
+      "diffHunkHeader": {
+        "dark": "vesperMuted",
+        "light": "vesperMuted"
+      },
+      "diffHighlightAdded": {
+        "dark": "vesperSuccess",
+        "light": "vesperSuccess"
+      },
+      "diffHighlightRemoved": {
+        "dark": "vesperError",
+        "light": "vesperError"
+      },
+      "diffAddedBg": {
+        "dark": "#0d2818",
+        "light": "#e8f5e8"
+      },
+      "diffRemovedBg": {
+        "dark": "#281a1a",
+        "light": "#f5e8e8"
+      },
+      "diffContextBg": {
+        "dark": "vesperBg",
+        "light": "#F8F8F8"
+      },
+      "diffLineNumber": {
+        "dark": "#505050",
+        "light": "#808080"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#0d2818",
+        "light": "#e8f5e8"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#281a1a",
+        "light": "#f5e8e8"
+      },
+      "markdownText": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "markdownHeading": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "markdownLink": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "markdownLinkText": {
+        "dark": "vesperMuted",
+        "light": "vesperMuted"
+      },
+      "markdownCode": {
+        "dark": "vesperMuted",
+        "light": "vesperMuted"
+      },
+      "markdownBlockQuote": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "markdownEmph": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "markdownStrong": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "markdownHorizontalRule": {
+        "dark": "#65737E",
+        "light": "#65737E"
+      },
+      "markdownListItem": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "markdownListEnumeration": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "markdownImage": {
+        "dark": "#FFC799",
+        "light": "#FFC799"
+      },
+      "markdownImageText": {
+        "dark": "vesperMuted",
+        "light": "vesperMuted"
+      },
+      "markdownCodeBlock": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "syntaxComment": {
+        "dark": "vesperComment",
+        "light": "vesperComment"
+      },
+      "syntaxKeyword": {
+        "dark": "vesperKeyword",
+        "light": "vesperKeyword"
+      },
+      "syntaxFunction": {
+        "dark": "vesperFunction",
+        "light": "vesperFunction"
+      },
+      "syntaxVariable": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      },
+      "syntaxString": {
+        "dark": "vesperString",
+        "light": "vesperString"
+      },
+      "syntaxNumber": {
+        "dark": "vesperNumber",
+        "light": "vesperNumber"
+      },
+      "syntaxType": {
+        "dark": "vesperFunction",
+        "light": "vesperFunction"
+      },
+      "syntaxOperator": {
+        "dark": "vesperKeyword",
+        "light": "vesperKeyword"
+      },
+      "syntaxPunctuation": {
+        "dark": "vesperFg",
+        "light": "vesperBg"
+      }
+    }
+  },
+  "zenburn": {
+    "$schema": "https://opencode.ai/theme.json",
+    "defs": {
+      "bg": "#3f3f3f",
+      "bgAlt": "#4f4f4f",
+      "bgPanel": "#5f5f5f",
+      "fg": "#dcdccc",
+      "fgMuted": "#9f9f9f",
+      "red": "#cc9393",
+      "redBright": "#dca3a3",
+      "green": "#7f9f7f",
+      "greenBright": "#8fb28f",
+      "yellow": "#f0dfaf",
+      "yellowDim": "#e0cf9f",
+      "blue": "#8cd0d3",
+      "blueDim": "#7cb8bb",
+      "magenta": "#dc8cc3",
+      "cyan": "#93e0e3",
+      "orange": "#dfaf8f"
+    },
+    "theme": {
+      "primary": {
+        "dark": "blue",
+        "light": "#5f7f8f"
+      },
+      "secondary": {
+        "dark": "magenta",
+        "light": "#8f5f8f"
+      },
+      "accent": {
+        "dark": "cyan",
+        "light": "#5f8f8f"
+      },
+      "error": {
+        "dark": "red",
+        "light": "#8f5f5f"
+      },
+      "warning": {
+        "dark": "yellow",
+        "light": "#8f8f5f"
+      },
+      "success": {
+        "dark": "green",
+        "light": "#5f8f5f"
+      },
+      "info": {
+        "dark": "orange",
+        "light": "#8f7f5f"
+      },
+      "text": {
+        "dark": "fg",
+        "light": "#3f3f3f"
+      },
+      "textMuted": {
+        "dark": "fgMuted",
+        "light": "#6f6f6f"
+      },
+      "background": {
+        "dark": "bg",
+        "light": "#ffffef"
+      },
+      "backgroundPanel": {
+        "dark": "bgAlt",
+        "light": "#f5f5e5"
+      },
+      "backgroundElement": {
+        "dark": "bgPanel",
+        "light": "#ebebdb"
+      },
+      "border": {
+        "dark": "#5f5f5f",
+        "light": "#d0d0c0"
+      },
+      "borderActive": {
+        "dark": "blue",
+        "light": "#5f7f8f"
+      },
+      "borderSubtle": {
+        "dark": "#4f4f4f",
+        "light": "#e0e0d0"
+      },
+      "diffAdded": {
+        "dark": "green",
+        "light": "#5f8f5f"
+      },
+      "diffRemoved": {
+        "dark": "red",
+        "light": "#8f5f5f"
+      },
+      "diffContext": {
+        "dark": "fgMuted",
+        "light": "#6f6f6f"
+      },
+      "diffHunkHeader": {
+        "dark": "cyan",
+        "light": "#5f8f8f"
+      },
+      "diffHighlightAdded": {
+        "dark": "greenBright",
+        "light": "#5f8f5f"
+      },
+      "diffHighlightRemoved": {
+        "dark": "redBright",
+        "light": "#8f5f5f"
+      },
+      "diffAddedBg": {
+        "dark": "#4f5f4f",
+        "light": "#efffef"
+      },
+      "diffRemovedBg": {
+        "dark": "#5f4f4f",
+        "light": "#ffefef"
+      },
+      "diffContextBg": {
+        "dark": "bgAlt",
+        "light": "#f5f5e5"
+      },
+      "diffLineNumber": {
+        "dark": "#6f6f6f",
+        "light": "#b0b0a0"
+      },
+      "diffAddedLineNumberBg": {
+        "dark": "#4f5f4f",
+        "light": "#efffef"
+      },
+      "diffRemovedLineNumberBg": {
+        "dark": "#5f4f4f",
+        "light": "#ffefef"
+      },
+      "markdownText": {
+        "dark": "fg",
+        "light": "#3f3f3f"
+      },
+      "markdownHeading": {
+        "dark": "yellow",
+        "light": "#8f8f5f"
+      },
+      "markdownLink": {
+        "dark": "blue",
+        "light": "#5f7f8f"
+      },
+      "markdownLinkText": {
+        "dark": "cyan",
+        "light": "#5f8f8f"
+      },
+      "markdownCode": {
+        "dark": "green",
+        "light": "#5f8f5f"
+      },
+      "markdownBlockQuote": {
+        "dark": "fgMuted",
+        "light": "#6f6f6f"
+      },
+      "markdownEmph": {
+        "dark": "yellowDim",
+        "light": "#8f8f5f"
+      },
+      "markdownStrong": {
+        "dark": "orange",
+        "light": "#8f7f5f"
+      },
+      "markdownHorizontalRule": {
+        "dark": "fgMuted",
+        "light": "#6f6f6f"
+      },
+      "markdownListItem": {
+        "dark": "blue",
+        "light": "#5f7f8f"
+      },
+      "markdownListEnumeration": {
+        "dark": "cyan",
+        "light": "#5f8f8f"
+      },
+      "markdownImage": {
+        "dark": "blue",
+        "light": "#5f7f8f"
+      },
+      "markdownImageText": {
+        "dark": "cyan",
+        "light": "#5f8f8f"
+      },
+      "markdownCodeBlock": {
+        "dark": "fg",
+        "light": "#3f3f3f"
+      },
+      "syntaxComment": {
+        "dark": "#7f9f7f",
+        "light": "#5f7f5f"
+      },
+      "syntaxKeyword": {
+        "dark": "yellow",
+        "light": "#8f8f5f"
+      },
+      "syntaxFunction": {
+        "dark": "blue",
+        "light": "#5f7f8f"
+      },
+      "syntaxVariable": {
+        "dark": "fg",
+        "light": "#3f3f3f"
+      },
+      "syntaxString": {
+        "dark": "red",
+        "light": "#8f5f5f"
+      },
+      "syntaxNumber": {
+        "dark": "greenBright",
+        "light": "#5f8f5f"
+      },
+      "syntaxType": {
+        "dark": "cyan",
+        "light": "#5f8f8f"
+      },
+      "syntaxOperator": {
+        "dark": "yellow",
+        "light": "#8f8f5f"
+      },
+      "syntaxPunctuation": {
+        "dark": "fg",
+        "light": "#3f3f3f"
+      }
+    }
+  }
+}
diff --git a/foundry/packages/cli/src/tmux.ts b/foundry/packages/cli/src/tmux.ts
new file mode 100644
index 0000000..297932e
--- /dev/null
+++ b/foundry/packages/cli/src/tmux.ts
@@ -0,0 +1,180 @@
+import { execFileSync, spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+
+const SYMBOL_RUNNING = "▶";
+const SYMBOL_IDLE = "✓";
+const DEFAULT_OPENCODE_ENDPOINT = "http://127.0.0.1:4097/opencode";
+
+export interface TmuxWindowMatch {
+  target: string;
+  windowName: string;
+}
+
+export interface SpawnCreateTmuxWindowInput {
+  branchName: string;
+  targetPath: string;
+  sessionId?: string | null;
+  opencodeEndpoint?: string;
+}
+
+export interface SpawnCreateTmuxWindowResult {
+  created: boolean;
+  reason: "created" | "not-in-tmux" | "not-local-path" | "window-exists" | "tmux-new-window-failed";
+}
+
+function isTmuxSession(): boolean {
+  return Boolean(process.env.TMUX);
+}
+
+function isAbsoluteLocalPath(path: string): boolean {
+  return path.startsWith("/");
+}
+
+function runTmux(args: string[]): boolean {
+  const result = spawnSync("tmux", args, { stdio: "ignore" });
+  return !result.error && result.status === 0;
+}
+
+function shellEscape(value: string): string {
+  if (value.length === 0) {
+    return "''";
+  }
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+
+function opencodeExistsOnPath(): boolean {
+  const probe = spawnSync("which", ["opencode"], { stdio: "ignore" });
+  return !probe.error && probe.status === 0;
+}
+
+function resolveOpencodeBinary(): string {
+  const envOverride = process.env.HF_OPENCODE_BIN?.trim();
+  if (envOverride) {
+    return envOverride;
+  }
+
+  if (opencodeExistsOnPath()) {
+    return "opencode";
+  }
+
+  const bundledCandidates = [`${homedir()}/.local/share/sandbox-agent/bin/opencode`, `${homedir()}/.opencode/bin/opencode`];
+
+  for (const candidate of bundledCandidates) {
+    if (existsSync(candidate)) {
+      return candidate;
+    }
+  }
+
+  return "opencode";
+}
+
+function attachCommand(sessionId: string, targetPath: string, endpoint: string): string {
+  const opencode = resolveOpencodeBinary();
+  return [shellEscape(opencode), "attach", shellEscape(endpoint), "--session", shellEscape(sessionId), "--dir", shellEscape(targetPath)].join(" ");
+}
+
+export function stripStatusPrefix(windowName: string): string {
+  return windowName
+    .trimStart()
+    .replace(new RegExp(`^${SYMBOL_RUNNING}\\s+`), "")
+    .replace(new RegExp(`^${SYMBOL_IDLE}\\s+`), "")
+    .trim();
+}
+
+export function findTmuxWindowsByBranch(branchName: string): TmuxWindowMatch[] {
+  const output = spawnSync("tmux", ["list-windows", "-a", "-F", "#{session_name}:#{window_id}:#{window_name}"], { encoding: "utf8" });
+
+  if (output.error || output.status !== 0 || !output.stdout) {
+    return [];
+  }
+
+  const lines = output.stdout.split(/\r?\n/).filter((line) => line.trim().length > 0);
+  const matches: TmuxWindowMatch[] = [];
+
+  for (const line of lines) {
+    const parts = line.split(":", 3);
+    if (parts.length !== 3) {
+      continue;
+    }
+
+    const sessionName = parts[0] ?? "";
+    const windowId = parts[1] ?? "";
+    const windowName = parts[2] ?? "";
+    const clean = stripStatusPrefix(windowName);
+    if (clean !== branchName) {
+      continue;
+    }
+
+    matches.push({
+      target: `${sessionName}:${windowId}`,
+      windowName,
+    });
+  }
+
+  return matches;
+}
+
+export function spawnCreateTmuxWindow(input: SpawnCreateTmuxWindowInput): SpawnCreateTmuxWindowResult {
+  if (!isTmuxSession()) {
+    return { created: false, reason: "not-in-tmux" };
+  }
+
+  if (!isAbsoluteLocalPath(input.targetPath)) {
+    return { created: false, reason: "not-local-path" };
+  }
+
+  if (findTmuxWindowsByBranch(input.branchName).length > 0) {
+    return { created: false, reason: "window-exists" };
+  }
+
+  const windowName = input.sessionId ? `${SYMBOL_RUNNING} ${input.branchName}` : input.branchName;
+  const endpoint = input.opencodeEndpoint ?? DEFAULT_OPENCODE_ENDPOINT;
+  let output = "";
+  try {
+    output = execFileSync("tmux", ["new-window", "-d", "-P", "-F", "#{window_id}", "-n", windowName, "-c", input.targetPath], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+  } catch {
+    return { created: false, reason: "tmux-new-window-failed" };
+  }
+
+  const windowId = output.trim();
+  if (!windowId) {
+    return { created: false, reason: "tmux-new-window-failed" };
+  }
+
+  if (input.sessionId) {
+    const leftPane = `${windowId}.0`;
+
+    // Split left pane horizontally → creates right pane; capture its pane ID
+    let rightPane: string;
+    try {
+      rightPane = execFileSync("tmux", ["split-window", "-h", "-P", "-F", "#{pane_id}", "-t", leftPane, "-c", input.targetPath], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "pipe"],
+      }).trim();
+    } catch {
+      return { created: true, reason: "created" };
+    }
+
+    if (!rightPane) {
+      return { created: true, reason: "created" };
+    }
+
+    // Split right pane vertically → top-right (rightPane) + bottom-right (new)
+    runTmux(["split-window", "-v", "-t", rightPane, "-c", input.targetPath]);
+
+    // Left pane 60% width, top-right pane 70% height
+    runTmux(["resize-pane", "-t", leftPane, "-x", "60%"]);
+    runTmux(["resize-pane", "-t", rightPane, "-y", "70%"]);
+
+    // Editor in left pane, agent attach in top-right pane
+    runTmux(["send-keys", "-t", leftPane, "nvim .", "Enter"]);
+    runTmux(["send-keys", "-t", rightPane, attachCommand(input.sessionId, input.targetPath, endpoint), "Enter"]);
+    runTmux(["select-pane", "-t", rightPane]);
+  }
+
+  return { created: true, reason: "created" };
+}
diff --git a/foundry/packages/cli/src/tui.ts b/foundry/packages/cli/src/tui.ts
new file mode 100644
index 0000000..062bb95
--- /dev/null
+++ b/foundry/packages/cli/src/tui.ts
@@ -0,0 +1,625 @@
+import type { AppConfig, TaskRecord, WorkspaceTaskDetail } from "@sandbox-agent/foundry-shared";
+import { spawnSync } from "node:child_process";
+import { createBackendClientFromConfig, filterTasks, formatRelativeAge, groupTaskStatus } from "@sandbox-agent/foundry-client";
+import { CLI_BUILD_ID } from "./build-id.js";
+import { writeStdout } from "./io.js";
+import { resolveTuiTheme, type TuiTheme } from "./theme.js";
+
+interface KeyEventLike {
+  name?: string;
+  ctrl?: boolean;
+  meta?: boolean;
+}
+
+const HELP_LINES = [
+  "Shortcuts",
+  "Ctrl-H           toggle cheatsheet",
+  "Enter            switch to branch",
+  "Ctrl-A           attach to session",
+  "Ctrl-O           open PR in browser",
+  "Ctrl-X           archive branch / close PR",
+  "Ctrl-Y           merge highlighted PR",
+  "Ctrl-S           sync task with remote",
+  "Ctrl-N / Down    next row",
+  "Ctrl-P / Up      previous row",
+  "Backspace        delete filter",
+  "Type             filter by branch/PR/author",
+  "Esc / Ctrl-C     cancel",
+  "",
+  "Legend",
+  "Agent: \u{1F916} running  \u{1F4AC} idle  \u25CC queued",
+];
+
+const COLUMN_WIDTHS = {
+  diff: 10,
+  agent: 5,
+  pr: 6,
+  author: 10,
+  ci: 7,
+  review: 8,
+  age: 5,
+} as const;
+
+interface DisplayRow {
+  name: string;
+  diff: string;
+  agent: string;
+  pr: string;
+  author: string;
+  ci: string;
+  review: string;
+  age: string;
+}
+
+type TuiTaskRow = TaskRecord & Pick<WorkspaceTaskDetail, "pullRequest"> & { activeSessionId?: string | null };
+
+interface RenderOptions {
+  width?: number;
+  height?: number;
+}
+
+async function listDetailedTasks(client: ReturnType<typeof createBackendClientFromConfig>, organizationId: string): Promise<TuiTaskRow[]> {
+  const rows = await client.listTasks(organizationId);
+  return await Promise.all(
+    rows.map(async (row) => {
+      const [task, detail] = await Promise.all([
+        client.getTask(organizationId, row.repoId, row.taskId),
+        client.getTaskDetail(organizationId, row.repoId, row.taskId).catch(() => null),
+      ]);
+      return {
+        ...task,
+        pullRequest: detail?.pullRequest ?? null,
+        activeSessionId: detail?.activeSessionId ?? null,
+      };
+    }),
+  );
+}
+
+function pad(input: string, width: number): string {
+  if (width <= 0) {
+    return "";
+  }
+  const chars = Array.from(input);
+  const text = chars.length > width ? `${chars.slice(0, Math.max(1, width - 1)).join("")}…` : input;
+  return text.padEnd(width, " ");
+}
+
+function truncateToLen(input: string, maxLen: number): string {
+  if (maxLen <= 0) {
+    return "";
+  }
+  return Array.from(input).slice(0, maxLen).join("");
+}
+
+function fitLine(input: string, width: number): string {
+  if (width <= 0) {
+    return "";
+  }
+  const clipped = truncateToLen(input, width);
+  const len = Array.from(clipped).length;
+  if (len >= width) {
+    return clipped;
+  }
+  return `${clipped}${" ".repeat(width - len)}`;
+}
+
+function overlayLine(base: string, overlay: string, startCol: number, width: number): string {
+  const out = Array.from(fitLine(base, width));
+  const src = Array.from(truncateToLen(overlay, Math.max(0, width - startCol)));
+  for (let i = 0; i < src.length; i += 1) {
+    const col = startCol + i;
+    if (col >= 0 && col < out.length) {
+      out[col] = src[i] ?? " ";
+    }
+  }
+  return out.join("");
+}
+
+function buildFooterLine(width: number, segments: string[], right: string): string {
+  if (width <= 0) {
+    return "";
+  }
+
+  const rightLen = Array.from(right).length;
+  if (width <= rightLen + 1) {
+    return truncateToLen(right, width);
+  }
+
+  const leftMax = width - rightLen - 1;
+  let used = 0;
+  let left = "";
+  let first = true;
+
+  for (const segment of segments) {
+    const chunk = first ? segment : ` | ${segment}`;
+    const clipped = truncateToLen(chunk, leftMax - used);
+    if (!clipped) {
+      break;
+    }
+    left += clipped;
+    used += Array.from(clipped).length;
+    first = false;
+    if (used >= leftMax) {
+      break;
+    }
+  }
+
+  const padding = " ".repeat(Math.max(0, leftMax - used) + 1);
+  return `${left}${padding}${right}`;
+}
+
+function agentSymbol(status: TaskRecord["status"]): string {
+  const group = groupTaskStatus(status);
+  if (group === "running") return "🤖";
+  if (group === "idle") return "💬";
+  if (group === "error") return "⚠";
+  if (group === "queued") return "◌";
+  return "-";
+}
+
+function toDisplayRow(row: TuiTaskRow): DisplayRow {
+  const prLabel = row.pullRequest ? `#${row.pullRequest.number}` : "-";
+  const reviewLabel = row.pullRequest ? (row.pullRequest.isDraft ? "draft" : row.pullRequest.state.toLowerCase()) : "-";
+
+  return {
+    name: row.title || row.branchName || row.taskId,
+    diff: "-",
+    agent: agentSymbol(row.status),
+    pr: prLabel,
+    author: row.pullRequest?.authorLogin ?? "-",
+    ci: "-",
+    review: reviewLabel,
+    age: formatRelativeAge(row.updatedAt),
+  };
+}
+
+function helpLines(width: number): string[] {
+  const popupWidth = Math.max(40, Math.min(width - 2, 100));
+  const innerWidth = Math.max(2, popupWidth - 2);
+  const borderTop = `┌${"─".repeat(innerWidth)}┐`;
+  const borderBottom = `└${"─".repeat(innerWidth)}┘`;
+
+  const lines = [borderTop];
+  for (const line of HELP_LINES) {
+    lines.push(`│${pad(line, innerWidth)}│`);
+  }
+  lines.push(borderBottom);
+  return lines;
+}
+
+export function formatRows(
+  rows: TuiTaskRow[],
+  selected: number,
+  organizationId: string,
+  status: string,
+  searchQuery = "",
+  showHelp = false,
+  options: RenderOptions = {},
+): string {
+  const totalWidth = options.width ?? process.stdout.columns ?? 120;
+  const totalHeight = Math.max(6, options.height ?? process.stdout.rows ?? 24);
+  const fixedWidth =
+    COLUMN_WIDTHS.diff + COLUMN_WIDTHS.agent + COLUMN_WIDTHS.pr + COLUMN_WIDTHS.author + COLUMN_WIDTHS.ci + COLUMN_WIDTHS.review + COLUMN_WIDTHS.age;
+  const separators = 7;
+  const prefixWidth = 2;
+  const branchWidth = Math.max(20, totalWidth - (fixedWidth + separators + prefixWidth));
+
+  const branchHeader = searchQuery ? `Branch/PR: ${searchQuery}_` : "Branch/PR (type to filter)";
+  const header = [
+    `  ${pad(branchHeader, branchWidth)} ${pad("Diff", COLUMN_WIDTHS.diff)} ${pad("Agent", COLUMN_WIDTHS.agent)} ${pad("PR", COLUMN_WIDTHS.pr)} ${pad("Author", COLUMN_WIDTHS.author)} ${pad("CI", COLUMN_WIDTHS.ci)} ${pad("Review", COLUMN_WIDTHS.review)} ${pad("Age", COLUMN_WIDTHS.age)}`,
+    "-".repeat(Math.max(24, Math.min(totalWidth, 180))),
+  ];
+
+  const body =
+    rows.length === 0
+      ? ["No branches found."]
+      : rows.map((row, index) => {
+          const marker = index === selected ? "┃ " : "  ";
+          const display = toDisplayRow(row);
+          return `${marker}${pad(display.name, branchWidth)} ${pad(display.diff, COLUMN_WIDTHS.diff)} ${pad(display.agent, COLUMN_WIDTHS.agent)} ${pad(display.pr, COLUMN_WIDTHS.pr)} ${pad(display.author, COLUMN_WIDTHS.author)} ${pad(display.ci, COLUMN_WIDTHS.ci)} ${pad(display.review, COLUMN_WIDTHS.review)} ${pad(display.age, COLUMN_WIDTHS.age)}`;
+        });
+
+  const footer = fitLine(buildFooterLine(totalWidth, ["Ctrl-H:cheatsheet", `organization:${organizationId}`, status], `v${CLI_BUILD_ID}`), totalWidth);
+
+  const contentHeight = totalHeight - 1;
+  const lines = [...header, ...body].map((line) => fitLine(line, totalWidth));
+  const page = lines.slice(0, contentHeight);
+  while (page.length < contentHeight) {
+    page.push(" ".repeat(totalWidth));
+  }
+
+  if (showHelp) {
+    const popup = helpLines(totalWidth);
+    const startRow = Math.max(0, Math.floor((contentHeight - popup.length) / 2));
+    for (let i = 0; i < popup.length; i += 1) {
+      const target = startRow + i;
+      if (target >= page.length) {
+        break;
+      }
+      const popupLine = popup[i] ?? "";
+      const popupLen = Array.from(popupLine).length;
+      const startCol = Math.max(0, Math.floor((totalWidth - popupLen) / 2));
+      page[target] = overlayLine(page[target] ?? "", popupLine, startCol, totalWidth);
+    }
+  }
+
+  return [...page, footer].join("\n");
+}
+
+interface OpenTuiLike {
+  createCliRenderer?: (options?: Record<string, unknown>) => Promise<any>;
+  TextRenderable?: new (
+    ctx: any,
+    options: { id: string; content: string },
+  ) => {
+    content: unknown;
+    fg?: string;
+    bg?: string;
+  };
+  fg?: (color: string) => (input: unknown) => unknown;
+  bg?: (color: string) => (input: unknown) => unknown;
+  StyledText?: new (chunks: unknown[]) => unknown;
+}
+
+interface StyledTextApi {
+  fg: (color: string) => (input: unknown) => unknown;
+  bg: (color: string) => (input: unknown) => unknown;
+  StyledText: new (chunks: unknown[]) => unknown;
+}
+
+function buildStyledContent(content: string, theme: TuiTheme, api: StyledTextApi): unknown {
+  const lines = content.split("\n");
+  const chunks: unknown[] = [];
+  const footerIndex = Math.max(0, lines.length - 1);
+
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i] ?? "";
+
+    let fgColor = theme.text;
+    let bgColor: string | undefined;
+
+    if (line.startsWith("┃ ")) {
+      const marker = "┃ ";
+      const rest = line.slice(marker.length);
+      bgColor = theme.highlightBg;
+      const markerChunk = api.bg(bgColor)(api.fg(theme.selectionBorder)(marker));
+      const restChunk = api.bg(bgColor)(api.fg(theme.highlightFg)(rest));
+      chunks.push(markerChunk);
+      chunks.push(restChunk);
+      if (i < lines.length - 1) {
+        chunks.push(api.fg(theme.text)("\n"));
+      }
+      continue;
+    }
+
+    if (i === 0) {
+      fgColor = theme.header;
+    } else if (i === 1) {
+      fgColor = theme.muted;
+    } else if (i === footerIndex) {
+      fgColor = theme.status;
+    } else if (line.startsWith("┌") || line.startsWith("│") || line.startsWith("└")) {
+      fgColor = theme.info;
+    }
+
+    let chunk: unknown = api.fg(fgColor)(line);
+    if (bgColor) {
+      chunk = api.bg(bgColor)(chunk);
+    }
+    chunks.push(chunk);
+
+    if (i < lines.length - 1) {
+      chunks.push(api.fg(theme.text)("\n"));
+    }
+  }
+
+  return new api.StyledText(chunks);
+}
+
+export async function runTui(config: AppConfig, organizationId: string): Promise<void> {
+  const core = (await import("@opentui/core")) as OpenTuiLike;
+  const createCliRenderer = core.createCliRenderer;
+  const TextRenderable = core.TextRenderable;
+  const styleApi = core.fg && core.bg && core.StyledText ? { fg: core.fg, bg: core.bg, StyledText: core.StyledText } : null;
+
+  if (!createCliRenderer || !TextRenderable) {
+    throw new Error("OpenTUI runtime missing createCliRenderer/TextRenderable exports");
+  }
+
+  const themeResolution = resolveTuiTheme(config);
+  const client = createBackendClientFromConfig(config);
+  const renderer = await createCliRenderer({ exitOnCtrlC: false });
+  const text = new TextRenderable(renderer, {
+    id: "foundry-switch",
+    content: "Loading...",
+  });
+  text.fg = themeResolution.theme.text;
+  text.bg = themeResolution.theme.background;
+  renderer.root.add(text);
+  renderer.start();
+
+  let allRows: TuiTaskRow[] = [];
+  let filteredRows: TuiTaskRow[] = [];
+  let selected = 0;
+  let searchQuery = "";
+  let showHelp = false;
+  let status = "loading...";
+  let busy = false;
+  let closed = false;
+  let timer: ReturnType<typeof setInterval> | null = null;
+
+  const clampSelected = (): void => {
+    if (filteredRows.length === 0) {
+      selected = 0;
+      return;
+    }
+    if (selected < 0) {
+      selected = 0;
+      return;
+    }
+    if (selected >= filteredRows.length) {
+      selected = filteredRows.length - 1;
+    }
+  };
+
+  const render = (): void => {
+    if (closed) {
+      return;
+    }
+    const output = formatRows(filteredRows, selected, organizationId, status, searchQuery, showHelp, {
+      width: renderer.width ?? process.stdout.columns,
+      height: renderer.height ?? process.stdout.rows,
+    });
+    text.content = styleApi ? buildStyledContent(output, themeResolution.theme, styleApi) : output;
+    renderer.requestRender();
+  };
+
+  const refresh = async (): Promise<void> => {
+    if (closed) {
+      return;
+    }
+    try {
+      allRows = await listDetailedTasks(client, organizationId);
+      if (closed) {
+        return;
+      }
+      filteredRows = filterTasks(allRows, searchQuery);
+      clampSelected();
+      status = `tasks=${allRows.length} filtered=${filteredRows.length}`;
+    } catch (err) {
+      if (closed) {
+        return;
+      }
+      status = err instanceof Error ? err.message : String(err);
+    }
+    render();
+  };
+
+  const selectedRow = (): TuiTaskRow | null => {
+    if (filteredRows.length === 0) {
+      return null;
+    }
+    return filteredRows[selected] ?? null;
+  };
+
+  let resolveDone: () => void = () => {};
+  const done = new Promise<void>((resolve) => {
+    resolveDone = () => resolve();
+  });
+
+  const close = (output?: string): void => {
+    if (closed) {
+      return;
+    }
+    closed = true;
+    if (timer) {
+      clearInterval(timer);
+      timer = null;
+    }
+    process.off("SIGINT", handleSignal);
+    process.off("SIGTERM", handleSignal);
+    renderer.destroy();
+    if (output) {
+      writeStdout(output);
+    }
+    resolveDone();
+  };
+
+  const handleSignal = (): void => {
+    close();
+  };
+
+  const runActionWithRefresh = async (label: string, fn: () => Promise<void>, success: string): Promise<void> => {
+    if (busy) {
+      return;
+    }
+    busy = true;
+    status = `${label}...`;
+    render();
+    try {
+      await fn();
+      status = success;
+      await refresh();
+    } catch (err) {
+      status = err instanceof Error ? err.message : String(err);
+      render();
+    } finally {
+      busy = false;
+    }
+  };
+
+  await refresh();
+  timer = setInterval(() => {
+    void refresh();
+  }, 10_000);
+  process.once("SIGINT", handleSignal);
+  process.once("SIGTERM", handleSignal);
+
+  const keyInput = (renderer.keyInput ?? renderer.keyHandler) as { on: (name: string, cb: (event: KeyEventLike) => void) => void } | undefined;
+
+  if (!keyInput) {
+    clearInterval(timer);
+    renderer.destroy();
+    throw new Error("OpenTUI key input handler is unavailable");
+  }
+
+  keyInput.on("keypress", (event: KeyEventLike) => {
+    if (closed) {
+      return;
+    }
+
+    const name = event.name ?? "";
+    const ctrl = Boolean(event.ctrl);
+
+    if (ctrl && name === "h") {
+      showHelp = !showHelp;
+      render();
+      return;
+    }
+
+    if (showHelp) {
+      if (name === "escape") {
+        showHelp = false;
+        render();
+      }
+      return;
+    }
+
+    if (name === "q" || name === "escape" || (ctrl && name === "c")) {
+      close();
+      return;
+    }
+
+    if ((ctrl && name === "n") || name === "down") {
+      if (filteredRows.length > 0) {
+        selected = selected >= filteredRows.length - 1 ? 0 : selected + 1;
+        render();
+      }
+      return;
+    }
+
+    if ((ctrl && name === "p") || name === "up") {
+      if (filteredRows.length > 0) {
+        selected = selected <= 0 ? filteredRows.length - 1 : selected - 1;
+        render();
+      }
+      return;
+    }
+
+    if (name === "backspace") {
+      searchQuery = searchQuery.slice(0, -1);
+      filteredRows = filterTasks(allRows, searchQuery);
+      selected = 0;
+      render();
+      return;
+    }
+
+    if (name === "return" || name === "enter") {
+      const row = selectedRow();
+      if (!row || busy) {
+        return;
+      }
+      busy = true;
+      status = `switching ${row.taskId}...`;
+      render();
+      void (async () => {
+        try {
+          const result = await client.switchTask(organizationId, row.repoId, row.taskId);
+          close(`cd ${result.switchTarget}`);
+        } catch (err) {
+          busy = false;
+          status = err instanceof Error ? err.message : String(err);
+          render();
+        }
+      })();
+      return;
+    }
+
+    if (ctrl && name === "a") {
+      const row = selectedRow();
+      if (!row || busy) {
+        return;
+      }
+      busy = true;
+      status = `attaching ${row.taskId}...`;
+      render();
+      void (async () => {
+        try {
+          const result = await client.attachTask(organizationId, row.repoId, row.taskId);
+          close(`target=${result.target} session=${result.sessionId ?? "none"}`);
+        } catch (err) {
+          busy = false;
+          status = err instanceof Error ? err.message : String(err);
+          render();
+        }
+      })();
+      return;
+    }
+
+    if (ctrl && name === "x") {
+      const row = selectedRow();
+      if (!row) {
+        return;
+      }
+      void runActionWithRefresh(
+        `archiving ${row.taskId}`,
+        async () => client.runAction(organizationId, row.repoId, row.taskId, "archive"),
+        `archived ${row.taskId}`,
+      );
+      return;
+    }
+
+    if (ctrl && name === "s") {
+      const row = selectedRow();
+      if (!row) {
+        return;
+      }
+      void runActionWithRefresh(
+        `syncing ${row.taskId}`,
+        async () => client.runAction(organizationId, row.repoId, row.taskId, "sync"),
+        `synced ${row.taskId}`,
+      );
+      return;
+    }
+
+    if (ctrl && name === "y") {
+      const row = selectedRow();
+      if (!row) {
+        return;
+      }
+      void runActionWithRefresh(
+        `merging ${row.taskId}`,
+        async () => {
+          await client.runAction(organizationId, row.repoId, row.taskId, "merge");
+          await client.runAction(organizationId, row.repoId, row.taskId, "archive");
+        },
+        `merged+archived ${row.taskId}`,
+      );
+      return;
+    }
+
+    if (ctrl && name === "o") {
+      const row = selectedRow();
+      const prUrl = row?.pullRequest?.url ?? null;
+      if (!prUrl) {
+        status = "no PR URL available for this task";
+        render();
+        return;
+      }
+      const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
+      spawnSync(openCmd, [prUrl], { stdio: "ignore" });
+      status = `opened ${prUrl}`;
+      render();
+      return;
+    }
+
+    if (!ctrl && !event.meta && name.length === 1) {
+      searchQuery += name;
+      filteredRows = filterTasks(allRows, searchQuery);
+      selected = 0;
+      render();
+    }
+  });
+
+  await done;
+}
diff --git a/foundry/packages/cli/test/backend-manager.test.ts b/foundry/packages/cli/test/backend-manager.test.ts
new file mode 100644
index 0000000..a6089c5
--- /dev/null
+++ b/foundry/packages/cli/test/backend-manager.test.ts
@@ -0,0 +1,160 @@
+import { mkdtempSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { EventEmitter } from "node:events";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ChildProcess } from "node:child_process";
+
+const { spawnMock, execFileSyncMock } = vi.hoisted(() => ({
+  spawnMock: vi.fn(),
+  execFileSyncMock: vi.fn(),
+}));
+
+vi.mock("node:child_process", async () => {
+  const actual = await vi.importActual<typeof import("node:child_process")>("node:child_process");
+  return {
+    ...actual,
+    spawn: spawnMock,
+    execFileSync: execFileSyncMock,
+  };
+});
+
+import { ensureBackendRunning, parseBackendPort } from "../src/backend/manager.js";
+import { ConfigSchema, type AppConfig } from "@sandbox-agent/foundry-shared";
+
+function backendStateFile(baseDir: string, host: string, port: number, suffix: string): string {
+  const sanitized = host
+    .split("")
+    .map((ch) => (/[a-zA-Z0-9]/.test(ch) ? ch : "-"))
+    .join("");
+
+  return join(baseDir, `backend-${sanitized}-${port}.${suffix}`);
+}
+
+function healthyMetadataResponse(): { ok: boolean; json: () => Promise<unknown> } {
+  return {
+    ok: true,
+    json: async () => ({
+      runtime: "rivetkit",
+      actorNames: {
+        organization: {},
+      },
+    }),
+  };
+}
+
+function unhealthyMetadataResponse(): { ok: boolean; json: () => Promise<unknown> } {
+  return {
+    ok: false,
+    json: async () => ({}),
+  };
+}
+
+describe("backend manager", () => {
+  const originalFetch = globalThis.fetch;
+  const originalStateDir = process.env.HF_BACKEND_STATE_DIR;
+  const originalBuildId = process.env.HF_BUILD_ID;
+
+  const config: AppConfig = ConfigSchema.parse({
+    auto_submit: true,
+    notify: ["terminal"],
+    organization: { default: "default" },
+    backend: {
+      host: "127.0.0.1",
+      port: 7741,
+      dbPath: "~/.local/share/foundry/task.db",
+      opencode_poll_interval: 2,
+      github_poll_interval: 30,
+      backup_interval_secs: 3600,
+      backup_retention_days: 7,
+    },
+    sandboxProviders: {
+      local: {},
+      e2b: {},
+    },
+  });
+
+  beforeEach(() => {
+    process.env.HF_BUILD_ID = "test-build";
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    spawnMock.mockReset();
+    execFileSyncMock.mockReset();
+    globalThis.fetch = originalFetch;
+
+    if (originalStateDir === undefined) {
+      delete process.env.HF_BACKEND_STATE_DIR;
+    } else {
+      process.env.HF_BACKEND_STATE_DIR = originalStateDir;
+    }
+
+    if (originalBuildId === undefined) {
+      delete process.env.HF_BUILD_ID;
+    } else {
+      process.env.HF_BUILD_ID = originalBuildId;
+    }
+  });
+
+  it("restarts backend when healthy but build is outdated", async () => {
+    const stateDir = mkdtempSync(join(tmpdir(), "hf-backend-test-"));
+    process.env.HF_BACKEND_STATE_DIR = stateDir;
+
+    const pidPath = backendStateFile(stateDir, config.backend.host, config.backend.port, "pid");
+    const versionPath = backendStateFile(stateDir, config.backend.host, config.backend.port, "version");
+
+    mkdirSync(stateDir, { recursive: true });
+    writeFileSync(pidPath, "999999", "utf8");
+    writeFileSync(versionPath, "old-build", "utf8");
+
+    const fetchMock = vi
+      .fn<() => Promise<{ ok: boolean; json: () => Promise<unknown> }>>()
+      .mockResolvedValueOnce(healthyMetadataResponse())
+      .mockResolvedValueOnce(unhealthyMetadataResponse())
+      .mockResolvedValue(healthyMetadataResponse());
+    globalThis.fetch = fetchMock as unknown as typeof fetch;
+
+    const fakeChild = Object.assign(new EventEmitter(), {
+      pid: process.pid,
+      unref: vi.fn(),
+    }) as unknown as ChildProcess;
+    spawnMock.mockReturnValue(fakeChild);
+
+    await ensureBackendRunning(config);
+
+    expect(spawnMock).toHaveBeenCalledTimes(1);
+    const launchCommand = spawnMock.mock.calls[0]?.[0];
+    const launchArgs = spawnMock.mock.calls[0]?.[1] as string[] | undefined;
+    expect(launchCommand === "pnpm" || launchCommand === "bun" || (typeof launchCommand === "string" && launchCommand.endsWith("/bun"))).toBe(true);
+    expect(launchArgs).toEqual(expect.arrayContaining(["start", "--host", config.backend.host, "--port", String(config.backend.port)]));
+    if (launchCommand === "pnpm") {
+      expect(launchArgs).toEqual(expect.arrayContaining(["exec", "bun", "src/index.ts"]));
+    }
+    expect(readFileSync(pidPath, "utf8").trim()).toBe(String(process.pid));
+    expect(readFileSync(versionPath, "utf8").trim()).toBe("test-build");
+  });
+
+  it("does not restart when backend is healthy and build is current", async () => {
+    const stateDir = mkdtempSync(join(tmpdir(), "hf-backend-test-"));
+    process.env.HF_BACKEND_STATE_DIR = stateDir;
+
+    const versionPath = backendStateFile(stateDir, config.backend.host, config.backend.port, "version");
+    mkdirSync(stateDir, { recursive: true });
+    writeFileSync(versionPath, "test-build", "utf8");
+
+    const fetchMock = vi.fn<() => Promise<{ ok: boolean; json: () => Promise<unknown> }>>().mockResolvedValue(healthyMetadataResponse());
+    globalThis.fetch = fetchMock as unknown as typeof fetch;
+
+    await ensureBackendRunning(config);
+
+    expect(spawnMock).not.toHaveBeenCalled();
+  });
+
+  it("validates backend port parsing", () => {
+    expect(parseBackendPort(undefined, 7741)).toBe(7741);
+    expect(parseBackendPort("8080", 7741)).toBe(8080);
+    expect(() => parseBackendPort("0", 7741)).toThrow("Invalid backend port");
+    expect(() => parseBackendPort("abc", 7741)).toThrow("Invalid backend port");
+  });
+});
diff --git a/foundry/packages/cli/test/organization-config.test.ts b/foundry/packages/cli/test/organization-config.test.ts
new file mode 100644
index 0000000..5053ec2
--- /dev/null
+++ b/foundry/packages/cli/test/organization-config.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from "vitest";
+import { ConfigSchema } from "@sandbox-agent/foundry-shared";
+import { resolveOrganization } from "../src/organization/config.js";
+
+describe("cli organization resolution", () => {
+  it("uses default organization when no flag", () => {
+    const config = ConfigSchema.parse({
+      auto_submit: true as const,
+      notify: ["terminal" as const],
+      organization: { default: "team" },
+      backend: {
+        host: "127.0.0.1",
+        port: 7741,
+        dbPath: "~/.local/share/foundry/task.db",
+        opencode_poll_interval: 2,
+        github_poll_interval: 30,
+        backup_interval_secs: 3600,
+        backup_retention_days: 7,
+      },
+      sandboxProviders: {
+        local: {},
+        e2b: {},
+      },
+    });
+
+    expect(resolveOrganization(undefined, config)).toBe("team");
+    expect(resolveOrganization("alpha", config)).toBe("alpha");
+  });
+});
diff --git a/foundry/packages/cli/test/task-editor.test.ts b/foundry/packages/cli/test/task-editor.test.ts
new file mode 100644
index 0000000..998e9ff
--- /dev/null
+++ b/foundry/packages/cli/test/task-editor.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from "vitest";
+import { sanitizeEditorTask } from "../src/task-editor.js";
+
+describe("task editor helpers", () => {
+  it("strips comment lines and trims whitespace", () => {
+    const value = sanitizeEditorTask(`
+# comment
+Implement feature
+
+# another comment
+with more detail
+`);
+
+    expect(value).toBe("Implement feature\n\nwith more detail");
+  });
+
+  it("returns empty string when only comments are present", () => {
+    const value = sanitizeEditorTask(`
+# hello
+# world
+`);
+
+    expect(value).toBe("");
+  });
+});
diff --git a/foundry/packages/cli/test/theme.test.ts b/foundry/packages/cli/test/theme.test.ts
new file mode 100644
index 0000000..2a0d7e3
--- /dev/null
+++ b/foundry/packages/cli/test/theme.test.ts
@@ -0,0 +1,105 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { ConfigSchema, type AppConfig } from "@sandbox-agent/foundry-shared";
+import { resolveTuiTheme } from "../src/theme.js";
+
+function withEnv(key: string, value: string | undefined): void {
+  if (value === undefined) {
+    delete process.env[key];
+    return;
+  }
+  process.env[key] = value;
+}
+
+describe("resolveTuiTheme", () => {
+  let tempDir: string | null = null;
+  const originalState = process.env.XDG_STATE_HOME;
+  const originalConfig = process.env.XDG_CONFIG_HOME;
+
+  const baseConfig: AppConfig = ConfigSchema.parse({
+    auto_submit: true,
+    notify: ["terminal"],
+    organization: { default: "default" },
+    backend: {
+      host: "127.0.0.1",
+      port: 7741,
+      dbPath: "~/.local/share/foundry/task.db",
+      opencode_poll_interval: 2,
+      github_poll_interval: 30,
+      backup_interval_secs: 3600,
+      backup_retention_days: 7,
+    },
+    sandboxProviders: {
+      local: {},
+      e2b: {},
+    },
+  });
+
+  afterEach(() => {
+    withEnv("XDG_STATE_HOME", originalState);
+    withEnv("XDG_CONFIG_HOME", originalConfig);
+    if (tempDir) {
+      rmSync(tempDir, { recursive: true, force: true });
+      tempDir = null;
+    }
+  });
+
+  it("falls back to default theme when no theme sources are present", () => {
+    tempDir = mkdtempSync(join(tmpdir(), "hf-theme-test-"));
+    withEnv("XDG_STATE_HOME", join(tempDir, "state"));
+    withEnv("XDG_CONFIG_HOME", join(tempDir, "config"));
+
+    const resolution = resolveTuiTheme(baseConfig, tempDir);
+
+    expect(resolution.name).toBe("opencode-default");
+    expect(resolution.source).toBe("default");
+    expect(resolution.theme.text).toBe("#ffffff");
+  });
+
+  it("loads theme from opencode state when configured", () => {
+    tempDir = mkdtempSync(join(tmpdir(), "hf-theme-test-"));
+    const stateHome = join(tempDir, "state");
+    const configHome = join(tempDir, "config");
+    withEnv("XDG_STATE_HOME", stateHome);
+    withEnv("XDG_CONFIG_HOME", configHome);
+    mkdirSync(join(stateHome, "opencode"), { recursive: true });
+    writeFileSync(join(stateHome, "opencode", "kv.json"), JSON.stringify({ theme: "gruvbox", theme_mode: "dark" }), "utf8");
+
+    const resolution = resolveTuiTheme(baseConfig, tempDir);
+
+    expect(resolution.name).toBe("gruvbox");
+    expect(resolution.source).toContain("opencode state");
+    expect(resolution.mode).toBe("dark");
+    expect(resolution.theme.selectionBorder.toLowerCase()).not.toContain("dark");
+  });
+
+  it("resolves OpenCode token references in theme defs", () => {
+    tempDir = mkdtempSync(join(tmpdir(), "hf-theme-test-"));
+    const stateHome = join(tempDir, "state");
+    const configHome = join(tempDir, "config");
+    withEnv("XDG_STATE_HOME", stateHome);
+    withEnv("XDG_CONFIG_HOME", configHome);
+    mkdirSync(join(stateHome, "opencode"), { recursive: true });
+    writeFileSync(join(stateHome, "opencode", "kv.json"), JSON.stringify({ theme: "orng", theme_mode: "dark" }), "utf8");
+
+    const resolution = resolveTuiTheme(baseConfig, tempDir);
+
+    expect(resolution.name).toBe("orng");
+    expect(resolution.theme.selectionBorder).toBe("#EE7948");
+    expect(resolution.theme.background).toBe("#0a0a0a");
+  });
+
+  it("prefers explicit foundry theme override from config", () => {
+    tempDir = mkdtempSync(join(tmpdir(), "hf-theme-test-"));
+    withEnv("XDG_STATE_HOME", join(tempDir, "state"));
+    withEnv("XDG_CONFIG_HOME", join(tempDir, "config"));
+
+    const config = { ...baseConfig, theme: "default" } as AppConfig & { theme: string };
+    const resolution = resolveTuiTheme(config, tempDir);
+
+    expect(resolution.name).toBe("opencode-default");
+    expect(resolution.source).toBe("foundry config");
+  });
+});
diff --git a/foundry/packages/cli/test/tmux.test.ts b/foundry/packages/cli/test/tmux.test.ts
new file mode 100644
index 0000000..29b7801
--- /dev/null
+++ b/foundry/packages/cli/test/tmux.test.ts
@@ -0,0 +1,10 @@
+import { describe, expect, it } from "vitest";
+import { stripStatusPrefix } from "../src/tmux.js";
+
+describe("tmux helpers", () => {
+  it("strips running and idle markers from window names", () => {
+    expect(stripStatusPrefix("▶ feature/auth")).toBe("feature/auth");
+    expect(stripStatusPrefix("✓ feature/auth")).toBe("feature/auth");
+    expect(stripStatusPrefix("feature/auth")).toBe("feature/auth");
+  });
+});
diff --git a/foundry/packages/cli/test/tui-format.test.ts b/foundry/packages/cli/test/tui-format.test.ts
new file mode 100644
index 0000000..15d3fe8
--- /dev/null
+++ b/foundry/packages/cli/test/tui-format.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it } from "vitest";
+import type { TaskRecord } from "@sandbox-agent/foundry-shared";
+import { filterTasks, fuzzyMatch } from "@sandbox-agent/foundry-client";
+import { formatRows } from "../src/tui.js";
+
+const sample = {
+  organizationId: "default",
+  repoId: "repo-a",
+  repoRemote: "https://example.com/repo-a.git",
+  taskId: "task-1",
+  branchName: "feature/test",
+  title: "Test Title",
+  task: "Do test",
+  sandboxProviderId: "local",
+  status: "running",
+  activeSandboxId: "sandbox-1",
+  pullRequest: null,
+  sandboxes: [
+    {
+      sandboxId: "sandbox-1",
+      sandboxProviderId: "local",
+      sandboxActorId: null,
+      switchTarget: "sandbox://local/sandbox-1",
+      cwd: null,
+      createdAt: 1,
+      updatedAt: 1,
+    },
+  ],
+  createdAt: 1,
+  updatedAt: 1,
+} satisfies TaskRecord & { pullRequest: null; activeSessionId?: null };
+
+describe("formatRows", () => {
+  it("renders rust-style table header and empty state", () => {
+    const output = formatRows([], 0, "default", "ok");
+    expect(output).toContain("Branch/PR (type to filter)");
+    expect(output).toContain("No branches found.");
+    expect(output).toContain("Ctrl-H:cheatsheet");
+    expect(output).toContain("ok");
+  });
+
+  it("marks selected row with highlight", () => {
+    const output = formatRows([sample], 0, "default", "ready");
+    expect(output).toContain("┃ ");
+    expect(output).toContain("Test Title");
+    expect(output).toContain("Ctrl-H:cheatsheet");
+  });
+
+  it("pins footer to the last terminal row", () => {
+    const output = formatRows([sample], 0, "default", "ready", "", false, {
+      width: 80,
+      height: 12,
+    });
+    const lines = output.split("\n");
+    expect(lines).toHaveLength(12);
+    expect(lines[11]).toContain("Ctrl-H:cheatsheet");
+    expect(lines[11]).toContain("v");
+  });
+});
+
+describe("search", () => {
+  it("supports ordered fuzzy matching", () => {
+    expect(fuzzyMatch("feature/test-branch", "ftb")).toBe(true);
+    expect(fuzzyMatch("feature/test-branch", "fbt")).toBe(false);
+  });
+
+  it("filters rows across branch and title", () => {
+    const rows: TaskRecord[] = [
+      sample,
+      {
+        ...sample,
+        taskId: "task-2",
+        branchName: "docs/update-intro",
+        title: "Docs Intro Refresh",
+        status: "idle",
+      },
+    ];
+    expect(filterTasks(rows, "doc")).toHaveLength(1);
+    expect(filterTasks(rows, "h2")).toHaveLength(1);
+    expect(filterTasks(rows, "test")).toHaveLength(2);
+  });
+});
diff --git a/foundry/packages/cli/tsconfig.json b/foundry/packages/cli/tsconfig.json
new file mode 100644
index 0000000..ae5ba21
--- /dev/null
+++ b/foundry/packages/cli/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src", "test"]
+}
diff --git a/foundry/packages/cli/tsup.config.ts b/foundry/packages/cli/tsup.config.ts
new file mode 100644
index 0000000..9ee19a7
--- /dev/null
+++ b/foundry/packages/cli/tsup.config.ts
@@ -0,0 +1,53 @@
+import { execSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { defineConfig } from "tsup";
+
+function packageVersion(): string {
+  try {
+    const packageJsonPath = resolve(process.cwd(), "package.json");
+    const parsed = JSON.parse(readFileSync(packageJsonPath, "utf8")) as { version?: unknown };
+    if (typeof parsed.version === "string" && parsed.version.trim()) {
+      return parsed.version.trim();
+    }
+  } catch {
+    // Fall through.
+  }
+  return "dev";
+}
+
+function sourceId(): string {
+  try {
+    const raw = execSync("git rev-parse --short HEAD", {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    }).trim();
+    if (raw.length > 0) {
+      return raw;
+    }
+  } catch {
+    // Fall through.
+  }
+  return packageVersion();
+}
+
+function resolveBuildId(): string {
+  const override = process.env.HF_BUILD_ID?.trim();
+  if (override) {
+    return override;
+  }
+
+  // Match sandbox-agent semantics: source id + unique build timestamp.
+  return `${sourceId()}-${Date.now().toString()}`;
+}
+
+const buildId = resolveBuildId();
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: ["esm"],
+  dts: true,
+  define: {
+    __HF_BUILD_ID__: JSON.stringify(buildId),
+  },
+});
diff --git a/foundry/packages/client/package.json b/foundry/packages/client/package.json
new file mode 100644
index 0000000..fa73dab
--- /dev/null
+++ b/foundry/packages/client/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@sandbox-agent/foundry-client",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsup src/index.ts --format esm --dts --tsconfig tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:e2e:full": "HF_ENABLE_DAEMON_FULL_E2E=1 vitest run test/e2e/full-integration-e2e.test.ts",
+    "test:e2e:workspace": "HF_ENABLE_DAEMON_WORKBENCH_E2E=1 vitest run test/e2e/workspace-e2e.test.ts",
+    "test:e2e:workspace-load": "HF_ENABLE_DAEMON_WORKBENCH_LOAD_E2E=1 vitest run test/e2e/workspace-load-e2e.test.ts"
+  },
+  "dependencies": {
+    "@sandbox-agent/foundry-shared": "workspace:*",
+    "react": "^19.1.1",
+    "rivetkit": "2.1.6",
+    "sandbox-agent": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/react": "^19.1.12",
+    "tsup": "^8.5.0"
+  }
+}
diff --git a/foundry/packages/client/src/app-client.ts b/foundry/packages/client/src/app-client.ts
new file mode 100644
index 0000000..0bf5526
--- /dev/null
+++ b/foundry/packages/client/src/app-client.ts
@@ -0,0 +1,69 @@
+import type {
+  FoundryAppSnapshot,
+  FoundryBillingPlanId,
+  FoundryOrganization,
+  FoundryUser,
+  UpdateFoundryOrganizationProfileInput,
+  WorkspaceModelId,
+} from "@sandbox-agent/foundry-shared";
+import type { BackendClient } from "./backend-client.js";
+import { getMockFoundryAppClient } from "./mock-app.js";
+import { createRemoteFoundryAppClient } from "./remote/app-client.js";
+
+export interface FoundryAppClient {
+  getSnapshot(): FoundryAppSnapshot;
+  subscribe(listener: () => void): () => void;
+  signInWithGithub(userId?: string): Promise<void>;
+  signOut(): Promise<void>;
+  skipStarterRepo(): Promise<void>;
+  starStarterRepo(organizationId: string): Promise<void>;
+  selectOrganization(organizationId: string): Promise<void>;
+  setDefaultModel(model: WorkspaceModelId): Promise<void>;
+  updateOrganizationProfile(input: UpdateFoundryOrganizationProfileInput): Promise<void>;
+  triggerGithubSync(organizationId: string): Promise<void>;
+  completeHostedCheckout(organizationId: string, planId: FoundryBillingPlanId): Promise<void>;
+  openBillingPortal(organizationId: string): Promise<void>;
+  cancelScheduledRenewal(organizationId: string): Promise<void>;
+  resumeSubscription(organizationId: string): Promise<void>;
+  reconnectGithub(organizationId: string): Promise<void>;
+  recordSeatUsage(organizationId: string): Promise<void>;
+}
+
+export interface CreateFoundryAppClientOptions {
+  mode: "mock" | "remote";
+  backend?: BackendClient;
+}
+
+export function createFoundryAppClient(options: CreateFoundryAppClientOptions): FoundryAppClient {
+  if (options.mode === "mock") {
+    return getMockFoundryAppClient() as unknown as FoundryAppClient;
+  }
+  if (!options.backend) {
+    throw new Error("Remote app client requires a backend client");
+  }
+  return createRemoteFoundryAppClient({ backend: options.backend });
+}
+
+export function currentFoundryUser(snapshot: FoundryAppSnapshot): FoundryUser | null {
+  if (!snapshot.auth.currentUserId) {
+    return null;
+  }
+  return snapshot.users.find((candidate) => candidate.id === snapshot.auth.currentUserId) ?? null;
+}
+
+export function currentFoundryOrganization(snapshot: FoundryAppSnapshot): FoundryOrganization | null {
+  if (!snapshot.activeOrganizationId) {
+    return null;
+  }
+  return snapshot.organizations.find((candidate) => candidate.id === snapshot.activeOrganizationId) ?? null;
+}
+
+export function eligibleFoundryOrganizations(snapshot: FoundryAppSnapshot): FoundryOrganization[] {
+  const user = currentFoundryUser(snapshot);
+  if (!user) {
+    return [];
+  }
+
+  const eligible = new Set(user.eligibleOrganizationIds);
+  return snapshot.organizations.filter((organization) => eligible.has(organization.id));
+}
diff --git a/foundry/packages/client/src/backend-client.ts b/foundry/packages/client/src/backend-client.ts
new file mode 100644
index 0000000..c2222cc
--- /dev/null
+++ b/foundry/packages/client/src/backend-client.ts
@@ -0,0 +1,1320 @@
+import { createClient } from "rivetkit/client";
+import type {
+  AgentType,
+  AppConfig,
+  FoundryAppSnapshot,
+  FoundryBillingPlanId,
+  CreateTaskInput,
+  AppEvent,
+  SessionEvent,
+  SandboxProcessSnapshot,
+  SandboxProcessesEvent,
+  TaskRecord,
+  TaskSummary,
+  TaskWorkspaceChangeModelInput,
+  TaskWorkspaceChangeOwnerInput,
+  TaskWorkspaceCreateTaskInput,
+  TaskWorkspaceCreateTaskResponse,
+  TaskWorkspaceDiffInput,
+  TaskWorkspaceRenameInput,
+  TaskWorkspaceRenameSessionInput,
+  TaskWorkspaceSelectInput,
+  TaskWorkspaceSetSessionUnreadInput,
+  TaskWorkspaceSendMessageInput,
+  TaskWorkspaceSnapshot,
+  TaskWorkspaceSessionInput,
+  TaskWorkspaceUpdateDraftInput,
+  TaskEvent,
+  WorkspaceTaskDetail,
+  WorkspaceTaskSummary,
+  WorkspaceSessionDetail,
+  OrganizationEvent,
+  OrganizationSummarySnapshot,
+  AuditLogEvent as HistoryEvent,
+  HistoryQueryInput,
+  SandboxProviderId,
+  RepoOverview,
+  RepoRecord,
+  StarSandboxAgentRepoInput,
+  StarSandboxAgentRepoResult,
+  SwitchResult,
+  UpdateFoundryOrganizationProfileInput,
+  WorkspaceModelGroup,
+  WorkspaceModelId,
+} from "@sandbox-agent/foundry-shared";
+import type { ProcessCreateRequest, ProcessLogFollowQuery, ProcessLogsResponse, ProcessSignalQuery } from "sandbox-agent";
+import { createMockBackendClient } from "./mock/backend-client.js";
+import { taskKey, taskSandboxKey, organizationKey } from "./keys.js";
+
+export type TaskAction = "push" | "sync" | "merge" | "archive" | "kill";
+
+export interface SandboxSessionRecord {
+  id: string;
+  agent: string;
+  agentSessionId: string;
+  lastConnectionId: string;
+  createdAt: number;
+  destroyedAt?: number;
+  status?: "pending_provision" | "pending_session_create" | "ready" | "running" | "idle" | "error";
+}
+
+export interface SandboxSessionEventRecord {
+  id: string;
+  eventIndex: number;
+  sessionId: string;
+  createdAt: number;
+  connectionId: string;
+  sender: "client" | "agent";
+  payload: unknown;
+}
+
+export type SandboxProcessRecord = SandboxProcessSnapshot;
+
+export interface ActorConn {
+  on(event: string, listener: (payload: any) => void): () => void;
+  onError(listener: (error: unknown) => void): () => void;
+  dispose(): Promise<void>;
+}
+
+interface AuthSessionScopedInput {
+  authSessionId?: string;
+}
+
+interface OrganizationHandle {
+  connect(): ActorConn;
+  listRepos(input: { organizationId: string }): Promise<RepoRecord[]>;
+  createTask(input: CreateTaskInput): Promise<TaskRecord>;
+  listTasks(input: { organizationId: string; repoId?: string }): Promise<TaskSummary[]>;
+  getRepoOverview(input: { organizationId: string; repoId: string }): Promise<RepoOverview>;
+  auditLog(input: HistoryQueryInput): Promise<HistoryEvent[]>;
+  switchTask(input: { repoId: string; taskId: string }): Promise<SwitchResult>;
+  getTask(input: { organizationId: string; repoId: string; taskId: string }): Promise<TaskRecord>;
+  attachTask(input: { organizationId: string; repoId: string; taskId: string; reason?: string }): Promise<{ target: string; sessionId: string | null }>;
+  pushTask(input: { organizationId: string; repoId: string; taskId: string; reason?: string }): Promise<void>;
+  syncTask(input: { organizationId: string; repoId: string; taskId: string; reason?: string }): Promise<void>;
+  mergeTask(input: { organizationId: string; repoId: string; taskId: string; reason?: string }): Promise<void>;
+  archiveTask(input: { organizationId: string; repoId: string; taskId: string; reason?: string }): Promise<void>;
+  killTask(input: { organizationId: string; repoId: string; taskId: string; reason?: string }): Promise<void>;
+  useOrganization(input: { organizationId: string }): Promise<{ organizationId: string }>;
+  starSandboxAgentRepo(input: StarSandboxAgentRepoInput): Promise<StarSandboxAgentRepoResult>;
+  getOrganizationSummary(input: { organizationId: string }): Promise<OrganizationSummarySnapshot>;
+  createWorkspaceTask(input: TaskWorkspaceCreateTaskInput & AuthSessionScopedInput): Promise<TaskWorkspaceCreateTaskResponse>;
+  markWorkspaceUnread(input: TaskWorkspaceSelectInput & AuthSessionScopedInput): Promise<void>;
+  renameWorkspaceTask(input: TaskWorkspaceRenameInput & AuthSessionScopedInput): Promise<void>;
+  createWorkspaceSession(input: TaskWorkspaceSelectInput & { model?: string } & AuthSessionScopedInput): Promise<{ sessionId: string }>;
+  renameWorkspaceSession(input: TaskWorkspaceRenameSessionInput & AuthSessionScopedInput): Promise<void>;
+  selectWorkspaceSession(input: TaskWorkspaceSessionInput & AuthSessionScopedInput): Promise<void>;
+  setWorkspaceSessionUnread(input: TaskWorkspaceSetSessionUnreadInput & AuthSessionScopedInput): Promise<void>;
+  updateWorkspaceDraft(input: TaskWorkspaceUpdateDraftInput & AuthSessionScopedInput): Promise<void>;
+  changeWorkspaceModel(input: TaskWorkspaceChangeModelInput & AuthSessionScopedInput): Promise<void>;
+  sendWorkspaceMessage(input: TaskWorkspaceSendMessageInput & AuthSessionScopedInput): Promise<void>;
+  stopWorkspaceSession(input: TaskWorkspaceSessionInput & AuthSessionScopedInput): Promise<void>;
+  closeWorkspaceSession(input: TaskWorkspaceSessionInput & AuthSessionScopedInput): Promise<void>;
+  publishWorkspacePr(input: TaskWorkspaceSelectInput & AuthSessionScopedInput): Promise<void>;
+  changeWorkspaceTaskOwner(input: TaskWorkspaceChangeOwnerInput & AuthSessionScopedInput): Promise<void>;
+  revertWorkspaceFile(input: TaskWorkspaceDiffInput & AuthSessionScopedInput): Promise<void>;
+  adminReloadGithubOrganization(): Promise<void>;
+  adminReloadGithubRepository(input: { repoId: string }): Promise<void>;
+}
+
+interface AppOrganizationHandle {
+  connect(): ActorConn;
+  getAppSnapshot(input: { sessionId: string }): Promise<FoundryAppSnapshot>;
+  skipAppStarterRepo(input: { sessionId: string }): Promise<FoundryAppSnapshot>;
+  starAppStarterRepo(input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot>;
+  selectAppOrganization(input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot>;
+  setAppDefaultModel(input: { sessionId: string; defaultModel: WorkspaceModelId }): Promise<FoundryAppSnapshot>;
+  updateAppOrganizationProfile(input: UpdateFoundryOrganizationProfileInput & { sessionId: string }): Promise<FoundryAppSnapshot>;
+  triggerAppRepoImport(input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot>;
+  beginAppGithubInstall(input: { sessionId: string; organizationId: string }): Promise<{ url: string }>;
+  createAppCheckoutSession(input: { sessionId: string; organizationId: string; planId: FoundryBillingPlanId }): Promise<{ url: string }>;
+  createAppBillingPortalSession(input: { sessionId: string; organizationId: string }): Promise<{ url: string }>;
+  cancelAppScheduledRenewal(input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot>;
+  resumeAppSubscription(input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot>;
+  recordAppSeatUsage(input: { sessionId: string; organizationId: string }): Promise<FoundryAppSnapshot>;
+}
+
+interface TaskHandle {
+  getTaskSummary(): Promise<WorkspaceTaskSummary>;
+  getTaskDetail(input?: AuthSessionScopedInput): Promise<WorkspaceTaskDetail>;
+  getSessionDetail(input: { sessionId: string } & AuthSessionScopedInput): Promise<WorkspaceSessionDetail>;
+  connect(): ActorConn;
+}
+
+interface TaskSandboxHandle {
+  connect(): ActorConn;
+  createSession(input: {
+    id?: string;
+    agent: string;
+    model?: string;
+    sessionInit?: {
+      cwd?: string;
+    };
+  }): Promise<{ id: string }>;
+  listSessions(input?: { cursor?: string; limit?: number }): Promise<{ items: SandboxSessionRecord[]; nextCursor?: string }>;
+  getEvents(input: { sessionId: string; cursor?: string; limit?: number }): Promise<{ items: SandboxSessionEventRecord[]; nextCursor?: string }>;
+  createProcess(input: ProcessCreateRequest): Promise<SandboxProcessRecord>;
+  listProcesses(): Promise<{ processes: SandboxProcessRecord[] }>;
+  getProcessLogs(processId: string, query?: ProcessLogFollowQuery): Promise<ProcessLogsResponse>;
+  stopProcess(processId: string, query?: ProcessSignalQuery): Promise<SandboxProcessRecord>;
+  killProcess(processId: string, query?: ProcessSignalQuery): Promise<SandboxProcessRecord>;
+  deleteProcess(processId: string): Promise<void>;
+  rawSendSessionMethod(sessionId: string, method: string, params: Record<string, unknown>): Promise<unknown>;
+  destroySession(sessionId: string): Promise<void>;
+  sandboxAgentConnection(): Promise<{ endpoint: string; token?: string }>;
+  listWorkspaceModelGroups(): Promise<WorkspaceModelGroup[]>;
+  providerState(): Promise<{ sandboxProviderId: SandboxProviderId; sandboxId: string; state: string; at: number }>;
+}
+
+interface RivetClient {
+  organization: {
+    getOrCreate(key?: string | string[], opts?: { createWithInput?: unknown }): OrganizationHandle;
+  };
+  task: {
+    get(key?: string | string[]): TaskHandle;
+    getOrCreate(key?: string | string[], opts?: { createWithInput?: unknown }): TaskHandle;
+  };
+  taskSandbox: {
+    get(key?: string | string[]): TaskSandboxHandle;
+    getOrCreate(key?: string | string[], opts?: { createWithInput?: unknown }): TaskSandboxHandle;
+    getForId(actorId: string): TaskSandboxHandle;
+  };
+}
+
+export interface BackendClientOptions {
+  endpoint: string;
+  defaultOrganizationId?: string;
+  mode?: "remote" | "mock";
+  encoding?: "json" | "cbor" | "bare";
+}
+
+export interface BackendClient {
+  getAppSnapshot(): Promise<FoundryAppSnapshot>;
+  connectOrganization(organizationId: string): Promise<ActorConn>;
+  connectTask(organizationId: string, repoId: string, taskId: string): Promise<ActorConn>;
+  connectSandbox(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<ActorConn>;
+  subscribeApp(listener: () => void): () => void;
+  signInWithGithub(): Promise<void>;
+  signOutApp(): Promise<FoundryAppSnapshot>;
+  skipAppStarterRepo(): Promise<FoundryAppSnapshot>;
+  starAppStarterRepo(organizationId: string): Promise<FoundryAppSnapshot>;
+  selectAppOrganization(organizationId: string): Promise<FoundryAppSnapshot>;
+  setAppDefaultModel(defaultModel: WorkspaceModelId): Promise<FoundryAppSnapshot>;
+  updateAppOrganizationProfile(input: UpdateFoundryOrganizationProfileInput): Promise<FoundryAppSnapshot>;
+  triggerAppRepoImport(organizationId: string): Promise<FoundryAppSnapshot>;
+  reconnectAppGithub(organizationId: string): Promise<void>;
+  completeAppHostedCheckout(organizationId: string, planId: FoundryBillingPlanId): Promise<void>;
+  openAppBillingPortal(organizationId: string): Promise<void>;
+  cancelAppScheduledRenewal(organizationId: string): Promise<FoundryAppSnapshot>;
+  resumeAppSubscription(organizationId: string): Promise<FoundryAppSnapshot>;
+  recordAppSeatUsage(organizationId: string): Promise<FoundryAppSnapshot>;
+  listRepos(organizationId: string): Promise<RepoRecord[]>;
+  createTask(input: CreateTaskInput): Promise<TaskRecord>;
+  listTasks(organizationId: string, repoId?: string): Promise<TaskSummary[]>;
+  getRepoOverview(organizationId: string, repoId: string): Promise<RepoOverview>;
+  getTask(organizationId: string, repoId: string, taskId: string): Promise<TaskRecord>;
+  listHistory(input: HistoryQueryInput): Promise<HistoryEvent[]>;
+  switchTask(organizationId: string, repoId: string, taskId: string): Promise<SwitchResult>;
+  attachTask(organizationId: string, repoId: string, taskId: string): Promise<{ target: string; sessionId: string | null }>;
+  runAction(organizationId: string, repoId: string, taskId: string, action: TaskAction): Promise<void>;
+  createSandboxSession(input: {
+    organizationId: string;
+    sandboxProviderId: SandboxProviderId;
+    sandboxId: string;
+    prompt: string;
+    cwd?: string;
+    agent?: AgentType | "opencode";
+  }): Promise<{ id: string; status: "running" | "idle" | "error" }>;
+  listSandboxSessions(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    input?: { cursor?: string; limit?: number },
+  ): Promise<{ items: SandboxSessionRecord[]; nextCursor?: string }>;
+  listSandboxSessionEvents(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    input: { sessionId: string; cursor?: string; limit?: number },
+  ): Promise<{ items: SandboxSessionEventRecord[]; nextCursor?: string }>;
+  createSandboxProcess(input: {
+    organizationId: string;
+    sandboxProviderId: SandboxProviderId;
+    sandboxId: string;
+    request: ProcessCreateRequest;
+  }): Promise<SandboxProcessRecord>;
+  listSandboxProcesses(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<{ processes: SandboxProcessRecord[] }>;
+  getSandboxProcessLogs(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    processId: string,
+    query?: ProcessLogFollowQuery,
+  ): Promise<ProcessLogsResponse>;
+  stopSandboxProcess(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    processId: string,
+    query?: ProcessSignalQuery,
+  ): Promise<SandboxProcessRecord>;
+  killSandboxProcess(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    processId: string,
+    query?: ProcessSignalQuery,
+  ): Promise<SandboxProcessRecord>;
+  deleteSandboxProcess(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string, processId: string): Promise<void>;
+  subscribeSandboxProcesses(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string, listener: () => void): () => void;
+  sendSandboxPrompt(input: {
+    organizationId: string;
+    sandboxProviderId: SandboxProviderId;
+    sandboxId: string;
+    sessionId: string;
+    prompt: string;
+    notification?: boolean;
+  }): Promise<void>;
+  sandboxSessionStatus(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    sessionId: string,
+  ): Promise<{ id: string; status: "running" | "idle" | "error" }>;
+  sandboxProviderState(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+  ): Promise<{ sandboxProviderId: SandboxProviderId; sandboxId: string; state: string; at: number }>;
+  getSandboxAgentConnection(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<{ endpoint: string; token?: string }>;
+  getSandboxWorkspaceModelGroups(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<WorkspaceModelGroup[]>;
+  getOrganizationSummary(organizationId: string): Promise<OrganizationSummarySnapshot>;
+  getTaskDetail(organizationId: string, repoId: string, taskId: string): Promise<WorkspaceTaskDetail>;
+  getSessionDetail(organizationId: string, repoId: string, taskId: string, sessionId: string): Promise<WorkspaceSessionDetail>;
+  getWorkspace(organizationId: string): Promise<TaskWorkspaceSnapshot>;
+  subscribeWorkspace(organizationId: string, listener: () => void): () => void;
+  createWorkspaceTask(organizationId: string, input: TaskWorkspaceCreateTaskInput): Promise<TaskWorkspaceCreateTaskResponse>;
+  markWorkspaceUnread(organizationId: string, input: TaskWorkspaceSelectInput): Promise<void>;
+  renameWorkspaceTask(organizationId: string, input: TaskWorkspaceRenameInput): Promise<void>;
+  createWorkspaceSession(organizationId: string, input: TaskWorkspaceSelectInput & { model?: string }): Promise<{ sessionId: string }>;
+  renameWorkspaceSession(organizationId: string, input: TaskWorkspaceRenameSessionInput): Promise<void>;
+  selectWorkspaceSession(organizationId: string, input: TaskWorkspaceSessionInput): Promise<void>;
+  setWorkspaceSessionUnread(organizationId: string, input: TaskWorkspaceSetSessionUnreadInput): Promise<void>;
+  updateWorkspaceDraft(organizationId: string, input: TaskWorkspaceUpdateDraftInput): Promise<void>;
+  changeWorkspaceModel(organizationId: string, input: TaskWorkspaceChangeModelInput): Promise<void>;
+  sendWorkspaceMessage(organizationId: string, input: TaskWorkspaceSendMessageInput): Promise<void>;
+  stopWorkspaceSession(organizationId: string, input: TaskWorkspaceSessionInput): Promise<void>;
+  closeWorkspaceSession(organizationId: string, input: TaskWorkspaceSessionInput): Promise<void>;
+  publishWorkspacePr(organizationId: string, input: TaskWorkspaceSelectInput): Promise<void>;
+  changeWorkspaceTaskOwner(organizationId: string, input: TaskWorkspaceChangeOwnerInput): Promise<void>;
+  revertWorkspaceFile(organizationId: string, input: TaskWorkspaceDiffInput): Promise<void>;
+  adminReloadGithubOrganization(organizationId: string): Promise<void>;
+  adminReloadGithubRepository(organizationId: string, repoId: string): Promise<void>;
+  health(): Promise<{ ok: true }>;
+  useOrganization(organizationId: string): Promise<{ organizationId: string }>;
+  starSandboxAgentRepo(organizationId: string): Promise<StarSandboxAgentRepoResult>;
+}
+
+export function rivetEndpoint(config: AppConfig): string {
+  return `http://${config.backend.host}:${config.backend.port}/v1/rivet`;
+}
+
+export function createBackendClientFromConfig(config: AppConfig): BackendClient {
+  return createBackendClient({
+    endpoint: rivetEndpoint(config),
+    defaultOrganizationId: config.organization.default,
+  });
+}
+
+export interface BackendHealthCheckOptions {
+  endpoint: string;
+  timeoutMs?: number;
+}
+
+export interface BackendMetadata {
+  clientEndpoint: string;
+  appEndpoint: string;
+  rivetEndpoint: string;
+}
+
+export async function checkBackendHealth(options: BackendHealthCheckOptions): Promise<boolean> {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), options.timeoutMs ?? 1_500);
+
+  try {
+    const response = await fetch(normalizeLegacyBackendEndpoint(options.endpoint), {
+      method: "GET",
+      signal: controller.signal,
+    });
+    return response.status < 500;
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+export async function readBackendMetadata(options: BackendHealthCheckOptions): Promise<BackendMetadata> {
+  const endpoints = deriveBackendEndpoints(options.endpoint);
+  const clientEndpoint = endpoints.rivetEndpoint.replace(/\/v1\/rivet\/?$/, "");
+
+  return {
+    clientEndpoint,
+    appEndpoint: endpoints.appEndpoint,
+    rivetEndpoint: endpoints.rivetEndpoint,
+  };
+}
+
+function stripTrailingSlash(value: string): string {
+  return value.replace(/\/$/, "");
+}
+
+function normalizeLegacyBackendEndpoint(endpoint: string): string {
+  const normalized = stripTrailingSlash(endpoint);
+  if (normalized.endsWith("/api/rivet")) {
+    return `${normalized.slice(0, -"/api/rivet".length)}/v1/rivet`;
+  }
+  return normalized;
+}
+
+function deriveBackendEndpoints(endpoint: string): { appEndpoint: string; rivetEndpoint: string } {
+  const normalized = normalizeLegacyBackendEndpoint(endpoint);
+  if (normalized.endsWith("/rivet")) {
+    return {
+      appEndpoint: normalized.slice(0, -"/rivet".length),
+      rivetEndpoint: normalized,
+    };
+  }
+  return {
+    appEndpoint: normalized,
+    rivetEndpoint: `${normalized}/rivet`,
+  };
+}
+
+function signedOutAppSnapshot(): FoundryAppSnapshot {
+  return {
+    auth: { status: "signed_out", currentUserId: null },
+    activeOrganizationId: null,
+    onboarding: {
+      starterRepo: {
+        repoFullName: "rivet-dev/sandbox-agent",
+        repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+        status: "pending",
+        starredAt: null,
+        skippedAt: null,
+      },
+    },
+    users: [],
+    organizations: [],
+  };
+}
+
+export function createBackendClient(options: BackendClientOptions): BackendClient {
+  if (options.mode === "mock") {
+    return createMockBackendClient(options.defaultOrganizationId);
+  }
+
+  const endpoints = deriveBackendEndpoints(options.endpoint);
+  const rivetApiEndpoint = endpoints.rivetEndpoint;
+  const appApiEndpoint = endpoints.appEndpoint;
+  const client = createClient({ endpoint: rivetApiEndpoint, encoding: options.encoding }) as unknown as RivetClient;
+  const workspaceSubscriptions = new Map<
+    string,
+    {
+      listeners: Set<() => void>;
+      disposeConnPromise: Promise<(() => Promise<void>) | null> | null;
+    }
+  >();
+  const sandboxProcessSubscriptions = new Map<
+    string,
+    {
+      listeners: Set<() => void>;
+      disposeConnPromise: Promise<(() => Promise<void>) | null> | null;
+    }
+  >();
+  const appSubscriptions = {
+    listeners: new Set<() => void>(),
+    disposeConnPromise: null as Promise<(() => Promise<void>) | null> | null,
+  };
+
+  const appRequest = async <T>(path: string, init?: RequestInit): Promise<T> => {
+    const headers = new Headers(init?.headers);
+    if (init?.body && !headers.has("Content-Type")) {
+      headers.set("Content-Type", "application/json");
+    }
+
+    const res = await fetch(`${appApiEndpoint}${path}`, {
+      ...init,
+      headers,
+      credentials: "include",
+    });
+    if (!res.ok) {
+      throw new Error(`app request failed: ${res.status} ${res.statusText}`);
+    }
+    return (await res.json()) as T;
+  };
+
+  const getSessionId = async (): Promise<string | null> => {
+    const res = await fetch(`${appApiEndpoint}/auth/get-session`, {
+      credentials: "include",
+    });
+    if (res.status === 401) {
+      return null;
+    }
+    if (!res.ok) {
+      throw new Error(`auth session request failed: ${res.status} ${res.statusText}`);
+    }
+    const data = (await res.json().catch(() => null)) as { session?: { id?: string | null } | null } | null;
+    const sessionId = data?.session?.id;
+    return typeof sessionId === "string" && sessionId.length > 0 ? sessionId : null;
+  };
+
+  const getAuthSessionInput = async (): Promise<AuthSessionScopedInput | undefined> => {
+    const authSessionId = await getSessionId();
+    return authSessionId ? { authSessionId } : undefined;
+  };
+
+  const withAuthSessionInput = async <TInput extends object>(input: TInput): Promise<TInput & AuthSessionScopedInput> => {
+    const authSessionInput = await getAuthSessionInput();
+    return authSessionInput ? { ...input, ...authSessionInput } : input;
+  };
+
+  const organization = async (organizationId: string): Promise<OrganizationHandle> =>
+    client.organization.getOrCreate(organizationKey(organizationId), {
+      createWithInput: organizationId,
+    });
+
+  const appOrganization = async (): Promise<AppOrganizationHandle> =>
+    client.organization.getOrCreate(organizationKey("app"), {
+      createWithInput: "app",
+    }) as unknown as AppOrganizationHandle;
+
+  // getOrCreate is intentional here — this is the ONLY lazy creation point for
+  // virtual tasks (PR-driven entries that exist in the org's local tables but
+  // have no task actor yet). The task actor self-initializes from org data in
+  // getCurrentRecord(). Backend code must NEVER use getOrCreateTask except in
+  // createTaskMutation. See backend/CLAUDE.md "Lazy Task Actor Creation".
+  const task = async (organizationId: string, repoId: string, taskId: string): Promise<TaskHandle> =>
+    client.task.getOrCreate(taskKey(organizationId, repoId, taskId), {
+      createWithInput: { organizationId, repoId, taskId },
+    });
+
+  const sandboxByKey = async (organizationId: string, _providerId: SandboxProviderId, sandboxId: string): Promise<TaskSandboxHandle> => {
+    return (client as any).taskSandbox.get(taskSandboxKey(organizationId, sandboxId));
+  };
+
+  function isActorNotFoundError(error: unknown): boolean {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.includes("Actor not found");
+  }
+
+  const sandboxByActorIdFromTask = async (
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+  ): Promise<TaskSandboxHandle | null> => {
+    const ws = await organization(organizationId);
+    const rows = await ws.listTasks({ organizationId });
+    const candidates = [...rows].sort((a, b) => b.updatedAt - a.updatedAt);
+
+    for (const row of candidates) {
+      try {
+        const detail = await ws.getTask({ organizationId, repoId: row.repoId, taskId: row.taskId });
+        if (detail.sandboxProviderId !== sandboxProviderId) {
+          continue;
+        }
+        const sandboxes = detail.sandboxes as Array<(typeof detail.sandboxes)[number] & { sandboxActorId?: string }>;
+        const sandbox = sandboxes.find(
+          (sb) =>
+            sb.sandboxId === sandboxId && sb.sandboxProviderId === sandboxProviderId && typeof sb.sandboxActorId === "string" && sb.sandboxActorId.length > 0,
+        );
+        if (sandbox?.sandboxActorId) {
+          return (client as any).taskSandbox.getForId(sandbox.sandboxActorId);
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (!isActorNotFoundError(error) && !message.includes("Unknown task")) {
+          throw error;
+        }
+        // Best effort fallback path; ignore missing task actors here.
+      }
+    }
+
+    return null;
+  };
+
+  const withSandboxHandle = async <T>(
+    organizationId: string,
+    sandboxProviderId: SandboxProviderId,
+    sandboxId: string,
+    run: (handle: TaskSandboxHandle) => Promise<T>,
+  ): Promise<T> => {
+    const handle = await sandboxByKey(organizationId, sandboxProviderId, sandboxId);
+    try {
+      return await run(handle);
+    } catch (error) {
+      if (!isActorNotFoundError(error)) {
+        throw error;
+      }
+      const fallback = await sandboxByActorIdFromTask(organizationId, sandboxProviderId, sandboxId);
+      if (!fallback) {
+        throw error;
+      }
+      return await run(fallback);
+    }
+  };
+
+  const connectOrganization = async (organizationId: string): Promise<ActorConn> => {
+    return (await organization(organizationId)).connect() as ActorConn;
+  };
+
+  const connectTask = async (organizationId: string, repoId: string, taskIdValue: string): Promise<ActorConn> => {
+    return (await task(organizationId, repoId, taskIdValue)).connect() as ActorConn;
+  };
+
+  const connectSandbox = async (organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<ActorConn> => {
+    try {
+      return (await sandboxByKey(organizationId, sandboxProviderId, sandboxId)).connect() as ActorConn;
+    } catch (error) {
+      if (!isActorNotFoundError(error)) {
+        throw error;
+      }
+      const fallback = await sandboxByActorIdFromTask(organizationId, sandboxProviderId, sandboxId);
+      if (!fallback) {
+        throw error;
+      }
+      return fallback.connect() as ActorConn;
+    }
+  };
+
+  const getTaskDetailWithAuth = async (organizationId: string, repoId: string, taskIdValue: string): Promise<WorkspaceTaskDetail> => {
+    return (await task(organizationId, repoId, taskIdValue)).getTaskDetail(await getAuthSessionInput());
+  };
+
+  const getSessionDetailWithAuth = async (organizationId: string, repoId: string, taskIdValue: string, sessionId: string): Promise<WorkspaceSessionDetail> => {
+    return (await task(organizationId, repoId, taskIdValue)).getSessionDetail(await withAuthSessionInput({ sessionId }));
+  };
+
+  const getWorkspaceCompat = async (organizationId: string): Promise<TaskWorkspaceSnapshot> => {
+    const authSessionInput = await getAuthSessionInput();
+    const summary = await (await organization(organizationId)).getOrganizationSummary({ organizationId });
+    const resolvedTasks = await Promise.all(
+      summary.taskSummaries.map(async (taskSummary) => {
+        let detail;
+        try {
+          const taskHandle = await task(organizationId, taskSummary.repoId, taskSummary.id);
+          detail = await taskHandle.getTaskDetail(authSessionInput);
+        } catch (error) {
+          if (isActorNotFoundError(error)) {
+            return null;
+          }
+          throw error;
+        }
+        const sessionDetails = await Promise.all(
+          detail.sessionsSummary.map(async (session) => {
+            try {
+              const full = await (await task(organizationId, detail.repoId, detail.id)).getSessionDetail({
+                sessionId: session.id,
+                ...(authSessionInput ?? {}),
+              });
+              return [session.id, full] as const;
+            } catch (error) {
+              if (isActorNotFoundError(error)) {
+                return null;
+              }
+              throw error;
+            }
+          }),
+        );
+        const sessionDetailsById = new Map(sessionDetails.filter((entry): entry is readonly [string, WorkspaceSessionDetail] => entry !== null));
+        return {
+          id: detail.id,
+          repoId: detail.repoId,
+          title: detail.title,
+          status: detail.status,
+          repoName: detail.repoName,
+          updatedAtMs: detail.updatedAtMs,
+          branch: detail.branch,
+          pullRequest: detail.pullRequest,
+          activeSessionId: detail.activeSessionId ?? null,
+          sessions: detail.sessionsSummary.map((session) => {
+            const full = sessionDetailsById.get(session.id);
+            return {
+              id: session.id,
+              sessionId: session.sessionId,
+              sessionName: session.sessionName,
+              agent: session.agent,
+              model: session.model,
+              status: session.status,
+              thinkingSinceMs: session.thinkingSinceMs,
+              unread: session.unread,
+              created: session.created,
+              draft: full?.draft ?? { text: "", attachments: [], updatedAtMs: null },
+              transcript: full?.transcript ?? [],
+            };
+          }),
+          fileChanges: detail.fileChanges,
+          diffs: detail.diffs,
+          fileTree: detail.fileTree,
+          minutesUsed: detail.minutesUsed,
+          activeSandboxId: detail.activeSandboxId ?? null,
+        };
+      }),
+    );
+    const tasks = resolvedTasks.filter((task): task is Exclude<(typeof resolvedTasks)[number], null> => task !== null);
+
+    const repositories = summary.repos
+      .map((repo) => ({
+        id: repo.id,
+        label: repo.label,
+        updatedAtMs: tasks.filter((task) => task.repoId === repo.id).reduce((latest, task) => Math.max(latest, task.updatedAtMs), repo.latestActivityMs),
+        tasks: tasks.filter((task) => task.repoId === repo.id).sort((left, right) => right.updatedAtMs - left.updatedAtMs),
+      }))
+      .filter((repo) => repo.tasks.length > 0);
+
+    return {
+      organizationId,
+      repos: summary.repos.map((repo) => ({ id: repo.id, label: repo.label })),
+      repositories,
+      tasks: tasks.sort((left, right) => right.updatedAtMs - left.updatedAtMs),
+    };
+  };
+
+  const subscribeWorkspace = (organizationId: string, listener: () => void): (() => void) => {
+    let entry = workspaceSubscriptions.get(organizationId);
+    if (!entry) {
+      entry = {
+        listeners: new Set(),
+        disposeConnPromise: null,
+      };
+      workspaceSubscriptions.set(organizationId, entry);
+    }
+
+    entry.listeners.add(listener);
+
+    if (!entry.disposeConnPromise) {
+      entry.disposeConnPromise = (async () => {
+        const handle = await organization(organizationId);
+        const conn = (handle as any).connect();
+        const unsubscribeEvent = conn.on("organizationUpdated", () => {
+          const current = workspaceSubscriptions.get(organizationId);
+          if (!current) {
+            return;
+          }
+          for (const currentListener of [...current.listeners]) {
+            currentListener();
+          }
+        });
+        const unsubscribeError = conn.onError(() => {});
+        return async () => {
+          unsubscribeEvent();
+          unsubscribeError();
+          await conn.dispose();
+        };
+      })().catch(() => null);
+    }
+
+    return () => {
+      const current = workspaceSubscriptions.get(organizationId);
+      if (!current) {
+        return;
+      }
+      current.listeners.delete(listener);
+      if (current.listeners.size > 0) {
+        return;
+      }
+
+      workspaceSubscriptions.delete(organizationId);
+      void current.disposeConnPromise?.then(async (disposeConn) => {
+        await disposeConn?.();
+      });
+    };
+  };
+
+  const sandboxProcessSubscriptionKey = (organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): string =>
+    `${organizationId}:${sandboxProviderId}:${sandboxId}`;
+
+  const subscribeSandboxProcesses = (organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string, listener: () => void): (() => void) => {
+    const key = sandboxProcessSubscriptionKey(organizationId, sandboxProviderId, sandboxId);
+    let entry = sandboxProcessSubscriptions.get(key);
+    if (!entry) {
+      entry = {
+        listeners: new Set(),
+        disposeConnPromise: null,
+      };
+      sandboxProcessSubscriptions.set(key, entry);
+    }
+
+    entry.listeners.add(listener);
+
+    if (!entry.disposeConnPromise) {
+      entry.disposeConnPromise = (async () => {
+        const conn = await connectSandbox(organizationId, sandboxProviderId, sandboxId);
+        const unsubscribeEvent = conn.on("processesUpdated", () => {
+          const current = sandboxProcessSubscriptions.get(key);
+          if (!current) {
+            return;
+          }
+          for (const currentListener of [...current.listeners]) {
+            currentListener();
+          }
+        });
+        const unsubscribeError = conn.onError(() => {});
+        return async () => {
+          unsubscribeEvent();
+          unsubscribeError();
+          await conn.dispose();
+        };
+      })().catch(() => null);
+    }
+
+    return () => {
+      const current = sandboxProcessSubscriptions.get(key);
+      if (!current) {
+        return;
+      }
+      current.listeners.delete(listener);
+      if (current.listeners.size > 0) {
+        return;
+      }
+
+      sandboxProcessSubscriptions.delete(key);
+      void current.disposeConnPromise?.then(async (disposeConn) => {
+        await disposeConn?.();
+      });
+    };
+  };
+
+  const subscribeApp = (listener: () => void): (() => void) => {
+    appSubscriptions.listeners.add(listener);
+
+    if (!appSubscriptions.disposeConnPromise) {
+      appSubscriptions.disposeConnPromise = (async () => {
+        const handle = await appOrganization();
+        const conn = (handle as any).connect();
+        const unsubscribeEvent = conn.on("appUpdated", () => {
+          for (const currentListener of [...appSubscriptions.listeners]) {
+            currentListener();
+          }
+        });
+        const unsubscribeError = conn.onError(() => {});
+        return async () => {
+          unsubscribeEvent();
+          unsubscribeError();
+          await conn.dispose();
+        };
+      })().catch(() => null);
+    }
+
+    return () => {
+      appSubscriptions.listeners.delete(listener);
+      if (appSubscriptions.listeners.size > 0) {
+        return;
+      }
+
+      void appSubscriptions.disposeConnPromise?.then(async (disposeConn) => {
+        await disposeConn?.();
+      });
+      appSubscriptions.disposeConnPromise = null;
+    };
+  };
+
+  return {
+    async getAppSnapshot(): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        return signedOutAppSnapshot();
+      }
+      return await (await appOrganization()).getAppSnapshot({ sessionId });
+    },
+
+    async connectOrganization(organizationId: string): Promise<ActorConn> {
+      return await connectOrganization(organizationId);
+    },
+
+    async connectTask(organizationId: string, repoId: string, taskIdValue: string): Promise<ActorConn> {
+      return await connectTask(organizationId, repoId, taskIdValue);
+    },
+
+    async connectSandbox(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<ActorConn> {
+      return await connectSandbox(organizationId, sandboxProviderId, sandboxId);
+    },
+
+    subscribeApp(listener: () => void): () => void {
+      return subscribeApp(listener);
+    },
+
+    async signInWithGithub(): Promise<void> {
+      const callbackURL = typeof window !== "undefined" ? `${window.location.origin}/organizations` : `${appApiEndpoint.replace(/\/$/, "")}/organizations`;
+      const response = await appRequest<{ url: string; redirect?: boolean }>("/auth/sign-in/social", {
+        method: "POST",
+        body: JSON.stringify({
+          provider: "github",
+          callbackURL,
+          disableRedirect: true,
+        }),
+      });
+      if (typeof window !== "undefined") {
+        window.location.assign(response.url);
+      }
+    },
+
+    async signOutApp(): Promise<FoundryAppSnapshot> {
+      return await appRequest<FoundryAppSnapshot>("/app/sign-out", { method: "POST" });
+    },
+
+    async skipAppStarterRepo(): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).skipAppStarterRepo({ sessionId });
+    },
+
+    async starAppStarterRepo(organizationId: string): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).starAppStarterRepo({ sessionId, organizationId });
+    },
+
+    async selectAppOrganization(organizationId: string): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).selectAppOrganization({ sessionId, organizationId });
+    },
+
+    async setAppDefaultModel(defaultModel: WorkspaceModelId): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).setAppDefaultModel({ sessionId, defaultModel });
+    },
+
+    async updateAppOrganizationProfile(input: UpdateFoundryOrganizationProfileInput): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).updateAppOrganizationProfile({
+        sessionId,
+        organizationId: input.organizationId,
+        displayName: input.displayName,
+        slug: input.slug,
+        primaryDomain: input.primaryDomain,
+      });
+    },
+
+    async triggerAppRepoImport(organizationId: string): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).triggerAppRepoImport({ sessionId, organizationId });
+    },
+
+    async reconnectAppGithub(organizationId: string): Promise<void> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      const response = await (await appOrganization()).beginAppGithubInstall({ sessionId, organizationId });
+      if (typeof window !== "undefined") {
+        window.location.assign(response.url);
+      }
+    },
+
+    async completeAppHostedCheckout(organizationId: string, planId: FoundryBillingPlanId): Promise<void> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      const response = await (await appOrganization()).createAppCheckoutSession({ sessionId, organizationId, planId });
+      if (typeof window !== "undefined") {
+        window.location.assign(response.url);
+      }
+    },
+
+    async openAppBillingPortal(organizationId: string): Promise<void> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      const response = await (await appOrganization()).createAppBillingPortalSession({ sessionId, organizationId });
+      if (typeof window !== "undefined") {
+        window.location.assign(response.url);
+      }
+    },
+
+    async cancelAppScheduledRenewal(organizationId: string): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).cancelAppScheduledRenewal({ sessionId, organizationId });
+    },
+
+    async resumeAppSubscription(organizationId: string): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).resumeAppSubscription({ sessionId, organizationId });
+    },
+
+    async recordAppSeatUsage(organizationId: string): Promise<FoundryAppSnapshot> {
+      const sessionId = await getSessionId();
+      if (!sessionId) {
+        throw new Error("No active auth session");
+      }
+      return await (await appOrganization()).recordAppSeatUsage({ sessionId, organizationId });
+    },
+
+    async listRepos(organizationId: string): Promise<RepoRecord[]> {
+      return (await organization(organizationId)).listRepos({ organizationId });
+    },
+
+    async createTask(input: CreateTaskInput): Promise<TaskRecord> {
+      return (await organization(input.organizationId)).createTask(input);
+    },
+
+    async starSandboxAgentRepo(organizationId: string): Promise<StarSandboxAgentRepoResult> {
+      return (await organization(organizationId)).starSandboxAgentRepo({ organizationId });
+    },
+
+    async listTasks(organizationId: string, repoId?: string): Promise<TaskSummary[]> {
+      return (await organization(organizationId)).listTasks({ organizationId, repoId });
+    },
+
+    async getRepoOverview(organizationId: string, repoId: string): Promise<RepoOverview> {
+      return (await organization(organizationId)).getRepoOverview({ organizationId, repoId });
+    },
+
+    async getTask(organizationId: string, repoId: string, taskId: string): Promise<TaskRecord> {
+      return (await organization(organizationId)).getTask({
+        organizationId,
+        repoId,
+        taskId,
+      });
+    },
+
+    async listHistory(input: HistoryQueryInput): Promise<HistoryEvent[]> {
+      return (await organization(input.organizationId)).auditLog(input);
+    },
+
+    async switchTask(organizationId: string, repoId: string, taskId: string): Promise<SwitchResult> {
+      return (await organization(organizationId)).switchTask({ repoId, taskId });
+    },
+
+    async attachTask(organizationId: string, repoId: string, taskId: string): Promise<{ target: string; sessionId: string | null }> {
+      return (await organization(organizationId)).attachTask({
+        organizationId,
+        repoId,
+        taskId,
+        reason: "cli.attach",
+      });
+    },
+
+    async runAction(organizationId: string, repoId: string, taskId: string, action: TaskAction): Promise<void> {
+      if (action === "push") {
+        await (await organization(organizationId)).pushTask({
+          organizationId,
+          repoId,
+          taskId,
+          reason: "cli.push",
+        });
+        return;
+      }
+      if (action === "sync") {
+        await (await organization(organizationId)).syncTask({
+          organizationId,
+          repoId,
+          taskId,
+          reason: "cli.sync",
+        });
+        return;
+      }
+      if (action === "merge") {
+        await (await organization(organizationId)).mergeTask({
+          organizationId,
+          repoId,
+          taskId,
+          reason: "cli.merge",
+        });
+        return;
+      }
+      if (action === "archive") {
+        await (await organization(organizationId)).archiveTask({
+          organizationId,
+          repoId,
+          taskId,
+          reason: "cli.archive",
+        });
+        return;
+      }
+      await (await organization(organizationId)).killTask({
+        organizationId,
+        repoId,
+        taskId,
+        reason: "cli.kill",
+      });
+    },
+
+    async createSandboxSession(input: {
+      organizationId: string;
+      sandboxProviderId: SandboxProviderId;
+      sandboxId: string;
+      prompt: string;
+      cwd?: string;
+      agent?: AgentType | "opencode";
+    }): Promise<{ id: string; status: "running" | "idle" | "error" }> {
+      const created = await withSandboxHandle(input.organizationId, input.sandboxProviderId, input.sandboxId, async (handle) =>
+        handle.createSession({
+          agent: input.agent ?? "claude",
+          sessionInit: {
+            cwd: input.cwd,
+          },
+        }),
+      );
+      if (input.prompt.trim().length > 0) {
+        await withSandboxHandle(input.organizationId, input.sandboxProviderId, input.sandboxId, async (handle) =>
+          handle.rawSendSessionMethod(created.id, "session/prompt", {
+            prompt: [{ type: "text", text: input.prompt }],
+          }),
+        );
+      }
+      return {
+        id: created.id,
+        status: "idle",
+      };
+    },
+
+    async listSandboxSessions(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+      input?: { cursor?: string; limit?: number },
+    ): Promise<{ items: SandboxSessionRecord[]; nextCursor?: string }> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.listSessions(input ?? {}));
+    },
+
+    async listSandboxSessionEvents(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+      input: { sessionId: string; cursor?: string; limit?: number },
+    ): Promise<{ items: SandboxSessionEventRecord[]; nextCursor?: string }> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.getEvents(input));
+    },
+
+    async createSandboxProcess(input: {
+      organizationId: string;
+      sandboxProviderId: SandboxProviderId;
+      sandboxId: string;
+      request: ProcessCreateRequest;
+    }): Promise<SandboxProcessRecord> {
+      return await withSandboxHandle(input.organizationId, input.sandboxProviderId, input.sandboxId, async (handle) => handle.createProcess(input.request));
+    },
+
+    async listSandboxProcesses(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+    ): Promise<{ processes: SandboxProcessRecord[] }> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.listProcesses());
+    },
+
+    async getSandboxProcessLogs(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+      processId: string,
+      query?: ProcessLogFollowQuery,
+    ): Promise<ProcessLogsResponse> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.getProcessLogs(processId, query));
+    },
+
+    async stopSandboxProcess(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+      processId: string,
+      query?: ProcessSignalQuery,
+    ): Promise<SandboxProcessRecord> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.stopProcess(processId, query));
+    },
+
+    async killSandboxProcess(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+      processId: string,
+      query?: ProcessSignalQuery,
+    ): Promise<SandboxProcessRecord> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.killProcess(processId, query));
+    },
+
+    async deleteSandboxProcess(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string, processId: string): Promise<void> {
+      await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.deleteProcess(processId));
+    },
+
+    subscribeSandboxProcesses(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string, listener: () => void): () => void {
+      return subscribeSandboxProcesses(organizationId, sandboxProviderId, sandboxId, listener);
+    },
+
+    async sendSandboxPrompt(input: {
+      organizationId: string;
+      sandboxProviderId: SandboxProviderId;
+      sandboxId: string;
+      sessionId: string;
+      prompt: string;
+      notification?: boolean;
+    }): Promise<void> {
+      await withSandboxHandle(input.organizationId, input.sandboxProviderId, input.sandboxId, async (handle) =>
+        handle.rawSendSessionMethod(input.sessionId, "session/prompt", {
+          prompt: [{ type: "text", text: input.prompt }],
+        }),
+      );
+    },
+
+    async sandboxSessionStatus(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+      sessionId: string,
+    ): Promise<{ id: string; status: "running" | "idle" | "error" }> {
+      return {
+        id: sessionId,
+        status: "idle",
+      };
+    },
+
+    async sandboxProviderState(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+    ): Promise<{ sandboxProviderId: SandboxProviderId; sandboxId: string; state: string; at: number }> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.providerState());
+    },
+
+    async getSandboxAgentConnection(
+      organizationId: string,
+      sandboxProviderId: SandboxProviderId,
+      sandboxId: string,
+    ): Promise<{ endpoint: string; token?: string }> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.sandboxAgentConnection());
+    },
+
+    async getSandboxWorkspaceModelGroups(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<WorkspaceModelGroup[]> {
+      return await withSandboxHandle(organizationId, sandboxProviderId, sandboxId, async (handle) => handle.listWorkspaceModelGroups());
+    },
+
+    async getOrganizationSummary(organizationId: string): Promise<OrganizationSummarySnapshot> {
+      return (await organization(organizationId)).getOrganizationSummary({ organizationId });
+    },
+
+    async getTaskDetail(organizationId: string, repoId: string, taskIdValue: string): Promise<WorkspaceTaskDetail> {
+      return await getTaskDetailWithAuth(organizationId, repoId, taskIdValue);
+    },
+
+    async getSessionDetail(organizationId: string, repoId: string, taskIdValue: string, sessionId: string): Promise<WorkspaceSessionDetail> {
+      return await getSessionDetailWithAuth(organizationId, repoId, taskIdValue, sessionId);
+    },
+
+    async getWorkspace(organizationId: string): Promise<TaskWorkspaceSnapshot> {
+      return await getWorkspaceCompat(organizationId);
+    },
+
+    subscribeWorkspace(organizationId: string, listener: () => void): () => void {
+      return subscribeWorkspace(organizationId, listener);
+    },
+
+    async createWorkspaceTask(organizationId: string, input: TaskWorkspaceCreateTaskInput): Promise<TaskWorkspaceCreateTaskResponse> {
+      return (await organization(organizationId)).createWorkspaceTask(await withAuthSessionInput(input));
+    },
+
+    async markWorkspaceUnread(organizationId: string, input: TaskWorkspaceSelectInput): Promise<void> {
+      await (await organization(organizationId)).markWorkspaceUnread(await withAuthSessionInput(input));
+    },
+
+    async renameWorkspaceTask(organizationId: string, input: TaskWorkspaceRenameInput): Promise<void> {
+      await (await organization(organizationId)).renameWorkspaceTask(await withAuthSessionInput(input));
+    },
+
+    async createWorkspaceSession(organizationId: string, input: TaskWorkspaceSelectInput & { model?: string }): Promise<{ sessionId: string }> {
+      return await (await organization(organizationId)).createWorkspaceSession(await withAuthSessionInput(input));
+    },
+
+    async renameWorkspaceSession(organizationId: string, input: TaskWorkspaceRenameSessionInput): Promise<void> {
+      await (await organization(organizationId)).renameWorkspaceSession(await withAuthSessionInput(input));
+    },
+
+    async selectWorkspaceSession(organizationId: string, input: TaskWorkspaceSessionInput): Promise<void> {
+      await (await organization(organizationId)).selectWorkspaceSession(await withAuthSessionInput(input));
+    },
+
+    async setWorkspaceSessionUnread(organizationId: string, input: TaskWorkspaceSetSessionUnreadInput): Promise<void> {
+      await (await organization(organizationId)).setWorkspaceSessionUnread(await withAuthSessionInput(input));
+    },
+
+    async updateWorkspaceDraft(organizationId: string, input: TaskWorkspaceUpdateDraftInput): Promise<void> {
+      await (await organization(organizationId)).updateWorkspaceDraft(await withAuthSessionInput(input));
+    },
+
+    async changeWorkspaceModel(organizationId: string, input: TaskWorkspaceChangeModelInput): Promise<void> {
+      await (await organization(organizationId)).changeWorkspaceModel(await withAuthSessionInput(input));
+    },
+
+    async sendWorkspaceMessage(organizationId: string, input: TaskWorkspaceSendMessageInput): Promise<void> {
+      await (await organization(organizationId)).sendWorkspaceMessage(await withAuthSessionInput(input));
+    },
+
+    async stopWorkspaceSession(organizationId: string, input: TaskWorkspaceSessionInput): Promise<void> {
+      await (await organization(organizationId)).stopWorkspaceSession(await withAuthSessionInput(input));
+    },
+
+    async closeWorkspaceSession(organizationId: string, input: TaskWorkspaceSessionInput): Promise<void> {
+      await (await organization(organizationId)).closeWorkspaceSession(await withAuthSessionInput(input));
+    },
+
+    async publishWorkspacePr(organizationId: string, input: TaskWorkspaceSelectInput): Promise<void> {
+      await (await organization(organizationId)).publishWorkspacePr(await withAuthSessionInput(input));
+    },
+
+    async changeWorkspaceTaskOwner(organizationId: string, input: TaskWorkspaceChangeOwnerInput): Promise<void> {
+      await (await organization(organizationId)).changeWorkspaceTaskOwner(await withAuthSessionInput(input));
+    },
+
+    async revertWorkspaceFile(organizationId: string, input: TaskWorkspaceDiffInput): Promise<void> {
+      await (await organization(organizationId)).revertWorkspaceFile(await withAuthSessionInput(input));
+    },
+
+    async adminReloadGithubOrganization(organizationId: string): Promise<void> {
+      await (await organization(organizationId)).adminReloadGithubOrganization();
+    },
+
+    async adminReloadGithubRepository(organizationId: string, repoId: string): Promise<void> {
+      await (await organization(organizationId)).adminReloadGithubRepository({ repoId });
+    },
+
+    async health(): Promise<{ ok: true }> {
+      const organizationId = options.defaultOrganizationId;
+      if (!organizationId) {
+        throw new Error("Backend client default organization is required for health checks");
+      }
+
+      await (await organization(organizationId)).useOrganization({
+        organizationId,
+      });
+      return { ok: true };
+    },
+
+    async useOrganization(organizationId: string): Promise<{ organizationId: string }> {
+      return (await organization(organizationId)).useOrganization({ organizationId });
+    },
+  };
+}
diff --git a/foundry/packages/client/src/index.ts b/foundry/packages/client/src/index.ts
new file mode 100644
index 0000000..e28745f
--- /dev/null
+++ b/foundry/packages/client/src/index.ts
@@ -0,0 +1,11 @@
+export * from "./app-client.js";
+export * from "./backend-client.js";
+export * from "./subscription/manager.js";
+export * from "./subscription/mock-manager.js";
+export * from "./subscription/remote-manager.js";
+export * from "./subscription/topics.js";
+export * from "./subscription/use-subscription.js";
+export * from "./keys.js";
+export * from "./mock-app.js";
+export * from "./view-model.js";
+export * from "./workspace-client.js";
diff --git a/foundry/packages/client/src/keys.ts b/foundry/packages/client/src/keys.ts
new file mode 100644
index 0000000..7242aae
--- /dev/null
+++ b/foundry/packages/client/src/keys.ts
@@ -0,0 +1,17 @@
+export type ActorKey = string[];
+
+export function organizationKey(organizationId: string): ActorKey {
+  return ["org", organizationId];
+}
+
+export function taskKey(organizationId: string, repoId: string, taskId: string): ActorKey {
+  return ["org", organizationId, "task", repoId, taskId];
+}
+
+export function taskSandboxKey(organizationId: string, sandboxId: string): ActorKey {
+  return ["org", organizationId, "sandbox", sandboxId];
+}
+
+export function auditLogKey(organizationId: string): ActorKey {
+  return ["org", organizationId, "audit-log"];
+}
diff --git a/foundry/packages/client/src/mock-app.ts b/foundry/packages/client/src/mock-app.ts
new file mode 100644
index 0000000..00fd9ca
--- /dev/null
+++ b/foundry/packages/client/src/mock-app.ts
@@ -0,0 +1,755 @@
+import { DEFAULT_WORKSPACE_MODEL_GROUPS, DEFAULT_WORKSPACE_MODEL_ID, type WorkspaceModelId } from "@sandbox-agent/foundry-shared";
+
+const claudeModels = DEFAULT_WORKSPACE_MODEL_GROUPS.find((group) => group.agentKind === "Claude")?.models ?? [];
+const CLAUDE_SECONDARY_MODEL_ID = claudeModels[1]?.id ?? claudeModels[0]?.id ?? DEFAULT_WORKSPACE_MODEL_ID;
+const CLAUDE_TERTIARY_MODEL_ID = claudeModels[2]?.id ?? CLAUDE_SECONDARY_MODEL_ID;
+import { injectMockLatency } from "./mock/latency.js";
+import rivetDevFixture from "../../../scripts/data/rivet-dev.json" with { type: "json" };
+
+export type MockBillingPlanId = "free" | "team";
+export type MockBillingStatus = "active" | "trialing" | "past_due" | "scheduled_cancel";
+export type MockGithubInstallationStatus = "connected" | "install_required" | "reconnect_required";
+export type MockGithubSyncStatus = "pending" | "syncing" | "synced" | "error";
+export type MockOrganizationKind = "personal" | "organization";
+export type MockStarterRepoStatus = "pending" | "starred" | "skipped";
+
+export interface MockFoundryUser {
+  id: string;
+  name: string;
+  email: string;
+  githubLogin: string;
+  roleLabel: string;
+  eligibleOrganizationIds: string[];
+  defaultModel: WorkspaceModelId;
+}
+
+export interface MockFoundryOrganizationMember {
+  id: string;
+  name: string;
+  email: string;
+  role: "owner" | "admin" | "member";
+  state: "active" | "invited";
+}
+
+export interface MockFoundryInvoice {
+  id: string;
+  label: string;
+  issuedAt: string;
+  amountUsd: number;
+  status: "paid" | "open";
+}
+
+export interface MockFoundryBillingState {
+  planId: MockBillingPlanId;
+  status: MockBillingStatus;
+  seatsIncluded: number;
+  trialEndsAt: string | null;
+  renewalAt: string | null;
+  stripeCustomerId: string;
+  paymentMethodLabel: string;
+  invoices: MockFoundryInvoice[];
+}
+
+export interface MockFoundryGithubState {
+  connectedAccount: string;
+  installationStatus: MockGithubInstallationStatus;
+  syncStatus: MockGithubSyncStatus;
+  importedRepoCount: number;
+  lastSyncLabel: string;
+  lastSyncAt: number | null;
+  lastWebhookAt: number | null;
+  lastWebhookEvent: string;
+}
+
+export interface MockFoundryOrganizationSettings {
+  displayName: string;
+  slug: string;
+  primaryDomain: string;
+  seatAccrualMode: "first_prompt";
+  autoImportRepos: boolean;
+}
+
+export interface MockFoundryOrganization {
+  id: string;
+  organizationId: string;
+  kind: MockOrganizationKind;
+  settings: MockFoundryOrganizationSettings;
+  github: MockFoundryGithubState;
+  billing: MockFoundryBillingState;
+  members: MockFoundryOrganizationMember[];
+  seatAssignments: string[];
+  repoCatalog: string[];
+}
+
+export interface MockFoundryAppSnapshot {
+  auth: {
+    status: "signed_out" | "signed_in";
+    currentUserId: string | null;
+  };
+  activeOrganizationId: string | null;
+  onboarding: {
+    starterRepo: {
+      repoFullName: string;
+      repoUrl: string;
+      status: MockStarterRepoStatus;
+      starredAt: number | null;
+      skippedAt: number | null;
+    };
+  };
+  users: MockFoundryUser[];
+  organizations: MockFoundryOrganization[];
+}
+
+export interface UpdateMockOrganizationProfileInput {
+  organizationId: string;
+  displayName: string;
+  slug: string;
+  primaryDomain: string;
+}
+
+export interface MockFoundryAppClient {
+  getSnapshot(): MockFoundryAppSnapshot;
+  subscribe(listener: () => void): () => void;
+  signInWithGithub(userId: string): Promise<void>;
+  signOut(): Promise<void>;
+  skipStarterRepo(): Promise<void>;
+  starStarterRepo(organizationId: string): Promise<void>;
+  selectOrganization(organizationId: string): Promise<void>;
+  setDefaultModel(model: WorkspaceModelId): Promise<void>;
+  updateOrganizationProfile(input: UpdateMockOrganizationProfileInput): Promise<void>;
+  triggerGithubSync(organizationId: string): Promise<void>;
+  completeHostedCheckout(organizationId: string, planId: MockBillingPlanId): Promise<void>;
+  openBillingPortal(organizationId: string): Promise<void>;
+  cancelScheduledRenewal(organizationId: string): Promise<void>;
+  resumeSubscription(organizationId: string): Promise<void>;
+  reconnectGithub(organizationId: string): Promise<void>;
+  recordSeatUsage(organizationId: string): void;
+}
+
+const STORAGE_KEY = "sandbox-agent-foundry:mock-app:v1";
+
+function isoDate(daysFromNow: number): string {
+  const value = new Date();
+  value.setDate(value.getDate() + daysFromNow);
+  return value.toISOString();
+}
+
+function syncStatusFromLegacy(value: unknown): MockGithubSyncStatus {
+  switch (value) {
+    case "ready":
+    case "synced":
+      return "synced";
+    case "importing":
+    case "syncing":
+      return "syncing";
+    case "error":
+      return "error";
+    default:
+      return "pending";
+  }
+}
+
+/**
+ * Build the "rivet" mock organization from real public GitHub data.
+ * Fixture sourced from: scripts/pull-org-data.ts (run against rivet-dev).
+ * Members that don't exist in the public fixture get synthetic entries
+ * so the mock still has realistic owner/admin/member role distribution.
+ */
+function buildRivetOrganization(): MockFoundryOrganization {
+  const repos = rivetDevFixture.repos.map((r) => r.fullName);
+  const fixtureMembers: MockFoundryOrganizationMember[] = rivetDevFixture.members.map((m) => ({
+    id: `member-rivet-${m.login.toLowerCase()}`,
+    name: m.login,
+    email: `${m.login.toLowerCase()}@rivet.dev`,
+    role: "member" as const,
+    state: "active" as const,
+  }));
+
+  // Ensure we have named owner/admin roles for the mock user personas
+  // that may not appear in the public members list
+  const knownMembers: MockFoundryOrganizationMember[] = [
+    { id: "member-rivet-jamie", name: "Jamie", email: "jamie@rivet.dev", role: "owner", state: "active" },
+    { id: "member-rivet-nathan", name: "Nathan", email: "nathan@acme.dev", role: "member", state: "active" },
+  ];
+
+  // Merge: known members take priority, then fixture members not already covered
+  const knownIds = new Set(knownMembers.map((m) => m.id));
+  const members = [...knownMembers, ...fixtureMembers.filter((m) => !knownIds.has(m.id))];
+
+  return {
+    id: "rivet",
+    organizationId: "rivet",
+    kind: "organization",
+    settings: {
+      displayName: rivetDevFixture.name ?? rivetDevFixture.login,
+      slug: "rivet",
+      primaryDomain: "rivet.dev",
+      seatAccrualMode: "first_prompt",
+      autoImportRepos: true,
+    },
+    github: {
+      connectedAccount: rivetDevFixture.login,
+      installationStatus: "connected",
+      syncStatus: "synced",
+      importedRepoCount: repos.length,
+      lastSyncLabel: "Synced just now",
+      lastSyncAt: Date.now() - 60_000,
+      lastWebhookAt: Date.now() - 30_000,
+      lastWebhookEvent: "push",
+    },
+    billing: {
+      planId: "team",
+      status: "trialing",
+      seatsIncluded: 5,
+      trialEndsAt: isoDate(12),
+      renewalAt: isoDate(12),
+      stripeCustomerId: "cus_mock_rivet_team",
+      paymentMethodLabel: "Visa ending in 4242",
+      invoices: [{ id: "inv-rivet-001", label: "Team pilot", issuedAt: "2026-03-04", amountUsd: 0, status: "paid" }],
+    },
+    members,
+    seatAssignments: ["jamie@rivet.dev"],
+    repoCatalog: repos,
+  };
+}
+
+function buildDefaultSnapshot(): MockFoundryAppSnapshot {
+  return {
+    auth: {
+      status: "signed_out",
+      currentUserId: null,
+    },
+    activeOrganizationId: null,
+    onboarding: {
+      starterRepo: {
+        repoFullName: "rivet-dev/sandbox-agent",
+        repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+        status: "pending",
+        starredAt: null,
+        skippedAt: null,
+      },
+    },
+    users: [
+      {
+        id: "user-nathan",
+        name: "Nathan",
+        email: "nathan@acme.dev",
+        githubLogin: "nathan",
+        roleLabel: "Founder",
+        eligibleOrganizationIds: ["personal-nathan", "acme", "rivet"],
+        defaultModel: DEFAULT_WORKSPACE_MODEL_ID,
+      },
+      {
+        id: "user-maya",
+        name: "Maya",
+        email: "maya@acme.dev",
+        githubLogin: "maya",
+        roleLabel: "Staff Engineer",
+        eligibleOrganizationIds: ["acme"],
+        defaultModel: CLAUDE_SECONDARY_MODEL_ID,
+      },
+      {
+        id: "user-jamie",
+        name: "Jamie",
+        email: "jamie@rivet.dev",
+        githubLogin: "jamie",
+        roleLabel: "Platform Lead",
+        eligibleOrganizationIds: ["personal-jamie", "rivet"],
+        defaultModel: CLAUDE_TERTIARY_MODEL_ID,
+      },
+    ],
+    organizations: [
+      {
+        id: "personal-nathan",
+        organizationId: "personal-nathan",
+        kind: "personal",
+        settings: {
+          displayName: "Nathan",
+          slug: "nathan",
+          primaryDomain: "personal",
+          seatAccrualMode: "first_prompt",
+          autoImportRepos: true,
+        },
+        github: {
+          connectedAccount: "nathan",
+          installationStatus: "connected",
+          syncStatus: "synced",
+          importedRepoCount: 1,
+          lastSyncLabel: "Synced just now",
+          lastSyncAt: Date.now() - 60_000,
+          lastWebhookAt: Date.now() - 120_000,
+          lastWebhookEvent: "pull_request.opened",
+        },
+        billing: {
+          planId: "free",
+          status: "active",
+          seatsIncluded: 1,
+          trialEndsAt: null,
+          renewalAt: null,
+          stripeCustomerId: "cus_mock_personal_nathan",
+          paymentMethodLabel: "No card required",
+          invoices: [],
+        },
+        members: [{ id: "member-nathan", name: "Nathan", email: "nathan@acme.dev", role: "owner", state: "active" }],
+        seatAssignments: ["nathan@acme.dev"],
+        repoCatalog: ["nathan/personal-site"],
+      },
+      {
+        id: "acme",
+        organizationId: "acme",
+        kind: "organization",
+        settings: {
+          displayName: "Acme",
+          slug: "acme",
+          primaryDomain: "acme.dev",
+          seatAccrualMode: "first_prompt",
+          autoImportRepos: true,
+        },
+        github: {
+          connectedAccount: "acme",
+          installationStatus: "connected",
+          syncStatus: "pending",
+          importedRepoCount: 3,
+          lastSyncLabel: "Waiting for first import",
+          lastSyncAt: null,
+          lastWebhookAt: null,
+          lastWebhookEvent: "",
+        },
+        billing: {
+          planId: "team",
+          status: "active",
+          seatsIncluded: 5,
+          trialEndsAt: null,
+          renewalAt: isoDate(18),
+          stripeCustomerId: "cus_mock_acme_team",
+          paymentMethodLabel: "Visa ending in 4242",
+          invoices: [
+            { id: "inv-acme-001", label: "March 2026", issuedAt: "2026-03-01", amountUsd: 240, status: "paid" },
+            { id: "inv-acme-000", label: "February 2026", issuedAt: "2026-02-01", amountUsd: 240, status: "paid" },
+          ],
+        },
+        members: [
+          { id: "member-acme-nathan", name: "Nathan", email: "nathan@acme.dev", role: "owner", state: "active" },
+          { id: "member-acme-maya", name: "Maya", email: "maya@acme.dev", role: "admin", state: "active" },
+          { id: "member-acme-priya", name: "Priya", email: "priya@acme.dev", role: "member", state: "active" },
+          { id: "member-acme-devon", name: "Devon", email: "devon@acme.dev", role: "member", state: "invited" },
+        ],
+        seatAssignments: ["nathan@acme.dev", "maya@acme.dev"],
+        repoCatalog: ["acme/backend", "acme/frontend", "acme/infra"],
+      },
+      buildRivetOrganization(),
+      {
+        id: "personal-jamie",
+        organizationId: "personal-jamie",
+        kind: "personal",
+        settings: {
+          displayName: "Jamie",
+          slug: "jamie",
+          primaryDomain: "personal",
+          seatAccrualMode: "first_prompt",
+          autoImportRepos: true,
+        },
+        github: {
+          connectedAccount: "jamie",
+          installationStatus: "connected",
+          syncStatus: "synced",
+          importedRepoCount: 1,
+          lastSyncLabel: "Synced yesterday",
+          lastSyncAt: Date.now() - 24 * 60 * 60_000,
+          lastWebhookAt: Date.now() - 3_600_000,
+          lastWebhookEvent: "check_run.completed",
+        },
+        billing: {
+          planId: "free",
+          status: "active",
+          seatsIncluded: 1,
+          trialEndsAt: null,
+          renewalAt: null,
+          stripeCustomerId: "cus_mock_personal_jamie",
+          paymentMethodLabel: "No card required",
+          invoices: [],
+        },
+        members: [{ id: "member-jamie", name: "Jamie", email: "jamie@rivet.dev", role: "owner", state: "active" }],
+        seatAssignments: ["jamie@rivet.dev"],
+        repoCatalog: ["jamie/demo-app"],
+      },
+    ],
+  };
+}
+
+function parseStoredSnapshot(): MockFoundryAppSnapshot | null {
+  if (typeof window === "undefined") {
+    return null;
+  }
+
+  const raw = window.localStorage.getItem(STORAGE_KEY);
+  if (!raw) {
+    return null;
+  }
+
+  try {
+    const parsed = JSON.parse(raw) as MockFoundryAppSnapshot & {
+      organizations?: Array<MockFoundryOrganization & { repoImportStatus?: string }>;
+    };
+    if (!parsed || typeof parsed !== "object") {
+      return null;
+    }
+    return {
+      ...parsed,
+      onboarding: {
+        starterRepo: {
+          repoFullName: parsed.onboarding?.starterRepo?.repoFullName ?? "rivet-dev/sandbox-agent",
+          repoUrl: parsed.onboarding?.starterRepo?.repoUrl ?? "https://github.com/rivet-dev/sandbox-agent",
+          status: parsed.onboarding?.starterRepo?.status ?? "pending",
+          starredAt: parsed.onboarding?.starterRepo?.starredAt ?? null,
+          skippedAt: parsed.onboarding?.starterRepo?.skippedAt ?? null,
+        },
+      },
+      organizations: (parsed.organizations ?? []).map((organization: MockFoundryOrganization & { repoImportStatus?: string }) => ({
+        ...organization,
+        github: {
+          ...organization.github,
+          syncStatus: syncStatusFromLegacy(organization.github?.syncStatus ?? organization.repoImportStatus),
+          lastSyncAt: organization.github?.lastSyncAt ?? null,
+          lastWebhookAt: organization.github?.lastWebhookAt ?? null,
+          lastWebhookEvent: organization.github?.lastWebhookEvent ?? "",
+        },
+      })),
+    };
+  } catch {
+    return null;
+  }
+}
+
+function saveSnapshot(snapshot: MockFoundryAppSnapshot): void {
+  if (typeof window === "undefined") {
+    return;
+  }
+
+  window.localStorage.setItem(STORAGE_KEY, JSON.stringify(snapshot));
+}
+
+function planSeatsIncluded(planId: MockBillingPlanId): number {
+  switch (planId) {
+    case "free":
+      return 1;
+    case "team":
+      return 5;
+  }
+}
+
+class MockFoundryAppStore implements MockFoundryAppClient {
+  private snapshot = parseStoredSnapshot() ?? buildDefaultSnapshot();
+  private listeners = new Set<() => void>();
+  private importTimers = new Map<string, ReturnType<typeof setTimeout>>();
+
+  getSnapshot(): MockFoundryAppSnapshot {
+    return this.snapshot;
+  }
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+
+  async signInWithGithub(userId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    const user = this.snapshot.users.find((candidate) => candidate.id === userId);
+    if (!user) {
+      throw new Error(`Unknown mock user ${userId}`);
+    }
+
+    this.updateSnapshot((current) => {
+      const activeOrganizationId = user.eligibleOrganizationIds.length === 1 ? (user.eligibleOrganizationIds[0] ?? null) : null;
+      return {
+        ...current,
+        auth: {
+          status: "signed_in",
+          currentUserId: userId,
+        },
+        activeOrganizationId,
+      };
+    });
+
+    if (user.eligibleOrganizationIds.length === 1) {
+      await this.selectOrganization(user.eligibleOrganizationIds[0]!);
+    }
+  }
+
+  async signOut(): Promise<void> {
+    await this.injectAsyncLatency();
+    this.updateSnapshot((current) => ({
+      ...current,
+      auth: {
+        status: "signed_out",
+        currentUserId: null,
+      },
+      activeOrganizationId: null,
+      onboarding: {
+        starterRepo: {
+          ...current.onboarding.starterRepo,
+          status: "pending",
+          starredAt: null,
+          skippedAt: null,
+        },
+      },
+    }));
+  }
+
+  async skipStarterRepo(): Promise<void> {
+    await this.injectAsyncLatency();
+    this.updateSnapshot((current) => ({
+      ...current,
+      onboarding: {
+        starterRepo: {
+          ...current.onboarding.starterRepo,
+          status: "skipped",
+          skippedAt: Date.now(),
+          starredAt: null,
+        },
+      },
+    }));
+  }
+
+  async starStarterRepo(organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(organizationId);
+    this.updateSnapshot((current) => ({
+      ...current,
+      onboarding: {
+        starterRepo: {
+          ...current.onboarding.starterRepo,
+          status: "starred",
+          starredAt: Date.now(),
+          skippedAt: null,
+        },
+      },
+    }));
+  }
+
+  async selectOrganization(organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    const org = this.requireOrganization(organizationId);
+    this.updateSnapshot((current) => ({
+      ...current,
+      activeOrganizationId: organizationId,
+    }));
+
+    if (org.github.syncStatus !== "synced") {
+      await this.triggerGithubSync(organizationId);
+    }
+  }
+
+  async setDefaultModel(model: WorkspaceModelId): Promise<void> {
+    await this.injectAsyncLatency();
+    const currentUserId = this.snapshot.auth.currentUserId;
+    if (!currentUserId) {
+      throw new Error("No signed-in mock user");
+    }
+    this.updateSnapshot((current) => ({
+      ...current,
+      users: current.users.map((user) => (user.id === currentUserId ? { ...user, defaultModel: model } : user)),
+    }));
+  }
+
+  async updateOrganizationProfile(input: UpdateMockOrganizationProfileInput): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(input.organizationId);
+    this.updateOrganization(input.organizationId, (organization) => ({
+      ...organization,
+      settings: {
+        ...organization.settings,
+        displayName: input.displayName.trim() || organization.settings.displayName,
+        slug: input.slug.trim() || organization.settings.slug,
+        primaryDomain: input.primaryDomain.trim() || organization.settings.primaryDomain,
+      },
+    }));
+  }
+
+  async triggerGithubSync(organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(organizationId);
+    const existingTimer = this.importTimers.get(organizationId);
+    if (existingTimer) {
+      clearTimeout(existingTimer);
+    }
+
+    this.updateOrganization(organizationId, (organization) => ({
+      ...organization,
+      github: {
+        ...organization.github,
+        syncStatus: "syncing",
+        lastSyncLabel: "Syncing repositories...",
+      },
+    }));
+
+    const timer = setTimeout(() => {
+      this.updateOrganization(organizationId, (organization) => ({
+        ...organization,
+        github: {
+          ...organization.github,
+          importedRepoCount: organization.repoCatalog.length,
+          installationStatus: "connected",
+          syncStatus: "synced",
+          lastSyncLabel: "Synced just now",
+          lastSyncAt: Date.now(),
+          lastWebhookAt: Date.now(),
+          lastWebhookEvent: "installation_repositories.added",
+        },
+      }));
+      this.importTimers.delete(organizationId);
+    }, 1_250);
+
+    this.importTimers.set(organizationId, timer);
+  }
+
+  async completeHostedCheckout(organizationId: string, planId: MockBillingPlanId): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(organizationId);
+    this.updateOrganization(organizationId, (organization) => ({
+      ...organization,
+      billing: {
+        ...organization.billing,
+        planId,
+        status: "active",
+        seatsIncluded: planSeatsIncluded(planId),
+        trialEndsAt: null,
+        renewalAt: isoDate(30),
+        paymentMethodLabel: "Visa ending in 4242",
+        invoices: [
+          {
+            id: `inv-${organizationId}-${Date.now()}`,
+            label: `${organization.settings.displayName} ${planId} upgrade`,
+            issuedAt: new Date().toISOString().slice(0, 10),
+            amountUsd: planId === "team" ? 240 : 0,
+            status: "paid",
+          },
+          ...organization.billing.invoices,
+        ],
+      },
+    }));
+  }
+
+  async openBillingPortal(_organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+  }
+
+  async cancelScheduledRenewal(organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(organizationId);
+    this.updateOrganization(organizationId, (organization) => ({
+      ...organization,
+      billing: {
+        ...organization.billing,
+        status: "scheduled_cancel",
+      },
+    }));
+  }
+
+  async resumeSubscription(organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(organizationId);
+    this.updateOrganization(organizationId, (organization) => ({
+      ...organization,
+      billing: {
+        ...organization.billing,
+        status: "active",
+      },
+    }));
+  }
+
+  async reconnectGithub(organizationId: string): Promise<void> {
+    await this.injectAsyncLatency();
+    this.requireOrganization(organizationId);
+    this.updateOrganization(organizationId, (organization) => ({
+      ...organization,
+      github: {
+        ...organization.github,
+        installationStatus: "connected",
+        syncStatus: "pending",
+        lastSyncLabel: "Reconnected just now",
+        lastSyncAt: Date.now(),
+      },
+    }));
+  }
+
+  recordSeatUsage(organizationId: string): void {
+    const org = this.snapshot.organizations.find((candidate) => candidate.organizationId === organizationId);
+    const currentUser = currentMockUser(this.snapshot);
+    if (!org || !currentUser) {
+      return;
+    }
+
+    if (org.seatAssignments.includes(currentUser.email)) {
+      return;
+    }
+
+    this.updateOrganization(org.id, (organization) => ({
+      ...organization,
+      seatAssignments: [...organization.seatAssignments, currentUser.email],
+    }));
+  }
+
+  private injectAsyncLatency(): Promise<void> {
+    return injectMockLatency();
+  }
+
+  private updateOrganization(organizationId: string, updater: (organization: MockFoundryOrganization) => MockFoundryOrganization): void {
+    this.updateSnapshot((current) => ({
+      ...current,
+      organizations: current.organizations.map((organization) => (organization.id === organizationId ? updater(organization) : organization)),
+    }));
+  }
+
+  private updateSnapshot(updater: (current: MockFoundryAppSnapshot) => MockFoundryAppSnapshot): void {
+    this.snapshot = updater(this.snapshot);
+    saveSnapshot(this.snapshot);
+    for (const listener of this.listeners) {
+      listener();
+    }
+  }
+
+  private requireOrganization(organizationId: string): MockFoundryOrganization {
+    const organization = this.snapshot.organizations.find((candidate) => candidate.id === organizationId);
+    if (!organization) {
+      throw new Error(`Unknown mock organization ${organizationId}`);
+    }
+    return organization;
+  }
+}
+
+function currentMockUser(snapshot: MockFoundryAppSnapshot): MockFoundryUser | null {
+  if (!snapshot.auth.currentUserId) {
+    return null;
+  }
+  return snapshot.users.find((candidate) => candidate.id === snapshot.auth.currentUserId) ?? null;
+}
+
+const mockFoundryAppStore = new MockFoundryAppStore();
+
+export function getMockFoundryAppClient(): MockFoundryAppClient {
+  return mockFoundryAppStore;
+}
+
+export function currentMockFoundryUser(snapshot: MockFoundryAppSnapshot): MockFoundryUser | null {
+  return currentMockUser(snapshot);
+}
+
+export function currentMockFoundryOrganization(snapshot: MockFoundryAppSnapshot): MockFoundryOrganization | null {
+  if (!snapshot.activeOrganizationId) {
+    return null;
+  }
+  return snapshot.organizations.find((candidate) => candidate.id === snapshot.activeOrganizationId) ?? null;
+}
+
+export function eligibleMockOrganizations(snapshot: MockFoundryAppSnapshot): MockFoundryOrganization[] {
+  const user = currentMockUser(snapshot);
+  if (!user) {
+    return [];
+  }
+
+  const eligible = new Set(user.eligibleOrganizationIds);
+  return snapshot.organizations.filter((organization) => eligible.has(organization.id));
+}
diff --git a/foundry/packages/client/src/mock/backend-client.ts b/foundry/packages/client/src/mock/backend-client.ts
new file mode 100644
index 0000000..191f68c
--- /dev/null
+++ b/foundry/packages/client/src/mock/backend-client.ts
@@ -0,0 +1,789 @@
+import type {
+  AppEvent,
+  CreateTaskInput,
+  FoundryAppSnapshot,
+  SandboxProcessesEvent,
+  SessionEvent,
+  TaskRecord,
+  TaskSummary,
+  TaskWorkspaceChangeModelInput,
+  TaskWorkspaceCreateTaskInput,
+  TaskWorkspaceCreateTaskResponse,
+  TaskWorkspaceDiffInput,
+  TaskWorkspaceRenameInput,
+  TaskWorkspaceRenameSessionInput,
+  TaskWorkspaceSelectInput,
+  TaskWorkspaceSetSessionUnreadInput,
+  TaskWorkspaceSendMessageInput,
+  TaskWorkspaceSnapshot,
+  TaskWorkspaceSessionInput,
+  TaskWorkspaceUpdateDraftInput,
+  TaskEvent,
+  WorkspaceSessionDetail,
+  WorkspaceModelGroup,
+  WorkspaceTaskDetail,
+  WorkspaceTaskSummary,
+  OrganizationEvent,
+  OrganizationSummarySnapshot,
+  AuditLogEvent as HistoryEvent,
+  HistoryQueryInput,
+  SandboxProviderId,
+  RepoOverview,
+  RepoRecord,
+  StarSandboxAgentRepoResult,
+  SwitchResult,
+} from "@sandbox-agent/foundry-shared";
+import { DEFAULT_WORKSPACE_MODEL_GROUPS } from "@sandbox-agent/foundry-shared";
+import type { ProcessCreateRequest, ProcessLogFollowQuery, ProcessLogsResponse, ProcessSignalQuery } from "sandbox-agent";
+import type { ActorConn, BackendClient, SandboxProcessRecord, SandboxSessionEventRecord, SandboxSessionRecord } from "../backend-client.js";
+import { getSharedMockWorkspaceClient } from "./workspace-client.js";
+
+interface MockProcessRecord extends SandboxProcessRecord {
+  logText: string;
+}
+
+function notSupported(name: string): never {
+  throw new Error(`${name} is not supported by the mock backend client.`);
+}
+
+function encodeBase64Utf8(value: string): string {
+  if (typeof Buffer !== "undefined") {
+    return Buffer.from(value, "utf8").toString("base64");
+  }
+  return globalThis.btoa(unescape(encodeURIComponent(value)));
+}
+
+function nowMs(): number {
+  return Date.now();
+}
+
+function mockRepoRemote(label: string): string {
+  return `https://example.test/${label}.git`;
+}
+
+function mockCwd(repoLabel: string, taskId: string): string {
+  return `/mock/${repoLabel.replace(/\//g, "-")}/${taskId}`;
+}
+
+function unsupportedAppSnapshot(): FoundryAppSnapshot {
+  return {
+    auth: { status: "signed_out", currentUserId: null },
+    activeOrganizationId: null,
+    onboarding: {
+      starterRepo: {
+        repoFullName: "rivet-dev/sandbox-agent",
+        repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+        status: "pending",
+        starredAt: null,
+        skippedAt: null,
+      },
+    },
+    users: [],
+    organizations: [],
+  };
+}
+
+function toTaskStatus(status: TaskRecord["status"], archived: boolean): TaskRecord["status"] {
+  if (archived) {
+    return "archived";
+  }
+  return status;
+}
+
+export function createMockBackendClient(defaultOrganizationId = "default"): BackendClient {
+  const workspace = getSharedMockWorkspaceClient();
+  const listenersBySandboxId = new Map<string, Set<() => void>>();
+  const processesBySandboxId = new Map<string, MockProcessRecord[]>();
+  const connectionListeners = new Map<string, Set<(payload: any) => void>>();
+  let nextPid = 4000;
+  let nextProcessId = 1;
+
+  const requireTask = (taskId: string) => {
+    const task = workspace.getSnapshot().tasks.find((candidate) => candidate.id === taskId);
+    if (!task) {
+      throw new Error(`Unknown mock task ${taskId}`);
+    }
+    return task;
+  };
+
+  const ensureProcessList = (sandboxId: string): MockProcessRecord[] => {
+    const existing = processesBySandboxId.get(sandboxId);
+    if (existing) {
+      return existing;
+    }
+    const created: MockProcessRecord[] = [];
+    processesBySandboxId.set(sandboxId, created);
+    return created;
+  };
+
+  const notifySandbox = (sandboxId: string): void => {
+    const listeners = listenersBySandboxId.get(sandboxId);
+    if (!listeners) {
+      emitSandboxProcessesUpdate(sandboxId);
+      return;
+    }
+    for (const listener of [...listeners]) {
+      listener();
+    }
+    emitSandboxProcessesUpdate(sandboxId);
+  };
+
+  const connectionChannel = (scope: string, event: string): string => `${scope}:${event}`;
+
+  const emitConnectionEvent = (scope: string, event: string, payload: any): void => {
+    const listeners = connectionListeners.get(connectionChannel(scope, event));
+    if (!listeners) {
+      return;
+    }
+    for (const listener of [...listeners]) {
+      listener(payload);
+    }
+  };
+
+  const createConn = (scope: string): ActorConn => ({
+    on(event: string, listener: (payload: any) => void): () => void {
+      const channel = connectionChannel(scope, event);
+      let listeners = connectionListeners.get(channel);
+      if (!listeners) {
+        listeners = new Set();
+        connectionListeners.set(channel, listeners);
+      }
+      listeners.add(listener);
+      return () => {
+        const current = connectionListeners.get(channel);
+        if (!current) {
+          return;
+        }
+        current.delete(listener);
+        if (current.size === 0) {
+          connectionListeners.delete(channel);
+        }
+      };
+    },
+    onError(): () => void {
+      return () => {};
+    },
+    async dispose(): Promise<void> {},
+  });
+
+  const buildTaskSummary = (task: TaskWorkspaceSnapshot["tasks"][number]): WorkspaceTaskSummary => ({
+    id: task.id,
+    repoId: task.repoId,
+    title: task.title,
+    status: task.status,
+    repoName: task.repoName,
+    updatedAtMs: task.updatedAtMs,
+    branch: task.branch,
+    pullRequest: task.pullRequest,
+    activeSessionId: task.activeSessionId ?? task.sessions[0]?.id ?? null,
+    sessionsSummary: task.sessions.map((tab) => ({
+      id: tab.id,
+      sessionId: tab.sessionId,
+      sandboxSessionId: tab.sandboxSessionId ?? tab.sessionId,
+      sessionName: tab.sessionName,
+      agent: tab.agent,
+      model: tab.model,
+      status: tab.status,
+      thinkingSinceMs: tab.thinkingSinceMs,
+      unread: tab.unread,
+      created: tab.created,
+    })),
+    primaryUserLogin: null,
+    primaryUserAvatarUrl: null,
+  });
+
+  const buildTaskDetail = (task: TaskWorkspaceSnapshot["tasks"][number]): WorkspaceTaskDetail => ({
+    ...buildTaskSummary(task),
+    task: task.title,
+    fileChanges: task.fileChanges,
+    diffs: task.diffs,
+    fileTree: task.fileTree,
+    minutesUsed: task.minutesUsed,
+    sandboxes: [
+      {
+        sandboxProviderId: "local",
+        sandboxId: task.id,
+        cwd: mockCwd(task.repoName, task.id),
+        url: null,
+      },
+    ],
+    activeSandboxId: task.id,
+  });
+
+  const buildSessionDetail = (task: TaskWorkspaceSnapshot["tasks"][number], sessionId: string): WorkspaceSessionDetail => {
+    const tab = task.sessions.find((candidate) => candidate.id === sessionId);
+    if (!tab) {
+      throw new Error(`Unknown mock session ${sessionId} for task ${task.id}`);
+    }
+    return {
+      sessionId: tab.id,
+      sandboxSessionId: tab.sandboxSessionId ?? tab.sessionId,
+      sessionName: tab.sessionName,
+      agent: tab.agent,
+      model: tab.model,
+      status: tab.status,
+      thinkingSinceMs: tab.thinkingSinceMs,
+      unread: tab.unread,
+      created: tab.created,
+      draft: tab.draft,
+      transcript: tab.transcript,
+    };
+  };
+
+  const buildOrganizationSummary = (): OrganizationSummarySnapshot => {
+    const snapshot = workspace.getSnapshot();
+    const taskSummaries = snapshot.tasks.map(buildTaskSummary);
+    return {
+      organizationId: defaultOrganizationId,
+      github: {
+        connectedAccount: "mock",
+        installationStatus: "connected",
+        syncStatus: "synced",
+        importedRepoCount: snapshot.repos.length,
+        lastSyncLabel: "Synced just now",
+        lastSyncAt: nowMs(),
+        lastWebhookAt: null,
+        lastWebhookEvent: "",
+        syncGeneration: 1,
+        syncPhase: null,
+        processedRepositoryCount: snapshot.repos.length,
+        totalRepositoryCount: snapshot.repos.length,
+      },
+      repos: snapshot.repos.map((repo) => {
+        const repoTasks = taskSummaries.filter((task) => task.repoId === repo.id);
+        return {
+          id: repo.id,
+          label: repo.label,
+          taskCount: repoTasks.length,
+          latestActivityMs: repoTasks.reduce((latest, task) => Math.max(latest, task.updatedAtMs), 0),
+        };
+      }),
+      taskSummaries,
+    };
+  };
+
+  const organizationScope = (organizationId: string): string => `organization:${organizationId}`;
+  const taskScope = (organizationId: string, repoId: string, taskId: string): string => `task:${organizationId}:${repoId}:${taskId}`;
+  const sandboxScope = (organizationId: string, sandboxProviderId: string, sandboxId: string): string =>
+    `sandbox:${organizationId}:${sandboxProviderId}:${sandboxId}`;
+
+  const emitOrganizationSnapshot = (): void => {
+    emitConnectionEvent(organizationScope(defaultOrganizationId), "organizationUpdated", {
+      type: "organizationUpdated",
+      snapshot: buildOrganizationSummary(),
+    } satisfies OrganizationEvent);
+  };
+
+  const emitTaskUpdate = (taskId: string): void => {
+    const task = requireTask(taskId);
+    emitConnectionEvent(taskScope(defaultOrganizationId, task.repoId, task.id), "taskUpdated", {
+      type: "taskUpdated",
+      detail: buildTaskDetail(task),
+    } satisfies TaskEvent);
+  };
+
+  const emitSessionUpdate = (taskId: string, sessionId: string): void => {
+    const task = requireTask(taskId);
+    emitConnectionEvent(taskScope(defaultOrganizationId, task.repoId, task.id), "sessionUpdated", {
+      type: "sessionUpdated",
+      session: buildSessionDetail(task, sessionId),
+    } satisfies SessionEvent);
+  };
+
+  const emitSandboxProcessesUpdate = (sandboxId: string): void => {
+    emitConnectionEvent(sandboxScope(defaultOrganizationId, "local", sandboxId), "processesUpdated", {
+      type: "processesUpdated",
+      processes: ensureProcessList(sandboxId).map((process) => cloneProcess(process)),
+    } satisfies SandboxProcessesEvent);
+  };
+
+  const buildTaskRecord = (taskId: string): TaskRecord => {
+    const task = requireTask(taskId);
+    const cwd = mockCwd(task.repoName, task.id);
+    const archived = task.status === "archived";
+    return {
+      organizationId: defaultOrganizationId,
+      repoId: task.repoId,
+      repoRemote: mockRepoRemote(task.repoName),
+      taskId: task.id,
+      branchName: task.branch,
+      title: task.title,
+      task: task.title,
+      sandboxProviderId: "local",
+      status: toTaskStatus(archived ? "archived" : "running", archived),
+      pullRequest: null,
+      activeSandboxId: task.id,
+      sandboxes: [
+        {
+          sandboxId: task.id,
+          sandboxProviderId: "local",
+          sandboxActorId: "mock-sandbox",
+          switchTarget: `mock://${task.id}`,
+          cwd,
+          createdAt: task.updatedAtMs,
+          updatedAt: task.updatedAtMs,
+        },
+      ],
+      createdAt: task.updatedAtMs,
+      updatedAt: task.updatedAtMs,
+    };
+  };
+
+  const cloneProcess = (process: MockProcessRecord): MockProcessRecord => ({ ...process });
+
+  const createProcessRecord = (sandboxId: string, cwd: string, request: ProcessCreateRequest): MockProcessRecord => {
+    const processId = `proc_${nextProcessId++}`;
+    const createdAtMs = nowMs();
+    const args = request.args ?? [];
+    const interactive = request.interactive ?? false;
+    const tty = request.tty ?? false;
+    const statusLine = interactive && tty ? "Mock terminal session created.\nInteractive transport is unavailable in mock mode.\n" : "Mock process created.\n";
+    const commandLine = `$ ${[request.command, ...args].join(" ").trim()}\n`;
+    return {
+      id: processId,
+      command: request.command,
+      args,
+      createdAtMs,
+      cwd: request.cwd ?? cwd,
+      exitCode: null,
+      exitedAtMs: null,
+      interactive,
+      pid: nextPid++,
+      status: "running",
+      tty,
+      logText: `${statusLine}${commandLine}`,
+    };
+  };
+
+  return {
+    async getAppSnapshot(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async connectOrganization(organizationId: string): Promise<ActorConn> {
+      return createConn(organizationScope(organizationId));
+    },
+
+    async connectTask(organizationId: string, repoId: string, taskId: string): Promise<ActorConn> {
+      return createConn(taskScope(organizationId, repoId, taskId));
+    },
+
+    async connectSandbox(organizationId: string, sandboxProviderId: SandboxProviderId, sandboxId: string): Promise<ActorConn> {
+      return createConn(sandboxScope(organizationId, sandboxProviderId, sandboxId));
+    },
+
+    subscribeApp(): () => void {
+      return () => {};
+    },
+
+    async signInWithGithub(): Promise<void> {
+      notSupported("signInWithGithub");
+    },
+
+    async signOutApp(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async skipAppStarterRepo(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async starAppStarterRepo(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async selectAppOrganization(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async setAppDefaultModel(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async updateAppOrganizationProfile(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async triggerAppRepoImport(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async reconnectAppGithub(): Promise<void> {
+      notSupported("reconnectAppGithub");
+    },
+
+    async completeAppHostedCheckout(): Promise<void> {
+      notSupported("completeAppHostedCheckout");
+    },
+
+    async openAppBillingPortal(): Promise<void> {
+      notSupported("openAppBillingPortal");
+    },
+
+    async cancelAppScheduledRenewal(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async resumeAppSubscription(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async recordAppSeatUsage(): Promise<FoundryAppSnapshot> {
+      return unsupportedAppSnapshot();
+    },
+
+    async listRepos(_organizationId: string): Promise<RepoRecord[]> {
+      return workspace.getSnapshot().repos.map((repo) => ({
+        organizationId: defaultOrganizationId,
+        repoId: repo.id,
+        remoteUrl: mockRepoRemote(repo.label),
+        createdAt: nowMs(),
+        updatedAt: nowMs(),
+      }));
+    },
+
+    async createTask(_input: CreateTaskInput): Promise<TaskRecord> {
+      notSupported("createTask");
+    },
+
+    async listTasks(_organizationId: string, repoId?: string): Promise<TaskSummary[]> {
+      return workspace
+        .getSnapshot()
+        .tasks.filter((task) => !repoId || task.repoId === repoId)
+        .map((task) => ({
+          organizationId: defaultOrganizationId,
+          repoId: task.repoId,
+          taskId: task.id,
+          branchName: task.branch,
+          title: task.title,
+          status: task.status === "archived" ? "archived" : "running",
+          pullRequest: null,
+          updatedAt: task.updatedAtMs,
+        }));
+    },
+
+    async getRepoOverview(_organizationId: string, _repoId: string): Promise<RepoOverview> {
+      notSupported("getRepoOverview");
+    },
+    async getTask(_organizationId: string, _repoId: string, taskId: string): Promise<TaskRecord> {
+      return buildTaskRecord(taskId);
+    },
+
+    async listHistory(_input: HistoryQueryInput): Promise<HistoryEvent[]> {
+      return [];
+    },
+
+    async switchTask(_organizationId: string, _repoId: string, taskId: string): Promise<SwitchResult> {
+      return {
+        organizationId: defaultOrganizationId,
+        taskId,
+        sandboxProviderId: "local",
+        switchTarget: `mock://${taskId}`,
+      };
+    },
+
+    async attachTask(_organizationId: string, _repoId: string, taskId: string): Promise<{ target: string; sessionId: string | null }> {
+      return {
+        target: `mock://${taskId}`,
+        sessionId: requireTask(taskId).sessions[0]?.sessionId ?? null,
+      };
+    },
+
+    async runAction(_organizationId: string, _repoId: string, _taskId: string): Promise<void> {
+      notSupported("runAction");
+    },
+
+    async createSandboxSession(): Promise<{ id: string; status: "running" | "idle" | "error" }> {
+      notSupported("createSandboxSession");
+    },
+
+    async listSandboxSessions(): Promise<{ items: SandboxSessionRecord[]; nextCursor?: string }> {
+      return { items: [] };
+    },
+
+    async listSandboxSessionEvents(): Promise<{ items: SandboxSessionEventRecord[]; nextCursor?: string }> {
+      return { items: [] };
+    },
+
+    async createSandboxProcess(input: {
+      organizationId: string;
+      sandboxProviderId: SandboxProviderId;
+      sandboxId: string;
+      request: ProcessCreateRequest;
+    }): Promise<SandboxProcessRecord> {
+      const task = requireTask(input.sandboxId);
+      const processes = ensureProcessList(input.sandboxId);
+      const created = createProcessRecord(input.sandboxId, mockCwd(task.repoName, task.id), input.request);
+      processes.unshift(created);
+      notifySandbox(input.sandboxId);
+      return cloneProcess(created);
+    },
+
+    async listSandboxProcesses(_organizationId: string, _providerId: SandboxProviderId, sandboxId: string): Promise<{ processes: SandboxProcessRecord[] }> {
+      return {
+        processes: ensureProcessList(sandboxId).map((process) => cloneProcess(process)),
+      };
+    },
+
+    async getSandboxProcessLogs(
+      _organizationId: string,
+      _providerId: SandboxProviderId,
+      sandboxId: string,
+      processId: string,
+      query?: ProcessLogFollowQuery,
+    ): Promise<ProcessLogsResponse> {
+      const process = ensureProcessList(sandboxId).find((candidate) => candidate.id === processId);
+      if (!process) {
+        throw new Error(`Unknown mock process ${processId}`);
+      }
+      return {
+        processId,
+        stream: query?.stream ?? (process.tty ? "pty" : "combined"),
+        entries: process.logText
+          ? [
+              {
+                data: encodeBase64Utf8(process.logText),
+                encoding: "base64",
+                sequence: 1,
+                stream: query?.stream ?? (process.tty ? "pty" : "combined"),
+                timestampMs: process.createdAtMs,
+              },
+            ]
+          : [],
+      };
+    },
+
+    async stopSandboxProcess(
+      _organizationId: string,
+      _providerId: SandboxProviderId,
+      sandboxId: string,
+      processId: string,
+      _query?: ProcessSignalQuery,
+    ): Promise<SandboxProcessRecord> {
+      const process = ensureProcessList(sandboxId).find((candidate) => candidate.id === processId);
+      if (!process) {
+        throw new Error(`Unknown mock process ${processId}`);
+      }
+      process.status = "exited";
+      process.exitCode = 0;
+      process.exitedAtMs = nowMs();
+      process.logText += "\n[stopped]\n";
+      notifySandbox(sandboxId);
+      return cloneProcess(process);
+    },
+
+    async killSandboxProcess(
+      _organizationId: string,
+      _providerId: SandboxProviderId,
+      sandboxId: string,
+      processId: string,
+      _query?: ProcessSignalQuery,
+    ): Promise<SandboxProcessRecord> {
+      const process = ensureProcessList(sandboxId).find((candidate) => candidate.id === processId);
+      if (!process) {
+        throw new Error(`Unknown mock process ${processId}`);
+      }
+      process.status = "exited";
+      process.exitCode = 137;
+      process.exitedAtMs = nowMs();
+      process.logText += "\n[killed]\n";
+      notifySandbox(sandboxId);
+      return cloneProcess(process);
+    },
+
+    async deleteSandboxProcess(_organizationId: string, _providerId: SandboxProviderId, sandboxId: string, processId: string): Promise<void> {
+      processesBySandboxId.set(
+        sandboxId,
+        ensureProcessList(sandboxId).filter((candidate) => candidate.id !== processId),
+      );
+      notifySandbox(sandboxId);
+    },
+
+    subscribeSandboxProcesses(_organizationId: string, _providerId: SandboxProviderId, sandboxId: string, listener: () => void): () => void {
+      let listeners = listenersBySandboxId.get(sandboxId);
+      if (!listeners) {
+        listeners = new Set();
+        listenersBySandboxId.set(sandboxId, listeners);
+      }
+      listeners.add(listener);
+      return () => {
+        const current = listenersBySandboxId.get(sandboxId);
+        if (!current) {
+          return;
+        }
+        current.delete(listener);
+        if (current.size === 0) {
+          listenersBySandboxId.delete(sandboxId);
+        }
+      };
+    },
+
+    async sendSandboxPrompt(): Promise<void> {
+      notSupported("sendSandboxPrompt");
+    },
+
+    async sandboxSessionStatus(sessionId: string): Promise<{ id: string; status: "running" | "idle" | "error" }> {
+      return { id: sessionId, status: "idle" };
+    },
+
+    async sandboxProviderState(
+      _organizationId: string,
+      _providerId: SandboxProviderId,
+      sandboxId: string,
+    ): Promise<{ sandboxProviderId: SandboxProviderId; sandboxId: string; state: string; at: number }> {
+      return { sandboxProviderId: "local", sandboxId, state: "running", at: nowMs() };
+    },
+
+    async getSandboxAgentConnection(): Promise<{ endpoint: string; token?: string }> {
+      return { endpoint: "mock://terminal-unavailable" };
+    },
+
+    async getSandboxWorkspaceModelGroups(_organizationId: string, _sandboxProviderId: SandboxProviderId, _sandboxId: string): Promise<WorkspaceModelGroup[]> {
+      return DEFAULT_WORKSPACE_MODEL_GROUPS;
+    },
+
+    async getOrganizationSummary(): Promise<OrganizationSummarySnapshot> {
+      return buildOrganizationSummary();
+    },
+
+    async getTaskDetail(_organizationId: string, _repoId: string, taskId: string): Promise<WorkspaceTaskDetail> {
+      return buildTaskDetail(requireTask(taskId));
+    },
+
+    async getSessionDetail(_organizationId: string, _repoId: string, taskId: string, sessionId: string): Promise<WorkspaceSessionDetail> {
+      return buildSessionDetail(requireTask(taskId), sessionId);
+    },
+
+    async getWorkspace(): Promise<TaskWorkspaceSnapshot> {
+      return workspace.getSnapshot();
+    },
+
+    subscribeWorkspace(_organizationId: string, listener: () => void): () => void {
+      return workspace.subscribe(listener);
+    },
+
+    async createWorkspaceTask(_organizationId: string, input: TaskWorkspaceCreateTaskInput): Promise<TaskWorkspaceCreateTaskResponse> {
+      const created = await workspace.createTask(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(created.taskId);
+      if (created.sessionId) {
+        emitSessionUpdate(created.taskId, created.sessionId);
+      }
+      return created;
+    },
+
+    async markWorkspaceUnread(_organizationId: string, input: TaskWorkspaceSelectInput): Promise<void> {
+      await workspace.markTaskUnread(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+    },
+
+    async renameWorkspaceTask(_organizationId: string, input: TaskWorkspaceRenameInput): Promise<void> {
+      await workspace.renameTask(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+    },
+
+    async createWorkspaceSession(_organizationId: string, input: TaskWorkspaceSelectInput & { model?: string }): Promise<{ sessionId: string }> {
+      const created = await workspace.addSession(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, created.sessionId);
+      return created;
+    },
+
+    async renameWorkspaceSession(_organizationId: string, input: TaskWorkspaceRenameSessionInput): Promise<void> {
+      await workspace.renameSession(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async selectWorkspaceSession(_organizationId: string, input: TaskWorkspaceSessionInput): Promise<void> {
+      await workspace.selectSession(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async setWorkspaceSessionUnread(_organizationId: string, input: TaskWorkspaceSetSessionUnreadInput): Promise<void> {
+      await workspace.setSessionUnread(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async updateWorkspaceDraft(_organizationId: string, input: TaskWorkspaceUpdateDraftInput): Promise<void> {
+      await workspace.updateDraft(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async changeWorkspaceModel(_organizationId: string, input: TaskWorkspaceChangeModelInput): Promise<void> {
+      await workspace.changeModel(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async sendWorkspaceMessage(_organizationId: string, input: TaskWorkspaceSendMessageInput): Promise<void> {
+      await workspace.sendMessage(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async stopWorkspaceSession(_organizationId: string, input: TaskWorkspaceSessionInput): Promise<void> {
+      await workspace.stopAgent(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+      emitSessionUpdate(input.taskId, input.sessionId);
+    },
+
+    async closeWorkspaceSession(_organizationId: string, input: TaskWorkspaceSessionInput): Promise<void> {
+      await workspace.closeSession(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+    },
+
+    async publishWorkspacePr(_organizationId: string, input: TaskWorkspaceSelectInput): Promise<void> {
+      await workspace.publishPr(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+    },
+
+    async changeWorkspaceTaskOwner(
+      _organizationId: string,
+      input: { repoId: string; taskId: string; targetUserId: string; targetUserName: string; targetUserEmail: string },
+    ): Promise<void> {
+      await workspace.changeOwner(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+    },
+
+    async revertWorkspaceFile(_organizationId: string, input: TaskWorkspaceDiffInput): Promise<void> {
+      await workspace.revertFile(input);
+      emitOrganizationSnapshot();
+      emitTaskUpdate(input.taskId);
+    },
+
+    async adminReloadGithubOrganization(): Promise<void> {},
+    async adminReloadGithubRepository(): Promise<void> {},
+
+    async health(): Promise<{ ok: true }> {
+      return { ok: true };
+    },
+
+    async useOrganization(organizationId: string): Promise<{ organizationId: string }> {
+      return { organizationId };
+    },
+
+    async starSandboxAgentRepo(): Promise<StarSandboxAgentRepoResult> {
+      return {
+        repo: "rivet-dev/sandbox-agent",
+        starredAt: nowMs(),
+      };
+    },
+  };
+}
diff --git a/foundry/packages/client/src/mock/latency.ts b/foundry/packages/client/src/mock/latency.ts
new file mode 100644
index 0000000..54d2d58
--- /dev/null
+++ b/foundry/packages/client/src/mock/latency.ts
@@ -0,0 +1,12 @@
+const MOCK_LATENCY_MIN_MS = 1;
+const MOCK_LATENCY_MAX_MS = 200;
+
+export function randomMockLatencyMs(): number {
+  return Math.floor(Math.random() * (MOCK_LATENCY_MAX_MS - MOCK_LATENCY_MIN_MS + 1)) + MOCK_LATENCY_MIN_MS;
+}
+
+export function injectMockLatency(): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, randomMockLatencyMs());
+  });
+}
diff --git a/foundry/packages/client/src/mock/workspace-client.ts b/foundry/packages/client/src/mock/workspace-client.ts
new file mode 100644
index 0000000..7983e0f
--- /dev/null
+++ b/foundry/packages/client/src/mock/workspace-client.ts
@@ -0,0 +1,471 @@
+import {
+  MODEL_GROUPS,
+  buildInitialMockLayoutViewModel,
+  groupWorkspaceRepositories,
+  nowMs,
+  providerAgent,
+  randomReply,
+  removeFileTreePath,
+  slugify,
+  uid,
+} from "../workspace-model.js";
+import { DEFAULT_WORKSPACE_MODEL_ID, workspaceAgentForModel } from "@sandbox-agent/foundry-shared";
+import type {
+  TaskWorkspaceAddSessionResponse,
+  TaskWorkspaceChangeModelInput,
+  TaskWorkspaceCreateTaskInput,
+  TaskWorkspaceCreateTaskResponse,
+  TaskWorkspaceDiffInput,
+  TaskWorkspaceRenameInput,
+  TaskWorkspaceRenameSessionInput,
+  TaskWorkspaceSelectInput,
+  TaskWorkspaceSetSessionUnreadInput,
+  TaskWorkspaceSendMessageInput,
+  TaskWorkspaceSnapshot,
+  TaskWorkspaceSessionInput,
+  TaskWorkspaceUpdateDraftInput,
+  WorkspaceSession as AgentSession,
+  WorkspaceTask as Task,
+  WorkspaceTranscriptEvent as TranscriptEvent,
+} from "@sandbox-agent/foundry-shared";
+import type { TaskWorkspaceClient } from "../workspace-client.js";
+
+function buildTranscriptEvent(params: {
+  sessionId: string;
+  sender: "client" | "agent";
+  createdAt: number;
+  payload: unknown;
+  eventIndex: number;
+}): TranscriptEvent {
+  return {
+    id: uid(),
+    sessionId: params.sessionId,
+    sender: params.sender,
+    createdAt: params.createdAt,
+    payload: params.payload,
+    connectionId: "mock-connection",
+    eventIndex: params.eventIndex,
+  };
+}
+
+class MockWorkspaceStore implements TaskWorkspaceClient {
+  private snapshot = buildInitialMockLayoutViewModel();
+  private listeners = new Set<() => void>();
+  private pendingTimers = new Map<string, ReturnType<typeof setTimeout>>();
+
+  getSnapshot(): TaskWorkspaceSnapshot {
+    return this.snapshot;
+  }
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+
+  async createTask(input: TaskWorkspaceCreateTaskInput): Promise<TaskWorkspaceCreateTaskResponse> {
+    const id = uid();
+    const sessionId = `session-${id}`;
+    const repo = this.snapshot.repos.find((candidate) => candidate.id === input.repoId);
+    if (!repo) {
+      throw new Error(`Cannot create mock task for unknown repo ${input.repoId}`);
+    }
+    const nextTask: Task = {
+      id,
+      repoId: repo.id,
+      title: input.title?.trim() || "New Task",
+      status: "init_enqueue_provision",
+      repoName: repo.label,
+      updatedAtMs: nowMs(),
+      branch: input.branch?.trim() || null,
+      pullRequest: null,
+      activeSessionId: sessionId,
+      sessions: [
+        {
+          id: sessionId,
+          sessionId: sessionId,
+          sessionName: "Session 1",
+          agent: workspaceAgentForModel(input.model ?? DEFAULT_WORKSPACE_MODEL_ID, MODEL_GROUPS),
+          model: input.model ?? DEFAULT_WORKSPACE_MODEL_ID,
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: false,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: [],
+        },
+      ],
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 0,
+    };
+
+    this.updateState((current) => ({
+      ...current,
+      tasks: [nextTask, ...current.tasks],
+    }));
+    return { taskId: id, sessionId };
+  }
+
+  async markTaskUnread(input: TaskWorkspaceSelectInput): Promise<void> {
+    this.updateTask(input.taskId, (task) => {
+      const targetSession = task.sessions[task.sessions.length - 1] ?? null;
+      if (!targetSession) {
+        return task;
+      }
+
+      return {
+        ...task,
+        sessions: task.sessions.map((session) => (session.id === targetSession.id ? { ...session, unread: true } : session)),
+      };
+    });
+  }
+
+  async renameTask(input: TaskWorkspaceRenameInput): Promise<void> {
+    const value = input.value.trim();
+    if (!value) {
+      throw new Error(`Cannot rename task ${input.taskId} to an empty title`);
+    }
+    this.updateTask(input.taskId, (task) => ({ ...task, title: value, updatedAtMs: nowMs() }));
+  }
+
+  async archiveTask(input: TaskWorkspaceSelectInput): Promise<void> {
+    this.updateTask(input.taskId, (task) => ({ ...task, status: "archived", updatedAtMs: nowMs() }));
+  }
+
+  async publishPr(input: TaskWorkspaceSelectInput): Promise<void> {
+    const nextPrNumber = Math.max(0, ...this.snapshot.tasks.map((task) => task.pullRequest?.number ?? 0)) + 1;
+    this.updateTask(input.taskId, (task) => ({
+      ...task,
+      updatedAtMs: nowMs(),
+      pullRequest: {
+        number: nextPrNumber,
+        status: "ready",
+        title: task.title,
+        state: "open",
+        url: `https://example.test/pr/${nextPrNumber}`,
+        headRefName: task.branch ?? `task/${task.id}`,
+        baseRefName: "main",
+        repoFullName: task.repoName,
+        authorLogin: "mock",
+        isDraft: false,
+        updatedAtMs: nowMs(),
+      },
+    }));
+  }
+
+  async revertFile(input: TaskWorkspaceDiffInput): Promise<void> {
+    this.updateTask(input.taskId, (task) => {
+      const file = task.fileChanges.find((entry) => entry.path === input.path);
+      const nextDiffs = { ...task.diffs };
+      delete nextDiffs[input.path];
+
+      return {
+        ...task,
+        fileChanges: task.fileChanges.filter((entry) => entry.path !== input.path),
+        diffs: nextDiffs,
+        fileTree: file?.type === "A" ? removeFileTreePath(task.fileTree, input.path) : task.fileTree,
+      };
+    });
+  }
+
+  async updateDraft(input: TaskWorkspaceUpdateDraftInput): Promise<void> {
+    this.assertSession(input.taskId, input.sessionId);
+    this.updateTask(input.taskId, (task) => ({
+      ...task,
+      updatedAtMs: nowMs(),
+      sessions: task.sessions.map((tab) =>
+        tab.id === input.sessionId
+          ? {
+              ...tab,
+              draft: {
+                text: input.text,
+                attachments: input.attachments,
+                updatedAtMs: nowMs(),
+              },
+            }
+          : tab,
+      ),
+    }));
+  }
+
+  async sendMessage(input: TaskWorkspaceSendMessageInput): Promise<void> {
+    const text = input.text.trim();
+    if (!text) {
+      throw new Error(`Cannot send an empty mock prompt for task ${input.taskId}`);
+    }
+
+    this.assertSession(input.taskId, input.sessionId);
+    const startedAtMs = nowMs();
+
+    this.updateTask(input.taskId, (currentTask) => {
+      const isFirstOnTask = String(currentTask.status).startsWith("init_");
+      const newTitle = isFirstOnTask ? (text.length > 50 ? `${text.slice(0, 47)}...` : text) : currentTask.title;
+      const newBranch = isFirstOnTask ? `feat/${slugify(newTitle)}` : currentTask.branch;
+      const userMessageLines = [text, ...input.attachments.map((attachment) => `@ ${attachment.filePath}:${attachment.lineNumber}`)];
+      const userEvent = buildTranscriptEvent({
+        sessionId: input.sessionId,
+        sender: "client",
+        createdAt: startedAtMs,
+        eventIndex: candidateEventIndex(currentTask, input.sessionId),
+        payload: {
+          method: "session/prompt",
+          params: {
+            prompt: userMessageLines.map((line) => ({ type: "text", text: line })),
+          },
+        },
+      });
+
+      return {
+        ...currentTask,
+        title: newTitle,
+        branch: newBranch,
+        status: "running",
+        updatedAtMs: startedAtMs,
+        sessions: currentTask.sessions.map((candidate) =>
+          candidate.id === input.sessionId
+            ? {
+                ...candidate,
+                created: true,
+                status: "running",
+                unread: false,
+                thinkingSinceMs: startedAtMs,
+                draft: { text: "", attachments: [], updatedAtMs: startedAtMs },
+                transcript: [...candidate.transcript, userEvent],
+              }
+            : candidate,
+        ),
+      };
+    });
+
+    const existingTimer = this.pendingTimers.get(input.sessionId);
+    if (existingTimer) {
+      clearTimeout(existingTimer);
+    }
+
+    const timer = setTimeout(() => {
+      const task = this.requireTask(input.taskId);
+      this.requireSession(task, input.sessionId);
+      const completedAtMs = nowMs();
+      const replyEvent = buildTranscriptEvent({
+        sessionId: input.sessionId,
+        sender: "agent",
+        createdAt: completedAtMs,
+        eventIndex: candidateEventIndex(task, input.sessionId),
+        payload: {
+          result: {
+            text: randomReply(),
+            durationMs: completedAtMs - startedAtMs,
+          },
+        },
+      });
+
+      this.updateTask(input.taskId, (currentTask) => {
+        const updatedTabs = currentTask.sessions.map((candidate) => {
+          if (candidate.id !== input.sessionId) {
+            return candidate;
+          }
+
+          return {
+            ...candidate,
+            status: "idle" as const,
+            thinkingSinceMs: null,
+            unread: true,
+            transcript: [...candidate.transcript, replyEvent],
+          };
+        });
+        const anyRunning = updatedTabs.some((candidate) => candidate.status === "running");
+
+        return {
+          ...currentTask,
+          updatedAtMs: completedAtMs,
+          sessions: updatedTabs,
+          status: currentTask.status === "archived" ? "archived" : anyRunning ? "running" : "idle",
+        };
+      });
+
+      this.pendingTimers.delete(input.sessionId);
+    }, 2_500);
+
+    this.pendingTimers.set(input.sessionId, timer);
+  }
+
+  async stopAgent(input: TaskWorkspaceSessionInput): Promise<void> {
+    this.assertSession(input.taskId, input.sessionId);
+    const existing = this.pendingTimers.get(input.sessionId);
+    if (existing) {
+      clearTimeout(existing);
+      this.pendingTimers.delete(input.sessionId);
+    }
+
+    this.updateTask(input.taskId, (currentTask) => {
+      const updatedTabs = currentTask.sessions.map((candidate) =>
+        candidate.id === input.sessionId ? { ...candidate, status: "idle" as const, thinkingSinceMs: null } : candidate,
+      );
+      const anyRunning = updatedTabs.some((candidate) => candidate.status === "running");
+
+      return {
+        ...currentTask,
+        updatedAtMs: nowMs(),
+        sessions: updatedTabs,
+        status: currentTask.status === "archived" ? "archived" : anyRunning ? "running" : "idle",
+      };
+    });
+  }
+
+  async selectSession(input: TaskWorkspaceSessionInput): Promise<void> {
+    this.assertSession(input.taskId, input.sessionId);
+    this.updateTask(input.taskId, (currentTask) => ({
+      ...currentTask,
+      activeSessionId: input.sessionId,
+    }));
+  }
+
+  async setSessionUnread(input: TaskWorkspaceSetSessionUnreadInput): Promise<void> {
+    this.updateTask(input.taskId, (currentTask) => ({
+      ...currentTask,
+      sessions: currentTask.sessions.map((candidate) => (candidate.id === input.sessionId ? { ...candidate, unread: input.unread } : candidate)),
+    }));
+  }
+
+  async renameSession(input: TaskWorkspaceRenameSessionInput): Promise<void> {
+    const title = input.title.trim();
+    if (!title) {
+      throw new Error(`Cannot rename session ${input.sessionId} to an empty title`);
+    }
+    this.updateTask(input.taskId, (currentTask) => ({
+      ...currentTask,
+      sessions: currentTask.sessions.map((candidate) => (candidate.id === input.sessionId ? { ...candidate, sessionName: title } : candidate)),
+    }));
+  }
+
+  async closeSession(input: TaskWorkspaceSessionInput): Promise<void> {
+    this.updateTask(input.taskId, (currentTask) => {
+      if (currentTask.sessions.length <= 1) {
+        return currentTask;
+      }
+
+      return {
+        ...currentTask,
+        activeSessionId:
+          currentTask.activeSessionId === input.sessionId
+            ? (currentTask.sessions.find((candidate) => candidate.id !== input.sessionId)?.id ?? null)
+            : currentTask.activeSessionId,
+        sessions: currentTask.sessions.filter((candidate) => candidate.id !== input.sessionId),
+      };
+    });
+  }
+
+  async addSession(input: TaskWorkspaceSelectInput): Promise<TaskWorkspaceAddSessionResponse> {
+    this.assertTask(input.taskId);
+    const nextSessionId = uid();
+    const nextSession: AgentSession = {
+      id: nextSessionId,
+      sessionId: nextSessionId,
+      sandboxSessionId: null,
+      sessionName: `Session ${this.requireTask(input.taskId).sessions.length + 1}`,
+      agent: workspaceAgentForModel(DEFAULT_WORKSPACE_MODEL_ID, MODEL_GROUPS),
+      model: DEFAULT_WORKSPACE_MODEL_ID,
+      status: "idle",
+      thinkingSinceMs: null,
+      unread: false,
+      created: false,
+      draft: { text: "", attachments: [], updatedAtMs: null },
+      transcript: [],
+    };
+
+    this.updateTask(input.taskId, (currentTask) => ({
+      ...currentTask,
+      updatedAtMs: nowMs(),
+      activeSessionId: nextSession.id,
+      sessions: [...currentTask.sessions, nextSession],
+    }));
+    return { sessionId: nextSession.id };
+  }
+
+  async changeModel(input: TaskWorkspaceChangeModelInput): Promise<void> {
+    const group = MODEL_GROUPS.find((candidate) => candidate.models.some((entry) => entry.id === input.model));
+    if (!group) {
+      throw new Error(`Unable to resolve model provider for ${input.model}`);
+    }
+
+    this.updateTask(input.taskId, (currentTask) => ({
+      ...currentTask,
+      sessions: currentTask.sessions.map((candidate) =>
+        candidate.id === input.sessionId ? { ...candidate, model: input.model, agent: workspaceAgentForModel(input.model, MODEL_GROUPS) } : candidate,
+      ),
+    }));
+  }
+
+  async changeOwner(input: { repoId: string; taskId: string; targetUserId: string; targetUserName: string; targetUserEmail: string }): Promise<void> {
+    this.updateTask(input.taskId, (currentTask) => ({
+      ...currentTask,
+      primaryUserLogin: input.targetUserName,
+      primaryUserAvatarUrl: null,
+    }));
+  }
+
+  private updateState(updater: (current: TaskWorkspaceSnapshot) => TaskWorkspaceSnapshot): void {
+    const nextSnapshot = updater(this.snapshot);
+    this.snapshot = {
+      ...nextSnapshot,
+      repositories: groupWorkspaceRepositories(nextSnapshot.repos, nextSnapshot.tasks),
+    };
+    this.notify();
+  }
+
+  private updateTask(taskId: string, updater: (task: Task) => Task): void {
+    this.assertTask(taskId);
+    this.updateState((current) => ({
+      ...current,
+      tasks: current.tasks.map((task) => (task.id === taskId ? updater(task) : task)),
+    }));
+  }
+
+  private notify(): void {
+    for (const listener of this.listeners) {
+      listener();
+    }
+  }
+
+  private assertTask(taskId: string): void {
+    this.requireTask(taskId);
+  }
+
+  private assertSession(taskId: string, sessionId: string): void {
+    const task = this.requireTask(taskId);
+    this.requireSession(task, sessionId);
+  }
+
+  private requireTask(taskId: string): Task {
+    const task = this.snapshot.tasks.find((candidate) => candidate.id === taskId);
+    if (!task) {
+      throw new Error(`Unable to find mock task ${taskId}`);
+    }
+    return task;
+  }
+
+  private requireSession(task: Task, sessionId: string): AgentSession {
+    const session = task.sessions.find((candidate) => candidate.id === sessionId);
+    if (!session) {
+      throw new Error(`Unable to find mock session ${sessionId} in task ${task.id}`);
+    }
+    return session;
+  }
+}
+
+function candidateEventIndex(task: Task, sessionId: string): number {
+  const session = task.sessions.find((candidate) => candidate.id === sessionId);
+  return (session?.transcript.length ?? 0) + 1;
+}
+
+let sharedMockWorkspaceClient: TaskWorkspaceClient | null = null;
+
+export function getSharedMockWorkspaceClient(): TaskWorkspaceClient {
+  if (!sharedMockWorkspaceClient) {
+    sharedMockWorkspaceClient = new MockWorkspaceStore();
+  }
+  return sharedMockWorkspaceClient;
+}
diff --git a/foundry/packages/client/src/remote/app-client.ts b/foundry/packages/client/src/remote/app-client.ts
new file mode 100644
index 0000000..f1cb908
--- /dev/null
+++ b/foundry/packages/client/src/remote/app-client.ts
@@ -0,0 +1,151 @@
+import type { FoundryAppSnapshot, FoundryBillingPlanId, UpdateFoundryOrganizationProfileInput, WorkspaceModelId } from "@sandbox-agent/foundry-shared";
+import type { BackendClient } from "../backend-client.js";
+import type { FoundryAppClient } from "../app-client.js";
+
+export interface RemoteFoundryAppClientOptions {
+  backend: BackendClient;
+}
+
+class RemoteFoundryAppStore implements FoundryAppClient {
+  private readonly backend: BackendClient;
+  private snapshot: FoundryAppSnapshot = {
+    auth: { status: "signed_out", currentUserId: null },
+    activeOrganizationId: null,
+    onboarding: {
+      starterRepo: {
+        repoFullName: "rivet-dev/sandbox-agent",
+        repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+        status: "pending",
+        starredAt: null,
+        skippedAt: null,
+      },
+    },
+    users: [],
+    organizations: [],
+  };
+  private readonly listeners = new Set<() => void>();
+  private refreshPromise: Promise<void> | null = null;
+  private unsubscribeApp: (() => void) | null = null;
+
+  constructor(options: RemoteFoundryAppClientOptions) {
+    this.backend = options.backend;
+  }
+
+  getSnapshot(): FoundryAppSnapshot {
+    return this.snapshot;
+  }
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    this.ensureStarted();
+    return () => {
+      this.listeners.delete(listener);
+      if (this.listeners.size === 0 && this.unsubscribeApp) {
+        this.unsubscribeApp();
+        this.unsubscribeApp = null;
+      }
+    };
+  }
+
+  async signInWithGithub(userId?: string): Promise<void> {
+    void userId;
+    await this.backend.signInWithGithub();
+  }
+
+  async signOut(): Promise<void> {
+    this.snapshot = await this.backend.signOutApp();
+    this.notify();
+  }
+
+  async skipStarterRepo(): Promise<void> {
+    this.snapshot = await this.backend.skipAppStarterRepo();
+    this.notify();
+  }
+
+  async starStarterRepo(organizationId: string): Promise<void> {
+    this.snapshot = await this.backend.starAppStarterRepo(organizationId);
+    this.notify();
+  }
+
+  async selectOrganization(organizationId: string): Promise<void> {
+    this.snapshot = await this.backend.selectAppOrganization(organizationId);
+    this.notify();
+  }
+
+  async setDefaultModel(model: WorkspaceModelId): Promise<void> {
+    this.snapshot = await this.backend.setAppDefaultModel(model);
+    this.notify();
+  }
+
+  async updateOrganizationProfile(input: UpdateFoundryOrganizationProfileInput): Promise<void> {
+    this.snapshot = await this.backend.updateAppOrganizationProfile(input);
+    this.notify();
+  }
+
+  async triggerGithubSync(organizationId: string): Promise<void> {
+    this.snapshot = await this.backend.triggerAppRepoImport(organizationId);
+    this.notify();
+  }
+
+  async completeHostedCheckout(organizationId: string, planId: FoundryBillingPlanId): Promise<void> {
+    await this.backend.completeAppHostedCheckout(organizationId, planId);
+  }
+
+  async openBillingPortal(organizationId: string): Promise<void> {
+    await this.backend.openAppBillingPortal(organizationId);
+  }
+
+  async cancelScheduledRenewal(organizationId: string): Promise<void> {
+    this.snapshot = await this.backend.cancelAppScheduledRenewal(organizationId);
+    this.notify();
+  }
+
+  async resumeSubscription(organizationId: string): Promise<void> {
+    this.snapshot = await this.backend.resumeAppSubscription(organizationId);
+    this.notify();
+  }
+
+  async reconnectGithub(organizationId: string): Promise<void> {
+    await this.backend.reconnectAppGithub(organizationId);
+  }
+
+  async recordSeatUsage(organizationId: string): Promise<void> {
+    this.snapshot = await this.backend.recordAppSeatUsage(organizationId);
+    this.notify();
+  }
+
+  private ensureStarted(): void {
+    if (!this.unsubscribeApp) {
+      this.unsubscribeApp = this.backend.subscribeApp(() => {
+        void this.refresh();
+      });
+    }
+    void this.refresh();
+  }
+
+  private async refresh(): Promise<void> {
+    if (this.refreshPromise) {
+      await this.refreshPromise;
+      return;
+    }
+
+    this.refreshPromise = (async () => {
+      this.snapshot = await this.backend.getAppSnapshot();
+      this.notify();
+    })().finally(() => {
+      this.refreshPromise = null;
+    });
+
+    await this.refreshPromise;
+  }
+
+  private notify(): void {
+    for (const listener of [...this.listeners]) {
+      listener();
+    }
+  }
+}
+
+export function createRemoteFoundryAppClient(options: RemoteFoundryAppClientOptions): FoundryAppClient {
+  return new RemoteFoundryAppStore(options);
+}
diff --git a/foundry/packages/client/src/remote/workspace-client.ts b/foundry/packages/client/src/remote/workspace-client.ts
new file mode 100644
index 0000000..2a11f51
--- /dev/null
+++ b/foundry/packages/client/src/remote/workspace-client.ts
@@ -0,0 +1,204 @@
+import type {
+  TaskWorkspaceAddSessionResponse,
+  TaskWorkspaceChangeModelInput,
+  TaskWorkspaceChangeOwnerInput,
+  TaskWorkspaceCreateTaskInput,
+  TaskWorkspaceCreateTaskResponse,
+  TaskWorkspaceDiffInput,
+  TaskWorkspaceRenameInput,
+  TaskWorkspaceRenameSessionInput,
+  TaskWorkspaceSelectInput,
+  TaskWorkspaceSetSessionUnreadInput,
+  TaskWorkspaceSendMessageInput,
+  TaskWorkspaceSnapshot,
+  TaskWorkspaceSessionInput,
+  TaskWorkspaceUpdateDraftInput,
+} from "@sandbox-agent/foundry-shared";
+import type { BackendClient } from "../backend-client.js";
+import { groupWorkspaceRepositories } from "../workspace-model.js";
+import type { TaskWorkspaceClient } from "../workspace-client.js";
+
+export interface RemoteWorkspaceClientOptions {
+  backend: BackendClient;
+  organizationId: string;
+}
+
+class RemoteWorkspaceStore implements TaskWorkspaceClient {
+  private readonly backend: BackendClient;
+  private readonly organizationId: string;
+  private snapshot: TaskWorkspaceSnapshot;
+  private readonly listeners = new Set<() => void>();
+  private unsubscribeWorkspace: (() => void) | null = null;
+  private refreshPromise: Promise<void> | null = null;
+  private refreshRetryTimeout: ReturnType<typeof setTimeout> | null = null;
+
+  constructor(options: RemoteWorkspaceClientOptions) {
+    this.backend = options.backend;
+    this.organizationId = options.organizationId;
+    this.snapshot = {
+      organizationId: options.organizationId,
+      repos: [],
+      repositories: [],
+      tasks: [],
+    };
+  }
+
+  getSnapshot(): TaskWorkspaceSnapshot {
+    return this.snapshot;
+  }
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    this.ensureStarted();
+    return () => {
+      this.listeners.delete(listener);
+      if (this.listeners.size === 0 && this.refreshRetryTimeout) {
+        clearTimeout(this.refreshRetryTimeout);
+        this.refreshRetryTimeout = null;
+      }
+      if (this.listeners.size === 0 && this.unsubscribeWorkspace) {
+        this.unsubscribeWorkspace();
+        this.unsubscribeWorkspace = null;
+      }
+    };
+  }
+
+  async createTask(input: TaskWorkspaceCreateTaskInput): Promise<TaskWorkspaceCreateTaskResponse> {
+    const created = await this.backend.createWorkspaceTask(this.organizationId, input);
+    await this.refresh();
+    return created;
+  }
+
+  async markTaskUnread(input: TaskWorkspaceSelectInput): Promise<void> {
+    await this.backend.markWorkspaceUnread(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async renameTask(input: TaskWorkspaceRenameInput): Promise<void> {
+    await this.backend.renameWorkspaceTask(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async archiveTask(input: TaskWorkspaceSelectInput): Promise<void> {
+    await this.backend.runAction(this.organizationId, input.repoId, input.taskId, "archive");
+    await this.refresh();
+  }
+
+  async publishPr(input: TaskWorkspaceSelectInput): Promise<void> {
+    await this.backend.publishWorkspacePr(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async revertFile(input: TaskWorkspaceDiffInput): Promise<void> {
+    await this.backend.revertWorkspaceFile(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async updateDraft(input: TaskWorkspaceUpdateDraftInput): Promise<void> {
+    await this.backend.updateWorkspaceDraft(this.organizationId, input);
+    // Skip refresh — the server broadcast will trigger it, and the frontend
+    // holds local draft state to avoid the round-trip overwriting user input.
+  }
+
+  async sendMessage(input: TaskWorkspaceSendMessageInput): Promise<void> {
+    await this.backend.sendWorkspaceMessage(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async stopAgent(input: TaskWorkspaceSessionInput): Promise<void> {
+    await this.backend.stopWorkspaceSession(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async selectSession(input: TaskWorkspaceSessionInput): Promise<void> {
+    await this.backend.selectWorkspaceSession(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async setSessionUnread(input: TaskWorkspaceSetSessionUnreadInput): Promise<void> {
+    await this.backend.setWorkspaceSessionUnread(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async renameSession(input: TaskWorkspaceRenameSessionInput): Promise<void> {
+    await this.backend.renameWorkspaceSession(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async closeSession(input: TaskWorkspaceSessionInput): Promise<void> {
+    await this.backend.closeWorkspaceSession(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async addSession(input: TaskWorkspaceSelectInput): Promise<TaskWorkspaceAddSessionResponse> {
+    const created = await this.backend.createWorkspaceSession(this.organizationId, input);
+    await this.refresh();
+    return created;
+  }
+
+  async changeModel(input: TaskWorkspaceChangeModelInput): Promise<void> {
+    await this.backend.changeWorkspaceModel(this.organizationId, input);
+    await this.refresh();
+  }
+
+  async changeOwner(input: TaskWorkspaceChangeOwnerInput): Promise<void> {
+    await this.backend.changeWorkspaceTaskOwner(this.organizationId, input);
+    await this.refresh();
+  }
+
+  private ensureStarted(): void {
+    if (!this.unsubscribeWorkspace) {
+      this.unsubscribeWorkspace = this.backend.subscribeWorkspace(this.organizationId, () => {
+        void this.refresh().catch(() => {
+          this.scheduleRefreshRetry();
+        });
+      });
+    }
+    void this.refresh().catch(() => {
+      this.scheduleRefreshRetry();
+    });
+  }
+
+  private scheduleRefreshRetry(): void {
+    if (this.refreshRetryTimeout || this.listeners.size === 0) {
+      return;
+    }
+
+    this.refreshRetryTimeout = setTimeout(() => {
+      this.refreshRetryTimeout = null;
+      void this.refresh().catch(() => {
+        this.scheduleRefreshRetry();
+      });
+    }, 1_000);
+  }
+
+  private async refresh(): Promise<void> {
+    if (this.refreshPromise) {
+      await this.refreshPromise;
+      return;
+    }
+
+    this.refreshPromise = (async () => {
+      const nextSnapshot = await this.backend.getWorkspace(this.organizationId);
+      if (this.refreshRetryTimeout) {
+        clearTimeout(this.refreshRetryTimeout);
+        this.refreshRetryTimeout = null;
+      }
+      this.snapshot = {
+        ...nextSnapshot,
+        repositories: nextSnapshot.repositories ?? groupWorkspaceRepositories(nextSnapshot.repos, nextSnapshot.tasks),
+      };
+      for (const listener of [...this.listeners]) {
+        listener();
+      }
+    })().finally(() => {
+      this.refreshPromise = null;
+    });
+
+    await this.refreshPromise;
+  }
+}
+
+export function createRemoteWorkspaceClient(options: RemoteWorkspaceClientOptions): TaskWorkspaceClient {
+  return new RemoteWorkspaceStore(options);
+}
diff --git a/foundry/packages/client/src/subscription/manager.ts b/foundry/packages/client/src/subscription/manager.ts
new file mode 100644
index 0000000..b9bee0b
--- /dev/null
+++ b/foundry/packages/client/src/subscription/manager.ts
@@ -0,0 +1,33 @@
+import type { TopicData, TopicKey, TopicParams } from "./topics.js";
+
+export type TopicStatus = "loading" | "connected" | "error";
+
+export interface DebugSubscriptionTopic {
+  topicKey: TopicKey;
+  cacheKey: string;
+  listenerCount: number;
+  status: TopicStatus;
+  lastRefreshAt: number | null;
+}
+
+export interface TopicState<K extends TopicKey> {
+  data: TopicData<K> | undefined;
+  status: TopicStatus;
+  error: Error | null;
+}
+
+/**
+ * The SubscriptionManager owns all realtime actor connections and cached state.
+ *
+ * Multiple subscribers to the same topic share one connection and one cache
+ * entry. After the last subscriber leaves, a short grace period keeps the
+ * connection warm so navigation does not thrash actor connections.
+ */
+export interface SubscriptionManager {
+  subscribe<K extends TopicKey>(topicKey: K, params: TopicParams<K>, listener: () => void): () => void;
+  getSnapshot<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicData<K> | undefined;
+  getStatus<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicStatus;
+  getError<K extends TopicKey>(topicKey: K, params: TopicParams<K>): Error | null;
+  listDebugTopics(): DebugSubscriptionTopic[];
+  dispose(): void;
+}
diff --git a/foundry/packages/client/src/subscription/mock-manager.ts b/foundry/packages/client/src/subscription/mock-manager.ts
new file mode 100644
index 0000000..bcdb389
--- /dev/null
+++ b/foundry/packages/client/src/subscription/mock-manager.ts
@@ -0,0 +1,12 @@
+import { createMockBackendClient } from "../mock/backend-client.js";
+import { RemoteSubscriptionManager } from "./remote-manager.js";
+
+/**
+ * Mock implementation shares the same subscription-manager harness as the remote
+ * path, but uses the in-memory mock backend that synthesizes actor events.
+ */
+export class MockSubscriptionManager extends RemoteSubscriptionManager {
+  constructor() {
+    super(createMockBackendClient());
+  }
+}
diff --git a/foundry/packages/client/src/subscription/remote-manager.ts b/foundry/packages/client/src/subscription/remote-manager.ts
new file mode 100644
index 0000000..ae774c6
--- /dev/null
+++ b/foundry/packages/client/src/subscription/remote-manager.ts
@@ -0,0 +1,275 @@
+import type { BackendClient } from "../backend-client.js";
+import type { DebugSubscriptionTopic, SubscriptionManager, TopicStatus } from "./manager.js";
+import { topicDefinitions, type TopicData, type TopicDefinition, type TopicKey, type TopicParams } from "./topics.js";
+
+const GRACE_PERIOD_MS = 30_000;
+
+/** Initial retry delay in ms. */
+const RETRY_BASE_MS = 1_000;
+/** Maximum retry delay in ms. */
+const RETRY_MAX_MS = 30_000;
+
+/**
+ * Remote implementation of SubscriptionManager.
+ * Each cache entry owns one actor connection plus one materialized snapshot.
+ */
+export class RemoteSubscriptionManager implements SubscriptionManager {
+  private entries = new Map<string, TopicEntry<any, any, any>>();
+
+  constructor(private readonly backend: BackendClient) {}
+
+  subscribe<K extends TopicKey>(topicKey: K, params: TopicParams<K>, listener: () => void): () => void {
+    const definition = topicDefinitions[topicKey] as unknown as TopicDefinition<any, any, any>;
+    const cacheKey = definition.key(params as any);
+    let entry = this.entries.get(cacheKey);
+
+    if (!entry) {
+      entry = new TopicEntry(topicKey, cacheKey, definition, this.backend, params as any);
+      this.entries.set(cacheKey, entry);
+    }
+
+    entry.cancelTeardown();
+    entry.addListener(listener);
+    entry.ensureStarted();
+
+    return () => {
+      const current = this.entries.get(cacheKey);
+      if (!current) {
+        return;
+      }
+      current.removeListener(listener);
+      if (current.listenerCount === 0) {
+        current.scheduleTeardown(GRACE_PERIOD_MS, () => {
+          this.entries.delete(cacheKey);
+        });
+      }
+    };
+  }
+
+  getSnapshot<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicData<K> | undefined {
+    return this.entries.get((topicDefinitions[topicKey] as any).key(params))?.data as TopicData<K> | undefined;
+  }
+
+  getStatus<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicStatus {
+    return this.entries.get((topicDefinitions[topicKey] as any).key(params))?.status ?? "loading";
+  }
+
+  getError<K extends TopicKey>(topicKey: K, params: TopicParams<K>): Error | null {
+    return this.entries.get((topicDefinitions[topicKey] as any).key(params))?.error ?? null;
+  }
+
+  listDebugTopics(): DebugSubscriptionTopic[] {
+    return [...this.entries.values()]
+      .filter((entry) => entry.listenerCount > 0)
+      .map((entry) => entry.getDebugTopic())
+      .sort((left, right) => left.cacheKey.localeCompare(right.cacheKey));
+  }
+
+  dispose(): void {
+    for (const entry of this.entries.values()) {
+      entry.dispose();
+    }
+    this.entries.clear();
+  }
+}
+
+class TopicEntry<TData, TParams, TEvent> {
+  data: TData | undefined;
+  status: TopicStatus = "loading";
+  error: Error | null = null;
+  listenerCount = 0;
+  lastRefreshAt: number | null = null;
+
+  private readonly listeners = new Set<() => void>();
+  private conn: Awaited<ReturnType<TopicDefinition<TData, TParams, TEvent>["connect"]>> | null = null;
+  private unsubscribeEvent: (() => void) | null = null;
+  private unsubscribeError: (() => void) | null = null;
+  private teardownTimer: ReturnType<typeof setTimeout> | null = null;
+  private retryTimer: ReturnType<typeof setTimeout> | null = null;
+  private retryAttempt = 0;
+  private startPromise: Promise<void> | null = null;
+  private eventPromise: Promise<void> = Promise.resolve();
+  private started = false;
+  private disposed = false;
+
+  constructor(
+    private readonly topicKey: TopicKey,
+    private readonly cacheKey: string,
+    private readonly definition: TopicDefinition<TData, TParams, TEvent>,
+    private readonly backend: BackendClient,
+    private readonly params: TParams,
+  ) {}
+
+  getDebugTopic(): DebugSubscriptionTopic {
+    return {
+      topicKey: this.topicKey,
+      cacheKey: this.cacheKey,
+      listenerCount: this.listenerCount,
+      status: this.status,
+      lastRefreshAt: this.lastRefreshAt,
+    };
+  }
+
+  addListener(listener: () => void): void {
+    this.listeners.add(listener);
+    this.listenerCount = this.listeners.size;
+  }
+
+  removeListener(listener: () => void): void {
+    this.listeners.delete(listener);
+    this.listenerCount = this.listeners.size;
+  }
+
+  ensureStarted(): void {
+    if (this.started || this.startPromise) {
+      return;
+    }
+    this.startPromise = this.start().finally(() => {
+      this.startPromise = null;
+    });
+  }
+
+  scheduleTeardown(ms: number, onTeardown: () => void): void {
+    this.teardownTimer = setTimeout(() => {
+      this.dispose();
+      onTeardown();
+    }, ms);
+  }
+
+  cancelTeardown(): void {
+    if (this.teardownTimer) {
+      clearTimeout(this.teardownTimer);
+      this.teardownTimer = null;
+    }
+  }
+
+  dispose(): void {
+    this.disposed = true;
+    this.cancelTeardown();
+    this.cancelRetry();
+    this.unsubscribeEvent?.();
+    this.unsubscribeError?.();
+    if (this.conn) {
+      void this.conn.dispose();
+    }
+    this.conn = null;
+    this.data = undefined;
+    this.status = "loading";
+    this.error = null;
+    this.lastRefreshAt = null;
+    this.started = false;
+    this.retryAttempt = 0;
+  }
+
+  private cancelRetry(): void {
+    if (this.retryTimer) {
+      clearTimeout(this.retryTimer);
+      this.retryTimer = null;
+    }
+  }
+
+  /**
+   * Schedules a retry with exponential backoff. Cleans up any existing
+   * connection state before reconnecting.
+   */
+  private scheduleRetry(): void {
+    if (this.disposed || this.listenerCount === 0) {
+      return;
+    }
+
+    const delay = Math.min(RETRY_BASE_MS * 2 ** this.retryAttempt, RETRY_MAX_MS);
+    this.retryAttempt++;
+
+    this.retryTimer = setTimeout(() => {
+      this.retryTimer = null;
+      if (this.disposed || this.listenerCount === 0) {
+        return;
+      }
+
+      // Tear down the old connection before retrying
+      this.cleanupConnection();
+      this.started = false;
+      this.startPromise = this.start().finally(() => {
+        this.startPromise = null;
+      });
+    }, delay);
+  }
+
+  /**
+   * Cleans up connection resources without resetting data/status/retry state.
+   */
+  private cleanupConnection(): void {
+    this.unsubscribeEvent?.();
+    this.unsubscribeError?.();
+    this.unsubscribeEvent = null;
+    this.unsubscribeError = null;
+    if (this.conn) {
+      void this.conn.dispose();
+    }
+    this.conn = null;
+  }
+
+  private async start(): Promise<void> {
+    this.status = "loading";
+    this.error = null;
+    this.notify();
+
+    try {
+      this.conn = await this.definition.connect(this.backend, this.params);
+      this.unsubscribeEvent = this.conn.on(this.definition.event, (event: TEvent) => {
+        void this.applyEvent(event);
+      });
+      this.unsubscribeError = this.conn.onError((error: unknown) => {
+        this.status = "error";
+        this.error = error instanceof Error ? error : new Error(String(error));
+        this.notify();
+        this.scheduleRetry();
+      });
+      this.data = await this.definition.fetchInitial(this.backend, this.params);
+      this.status = "connected";
+      this.lastRefreshAt = Date.now();
+      this.started = true;
+      this.retryAttempt = 0;
+      this.notify();
+    } catch (error) {
+      this.status = "error";
+      this.error = error instanceof Error ? error : new Error(String(error));
+      this.started = false;
+      this.notify();
+      this.scheduleRetry();
+    }
+  }
+
+  private applyEvent(event: TEvent): Promise<void> {
+    this.eventPromise = this.eventPromise
+      .then(async () => {
+        if (!this.started || this.data === undefined) {
+          return;
+        }
+
+        const nextData = await this.definition.applyEvent(this.backend, this.params, this.data, event);
+        if (!this.started) {
+          return;
+        }
+
+        this.data = nextData;
+        this.status = "connected";
+        this.error = null;
+        this.lastRefreshAt = Date.now();
+        this.notify();
+      })
+      .catch((error) => {
+        this.status = "error";
+        this.error = error instanceof Error ? error : new Error(String(error));
+        this.notify();
+      });
+
+    return this.eventPromise;
+  }
+
+  private notify(): void {
+    for (const listener of [...this.listeners]) {
+      listener();
+    }
+  }
+}
diff --git a/foundry/packages/client/src/subscription/topics.ts b/foundry/packages/client/src/subscription/topics.ts
new file mode 100644
index 0000000..bbda118
--- /dev/null
+++ b/foundry/packages/client/src/subscription/topics.ts
@@ -0,0 +1,106 @@
+import type {
+  AppEvent,
+  FoundryAppSnapshot,
+  SandboxProviderId,
+  SandboxProcessesEvent,
+  SessionEvent,
+  TaskEvent,
+  WorkspaceSessionDetail,
+  WorkspaceTaskDetail,
+  OrganizationEvent,
+  OrganizationSummarySnapshot,
+} from "@sandbox-agent/foundry-shared";
+import type { ActorConn, BackendClient, SandboxProcessRecord } from "../backend-client.js";
+
+/**
+ * Topic definitions for the subscription manager.
+ *
+ * Each topic describes one actor connection plus one materialized read model.
+ * Some topics can apply broadcast payloads directly, while others refetch
+ * through BackendClient so auth-scoped state stays user-specific.
+ */
+export interface TopicDefinition<TData, TParams, TEvent> {
+  key: (params: TParams) => string;
+  event: string;
+  connect: (backend: BackendClient, params: TParams) => Promise<ActorConn>;
+  fetchInitial: (backend: BackendClient, params: TParams) => Promise<TData>;
+  applyEvent: (backend: BackendClient, params: TParams, current: TData, event: TEvent) => Promise<TData> | TData;
+}
+
+export interface AppTopicParams {}
+export interface OrganizationTopicParams {
+  organizationId: string;
+}
+export interface TaskTopicParams {
+  organizationId: string;
+  repoId: string;
+  taskId: string;
+}
+export interface SessionTopicParams {
+  organizationId: string;
+  repoId: string;
+  taskId: string;
+  sessionId: string;
+}
+export interface SandboxProcessesTopicParams {
+  organizationId: string;
+  sandboxProviderId: SandboxProviderId;
+  sandboxId: string;
+}
+
+export const topicDefinitions = {
+  app: {
+    key: () => "app",
+    event: "appUpdated",
+    connect: (backend: BackendClient, _params: AppTopicParams) => backend.connectOrganization("app"),
+    fetchInitial: (backend: BackendClient, _params: AppTopicParams) => backend.getAppSnapshot(),
+    applyEvent: (_backend: BackendClient, _params: AppTopicParams, _current: FoundryAppSnapshot, event: AppEvent) => event.snapshot,
+  } satisfies TopicDefinition<FoundryAppSnapshot, AppTopicParams, AppEvent>,
+
+  organization: {
+    key: (params: OrganizationTopicParams) => `organization:${params.organizationId}`,
+    event: "organizationUpdated",
+    connect: (backend: BackendClient, params: OrganizationTopicParams) => backend.connectOrganization(params.organizationId),
+    fetchInitial: (backend: BackendClient, params: OrganizationTopicParams) => backend.getOrganizationSummary(params.organizationId),
+    applyEvent: (_backend: BackendClient, _params: OrganizationTopicParams, _current: OrganizationSummarySnapshot, event: OrganizationEvent) =>
+      event.snapshot,
+  } satisfies TopicDefinition<OrganizationSummarySnapshot, OrganizationTopicParams, OrganizationEvent>,
+
+  task: {
+    key: (params: TaskTopicParams) => `task:${params.organizationId}:${params.taskId}`,
+    event: "taskUpdated",
+    connect: (backend: BackendClient, params: TaskTopicParams) => backend.connectTask(params.organizationId, params.repoId, params.taskId),
+    fetchInitial: (backend: BackendClient, params: TaskTopicParams) => backend.getTaskDetail(params.organizationId, params.repoId, params.taskId),
+    applyEvent: (backend: BackendClient, params: TaskTopicParams, _current: WorkspaceTaskDetail, _event: TaskEvent) =>
+      backend.getTaskDetail(params.organizationId, params.repoId, params.taskId),
+  } satisfies TopicDefinition<WorkspaceTaskDetail, TaskTopicParams, TaskEvent>,
+
+  session: {
+    key: (params: SessionTopicParams) => `session:${params.organizationId}:${params.taskId}:${params.sessionId}`,
+    event: "sessionUpdated",
+    connect: (backend: BackendClient, params: SessionTopicParams) => backend.connectTask(params.organizationId, params.repoId, params.taskId),
+    fetchInitial: (backend: BackendClient, params: SessionTopicParams) =>
+      backend.getSessionDetail(params.organizationId, params.repoId, params.taskId, params.sessionId),
+    applyEvent: async (backend: BackendClient, params: SessionTopicParams, current: WorkspaceSessionDetail, event: SessionEvent) => {
+      if (event.session.sessionId !== params.sessionId) {
+        return current;
+      }
+      return await backend.getSessionDetail(params.organizationId, params.repoId, params.taskId, params.sessionId);
+    },
+  } satisfies TopicDefinition<WorkspaceSessionDetail, SessionTopicParams, SessionEvent>,
+
+  sandboxProcesses: {
+    key: (params: SandboxProcessesTopicParams) => `sandbox:${params.organizationId}:${params.sandboxProviderId}:${params.sandboxId}`,
+    event: "processesUpdated",
+    connect: (backend: BackendClient, params: SandboxProcessesTopicParams) =>
+      backend.connectSandbox(params.organizationId, params.sandboxProviderId, params.sandboxId),
+    fetchInitial: async (backend: BackendClient, params: SandboxProcessesTopicParams) =>
+      (await backend.listSandboxProcesses(params.organizationId, params.sandboxProviderId, params.sandboxId)).processes,
+    applyEvent: (_backend: BackendClient, _params: SandboxProcessesTopicParams, _current: SandboxProcessRecord[], event: SandboxProcessesEvent) =>
+      event.processes,
+  } satisfies TopicDefinition<SandboxProcessRecord[], SandboxProcessesTopicParams, SandboxProcessesEvent>,
+} as const;
+
+export type TopicKey = keyof typeof topicDefinitions;
+export type TopicParams<K extends TopicKey> = Parameters<(typeof topicDefinitions)[K]["fetchInitial"]>[1];
+export type TopicData<K extends TopicKey> = Awaited<ReturnType<(typeof topicDefinitions)[K]["fetchInitial"]>>;
diff --git a/foundry/packages/client/src/subscription/use-subscription.ts b/foundry/packages/client/src/subscription/use-subscription.ts
new file mode 100644
index 0000000..c83148a
--- /dev/null
+++ b/foundry/packages/client/src/subscription/use-subscription.ts
@@ -0,0 +1,56 @@
+import { useMemo, useRef, useSyncExternalStore } from "react";
+import type { SubscriptionManager, TopicState } from "./manager.js";
+import { topicDefinitions, type TopicKey, type TopicParams } from "./topics.js";
+
+/**
+ * React bridge for the subscription manager.
+ *
+ * `null` params disable the subscription entirely, which is how screens express
+ * conditional subscription in task/session/sandbox topics.
+ */
+export function useSubscription<K extends TopicKey>(manager: SubscriptionManager, topicKey: K, params: TopicParams<K> | null): TopicState<K> {
+  const paramsKey = params ? (topicDefinitions[topicKey] as any).key(params) : null;
+  const paramsRef = useRef<TopicParams<K> | null>(params);
+  paramsRef.current = params;
+
+  const subscribe = useMemo(() => {
+    return (listener: () => void) => {
+      const currentParams = paramsRef.current;
+      if (!currentParams) {
+        return () => {};
+      }
+      return manager.subscribe(topicKey, currentParams, listener);
+    };
+  }, [manager, topicKey, paramsKey]);
+
+  const getSnapshot = useMemo(() => {
+    let lastSnapshot: TopicState<K> | null = null;
+
+    return (): TopicState<K> => {
+      const currentParams = paramsRef.current;
+      const nextSnapshot: TopicState<K> = currentParams
+        ? {
+            data: manager.getSnapshot(topicKey, currentParams),
+            status: manager.getStatus(topicKey, currentParams),
+            error: manager.getError(topicKey, currentParams),
+          }
+        : {
+            data: undefined,
+            status: "loading",
+            error: null,
+          };
+
+      // `useSyncExternalStore` requires referentially-stable snapshots when the
+      // underlying store has not changed. Reuse the previous object whenever
+      // the topic data/status/error triplet is unchanged.
+      if (lastSnapshot && lastSnapshot.data === nextSnapshot.data && lastSnapshot.status === nextSnapshot.status && lastSnapshot.error === nextSnapshot.error) {
+        return lastSnapshot;
+      }
+
+      lastSnapshot = nextSnapshot;
+      return nextSnapshot;
+    };
+  }, [manager, topicKey, paramsKey]);
+
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
diff --git a/foundry/packages/client/src/view-model.ts b/foundry/packages/client/src/view-model.ts
new file mode 100644
index 0000000..bd7a98c
--- /dev/null
+++ b/foundry/packages/client/src/view-model.ts
@@ -0,0 +1,98 @@
+import type { TaskRecord, TaskStatus } from "@sandbox-agent/foundry-shared";
+
+export const TASK_STATUS_GROUPS = ["queued", "running", "idle", "archived", "killed", "error"] as const;
+
+export type TaskStatusGroup = (typeof TASK_STATUS_GROUPS)[number];
+
+const QUEUED_STATUSES = new Set<TaskStatus>([
+  "init_bootstrap_db",
+  "init_enqueue_provision",
+  "init_ensure_name",
+  "init_assert_name",
+  "init_complete",
+  "archive_stop_status_sync",
+  "archive_release_sandbox",
+  "archive_finalize",
+  "kill_destroy_sandbox",
+  "kill_finalize",
+]);
+
+export function groupTaskStatus(status: TaskStatus): TaskStatusGroup {
+  if (status === "running") return "running";
+  if (status === "idle") return "idle";
+  if (status === "archived") return "archived";
+  if (status === "killed") return "killed";
+  if (status === "error") return "error";
+  if (QUEUED_STATUSES.has(status)) return "queued";
+  return "queued";
+}
+
+function emptyStatusCounts(): Record<TaskStatusGroup, number> {
+  return {
+    queued: 0,
+    running: 0,
+    idle: 0,
+    archived: 0,
+    killed: 0,
+    error: 0,
+  };
+}
+
+export interface TaskSummary {
+  total: number;
+  byStatus: Record<TaskStatusGroup, number>;
+  byProvider: Record<string, number>;
+}
+
+export function fuzzyMatch(target: string, query: string): boolean {
+  const haystack = target.toLowerCase();
+  const needle = query.toLowerCase();
+  let i = 0;
+  for (const ch of needle) {
+    i = haystack.indexOf(ch, i);
+    if (i < 0) {
+      return false;
+    }
+    i += 1;
+  }
+  return true;
+}
+
+export function filterTasks(rows: TaskRecord[], query: string): TaskRecord[] {
+  const q = query.trim();
+  if (!q) {
+    return rows;
+  }
+
+  return rows.filter((row) => {
+    const fields = [row.branchName ?? "", row.title ?? "", row.taskId, row.task];
+    return fields.some((field) => fuzzyMatch(field, q));
+  });
+}
+
+export function formatRelativeAge(updatedAt: number, now = Date.now()): string {
+  const deltaSeconds = Math.max(0, Math.floor((now - updatedAt) / 1000));
+  if (deltaSeconds < 60) return `${deltaSeconds}s`;
+  const minutes = Math.floor(deltaSeconds / 60);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h`;
+  const days = Math.floor(hours / 24);
+  return `${days}d`;
+}
+
+export function summarizeTasks(rows: TaskRecord[]): TaskSummary {
+  const byStatus = emptyStatusCounts();
+  const byProvider: Record<string, number> = {};
+
+  for (const row of rows) {
+    byStatus[groupTaskStatus(row.status)] += 1;
+    byProvider[row.sandboxProviderId] = (byProvider[row.sandboxProviderId] ?? 0) + 1;
+  }
+
+  return {
+    total: rows.length,
+    byStatus,
+    byProvider,
+  };
+}
diff --git a/foundry/packages/client/src/workspace-client.ts b/foundry/packages/client/src/workspace-client.ts
new file mode 100644
index 0000000..6662352
--- /dev/null
+++ b/foundry/packages/client/src/workspace-client.ts
@@ -0,0 +1,66 @@
+import type {
+  TaskWorkspaceAddSessionResponse,
+  TaskWorkspaceChangeModelInput,
+  TaskWorkspaceChangeOwnerInput,
+  TaskWorkspaceCreateTaskInput,
+  TaskWorkspaceCreateTaskResponse,
+  TaskWorkspaceDiffInput,
+  TaskWorkspaceRenameInput,
+  TaskWorkspaceRenameSessionInput,
+  TaskWorkspaceSelectInput,
+  TaskWorkspaceSetSessionUnreadInput,
+  TaskWorkspaceSendMessageInput,
+  TaskWorkspaceSnapshot,
+  TaskWorkspaceSessionInput,
+  TaskWorkspaceUpdateDraftInput,
+} from "@sandbox-agent/foundry-shared";
+import type { BackendClient } from "./backend-client.js";
+import { getSharedMockWorkspaceClient } from "./mock/workspace-client.js";
+import { createRemoteWorkspaceClient } from "./remote/workspace-client.js";
+
+export type TaskWorkspaceClientMode = "mock" | "remote";
+
+export interface CreateTaskWorkspaceClientOptions {
+  mode: TaskWorkspaceClientMode;
+  backend?: BackendClient;
+  organizationId?: string;
+}
+
+export interface TaskWorkspaceClient {
+  getSnapshot(): TaskWorkspaceSnapshot;
+  subscribe(listener: () => void): () => void;
+  createTask(input: TaskWorkspaceCreateTaskInput): Promise<TaskWorkspaceCreateTaskResponse>;
+  markTaskUnread(input: TaskWorkspaceSelectInput): Promise<void>;
+  renameTask(input: TaskWorkspaceRenameInput): Promise<void>;
+  archiveTask(input: TaskWorkspaceSelectInput): Promise<void>;
+  publishPr(input: TaskWorkspaceSelectInput): Promise<void>;
+  revertFile(input: TaskWorkspaceDiffInput): Promise<void>;
+  updateDraft(input: TaskWorkspaceUpdateDraftInput): Promise<void>;
+  sendMessage(input: TaskWorkspaceSendMessageInput): Promise<void>;
+  stopAgent(input: TaskWorkspaceSessionInput): Promise<void>;
+  selectSession(input: TaskWorkspaceSessionInput): Promise<void>;
+  setSessionUnread(input: TaskWorkspaceSetSessionUnreadInput): Promise<void>;
+  renameSession(input: TaskWorkspaceRenameSessionInput): Promise<void>;
+  closeSession(input: TaskWorkspaceSessionInput): Promise<void>;
+  addSession(input: TaskWorkspaceSelectInput): Promise<TaskWorkspaceAddSessionResponse>;
+  changeModel(input: TaskWorkspaceChangeModelInput): Promise<void>;
+  changeOwner(input: TaskWorkspaceChangeOwnerInput): Promise<void>;
+}
+
+export function createTaskWorkspaceClient(options: CreateTaskWorkspaceClientOptions): TaskWorkspaceClient {
+  if (options.mode === "mock") {
+    return getSharedMockWorkspaceClient();
+  }
+
+  if (!options.backend) {
+    throw new Error("Remote task workspace client requires a backend client");
+  }
+  if (!options.organizationId) {
+    throw new Error("Remote task workspace client requires a organization id");
+  }
+
+  return createRemoteWorkspaceClient({
+    backend: options.backend,
+    organizationId: options.organizationId,
+  });
+}
diff --git a/foundry/packages/client/src/workspace-model.ts b/foundry/packages/client/src/workspace-model.ts
new file mode 100644
index 0000000..290794b
--- /dev/null
+++ b/foundry/packages/client/src/workspace-model.ts
@@ -0,0 +1,1418 @@
+import {
+  DEFAULT_WORKSPACE_MODEL_ID,
+  DEFAULT_WORKSPACE_MODEL_GROUPS as SharedModelGroups,
+  workspaceModelLabel as sharedWorkspaceModelLabel,
+  workspaceProviderAgent as sharedWorkspaceProviderAgent,
+} from "@sandbox-agent/foundry-shared";
+import type {
+  WorkspaceAgentKind as AgentKind,
+  WorkspaceSession as AgentSession,
+  WorkspaceDiffLineKind as DiffLineKind,
+  WorkspaceFileTreeNode as FileTreeNode,
+  WorkspaceTask as Task,
+  TaskWorkspaceSnapshot,
+  WorkspaceHistoryEvent as HistoryEvent,
+  WorkspaceModelGroup as ModelGroup,
+  WorkspaceModelId as ModelId,
+  WorkspaceParsedDiffLine as ParsedDiffLine,
+  WorkspaceRepositorySection,
+  WorkspaceRepo,
+  WorkspaceTranscriptEvent as TranscriptEvent,
+} from "@sandbox-agent/foundry-shared";
+import rivetDevFixture from "../../../scripts/data/rivet-dev.json" with { type: "json" };
+
+export const MODEL_GROUPS: ModelGroup[] = SharedModelGroups;
+export const DEFAULT_MODEL_ID: ModelId = DEFAULT_WORKSPACE_MODEL_ID;
+
+const MOCK_REPLIES = [
+  "Got it. I'll work on that now. Let me start by examining the relevant files...",
+  "I've analyzed the codebase and found the relevant code. Making the changes now...",
+  "Working on it. I'll update you once I have the implementation ready.",
+  "Let me look into that. I'll trace through the code to understand the current behavior...",
+  "Starting on this now. I'll need to modify a few files to implement this properly.",
+];
+
+let nextId = 100;
+
+export function uid(): string {
+  return String(++nextId);
+}
+
+export function nowMs(): number {
+  return Date.now();
+}
+
+export function formatThinkingDuration(durationMs: number): string {
+  const totalSeconds = Math.max(0, Math.floor(durationMs / 1000));
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}:${String(seconds).padStart(2, "0")}`;
+}
+
+export function formatMessageDuration(durationMs: number): string {
+  const totalSeconds = Math.max(1, Math.round(durationMs / 1000));
+  if (totalSeconds < 60) {
+    return `${totalSeconds}s`;
+  }
+
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}m ${String(seconds).padStart(2, "0")}s`;
+}
+
+export function modelLabel(id: ModelId): string {
+  return sharedWorkspaceModelLabel(id, MODEL_GROUPS);
+}
+
+export function providerAgent(provider: string): AgentKind {
+  return sharedWorkspaceProviderAgent(provider);
+}
+
+export function slugify(text: string): string {
+  return text
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, 40);
+}
+
+export function randomReply(): string {
+  return MOCK_REPLIES[Math.floor(Math.random() * MOCK_REPLIES.length)]!;
+}
+
+const DIFF_PREFIX = "diff:";
+
+export function isDiffTab(id: string): boolean {
+  return id.startsWith(DIFF_PREFIX);
+}
+
+export function diffPath(id: string): string {
+  return id.slice(DIFF_PREFIX.length);
+}
+
+export function diffTabId(path: string): string {
+  return `${DIFF_PREFIX}${path}`;
+}
+
+export function fileName(path: string): string {
+  return path.split("/").pop() ?? path;
+}
+
+function messageOrder(id: string): number {
+  const match = id.match(/\d+/);
+  return match ? Number(match[0]) : 0;
+}
+
+interface LegacyMessage {
+  id: string;
+  role: "agent" | "user";
+  agent: string | null;
+  createdAtMs: number;
+  lines: string[];
+  durationMs?: number;
+}
+
+function transcriptText(payload: unknown): string {
+  if (!payload || typeof payload !== "object") {
+    return String(payload ?? "");
+  }
+
+  const envelope = payload as {
+    method?: unknown;
+    params?: unknown;
+    result?: unknown;
+    error?: unknown;
+  };
+
+  if (envelope.params && typeof envelope.params === "object") {
+    const prompt = (envelope.params as { prompt?: unknown }).prompt;
+    if (Array.isArray(prompt)) {
+      const text = prompt
+        .map((item) => (item && typeof item === "object" ? (item as { text?: unknown }).text : null))
+        .filter((value): value is string => typeof value === "string" && value.trim().length > 0)
+        .join("\n");
+      if (text) {
+        return text;
+      }
+    }
+
+    const paramsText = (envelope.params as { text?: unknown }).text;
+    if (typeof paramsText === "string" && paramsText.trim().length > 0) {
+      return paramsText.trim();
+    }
+  }
+
+  if (envelope.result && typeof envelope.result === "object") {
+    const resultText = (envelope.result as { text?: unknown }).text;
+    if (typeof resultText === "string" && resultText.trim().length > 0) {
+      return resultText.trim();
+    }
+  }
+
+  if (envelope.error) {
+    return JSON.stringify(envelope.error);
+  }
+
+  if (typeof envelope.method === "string") {
+    return envelope.method;
+  }
+
+  return JSON.stringify(payload);
+}
+
+function historyPreview(event: TranscriptEvent): string {
+  const content = transcriptText(event.payload).trim() || "Untitled event";
+  return content.length > 42 ? `${content.slice(0, 39)}...` : content;
+}
+
+function historyDetail(event: TranscriptEvent): string {
+  const content = transcriptText(event.payload).trim();
+  return content || "Untitled event";
+}
+
+export function buildHistoryEvents(sessions: AgentSession[]): HistoryEvent[] {
+  return sessions
+    .flatMap((session) =>
+      session.transcript
+        .filter((event) => event.sender === "client")
+        .map((event) => ({
+          id: `history-${session.id}-${event.id}`,
+          messageId: event.id,
+          preview: historyPreview(event),
+          sessionName: session.sessionName,
+          sessionId: session.id,
+          createdAtMs: event.createdAt,
+          detail: historyDetail(event),
+        })),
+    )
+    .sort((left, right) => messageOrder(left.messageId) - messageOrder(right.messageId));
+}
+
+function buildPullRequestSummary(params: {
+  number: number;
+  title: string;
+  branch: string;
+  repoName: string;
+  updatedAtMs: number;
+  status: "ready" | "draft";
+}) {
+  return {
+    number: params.number,
+    status: params.status,
+    title: params.title,
+    state: "open",
+    url: `https://github.com/${params.repoName}/pull/${params.number}`,
+    headRefName: params.branch,
+    baseRefName: "main",
+    repoFullName: params.repoName,
+    authorLogin: "mock",
+    isDraft: params.status === "draft",
+    updatedAtMs: params.updatedAtMs,
+  };
+}
+
+function transcriptFromLegacyMessages(sessionId: string, messages: LegacyMessage[]): TranscriptEvent[] {
+  return messages.map((message, index) => ({
+    id: message.id,
+    eventIndex: index + 1,
+    sessionId,
+    createdAt: message.createdAtMs,
+    connectionId: "mock-connection",
+    sender: message.role === "user" ? "client" : "agent",
+    payload:
+      message.role === "user"
+        ? {
+            method: "session/prompt",
+            params: {
+              prompt: message.lines.map((line) => ({ type: "text", text: line })),
+            },
+          }
+        : {
+            result: {
+              text: message.lines.join("\n"),
+              durationMs: message.durationMs,
+            },
+          },
+  }));
+}
+
+const NOW_MS = Date.now();
+
+function minutesAgo(minutes: number): number {
+  return NOW_MS - minutes * 60_000;
+}
+
+function buildTranscriptStressMessages(pairCount: number): LegacyMessage[] {
+  const startedAtMs = NOW_MS - pairCount * 8_000;
+  const messages: LegacyMessage[] = [];
+
+  for (let index = 0; index < pairCount; index++) {
+    const sequence = index + 1;
+    const createdAtMs = startedAtMs + index * 8_000;
+
+    messages.push({
+      id: `stress-user-${sequence}`,
+      role: "user",
+      agent: null,
+      createdAtMs,
+      lines: [
+        `Stress prompt ${sequence}: summarize the current state of the transcript virtualizer.`,
+        `Keep the answer focused on scroll position, render cost, and preserved expansion state.`,
+      ],
+    });
+
+    messages.push({
+      id: `stress-agent-${sequence}`,
+      role: "agent",
+      agent: "codex",
+      createdAtMs: createdAtMs + 3_000,
+      lines: [
+        `Stress reply ${sequence}: the list should only render visible rows plus overscan while preserving scroll anchoring near the bottom.`,
+        `Grouping, minimap navigation, and per-row UI should remain stable even as older rows unmount.`,
+      ],
+      durationMs: 2_500,
+    });
+  }
+
+  return messages;
+}
+
+export function parseDiffLines(diff: string): ParsedDiffLine[] {
+  return diff.split("\n").map((text, index) => {
+    if (text.startsWith("@@")) {
+      return { kind: "hunk", lineNumber: index + 1, text };
+    }
+    if (text.startsWith("+")) {
+      return { kind: "add", lineNumber: index + 1, text };
+    }
+    if (text.startsWith("-")) {
+      return { kind: "remove", lineNumber: index + 1, text };
+    }
+    return { kind: "context", lineNumber: index + 1, text };
+  });
+}
+
+export function removeFileTreePath(nodes: FileTreeNode[], targetPath: string): FileTreeNode[] {
+  return nodes.flatMap((node) => {
+    if (node.path === targetPath) {
+      return [];
+    }
+
+    if (!node.children) {
+      return [node];
+    }
+
+    const nextChildren = removeFileTreePath(node.children, targetPath);
+    if (node.isDir && nextChildren.length === 0) {
+      return [];
+    }
+
+    return [{ ...node, children: nextChildren }];
+  });
+}
+
+export function buildInitialTasks(): Task[] {
+  return [
+    // ── rivet-dev/sandbox-agent ──
+    {
+      id: "h1",
+      repoId: "sandbox-agent",
+      title: "Normalize Pi ACP bootstrap payloads",
+      status: "idle",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(8),
+      branch: "NathanFlurry/pi-bootstrap-fix",
+      pullRequest: buildPullRequestSummary({
+        number: 227,
+        title: "Normalize Pi ACP bootstrap payloads",
+        branch: "NathanFlurry/pi-bootstrap-fix",
+        repoName: "rivet-dev/sandbox-agent",
+        updatedAtMs: minutesAgo(8),
+        status: "ready",
+      }),
+      sessions: [
+        {
+          id: "t1",
+          sessionId: "t1",
+          sessionName: "Pi payload fix",
+          agent: "Claude",
+          model: "sonnet",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t1", [
+            {
+              id: "m1",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(18),
+              lines: [
+                "I'll fix the Pi agent ACP bootstrap payloads. The `initialize` method sends `protocolVersion` as a string but Pi expects a number. Let me examine `acp_proxy_runtime.rs`.",
+                "",
+                "Found the issue — the ACP proxy forwards the raw JSON-RPC payload without normalizing field types per-agent. Adding a `normalize_payload_for_agent` pass before dispatch.",
+              ],
+              durationMs: 14_000,
+            },
+            {
+              id: "m2",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(15),
+              lines: [
+                "Done. Added `normalize_pi_payload()` in `acp_proxy_runtime.rs` that converts `protocolVersion` from string to number for `initialize`, and ensures `mcpServers` is present in `session/new` params.",
+              ],
+              durationMs: 22_000,
+            },
+            {
+              id: "m3",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(12),
+              lines: ['Does this also handle the case where protocolVersion is a float string like "2.0"?'],
+            },
+            {
+              id: "m4",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(11),
+              lines: ['Yes — the `parse_json_number` helper tries u64, then i64, then f64 parsing in order. So "2.0" becomes `2.0` as a JSON number.'],
+              durationMs: 8_000,
+            },
+          ]),
+        },
+        {
+          id: "t2",
+          sessionId: "t2",
+          sessionName: "Test coverage",
+          agent: "Codex",
+          model: "gpt-5.3-codex",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: true,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t2", [
+            {
+              id: "m5",
+              role: "agent",
+              agent: "codex",
+              createdAtMs: minutesAgo(20),
+              lines: ["Analyzed the normalize_pi_payload function. It handles `initialize` and `session/new` methods. I'll add unit tests for edge cases."],
+              durationMs: 18_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "server/packages/sandbox-agent/src/acp_proxy_runtime.rs", added: 51, removed: 0, type: "M" },
+        { path: "server/packages/sandbox-agent/src/acp_proxy_runtime_test.rs", added: 38, removed: 0, type: "A" },
+      ],
+      diffs: {
+        "server/packages/sandbox-agent/src/acp_proxy_runtime.rs": [
+          "@@ -134,6 +134,8 @@ impl AcpProxyRuntime {",
+          '             "acp_proxy: instance resolved"',
+          "         );",
+          " ",
+          "+        let payload = normalize_payload_for_agent(instance.agent, payload);",
+          "+",
+          "         match instance.runtime.post(payload).await {",
+          "@@ -510,6 +512,57 @@ fn map_adapter_error(err: AdapterError) -> SandboxError {",
+          " }",
+          " ",
+          "+fn normalize_payload_for_agent(agent: AgentId, payload: Value) -> Value {",
+          "+    if agent != AgentId::Pi {",
+          "+        return payload;",
+          "+    }",
+          "+    normalize_pi_payload(payload)",
+          "+}",
+          "+",
+          "+fn normalize_pi_payload(mut payload: Value) -> Value {",
+          "+    let method = payload",
+          '+        .get("method")',
+          "+        .and_then(Value::as_str)",
+          "+        .unwrap_or_default();",
+          "+",
+          "+    match method {",
+          '+        "initialize" => {',
+          '+            if let Some(protocol) = payload.pointer_mut("/params/protocolVersion") {',
+          "+                if let Some(raw) = protocol.as_str() {",
+          "+                    if let Some(number) = parse_json_number(raw) {",
+          "+                        *protocol = Value::Number(number);",
+          "+                    }",
+          "+                }",
+          "+            }",
+          "+        }",
+          '+        "session/new" => {',
+          '+            if let Some(params) = payload.get_mut("params").and_then(Value::as_object_mut) {',
+          '+                params.entry("mcpServers".to_string())',
+          "+                    .or_insert_with(|| Value::Array(Vec::new()));",
+          "+            }",
+          "+        }",
+          "+        _ => {}",
+          "+    }",
+          "+    payload",
+          "+}",
+        ].join("\n"),
+      },
+      fileTree: [
+        {
+          name: "server",
+          path: "server",
+          isDir: true,
+          children: [
+            {
+              name: "packages",
+              path: "server/packages",
+              isDir: true,
+              children: [
+                {
+                  name: "sandbox-agent",
+                  path: "server/packages/sandbox-agent",
+                  isDir: true,
+                  children: [
+                    {
+                      name: "src",
+                      path: "server/packages/sandbox-agent/src",
+                      isDir: true,
+                      children: [
+                        { name: "acp_proxy_runtime.rs", path: "server/packages/sandbox-agent/src/acp_proxy_runtime.rs", isDir: false },
+                        { name: "acp_proxy_runtime_test.rs", path: "server/packages/sandbox-agent/src/acp_proxy_runtime_test.rs", isDir: false },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      minutesUsed: 42,
+    },
+    {
+      id: "h2",
+      repoId: "sandbox-agent",
+      title: "Auto-inject builtin agent skills at startup",
+      status: "running",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(3),
+      branch: "feat/builtin-agent-skills",
+      pullRequest: buildPullRequestSummary({
+        number: 223,
+        title: "Auto-inject builtin agent skills at startup",
+        branch: "feat/builtin-agent-skills",
+        repoName: "rivet-dev/sandbox-agent",
+        updatedAtMs: minutesAgo(3),
+        status: "draft",
+      }),
+      sessions: [
+        {
+          id: "t3",
+          sessionId: "t3",
+          sessionName: "Skills injection",
+          agent: "Claude",
+          model: "opus",
+          status: "running",
+          thinkingSinceMs: NOW_MS - 45_000,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t3", [
+            {
+              id: "m10",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(30),
+              lines: ["Add builtin skill injection to agent startup. Skills should be loaded from the skills registry and written to the agent's CLAUDE.md."],
+            },
+            {
+              id: "m11",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(28),
+              lines: [
+                "I'll implement this in the agent management package. The approach:",
+                "1. Load skills from the registry during agent install",
+                "2. Inject skill definitions into the agent's working directory as `.claude/skills/`",
+                "3. Append skill references to CLAUDE.md if present",
+                "",
+                "Working on `server/packages/agent-management/src/agents/install.rs` now...",
+              ],
+              durationMs: 32_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "server/packages/agent-management/src/agents/install.rs", added: 87, removed: 12, type: "M" },
+        { path: "server/packages/agent-management/src/skills/mod.rs", added: 145, removed: 0, type: "A" },
+        { path: "server/packages/agent-management/src/skills/registry.rs", added: 63, removed: 0, type: "A" },
+      ],
+      diffs: {},
+      fileTree: [
+        {
+          name: "server",
+          path: "server",
+          isDir: true,
+          children: [
+            {
+              name: "packages",
+              path: "server/packages",
+              isDir: true,
+              children: [
+                {
+                  name: "agent-management",
+                  path: "server/packages/agent-management",
+                  isDir: true,
+                  children: [
+                    {
+                      name: "src",
+                      path: "server/packages/agent-management/src",
+                      isDir: true,
+                      children: [
+                        {
+                          name: "agents",
+                          path: "server/packages/agent-management/src/agents",
+                          isDir: true,
+                          children: [{ name: "install.rs", path: "server/packages/agent-management/src/agents/install.rs", isDir: false }],
+                        },
+                        {
+                          name: "skills",
+                          path: "server/packages/agent-management/src/skills",
+                          isDir: true,
+                          children: [
+                            { name: "mod.rs", path: "server/packages/agent-management/src/skills/mod.rs", isDir: false },
+                            { name: "registry.rs", path: "server/packages/agent-management/src/skills/registry.rs", isDir: false },
+                          ],
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      minutesUsed: 187,
+    },
+    {
+      id: "h3",
+      repoId: "sandbox-agent",
+      title: "Add hooks example for Claude, Codex, and OpenCode",
+      status: "idle",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(45),
+      branch: "hooks-example",
+      pullRequest: buildPullRequestSummary({
+        number: 225,
+        title: "Add hooks example for Claude, Codex, and OpenCode",
+        branch: "hooks-example",
+        repoName: "rivet-dev/sandbox-agent",
+        updatedAtMs: minutesAgo(45),
+        status: "ready",
+      }),
+      sessions: [
+        {
+          id: "t4",
+          sessionId: "t4",
+          sessionName: "Example docs",
+          agent: "Claude",
+          model: "sonnet",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t4", [
+            {
+              id: "m20",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(60),
+              lines: ["Create an example showing how to use hooks with Claude, Codex, and OpenCode agents."],
+            },
+            {
+              id: "m21",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(58),
+              lines: [
+                "Done. Created `examples/hooks/` with a TypeScript example that demonstrates lifecycle hooks for all three agents. Includes `onPermissionRequest`, `onSessionEvent`, and `onAgentOutput` hooks.",
+              ],
+              durationMs: 16_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "examples/hooks/src/index.ts", added: 120, removed: 0, type: "A" },
+        { path: "examples/hooks/package.json", added: 18, removed: 0, type: "A" },
+        { path: "examples/hooks/tsconfig.json", added: 12, removed: 0, type: "A" },
+      ],
+      diffs: {},
+      fileTree: [
+        {
+          name: "examples",
+          path: "examples",
+          isDir: true,
+          children: [
+            {
+              name: "hooks",
+              path: "examples/hooks",
+              isDir: true,
+              children: [
+                { name: "package.json", path: "examples/hooks/package.json", isDir: false },
+                { name: "tsconfig.json", path: "examples/hooks/tsconfig.json", isDir: false },
+                {
+                  name: "src",
+                  path: "examples/hooks/src",
+                  isDir: true,
+                  children: [{ name: "index.ts", path: "examples/hooks/src/index.ts", isDir: false }],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      minutesUsed: 23,
+    },
+    // ── rivet-dev/rivet ──
+    {
+      id: "h4",
+      repoId: "rivet",
+      title: "Add actor reschedule endpoint",
+      status: "idle",
+      repoName: "rivet-dev/rivet",
+      updatedAtMs: minutesAgo(15),
+      branch: "actor-reschedule-endpoint",
+      pullRequest: buildPullRequestSummary({
+        number: 4400,
+        title: "Add actor reschedule endpoint",
+        branch: "actor-reschedule-endpoint",
+        repoName: "rivet-dev/rivet",
+        updatedAtMs: minutesAgo(15),
+        status: "ready",
+      }),
+      sessions: [
+        {
+          id: "t5",
+          sessionId: "t5",
+          sessionName: "Reschedule API",
+          agent: "Claude",
+          model: "sonnet",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t5", [
+            {
+              id: "m30",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(90),
+              lines: ["Implement a POST /actors/{actor_id}/reschedule endpoint that signals the actor workflow to reschedule."],
+            },
+            {
+              id: "m31",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(87),
+              lines: [
+                "I'll add the reschedule endpoint to `api-peer`. The flow is:",
+                "1. Resolve actor by ID and verify namespace ownership",
+                "2. Send `Reschedule` signal to the actor workflow",
+                "3. Return 200 on success, 404 if actor not found",
+                "",
+                "Created `engine/packages/api-peer/src/actors/reschedule.rs` and wired it into the router.",
+              ],
+              durationMs: 28_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "engine/packages/api-peer/src/actors/reschedule.rs", added: 64, removed: 0, type: "A" },
+        { path: "engine/packages/api-peer/src/actors/mod.rs", added: 1, removed: 0, type: "M" },
+        { path: "engine/packages/api-peer/src/router.rs", added: 12, removed: 3, type: "M" },
+        { path: "engine/packages/api-types/src/actors/reschedule.rs", added: 24, removed: 0, type: "A" },
+      ],
+      diffs: {
+        "engine/packages/api-peer/src/actors/reschedule.rs": [
+          "@@ -0,0 +1,64 @@",
+          "+use anyhow::Result;",
+          "+use gas::prelude::*;",
+          "+use rivet_api_builder::ApiCtx;",
+          "+use rivet_api_types::actors::reschedule::*;",
+          "+use rivet_util::Id;",
+          "+",
+          "+#[utoipa::path(",
+          "+    post,",
+          '+    operation_id = "actors_reschedule",',
+          '+    path = "/actors/{actor_id}/reschedule",',
+          "+)]",
+          "+#[tracing::instrument(skip_all)]",
+          "+pub async fn reschedule(",
+          "+    ctx: ApiCtx,",
+          "+    path: ReschedulePath,",
+          "+    query: RescheduleQuery,",
+          "+) -> Result<RescheduleResponse> {",
+          "+    let actors_res = ctx.op(pegboard::ops::actor::get::Input {",
+          "+        actor_ids: vec![path.actor_id],",
+          "+        fetch_error: false,",
+          "+    }).await?;",
+          "+",
+          "+    let actor = actors_res.actors.into_iter().next()",
+          "+        .ok_or_else(|| pegboard::errors::Actor::NotFound.build())?;",
+          "+",
+          "+    ctx.signal(pegboard::workflows::actor::Reschedule {",
+          "+        reset_rescheduling: true,",
+          "+    })",
+          "+    .to_workflow::<pegboard::workflows::actor::Workflow>()",
+          '+    .tag("actor_id", path.actor_id)',
+          "+    .send().await?;",
+          "+",
+          "+    Ok(RescheduleResponse {})",
+          "+}",
+        ].join("\n"),
+      },
+      fileTree: [
+        {
+          name: "engine",
+          path: "engine",
+          isDir: true,
+          children: [
+            {
+              name: "packages",
+              path: "engine/packages",
+              isDir: true,
+              children: [
+                {
+                  name: "api-peer",
+                  path: "engine/packages/api-peer",
+                  isDir: true,
+                  children: [
+                    {
+                      name: "src",
+                      path: "engine/packages/api-peer/src",
+                      isDir: true,
+                      children: [
+                        {
+                          name: "actors",
+                          path: "engine/packages/api-peer/src/actors",
+                          isDir: true,
+                          children: [
+                            { name: "mod.rs", path: "engine/packages/api-peer/src/actors/mod.rs", isDir: false },
+                            { name: "reschedule.rs", path: "engine/packages/api-peer/src/actors/reschedule.rs", isDir: false },
+                          ],
+                        },
+                        { name: "router.rs", path: "engine/packages/api-peer/src/router.rs", isDir: false },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      minutesUsed: 5,
+    },
+    {
+      id: "h5",
+      repoId: "rivet",
+      title: "Dynamic actors",
+      status: "idle",
+      repoName: "rivet-dev/rivet",
+      updatedAtMs: minutesAgo(35),
+      branch: "feat/dynamic-actors",
+      pullRequest: buildPullRequestSummary({
+        number: 4395,
+        title: "Dynamic actors",
+        branch: "feat/dynamic-actors",
+        repoName: "rivet-dev/rivet",
+        updatedAtMs: minutesAgo(35),
+        status: "draft",
+      }),
+      sessions: [
+        {
+          id: "t6",
+          sessionId: "t6",
+          sessionName: "Dynamic actors impl",
+          agent: "Claude",
+          model: "opus",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: true,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t6", [
+            {
+              id: "m40",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(120),
+              lines: ["Implement dynamic actor support — actors that can be created at runtime without pre-registration in the registry."],
+            },
+            {
+              id: "m41",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(115),
+              lines: [
+                "This is a large change spanning the RivetKit runtime, the engine scheduler, and the SDK. I'll start with the core runtime changes and work outward.",
+                "",
+                "Key design decisions:",
+                "- Dynamic actors use a special `__dynamic` registry entry",
+                "- They receive their behavior module at creation time via `createDynamic()`",
+                "- State persistence works identically to registered actors",
+              ],
+              durationMs: 45_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "rivetkit-typescript/packages/rivetkit/src/dynamic.ts", added: 280, removed: 0, type: "A" },
+        { path: "rivetkit-typescript/packages/rivetkit/src/registry.ts", added: 45, removed: 12, type: "M" },
+        { path: "engine/packages/pegboard/src/workflows/actor.rs", added: 120, removed: 30, type: "M" },
+      ],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 312,
+    },
+    // ── rivet-dev/vbare ──
+    {
+      id: "h6",
+      repoId: "vbare",
+      title: "Use full cloud run pool name for routing",
+      status: "idle",
+      repoName: "rivet-dev/vbare",
+      updatedAtMs: minutesAgo(25),
+      branch: "fix-use-full-cloud-run-pool-name",
+      pullRequest: buildPullRequestSummary({
+        number: 235,
+        title: "Use full cloud run pool name for routing",
+        branch: "fix-use-full-cloud-run-pool-name",
+        repoName: "rivet-dev/vbare",
+        updatedAtMs: minutesAgo(25),
+        status: "ready",
+      }),
+      sessions: [
+        {
+          id: "t7",
+          sessionId: "t7",
+          sessionName: "Pool routing fix",
+          agent: "Claude",
+          model: "sonnet",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t7", [
+            {
+              id: "m50",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(40),
+              lines: [
+                "Fixed the managed pool routing issue. The Cloud Run service was using a truncated pool name for routing, causing 404s on pools with long names. Updated the gateway routing endpoint to use the full pool name.",
+              ],
+              durationMs: 24_000,
+            },
+            {
+              id: "m51",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(38),
+              lines: ["Does this also update the SDK type exports?"],
+            },
+            {
+              id: "m52",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(36),
+              lines: [
+                "Yes — the `Registry` type is now exported from `actors/index.ts` so downstream consumers can reference it. Also bumped rivetkit to `2.0.4-rc.1` in pnpm overrides.",
+              ],
+              durationMs: 11_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "packages/api/src/actors/index.ts", added: 4, removed: 2, type: "M" },
+        { path: "package.json", added: 2, removed: 1, type: "M" },
+        { path: "packages/api/scripts/managed-pools-e2e.ts", added: 2, removed: 2, type: "M" },
+      ],
+      diffs: {
+        "packages/api/src/actors/index.ts": [
+          "@@ -28,6 +28,8 @@ export const registry = setup({",
+          "   inspector: {},",
+          " });",
+          " ",
+          "+export type Registry = typeof registry;",
+          "+",
+          " export type ActorClient = ReturnType<typeof createActorClient>;",
+          " ",
+          " let _client: ActorClient | null = null;",
+          "@@ -37,7 +39,7 @@ function createActorClient() {",
+          "     const managerPort = process.env.RIVETKIT_MANAGER_PORT",
+          "       ? Number.parseInt(process.env.RIVETKIT_MANAGER_PORT, 10)",
+          "       : 6420;",
+          "-    return createClient<typeof registry>({",
+          "+    return createClient<Registry>({",
+          "       endpoint: `http://127.0.0.1:${managerPort}`,",
+        ].join("\n"),
+      },
+      fileTree: [
+        {
+          name: "packages",
+          path: "packages",
+          isDir: true,
+          children: [
+            {
+              name: "api",
+              path: "packages/api",
+              isDir: true,
+              children: [
+                {
+                  name: "src",
+                  path: "packages/api/src",
+                  isDir: true,
+                  children: [
+                    {
+                      name: "actors",
+                      path: "packages/api/src/actors",
+                      isDir: true,
+                      children: [{ name: "index.ts", path: "packages/api/src/actors/index.ts", isDir: false }],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      minutesUsed: 0,
+    },
+    // ── rivet-dev/skills ──
+    {
+      id: "h7",
+      repoId: "skills",
+      title: "Route compute gateway path correctly",
+      status: "idle",
+      repoName: "rivet-dev/skills",
+      updatedAtMs: minutesAgo(50),
+      branch: "fix-guard-support-https-targets",
+      pullRequest: buildPullRequestSummary({
+        number: 125,
+        title: "Route compute gateway path correctly",
+        branch: "fix-guard-support-https-targets",
+        repoName: "rivet-dev/skills",
+        updatedAtMs: minutesAgo(50),
+        status: "ready",
+      }),
+      sessions: [
+        {
+          id: "t8",
+          sessionId: "t8",
+          sessionName: "Guard routing",
+          agent: "Claude",
+          model: "sonnet",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t8", [
+            {
+              id: "m60",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(65),
+              lines: [
+                "Fixed the guard proxy to support HTTPS targets and correct compute gateway path routing. The proxy was using an HTTP-only connector — switched to `hyper_tls::HttpsConnector`. Also fixed path-based routing to strip the `/compute/gateway` prefix before forwarding.",
+              ],
+              durationMs: 30_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "engine/packages/guard-core/src/proxy_service.rs", added: 8, removed: 4, type: "M" },
+        { path: "engine/packages/guard/src/routing/compute_gateway.rs", added: 42, removed: 8, type: "M" },
+        { path: "engine/packages/guard-core/Cargo.toml", added: 1, removed: 0, type: "M" },
+        { path: "Cargo.lock", added: 37, removed: 5, type: "M" },
+      ],
+      diffs: {
+        "engine/packages/guard-core/src/proxy_service.rs": [
+          "@@ -309,15 +309,19 @@ pub struct ProxyService {",
+          "     remote_addr: SocketAddr,",
+          "-    client: Client<hyper_util::client::legacy::connect::HttpConnector, Full<Bytes>>,",
+          "+    client: Client<",
+          "+        hyper_tls::HttpsConnector<hyper_util::client::legacy::connect::HttpConnector>,",
+          "+        Full<Bytes>,",
+          "+    >,",
+          " }",
+          " ",
+          " impl ProxyService {",
+          "     pub fn new(state: Arc<ProxyState>, remote_addr: SocketAddr) -> Self {",
+          "+        let https_connector = hyper_tls::HttpsConnector::new();",
+          "         let client = Client::builder(TokioExecutor::new())",
+          "             .pool_idle_timeout(Duration::from_secs(30))",
+          "-            .build_http();",
+          "+            .build(https_connector);",
+        ].join("\n"),
+      },
+      fileTree: [
+        {
+          name: "engine",
+          path: "engine",
+          isDir: true,
+          children: [
+            {
+              name: "packages",
+              path: "engine/packages",
+              isDir: true,
+              children: [
+                {
+                  name: "guard-core",
+                  path: "engine/packages/guard-core",
+                  isDir: true,
+                  children: [
+                    { name: "Cargo.toml", path: "engine/packages/guard-core/Cargo.toml", isDir: false },
+                    {
+                      name: "src",
+                      path: "engine/packages/guard-core/src",
+                      isDir: true,
+                      children: [{ name: "proxy_service.rs", path: "engine/packages/guard-core/src/proxy_service.rs", isDir: false }],
+                    },
+                  ],
+                },
+                {
+                  name: "guard",
+                  path: "engine/packages/guard",
+                  isDir: true,
+                  children: [
+                    {
+                      name: "src",
+                      path: "engine/packages/guard/src",
+                      isDir: true,
+                      children: [
+                        {
+                          name: "routing",
+                          path: "engine/packages/guard/src/routing",
+                          isDir: true,
+                          children: [{ name: "compute_gateway.rs", path: "engine/packages/guard/src/routing/compute_gateway.rs", isDir: false }],
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      minutesUsed: 78,
+    },
+    // ── rivet-dev/skills (archived) ──
+    {
+      id: "h8",
+      repoId: "skills",
+      title: "Move compute gateway to guard",
+      status: "archived",
+      repoName: "rivet-dev/skills",
+      updatedAtMs: minutesAgo(2 * 24 * 60),
+      branch: "chore-move-compute-gateway-to",
+      pullRequest: buildPullRequestSummary({
+        number: 123,
+        title: "Move compute gateway to guard",
+        branch: "chore-move-compute-gateway-to",
+        repoName: "rivet-dev/skills",
+        updatedAtMs: minutesAgo(2 * 24 * 60),
+        status: "ready",
+      }),
+      sessions: [
+        {
+          id: "t9",
+          sessionId: "t9",
+          sessionName: "Gateway migration",
+          agent: "Claude",
+          model: "sonnet",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t9", [
+            {
+              id: "m70",
+              role: "agent",
+              agent: "claude",
+              createdAtMs: minutesAgo(2 * 24 * 60 + 30),
+              lines: ["Migrated the compute gateway from its standalone service into the guard package. Removed 469 lines of duplicated routing logic."],
+              durationMs: 38_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "engine/packages/guard/src/routing/compute_gateway.rs", added: 180, removed: 0, type: "A" },
+        { path: "engine/packages/compute-gateway/src/lib.rs", added: 0, removed: 320, type: "D" },
+      ],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 15,
+    },
+    // ── rivet-dev/deploy-action ──
+    {
+      id: "h9",
+      repoId: "deploy-action",
+      title: "Harden namespace isolation for nested containers",
+      status: "idle",
+      repoName: "rivet-dev/deploy-action",
+      updatedAtMs: minutesAgo(90),
+      branch: "fix/namespace-isolation",
+      pullRequest: null,
+      sessions: [
+        {
+          id: "t10",
+          sessionId: "t10",
+          sessionName: "Namespace fix",
+          agent: "Codex",
+          model: "gpt-5.3-codex",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: true,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("t10", [
+            {
+              id: "m80",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(100),
+              lines: [
+                "Audit and harden the namespace isolation for nested container execution. Make sure PID, network, and mount namespaces are correctly unshared.",
+              ],
+            },
+            {
+              id: "m81",
+              role: "agent",
+              agent: "codex",
+              createdAtMs: minutesAgo(97),
+              lines: [
+                "Audited the sandbox creation path. Found that the PID namespace was shared with the host in certain fallback paths. Fixed by always calling `unshare(CLONE_NEWPID)` before `fork()`. Also tightened the seccomp filter to block `setns` calls from within the sandbox.",
+              ],
+              durationMs: 42_000,
+            },
+          ]),
+        },
+      ],
+      fileChanges: [
+        { path: "src/sandbox/namespace.ts", added: 35, removed: 8, type: "M" },
+        { path: "src/sandbox/seccomp.ts", added: 12, removed: 2, type: "M" },
+      ],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 3,
+    },
+
+    // ── Status demo tasks ──────────────────────────────────────────────
+    {
+      id: "status-error",
+      repoId: "sandbox-agent",
+      title: "Fix broken auth middleware (error demo)",
+      status: "error",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(2),
+      branch: "fix/auth-middleware",
+      pullRequest: null,
+      sessions: [
+        {
+          id: "status-error-session",
+          sessionId: "status-error-session",
+          sessionName: "Auth fix",
+          agent: "Claude",
+          model: "sonnet",
+          status: "error",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          errorMessage: "Sandbox process exited unexpectedly (exit code 137). The sandbox may have run out of memory.",
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: [],
+        },
+      ],
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 1,
+    },
+    {
+      id: "status-provisioning",
+      repoId: "sandbox-agent",
+      title: "Add rate limiting to API gateway (provisioning demo)",
+      status: "init_enqueue_provision",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(0),
+      branch: null,
+      pullRequest: null,
+      sessions: [
+        {
+          id: "status-prov-session",
+          sessionId: "status-prov-session",
+          sandboxSessionId: null,
+          sessionName: "Session 1",
+          agent: "Claude",
+          model: "sonnet",
+          status: "pending_provision",
+          thinkingSinceMs: null,
+          unread: false,
+          created: false,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: [],
+        },
+      ],
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 0,
+    },
+    {
+      id: "stress-transcript",
+      repoId: "sandbox-agent",
+      title: "Transcript virtualization stress test",
+      status: "idle",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(40),
+      branch: "perf/transcript-virtualizer",
+      pullRequest: null,
+      sessions: [
+        {
+          id: "stress-transcript-tab",
+          sessionId: "stress-transcript-session",
+          sessionName: "Virtualizer stress session",
+          agent: "Codex",
+          model: "gpt-5.3-codex",
+          status: "idle",
+          thinkingSinceMs: null,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("stress-transcript-tab", buildTranscriptStressMessages(1600)),
+        },
+      ],
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 18,
+    },
+    {
+      id: "status-running",
+      repoId: "sandbox-agent",
+      title: "Refactor WebSocket handler (running demo)",
+      status: "running",
+      repoName: "rivet-dev/sandbox-agent",
+      updatedAtMs: minutesAgo(1),
+      branch: "refactor/ws-handler",
+      pullRequest: null,
+      sessions: [
+        {
+          id: "status-run-session",
+          sessionId: "status-run-session",
+          sessionName: "WS refactor",
+          agent: "Codex",
+          model: "gpt-5.3-codex",
+          status: "running",
+          thinkingSinceMs: Date.now() - 12_000,
+          unread: false,
+          created: true,
+          draft: { text: "", attachments: [], updatedAtMs: null },
+          transcript: transcriptFromLegacyMessages("status-run-session", [
+            {
+              id: "sr1",
+              role: "user",
+              agent: null,
+              createdAtMs: minutesAgo(3),
+              lines: ["Refactor the WebSocket handler to use a connection pool pattern."],
+            },
+          ]),
+        },
+      ],
+      fileChanges: [],
+      diffs: {},
+      fileTree: [],
+      minutesUsed: 2,
+    },
+  ];
+}
+
+/**
+ * Build repos list from the rivet-dev fixture data (scripts/data/rivet-dev.json).
+ * Uses real public repos so the mock sidebar matches what an actual rivet-dev
+ * organization would show after a GitHub sync.
+ */
+function buildMockRepos(): WorkspaceRepo[] {
+  return rivetDevFixture.repos.map((r) => ({
+    id: repoIdFromFullName(r.fullName),
+    label: r.fullName,
+  }));
+}
+
+/** Derive a stable short id from a "org/repo" full name (e.g. "rivet-dev/rivet" → "rivet"). */
+function repoIdFromFullName(fullName: string): string {
+  const parts = fullName.split("/");
+  return parts[parts.length - 1] ?? fullName;
+}
+
+export function buildInitialMockLayoutViewModel(): TaskWorkspaceSnapshot {
+  const repos = buildMockRepos();
+  const tasks = buildInitialTasks();
+  return {
+    organizationId: "default",
+    repos,
+    repositories: groupWorkspaceRepositories(repos, tasks),
+    tasks,
+  };
+}
+
+export function groupWorkspaceRepositories(repos: WorkspaceRepo[], tasks: Task[]): WorkspaceRepositorySection[] {
+  const grouped = new Map<string, WorkspaceRepositorySection>();
+
+  for (const repo of repos) {
+    grouped.set(repo.id, {
+      id: repo.id,
+      label: repo.label,
+      updatedAtMs: 0,
+      tasks: [],
+    });
+  }
+
+  for (const task of tasks) {
+    const existing = grouped.get(task.repoId) ?? {
+      id: task.repoId,
+      label: task.repoName,
+      updatedAtMs: 0,
+      tasks: [],
+    };
+
+    existing.tasks.push(task);
+    existing.updatedAtMs = Math.max(existing.updatedAtMs, task.updatedAtMs);
+    grouped.set(task.repoId, existing);
+  }
+
+  return [...grouped.values()]
+    .map((repository) => ({
+      ...repository,
+      tasks: [...repository.tasks].sort((a, b) => b.updatedAtMs - a.updatedAtMs),
+      updatedAtMs: repository.tasks.length > 0 ? Math.max(...repository.tasks.map((task) => task.updatedAtMs)) : repository.updatedAtMs,
+    }))
+    .filter((repository) => repository.tasks.length > 0)
+    .sort((a, b) => b.updatedAtMs - a.updatedAtMs);
+}
diff --git a/foundry/packages/client/test/e2e/full-integration-e2e.test.ts b/foundry/packages/client/test/e2e/full-integration-e2e.test.ts
new file mode 100644
index 0000000..21eaf6b
--- /dev/null
+++ b/foundry/packages/client/test/e2e/full-integration-e2e.test.ts
@@ -0,0 +1,146 @@
+import { randomUUID } from "node:crypto";
+import { describe, expect, it } from "vitest";
+import type { AuditLogEvent as HistoryEvent, RepoOverview } from "@sandbox-agent/foundry-shared";
+import { createBackendClient } from "../../src/backend-client.js";
+import { requireImportedRepo } from "./helpers.js";
+
+const RUN_FULL_E2E = process.env.HF_ENABLE_DAEMON_FULL_E2E === "1";
+
+function requiredEnv(name: string): string {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    throw new Error(`Missing required env var: ${name}`);
+  }
+  return value;
+}
+
+function parseGithubRepo(input: string): { fullName: string } {
+  const trimmed = input.trim();
+  const shorthand = trimmed.match(/^([a-zA-Z0-9_.-]+)\/([a-zA-Z0-9_.-]+)$/);
+  if (shorthand) {
+    return { fullName: `${shorthand[1]}/${shorthand[2]}` };
+  }
+
+  const url = new URL(trimmed.startsWith("http") ? trimmed : `https://${trimmed}`);
+  const parts = url.pathname.replace(/^\/+/, "").split("/").filter(Boolean);
+  if (url.hostname.toLowerCase().includes("github.com") && parts.length >= 2) {
+    return { fullName: `${parts[0]}/${(parts[1] ?? "").replace(/\.git$/, "")}` };
+  }
+
+  throw new Error(`Unable to parse GitHub repo from: ${input}`);
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function poll<T>(label: string, timeoutMs: number, intervalMs: number, fn: () => Promise<T>, isDone: (value: T) => boolean): Promise<T> {
+  const start = Date.now();
+  let last: T;
+  for (;;) {
+    last = await fn();
+    if (isDone(last)) {
+      return last;
+    }
+    if (Date.now() - start > timeoutMs) {
+      throw new Error(`timed out waiting for ${label}`);
+    }
+    await sleep(intervalMs);
+  }
+}
+
+function parseHistoryPayload(event: HistoryEvent): Record<string, unknown> {
+  try {
+    return JSON.parse(event.payloadJson) as Record<string, unknown>;
+  } catch {
+    return {};
+  }
+}
+
+async function githubApi(token: string, path: string, init?: RequestInit): Promise<Response> {
+  const url = `https://api.github.com/${path.replace(/^\/+/, "")}`;
+  return await fetch(url, {
+    ...init,
+    headers: {
+      Accept: "application/vnd.github+json",
+      Authorization: `Bearer ${token}`,
+      "X-GitHub-Api-Version": "2022-11-28",
+      ...(init?.headers ?? {}),
+    },
+  });
+}
+
+async function ensureRemoteBranchExists(token: string, fullName: string, branchName: string): Promise<void> {
+  const repoRes = await githubApi(token, `repos/${fullName}`, { method: "GET" });
+  if (!repoRes.ok) {
+    throw new Error(`GitHub repo lookup failed: ${repoRes.status} ${await repoRes.text()}`);
+  }
+  const repo = (await repoRes.json()) as { default_branch?: string };
+  const defaultBranch = repo.default_branch;
+  if (!defaultBranch) {
+    throw new Error(`GitHub repo default branch is missing for ${fullName}`);
+  }
+
+  const defaultRefRes = await githubApi(token, `repos/${fullName}/git/ref/heads/${encodeURIComponent(defaultBranch)}`, { method: "GET" });
+  if (!defaultRefRes.ok) {
+    throw new Error(`GitHub default ref lookup failed: ${defaultRefRes.status} ${await defaultRefRes.text()}`);
+  }
+  const defaultRef = (await defaultRefRes.json()) as { object?: { sha?: string } };
+  const sha = defaultRef.object?.sha;
+  if (!sha) {
+    throw new Error(`GitHub default ref sha missing for ${fullName}:${defaultBranch}`);
+  }
+
+  const createRefRes = await githubApi(token, `repos/${fullName}/git/refs`, {
+    method: "POST",
+    body: JSON.stringify({
+      ref: `refs/heads/${branchName}`,
+      sha,
+    }),
+    headers: { "Content-Type": "application/json" },
+  });
+  if (createRefRes.ok || createRefRes.status === 422) {
+    return;
+  }
+
+  throw new Error(`GitHub create ref failed: ${createRefRes.status} ${await createRefRes.text()}`);
+}
+
+describe("e2e(client): full integration stack workflow", () => {
+  it.skipIf(!RUN_FULL_E2E)("uses an imported repo, loads branch graph, and executes a stack restack action", { timeout: 8 * 60_000 }, async () => {
+    const endpoint = process.env.HF_E2E_BACKEND_ENDPOINT?.trim() || "http://127.0.0.1:7741/v1/rivet";
+    const organizationId = process.env.HF_E2E_WORKSPACE?.trim() || "default";
+    const repoRemote = requiredEnv("HF_E2E_GITHUB_REPO");
+    const githubToken = requiredEnv("GITHUB_TOKEN");
+    const { fullName } = parseGithubRepo(repoRemote);
+    const normalizedRepoRemote = `https://github.com/${fullName}.git`;
+    const seededBranch = `e2e/full-seed-${Date.now().toString(36)}-${randomUUID().slice(0, 8)}`;
+
+    const client = createBackendClient({
+      endpoint,
+      defaultOrganizationId: organizationId,
+    });
+
+    try {
+      await ensureRemoteBranchExists(githubToken, fullName, seededBranch);
+
+      const repo = await requireImportedRepo(client, organizationId, repoRemote);
+      expect(repo.remoteUrl).toBe(normalizedRepoRemote);
+
+      const overview = await poll<RepoOverview>(
+        "repo overview includes seeded branch",
+        90_000,
+        1_000,
+        async () => client.getRepoOverview(organizationId, repo.repoId),
+        (value) => value.branches.some((row: RepoOverview["branches"][number]) => row.branchName === seededBranch),
+      );
+
+      const postActionOverview = await client.getRepoOverview(organizationId, repo.repoId);
+      const seededRow = postActionOverview.branches.find((row: RepoOverview["branches"][number]) => row.branchName === seededBranch);
+      expect(Boolean(seededRow)).toBe(true);
+      expect(postActionOverview.fetchedAt).toBeGreaterThanOrEqual(overview.fetchedAt);
+    } finally {
+      await githubApi(githubToken, `repos/${fullName}/git/refs/heads/${encodeURIComponent(seededBranch)}`, { method: "DELETE" }).catch(() => {});
+    }
+  });
+});
diff --git a/foundry/packages/client/test/e2e/github-pr-e2e.test.ts b/foundry/packages/client/test/e2e/github-pr-e2e.test.ts
new file mode 100644
index 0000000..89dd638
--- /dev/null
+++ b/foundry/packages/client/test/e2e/github-pr-e2e.test.ts
@@ -0,0 +1,333 @@
+import { describe, expect, it } from "vitest";
+import type { AuditLogEvent as HistoryEvent, TaskRecord } from "@sandbox-agent/foundry-shared";
+import { createBackendClient } from "../../src/backend-client.js";
+import { requireImportedRepo } from "./helpers.js";
+
+const RUN_E2E = process.env.HF_ENABLE_DAEMON_E2E === "1";
+
+function requiredEnv(name: string): string {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    throw new Error(`Missing required env var: ${name}`);
+  }
+  return value;
+}
+
+function parseGithubRepo(input: string): { owner: string; repo: string; fullName: string } {
+  const trimmed = input.trim();
+  if (!trimmed) {
+    throw new Error("HF_E2E_GITHUB_REPO is empty");
+  }
+
+  // owner/repo shorthand
+  const shorthand = trimmed.match(/^([a-zA-Z0-9_.-]+)\/([a-zA-Z0-9_.-]+)$/);
+  if (shorthand) {
+    const owner = shorthand[1]!;
+    const repo = shorthand[2]!;
+    return { owner, repo, fullName: `${owner}/${repo}` };
+  }
+
+  // https://github.com/owner/repo(.git)?(/...)?
+  try {
+    const url = new URL(trimmed.startsWith("http") ? trimmed : `https://${trimmed}`);
+    const parts = url.pathname.replace(/^\/+/, "").split("/").filter(Boolean);
+    if (url.hostname.toLowerCase().includes("github.com") && parts.length >= 2) {
+      const owner = parts[0]!;
+      const repo = (parts[1] ?? "").replace(/\.git$/, "");
+      if (owner && repo) {
+        return { owner, repo, fullName: `${owner}/${repo}` };
+      }
+    }
+  } catch {
+    // fall through
+  }
+
+  throw new Error(`Unable to parse GitHub repo from: ${input}`);
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise((r) => setTimeout(r, ms));
+}
+
+async function poll<T>(
+  label: string,
+  timeoutMs: number,
+  intervalMs: number,
+  fn: () => Promise<T>,
+  isDone: (value: T) => boolean,
+  onTick?: (value: T) => void,
+): Promise<T> {
+  const start = Date.now();
+  let last: T;
+  for (;;) {
+    last = await fn();
+    onTick?.(last);
+    if (isDone(last)) {
+      return last;
+    }
+    if (Date.now() - start > timeoutMs) {
+      throw new Error(`timed out waiting for ${label}`);
+    }
+    await sleep(intervalMs);
+  }
+}
+
+function parseHistoryPayload(event: HistoryEvent): Record<string, unknown> {
+  try {
+    return JSON.parse(event.payloadJson) as Record<string, unknown>;
+  } catch {
+    return {};
+  }
+}
+
+async function debugDump(client: ReturnType<typeof createBackendClient>, organizationId: string, repoId: string, taskId: string): Promise<string> {
+  try {
+    const task = await client.getTask(organizationId, repoId, taskId);
+    const detail = await client.getTaskDetail(organizationId, repoId, taskId).catch(() => null);
+    const history = await client.listHistory({ organizationId, taskId, limit: 80 }).catch(() => []);
+    const historySummary = history
+      .slice(0, 20)
+      .map((e) => `${new Date(e.createdAt).toISOString()} ${e.kind}`)
+      .join("\n");
+
+    let sessionEventsSummary = "";
+    const activeSessionId = detail?.activeSessionId ?? null;
+    if (task.activeSandboxId && activeSessionId) {
+      const events = await client
+        .listSandboxSessionEvents(organizationId, task.sandboxProviderId, task.activeSandboxId, {
+          sessionId: activeSessionId,
+          limit: 50,
+        })
+        .then((r) => r.items)
+        .catch(() => []);
+      sessionEventsSummary = events
+        .slice(-12)
+        .map((e) => `${new Date(e.createdAt).toISOString()} ${e.sender}`)
+        .join("\n");
+    }
+
+    return [
+      "=== task ===",
+      JSON.stringify(
+        {
+          status: task.status,
+          title: task.title,
+          branchName: task.branchName,
+          activeSandboxId: task.activeSandboxId,
+          activeSessionId,
+          pullRequestUrl: detail?.pullRequest?.url ?? null,
+        },
+        null,
+        2,
+      ),
+      "=== history (most recent first) ===",
+      historySummary || "(none)",
+      "=== session events (tail) ===",
+      sessionEventsSummary || "(none)",
+    ].join("\n");
+  } catch (err) {
+    return `debug dump failed: ${err instanceof Error ? err.message : String(err)}`;
+  }
+}
+
+async function githubApi(token: string, path: string, init?: RequestInit): Promise<Response> {
+  const url = `https://api.github.com/${path.replace(/^\/+/, "")}`;
+  return await fetch(url, {
+    ...init,
+    headers: {
+      Accept: "application/vnd.github+json",
+      Authorization: `Bearer ${token}`,
+      "X-GitHub-Api-Version": "2022-11-28",
+      ...(init?.headers ?? {}),
+    },
+  });
+}
+
+describe("e2e: backend -> sandbox-agent -> git -> PR", () => {
+  it.skipIf(!RUN_E2E)("creates a task, waits for agent to implement, and opens a PR", { timeout: 15 * 60_000 }, async () => {
+    const endpoint = process.env.HF_E2E_BACKEND_ENDPOINT?.trim() || "http://127.0.0.1:7741/v1/rivet";
+    const organizationId = process.env.HF_E2E_WORKSPACE?.trim() || "default";
+    const repoRemote = requiredEnv("HF_E2E_GITHUB_REPO");
+    const githubToken = requiredEnv("GITHUB_TOKEN");
+
+    const { fullName } = parseGithubRepo(repoRemote);
+    const runId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+    const expectedFile = `e2e/${runId}.txt`;
+
+    const client = createBackendClient({
+      endpoint,
+      defaultOrganizationId: organizationId,
+    });
+
+    const repo = await requireImportedRepo(client, organizationId, repoRemote);
+
+    const created = await client.createTask({
+      organizationId,
+      repoId: repo.repoId,
+      task: [
+        "E2E test task:",
+        `1. Create a new file at ${expectedFile} containing the single line: ${runId}`,
+        "2. git add the file",
+        `3. git commit -m \"test(e2e): ${runId}\"`,
+        "4. git push the branch to origin",
+        "5. Stop when done (agent should go idle).",
+      ].join("\n"),
+      sandboxProviderId: "local",
+      explicitTitle: `test(e2e): ${runId}`,
+      explicitBranchName: `e2e/${runId}`,
+    });
+
+    let prNumber: number | null = null;
+    let branchName: string | null = null;
+    let sandboxId: string | null = null;
+    let sessionId: string | null = null;
+    let lastStatus: string | null = null;
+
+    try {
+      const namedAndProvisioned = await poll<TaskRecord>(
+        "task naming + sandbox provisioning",
+        // Cold local sandbox startup can exceed a few minutes on first run.
+        8 * 60_000,
+        1_000,
+        async () => client.getTask(organizationId, repo.repoId, created.taskId),
+        (h) => Boolean(h.title && h.branchName && h.activeSandboxId),
+        (h) => {
+          if (h.status !== lastStatus) {
+            lastStatus = h.status;
+          }
+          if (h.status === "error") {
+            throw new Error("task entered error state during provisioning");
+          }
+        },
+      ).catch(async (err) => {
+        const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+        throw new Error(`${err instanceof Error ? err.message : String(err)}\n${dump}`);
+      });
+
+      branchName = namedAndProvisioned.branchName!;
+      sandboxId = namedAndProvisioned.activeSandboxId!;
+
+      const withSession = await poll<Awaited<ReturnType<typeof client.getTaskDetail>>>(
+        "task to create active session",
+        3 * 60_000,
+        1_500,
+        async () => client.getTaskDetail(organizationId, repo.repoId, created.taskId),
+        (h) => Boolean(h.activeSessionId),
+        (h) => {
+          if (h.status === "error") {
+            throw new Error("task entered error state while waiting for active session");
+          }
+        },
+      ).catch(async (err) => {
+        const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+        throw new Error(`${err instanceof Error ? err.message : String(err)}\n${dump}`);
+      });
+
+      sessionId = withSession.activeSessionId!;
+
+      await poll<{ id: string }[]>(
+        "session transcript bootstrap events",
+        2 * 60_000,
+        2_000,
+        async () =>
+          (
+            await client.listSandboxSessionEvents(organizationId, namedAndProvisioned.sandboxProviderId, sandboxId!, {
+              sessionId: sessionId!,
+              limit: 40,
+            })
+          ).items,
+        (events) => events.length > 0,
+      ).catch(async (err) => {
+        const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+        throw new Error(`${err instanceof Error ? err.message : String(err)}\n${dump}`);
+      });
+
+      await poll<TaskRecord>(
+        "task to reach idle state",
+        8 * 60_000,
+        2_000,
+        async () => client.getTask(organizationId, repo.repoId, created.taskId),
+        (h) => h.status === "idle",
+        (h) => {
+          if (h.status === "error") {
+            throw new Error("task entered error state while waiting for idle");
+          }
+        },
+      ).catch(async (err) => {
+        const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+        throw new Error(`${err instanceof Error ? err.message : String(err)}\n${dump}`);
+      });
+
+      const prCreatedEvent = await poll<HistoryEvent[]>(
+        "PR creation history event",
+        3 * 60_000,
+        2_000,
+        async () => client.listHistory({ organizationId, taskId: created.taskId, limit: 200 }),
+        (events) => events.some((e) => e.kind === "task.pr_created"),
+      )
+        .catch(async (err) => {
+          const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+          throw new Error(`${err instanceof Error ? err.message : String(err)}\n${dump}`);
+        })
+        .then((events) => events.find((e) => e.kind === "task.pr_created")!);
+
+      const payload = parseHistoryPayload(prCreatedEvent);
+      prNumber = Number(payload.prNumber);
+      const prUrl = String(payload.prUrl ?? "");
+
+      expect(prNumber).toBeGreaterThan(0);
+      expect(prUrl).toContain("/pull/");
+
+      const prFilesRes = await githubApi(githubToken, `repos/${fullName}/pulls/${prNumber}/files?per_page=100`, { method: "GET" });
+      if (!prFilesRes.ok) {
+        const body = await prFilesRes.text();
+        throw new Error(`GitHub PR files request failed: ${prFilesRes.status} ${body}`);
+      }
+      const prFiles = (await prFilesRes.json()) as Array<{ filename: string }>;
+      expect(prFiles.some((f) => f.filename === expectedFile)).toBe(true);
+
+      // Close the task and assert the sandbox is released (stopped).
+      await client.runAction(organizationId, repo.repoId, created.taskId, "archive");
+
+      await poll<Awaited<ReturnType<typeof client.getTaskDetail>>>(
+        "task to become archived (session released)",
+        60_000,
+        1_000,
+        async () => client.getTaskDetail(organizationId, repo.repoId, created.taskId),
+        (h) => h.status === "archived" && h.activeSessionId === null,
+      ).catch(async (err) => {
+        const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+        throw new Error(`${err instanceof Error ? err.message : String(err)}\n${dump}`);
+      });
+
+      if (sandboxId) {
+        await poll<{ sandboxProviderId: string; sandboxId: string; state: string; at: number }>(
+          "sandbox to stop",
+          2 * 60_000,
+          2_000,
+          async () => client.sandboxProviderState(organizationId, "local", sandboxId!),
+          (s) => {
+            const st = String(s.state).toLowerCase();
+            return st.includes("destroyed") || st.includes("stopped") || st.includes("suspended") || st.includes("paused");
+          },
+        ).catch(async (err) => {
+          const dump = await debugDump(client, organizationId, repo.repoId, created.taskId);
+          const state = await client.sandboxProviderState(organizationId, "local", sandboxId!).catch(() => null);
+          throw new Error(`${err instanceof Error ? err.message : String(err)}\n` + `sandbox state: ${state ? state.state : "unknown"}\n` + `${dump}`);
+        });
+      }
+    } finally {
+      if (prNumber && Number.isFinite(prNumber)) {
+        await githubApi(githubToken, `repos/${fullName}/pulls/${prNumber}`, {
+          method: "PATCH",
+          body: JSON.stringify({ state: "closed" }),
+          headers: { "Content-Type": "application/json" },
+        }).catch(() => {});
+      }
+
+      if (branchName) {
+        await githubApi(githubToken, `repos/${fullName}/git/refs/heads/${encodeURIComponent(branchName)}`, { method: "DELETE" }).catch(() => {});
+      }
+    }
+  });
+});
diff --git a/foundry/packages/client/test/e2e/helpers.ts b/foundry/packages/client/test/e2e/helpers.ts
new file mode 100644
index 0000000..0e15c51
--- /dev/null
+++ b/foundry/packages/client/test/e2e/helpers.ts
@@ -0,0 +1,84 @@
+import type { RepoRecord } from "@sandbox-agent/foundry-shared";
+import type { BackendClient } from "../../src/backend-client.js";
+
+function normalizeRepoSelector(value: string): string {
+  let normalized = value.trim();
+  if (!normalized) {
+    return "";
+  }
+
+  normalized = normalized.replace(/\/+$/, "");
+  if (/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(normalized)) {
+    return `https://github.com/${normalized}.git`;
+  }
+
+  if (/^(?:www\.)?github\.com\/.+/i.test(normalized)) {
+    normalized = `https://${normalized.replace(/^www\./i, "")}`;
+  }
+
+  try {
+    if (/^https?:\/\//i.test(normalized)) {
+      const url = new URL(normalized);
+      const hostname = url.hostname.replace(/^www\./i, "");
+      if (hostname.toLowerCase() === "github.com") {
+        const parts = url.pathname.split("/").filter(Boolean);
+        if (parts.length >= 2) {
+          return `${url.protocol}//${hostname}/${parts[0]}/${(parts[1] ?? "").replace(/\.git$/i, "")}.git`;
+        }
+      }
+      url.search = "";
+      url.hash = "";
+      return url.toString().replace(/\/+$/, "");
+    }
+  } catch {
+    // Keep the selector as-is for matching below.
+  }
+
+  return normalized;
+}
+
+function githubRepoFullNameFromSelector(value: string): string | null {
+  const normalized = normalizeRepoSelector(value);
+  try {
+    const url = new URL(normalized);
+    if (url.hostname.replace(/^www\./i, "").toLowerCase() !== "github.com") {
+      return null;
+    }
+    const parts = url.pathname.replace(/\/+$/, "").split("/").filter(Boolean);
+    if (parts.length < 2) {
+      return null;
+    }
+    return `${parts[0]}/${(parts[1] ?? "").replace(/\.git$/i, "")}`;
+  } catch {
+    return null;
+  }
+}
+
+export async function requireImportedRepo(client: BackendClient, organizationId: string, repoSelector: string): Promise<RepoRecord> {
+  const selector = repoSelector.trim();
+  if (!selector) {
+    throw new Error("Missing repo selector");
+  }
+
+  const normalizedSelector = normalizeRepoSelector(selector);
+  const selectorFullName = githubRepoFullNameFromSelector(selector);
+  const repos = await client.listRepos(organizationId);
+  const match = repos.find((repo) => {
+    if (repo.repoId === selector) {
+      return true;
+    }
+    if (normalizeRepoSelector(repo.remoteUrl) === normalizedSelector) {
+      return true;
+    }
+    const repoFullName = githubRepoFullNameFromSelector(repo.remoteUrl);
+    return Boolean(selectorFullName && repoFullName && repoFullName === selectorFullName);
+  });
+
+  if (!match) {
+    throw new Error(
+      `Repo not available in organization ${organizationId}: ${repoSelector}. Create it in GitHub first, then sync repos in Foundry before running this test.`,
+    );
+  }
+
+  return match;
+}
diff --git a/foundry/packages/client/test/e2e/workspace-e2e.test.ts b/foundry/packages/client/test/e2e/workspace-e2e.test.ts
new file mode 100644
index 0000000..1de2065
--- /dev/null
+++ b/foundry/packages/client/test/e2e/workspace-e2e.test.ts
@@ -0,0 +1,307 @@
+import { describe, expect, it } from "vitest";
+import type { TaskWorkspaceSnapshot, WorkspaceSession, WorkspaceTask, WorkspaceModelId, WorkspaceTranscriptEvent } from "@sandbox-agent/foundry-shared";
+import { createBackendClient } from "../../src/backend-client.js";
+import { requireImportedRepo } from "./helpers.js";
+
+const RUN_WORKBENCH_E2E = process.env.HF_ENABLE_DAEMON_WORKBENCH_E2E === "1";
+
+function requiredEnv(name: string): string {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    throw new Error(`Missing required env var: ${name}`);
+  }
+  return value;
+}
+
+function workspaceModelEnv(name: string, fallback: WorkspaceModelId): WorkspaceModelId {
+  const value = process.env[name]?.trim();
+  return value && value.length > 0 ? value : fallback;
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function poll<T>(label: string, timeoutMs: number, intervalMs: number, fn: () => Promise<T>, isDone: (value: T) => boolean): Promise<T> {
+  const startedAt = Date.now();
+  let lastValue: T;
+
+  for (;;) {
+    lastValue = await fn();
+    if (isDone(lastValue)) {
+      return lastValue;
+    }
+    if (Date.now() - startedAt > timeoutMs) {
+      throw new Error(`timed out waiting for ${label}`);
+    }
+    await sleep(intervalMs);
+  }
+}
+
+function findTask(snapshot: TaskWorkspaceSnapshot, taskId: string): WorkspaceTask {
+  const task = snapshot.tasks.find((candidate) => candidate.id === taskId);
+  if (!task) {
+    throw new Error(`task ${taskId} missing from snapshot`);
+  }
+  return task;
+}
+
+function findTab(task: WorkspaceTask, sessionId: string): WorkspaceSession {
+  const tab = task.sessions.find((candidate) => candidate.id === sessionId);
+  if (!tab) {
+    throw new Error(`tab ${sessionId} missing from task ${task.id}`);
+  }
+  return tab;
+}
+
+function extractEventText(event: WorkspaceTranscriptEvent): string {
+  const payload = event.payload;
+  if (!payload || typeof payload !== "object") {
+    return String(payload ?? "");
+  }
+
+  const envelope = payload as {
+    method?: unknown;
+    params?: unknown;
+    result?: unknown;
+    error?: unknown;
+  };
+
+  const params = envelope.params;
+  if (params && typeof params === "object") {
+    const update = (params as { update?: unknown }).update;
+    if (update && typeof update === "object") {
+      const content = (update as { content?: unknown }).content;
+      if (content && typeof content === "object") {
+        const chunkText = (content as { text?: unknown }).text;
+        if (typeof chunkText === "string") {
+          return chunkText;
+        }
+      }
+    }
+
+    const text = (params as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim()) {
+      return text.trim();
+    }
+    const prompt = (params as { prompt?: Array<{ text?: unknown }> }).prompt;
+    if (Array.isArray(prompt)) {
+      const value = prompt
+        .map((item) => (typeof item?.text === "string" ? item.text.trim() : ""))
+        .filter(Boolean)
+        .join("\n");
+      if (value) {
+        return value;
+      }
+    }
+  }
+
+  const result = envelope.result;
+  if (result && typeof result === "object") {
+    const text = (result as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim()) {
+      return text.trim();
+    }
+  }
+
+  if (envelope.error) {
+    return JSON.stringify(envelope.error);
+  }
+
+  if (typeof envelope.method === "string") {
+    return envelope.method;
+  }
+
+  return JSON.stringify(payload);
+}
+
+function transcriptIncludesAgentText(transcript: WorkspaceTranscriptEvent[], expectedText: string): boolean {
+  return transcript
+    .filter((event) => event.sender === "agent")
+    .map((event) => extractEventText(event))
+    .join("")
+    .includes(expectedText);
+}
+
+describe("e2e(client): workspace flows", () => {
+  it.skipIf(!RUN_WORKBENCH_E2E)(
+    "creates a task from an imported repo, adds sessions, exchanges messages, and manages workspace state",
+    { timeout: 20 * 60_000 },
+    async () => {
+      const endpoint = process.env.HF_E2E_BACKEND_ENDPOINT?.trim() || "http://127.0.0.1:7741/v1/rivet";
+      const organizationId = process.env.HF_E2E_WORKSPACE?.trim() || "default";
+      const repoRemote = requiredEnv("HF_E2E_GITHUB_REPO");
+      const model = workspaceModelEnv("HF_E2E_MODEL", "gpt-5.3-codex");
+      const runId = `wb-${Date.now().toString(36)}`;
+      const expectedFile = `${runId}.txt`;
+      const expectedInitialReply = `WORKBENCH_READY_${runId}`;
+      const expectedReply = `WORKBENCH_ACK_${runId}`;
+
+      const client = createBackendClient({
+        endpoint,
+        defaultOrganizationId: organizationId,
+      });
+
+      const repo = await requireImportedRepo(client, organizationId, repoRemote);
+      const created = await client.createWorkspaceTask(organizationId, {
+        repoId: repo.repoId,
+        title: `Workspace E2E ${runId}`,
+        branch: `e2e/${runId}`,
+        model,
+        task: `Reply with exactly: ${expectedInitialReply}`,
+      });
+
+      const provisioned = await poll(
+        "task provisioning",
+        12 * 60_000,
+        2_000,
+        async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+        (task) => task.branch === `e2e/${runId}` && task.sessions.length > 0,
+      );
+
+      const primaryTab = provisioned.sessions[0]!;
+
+      const initialCompleted = await poll(
+        "initial agent response",
+        12 * 60_000,
+        2_000,
+        async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+        (task) => {
+          const tab = findTab(task, primaryTab.id);
+          return task.status === "idle" && tab.status === "idle" && transcriptIncludesAgentText(tab.transcript, expectedInitialReply);
+        },
+      );
+
+      expect(findTab(initialCompleted, primaryTab.id).sessionId).toBeTruthy();
+      expect(transcriptIncludesAgentText(findTab(initialCompleted, primaryTab.id).transcript, expectedInitialReply)).toBe(true);
+
+      await client.renameWorkspaceTask(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        value: `Workspace E2E ${runId} Renamed`,
+      });
+      await client.renameWorkspaceSession(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        sessionId: primaryTab.id,
+        title: "Primary Session",
+      });
+
+      const secondTab = await client.createWorkspaceSession(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        model,
+      });
+
+      await client.renameWorkspaceSession(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        sessionId: secondTab.sessionId,
+        title: "Follow-up Session",
+      });
+
+      await client.updateWorkspaceDraft(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        sessionId: secondTab.sessionId,
+        text: [
+          `Create a file named ${expectedFile} in the repo root.`,
+          `Write exactly this single line into the file: ${runId}`,
+          `Then reply with exactly: ${expectedReply}`,
+        ].join("\n"),
+        attachments: [
+          {
+            id: `${expectedFile}:1`,
+            filePath: expectedFile,
+            lineNumber: 1,
+            lineContent: runId,
+          },
+        ],
+      });
+
+      const drafted = findTask(await client.getWorkspace(organizationId), created.taskId);
+      expect(findTab(drafted, secondTab.sessionId).draft.text).toContain(expectedReply);
+      expect(findTab(drafted, secondTab.sessionId).draft.attachments).toHaveLength(1);
+
+      await client.sendWorkspaceMessage(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        sessionId: secondTab.sessionId,
+        text: [
+          `Create a file named ${expectedFile} in the repo root.`,
+          `Write exactly this single line into the file: ${runId}`,
+          `Then reply with exactly: ${expectedReply}`,
+        ].join("\n"),
+        attachments: [
+          {
+            id: `${expectedFile}:1`,
+            filePath: expectedFile,
+            lineNumber: 1,
+            lineContent: runId,
+          },
+        ],
+      });
+
+      const withSecondReply = await poll(
+        "follow-up session response",
+        10 * 60_000,
+        2_000,
+        async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+        (task) => {
+          const tab = findTab(task, secondTab.sessionId);
+          return (
+            tab.status === "idle" && transcriptIncludesAgentText(tab.transcript, expectedReply) && task.fileChanges.some((file) => file.path === expectedFile)
+          );
+        },
+      );
+
+      const secondTranscript = findTab(withSecondReply, secondTab.sessionId).transcript;
+      expect(transcriptIncludesAgentText(secondTranscript, expectedReply)).toBe(true);
+      expect(withSecondReply.fileChanges.some((file) => file.path === expectedFile)).toBe(true);
+
+      await client.setWorkspaceSessionUnread(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        sessionId: secondTab.sessionId,
+        unread: false,
+      });
+      await client.markWorkspaceUnread(organizationId, { repoId: repo.repoId, taskId: created.taskId });
+
+      const unreadSnapshot = findTask(await client.getWorkspace(organizationId), created.taskId);
+      expect(unreadSnapshot.sessions.some((tab) => tab.unread)).toBe(true);
+
+      await client.closeWorkspaceSession(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        sessionId: secondTab.sessionId,
+      });
+
+      const closedSnapshot = await poll(
+        "secondary session closed",
+        30_000,
+        1_000,
+        async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+        (task) => !task.sessions.some((tab) => tab.id === secondTab.sessionId),
+      );
+      expect(closedSnapshot.sessions).toHaveLength(1);
+
+      await client.revertWorkspaceFile(organizationId, {
+        repoId: repo.repoId,
+        taskId: created.taskId,
+        path: expectedFile,
+      });
+
+      const revertedSnapshot = await poll(
+        "file revert reflected in workspace",
+        30_000,
+        1_000,
+        async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+        (task) => !task.fileChanges.some((file) => file.path === expectedFile),
+      );
+
+      expect(revertedSnapshot.fileChanges.some((file) => file.path === expectedFile)).toBe(false);
+      expect(revertedSnapshot.title).toBe(`Workspace E2E ${runId} Renamed`);
+      expect(findTab(revertedSnapshot, primaryTab.id).sessionName).toBe("Primary Session");
+    },
+  );
+});
diff --git a/foundry/packages/client/test/e2e/workspace-load-e2e.test.ts b/foundry/packages/client/test/e2e/workspace-load-e2e.test.ts
new file mode 100644
index 0000000..f9fc244
--- /dev/null
+++ b/foundry/packages/client/test/e2e/workspace-load-e2e.test.ts
@@ -0,0 +1,314 @@
+import { describe, expect, it } from "vitest";
+import {
+  createFoundryLogger,
+  type TaskWorkspaceSnapshot,
+  type WorkspaceSession,
+  type WorkspaceTask,
+  type WorkspaceModelId,
+  type WorkspaceTranscriptEvent,
+} from "@sandbox-agent/foundry-shared";
+import { createBackendClient } from "../../src/backend-client.js";
+import { requireImportedRepo } from "./helpers.js";
+
+const RUN_WORKBENCH_LOAD_E2E = process.env.HF_ENABLE_DAEMON_WORKBENCH_LOAD_E2E === "1";
+const logger = createFoundryLogger({
+  service: "foundry-client-e2e",
+  bindings: {
+    suite: "workspace-load",
+  },
+});
+
+function requiredEnv(name: string): string {
+  const value = process.env[name]?.trim();
+  if (!value) {
+    throw new Error(`Missing required env var: ${name}`);
+  }
+  return value;
+}
+
+function workspaceModelEnv(name: string, fallback: WorkspaceModelId): WorkspaceModelId {
+  const value = process.env[name]?.trim();
+  return value && value.length > 0 ? value : fallback;
+}
+
+function intEnv(name: string, fallback: number): number {
+  const raw = process.env[name]?.trim();
+  if (!raw) {
+    return fallback;
+  }
+  const value = Number.parseInt(raw, 10);
+  return Number.isFinite(value) && value > 0 ? value : fallback;
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function poll<T>(label: string, timeoutMs: number, intervalMs: number, fn: () => Promise<T>, isDone: (value: T) => boolean): Promise<T> {
+  const startedAt = Date.now();
+  let lastValue: T;
+
+  for (;;) {
+    lastValue = await fn();
+    if (isDone(lastValue)) {
+      return lastValue;
+    }
+    if (Date.now() - startedAt > timeoutMs) {
+      throw new Error(`timed out waiting for ${label}`);
+    }
+    await sleep(intervalMs);
+  }
+}
+
+function findTask(snapshot: TaskWorkspaceSnapshot, taskId: string): WorkspaceTask {
+  const task = snapshot.tasks.find((candidate) => candidate.id === taskId);
+  if (!task) {
+    throw new Error(`task ${taskId} missing from snapshot`);
+  }
+  return task;
+}
+
+function findTab(task: WorkspaceTask, sessionId: string): WorkspaceSession {
+  const tab = task.sessions.find((candidate) => candidate.id === sessionId);
+  if (!tab) {
+    throw new Error(`tab ${sessionId} missing from task ${task.id}`);
+  }
+  return tab;
+}
+
+function extractEventText(event: WorkspaceTranscriptEvent): string {
+  const payload = event.payload;
+  if (!payload || typeof payload !== "object") {
+    return String(payload ?? "");
+  }
+
+  const envelope = payload as {
+    method?: unknown;
+    params?: unknown;
+    result?: unknown;
+  };
+
+  const params = envelope.params;
+  if (params && typeof params === "object") {
+    const update = (params as { update?: unknown }).update;
+    if (update && typeof update === "object") {
+      const content = (update as { content?: unknown }).content;
+      if (content && typeof content === "object") {
+        const chunkText = (content as { text?: unknown }).text;
+        if (typeof chunkText === "string") {
+          return chunkText;
+        }
+      }
+    }
+
+    const text = (params as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim()) {
+      return text.trim();
+    }
+
+    const prompt = (params as { prompt?: Array<{ text?: unknown }> }).prompt;
+    if (Array.isArray(prompt)) {
+      return prompt
+        .map((item) => (typeof item?.text === "string" ? item.text.trim() : ""))
+        .filter(Boolean)
+        .join("\n");
+    }
+  }
+
+  const result = envelope.result;
+  if (result && typeof result === "object") {
+    const text = (result as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim()) {
+      return text.trim();
+    }
+  }
+
+  return typeof envelope.method === "string" ? envelope.method : JSON.stringify(payload);
+}
+
+function transcriptIncludesAgentText(transcript: WorkspaceTranscriptEvent[], expectedText: string): boolean {
+  return transcript
+    .filter((event) => event.sender === "agent")
+    .map((event) => extractEventText(event))
+    .join("")
+    .includes(expectedText);
+}
+
+function average(values: number[]): number {
+  return values.reduce((sum, value) => sum + value, 0) / Math.max(values.length, 1);
+}
+
+async function measureWorkspaceSnapshot(
+  client: ReturnType<typeof createBackendClient>,
+  organizationId: string,
+  iterations: number,
+): Promise<{
+  avgMs: number;
+  maxMs: number;
+  payloadBytes: number;
+  taskCount: number;
+  tabCount: number;
+  transcriptEventCount: number;
+}> {
+  const durations: number[] = [];
+  let snapshot: TaskWorkspaceSnapshot | null = null;
+
+  for (let index = 0; index < iterations; index += 1) {
+    const startedAt = performance.now();
+    snapshot = await client.getWorkspace(organizationId);
+    durations.push(performance.now() - startedAt);
+  }
+
+  const finalSnapshot = snapshot ?? {
+    organizationId,
+    repos: [],
+    repositories: [],
+    tasks: [],
+  };
+  const payloadBytes = Buffer.byteLength(JSON.stringify(finalSnapshot), "utf8");
+  const tabCount = finalSnapshot.tasks.reduce((sum, task) => sum + task.sessions.length, 0);
+  const transcriptEventCount = finalSnapshot.tasks.reduce((sum, task) => sum + task.sessions.reduce((tabSum, tab) => tabSum + tab.transcript.length, 0), 0);
+
+  return {
+    avgMs: Math.round(average(durations)),
+    maxMs: Math.round(Math.max(...durations, 0)),
+    payloadBytes,
+    taskCount: finalSnapshot.tasks.length,
+    tabCount,
+    transcriptEventCount,
+  };
+}
+
+describe("e2e(client): workspace load", () => {
+  it.skipIf(!RUN_WORKBENCH_LOAD_E2E)("runs a simple sequential load profile against the real backend", { timeout: 30 * 60_000 }, async () => {
+    const endpoint = process.env.HF_E2E_BACKEND_ENDPOINT?.trim() || "http://127.0.0.1:7741/v1/rivet";
+    const organizationId = process.env.HF_E2E_WORKSPACE?.trim() || "default";
+    const repoRemote = requiredEnv("HF_E2E_GITHUB_REPO");
+    const model = workspaceModelEnv("HF_E2E_MODEL", "gpt-5.3-codex");
+    const taskCount = intEnv("HF_LOAD_TASK_COUNT", 3);
+    const extraSessionCount = intEnv("HF_LOAD_EXTRA_SESSION_COUNT", 2);
+    const pollIntervalMs = intEnv("HF_LOAD_POLL_INTERVAL_MS", 2_000);
+
+    const client = createBackendClient({
+      endpoint,
+      defaultOrganizationId: organizationId,
+    });
+
+    const repo = await requireImportedRepo(client, organizationId, repoRemote);
+    const createTaskLatencies: number[] = [];
+    const provisionLatencies: number[] = [];
+    const createSessionLatencies: number[] = [];
+    const messageRoundTripLatencies: number[] = [];
+    const snapshotSeries: Array<{
+      taskCount: number;
+      avgMs: number;
+      maxMs: number;
+      payloadBytes: number;
+      tabCount: number;
+      transcriptEventCount: number;
+    }> = [];
+
+    snapshotSeries.push(await measureWorkspaceSnapshot(client, organizationId, 2));
+
+    for (let taskIndex = 0; taskIndex < taskCount; taskIndex += 1) {
+      const runId = `load-${taskIndex}-${Date.now().toString(36)}`;
+      const initialReply = `LOAD_INIT_${runId}`;
+
+      const createStartedAt = performance.now();
+      const created = await client.createWorkspaceTask(organizationId, {
+        repoId: repo.repoId,
+        title: `Workspace Load ${runId}`,
+        branch: `load/${runId}`,
+        model,
+        task: `Reply with exactly: ${initialReply}`,
+      });
+      createTaskLatencies.push(performance.now() - createStartedAt);
+
+      const provisionStartedAt = performance.now();
+      const provisioned = await poll(
+        `task ${runId} provisioning`,
+        12 * 60_000,
+        pollIntervalMs,
+        async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+        (task) => {
+          const tab = task.sessions[0];
+          return Boolean(tab && task.status === "idle" && tab.status === "idle" && transcriptIncludesAgentText(tab.transcript, initialReply));
+        },
+      );
+      provisionLatencies.push(performance.now() - provisionStartedAt);
+
+      expect(provisioned.sessions.length).toBeGreaterThan(0);
+      const primaryTab = provisioned.sessions[0]!;
+      expect(transcriptIncludesAgentText(primaryTab.transcript, initialReply)).toBe(true);
+
+      for (let sessionIndex = 0; sessionIndex < extraSessionCount; sessionIndex += 1) {
+        const expectedReply = `LOAD_REPLY_${runId}_${sessionIndex}`;
+        const createSessionStartedAt = performance.now();
+        const createdSession = await client.createWorkspaceSession(organizationId, {
+          repoId: repo.repoId,
+          taskId: created.taskId,
+          model,
+        });
+        createSessionLatencies.push(performance.now() - createSessionStartedAt);
+
+        await client.sendWorkspaceMessage(organizationId, {
+          repoId: repo.repoId,
+          taskId: created.taskId,
+          sessionId: createdSession.sessionId,
+          text: `Run pwd in the repo, then reply with exactly: ${expectedReply}`,
+          attachments: [],
+        });
+
+        const messageStartedAt = performance.now();
+        const withReply = await poll(
+          `task ${runId} session ${sessionIndex} reply`,
+          10 * 60_000,
+          pollIntervalMs,
+          async () => findTask(await client.getWorkspace(organizationId), created.taskId),
+          (task) => {
+            const tab = findTab(task, createdSession.sessionId);
+            return tab.status === "idle" && transcriptIncludesAgentText(tab.transcript, expectedReply);
+          },
+        );
+        messageRoundTripLatencies.push(performance.now() - messageStartedAt);
+
+        expect(transcriptIncludesAgentText(findTab(withReply, createdSession.sessionId).transcript, expectedReply)).toBe(true);
+      }
+
+      const snapshotMetrics = await measureWorkspaceSnapshot(client, organizationId, 3);
+      snapshotSeries.push(snapshotMetrics);
+      logger.info(
+        {
+          taskIndex: taskIndex + 1,
+          ...snapshotMetrics,
+        },
+        "workspace_load_snapshot",
+      );
+    }
+
+    const firstSnapshot = snapshotSeries[0]!;
+    const lastSnapshot = snapshotSeries[snapshotSeries.length - 1]!;
+    const summary = {
+      taskCount,
+      extraSessionCount,
+      createTaskAvgMs: Math.round(average(createTaskLatencies)),
+      provisionAvgMs: Math.round(average(provisionLatencies)),
+      createSessionAvgMs: Math.round(average(createSessionLatencies)),
+      messageRoundTripAvgMs: Math.round(average(messageRoundTripLatencies)),
+      snapshotReadBaselineAvgMs: firstSnapshot.avgMs,
+      snapshotReadFinalAvgMs: lastSnapshot.avgMs,
+      snapshotReadFinalMaxMs: lastSnapshot.maxMs,
+      snapshotPayloadBaselineBytes: firstSnapshot.payloadBytes,
+      snapshotPayloadFinalBytes: lastSnapshot.payloadBytes,
+      snapshotTabFinalCount: lastSnapshot.tabCount,
+      snapshotTranscriptFinalCount: lastSnapshot.transcriptEventCount,
+    };
+
+    logger.info(summary, "workspace_load_summary");
+
+    expect(createTaskLatencies.length).toBe(taskCount);
+    expect(provisionLatencies.length).toBe(taskCount);
+    expect(createSessionLatencies.length).toBe(taskCount * extraSessionCount);
+    expect(messageRoundTripLatencies.length).toBe(taskCount * extraSessionCount);
+  });
+});
diff --git a/foundry/packages/client/test/keys.test.ts b/foundry/packages/client/test/keys.test.ts
new file mode 100644
index 0000000..6b93ec1
--- /dev/null
+++ b/foundry/packages/client/test/keys.test.ts
@@ -0,0 +1,13 @@
+import { describe, expect, it } from "vitest";
+import { auditLogKey, organizationKey, taskKey, taskSandboxKey } from "../src/keys.js";
+
+describe("actor keys", () => {
+  it("prefixes every key with organization namespace", () => {
+    const keys = [organizationKey("default"), taskKey("default", "repo", "task"), taskSandboxKey("default", "sbx"), auditLogKey("default")];
+
+    for (const key of keys) {
+      expect(key[0]).toBe("org");
+      expect(key[1]).toBe("default");
+    }
+  });
+});
diff --git a/foundry/packages/client/test/subscription-manager.test.ts b/foundry/packages/client/test/subscription-manager.test.ts
new file mode 100644
index 0000000..f0a29c2
--- /dev/null
+++ b/foundry/packages/client/test/subscription-manager.test.ts
@@ -0,0 +1,225 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { OrganizationEvent, OrganizationSummarySnapshot } from "@sandbox-agent/foundry-shared";
+import type { ActorConn, BackendClient } from "../src/backend-client.js";
+import { RemoteSubscriptionManager } from "../src/subscription/remote-manager.js";
+
+class FakeActorConn implements ActorConn {
+  private readonly listeners = new Map<string, Set<(payload: any) => void>>();
+  private readonly errorListeners = new Set<(error: unknown) => void>();
+  disposeCount = 0;
+
+  on(event: string, listener: (payload: any) => void): () => void {
+    let current = this.listeners.get(event);
+    if (!current) {
+      current = new Set();
+      this.listeners.set(event, current);
+    }
+    current.add(listener);
+    return () => {
+      current?.delete(listener);
+      if (current?.size === 0) {
+        this.listeners.delete(event);
+      }
+    };
+  }
+
+  onError(listener: (error: unknown) => void): () => void {
+    this.errorListeners.add(listener);
+    return () => {
+      this.errorListeners.delete(listener);
+    };
+  }
+
+  emit(event: string, payload: unknown): void {
+    for (const listener of this.listeners.get(event) ?? []) {
+      listener(payload);
+    }
+  }
+
+  emitError(error: unknown): void {
+    for (const listener of this.errorListeners) {
+      listener(error);
+    }
+  }
+
+  async dispose(): Promise<void> {
+    this.disposeCount += 1;
+  }
+}
+
+function organizationSnapshot(): OrganizationSummarySnapshot {
+  return {
+    organizationId: "org-1",
+    github: {
+      connectedAccount: "octocat",
+      installationStatus: "connected",
+      syncStatus: "synced",
+      importedRepoCount: 1,
+      lastSyncLabel: "Synced just now",
+      lastSyncAt: 10,
+      lastWebhookAt: null,
+      lastWebhookEvent: "",
+      syncGeneration: 1,
+      syncPhase: null,
+      processedRepositoryCount: 1,
+      totalRepositoryCount: 1,
+    },
+    repos: [{ id: "repo-1", label: "repo-1", taskCount: 1, latestActivityMs: 10 }],
+    taskSummaries: [
+      {
+        id: "task-1",
+        repoId: "repo-1",
+        title: "Initial task",
+        status: "idle",
+        repoName: "repo-1",
+        updatedAtMs: 10,
+        branch: "main",
+        pullRequest: null,
+        activeSessionId: null,
+        sessionsSummary: [],
+        primaryUserLogin: null,
+        primaryUserAvatarUrl: null,
+      },
+    ],
+  };
+}
+
+function createBackend(conn: FakeActorConn, snapshot: OrganizationSummarySnapshot): BackendClient {
+  return {
+    connectOrganization: vi.fn(async () => conn),
+    getOrganizationSummary: vi.fn(async () => snapshot),
+  } as unknown as BackendClient;
+}
+
+async function flushAsyncWork(): Promise<void> {
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
+describe("RemoteSubscriptionManager", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("shares one connection per topic key and applies incoming events", async () => {
+    const conn = new FakeActorConn();
+    const backend = createBackend(conn, organizationSnapshot());
+    const manager = new RemoteSubscriptionManager(backend);
+    const params = { organizationId: "org-1" } as const;
+    const listenerA = vi.fn();
+    const listenerB = vi.fn();
+
+    const unsubscribeA = manager.subscribe("organization", params, listenerA);
+    const unsubscribeB = manager.subscribe("organization", params, listenerB);
+    await flushAsyncWork();
+
+    expect(backend.connectOrganization).toHaveBeenCalledTimes(1);
+    expect(backend.getOrganizationSummary).toHaveBeenCalledTimes(1);
+    expect(manager.getStatus("organization", params)).toBe("connected");
+    expect(manager.getSnapshot("organization", params)?.taskSummaries[0]?.title).toBe("Initial task");
+    expect(manager.listDebugTopics()).toEqual([
+      expect.objectContaining({
+        topicKey: "organization",
+        cacheKey: "organization:org-1",
+        listenerCount: 2,
+        status: "connected",
+      }),
+    ]);
+
+    conn.emit("organizationUpdated", {
+      type: "organizationUpdated",
+      snapshot: {
+        organizationId: "org-1",
+        github: {
+          connectedAccount: "octocat",
+          installationStatus: "connected",
+          syncStatus: "syncing",
+          importedRepoCount: 1,
+          lastSyncLabel: "Syncing repositories...",
+          lastSyncAt: 10,
+          lastWebhookAt: null,
+          lastWebhookEvent: "",
+          syncGeneration: 2,
+          syncPhase: "syncing_branches",
+          processedRepositoryCount: 1,
+          totalRepositoryCount: 3,
+        },
+        repos: [],
+        taskSummaries: [
+          {
+            id: "task-1",
+            repoId: "repo-1",
+            title: "Updated task",
+            status: "running",
+            repoName: "repo-1",
+            updatedAtMs: 20,
+            branch: "feature/live",
+            pullRequest: null,
+            activeSessionId: null,
+            sessionsSummary: [],
+            primaryUserLogin: null,
+            primaryUserAvatarUrl: null,
+          },
+        ],
+      },
+    } satisfies OrganizationEvent);
+
+    // applyEvent chains onto an internal promise — flush the microtask queue
+    await flushAsyncWork();
+
+    expect(manager.getSnapshot("organization", params)?.taskSummaries[0]?.title).toBe("Updated task");
+    expect(listenerA).toHaveBeenCalled();
+    expect(listenerB).toHaveBeenCalled();
+    expect(manager.listDebugTopics()[0]?.lastRefreshAt).toEqual(expect.any(Number));
+
+    unsubscribeA();
+    unsubscribeB();
+    manager.dispose();
+  });
+
+  it("keeps a topic warm during the grace period and tears it down afterwards", async () => {
+    const conn = new FakeActorConn();
+    const backend = createBackend(conn, organizationSnapshot());
+    const manager = new RemoteSubscriptionManager(backend);
+    const params = { organizationId: "org-1" } as const;
+
+    const unsubscribeA = manager.subscribe("organization", params, () => {});
+    await flushAsyncWork();
+    unsubscribeA();
+
+    vi.advanceTimersByTime(29_000);
+    expect(manager.listDebugTopics()).toEqual([]);
+
+    const unsubscribeB = manager.subscribe("organization", params, () => {});
+    await flushAsyncWork();
+
+    expect(backend.connectOrganization).toHaveBeenCalledTimes(1);
+    expect(conn.disposeCount).toBe(0);
+
+    unsubscribeB();
+    expect(manager.listDebugTopics()).toEqual([]);
+    vi.advanceTimersByTime(30_000);
+
+    expect(conn.disposeCount).toBe(1);
+    expect(manager.getSnapshot("organization", params)).toBeUndefined();
+  });
+
+  it("surfaces connection errors to subscribers", async () => {
+    const conn = new FakeActorConn();
+    const backend = createBackend(conn, organizationSnapshot());
+    const manager = new RemoteSubscriptionManager(backend);
+    const params = { organizationId: "org-1" } as const;
+
+    manager.subscribe("organization", params, () => {});
+    await flushAsyncWork();
+
+    conn.emitError(new Error("socket dropped"));
+
+    expect(manager.getStatus("organization", params)).toBe("error");
+    expect(manager.getError("organization", params)?.message).toBe("socket dropped");
+  });
+});
diff --git a/foundry/packages/client/test/view-model.test.ts b/foundry/packages/client/test/view-model.test.ts
new file mode 100644
index 0000000..d418c2f
--- /dev/null
+++ b/foundry/packages/client/test/view-model.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from "vitest";
+import type { TaskRecord } from "@sandbox-agent/foundry-shared";
+import { filterTasks, formatRelativeAge, fuzzyMatch, summarizeTasks } from "../src/view-model.js";
+
+const sample: TaskRecord = {
+  organizationId: "default",
+  repoId: "repo-a",
+  repoRemote: "https://example.com/repo-a.git",
+  taskId: "task-1",
+  branchName: "feature/test",
+  title: "Test Title",
+  task: "Do test",
+  sandboxProviderId: "local",
+  status: "running",
+  activeSandboxId: "sandbox-1",
+  pullRequest: null,
+  sandboxes: [
+    {
+      sandboxId: "sandbox-1",
+      sandboxProviderId: "local",
+      sandboxActorId: null,
+      switchTarget: "sandbox://local/sandbox-1",
+      cwd: null,
+      createdAt: 1,
+      updatedAt: 1,
+    },
+  ],
+  createdAt: 1,
+  updatedAt: 1,
+};
+
+describe("search helpers", () => {
+  it("supports ordered fuzzy matching", () => {
+    expect(fuzzyMatch("feature/test-branch", "ftb")).toBe(true);
+    expect(fuzzyMatch("feature/test-branch", "fbt")).toBe(false);
+  });
+
+  it("filters rows across branch and title", () => {
+    const rows: TaskRecord[] = [
+      sample,
+      {
+        ...sample,
+        taskId: "task-2",
+        branchName: "docs/update-intro",
+        title: "Docs Intro Refresh",
+        status: "idle",
+      },
+    ];
+    expect(filterTasks(rows, "doc")).toHaveLength(1);
+    expect(filterTasks(rows, "intro")).toHaveLength(1);
+    expect(filterTasks(rows, "test")).toHaveLength(2);
+  });
+});
+
+describe("summary helpers", () => {
+  it("formats relative age", () => {
+    expect(formatRelativeAge(9_000, 10_000)).toBe("1s");
+    expect(formatRelativeAge(0, 120_000)).toBe("2m");
+  });
+
+  it("summarizes by status and provider", () => {
+    const rows: TaskRecord[] = [
+      sample,
+      { ...sample, taskId: "task-2", status: "idle", sandboxProviderId: "local" },
+      { ...sample, taskId: "task-3", status: "error", sandboxProviderId: "local" },
+    ];
+
+    const summary = summarizeTasks(rows);
+    expect(summary.total).toBe(3);
+    expect(summary.byStatus.running).toBe(1);
+    expect(summary.byStatus.idle).toBe(1);
+    expect(summary.byStatus.error).toBe(1);
+    expect(summary.byProvider.local).toBe(3);
+  });
+});
diff --git a/foundry/packages/client/tsconfig.build.json b/foundry/packages/client/tsconfig.build.json
new file mode 100644
index 0000000..35bcdb2
--- /dev/null
+++ b/foundry/packages/client/tsconfig.build.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "ignoreDeprecations": "6.0"
+  }
+}
diff --git a/foundry/packages/client/tsconfig.json b/foundry/packages/client/tsconfig.json
new file mode 100644
index 0000000..ae5ba21
--- /dev/null
+++ b/foundry/packages/client/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src", "test"]
+}
diff --git a/foundry/packages/desktop/package.json b/foundry/packages/desktop/package.json
new file mode 100644
index 0000000..fee1a61
--- /dev/null
+++ b/foundry/packages/desktop/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@sandbox-agent/foundry-desktop",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "tauri dev",
+    "build": "tauri build",
+    "build:sidecar": "tsx scripts/build-sidecar.ts",
+    "build:frontend": "tsx scripts/build-frontend.ts",
+    "build:all": "pnpm build:sidecar && pnpm build:frontend && pnpm build",
+    "tauri": "tauri"
+  },
+  "devDependencies": {
+    "@tauri-apps/cli": "^2",
+    "tsx": "^4"
+  },
+  "dependencies": {
+    "@sandbox-agent/foundry-shared": "workspace:*",
+    "@tauri-apps/api": "^2",
+    "@tauri-apps/plugin-shell": "^2"
+  }
+}
diff --git a/foundry/packages/desktop/scripts/build-frontend.ts b/foundry/packages/desktop/scripts/build-frontend.ts
new file mode 100644
index 0000000..742231e
--- /dev/null
+++ b/foundry/packages/desktop/scripts/build-frontend.ts
@@ -0,0 +1,49 @@
+import { execSync } from "node:child_process";
+import { cpSync, readFileSync, writeFileSync, rmSync, existsSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { createFoundryLogger } from "@sandbox-agent/foundry-shared";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const desktopRoot = resolve(__dirname, "..");
+const repoRoot = resolve(desktopRoot, "../../..");
+const frontendDist = resolve(desktopRoot, "../frontend/dist");
+const destDir = resolve(desktopRoot, "frontend-dist");
+const logger = createFoundryLogger({
+  service: "foundry-desktop-build",
+  bindings: {
+    script: "build-frontend",
+  },
+});
+
+function run(cmd: string, opts?: { cwd?: string; env?: NodeJS.ProcessEnv }) {
+  logger.info({ command: cmd, cwd: opts?.cwd ?? repoRoot }, "run_command");
+  execSync(cmd, {
+    stdio: "inherit",
+    cwd: opts?.cwd ?? repoRoot,
+    env: { ...process.env, ...opts?.env },
+  });
+}
+
+// Step 1: Build the frontend with the desktop-specific backend endpoint
+logger.info("building_frontend");
+run("pnpm --filter @sandbox-agent/foundry-frontend build", {
+  env: {
+    VITE_HF_BACKEND_ENDPOINT: "http://127.0.0.1:7741/v1/rivet",
+  },
+});
+
+// Step 2: Copy dist to frontend-dist/
+logger.info({ frontendDist, destDir }, "copying_frontend_dist");
+if (existsSync(destDir)) {
+  rmSync(destDir, { recursive: true });
+}
+cpSync(frontendDist, destDir, { recursive: true });
+
+// Step 3: Strip react-scan script from index.html (it loads unconditionally)
+const indexPath = resolve(destDir, "index.html");
+let html = readFileSync(indexPath, "utf-8");
+html = html.replace(/<script\s+src="https:\/\/unpkg\.com\/react-scan\/dist\/auto\.global\.js"[^>]*><\/script>\s*/g, "");
+writeFileSync(indexPath, html);
+
+logger.info({ indexPath }, "frontend_build_complete");
diff --git a/foundry/packages/desktop/scripts/build-sidecar.ts b/foundry/packages/desktop/scripts/build-sidecar.ts
new file mode 100644
index 0000000..58ef4b0
--- /dev/null
+++ b/foundry/packages/desktop/scripts/build-sidecar.ts
@@ -0,0 +1,75 @@
+import { execSync } from "node:child_process";
+import { mkdirSync, existsSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { createFoundryLogger } from "@sandbox-agent/foundry-shared";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const desktopRoot = resolve(__dirname, "..");
+const sidecarDir = resolve(desktopRoot, "src-tauri/sidecars");
+const logger = createFoundryLogger({
+  service: "foundry-desktop-build",
+  bindings: {
+    script: "build-sidecar",
+  },
+});
+
+const isDev = process.argv.includes("--dev");
+
+// Detect current architecture
+function currentTarget(): string {
+  const arch = process.arch === "arm64" ? "aarch64" : "x86_64";
+  return `${arch}-apple-darwin`;
+}
+
+// Target triples to build
+const targets: Array<{ bunTarget: string; tripleTarget: string }> = isDev
+  ? [
+      {
+        bunTarget: process.arch === "arm64" ? "bun-darwin-arm64" : "bun-darwin-x64",
+        tripleTarget: currentTarget(),
+      },
+    ]
+  : [
+      {
+        bunTarget: "bun-darwin-arm64",
+        tripleTarget: "aarch64-apple-darwin",
+      },
+      {
+        bunTarget: "bun-darwin-x64",
+        tripleTarget: "x86_64-apple-darwin",
+      },
+    ];
+
+function run(cmd: string, opts?: { cwd?: string; env?: NodeJS.ProcessEnv }) {
+  logger.info({ command: cmd, cwd: opts?.cwd ?? desktopRoot }, "run_command");
+  execSync(cmd, {
+    stdio: "inherit",
+    cwd: opts?.cwd ?? desktopRoot,
+    env: { ...process.env, ...opts?.env },
+  });
+}
+
+// Step 1: Build the backend with tsup
+logger.info("building_backend");
+run("pnpm --filter @sandbox-agent/foundry-backend build", {
+  cwd: resolve(desktopRoot, "../../.."),
+});
+
+// Step 2: Compile standalone binaries with bun
+mkdirSync(sidecarDir, { recursive: true });
+
+const backendEntry = resolve(desktopRoot, "../backend/dist/index.js");
+
+if (!existsSync(backendEntry)) {
+  logger.error({ backendEntry }, "backend_build_output_not_found");
+  process.exit(1);
+}
+
+for (const { bunTarget, tripleTarget } of targets) {
+  const outfile = resolve(sidecarDir, `foundry-backend-${tripleTarget}`);
+  logger.info({ bunTarget, tripleTarget, outfile }, "compiling_sidecar");
+  run(`bun build --compile --target ${bunTarget} ${backendEntry} --outfile ${outfile}`);
+}
+
+logger.info({ targets: targets.map((target) => target.tripleTarget) }, "sidecar_build_complete");
diff --git a/foundry/packages/desktop/src-tauri/Cargo.toml b/foundry/packages/desktop/src-tauri/Cargo.toml
new file mode 100644
index 0000000..bf86188
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "foundry"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+tauri = { version = "2", features = [] }
+tauri-plugin-shell = "2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+reqwest = { version = "0.12", features = ["json"] }
+tokio = { version = "1", features = ["time"] }
diff --git a/foundry/packages/desktop/src-tauri/build.rs b/foundry/packages/desktop/src-tauri/build.rs
new file mode 100644
index 0000000..d860e1e
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/build.rs
@@ -0,0 +1,3 @@
+fn main() {
+    tauri_build::build()
+}
diff --git a/foundry/packages/desktop/src-tauri/capabilities/default.json b/foundry/packages/desktop/src-tauri/capabilities/default.json
new file mode 100644
index 0000000..1275b58
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/capabilities/default.json
@@ -0,0 +1,30 @@
+{
+  "identifier": "default",
+  "description": "Default capability for Foundry desktop",
+  "windows": ["main"],
+  "permissions": [
+    "core:default",
+    "core:window:allow-start-dragging",
+    "shell:allow-open",
+    {
+      "identifier": "shell:allow-execute",
+      "allow": [
+        {
+          "name": "sidecars/foundry-backend",
+          "sidecar": true,
+          "args": true
+        }
+      ]
+    },
+    {
+      "identifier": "shell:allow-spawn",
+      "allow": [
+        {
+          "name": "sidecars/foundry-backend",
+          "sidecar": true,
+          "args": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/foundry/packages/desktop/src-tauri/gen/schemas/acl-manifests.json b/foundry/packages/desktop/src-tauri/gen/schemas/acl-manifests.json
new file mode 100644
index 0000000..6844932
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/gen/schemas/acl-manifests.json
@@ -0,0 +1,1922 @@
+{
+  "core": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default core plugins set.",
+      "permissions": [
+        "core:path:default",
+        "core:event:default",
+        "core:window:default",
+        "core:webview:default",
+        "core:app:default",
+        "core:image:default",
+        "core:resources:default",
+        "core:menu:default",
+        "core:tray:default"
+      ]
+    },
+    "permissions": {},
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:app": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin.",
+      "permissions": [
+        "allow-version",
+        "allow-name",
+        "allow-tauri-version",
+        "allow-identifier",
+        "allow-bundle-type",
+        "allow-register-listener",
+        "allow-remove-listener"
+      ]
+    },
+    "permissions": {
+      "allow-app-hide": {
+        "identifier": "allow-app-hide",
+        "description": "Enables the app_hide command without any pre-configured scope.",
+        "commands": { "allow": ["app_hide"], "deny": [] }
+      },
+      "allow-app-show": {
+        "identifier": "allow-app-show",
+        "description": "Enables the app_show command without any pre-configured scope.",
+        "commands": { "allow": ["app_show"], "deny": [] }
+      },
+      "allow-bundle-type": {
+        "identifier": "allow-bundle-type",
+        "description": "Enables the bundle_type command without any pre-configured scope.",
+        "commands": { "allow": ["bundle_type"], "deny": [] }
+      },
+      "allow-default-window-icon": {
+        "identifier": "allow-default-window-icon",
+        "description": "Enables the default_window_icon command without any pre-configured scope.",
+        "commands": { "allow": ["default_window_icon"], "deny": [] }
+      },
+      "allow-fetch-data-store-identifiers": {
+        "identifier": "allow-fetch-data-store-identifiers",
+        "description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
+        "commands": { "allow": ["fetch_data_store_identifiers"], "deny": [] }
+      },
+      "allow-identifier": {
+        "identifier": "allow-identifier",
+        "description": "Enables the identifier command without any pre-configured scope.",
+        "commands": { "allow": ["identifier"], "deny": [] }
+      },
+      "allow-name": {
+        "identifier": "allow-name",
+        "description": "Enables the name command without any pre-configured scope.",
+        "commands": { "allow": ["name"], "deny": [] }
+      },
+      "allow-register-listener": {
+        "identifier": "allow-register-listener",
+        "description": "Enables the register_listener command without any pre-configured scope.",
+        "commands": { "allow": ["register_listener"], "deny": [] }
+      },
+      "allow-remove-data-store": {
+        "identifier": "allow-remove-data-store",
+        "description": "Enables the remove_data_store command without any pre-configured scope.",
+        "commands": { "allow": ["remove_data_store"], "deny": [] }
+      },
+      "allow-remove-listener": {
+        "identifier": "allow-remove-listener",
+        "description": "Enables the remove_listener command without any pre-configured scope.",
+        "commands": { "allow": ["remove_listener"], "deny": [] }
+      },
+      "allow-set-app-theme": {
+        "identifier": "allow-set-app-theme",
+        "description": "Enables the set_app_theme command without any pre-configured scope.",
+        "commands": { "allow": ["set_app_theme"], "deny": [] }
+      },
+      "allow-set-dock-visibility": {
+        "identifier": "allow-set-dock-visibility",
+        "description": "Enables the set_dock_visibility command without any pre-configured scope.",
+        "commands": { "allow": ["set_dock_visibility"], "deny": [] }
+      },
+      "allow-tauri-version": {
+        "identifier": "allow-tauri-version",
+        "description": "Enables the tauri_version command without any pre-configured scope.",
+        "commands": { "allow": ["tauri_version"], "deny": [] }
+      },
+      "allow-version": {
+        "identifier": "allow-version",
+        "description": "Enables the version command without any pre-configured scope.",
+        "commands": { "allow": ["version"], "deny": [] }
+      },
+      "deny-app-hide": {
+        "identifier": "deny-app-hide",
+        "description": "Denies the app_hide command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["app_hide"] }
+      },
+      "deny-app-show": {
+        "identifier": "deny-app-show",
+        "description": "Denies the app_show command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["app_show"] }
+      },
+      "deny-bundle-type": {
+        "identifier": "deny-bundle-type",
+        "description": "Denies the bundle_type command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["bundle_type"] }
+      },
+      "deny-default-window-icon": {
+        "identifier": "deny-default-window-icon",
+        "description": "Denies the default_window_icon command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["default_window_icon"] }
+      },
+      "deny-fetch-data-store-identifiers": {
+        "identifier": "deny-fetch-data-store-identifiers",
+        "description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["fetch_data_store_identifiers"] }
+      },
+      "deny-identifier": {
+        "identifier": "deny-identifier",
+        "description": "Denies the identifier command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["identifier"] }
+      },
+      "deny-name": {
+        "identifier": "deny-name",
+        "description": "Denies the name command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["name"] }
+      },
+      "deny-register-listener": {
+        "identifier": "deny-register-listener",
+        "description": "Denies the register_listener command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["register_listener"] }
+      },
+      "deny-remove-data-store": {
+        "identifier": "deny-remove-data-store",
+        "description": "Denies the remove_data_store command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["remove_data_store"] }
+      },
+      "deny-remove-listener": {
+        "identifier": "deny-remove-listener",
+        "description": "Denies the remove_listener command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["remove_listener"] }
+      },
+      "deny-set-app-theme": {
+        "identifier": "deny-set-app-theme",
+        "description": "Denies the set_app_theme command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_app_theme"] }
+      },
+      "deny-set-dock-visibility": {
+        "identifier": "deny-set-dock-visibility",
+        "description": "Denies the set_dock_visibility command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_dock_visibility"] }
+      },
+      "deny-tauri-version": {
+        "identifier": "deny-tauri-version",
+        "description": "Denies the tauri_version command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["tauri_version"] }
+      },
+      "deny-version": {
+        "identifier": "deny-version",
+        "description": "Denies the version command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["version"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:event": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin, which enables all commands.",
+      "permissions": ["allow-listen", "allow-unlisten", "allow-emit", "allow-emit-to"]
+    },
+    "permissions": {
+      "allow-emit": {
+        "identifier": "allow-emit",
+        "description": "Enables the emit command without any pre-configured scope.",
+        "commands": { "allow": ["emit"], "deny": [] }
+      },
+      "allow-emit-to": {
+        "identifier": "allow-emit-to",
+        "description": "Enables the emit_to command without any pre-configured scope.",
+        "commands": { "allow": ["emit_to"], "deny": [] }
+      },
+      "allow-listen": {
+        "identifier": "allow-listen",
+        "description": "Enables the listen command without any pre-configured scope.",
+        "commands": { "allow": ["listen"], "deny": [] }
+      },
+      "allow-unlisten": {
+        "identifier": "allow-unlisten",
+        "description": "Enables the unlisten command without any pre-configured scope.",
+        "commands": { "allow": ["unlisten"], "deny": [] }
+      },
+      "deny-emit": {
+        "identifier": "deny-emit",
+        "description": "Denies the emit command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["emit"] }
+      },
+      "deny-emit-to": {
+        "identifier": "deny-emit-to",
+        "description": "Denies the emit_to command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["emit_to"] }
+      },
+      "deny-listen": {
+        "identifier": "deny-listen",
+        "description": "Denies the listen command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["listen"] }
+      },
+      "deny-unlisten": {
+        "identifier": "deny-unlisten",
+        "description": "Denies the unlisten command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["unlisten"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:image": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin, which enables all commands.",
+      "permissions": ["allow-new", "allow-from-bytes", "allow-from-path", "allow-rgba", "allow-size"]
+    },
+    "permissions": {
+      "allow-from-bytes": {
+        "identifier": "allow-from-bytes",
+        "description": "Enables the from_bytes command without any pre-configured scope.",
+        "commands": { "allow": ["from_bytes"], "deny": [] }
+      },
+      "allow-from-path": {
+        "identifier": "allow-from-path",
+        "description": "Enables the from_path command without any pre-configured scope.",
+        "commands": { "allow": ["from_path"], "deny": [] }
+      },
+      "allow-new": {
+        "identifier": "allow-new",
+        "description": "Enables the new command without any pre-configured scope.",
+        "commands": { "allow": ["new"], "deny": [] }
+      },
+      "allow-rgba": {
+        "identifier": "allow-rgba",
+        "description": "Enables the rgba command without any pre-configured scope.",
+        "commands": { "allow": ["rgba"], "deny": [] }
+      },
+      "allow-size": {
+        "identifier": "allow-size",
+        "description": "Enables the size command without any pre-configured scope.",
+        "commands": { "allow": ["size"], "deny": [] }
+      },
+      "deny-from-bytes": {
+        "identifier": "deny-from-bytes",
+        "description": "Denies the from_bytes command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["from_bytes"] }
+      },
+      "deny-from-path": {
+        "identifier": "deny-from-path",
+        "description": "Denies the from_path command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["from_path"] }
+      },
+      "deny-new": {
+        "identifier": "deny-new",
+        "description": "Denies the new command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["new"] }
+      },
+      "deny-rgba": {
+        "identifier": "deny-rgba",
+        "description": "Denies the rgba command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["rgba"] }
+      },
+      "deny-size": {
+        "identifier": "deny-size",
+        "description": "Denies the size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["size"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:menu": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin, which enables all commands.",
+      "permissions": [
+        "allow-new",
+        "allow-append",
+        "allow-prepend",
+        "allow-insert",
+        "allow-remove",
+        "allow-remove-at",
+        "allow-items",
+        "allow-get",
+        "allow-popup",
+        "allow-create-default",
+        "allow-set-as-app-menu",
+        "allow-set-as-window-menu",
+        "allow-text",
+        "allow-set-text",
+        "allow-is-enabled",
+        "allow-set-enabled",
+        "allow-set-accelerator",
+        "allow-set-as-windows-menu-for-nsapp",
+        "allow-set-as-help-menu-for-nsapp",
+        "allow-is-checked",
+        "allow-set-checked",
+        "allow-set-icon"
+      ]
+    },
+    "permissions": {
+      "allow-append": {
+        "identifier": "allow-append",
+        "description": "Enables the append command without any pre-configured scope.",
+        "commands": { "allow": ["append"], "deny": [] }
+      },
+      "allow-create-default": {
+        "identifier": "allow-create-default",
+        "description": "Enables the create_default command without any pre-configured scope.",
+        "commands": { "allow": ["create_default"], "deny": [] }
+      },
+      "allow-get": {
+        "identifier": "allow-get",
+        "description": "Enables the get command without any pre-configured scope.",
+        "commands": { "allow": ["get"], "deny": [] }
+      },
+      "allow-insert": {
+        "identifier": "allow-insert",
+        "description": "Enables the insert command without any pre-configured scope.",
+        "commands": { "allow": ["insert"], "deny": [] }
+      },
+      "allow-is-checked": {
+        "identifier": "allow-is-checked",
+        "description": "Enables the is_checked command without any pre-configured scope.",
+        "commands": { "allow": ["is_checked"], "deny": [] }
+      },
+      "allow-is-enabled": {
+        "identifier": "allow-is-enabled",
+        "description": "Enables the is_enabled command without any pre-configured scope.",
+        "commands": { "allow": ["is_enabled"], "deny": [] }
+      },
+      "allow-items": {
+        "identifier": "allow-items",
+        "description": "Enables the items command without any pre-configured scope.",
+        "commands": { "allow": ["items"], "deny": [] }
+      },
+      "allow-new": {
+        "identifier": "allow-new",
+        "description": "Enables the new command without any pre-configured scope.",
+        "commands": { "allow": ["new"], "deny": [] }
+      },
+      "allow-popup": {
+        "identifier": "allow-popup",
+        "description": "Enables the popup command without any pre-configured scope.",
+        "commands": { "allow": ["popup"], "deny": [] }
+      },
+      "allow-prepend": {
+        "identifier": "allow-prepend",
+        "description": "Enables the prepend command without any pre-configured scope.",
+        "commands": { "allow": ["prepend"], "deny": [] }
+      },
+      "allow-remove": {
+        "identifier": "allow-remove",
+        "description": "Enables the remove command without any pre-configured scope.",
+        "commands": { "allow": ["remove"], "deny": [] }
+      },
+      "allow-remove-at": {
+        "identifier": "allow-remove-at",
+        "description": "Enables the remove_at command without any pre-configured scope.",
+        "commands": { "allow": ["remove_at"], "deny": [] }
+      },
+      "allow-set-accelerator": {
+        "identifier": "allow-set-accelerator",
+        "description": "Enables the set_accelerator command without any pre-configured scope.",
+        "commands": { "allow": ["set_accelerator"], "deny": [] }
+      },
+      "allow-set-as-app-menu": {
+        "identifier": "allow-set-as-app-menu",
+        "description": "Enables the set_as_app_menu command without any pre-configured scope.",
+        "commands": { "allow": ["set_as_app_menu"], "deny": [] }
+      },
+      "allow-set-as-help-menu-for-nsapp": {
+        "identifier": "allow-set-as-help-menu-for-nsapp",
+        "description": "Enables the set_as_help_menu_for_nsapp command without any pre-configured scope.",
+        "commands": { "allow": ["set_as_help_menu_for_nsapp"], "deny": [] }
+      },
+      "allow-set-as-window-menu": {
+        "identifier": "allow-set-as-window-menu",
+        "description": "Enables the set_as_window_menu command without any pre-configured scope.",
+        "commands": { "allow": ["set_as_window_menu"], "deny": [] }
+      },
+      "allow-set-as-windows-menu-for-nsapp": {
+        "identifier": "allow-set-as-windows-menu-for-nsapp",
+        "description": "Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope.",
+        "commands": { "allow": ["set_as_windows_menu_for_nsapp"], "deny": [] }
+      },
+      "allow-set-checked": {
+        "identifier": "allow-set-checked",
+        "description": "Enables the set_checked command without any pre-configured scope.",
+        "commands": { "allow": ["set_checked"], "deny": [] }
+      },
+      "allow-set-enabled": {
+        "identifier": "allow-set-enabled",
+        "description": "Enables the set_enabled command without any pre-configured scope.",
+        "commands": { "allow": ["set_enabled"], "deny": [] }
+      },
+      "allow-set-icon": {
+        "identifier": "allow-set-icon",
+        "description": "Enables the set_icon command without any pre-configured scope.",
+        "commands": { "allow": ["set_icon"], "deny": [] }
+      },
+      "allow-set-text": {
+        "identifier": "allow-set-text",
+        "description": "Enables the set_text command without any pre-configured scope.",
+        "commands": { "allow": ["set_text"], "deny": [] }
+      },
+      "allow-text": {
+        "identifier": "allow-text",
+        "description": "Enables the text command without any pre-configured scope.",
+        "commands": { "allow": ["text"], "deny": [] }
+      },
+      "deny-append": {
+        "identifier": "deny-append",
+        "description": "Denies the append command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["append"] }
+      },
+      "deny-create-default": {
+        "identifier": "deny-create-default",
+        "description": "Denies the create_default command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["create_default"] }
+      },
+      "deny-get": {
+        "identifier": "deny-get",
+        "description": "Denies the get command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["get"] }
+      },
+      "deny-insert": {
+        "identifier": "deny-insert",
+        "description": "Denies the insert command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["insert"] }
+      },
+      "deny-is-checked": {
+        "identifier": "deny-is-checked",
+        "description": "Denies the is_checked command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_checked"] }
+      },
+      "deny-is-enabled": {
+        "identifier": "deny-is-enabled",
+        "description": "Denies the is_enabled command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_enabled"] }
+      },
+      "deny-items": {
+        "identifier": "deny-items",
+        "description": "Denies the items command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["items"] }
+      },
+      "deny-new": {
+        "identifier": "deny-new",
+        "description": "Denies the new command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["new"] }
+      },
+      "deny-popup": {
+        "identifier": "deny-popup",
+        "description": "Denies the popup command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["popup"] }
+      },
+      "deny-prepend": {
+        "identifier": "deny-prepend",
+        "description": "Denies the prepend command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["prepend"] }
+      },
+      "deny-remove": {
+        "identifier": "deny-remove",
+        "description": "Denies the remove command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["remove"] }
+      },
+      "deny-remove-at": {
+        "identifier": "deny-remove-at",
+        "description": "Denies the remove_at command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["remove_at"] }
+      },
+      "deny-set-accelerator": {
+        "identifier": "deny-set-accelerator",
+        "description": "Denies the set_accelerator command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_accelerator"] }
+      },
+      "deny-set-as-app-menu": {
+        "identifier": "deny-set-as-app-menu",
+        "description": "Denies the set_as_app_menu command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_as_app_menu"] }
+      },
+      "deny-set-as-help-menu-for-nsapp": {
+        "identifier": "deny-set-as-help-menu-for-nsapp",
+        "description": "Denies the set_as_help_menu_for_nsapp command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_as_help_menu_for_nsapp"] }
+      },
+      "deny-set-as-window-menu": {
+        "identifier": "deny-set-as-window-menu",
+        "description": "Denies the set_as_window_menu command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_as_window_menu"] }
+      },
+      "deny-set-as-windows-menu-for-nsapp": {
+        "identifier": "deny-set-as-windows-menu-for-nsapp",
+        "description": "Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_as_windows_menu_for_nsapp"] }
+      },
+      "deny-set-checked": {
+        "identifier": "deny-set-checked",
+        "description": "Denies the set_checked command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_checked"] }
+      },
+      "deny-set-enabled": {
+        "identifier": "deny-set-enabled",
+        "description": "Denies the set_enabled command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_enabled"] }
+      },
+      "deny-set-icon": {
+        "identifier": "deny-set-icon",
+        "description": "Denies the set_icon command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_icon"] }
+      },
+      "deny-set-text": {
+        "identifier": "deny-set-text",
+        "description": "Denies the set_text command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_text"] }
+      },
+      "deny-text": {
+        "identifier": "deny-text",
+        "description": "Denies the text command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["text"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:path": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin, which enables all commands.",
+      "permissions": [
+        "allow-resolve-directory",
+        "allow-resolve",
+        "allow-normalize",
+        "allow-join",
+        "allow-dirname",
+        "allow-extname",
+        "allow-basename",
+        "allow-is-absolute"
+      ]
+    },
+    "permissions": {
+      "allow-basename": {
+        "identifier": "allow-basename",
+        "description": "Enables the basename command without any pre-configured scope.",
+        "commands": { "allow": ["basename"], "deny": [] }
+      },
+      "allow-dirname": {
+        "identifier": "allow-dirname",
+        "description": "Enables the dirname command without any pre-configured scope.",
+        "commands": { "allow": ["dirname"], "deny": [] }
+      },
+      "allow-extname": {
+        "identifier": "allow-extname",
+        "description": "Enables the extname command without any pre-configured scope.",
+        "commands": { "allow": ["extname"], "deny": [] }
+      },
+      "allow-is-absolute": {
+        "identifier": "allow-is-absolute",
+        "description": "Enables the is_absolute command without any pre-configured scope.",
+        "commands": { "allow": ["is_absolute"], "deny": [] }
+      },
+      "allow-join": {
+        "identifier": "allow-join",
+        "description": "Enables the join command without any pre-configured scope.",
+        "commands": { "allow": ["join"], "deny": [] }
+      },
+      "allow-normalize": {
+        "identifier": "allow-normalize",
+        "description": "Enables the normalize command without any pre-configured scope.",
+        "commands": { "allow": ["normalize"], "deny": [] }
+      },
+      "allow-resolve": {
+        "identifier": "allow-resolve",
+        "description": "Enables the resolve command without any pre-configured scope.",
+        "commands": { "allow": ["resolve"], "deny": [] }
+      },
+      "allow-resolve-directory": {
+        "identifier": "allow-resolve-directory",
+        "description": "Enables the resolve_directory command without any pre-configured scope.",
+        "commands": { "allow": ["resolve_directory"], "deny": [] }
+      },
+      "deny-basename": {
+        "identifier": "deny-basename",
+        "description": "Denies the basename command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["basename"] }
+      },
+      "deny-dirname": {
+        "identifier": "deny-dirname",
+        "description": "Denies the dirname command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["dirname"] }
+      },
+      "deny-extname": {
+        "identifier": "deny-extname",
+        "description": "Denies the extname command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["extname"] }
+      },
+      "deny-is-absolute": {
+        "identifier": "deny-is-absolute",
+        "description": "Denies the is_absolute command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_absolute"] }
+      },
+      "deny-join": {
+        "identifier": "deny-join",
+        "description": "Denies the join command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["join"] }
+      },
+      "deny-normalize": {
+        "identifier": "deny-normalize",
+        "description": "Denies the normalize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["normalize"] }
+      },
+      "deny-resolve": {
+        "identifier": "deny-resolve",
+        "description": "Denies the resolve command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["resolve"] }
+      },
+      "deny-resolve-directory": {
+        "identifier": "deny-resolve-directory",
+        "description": "Denies the resolve_directory command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["resolve_directory"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:resources": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin, which enables all commands.",
+      "permissions": ["allow-close"]
+    },
+    "permissions": {
+      "allow-close": {
+        "identifier": "allow-close",
+        "description": "Enables the close command without any pre-configured scope.",
+        "commands": { "allow": ["close"], "deny": [] }
+      },
+      "deny-close": {
+        "identifier": "deny-close",
+        "description": "Denies the close command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["close"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:tray": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin, which enables all commands.",
+      "permissions": [
+        "allow-new",
+        "allow-get-by-id",
+        "allow-remove-by-id",
+        "allow-set-icon",
+        "allow-set-menu",
+        "allow-set-tooltip",
+        "allow-set-title",
+        "allow-set-visible",
+        "allow-set-temp-dir-path",
+        "allow-set-icon-as-template",
+        "allow-set-show-menu-on-left-click"
+      ]
+    },
+    "permissions": {
+      "allow-get-by-id": {
+        "identifier": "allow-get-by-id",
+        "description": "Enables the get_by_id command without any pre-configured scope.",
+        "commands": { "allow": ["get_by_id"], "deny": [] }
+      },
+      "allow-new": {
+        "identifier": "allow-new",
+        "description": "Enables the new command without any pre-configured scope.",
+        "commands": { "allow": ["new"], "deny": [] }
+      },
+      "allow-remove-by-id": {
+        "identifier": "allow-remove-by-id",
+        "description": "Enables the remove_by_id command without any pre-configured scope.",
+        "commands": { "allow": ["remove_by_id"], "deny": [] }
+      },
+      "allow-set-icon": {
+        "identifier": "allow-set-icon",
+        "description": "Enables the set_icon command without any pre-configured scope.",
+        "commands": { "allow": ["set_icon"], "deny": [] }
+      },
+      "allow-set-icon-as-template": {
+        "identifier": "allow-set-icon-as-template",
+        "description": "Enables the set_icon_as_template command without any pre-configured scope.",
+        "commands": { "allow": ["set_icon_as_template"], "deny": [] }
+      },
+      "allow-set-menu": {
+        "identifier": "allow-set-menu",
+        "description": "Enables the set_menu command without any pre-configured scope.",
+        "commands": { "allow": ["set_menu"], "deny": [] }
+      },
+      "allow-set-show-menu-on-left-click": {
+        "identifier": "allow-set-show-menu-on-left-click",
+        "description": "Enables the set_show_menu_on_left_click command without any pre-configured scope.",
+        "commands": { "allow": ["set_show_menu_on_left_click"], "deny": [] }
+      },
+      "allow-set-temp-dir-path": {
+        "identifier": "allow-set-temp-dir-path",
+        "description": "Enables the set_temp_dir_path command without any pre-configured scope.",
+        "commands": { "allow": ["set_temp_dir_path"], "deny": [] }
+      },
+      "allow-set-title": {
+        "identifier": "allow-set-title",
+        "description": "Enables the set_title command without any pre-configured scope.",
+        "commands": { "allow": ["set_title"], "deny": [] }
+      },
+      "allow-set-tooltip": {
+        "identifier": "allow-set-tooltip",
+        "description": "Enables the set_tooltip command without any pre-configured scope.",
+        "commands": { "allow": ["set_tooltip"], "deny": [] }
+      },
+      "allow-set-visible": {
+        "identifier": "allow-set-visible",
+        "description": "Enables the set_visible command without any pre-configured scope.",
+        "commands": { "allow": ["set_visible"], "deny": [] }
+      },
+      "deny-get-by-id": {
+        "identifier": "deny-get-by-id",
+        "description": "Denies the get_by_id command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["get_by_id"] }
+      },
+      "deny-new": {
+        "identifier": "deny-new",
+        "description": "Denies the new command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["new"] }
+      },
+      "deny-remove-by-id": {
+        "identifier": "deny-remove-by-id",
+        "description": "Denies the remove_by_id command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["remove_by_id"] }
+      },
+      "deny-set-icon": {
+        "identifier": "deny-set-icon",
+        "description": "Denies the set_icon command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_icon"] }
+      },
+      "deny-set-icon-as-template": {
+        "identifier": "deny-set-icon-as-template",
+        "description": "Denies the set_icon_as_template command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_icon_as_template"] }
+      },
+      "deny-set-menu": {
+        "identifier": "deny-set-menu",
+        "description": "Denies the set_menu command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_menu"] }
+      },
+      "deny-set-show-menu-on-left-click": {
+        "identifier": "deny-set-show-menu-on-left-click",
+        "description": "Denies the set_show_menu_on_left_click command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_show_menu_on_left_click"] }
+      },
+      "deny-set-temp-dir-path": {
+        "identifier": "deny-set-temp-dir-path",
+        "description": "Denies the set_temp_dir_path command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_temp_dir_path"] }
+      },
+      "deny-set-title": {
+        "identifier": "deny-set-title",
+        "description": "Denies the set_title command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_title"] }
+      },
+      "deny-set-tooltip": {
+        "identifier": "deny-set-tooltip",
+        "description": "Denies the set_tooltip command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_tooltip"] }
+      },
+      "deny-set-visible": {
+        "identifier": "deny-set-visible",
+        "description": "Denies the set_visible command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_visible"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:webview": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin.",
+      "permissions": ["allow-get-all-webviews", "allow-webview-position", "allow-webview-size", "allow-internal-toggle-devtools"]
+    },
+    "permissions": {
+      "allow-clear-all-browsing-data": {
+        "identifier": "allow-clear-all-browsing-data",
+        "description": "Enables the clear_all_browsing_data command without any pre-configured scope.",
+        "commands": { "allow": ["clear_all_browsing_data"], "deny": [] }
+      },
+      "allow-create-webview": {
+        "identifier": "allow-create-webview",
+        "description": "Enables the create_webview command without any pre-configured scope.",
+        "commands": { "allow": ["create_webview"], "deny": [] }
+      },
+      "allow-create-webview-window": {
+        "identifier": "allow-create-webview-window",
+        "description": "Enables the create_webview_window command without any pre-configured scope.",
+        "commands": { "allow": ["create_webview_window"], "deny": [] }
+      },
+      "allow-get-all-webviews": {
+        "identifier": "allow-get-all-webviews",
+        "description": "Enables the get_all_webviews command without any pre-configured scope.",
+        "commands": { "allow": ["get_all_webviews"], "deny": [] }
+      },
+      "allow-internal-toggle-devtools": {
+        "identifier": "allow-internal-toggle-devtools",
+        "description": "Enables the internal_toggle_devtools command without any pre-configured scope.",
+        "commands": { "allow": ["internal_toggle_devtools"], "deny": [] }
+      },
+      "allow-print": {
+        "identifier": "allow-print",
+        "description": "Enables the print command without any pre-configured scope.",
+        "commands": { "allow": ["print"], "deny": [] }
+      },
+      "allow-reparent": {
+        "identifier": "allow-reparent",
+        "description": "Enables the reparent command without any pre-configured scope.",
+        "commands": { "allow": ["reparent"], "deny": [] }
+      },
+      "allow-set-webview-auto-resize": {
+        "identifier": "allow-set-webview-auto-resize",
+        "description": "Enables the set_webview_auto_resize command without any pre-configured scope.",
+        "commands": { "allow": ["set_webview_auto_resize"], "deny": [] }
+      },
+      "allow-set-webview-background-color": {
+        "identifier": "allow-set-webview-background-color",
+        "description": "Enables the set_webview_background_color command without any pre-configured scope.",
+        "commands": { "allow": ["set_webview_background_color"], "deny": [] }
+      },
+      "allow-set-webview-focus": {
+        "identifier": "allow-set-webview-focus",
+        "description": "Enables the set_webview_focus command without any pre-configured scope.",
+        "commands": { "allow": ["set_webview_focus"], "deny": [] }
+      },
+      "allow-set-webview-position": {
+        "identifier": "allow-set-webview-position",
+        "description": "Enables the set_webview_position command without any pre-configured scope.",
+        "commands": { "allow": ["set_webview_position"], "deny": [] }
+      },
+      "allow-set-webview-size": {
+        "identifier": "allow-set-webview-size",
+        "description": "Enables the set_webview_size command without any pre-configured scope.",
+        "commands": { "allow": ["set_webview_size"], "deny": [] }
+      },
+      "allow-set-webview-zoom": {
+        "identifier": "allow-set-webview-zoom",
+        "description": "Enables the set_webview_zoom command without any pre-configured scope.",
+        "commands": { "allow": ["set_webview_zoom"], "deny": [] }
+      },
+      "allow-webview-close": {
+        "identifier": "allow-webview-close",
+        "description": "Enables the webview_close command without any pre-configured scope.",
+        "commands": { "allow": ["webview_close"], "deny": [] }
+      },
+      "allow-webview-hide": {
+        "identifier": "allow-webview-hide",
+        "description": "Enables the webview_hide command without any pre-configured scope.",
+        "commands": { "allow": ["webview_hide"], "deny": [] }
+      },
+      "allow-webview-position": {
+        "identifier": "allow-webview-position",
+        "description": "Enables the webview_position command without any pre-configured scope.",
+        "commands": { "allow": ["webview_position"], "deny": [] }
+      },
+      "allow-webview-show": {
+        "identifier": "allow-webview-show",
+        "description": "Enables the webview_show command without any pre-configured scope.",
+        "commands": { "allow": ["webview_show"], "deny": [] }
+      },
+      "allow-webview-size": {
+        "identifier": "allow-webview-size",
+        "description": "Enables the webview_size command without any pre-configured scope.",
+        "commands": { "allow": ["webview_size"], "deny": [] }
+      },
+      "deny-clear-all-browsing-data": {
+        "identifier": "deny-clear-all-browsing-data",
+        "description": "Denies the clear_all_browsing_data command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["clear_all_browsing_data"] }
+      },
+      "deny-create-webview": {
+        "identifier": "deny-create-webview",
+        "description": "Denies the create_webview command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["create_webview"] }
+      },
+      "deny-create-webview-window": {
+        "identifier": "deny-create-webview-window",
+        "description": "Denies the create_webview_window command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["create_webview_window"] }
+      },
+      "deny-get-all-webviews": {
+        "identifier": "deny-get-all-webviews",
+        "description": "Denies the get_all_webviews command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["get_all_webviews"] }
+      },
+      "deny-internal-toggle-devtools": {
+        "identifier": "deny-internal-toggle-devtools",
+        "description": "Denies the internal_toggle_devtools command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["internal_toggle_devtools"] }
+      },
+      "deny-print": {
+        "identifier": "deny-print",
+        "description": "Denies the print command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["print"] }
+      },
+      "deny-reparent": {
+        "identifier": "deny-reparent",
+        "description": "Denies the reparent command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["reparent"] }
+      },
+      "deny-set-webview-auto-resize": {
+        "identifier": "deny-set-webview-auto-resize",
+        "description": "Denies the set_webview_auto_resize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_webview_auto_resize"] }
+      },
+      "deny-set-webview-background-color": {
+        "identifier": "deny-set-webview-background-color",
+        "description": "Denies the set_webview_background_color command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_webview_background_color"] }
+      },
+      "deny-set-webview-focus": {
+        "identifier": "deny-set-webview-focus",
+        "description": "Denies the set_webview_focus command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_webview_focus"] }
+      },
+      "deny-set-webview-position": {
+        "identifier": "deny-set-webview-position",
+        "description": "Denies the set_webview_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_webview_position"] }
+      },
+      "deny-set-webview-size": {
+        "identifier": "deny-set-webview-size",
+        "description": "Denies the set_webview_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_webview_size"] }
+      },
+      "deny-set-webview-zoom": {
+        "identifier": "deny-set-webview-zoom",
+        "description": "Denies the set_webview_zoom command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_webview_zoom"] }
+      },
+      "deny-webview-close": {
+        "identifier": "deny-webview-close",
+        "description": "Denies the webview_close command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["webview_close"] }
+      },
+      "deny-webview-hide": {
+        "identifier": "deny-webview-hide",
+        "description": "Denies the webview_hide command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["webview_hide"] }
+      },
+      "deny-webview-position": {
+        "identifier": "deny-webview-position",
+        "description": "Denies the webview_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["webview_position"] }
+      },
+      "deny-webview-show": {
+        "identifier": "deny-webview-show",
+        "description": "Denies the webview_show command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["webview_show"] }
+      },
+      "deny-webview-size": {
+        "identifier": "deny-webview-size",
+        "description": "Denies the webview_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["webview_size"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "core:window": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "Default permissions for the plugin.",
+      "permissions": [
+        "allow-get-all-windows",
+        "allow-scale-factor",
+        "allow-inner-position",
+        "allow-outer-position",
+        "allow-inner-size",
+        "allow-outer-size",
+        "allow-is-fullscreen",
+        "allow-is-minimized",
+        "allow-is-maximized",
+        "allow-is-focused",
+        "allow-is-decorated",
+        "allow-is-resizable",
+        "allow-is-maximizable",
+        "allow-is-minimizable",
+        "allow-is-closable",
+        "allow-is-visible",
+        "allow-is-enabled",
+        "allow-title",
+        "allow-current-monitor",
+        "allow-primary-monitor",
+        "allow-monitor-from-point",
+        "allow-available-monitors",
+        "allow-cursor-position",
+        "allow-theme",
+        "allow-is-always-on-top",
+        "allow-internal-toggle-maximize"
+      ]
+    },
+    "permissions": {
+      "allow-available-monitors": {
+        "identifier": "allow-available-monitors",
+        "description": "Enables the available_monitors command without any pre-configured scope.",
+        "commands": { "allow": ["available_monitors"], "deny": [] }
+      },
+      "allow-center": {
+        "identifier": "allow-center",
+        "description": "Enables the center command without any pre-configured scope.",
+        "commands": { "allow": ["center"], "deny": [] }
+      },
+      "allow-close": {
+        "identifier": "allow-close",
+        "description": "Enables the close command without any pre-configured scope.",
+        "commands": { "allow": ["close"], "deny": [] }
+      },
+      "allow-create": {
+        "identifier": "allow-create",
+        "description": "Enables the create command without any pre-configured scope.",
+        "commands": { "allow": ["create"], "deny": [] }
+      },
+      "allow-current-monitor": {
+        "identifier": "allow-current-monitor",
+        "description": "Enables the current_monitor command without any pre-configured scope.",
+        "commands": { "allow": ["current_monitor"], "deny": [] }
+      },
+      "allow-cursor-position": {
+        "identifier": "allow-cursor-position",
+        "description": "Enables the cursor_position command without any pre-configured scope.",
+        "commands": { "allow": ["cursor_position"], "deny": [] }
+      },
+      "allow-destroy": {
+        "identifier": "allow-destroy",
+        "description": "Enables the destroy command without any pre-configured scope.",
+        "commands": { "allow": ["destroy"], "deny": [] }
+      },
+      "allow-get-all-windows": {
+        "identifier": "allow-get-all-windows",
+        "description": "Enables the get_all_windows command without any pre-configured scope.",
+        "commands": { "allow": ["get_all_windows"], "deny": [] }
+      },
+      "allow-hide": {
+        "identifier": "allow-hide",
+        "description": "Enables the hide command without any pre-configured scope.",
+        "commands": { "allow": ["hide"], "deny": [] }
+      },
+      "allow-inner-position": {
+        "identifier": "allow-inner-position",
+        "description": "Enables the inner_position command without any pre-configured scope.",
+        "commands": { "allow": ["inner_position"], "deny": [] }
+      },
+      "allow-inner-size": {
+        "identifier": "allow-inner-size",
+        "description": "Enables the inner_size command without any pre-configured scope.",
+        "commands": { "allow": ["inner_size"], "deny": [] }
+      },
+      "allow-internal-toggle-maximize": {
+        "identifier": "allow-internal-toggle-maximize",
+        "description": "Enables the internal_toggle_maximize command without any pre-configured scope.",
+        "commands": { "allow": ["internal_toggle_maximize"], "deny": [] }
+      },
+      "allow-is-always-on-top": {
+        "identifier": "allow-is-always-on-top",
+        "description": "Enables the is_always_on_top command without any pre-configured scope.",
+        "commands": { "allow": ["is_always_on_top"], "deny": [] }
+      },
+      "allow-is-closable": {
+        "identifier": "allow-is-closable",
+        "description": "Enables the is_closable command without any pre-configured scope.",
+        "commands": { "allow": ["is_closable"], "deny": [] }
+      },
+      "allow-is-decorated": {
+        "identifier": "allow-is-decorated",
+        "description": "Enables the is_decorated command without any pre-configured scope.",
+        "commands": { "allow": ["is_decorated"], "deny": [] }
+      },
+      "allow-is-enabled": {
+        "identifier": "allow-is-enabled",
+        "description": "Enables the is_enabled command without any pre-configured scope.",
+        "commands": { "allow": ["is_enabled"], "deny": [] }
+      },
+      "allow-is-focused": {
+        "identifier": "allow-is-focused",
+        "description": "Enables the is_focused command without any pre-configured scope.",
+        "commands": { "allow": ["is_focused"], "deny": [] }
+      },
+      "allow-is-fullscreen": {
+        "identifier": "allow-is-fullscreen",
+        "description": "Enables the is_fullscreen command without any pre-configured scope.",
+        "commands": { "allow": ["is_fullscreen"], "deny": [] }
+      },
+      "allow-is-maximizable": {
+        "identifier": "allow-is-maximizable",
+        "description": "Enables the is_maximizable command without any pre-configured scope.",
+        "commands": { "allow": ["is_maximizable"], "deny": [] }
+      },
+      "allow-is-maximized": {
+        "identifier": "allow-is-maximized",
+        "description": "Enables the is_maximized command without any pre-configured scope.",
+        "commands": { "allow": ["is_maximized"], "deny": [] }
+      },
+      "allow-is-minimizable": {
+        "identifier": "allow-is-minimizable",
+        "description": "Enables the is_minimizable command without any pre-configured scope.",
+        "commands": { "allow": ["is_minimizable"], "deny": [] }
+      },
+      "allow-is-minimized": {
+        "identifier": "allow-is-minimized",
+        "description": "Enables the is_minimized command without any pre-configured scope.",
+        "commands": { "allow": ["is_minimized"], "deny": [] }
+      },
+      "allow-is-resizable": {
+        "identifier": "allow-is-resizable",
+        "description": "Enables the is_resizable command without any pre-configured scope.",
+        "commands": { "allow": ["is_resizable"], "deny": [] }
+      },
+      "allow-is-visible": {
+        "identifier": "allow-is-visible",
+        "description": "Enables the is_visible command without any pre-configured scope.",
+        "commands": { "allow": ["is_visible"], "deny": [] }
+      },
+      "allow-maximize": {
+        "identifier": "allow-maximize",
+        "description": "Enables the maximize command without any pre-configured scope.",
+        "commands": { "allow": ["maximize"], "deny": [] }
+      },
+      "allow-minimize": {
+        "identifier": "allow-minimize",
+        "description": "Enables the minimize command without any pre-configured scope.",
+        "commands": { "allow": ["minimize"], "deny": [] }
+      },
+      "allow-monitor-from-point": {
+        "identifier": "allow-monitor-from-point",
+        "description": "Enables the monitor_from_point command without any pre-configured scope.",
+        "commands": { "allow": ["monitor_from_point"], "deny": [] }
+      },
+      "allow-outer-position": {
+        "identifier": "allow-outer-position",
+        "description": "Enables the outer_position command without any pre-configured scope.",
+        "commands": { "allow": ["outer_position"], "deny": [] }
+      },
+      "allow-outer-size": {
+        "identifier": "allow-outer-size",
+        "description": "Enables the outer_size command without any pre-configured scope.",
+        "commands": { "allow": ["outer_size"], "deny": [] }
+      },
+      "allow-primary-monitor": {
+        "identifier": "allow-primary-monitor",
+        "description": "Enables the primary_monitor command without any pre-configured scope.",
+        "commands": { "allow": ["primary_monitor"], "deny": [] }
+      },
+      "allow-request-user-attention": {
+        "identifier": "allow-request-user-attention",
+        "description": "Enables the request_user_attention command without any pre-configured scope.",
+        "commands": { "allow": ["request_user_attention"], "deny": [] }
+      },
+      "allow-scale-factor": {
+        "identifier": "allow-scale-factor",
+        "description": "Enables the scale_factor command without any pre-configured scope.",
+        "commands": { "allow": ["scale_factor"], "deny": [] }
+      },
+      "allow-set-always-on-bottom": {
+        "identifier": "allow-set-always-on-bottom",
+        "description": "Enables the set_always_on_bottom command without any pre-configured scope.",
+        "commands": { "allow": ["set_always_on_bottom"], "deny": [] }
+      },
+      "allow-set-always-on-top": {
+        "identifier": "allow-set-always-on-top",
+        "description": "Enables the set_always_on_top command without any pre-configured scope.",
+        "commands": { "allow": ["set_always_on_top"], "deny": [] }
+      },
+      "allow-set-background-color": {
+        "identifier": "allow-set-background-color",
+        "description": "Enables the set_background_color command without any pre-configured scope.",
+        "commands": { "allow": ["set_background_color"], "deny": [] }
+      },
+      "allow-set-badge-count": {
+        "identifier": "allow-set-badge-count",
+        "description": "Enables the set_badge_count command without any pre-configured scope.",
+        "commands": { "allow": ["set_badge_count"], "deny": [] }
+      },
+      "allow-set-badge-label": {
+        "identifier": "allow-set-badge-label",
+        "description": "Enables the set_badge_label command without any pre-configured scope.",
+        "commands": { "allow": ["set_badge_label"], "deny": [] }
+      },
+      "allow-set-closable": {
+        "identifier": "allow-set-closable",
+        "description": "Enables the set_closable command without any pre-configured scope.",
+        "commands": { "allow": ["set_closable"], "deny": [] }
+      },
+      "allow-set-content-protected": {
+        "identifier": "allow-set-content-protected",
+        "description": "Enables the set_content_protected command without any pre-configured scope.",
+        "commands": { "allow": ["set_content_protected"], "deny": [] }
+      },
+      "allow-set-cursor-grab": {
+        "identifier": "allow-set-cursor-grab",
+        "description": "Enables the set_cursor_grab command without any pre-configured scope.",
+        "commands": { "allow": ["set_cursor_grab"], "deny": [] }
+      },
+      "allow-set-cursor-icon": {
+        "identifier": "allow-set-cursor-icon",
+        "description": "Enables the set_cursor_icon command without any pre-configured scope.",
+        "commands": { "allow": ["set_cursor_icon"], "deny": [] }
+      },
+      "allow-set-cursor-position": {
+        "identifier": "allow-set-cursor-position",
+        "description": "Enables the set_cursor_position command without any pre-configured scope.",
+        "commands": { "allow": ["set_cursor_position"], "deny": [] }
+      },
+      "allow-set-cursor-visible": {
+        "identifier": "allow-set-cursor-visible",
+        "description": "Enables the set_cursor_visible command without any pre-configured scope.",
+        "commands": { "allow": ["set_cursor_visible"], "deny": [] }
+      },
+      "allow-set-decorations": {
+        "identifier": "allow-set-decorations",
+        "description": "Enables the set_decorations command without any pre-configured scope.",
+        "commands": { "allow": ["set_decorations"], "deny": [] }
+      },
+      "allow-set-effects": {
+        "identifier": "allow-set-effects",
+        "description": "Enables the set_effects command without any pre-configured scope.",
+        "commands": { "allow": ["set_effects"], "deny": [] }
+      },
+      "allow-set-enabled": {
+        "identifier": "allow-set-enabled",
+        "description": "Enables the set_enabled command without any pre-configured scope.",
+        "commands": { "allow": ["set_enabled"], "deny": [] }
+      },
+      "allow-set-focus": {
+        "identifier": "allow-set-focus",
+        "description": "Enables the set_focus command without any pre-configured scope.",
+        "commands": { "allow": ["set_focus"], "deny": [] }
+      },
+      "allow-set-focusable": {
+        "identifier": "allow-set-focusable",
+        "description": "Enables the set_focusable command without any pre-configured scope.",
+        "commands": { "allow": ["set_focusable"], "deny": [] }
+      },
+      "allow-set-fullscreen": {
+        "identifier": "allow-set-fullscreen",
+        "description": "Enables the set_fullscreen command without any pre-configured scope.",
+        "commands": { "allow": ["set_fullscreen"], "deny": [] }
+      },
+      "allow-set-icon": {
+        "identifier": "allow-set-icon",
+        "description": "Enables the set_icon command without any pre-configured scope.",
+        "commands": { "allow": ["set_icon"], "deny": [] }
+      },
+      "allow-set-ignore-cursor-events": {
+        "identifier": "allow-set-ignore-cursor-events",
+        "description": "Enables the set_ignore_cursor_events command without any pre-configured scope.",
+        "commands": { "allow": ["set_ignore_cursor_events"], "deny": [] }
+      },
+      "allow-set-max-size": {
+        "identifier": "allow-set-max-size",
+        "description": "Enables the set_max_size command without any pre-configured scope.",
+        "commands": { "allow": ["set_max_size"], "deny": [] }
+      },
+      "allow-set-maximizable": {
+        "identifier": "allow-set-maximizable",
+        "description": "Enables the set_maximizable command without any pre-configured scope.",
+        "commands": { "allow": ["set_maximizable"], "deny": [] }
+      },
+      "allow-set-min-size": {
+        "identifier": "allow-set-min-size",
+        "description": "Enables the set_min_size command without any pre-configured scope.",
+        "commands": { "allow": ["set_min_size"], "deny": [] }
+      },
+      "allow-set-minimizable": {
+        "identifier": "allow-set-minimizable",
+        "description": "Enables the set_minimizable command without any pre-configured scope.",
+        "commands": { "allow": ["set_minimizable"], "deny": [] }
+      },
+      "allow-set-overlay-icon": {
+        "identifier": "allow-set-overlay-icon",
+        "description": "Enables the set_overlay_icon command without any pre-configured scope.",
+        "commands": { "allow": ["set_overlay_icon"], "deny": [] }
+      },
+      "allow-set-position": {
+        "identifier": "allow-set-position",
+        "description": "Enables the set_position command without any pre-configured scope.",
+        "commands": { "allow": ["set_position"], "deny": [] }
+      },
+      "allow-set-progress-bar": {
+        "identifier": "allow-set-progress-bar",
+        "description": "Enables the set_progress_bar command without any pre-configured scope.",
+        "commands": { "allow": ["set_progress_bar"], "deny": [] }
+      },
+      "allow-set-resizable": {
+        "identifier": "allow-set-resizable",
+        "description": "Enables the set_resizable command without any pre-configured scope.",
+        "commands": { "allow": ["set_resizable"], "deny": [] }
+      },
+      "allow-set-shadow": {
+        "identifier": "allow-set-shadow",
+        "description": "Enables the set_shadow command without any pre-configured scope.",
+        "commands": { "allow": ["set_shadow"], "deny": [] }
+      },
+      "allow-set-simple-fullscreen": {
+        "identifier": "allow-set-simple-fullscreen",
+        "description": "Enables the set_simple_fullscreen command without any pre-configured scope.",
+        "commands": { "allow": ["set_simple_fullscreen"], "deny": [] }
+      },
+      "allow-set-size": {
+        "identifier": "allow-set-size",
+        "description": "Enables the set_size command without any pre-configured scope.",
+        "commands": { "allow": ["set_size"], "deny": [] }
+      },
+      "allow-set-size-constraints": {
+        "identifier": "allow-set-size-constraints",
+        "description": "Enables the set_size_constraints command without any pre-configured scope.",
+        "commands": { "allow": ["set_size_constraints"], "deny": [] }
+      },
+      "allow-set-skip-taskbar": {
+        "identifier": "allow-set-skip-taskbar",
+        "description": "Enables the set_skip_taskbar command without any pre-configured scope.",
+        "commands": { "allow": ["set_skip_taskbar"], "deny": [] }
+      },
+      "allow-set-theme": {
+        "identifier": "allow-set-theme",
+        "description": "Enables the set_theme command without any pre-configured scope.",
+        "commands": { "allow": ["set_theme"], "deny": [] }
+      },
+      "allow-set-title": {
+        "identifier": "allow-set-title",
+        "description": "Enables the set_title command without any pre-configured scope.",
+        "commands": { "allow": ["set_title"], "deny": [] }
+      },
+      "allow-set-title-bar-style": {
+        "identifier": "allow-set-title-bar-style",
+        "description": "Enables the set_title_bar_style command without any pre-configured scope.",
+        "commands": { "allow": ["set_title_bar_style"], "deny": [] }
+      },
+      "allow-set-visible-on-all-organizations": {
+        "identifier": "allow-set-visible-on-all-organizations",
+        "description": "Enables the set_visible_on_all_organizations command without any pre-configured scope.",
+        "commands": { "allow": ["set_visible_on_all_organizations"], "deny": [] }
+      },
+      "allow-show": {
+        "identifier": "allow-show",
+        "description": "Enables the show command without any pre-configured scope.",
+        "commands": { "allow": ["show"], "deny": [] }
+      },
+      "allow-start-dragging": {
+        "identifier": "allow-start-dragging",
+        "description": "Enables the start_dragging command without any pre-configured scope.",
+        "commands": { "allow": ["start_dragging"], "deny": [] }
+      },
+      "allow-start-resize-dragging": {
+        "identifier": "allow-start-resize-dragging",
+        "description": "Enables the start_resize_dragging command without any pre-configured scope.",
+        "commands": { "allow": ["start_resize_dragging"], "deny": [] }
+      },
+      "allow-theme": {
+        "identifier": "allow-theme",
+        "description": "Enables the theme command without any pre-configured scope.",
+        "commands": { "allow": ["theme"], "deny": [] }
+      },
+      "allow-title": {
+        "identifier": "allow-title",
+        "description": "Enables the title command without any pre-configured scope.",
+        "commands": { "allow": ["title"], "deny": [] }
+      },
+      "allow-toggle-maximize": {
+        "identifier": "allow-toggle-maximize",
+        "description": "Enables the toggle_maximize command without any pre-configured scope.",
+        "commands": { "allow": ["toggle_maximize"], "deny": [] }
+      },
+      "allow-unmaximize": {
+        "identifier": "allow-unmaximize",
+        "description": "Enables the unmaximize command without any pre-configured scope.",
+        "commands": { "allow": ["unmaximize"], "deny": [] }
+      },
+      "allow-unminimize": {
+        "identifier": "allow-unminimize",
+        "description": "Enables the unminimize command without any pre-configured scope.",
+        "commands": { "allow": ["unminimize"], "deny": [] }
+      },
+      "deny-available-monitors": {
+        "identifier": "deny-available-monitors",
+        "description": "Denies the available_monitors command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["available_monitors"] }
+      },
+      "deny-center": {
+        "identifier": "deny-center",
+        "description": "Denies the center command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["center"] }
+      },
+      "deny-close": {
+        "identifier": "deny-close",
+        "description": "Denies the close command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["close"] }
+      },
+      "deny-create": {
+        "identifier": "deny-create",
+        "description": "Denies the create command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["create"] }
+      },
+      "deny-current-monitor": {
+        "identifier": "deny-current-monitor",
+        "description": "Denies the current_monitor command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["current_monitor"] }
+      },
+      "deny-cursor-position": {
+        "identifier": "deny-cursor-position",
+        "description": "Denies the cursor_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["cursor_position"] }
+      },
+      "deny-destroy": {
+        "identifier": "deny-destroy",
+        "description": "Denies the destroy command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["destroy"] }
+      },
+      "deny-get-all-windows": {
+        "identifier": "deny-get-all-windows",
+        "description": "Denies the get_all_windows command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["get_all_windows"] }
+      },
+      "deny-hide": {
+        "identifier": "deny-hide",
+        "description": "Denies the hide command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["hide"] }
+      },
+      "deny-inner-position": {
+        "identifier": "deny-inner-position",
+        "description": "Denies the inner_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["inner_position"] }
+      },
+      "deny-inner-size": {
+        "identifier": "deny-inner-size",
+        "description": "Denies the inner_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["inner_size"] }
+      },
+      "deny-internal-toggle-maximize": {
+        "identifier": "deny-internal-toggle-maximize",
+        "description": "Denies the internal_toggle_maximize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["internal_toggle_maximize"] }
+      },
+      "deny-is-always-on-top": {
+        "identifier": "deny-is-always-on-top",
+        "description": "Denies the is_always_on_top command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_always_on_top"] }
+      },
+      "deny-is-closable": {
+        "identifier": "deny-is-closable",
+        "description": "Denies the is_closable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_closable"] }
+      },
+      "deny-is-decorated": {
+        "identifier": "deny-is-decorated",
+        "description": "Denies the is_decorated command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_decorated"] }
+      },
+      "deny-is-enabled": {
+        "identifier": "deny-is-enabled",
+        "description": "Denies the is_enabled command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_enabled"] }
+      },
+      "deny-is-focused": {
+        "identifier": "deny-is-focused",
+        "description": "Denies the is_focused command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_focused"] }
+      },
+      "deny-is-fullscreen": {
+        "identifier": "deny-is-fullscreen",
+        "description": "Denies the is_fullscreen command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_fullscreen"] }
+      },
+      "deny-is-maximizable": {
+        "identifier": "deny-is-maximizable",
+        "description": "Denies the is_maximizable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_maximizable"] }
+      },
+      "deny-is-maximized": {
+        "identifier": "deny-is-maximized",
+        "description": "Denies the is_maximized command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_maximized"] }
+      },
+      "deny-is-minimizable": {
+        "identifier": "deny-is-minimizable",
+        "description": "Denies the is_minimizable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_minimizable"] }
+      },
+      "deny-is-minimized": {
+        "identifier": "deny-is-minimized",
+        "description": "Denies the is_minimized command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_minimized"] }
+      },
+      "deny-is-resizable": {
+        "identifier": "deny-is-resizable",
+        "description": "Denies the is_resizable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_resizable"] }
+      },
+      "deny-is-visible": {
+        "identifier": "deny-is-visible",
+        "description": "Denies the is_visible command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["is_visible"] }
+      },
+      "deny-maximize": {
+        "identifier": "deny-maximize",
+        "description": "Denies the maximize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["maximize"] }
+      },
+      "deny-minimize": {
+        "identifier": "deny-minimize",
+        "description": "Denies the minimize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["minimize"] }
+      },
+      "deny-monitor-from-point": {
+        "identifier": "deny-monitor-from-point",
+        "description": "Denies the monitor_from_point command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["monitor_from_point"] }
+      },
+      "deny-outer-position": {
+        "identifier": "deny-outer-position",
+        "description": "Denies the outer_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["outer_position"] }
+      },
+      "deny-outer-size": {
+        "identifier": "deny-outer-size",
+        "description": "Denies the outer_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["outer_size"] }
+      },
+      "deny-primary-monitor": {
+        "identifier": "deny-primary-monitor",
+        "description": "Denies the primary_monitor command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["primary_monitor"] }
+      },
+      "deny-request-user-attention": {
+        "identifier": "deny-request-user-attention",
+        "description": "Denies the request_user_attention command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["request_user_attention"] }
+      },
+      "deny-scale-factor": {
+        "identifier": "deny-scale-factor",
+        "description": "Denies the scale_factor command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["scale_factor"] }
+      },
+      "deny-set-always-on-bottom": {
+        "identifier": "deny-set-always-on-bottom",
+        "description": "Denies the set_always_on_bottom command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_always_on_bottom"] }
+      },
+      "deny-set-always-on-top": {
+        "identifier": "deny-set-always-on-top",
+        "description": "Denies the set_always_on_top command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_always_on_top"] }
+      },
+      "deny-set-background-color": {
+        "identifier": "deny-set-background-color",
+        "description": "Denies the set_background_color command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_background_color"] }
+      },
+      "deny-set-badge-count": {
+        "identifier": "deny-set-badge-count",
+        "description": "Denies the set_badge_count command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_badge_count"] }
+      },
+      "deny-set-badge-label": {
+        "identifier": "deny-set-badge-label",
+        "description": "Denies the set_badge_label command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_badge_label"] }
+      },
+      "deny-set-closable": {
+        "identifier": "deny-set-closable",
+        "description": "Denies the set_closable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_closable"] }
+      },
+      "deny-set-content-protected": {
+        "identifier": "deny-set-content-protected",
+        "description": "Denies the set_content_protected command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_content_protected"] }
+      },
+      "deny-set-cursor-grab": {
+        "identifier": "deny-set-cursor-grab",
+        "description": "Denies the set_cursor_grab command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_cursor_grab"] }
+      },
+      "deny-set-cursor-icon": {
+        "identifier": "deny-set-cursor-icon",
+        "description": "Denies the set_cursor_icon command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_cursor_icon"] }
+      },
+      "deny-set-cursor-position": {
+        "identifier": "deny-set-cursor-position",
+        "description": "Denies the set_cursor_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_cursor_position"] }
+      },
+      "deny-set-cursor-visible": {
+        "identifier": "deny-set-cursor-visible",
+        "description": "Denies the set_cursor_visible command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_cursor_visible"] }
+      },
+      "deny-set-decorations": {
+        "identifier": "deny-set-decorations",
+        "description": "Denies the set_decorations command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_decorations"] }
+      },
+      "deny-set-effects": {
+        "identifier": "deny-set-effects",
+        "description": "Denies the set_effects command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_effects"] }
+      },
+      "deny-set-enabled": {
+        "identifier": "deny-set-enabled",
+        "description": "Denies the set_enabled command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_enabled"] }
+      },
+      "deny-set-focus": {
+        "identifier": "deny-set-focus",
+        "description": "Denies the set_focus command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_focus"] }
+      },
+      "deny-set-focusable": {
+        "identifier": "deny-set-focusable",
+        "description": "Denies the set_focusable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_focusable"] }
+      },
+      "deny-set-fullscreen": {
+        "identifier": "deny-set-fullscreen",
+        "description": "Denies the set_fullscreen command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_fullscreen"] }
+      },
+      "deny-set-icon": {
+        "identifier": "deny-set-icon",
+        "description": "Denies the set_icon command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_icon"] }
+      },
+      "deny-set-ignore-cursor-events": {
+        "identifier": "deny-set-ignore-cursor-events",
+        "description": "Denies the set_ignore_cursor_events command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_ignore_cursor_events"] }
+      },
+      "deny-set-max-size": {
+        "identifier": "deny-set-max-size",
+        "description": "Denies the set_max_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_max_size"] }
+      },
+      "deny-set-maximizable": {
+        "identifier": "deny-set-maximizable",
+        "description": "Denies the set_maximizable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_maximizable"] }
+      },
+      "deny-set-min-size": {
+        "identifier": "deny-set-min-size",
+        "description": "Denies the set_min_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_min_size"] }
+      },
+      "deny-set-minimizable": {
+        "identifier": "deny-set-minimizable",
+        "description": "Denies the set_minimizable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_minimizable"] }
+      },
+      "deny-set-overlay-icon": {
+        "identifier": "deny-set-overlay-icon",
+        "description": "Denies the set_overlay_icon command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_overlay_icon"] }
+      },
+      "deny-set-position": {
+        "identifier": "deny-set-position",
+        "description": "Denies the set_position command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_position"] }
+      },
+      "deny-set-progress-bar": {
+        "identifier": "deny-set-progress-bar",
+        "description": "Denies the set_progress_bar command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_progress_bar"] }
+      },
+      "deny-set-resizable": {
+        "identifier": "deny-set-resizable",
+        "description": "Denies the set_resizable command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_resizable"] }
+      },
+      "deny-set-shadow": {
+        "identifier": "deny-set-shadow",
+        "description": "Denies the set_shadow command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_shadow"] }
+      },
+      "deny-set-simple-fullscreen": {
+        "identifier": "deny-set-simple-fullscreen",
+        "description": "Denies the set_simple_fullscreen command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_simple_fullscreen"] }
+      },
+      "deny-set-size": {
+        "identifier": "deny-set-size",
+        "description": "Denies the set_size command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_size"] }
+      },
+      "deny-set-size-constraints": {
+        "identifier": "deny-set-size-constraints",
+        "description": "Denies the set_size_constraints command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_size_constraints"] }
+      },
+      "deny-set-skip-taskbar": {
+        "identifier": "deny-set-skip-taskbar",
+        "description": "Denies the set_skip_taskbar command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_skip_taskbar"] }
+      },
+      "deny-set-theme": {
+        "identifier": "deny-set-theme",
+        "description": "Denies the set_theme command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_theme"] }
+      },
+      "deny-set-title": {
+        "identifier": "deny-set-title",
+        "description": "Denies the set_title command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_title"] }
+      },
+      "deny-set-title-bar-style": {
+        "identifier": "deny-set-title-bar-style",
+        "description": "Denies the set_title_bar_style command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_title_bar_style"] }
+      },
+      "deny-set-visible-on-all-organizations": {
+        "identifier": "deny-set-visible-on-all-organizations",
+        "description": "Denies the set_visible_on_all_organizations command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["set_visible_on_all_organizations"] }
+      },
+      "deny-show": {
+        "identifier": "deny-show",
+        "description": "Denies the show command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["show"] }
+      },
+      "deny-start-dragging": {
+        "identifier": "deny-start-dragging",
+        "description": "Denies the start_dragging command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["start_dragging"] }
+      },
+      "deny-start-resize-dragging": {
+        "identifier": "deny-start-resize-dragging",
+        "description": "Denies the start_resize_dragging command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["start_resize_dragging"] }
+      },
+      "deny-theme": {
+        "identifier": "deny-theme",
+        "description": "Denies the theme command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["theme"] }
+      },
+      "deny-title": {
+        "identifier": "deny-title",
+        "description": "Denies the title command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["title"] }
+      },
+      "deny-toggle-maximize": {
+        "identifier": "deny-toggle-maximize",
+        "description": "Denies the toggle_maximize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["toggle_maximize"] }
+      },
+      "deny-unmaximize": {
+        "identifier": "deny-unmaximize",
+        "description": "Denies the unmaximize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["unmaximize"] }
+      },
+      "deny-unminimize": {
+        "identifier": "deny-unminimize",
+        "description": "Denies the unminimize command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["unminimize"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": null
+  },
+  "shell": {
+    "default_permission": {
+      "identifier": "default",
+      "description": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n",
+      "permissions": ["allow-open"]
+    },
+    "permissions": {
+      "allow-execute": {
+        "identifier": "allow-execute",
+        "description": "Enables the execute command without any pre-configured scope.",
+        "commands": { "allow": ["execute"], "deny": [] }
+      },
+      "allow-kill": {
+        "identifier": "allow-kill",
+        "description": "Enables the kill command without any pre-configured scope.",
+        "commands": { "allow": ["kill"], "deny": [] }
+      },
+      "allow-open": {
+        "identifier": "allow-open",
+        "description": "Enables the open command without any pre-configured scope.",
+        "commands": { "allow": ["open"], "deny": [] }
+      },
+      "allow-spawn": {
+        "identifier": "allow-spawn",
+        "description": "Enables the spawn command without any pre-configured scope.",
+        "commands": { "allow": ["spawn"], "deny": [] }
+      },
+      "allow-stdin-write": {
+        "identifier": "allow-stdin-write",
+        "description": "Enables the stdin_write command without any pre-configured scope.",
+        "commands": { "allow": ["stdin_write"], "deny": [] }
+      },
+      "deny-execute": {
+        "identifier": "deny-execute",
+        "description": "Denies the execute command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["execute"] }
+      },
+      "deny-kill": {
+        "identifier": "deny-kill",
+        "description": "Denies the kill command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["kill"] }
+      },
+      "deny-open": {
+        "identifier": "deny-open",
+        "description": "Denies the open command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["open"] }
+      },
+      "deny-spawn": {
+        "identifier": "deny-spawn",
+        "description": "Denies the spawn command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["spawn"] }
+      },
+      "deny-stdin-write": {
+        "identifier": "deny-stdin-write",
+        "description": "Denies the stdin_write command without any pre-configured scope.",
+        "commands": { "allow": [], "deny": ["stdin_write"] }
+      }
+    },
+    "permission_sets": {},
+    "global_scope_schema": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "anyOf": [
+        {
+          "additionalProperties": false,
+          "properties": {
+            "args": { "allOf": [{ "$ref": "#/definitions/ShellScopeEntryAllowedArgs" }], "description": "The allowed arguments for the command execution." },
+            "cmd": {
+              "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
+              "type": "string"
+            },
+            "name": {
+              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+              "type": "string"
+            }
+          },
+          "required": ["cmd", "name"],
+          "type": "object"
+        },
+        {
+          "additionalProperties": false,
+          "properties": {
+            "args": { "allOf": [{ "$ref": "#/definitions/ShellScopeEntryAllowedArgs" }], "description": "The allowed arguments for the command execution." },
+            "name": {
+              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+              "type": "string"
+            },
+            "sidecar": { "description": "If this command is a sidecar command.", "type": "boolean" }
+          },
+          "required": ["name", "sidecar"],
+          "type": "object"
+        }
+      ],
+      "definitions": {
+        "ShellScopeEntryAllowedArg": {
+          "anyOf": [
+            { "description": "A non-configurable argument that is passed to the command in the order it was specified.", "type": "string" },
+            {
+              "additionalProperties": false,
+              "description": "A variable that is set while calling the command from the webview API.",
+              "properties": {
+                "raw": {
+                  "default": false,
+                  "description": "Marks the validator as a raw regex, meaning the plugin should not make any modification at runtime.\n\nThis means the regex will not match on the entire string by default, which might be exploited if your regex allow unexpected input to be considered valid. When using this option, make sure your regex is correct.",
+                  "type": "boolean"
+                },
+                "validator": {
+                  "description": "[regex] validator to require passed values to conform to an expected input.\n\nThis will require the argument value passed to this variable to match the `validator` regex before it will be executed.\n\nThe regex string is by default surrounded by `^...$` to match the full string. For example the `https?://\\w+` regex would be registered as `^https?://\\w+$`.\n\n[regex]: <https://docs.rs/regex/latest/regex/#syntax>",
+                  "type": "string"
+                }
+              },
+              "required": ["validator"],
+              "type": "object"
+            }
+          ],
+          "description": "A command argument allowed to be executed by the webview API."
+        },
+        "ShellScopeEntryAllowedArgs": {
+          "anyOf": [
+            { "description": "Use a simple boolean to allow all or disable all arguments to this command configuration.", "type": "boolean" },
+            {
+              "description": "A specific set of [`ShellScopeEntryAllowedArg`] that are valid to call for the command configuration.",
+              "items": { "$ref": "#/definitions/ShellScopeEntryAllowedArg" },
+              "type": "array"
+            }
+          ],
+          "description": "A set of command arguments allowed to be executed by the webview API.\n\nA value of `true` will allow any arguments to be passed to the command. `false` will disable all arguments. A list of [`ShellScopeEntryAllowedArg`] will set those arguments as the only valid arguments to be passed to the attached command configuration."
+        }
+      },
+      "description": "Shell scope entry.",
+      "title": "ShellScopeEntry"
+    }
+  }
+}
diff --git a/foundry/packages/desktop/src-tauri/gen/schemas/capabilities.json b/foundry/packages/desktop/src-tauri/gen/schemas/capabilities.json
new file mode 100644
index 0000000..fe3a6f3
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/gen/schemas/capabilities.json
@@ -0,0 +1 @@
+{"default":{"identifier":"default","description":"Default capability for Foundry desktop","local":true,"windows":["main"],"permissions":["core:default","core:window:allow-start-dragging","shell:allow-open",{"identifier":"shell:allow-execute","allow":[{"args":true,"name":"sidecars/foundry-backend","sidecar":true}]},{"identifier":"shell:allow-spawn","allow":[{"args":true,"name":"sidecars/foundry-backend","sidecar":true}]}]}}
\ No newline at end of file
diff --git a/foundry/packages/desktop/src-tauri/gen/schemas/desktop-schema.json b/foundry/packages/desktop/src-tauri/gen/schemas/desktop-schema.json
new file mode 100644
index 0000000..34f0a61
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/gen/schemas/desktop-schema.json
@@ -0,0 +1,2522 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "CapabilityFile",
+  "description": "Capability formats accepted in a capability file.",
+  "anyOf": [
+    {
+      "description": "A single capability.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Capability"
+        }
+      ]
+    },
+    {
+      "description": "A list of capabilities.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Capability"
+      }
+    },
+    {
+      "description": "A list of capabilities.",
+      "type": "object",
+      "required": ["capabilities"],
+      "properties": {
+        "capabilities": {
+          "description": "The list of capabilities.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Capability"
+          }
+        }
+      }
+    }
+  ],
+  "definitions": {
+    "Capability": {
+      "description": "A grouping and boundary mechanism developers can use to isolate access to the IPC layer.\n\nIt controls application windows' and webviews' fine grained access to the Tauri core, application, or plugin commands. If a webview or its window is not matching any capability then it has no access to the IPC layer at all.\n\nThis can be done to create groups of windows, based on their required system access, which can reduce impact of frontend vulnerabilities in less privileged windows. Windows can be added to a capability by exact name (e.g. `main-window`) or glob patterns like `*` or `admin-*`. A Window can have none, one, or multiple associated capabilities.\n\n## Example\n\n```json { \"identifier\": \"main-user-files-write\", \"description\": \"This capability allows the `main` window on macOS and Windows access to `filesystem` write related commands and `dialog` commands to enable programmatic access to files selected by the user.\", \"windows\": [ \"main\" ], \"permissions\": [ \"core:default\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] }, ], \"platforms\": [\"macOS\",\"windows\"] } ```",
+      "type": "object",
+      "required": ["identifier", "permissions"],
+      "properties": {
+        "identifier": {
+          "description": "Identifier of the capability.\n\n## Example\n\n`main-user-files-write`",
+          "type": "string"
+        },
+        "description": {
+          "description": "Description of what the capability is intended to allow on associated windows.\n\nIt should contain a description of what the grouped permissions should allow.\n\n## Example\n\nThis capability allows the `main` window access to `filesystem` write related commands and `dialog` commands to enable programmatic access to files selected by the user.",
+          "default": "",
+          "type": "string"
+        },
+        "remote": {
+          "description": "Configure remote URLs that can use the capability permissions.\n\nThis setting is optional and defaults to not being set, as our default use case is that the content is served from our local application.\n\n:::caution Make sure you understand the security implications of providing remote sources with local system access. :::\n\n## Example\n\n```json { \"urls\": [\"https://*.mydomain.dev\"] } ```",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/CapabilityRemote"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "local": {
+          "description": "Whether this capability is enabled for local app URLs or not. Defaults to `true`.",
+          "default": true,
+          "type": "boolean"
+        },
+        "windows": {
+          "description": "List of windows that are affected by this capability. Can be a glob pattern.\n\nIf a window label matches any of the patterns in this list, the capability will be enabled on all the webviews of that window, regardless of the value of [`Self::webviews`].\n\nOn multiwebview windows, prefer specifying [`Self::webviews`] and omitting [`Self::windows`] for a fine grained access control.\n\n## Example\n\n`[\"main\"]`",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "webviews": {
+          "description": "List of webviews that are affected by this capability. Can be a glob pattern.\n\nThe capability will be enabled on all the webviews whose label matches any of the patterns in this list, regardless of whether the webview's window label matches a pattern in [`Self::windows`].\n\n## Example\n\n`[\"sub-webview-one\", \"sub-webview-two\"]`",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "permissions": {
+          "description": "List of permissions attached to this capability.\n\nMust include the plugin name as prefix in the form of `${plugin-name}:${permission-name}`. For commands directly implemented in the application itself only `${permission-name}` is required.\n\n## Example\n\n```json [ \"core:default\", \"shell:allow-open\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] } ] ```",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PermissionEntry"
+          },
+          "uniqueItems": true
+        },
+        "platforms": {
+          "description": "Limit which target platforms this capability applies to.\n\nBy default all platforms are targeted.\n\n## Example\n\n`[\"macOS\",\"windows\"]`",
+          "type": ["array", "null"],
+          "items": {
+            "$ref": "#/definitions/Target"
+          }
+        }
+      }
+    },
+    "CapabilityRemote": {
+      "description": "Configuration for remote URLs that are associated with the capability.",
+      "type": "object",
+      "required": ["urls"],
+      "properties": {
+        "urls": {
+          "description": "Remote domains this capability refers to using the [URLPattern standard](https://urlpattern.spec.whatwg.org/).\n\n## Examples\n\n- \"https://*.mydomain.dev\": allows subdomains of mydomain.dev - \"https://mydomain.dev/api/*\": allows any subpath of mydomain.dev/api",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "PermissionEntry": {
+      "description": "An entry for a permission value in a [`Capability`] can be either a raw permission [`Identifier`] or an object that references a permission and extends its scope.",
+      "anyOf": [
+        {
+          "description": "Reference a permission or permission set by identifier.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Identifier"
+            }
+          ]
+        },
+        {
+          "description": "Reference a permission or permission set by identifier and extends its scope.",
+          "type": "object",
+          "allOf": [
+            {
+              "if": {
+                "properties": {
+                  "identifier": {
+                    "anyOf": [
+                      {
+                        "description": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`",
+                        "type": "string",
+                        "const": "shell:default",
+                        "markdownDescription": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`"
+                      },
+                      {
+                        "description": "Enables the execute command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-execute",
+                        "markdownDescription": "Enables the execute command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the kill command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-kill",
+                        "markdownDescription": "Enables the kill command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the open command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-open",
+                        "markdownDescription": "Enables the open command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the spawn command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-spawn",
+                        "markdownDescription": "Enables the spawn command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the stdin_write command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-stdin-write",
+                        "markdownDescription": "Enables the stdin_write command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the execute command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-execute",
+                        "markdownDescription": "Denies the execute command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the kill command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-kill",
+                        "markdownDescription": "Denies the kill command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the open command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-open",
+                        "markdownDescription": "Denies the open command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the spawn command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-spawn",
+                        "markdownDescription": "Denies the spawn command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the stdin_write command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-stdin-write",
+                        "markdownDescription": "Denies the stdin_write command without any pre-configured scope."
+                      }
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "allow": {
+                    "items": {
+                      "title": "ShellScopeEntry",
+                      "description": "Shell scope entry.",
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "required": ["cmd", "name"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "cmd": {
+                              "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
+                              "type": "string"
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "required": ["name", "sidecar"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            },
+                            "sidecar": {
+                              "description": "If this command is a sidecar command.",
+                              "type": "boolean"
+                            }
+                          },
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "deny": {
+                    "items": {
+                      "title": "ShellScopeEntry",
+                      "description": "Shell scope entry.",
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "required": ["cmd", "name"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "cmd": {
+                              "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
+                              "type": "string"
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "required": ["name", "sidecar"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            },
+                            "sidecar": {
+                              "description": "If this command is a sidecar command.",
+                              "type": "boolean"
+                            }
+                          },
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "properties": {
+                "identifier": {
+                  "description": "Identifier of the permission or permission set.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Identifier"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "properties": {
+                "identifier": {
+                  "description": "Identifier of the permission or permission set.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Identifier"
+                    }
+                  ]
+                },
+                "allow": {
+                  "description": "Data that defines what is allowed by the scope.",
+                  "type": ["array", "null"],
+                  "items": {
+                    "$ref": "#/definitions/Value"
+                  }
+                },
+                "deny": {
+                  "description": "Data that defines what is denied by the scope. This should be prioritized by validation logic.",
+                  "type": ["array", "null"],
+                  "items": {
+                    "$ref": "#/definitions/Value"
+                  }
+                }
+              }
+            }
+          ],
+          "required": ["identifier"]
+        }
+      ]
+    },
+    "Identifier": {
+      "description": "Permission identifier",
+      "oneOf": [
+        {
+          "description": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`",
+          "type": "string",
+          "const": "core:default",
+          "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
+        },
+        {
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
+          "type": "string",
+          "const": "core:app:default",
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
+        },
+        {
+          "description": "Enables the app_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-app-hide",
+          "markdownDescription": "Enables the app_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the app_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-app-show",
+          "markdownDescription": "Enables the app_show command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the bundle_type command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-bundle-type",
+          "markdownDescription": "Enables the bundle_type command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the default_window_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-default-window-icon",
+          "markdownDescription": "Enables the default_window_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-fetch-data-store-identifiers",
+          "markdownDescription": "Enables the fetch_data_store_identifiers command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the identifier command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-identifier",
+          "markdownDescription": "Enables the identifier command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the name command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-name",
+          "markdownDescription": "Enables the name command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_data_store command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-data-store",
+          "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-set-app-theme",
+          "markdownDescription": "Enables the set_app_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_dock_visibility command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-set-dock-visibility",
+          "markdownDescription": "Enables the set_dock_visibility command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the tauri_version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-tauri-version",
+          "markdownDescription": "Enables the tauri_version command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-version",
+          "markdownDescription": "Enables the version command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the app_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-app-hide",
+          "markdownDescription": "Denies the app_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the app_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-app-show",
+          "markdownDescription": "Denies the app_show command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the bundle_type command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-bundle-type",
+          "markdownDescription": "Denies the bundle_type command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the default_window_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-default-window-icon",
+          "markdownDescription": "Denies the default_window_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-fetch-data-store-identifiers",
+          "markdownDescription": "Denies the fetch_data_store_identifiers command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the identifier command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-identifier",
+          "markdownDescription": "Denies the identifier command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the name command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-name",
+          "markdownDescription": "Denies the name command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_data_store command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-data-store",
+          "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-set-app-theme",
+          "markdownDescription": "Denies the set_app_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_dock_visibility command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-set-dock-visibility",
+          "markdownDescription": "Denies the set_dock_visibility command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the tauri_version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-tauri-version",
+          "markdownDescription": "Denies the tauri_version command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-version",
+          "markdownDescription": "Denies the version command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-listen`\n- `allow-unlisten`\n- `allow-emit`\n- `allow-emit-to`",
+          "type": "string",
+          "const": "core:event:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-listen`\n- `allow-unlisten`\n- `allow-emit`\n- `allow-emit-to`"
+        },
+        {
+          "description": "Enables the emit command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-emit",
+          "markdownDescription": "Enables the emit command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the emit_to command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-emit-to",
+          "markdownDescription": "Enables the emit_to command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the listen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-listen",
+          "markdownDescription": "Enables the listen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the unlisten command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-unlisten",
+          "markdownDescription": "Enables the unlisten command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the emit command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-emit",
+          "markdownDescription": "Denies the emit command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the emit_to command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-emit-to",
+          "markdownDescription": "Denies the emit_to command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the listen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-listen",
+          "markdownDescription": "Denies the listen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the unlisten command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-unlisten",
+          "markdownDescription": "Denies the unlisten command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-from-bytes`\n- `allow-from-path`\n- `allow-rgba`\n- `allow-size`",
+          "type": "string",
+          "const": "core:image:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-from-bytes`\n- `allow-from-path`\n- `allow-rgba`\n- `allow-size`"
+        },
+        {
+          "description": "Enables the from_bytes command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-from-bytes",
+          "markdownDescription": "Enables the from_bytes command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the from_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-from-path",
+          "markdownDescription": "Enables the from_path command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-new",
+          "markdownDescription": "Enables the new command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the rgba command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-rgba",
+          "markdownDescription": "Enables the rgba command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-size",
+          "markdownDescription": "Enables the size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the from_bytes command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-from-bytes",
+          "markdownDescription": "Denies the from_bytes command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the from_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-from-path",
+          "markdownDescription": "Denies the from_path command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-new",
+          "markdownDescription": "Denies the new command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the rgba command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-rgba",
+          "markdownDescription": "Denies the rgba command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-size",
+          "markdownDescription": "Denies the size command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-append`\n- `allow-prepend`\n- `allow-insert`\n- `allow-remove`\n- `allow-remove-at`\n- `allow-items`\n- `allow-get`\n- `allow-popup`\n- `allow-create-default`\n- `allow-set-as-app-menu`\n- `allow-set-as-window-menu`\n- `allow-text`\n- `allow-set-text`\n- `allow-is-enabled`\n- `allow-set-enabled`\n- `allow-set-accelerator`\n- `allow-set-as-windows-menu-for-nsapp`\n- `allow-set-as-help-menu-for-nsapp`\n- `allow-is-checked`\n- `allow-set-checked`\n- `allow-set-icon`",
+          "type": "string",
+          "const": "core:menu:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-append`\n- `allow-prepend`\n- `allow-insert`\n- `allow-remove`\n- `allow-remove-at`\n- `allow-items`\n- `allow-get`\n- `allow-popup`\n- `allow-create-default`\n- `allow-set-as-app-menu`\n- `allow-set-as-window-menu`\n- `allow-text`\n- `allow-set-text`\n- `allow-is-enabled`\n- `allow-set-enabled`\n- `allow-set-accelerator`\n- `allow-set-as-windows-menu-for-nsapp`\n- `allow-set-as-help-menu-for-nsapp`\n- `allow-is-checked`\n- `allow-set-checked`\n- `allow-set-icon`"
+        },
+        {
+          "description": "Enables the append command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-append",
+          "markdownDescription": "Enables the append command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create_default command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-create-default",
+          "markdownDescription": "Enables the create_default command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the get command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-get",
+          "markdownDescription": "Enables the get command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the insert command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-insert",
+          "markdownDescription": "Enables the insert command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-is-checked",
+          "markdownDescription": "Enables the is_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-is-enabled",
+          "markdownDescription": "Enables the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the items command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-items",
+          "markdownDescription": "Enables the items command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-new",
+          "markdownDescription": "Enables the new command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the popup command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-popup",
+          "markdownDescription": "Enables the popup command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the prepend command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-prepend",
+          "markdownDescription": "Enables the prepend command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-remove",
+          "markdownDescription": "Enables the remove command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_at command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-remove-at",
+          "markdownDescription": "Enables the remove_at command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_accelerator command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-accelerator",
+          "markdownDescription": "Enables the set_accelerator command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_app_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-app-menu",
+          "markdownDescription": "Enables the set_as_app_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_help_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-help-menu-for-nsapp",
+          "markdownDescription": "Enables the set_as_help_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_window_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-window-menu",
+          "markdownDescription": "Enables the set_as_window_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-windows-menu-for-nsapp",
+          "markdownDescription": "Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-checked",
+          "markdownDescription": "Enables the set_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-enabled",
+          "markdownDescription": "Enables the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-icon",
+          "markdownDescription": "Enables the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-text",
+          "markdownDescription": "Enables the set_text command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-text",
+          "markdownDescription": "Enables the text command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the append command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-append",
+          "markdownDescription": "Denies the append command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create_default command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-create-default",
+          "markdownDescription": "Denies the create_default command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-get",
+          "markdownDescription": "Denies the get command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the insert command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-insert",
+          "markdownDescription": "Denies the insert command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-is-checked",
+          "markdownDescription": "Denies the is_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-is-enabled",
+          "markdownDescription": "Denies the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the items command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-items",
+          "markdownDescription": "Denies the items command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-new",
+          "markdownDescription": "Denies the new command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the popup command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-popup",
+          "markdownDescription": "Denies the popup command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the prepend command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-prepend",
+          "markdownDescription": "Denies the prepend command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-remove",
+          "markdownDescription": "Denies the remove command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_at command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-remove-at",
+          "markdownDescription": "Denies the remove_at command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_accelerator command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-accelerator",
+          "markdownDescription": "Denies the set_accelerator command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_app_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-app-menu",
+          "markdownDescription": "Denies the set_as_app_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_help_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-help-menu-for-nsapp",
+          "markdownDescription": "Denies the set_as_help_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_window_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-window-menu",
+          "markdownDescription": "Denies the set_as_window_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-windows-menu-for-nsapp",
+          "markdownDescription": "Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-checked",
+          "markdownDescription": "Denies the set_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-enabled",
+          "markdownDescription": "Denies the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-icon",
+          "markdownDescription": "Denies the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-text",
+          "markdownDescription": "Denies the set_text command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-text",
+          "markdownDescription": "Denies the text command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-resolve-directory`\n- `allow-resolve`\n- `allow-normalize`\n- `allow-join`\n- `allow-dirname`\n- `allow-extname`\n- `allow-basename`\n- `allow-is-absolute`",
+          "type": "string",
+          "const": "core:path:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-resolve-directory`\n- `allow-resolve`\n- `allow-normalize`\n- `allow-join`\n- `allow-dirname`\n- `allow-extname`\n- `allow-basename`\n- `allow-is-absolute`"
+        },
+        {
+          "description": "Enables the basename command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-basename",
+          "markdownDescription": "Enables the basename command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the dirname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-dirname",
+          "markdownDescription": "Enables the dirname command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the extname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-extname",
+          "markdownDescription": "Enables the extname command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_absolute command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-is-absolute",
+          "markdownDescription": "Enables the is_absolute command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the join command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-join",
+          "markdownDescription": "Enables the join command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the normalize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-normalize",
+          "markdownDescription": "Enables the normalize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the resolve command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-resolve",
+          "markdownDescription": "Enables the resolve command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the resolve_directory command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-resolve-directory",
+          "markdownDescription": "Enables the resolve_directory command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the basename command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-basename",
+          "markdownDescription": "Denies the basename command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the dirname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-dirname",
+          "markdownDescription": "Denies the dirname command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the extname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-extname",
+          "markdownDescription": "Denies the extname command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_absolute command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-is-absolute",
+          "markdownDescription": "Denies the is_absolute command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the join command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-join",
+          "markdownDescription": "Denies the join command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the normalize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-normalize",
+          "markdownDescription": "Denies the normalize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the resolve command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-resolve",
+          "markdownDescription": "Denies the resolve command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the resolve_directory command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-resolve-directory",
+          "markdownDescription": "Denies the resolve_directory command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-close`",
+          "type": "string",
+          "const": "core:resources:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-close`"
+        },
+        {
+          "description": "Enables the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:resources:allow-close",
+          "markdownDescription": "Enables the close command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:resources:deny-close",
+          "markdownDescription": "Denies the close command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-get-by-id`\n- `allow-remove-by-id`\n- `allow-set-icon`\n- `allow-set-menu`\n- `allow-set-tooltip`\n- `allow-set-title`\n- `allow-set-visible`\n- `allow-set-temp-dir-path`\n- `allow-set-icon-as-template`\n- `allow-set-show-menu-on-left-click`",
+          "type": "string",
+          "const": "core:tray:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-get-by-id`\n- `allow-remove-by-id`\n- `allow-set-icon`\n- `allow-set-menu`\n- `allow-set-tooltip`\n- `allow-set-title`\n- `allow-set-visible`\n- `allow-set-temp-dir-path`\n- `allow-set-icon-as-template`\n- `allow-set-show-menu-on-left-click`"
+        },
+        {
+          "description": "Enables the get_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-get-by-id",
+          "markdownDescription": "Enables the get_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-new",
+          "markdownDescription": "Enables the new command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-remove-by-id",
+          "markdownDescription": "Enables the remove_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-icon",
+          "markdownDescription": "Enables the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon_as_template command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-icon-as-template",
+          "markdownDescription": "Enables the set_icon_as_template command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-menu",
+          "markdownDescription": "Enables the set_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_show_menu_on_left_click command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-show-menu-on-left-click",
+          "markdownDescription": "Enables the set_show_menu_on_left_click command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_temp_dir_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-temp-dir-path",
+          "markdownDescription": "Enables the set_temp_dir_path command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-title",
+          "markdownDescription": "Enables the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_tooltip command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-tooltip",
+          "markdownDescription": "Enables the set_tooltip command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-visible",
+          "markdownDescription": "Enables the set_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-get-by-id",
+          "markdownDescription": "Denies the get_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-new",
+          "markdownDescription": "Denies the new command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-remove-by-id",
+          "markdownDescription": "Denies the remove_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-icon",
+          "markdownDescription": "Denies the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon_as_template command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-icon-as-template",
+          "markdownDescription": "Denies the set_icon_as_template command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-menu",
+          "markdownDescription": "Denies the set_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_show_menu_on_left_click command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-show-menu-on-left-click",
+          "markdownDescription": "Denies the set_show_menu_on_left_click command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_temp_dir_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-temp-dir-path",
+          "markdownDescription": "Denies the set_temp_dir_path command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-title",
+          "markdownDescription": "Denies the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_tooltip command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-tooltip",
+          "markdownDescription": "Denies the set_tooltip command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-visible",
+          "markdownDescription": "Denies the set_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-webviews`\n- `allow-webview-position`\n- `allow-webview-size`\n- `allow-internal-toggle-devtools`",
+          "type": "string",
+          "const": "core:webview:default",
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-webviews`\n- `allow-webview-position`\n- `allow-webview-size`\n- `allow-internal-toggle-devtools`"
+        },
+        {
+          "description": "Enables the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-clear-all-browsing-data",
+          "markdownDescription": "Enables the clear_all_browsing_data command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create_webview command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-create-webview",
+          "markdownDescription": "Enables the create_webview command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create_webview_window command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-create-webview-window",
+          "markdownDescription": "Enables the create_webview_window command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the get_all_webviews command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-get-all-webviews",
+          "markdownDescription": "Enables the get_all_webviews command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the internal_toggle_devtools command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-internal-toggle-devtools",
+          "markdownDescription": "Enables the internal_toggle_devtools command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the print command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-print",
+          "markdownDescription": "Enables the print command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the reparent command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-reparent",
+          "markdownDescription": "Enables the reparent command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_auto_resize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-auto-resize",
+          "markdownDescription": "Enables the set_webview_auto_resize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-background-color",
+          "markdownDescription": "Enables the set_webview_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-focus",
+          "markdownDescription": "Enables the set_webview_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-position",
+          "markdownDescription": "Enables the set_webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-size",
+          "markdownDescription": "Enables the set_webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_zoom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-zoom",
+          "markdownDescription": "Enables the set_webview_zoom command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-close",
+          "markdownDescription": "Enables the webview_close command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-hide",
+          "markdownDescription": "Enables the webview_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-position",
+          "markdownDescription": "Enables the webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-show",
+          "markdownDescription": "Enables the webview_show command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-size",
+          "markdownDescription": "Enables the webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-clear-all-browsing-data",
+          "markdownDescription": "Denies the clear_all_browsing_data command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create_webview command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-create-webview",
+          "markdownDescription": "Denies the create_webview command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create_webview_window command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-create-webview-window",
+          "markdownDescription": "Denies the create_webview_window command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_all_webviews command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-get-all-webviews",
+          "markdownDescription": "Denies the get_all_webviews command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the internal_toggle_devtools command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-internal-toggle-devtools",
+          "markdownDescription": "Denies the internal_toggle_devtools command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the print command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-print",
+          "markdownDescription": "Denies the print command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the reparent command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-reparent",
+          "markdownDescription": "Denies the reparent command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_auto_resize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-auto-resize",
+          "markdownDescription": "Denies the set_webview_auto_resize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-background-color",
+          "markdownDescription": "Denies the set_webview_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-focus",
+          "markdownDescription": "Denies the set_webview_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-position",
+          "markdownDescription": "Denies the set_webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-size",
+          "markdownDescription": "Denies the set_webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_zoom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-zoom",
+          "markdownDescription": "Denies the set_webview_zoom command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-close",
+          "markdownDescription": "Denies the webview_close command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-hide",
+          "markdownDescription": "Denies the webview_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-position",
+          "markdownDescription": "Denies the webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-show",
+          "markdownDescription": "Denies the webview_show command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-size",
+          "markdownDescription": "Denies the webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-windows`\n- `allow-scale-factor`\n- `allow-inner-position`\n- `allow-outer-position`\n- `allow-inner-size`\n- `allow-outer-size`\n- `allow-is-fullscreen`\n- `allow-is-minimized`\n- `allow-is-maximized`\n- `allow-is-focused`\n- `allow-is-decorated`\n- `allow-is-resizable`\n- `allow-is-maximizable`\n- `allow-is-minimizable`\n- `allow-is-closable`\n- `allow-is-visible`\n- `allow-is-enabled`\n- `allow-title`\n- `allow-current-monitor`\n- `allow-primary-monitor`\n- `allow-monitor-from-point`\n- `allow-available-monitors`\n- `allow-cursor-position`\n- `allow-theme`\n- `allow-is-always-on-top`\n- `allow-internal-toggle-maximize`",
+          "type": "string",
+          "const": "core:window:default",
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-windows`\n- `allow-scale-factor`\n- `allow-inner-position`\n- `allow-outer-position`\n- `allow-inner-size`\n- `allow-outer-size`\n- `allow-is-fullscreen`\n- `allow-is-minimized`\n- `allow-is-maximized`\n- `allow-is-focused`\n- `allow-is-decorated`\n- `allow-is-resizable`\n- `allow-is-maximizable`\n- `allow-is-minimizable`\n- `allow-is-closable`\n- `allow-is-visible`\n- `allow-is-enabled`\n- `allow-title`\n- `allow-current-monitor`\n- `allow-primary-monitor`\n- `allow-monitor-from-point`\n- `allow-available-monitors`\n- `allow-cursor-position`\n- `allow-theme`\n- `allow-is-always-on-top`\n- `allow-internal-toggle-maximize`"
+        },
+        {
+          "description": "Enables the available_monitors command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-available-monitors",
+          "markdownDescription": "Enables the available_monitors command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the center command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-center",
+          "markdownDescription": "Enables the center command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-close",
+          "markdownDescription": "Enables the close command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-create",
+          "markdownDescription": "Enables the create command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the current_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-current-monitor",
+          "markdownDescription": "Enables the current_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-cursor-position",
+          "markdownDescription": "Enables the cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the destroy command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-destroy",
+          "markdownDescription": "Enables the destroy command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the get_all_windows command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-get-all-windows",
+          "markdownDescription": "Enables the get_all_windows command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-hide",
+          "markdownDescription": "Enables the hide command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the inner_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-inner-position",
+          "markdownDescription": "Enables the inner_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the inner_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-inner-size",
+          "markdownDescription": "Enables the inner_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the internal_toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-internal-toggle-maximize",
+          "markdownDescription": "Enables the internal_toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-always-on-top",
+          "markdownDescription": "Enables the is_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-closable",
+          "markdownDescription": "Enables the is_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_decorated command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-decorated",
+          "markdownDescription": "Enables the is_decorated command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-enabled",
+          "markdownDescription": "Enables the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_focused command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-focused",
+          "markdownDescription": "Enables the is_focused command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-fullscreen",
+          "markdownDescription": "Enables the is_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-maximizable",
+          "markdownDescription": "Enables the is_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_maximized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-maximized",
+          "markdownDescription": "Enables the is_maximized command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-minimizable",
+          "markdownDescription": "Enables the is_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_minimized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-minimized",
+          "markdownDescription": "Enables the is_minimized command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-resizable",
+          "markdownDescription": "Enables the is_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-visible",
+          "markdownDescription": "Enables the is_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-maximize",
+          "markdownDescription": "Enables the maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the minimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-minimize",
+          "markdownDescription": "Enables the minimize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the monitor_from_point command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-monitor-from-point",
+          "markdownDescription": "Enables the monitor_from_point command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the outer_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-outer-position",
+          "markdownDescription": "Enables the outer_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the outer_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-outer-size",
+          "markdownDescription": "Enables the outer_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the primary_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-primary-monitor",
+          "markdownDescription": "Enables the primary_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the request_user_attention command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-request-user-attention",
+          "markdownDescription": "Enables the request_user_attention command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the scale_factor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-scale-factor",
+          "markdownDescription": "Enables the scale_factor command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_always_on_bottom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-always-on-bottom",
+          "markdownDescription": "Enables the set_always_on_bottom command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-always-on-top",
+          "markdownDescription": "Enables the set_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-background-color",
+          "markdownDescription": "Enables the set_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_badge_count command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-badge-count",
+          "markdownDescription": "Enables the set_badge_count command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_badge_label command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-badge-label",
+          "markdownDescription": "Enables the set_badge_label command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-closable",
+          "markdownDescription": "Enables the set_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_content_protected command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-content-protected",
+          "markdownDescription": "Enables the set_content_protected command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_grab command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-grab",
+          "markdownDescription": "Enables the set_cursor_grab command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-icon",
+          "markdownDescription": "Enables the set_cursor_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-position",
+          "markdownDescription": "Enables the set_cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-visible",
+          "markdownDescription": "Enables the set_cursor_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_decorations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-decorations",
+          "markdownDescription": "Enables the set_decorations command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_effects command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-effects",
+          "markdownDescription": "Enables the set_effects command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-enabled",
+          "markdownDescription": "Enables the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-focus",
+          "markdownDescription": "Enables the set_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_focusable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-focusable",
+          "markdownDescription": "Enables the set_focusable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-fullscreen",
+          "markdownDescription": "Enables the set_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-icon",
+          "markdownDescription": "Enables the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_ignore_cursor_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-ignore-cursor-events",
+          "markdownDescription": "Enables the set_ignore_cursor_events command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_max_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-max-size",
+          "markdownDescription": "Enables the set_max_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-maximizable",
+          "markdownDescription": "Enables the set_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_min_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-min-size",
+          "markdownDescription": "Enables the set_min_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-minimizable",
+          "markdownDescription": "Enables the set_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_overlay_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-overlay-icon",
+          "markdownDescription": "Enables the set_overlay_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-position",
+          "markdownDescription": "Enables the set_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_progress_bar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-progress-bar",
+          "markdownDescription": "Enables the set_progress_bar command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-resizable",
+          "markdownDescription": "Enables the set_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_shadow command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-shadow",
+          "markdownDescription": "Enables the set_shadow command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_simple_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-simple-fullscreen",
+          "markdownDescription": "Enables the set_simple_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-size",
+          "markdownDescription": "Enables the set_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_size_constraints command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-size-constraints",
+          "markdownDescription": "Enables the set_size_constraints command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_skip_taskbar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-skip-taskbar",
+          "markdownDescription": "Enables the set_skip_taskbar command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-theme",
+          "markdownDescription": "Enables the set_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-title",
+          "markdownDescription": "Enables the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-title-bar-style",
+          "markdownDescription": "Enables the set_title_bar_style command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_visible_on_all_organizations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-visible-on-all-organizations",
+          "markdownDescription": "Enables the set_visible_on_all_organizations command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-show",
+          "markdownDescription": "Enables the show command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the start_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-start-dragging",
+          "markdownDescription": "Enables the start_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the start_resize_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-start-resize-dragging",
+          "markdownDescription": "Enables the start_resize_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-theme",
+          "markdownDescription": "Enables the theme command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-title",
+          "markdownDescription": "Enables the title command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-toggle-maximize",
+          "markdownDescription": "Enables the toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the unmaximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-unmaximize",
+          "markdownDescription": "Enables the unmaximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the unminimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-unminimize",
+          "markdownDescription": "Enables the unminimize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the available_monitors command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-available-monitors",
+          "markdownDescription": "Denies the available_monitors command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the center command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-center",
+          "markdownDescription": "Denies the center command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-close",
+          "markdownDescription": "Denies the close command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-create",
+          "markdownDescription": "Denies the create command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the current_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-current-monitor",
+          "markdownDescription": "Denies the current_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-cursor-position",
+          "markdownDescription": "Denies the cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the destroy command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-destroy",
+          "markdownDescription": "Denies the destroy command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_all_windows command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-get-all-windows",
+          "markdownDescription": "Denies the get_all_windows command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-hide",
+          "markdownDescription": "Denies the hide command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the inner_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-inner-position",
+          "markdownDescription": "Denies the inner_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the inner_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-inner-size",
+          "markdownDescription": "Denies the inner_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the internal_toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-internal-toggle-maximize",
+          "markdownDescription": "Denies the internal_toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-always-on-top",
+          "markdownDescription": "Denies the is_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-closable",
+          "markdownDescription": "Denies the is_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_decorated command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-decorated",
+          "markdownDescription": "Denies the is_decorated command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-enabled",
+          "markdownDescription": "Denies the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_focused command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-focused",
+          "markdownDescription": "Denies the is_focused command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-fullscreen",
+          "markdownDescription": "Denies the is_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-maximizable",
+          "markdownDescription": "Denies the is_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_maximized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-maximized",
+          "markdownDescription": "Denies the is_maximized command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-minimizable",
+          "markdownDescription": "Denies the is_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_minimized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-minimized",
+          "markdownDescription": "Denies the is_minimized command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-resizable",
+          "markdownDescription": "Denies the is_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-visible",
+          "markdownDescription": "Denies the is_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-maximize",
+          "markdownDescription": "Denies the maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the minimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-minimize",
+          "markdownDescription": "Denies the minimize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the monitor_from_point command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-monitor-from-point",
+          "markdownDescription": "Denies the monitor_from_point command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the outer_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-outer-position",
+          "markdownDescription": "Denies the outer_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the outer_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-outer-size",
+          "markdownDescription": "Denies the outer_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the primary_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-primary-monitor",
+          "markdownDescription": "Denies the primary_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the request_user_attention command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-request-user-attention",
+          "markdownDescription": "Denies the request_user_attention command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the scale_factor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-scale-factor",
+          "markdownDescription": "Denies the scale_factor command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_always_on_bottom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-always-on-bottom",
+          "markdownDescription": "Denies the set_always_on_bottom command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-always-on-top",
+          "markdownDescription": "Denies the set_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-background-color",
+          "markdownDescription": "Denies the set_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_badge_count command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-badge-count",
+          "markdownDescription": "Denies the set_badge_count command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_badge_label command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-badge-label",
+          "markdownDescription": "Denies the set_badge_label command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-closable",
+          "markdownDescription": "Denies the set_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_content_protected command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-content-protected",
+          "markdownDescription": "Denies the set_content_protected command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_grab command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-grab",
+          "markdownDescription": "Denies the set_cursor_grab command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-icon",
+          "markdownDescription": "Denies the set_cursor_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-position",
+          "markdownDescription": "Denies the set_cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-visible",
+          "markdownDescription": "Denies the set_cursor_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_decorations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-decorations",
+          "markdownDescription": "Denies the set_decorations command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_effects command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-effects",
+          "markdownDescription": "Denies the set_effects command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-enabled",
+          "markdownDescription": "Denies the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-focus",
+          "markdownDescription": "Denies the set_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_focusable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-focusable",
+          "markdownDescription": "Denies the set_focusable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-fullscreen",
+          "markdownDescription": "Denies the set_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-icon",
+          "markdownDescription": "Denies the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_ignore_cursor_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-ignore-cursor-events",
+          "markdownDescription": "Denies the set_ignore_cursor_events command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_max_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-max-size",
+          "markdownDescription": "Denies the set_max_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-maximizable",
+          "markdownDescription": "Denies the set_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_min_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-min-size",
+          "markdownDescription": "Denies the set_min_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-minimizable",
+          "markdownDescription": "Denies the set_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_overlay_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-overlay-icon",
+          "markdownDescription": "Denies the set_overlay_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-position",
+          "markdownDescription": "Denies the set_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_progress_bar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-progress-bar",
+          "markdownDescription": "Denies the set_progress_bar command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-resizable",
+          "markdownDescription": "Denies the set_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_shadow command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-shadow",
+          "markdownDescription": "Denies the set_shadow command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_simple_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-simple-fullscreen",
+          "markdownDescription": "Denies the set_simple_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-size",
+          "markdownDescription": "Denies the set_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_size_constraints command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-size-constraints",
+          "markdownDescription": "Denies the set_size_constraints command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_skip_taskbar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-skip-taskbar",
+          "markdownDescription": "Denies the set_skip_taskbar command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-theme",
+          "markdownDescription": "Denies the set_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-title",
+          "markdownDescription": "Denies the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-title-bar-style",
+          "markdownDescription": "Denies the set_title_bar_style command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_visible_on_all_organizations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-visible-on-all-organizations",
+          "markdownDescription": "Denies the set_visible_on_all_organizations command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-show",
+          "markdownDescription": "Denies the show command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-start-dragging",
+          "markdownDescription": "Denies the start_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start_resize_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-start-resize-dragging",
+          "markdownDescription": "Denies the start_resize_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-theme",
+          "markdownDescription": "Denies the theme command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-title",
+          "markdownDescription": "Denies the title command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-toggle-maximize",
+          "markdownDescription": "Denies the toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the unmaximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-unmaximize",
+          "markdownDescription": "Denies the unmaximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the unminimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-unminimize",
+          "markdownDescription": "Denies the unminimize command without any pre-configured scope."
+        },
+        {
+          "description": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`",
+          "type": "string",
+          "const": "shell:default",
+          "markdownDescription": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`"
+        },
+        {
+          "description": "Enables the execute command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-execute",
+          "markdownDescription": "Enables the execute command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the kill command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-kill",
+          "markdownDescription": "Enables the kill command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the open command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-open",
+          "markdownDescription": "Enables the open command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the spawn command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-spawn",
+          "markdownDescription": "Enables the spawn command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the stdin_write command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-stdin-write",
+          "markdownDescription": "Enables the stdin_write command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the execute command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-execute",
+          "markdownDescription": "Denies the execute command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the kill command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-kill",
+          "markdownDescription": "Denies the kill command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the open command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-open",
+          "markdownDescription": "Denies the open command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the spawn command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-spawn",
+          "markdownDescription": "Denies the spawn command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the stdin_write command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-stdin-write",
+          "markdownDescription": "Denies the stdin_write command without any pre-configured scope."
+        }
+      ]
+    },
+    "Value": {
+      "description": "All supported ACL values.",
+      "anyOf": [
+        {
+          "description": "Represents a null JSON value.",
+          "type": "null"
+        },
+        {
+          "description": "Represents a [`bool`].",
+          "type": "boolean"
+        },
+        {
+          "description": "Represents a valid ACL [`Number`].",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Number"
+            }
+          ]
+        },
+        {
+          "description": "Represents a [`String`].",
+          "type": "string"
+        },
+        {
+          "description": "Represents a list of other [`Value`]s.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        },
+        {
+          "description": "Represents a map of [`String`] keys to [`Value`]s.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/Value"
+          }
+        }
+      ]
+    },
+    "Number": {
+      "description": "A valid ACL number.",
+      "anyOf": [
+        {
+          "description": "Represents an [`i64`].",
+          "type": "integer",
+          "format": "int64"
+        },
+        {
+          "description": "Represents a [`f64`].",
+          "type": "number",
+          "format": "double"
+        }
+      ]
+    },
+    "Target": {
+      "description": "Platform target.",
+      "oneOf": [
+        {
+          "description": "MacOS.",
+          "type": "string",
+          "enum": ["macOS"]
+        },
+        {
+          "description": "Windows.",
+          "type": "string",
+          "enum": ["windows"]
+        },
+        {
+          "description": "Linux.",
+          "type": "string",
+          "enum": ["linux"]
+        },
+        {
+          "description": "Android.",
+          "type": "string",
+          "enum": ["android"]
+        },
+        {
+          "description": "iOS.",
+          "type": "string",
+          "enum": ["iOS"]
+        }
+      ]
+    },
+    "ShellScopeEntryAllowedArg": {
+      "description": "A command argument allowed to be executed by the webview API.",
+      "anyOf": [
+        {
+          "description": "A non-configurable argument that is passed to the command in the order it was specified.",
+          "type": "string"
+        },
+        {
+          "description": "A variable that is set while calling the command from the webview API.",
+          "type": "object",
+          "required": ["validator"],
+          "properties": {
+            "raw": {
+              "description": "Marks the validator as a raw regex, meaning the plugin should not make any modification at runtime.\n\nThis means the regex will not match on the entire string by default, which might be exploited if your regex allow unexpected input to be considered valid. When using this option, make sure your regex is correct.",
+              "default": false,
+              "type": "boolean"
+            },
+            "validator": {
+              "description": "[regex] validator to require passed values to conform to an expected input.\n\nThis will require the argument value passed to this variable to match the `validator` regex before it will be executed.\n\nThe regex string is by default surrounded by `^...$` to match the full string. For example the `https?://\\w+` regex would be registered as `^https?://\\w+$`.\n\n[regex]: <https://docs.rs/regex/latest/regex/#syntax>",
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "ShellScopeEntryAllowedArgs": {
+      "description": "A set of command arguments allowed to be executed by the webview API.\n\nA value of `true` will allow any arguments to be passed to the command. `false` will disable all arguments. A list of [`ShellScopeEntryAllowedArg`] will set those arguments as the only valid arguments to be passed to the attached command configuration.",
+      "anyOf": [
+        {
+          "description": "Use a simple boolean to allow all or disable all arguments to this command configuration.",
+          "type": "boolean"
+        },
+        {
+          "description": "A specific set of [`ShellScopeEntryAllowedArg`] that are valid to call for the command configuration.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ShellScopeEntryAllowedArg"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/foundry/packages/desktop/src-tauri/gen/schemas/macOS-schema.json b/foundry/packages/desktop/src-tauri/gen/schemas/macOS-schema.json
new file mode 100644
index 0000000..34f0a61
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/gen/schemas/macOS-schema.json
@@ -0,0 +1,2522 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "CapabilityFile",
+  "description": "Capability formats accepted in a capability file.",
+  "anyOf": [
+    {
+      "description": "A single capability.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Capability"
+        }
+      ]
+    },
+    {
+      "description": "A list of capabilities.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Capability"
+      }
+    },
+    {
+      "description": "A list of capabilities.",
+      "type": "object",
+      "required": ["capabilities"],
+      "properties": {
+        "capabilities": {
+          "description": "The list of capabilities.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Capability"
+          }
+        }
+      }
+    }
+  ],
+  "definitions": {
+    "Capability": {
+      "description": "A grouping and boundary mechanism developers can use to isolate access to the IPC layer.\n\nIt controls application windows' and webviews' fine grained access to the Tauri core, application, or plugin commands. If a webview or its window is not matching any capability then it has no access to the IPC layer at all.\n\nThis can be done to create groups of windows, based on their required system access, which can reduce impact of frontend vulnerabilities in less privileged windows. Windows can be added to a capability by exact name (e.g. `main-window`) or glob patterns like `*` or `admin-*`. A Window can have none, one, or multiple associated capabilities.\n\n## Example\n\n```json { \"identifier\": \"main-user-files-write\", \"description\": \"This capability allows the `main` window on macOS and Windows access to `filesystem` write related commands and `dialog` commands to enable programmatic access to files selected by the user.\", \"windows\": [ \"main\" ], \"permissions\": [ \"core:default\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] }, ], \"platforms\": [\"macOS\",\"windows\"] } ```",
+      "type": "object",
+      "required": ["identifier", "permissions"],
+      "properties": {
+        "identifier": {
+          "description": "Identifier of the capability.\n\n## Example\n\n`main-user-files-write`",
+          "type": "string"
+        },
+        "description": {
+          "description": "Description of what the capability is intended to allow on associated windows.\n\nIt should contain a description of what the grouped permissions should allow.\n\n## Example\n\nThis capability allows the `main` window access to `filesystem` write related commands and `dialog` commands to enable programmatic access to files selected by the user.",
+          "default": "",
+          "type": "string"
+        },
+        "remote": {
+          "description": "Configure remote URLs that can use the capability permissions.\n\nThis setting is optional and defaults to not being set, as our default use case is that the content is served from our local application.\n\n:::caution Make sure you understand the security implications of providing remote sources with local system access. :::\n\n## Example\n\n```json { \"urls\": [\"https://*.mydomain.dev\"] } ```",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/CapabilityRemote"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "local": {
+          "description": "Whether this capability is enabled for local app URLs or not. Defaults to `true`.",
+          "default": true,
+          "type": "boolean"
+        },
+        "windows": {
+          "description": "List of windows that are affected by this capability. Can be a glob pattern.\n\nIf a window label matches any of the patterns in this list, the capability will be enabled on all the webviews of that window, regardless of the value of [`Self::webviews`].\n\nOn multiwebview windows, prefer specifying [`Self::webviews`] and omitting [`Self::windows`] for a fine grained access control.\n\n## Example\n\n`[\"main\"]`",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "webviews": {
+          "description": "List of webviews that are affected by this capability. Can be a glob pattern.\n\nThe capability will be enabled on all the webviews whose label matches any of the patterns in this list, regardless of whether the webview's window label matches a pattern in [`Self::windows`].\n\n## Example\n\n`[\"sub-webview-one\", \"sub-webview-two\"]`",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "permissions": {
+          "description": "List of permissions attached to this capability.\n\nMust include the plugin name as prefix in the form of `${plugin-name}:${permission-name}`. For commands directly implemented in the application itself only `${permission-name}` is required.\n\n## Example\n\n```json [ \"core:default\", \"shell:allow-open\", \"dialog:open\", { \"identifier\": \"fs:allow-write-text-file\", \"allow\": [{ \"path\": \"$HOME/test.txt\" }] } ] ```",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PermissionEntry"
+          },
+          "uniqueItems": true
+        },
+        "platforms": {
+          "description": "Limit which target platforms this capability applies to.\n\nBy default all platforms are targeted.\n\n## Example\n\n`[\"macOS\",\"windows\"]`",
+          "type": ["array", "null"],
+          "items": {
+            "$ref": "#/definitions/Target"
+          }
+        }
+      }
+    },
+    "CapabilityRemote": {
+      "description": "Configuration for remote URLs that are associated with the capability.",
+      "type": "object",
+      "required": ["urls"],
+      "properties": {
+        "urls": {
+          "description": "Remote domains this capability refers to using the [URLPattern standard](https://urlpattern.spec.whatwg.org/).\n\n## Examples\n\n- \"https://*.mydomain.dev\": allows subdomains of mydomain.dev - \"https://mydomain.dev/api/*\": allows any subpath of mydomain.dev/api",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "PermissionEntry": {
+      "description": "An entry for a permission value in a [`Capability`] can be either a raw permission [`Identifier`] or an object that references a permission and extends its scope.",
+      "anyOf": [
+        {
+          "description": "Reference a permission or permission set by identifier.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Identifier"
+            }
+          ]
+        },
+        {
+          "description": "Reference a permission or permission set by identifier and extends its scope.",
+          "type": "object",
+          "allOf": [
+            {
+              "if": {
+                "properties": {
+                  "identifier": {
+                    "anyOf": [
+                      {
+                        "description": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`",
+                        "type": "string",
+                        "const": "shell:default",
+                        "markdownDescription": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`"
+                      },
+                      {
+                        "description": "Enables the execute command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-execute",
+                        "markdownDescription": "Enables the execute command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the kill command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-kill",
+                        "markdownDescription": "Enables the kill command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the open command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-open",
+                        "markdownDescription": "Enables the open command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the spawn command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-spawn",
+                        "markdownDescription": "Enables the spawn command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Enables the stdin_write command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:allow-stdin-write",
+                        "markdownDescription": "Enables the stdin_write command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the execute command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-execute",
+                        "markdownDescription": "Denies the execute command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the kill command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-kill",
+                        "markdownDescription": "Denies the kill command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the open command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-open",
+                        "markdownDescription": "Denies the open command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the spawn command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-spawn",
+                        "markdownDescription": "Denies the spawn command without any pre-configured scope."
+                      },
+                      {
+                        "description": "Denies the stdin_write command without any pre-configured scope.",
+                        "type": "string",
+                        "const": "shell:deny-stdin-write",
+                        "markdownDescription": "Denies the stdin_write command without any pre-configured scope."
+                      }
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "allow": {
+                    "items": {
+                      "title": "ShellScopeEntry",
+                      "description": "Shell scope entry.",
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "required": ["cmd", "name"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "cmd": {
+                              "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
+                              "type": "string"
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "required": ["name", "sidecar"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            },
+                            "sidecar": {
+                              "description": "If this command is a sidecar command.",
+                              "type": "boolean"
+                            }
+                          },
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  },
+                  "deny": {
+                    "items": {
+                      "title": "ShellScopeEntry",
+                      "description": "Shell scope entry.",
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "required": ["cmd", "name"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "cmd": {
+                              "description": "The command name. It can start with a variable that resolves to a system base directory. The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`.",
+                              "type": "string"
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "required": ["name", "sidecar"],
+                          "properties": {
+                            "args": {
+                              "description": "The allowed arguments for the command execution.",
+                              "allOf": [
+                                {
+                                  "$ref": "#/definitions/ShellScopeEntryAllowedArgs"
+                                }
+                              ]
+                            },
+                            "name": {
+                              "description": "The name for this allowed shell command configuration.\n\nThis name will be used inside of the webview API to call this command along with any specified arguments.",
+                              "type": "string"
+                            },
+                            "sidecar": {
+                              "description": "If this command is a sidecar command.",
+                              "type": "boolean"
+                            }
+                          },
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              "properties": {
+                "identifier": {
+                  "description": "Identifier of the permission or permission set.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Identifier"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "properties": {
+                "identifier": {
+                  "description": "Identifier of the permission or permission set.",
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Identifier"
+                    }
+                  ]
+                },
+                "allow": {
+                  "description": "Data that defines what is allowed by the scope.",
+                  "type": ["array", "null"],
+                  "items": {
+                    "$ref": "#/definitions/Value"
+                  }
+                },
+                "deny": {
+                  "description": "Data that defines what is denied by the scope. This should be prioritized by validation logic.",
+                  "type": ["array", "null"],
+                  "items": {
+                    "$ref": "#/definitions/Value"
+                  }
+                }
+              }
+            }
+          ],
+          "required": ["identifier"]
+        }
+      ]
+    },
+    "Identifier": {
+      "description": "Permission identifier",
+      "oneOf": [
+        {
+          "description": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`",
+          "type": "string",
+          "const": "core:default",
+          "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
+        },
+        {
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
+          "type": "string",
+          "const": "core:app:default",
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
+        },
+        {
+          "description": "Enables the app_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-app-hide",
+          "markdownDescription": "Enables the app_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the app_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-app-show",
+          "markdownDescription": "Enables the app_show command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the bundle_type command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-bundle-type",
+          "markdownDescription": "Enables the bundle_type command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the default_window_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-default-window-icon",
+          "markdownDescription": "Enables the default_window_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the fetch_data_store_identifiers command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-fetch-data-store-identifiers",
+          "markdownDescription": "Enables the fetch_data_store_identifiers command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the identifier command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-identifier",
+          "markdownDescription": "Enables the identifier command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the name command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-name",
+          "markdownDescription": "Enables the name command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_data_store command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-data-store",
+          "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-set-app-theme",
+          "markdownDescription": "Enables the set_app_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_dock_visibility command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-set-dock-visibility",
+          "markdownDescription": "Enables the set_dock_visibility command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the tauri_version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-tauri-version",
+          "markdownDescription": "Enables the tauri_version command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-version",
+          "markdownDescription": "Enables the version command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the app_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-app-hide",
+          "markdownDescription": "Denies the app_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the app_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-app-show",
+          "markdownDescription": "Denies the app_show command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the bundle_type command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-bundle-type",
+          "markdownDescription": "Denies the bundle_type command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the default_window_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-default-window-icon",
+          "markdownDescription": "Denies the default_window_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the fetch_data_store_identifiers command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-fetch-data-store-identifiers",
+          "markdownDescription": "Denies the fetch_data_store_identifiers command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the identifier command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-identifier",
+          "markdownDescription": "Denies the identifier command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the name command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-name",
+          "markdownDescription": "Denies the name command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_data_store command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-data-store",
+          "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_app_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-set-app-theme",
+          "markdownDescription": "Denies the set_app_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_dock_visibility command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-set-dock-visibility",
+          "markdownDescription": "Denies the set_dock_visibility command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the tauri_version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-tauri-version",
+          "markdownDescription": "Denies the tauri_version command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the version command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-version",
+          "markdownDescription": "Denies the version command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-listen`\n- `allow-unlisten`\n- `allow-emit`\n- `allow-emit-to`",
+          "type": "string",
+          "const": "core:event:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-listen`\n- `allow-unlisten`\n- `allow-emit`\n- `allow-emit-to`"
+        },
+        {
+          "description": "Enables the emit command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-emit",
+          "markdownDescription": "Enables the emit command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the emit_to command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-emit-to",
+          "markdownDescription": "Enables the emit_to command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the listen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-listen",
+          "markdownDescription": "Enables the listen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the unlisten command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:allow-unlisten",
+          "markdownDescription": "Enables the unlisten command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the emit command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-emit",
+          "markdownDescription": "Denies the emit command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the emit_to command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-emit-to",
+          "markdownDescription": "Denies the emit_to command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the listen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-listen",
+          "markdownDescription": "Denies the listen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the unlisten command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:event:deny-unlisten",
+          "markdownDescription": "Denies the unlisten command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-from-bytes`\n- `allow-from-path`\n- `allow-rgba`\n- `allow-size`",
+          "type": "string",
+          "const": "core:image:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-from-bytes`\n- `allow-from-path`\n- `allow-rgba`\n- `allow-size`"
+        },
+        {
+          "description": "Enables the from_bytes command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-from-bytes",
+          "markdownDescription": "Enables the from_bytes command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the from_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-from-path",
+          "markdownDescription": "Enables the from_path command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-new",
+          "markdownDescription": "Enables the new command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the rgba command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-rgba",
+          "markdownDescription": "Enables the rgba command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:allow-size",
+          "markdownDescription": "Enables the size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the from_bytes command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-from-bytes",
+          "markdownDescription": "Denies the from_bytes command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the from_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-from-path",
+          "markdownDescription": "Denies the from_path command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-new",
+          "markdownDescription": "Denies the new command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the rgba command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-rgba",
+          "markdownDescription": "Denies the rgba command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:image:deny-size",
+          "markdownDescription": "Denies the size command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-append`\n- `allow-prepend`\n- `allow-insert`\n- `allow-remove`\n- `allow-remove-at`\n- `allow-items`\n- `allow-get`\n- `allow-popup`\n- `allow-create-default`\n- `allow-set-as-app-menu`\n- `allow-set-as-window-menu`\n- `allow-text`\n- `allow-set-text`\n- `allow-is-enabled`\n- `allow-set-enabled`\n- `allow-set-accelerator`\n- `allow-set-as-windows-menu-for-nsapp`\n- `allow-set-as-help-menu-for-nsapp`\n- `allow-is-checked`\n- `allow-set-checked`\n- `allow-set-icon`",
+          "type": "string",
+          "const": "core:menu:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-append`\n- `allow-prepend`\n- `allow-insert`\n- `allow-remove`\n- `allow-remove-at`\n- `allow-items`\n- `allow-get`\n- `allow-popup`\n- `allow-create-default`\n- `allow-set-as-app-menu`\n- `allow-set-as-window-menu`\n- `allow-text`\n- `allow-set-text`\n- `allow-is-enabled`\n- `allow-set-enabled`\n- `allow-set-accelerator`\n- `allow-set-as-windows-menu-for-nsapp`\n- `allow-set-as-help-menu-for-nsapp`\n- `allow-is-checked`\n- `allow-set-checked`\n- `allow-set-icon`"
+        },
+        {
+          "description": "Enables the append command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-append",
+          "markdownDescription": "Enables the append command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create_default command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-create-default",
+          "markdownDescription": "Enables the create_default command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the get command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-get",
+          "markdownDescription": "Enables the get command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the insert command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-insert",
+          "markdownDescription": "Enables the insert command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-is-checked",
+          "markdownDescription": "Enables the is_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-is-enabled",
+          "markdownDescription": "Enables the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the items command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-items",
+          "markdownDescription": "Enables the items command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-new",
+          "markdownDescription": "Enables the new command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the popup command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-popup",
+          "markdownDescription": "Enables the popup command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the prepend command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-prepend",
+          "markdownDescription": "Enables the prepend command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-remove",
+          "markdownDescription": "Enables the remove command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_at command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-remove-at",
+          "markdownDescription": "Enables the remove_at command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_accelerator command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-accelerator",
+          "markdownDescription": "Enables the set_accelerator command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_app_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-app-menu",
+          "markdownDescription": "Enables the set_as_app_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_help_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-help-menu-for-nsapp",
+          "markdownDescription": "Enables the set_as_help_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_window_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-window-menu",
+          "markdownDescription": "Enables the set_as_window_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-as-windows-menu-for-nsapp",
+          "markdownDescription": "Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-checked",
+          "markdownDescription": "Enables the set_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-enabled",
+          "markdownDescription": "Enables the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-icon",
+          "markdownDescription": "Enables the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-set-text",
+          "markdownDescription": "Enables the set_text command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:allow-text",
+          "markdownDescription": "Enables the text command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the append command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-append",
+          "markdownDescription": "Denies the append command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create_default command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-create-default",
+          "markdownDescription": "Denies the create_default command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-get",
+          "markdownDescription": "Denies the get command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the insert command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-insert",
+          "markdownDescription": "Denies the insert command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-is-checked",
+          "markdownDescription": "Denies the is_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-is-enabled",
+          "markdownDescription": "Denies the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the items command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-items",
+          "markdownDescription": "Denies the items command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-new",
+          "markdownDescription": "Denies the new command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the popup command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-popup",
+          "markdownDescription": "Denies the popup command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the prepend command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-prepend",
+          "markdownDescription": "Denies the prepend command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-remove",
+          "markdownDescription": "Denies the remove command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_at command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-remove-at",
+          "markdownDescription": "Denies the remove_at command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_accelerator command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-accelerator",
+          "markdownDescription": "Denies the set_accelerator command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_app_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-app-menu",
+          "markdownDescription": "Denies the set_as_app_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_help_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-help-menu-for-nsapp",
+          "markdownDescription": "Denies the set_as_help_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_window_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-window-menu",
+          "markdownDescription": "Denies the set_as_window_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-as-windows-menu-for-nsapp",
+          "markdownDescription": "Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_checked command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-checked",
+          "markdownDescription": "Denies the set_checked command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-enabled",
+          "markdownDescription": "Denies the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-icon",
+          "markdownDescription": "Denies the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-set-text",
+          "markdownDescription": "Denies the set_text command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the text command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:menu:deny-text",
+          "markdownDescription": "Denies the text command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-resolve-directory`\n- `allow-resolve`\n- `allow-normalize`\n- `allow-join`\n- `allow-dirname`\n- `allow-extname`\n- `allow-basename`\n- `allow-is-absolute`",
+          "type": "string",
+          "const": "core:path:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-resolve-directory`\n- `allow-resolve`\n- `allow-normalize`\n- `allow-join`\n- `allow-dirname`\n- `allow-extname`\n- `allow-basename`\n- `allow-is-absolute`"
+        },
+        {
+          "description": "Enables the basename command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-basename",
+          "markdownDescription": "Enables the basename command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the dirname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-dirname",
+          "markdownDescription": "Enables the dirname command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the extname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-extname",
+          "markdownDescription": "Enables the extname command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_absolute command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-is-absolute",
+          "markdownDescription": "Enables the is_absolute command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the join command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-join",
+          "markdownDescription": "Enables the join command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the normalize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-normalize",
+          "markdownDescription": "Enables the normalize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the resolve command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-resolve",
+          "markdownDescription": "Enables the resolve command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the resolve_directory command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:allow-resolve-directory",
+          "markdownDescription": "Enables the resolve_directory command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the basename command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-basename",
+          "markdownDescription": "Denies the basename command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the dirname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-dirname",
+          "markdownDescription": "Denies the dirname command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the extname command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-extname",
+          "markdownDescription": "Denies the extname command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_absolute command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-is-absolute",
+          "markdownDescription": "Denies the is_absolute command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the join command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-join",
+          "markdownDescription": "Denies the join command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the normalize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-normalize",
+          "markdownDescription": "Denies the normalize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the resolve command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-resolve",
+          "markdownDescription": "Denies the resolve command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the resolve_directory command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:path:deny-resolve-directory",
+          "markdownDescription": "Denies the resolve_directory command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-close`",
+          "type": "string",
+          "const": "core:resources:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-close`"
+        },
+        {
+          "description": "Enables the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:resources:allow-close",
+          "markdownDescription": "Enables the close command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:resources:deny-close",
+          "markdownDescription": "Denies the close command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-get-by-id`\n- `allow-remove-by-id`\n- `allow-set-icon`\n- `allow-set-menu`\n- `allow-set-tooltip`\n- `allow-set-title`\n- `allow-set-visible`\n- `allow-set-temp-dir-path`\n- `allow-set-icon-as-template`\n- `allow-set-show-menu-on-left-click`",
+          "type": "string",
+          "const": "core:tray:default",
+          "markdownDescription": "Default permissions for the plugin, which enables all commands.\n#### This default permission set includes:\n\n- `allow-new`\n- `allow-get-by-id`\n- `allow-remove-by-id`\n- `allow-set-icon`\n- `allow-set-menu`\n- `allow-set-tooltip`\n- `allow-set-title`\n- `allow-set-visible`\n- `allow-set-temp-dir-path`\n- `allow-set-icon-as-template`\n- `allow-set-show-menu-on-left-click`"
+        },
+        {
+          "description": "Enables the get_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-get-by-id",
+          "markdownDescription": "Enables the get_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-new",
+          "markdownDescription": "Enables the new command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the remove_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-remove-by-id",
+          "markdownDescription": "Enables the remove_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-icon",
+          "markdownDescription": "Enables the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon_as_template command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-icon-as-template",
+          "markdownDescription": "Enables the set_icon_as_template command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-menu",
+          "markdownDescription": "Enables the set_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_show_menu_on_left_click command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-show-menu-on-left-click",
+          "markdownDescription": "Enables the set_show_menu_on_left_click command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_temp_dir_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-temp-dir-path",
+          "markdownDescription": "Enables the set_temp_dir_path command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-title",
+          "markdownDescription": "Enables the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_tooltip command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-tooltip",
+          "markdownDescription": "Enables the set_tooltip command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:allow-set-visible",
+          "markdownDescription": "Enables the set_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-get-by-id",
+          "markdownDescription": "Denies the get_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the new command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-new",
+          "markdownDescription": "Denies the new command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the remove_by_id command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-remove-by-id",
+          "markdownDescription": "Denies the remove_by_id command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-icon",
+          "markdownDescription": "Denies the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon_as_template command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-icon-as-template",
+          "markdownDescription": "Denies the set_icon_as_template command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_menu command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-menu",
+          "markdownDescription": "Denies the set_menu command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_show_menu_on_left_click command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-show-menu-on-left-click",
+          "markdownDescription": "Denies the set_show_menu_on_left_click command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_temp_dir_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-temp-dir-path",
+          "markdownDescription": "Denies the set_temp_dir_path command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-title",
+          "markdownDescription": "Denies the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_tooltip command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-tooltip",
+          "markdownDescription": "Denies the set_tooltip command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:tray:deny-set-visible",
+          "markdownDescription": "Denies the set_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-webviews`\n- `allow-webview-position`\n- `allow-webview-size`\n- `allow-internal-toggle-devtools`",
+          "type": "string",
+          "const": "core:webview:default",
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-webviews`\n- `allow-webview-position`\n- `allow-webview-size`\n- `allow-internal-toggle-devtools`"
+        },
+        {
+          "description": "Enables the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-clear-all-browsing-data",
+          "markdownDescription": "Enables the clear_all_browsing_data command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create_webview command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-create-webview",
+          "markdownDescription": "Enables the create_webview command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create_webview_window command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-create-webview-window",
+          "markdownDescription": "Enables the create_webview_window command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the get_all_webviews command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-get-all-webviews",
+          "markdownDescription": "Enables the get_all_webviews command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the internal_toggle_devtools command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-internal-toggle-devtools",
+          "markdownDescription": "Enables the internal_toggle_devtools command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the print command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-print",
+          "markdownDescription": "Enables the print command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the reparent command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-reparent",
+          "markdownDescription": "Enables the reparent command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_auto_resize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-auto-resize",
+          "markdownDescription": "Enables the set_webview_auto_resize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-background-color",
+          "markdownDescription": "Enables the set_webview_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-focus",
+          "markdownDescription": "Enables the set_webview_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-position",
+          "markdownDescription": "Enables the set_webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-size",
+          "markdownDescription": "Enables the set_webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_webview_zoom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-zoom",
+          "markdownDescription": "Enables the set_webview_zoom command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-close",
+          "markdownDescription": "Enables the webview_close command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-hide",
+          "markdownDescription": "Enables the webview_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-position",
+          "markdownDescription": "Enables the webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-show",
+          "markdownDescription": "Enables the webview_show command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-webview-size",
+          "markdownDescription": "Enables the webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the clear_all_browsing_data command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-clear-all-browsing-data",
+          "markdownDescription": "Denies the clear_all_browsing_data command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create_webview command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-create-webview",
+          "markdownDescription": "Denies the create_webview command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create_webview_window command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-create-webview-window",
+          "markdownDescription": "Denies the create_webview_window command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_all_webviews command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-get-all-webviews",
+          "markdownDescription": "Denies the get_all_webviews command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the internal_toggle_devtools command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-internal-toggle-devtools",
+          "markdownDescription": "Denies the internal_toggle_devtools command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the print command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-print",
+          "markdownDescription": "Denies the print command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the reparent command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-reparent",
+          "markdownDescription": "Denies the reparent command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_auto_resize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-auto-resize",
+          "markdownDescription": "Denies the set_webview_auto_resize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-background-color",
+          "markdownDescription": "Denies the set_webview_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-focus",
+          "markdownDescription": "Denies the set_webview_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-position",
+          "markdownDescription": "Denies the set_webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-size",
+          "markdownDescription": "Denies the set_webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_webview_zoom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-zoom",
+          "markdownDescription": "Denies the set_webview_zoom command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-close",
+          "markdownDescription": "Denies the webview_close command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-hide",
+          "markdownDescription": "Denies the webview_hide command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-position",
+          "markdownDescription": "Denies the webview_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-show",
+          "markdownDescription": "Denies the webview_show command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the webview_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-webview-size",
+          "markdownDescription": "Denies the webview_size command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-windows`\n- `allow-scale-factor`\n- `allow-inner-position`\n- `allow-outer-position`\n- `allow-inner-size`\n- `allow-outer-size`\n- `allow-is-fullscreen`\n- `allow-is-minimized`\n- `allow-is-maximized`\n- `allow-is-focused`\n- `allow-is-decorated`\n- `allow-is-resizable`\n- `allow-is-maximizable`\n- `allow-is-minimizable`\n- `allow-is-closable`\n- `allow-is-visible`\n- `allow-is-enabled`\n- `allow-title`\n- `allow-current-monitor`\n- `allow-primary-monitor`\n- `allow-monitor-from-point`\n- `allow-available-monitors`\n- `allow-cursor-position`\n- `allow-theme`\n- `allow-is-always-on-top`\n- `allow-internal-toggle-maximize`",
+          "type": "string",
+          "const": "core:window:default",
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-get-all-windows`\n- `allow-scale-factor`\n- `allow-inner-position`\n- `allow-outer-position`\n- `allow-inner-size`\n- `allow-outer-size`\n- `allow-is-fullscreen`\n- `allow-is-minimized`\n- `allow-is-maximized`\n- `allow-is-focused`\n- `allow-is-decorated`\n- `allow-is-resizable`\n- `allow-is-maximizable`\n- `allow-is-minimizable`\n- `allow-is-closable`\n- `allow-is-visible`\n- `allow-is-enabled`\n- `allow-title`\n- `allow-current-monitor`\n- `allow-primary-monitor`\n- `allow-monitor-from-point`\n- `allow-available-monitors`\n- `allow-cursor-position`\n- `allow-theme`\n- `allow-is-always-on-top`\n- `allow-internal-toggle-maximize`"
+        },
+        {
+          "description": "Enables the available_monitors command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-available-monitors",
+          "markdownDescription": "Enables the available_monitors command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the center command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-center",
+          "markdownDescription": "Enables the center command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-close",
+          "markdownDescription": "Enables the close command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the create command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-create",
+          "markdownDescription": "Enables the create command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the current_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-current-monitor",
+          "markdownDescription": "Enables the current_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-cursor-position",
+          "markdownDescription": "Enables the cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the destroy command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-destroy",
+          "markdownDescription": "Enables the destroy command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the get_all_windows command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-get-all-windows",
+          "markdownDescription": "Enables the get_all_windows command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-hide",
+          "markdownDescription": "Enables the hide command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the inner_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-inner-position",
+          "markdownDescription": "Enables the inner_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the inner_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-inner-size",
+          "markdownDescription": "Enables the inner_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the internal_toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-internal-toggle-maximize",
+          "markdownDescription": "Enables the internal_toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-always-on-top",
+          "markdownDescription": "Enables the is_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-closable",
+          "markdownDescription": "Enables the is_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_decorated command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-decorated",
+          "markdownDescription": "Enables the is_decorated command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-enabled",
+          "markdownDescription": "Enables the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_focused command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-focused",
+          "markdownDescription": "Enables the is_focused command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-fullscreen",
+          "markdownDescription": "Enables the is_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-maximizable",
+          "markdownDescription": "Enables the is_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_maximized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-maximized",
+          "markdownDescription": "Enables the is_maximized command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-minimizable",
+          "markdownDescription": "Enables the is_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_minimized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-minimized",
+          "markdownDescription": "Enables the is_minimized command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-resizable",
+          "markdownDescription": "Enables the is_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-is-visible",
+          "markdownDescription": "Enables the is_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-maximize",
+          "markdownDescription": "Enables the maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the minimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-minimize",
+          "markdownDescription": "Enables the minimize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the monitor_from_point command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-monitor-from-point",
+          "markdownDescription": "Enables the monitor_from_point command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the outer_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-outer-position",
+          "markdownDescription": "Enables the outer_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the outer_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-outer-size",
+          "markdownDescription": "Enables the outer_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the primary_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-primary-monitor",
+          "markdownDescription": "Enables the primary_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the request_user_attention command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-request-user-attention",
+          "markdownDescription": "Enables the request_user_attention command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the scale_factor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-scale-factor",
+          "markdownDescription": "Enables the scale_factor command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_always_on_bottom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-always-on-bottom",
+          "markdownDescription": "Enables the set_always_on_bottom command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-always-on-top",
+          "markdownDescription": "Enables the set_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-background-color",
+          "markdownDescription": "Enables the set_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_badge_count command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-badge-count",
+          "markdownDescription": "Enables the set_badge_count command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_badge_label command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-badge-label",
+          "markdownDescription": "Enables the set_badge_label command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-closable",
+          "markdownDescription": "Enables the set_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_content_protected command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-content-protected",
+          "markdownDescription": "Enables the set_content_protected command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_grab command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-grab",
+          "markdownDescription": "Enables the set_cursor_grab command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-icon",
+          "markdownDescription": "Enables the set_cursor_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-position",
+          "markdownDescription": "Enables the set_cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_cursor_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-cursor-visible",
+          "markdownDescription": "Enables the set_cursor_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_decorations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-decorations",
+          "markdownDescription": "Enables the set_decorations command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_effects command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-effects",
+          "markdownDescription": "Enables the set_effects command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-enabled",
+          "markdownDescription": "Enables the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-focus",
+          "markdownDescription": "Enables the set_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_focusable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-focusable",
+          "markdownDescription": "Enables the set_focusable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-fullscreen",
+          "markdownDescription": "Enables the set_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-icon",
+          "markdownDescription": "Enables the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_ignore_cursor_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-ignore-cursor-events",
+          "markdownDescription": "Enables the set_ignore_cursor_events command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_max_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-max-size",
+          "markdownDescription": "Enables the set_max_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-maximizable",
+          "markdownDescription": "Enables the set_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_min_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-min-size",
+          "markdownDescription": "Enables the set_min_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-minimizable",
+          "markdownDescription": "Enables the set_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_overlay_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-overlay-icon",
+          "markdownDescription": "Enables the set_overlay_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-position",
+          "markdownDescription": "Enables the set_position command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_progress_bar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-progress-bar",
+          "markdownDescription": "Enables the set_progress_bar command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-resizable",
+          "markdownDescription": "Enables the set_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_shadow command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-shadow",
+          "markdownDescription": "Enables the set_shadow command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_simple_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-simple-fullscreen",
+          "markdownDescription": "Enables the set_simple_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-size",
+          "markdownDescription": "Enables the set_size command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_size_constraints command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-size-constraints",
+          "markdownDescription": "Enables the set_size_constraints command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_skip_taskbar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-skip-taskbar",
+          "markdownDescription": "Enables the set_skip_taskbar command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-theme",
+          "markdownDescription": "Enables the set_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-title",
+          "markdownDescription": "Enables the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-title-bar-style",
+          "markdownDescription": "Enables the set_title_bar_style command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the set_visible_on_all_organizations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-visible-on-all-organizations",
+          "markdownDescription": "Enables the set_visible_on_all_organizations command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-show",
+          "markdownDescription": "Enables the show command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the start_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-start-dragging",
+          "markdownDescription": "Enables the start_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the start_resize_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-start-resize-dragging",
+          "markdownDescription": "Enables the start_resize_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-theme",
+          "markdownDescription": "Enables the theme command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-title",
+          "markdownDescription": "Enables the title command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-toggle-maximize",
+          "markdownDescription": "Enables the toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the unmaximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-unmaximize",
+          "markdownDescription": "Enables the unmaximize command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the unminimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-unminimize",
+          "markdownDescription": "Enables the unminimize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the available_monitors command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-available-monitors",
+          "markdownDescription": "Denies the available_monitors command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the center command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-center",
+          "markdownDescription": "Denies the center command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-close",
+          "markdownDescription": "Denies the close command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the create command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-create",
+          "markdownDescription": "Denies the create command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the current_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-current-monitor",
+          "markdownDescription": "Denies the current_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-cursor-position",
+          "markdownDescription": "Denies the cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the destroy command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-destroy",
+          "markdownDescription": "Denies the destroy command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_all_windows command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-get-all-windows",
+          "markdownDescription": "Denies the get_all_windows command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the hide command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-hide",
+          "markdownDescription": "Denies the hide command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the inner_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-inner-position",
+          "markdownDescription": "Denies the inner_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the inner_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-inner-size",
+          "markdownDescription": "Denies the inner_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the internal_toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-internal-toggle-maximize",
+          "markdownDescription": "Denies the internal_toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-always-on-top",
+          "markdownDescription": "Denies the is_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-closable",
+          "markdownDescription": "Denies the is_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_decorated command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-decorated",
+          "markdownDescription": "Denies the is_decorated command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-enabled",
+          "markdownDescription": "Denies the is_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_focused command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-focused",
+          "markdownDescription": "Denies the is_focused command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-fullscreen",
+          "markdownDescription": "Denies the is_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-maximizable",
+          "markdownDescription": "Denies the is_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_maximized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-maximized",
+          "markdownDescription": "Denies the is_maximized command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-minimizable",
+          "markdownDescription": "Denies the is_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_minimized command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-minimized",
+          "markdownDescription": "Denies the is_minimized command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-resizable",
+          "markdownDescription": "Denies the is_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-is-visible",
+          "markdownDescription": "Denies the is_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-maximize",
+          "markdownDescription": "Denies the maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the minimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-minimize",
+          "markdownDescription": "Denies the minimize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the monitor_from_point command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-monitor-from-point",
+          "markdownDescription": "Denies the monitor_from_point command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the outer_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-outer-position",
+          "markdownDescription": "Denies the outer_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the outer_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-outer-size",
+          "markdownDescription": "Denies the outer_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the primary_monitor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-primary-monitor",
+          "markdownDescription": "Denies the primary_monitor command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the request_user_attention command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-request-user-attention",
+          "markdownDescription": "Denies the request_user_attention command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the scale_factor command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-scale-factor",
+          "markdownDescription": "Denies the scale_factor command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_always_on_bottom command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-always-on-bottom",
+          "markdownDescription": "Denies the set_always_on_bottom command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_always_on_top command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-always-on-top",
+          "markdownDescription": "Denies the set_always_on_top command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-background-color",
+          "markdownDescription": "Denies the set_background_color command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_badge_count command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-badge-count",
+          "markdownDescription": "Denies the set_badge_count command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_badge_label command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-badge-label",
+          "markdownDescription": "Denies the set_badge_label command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_closable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-closable",
+          "markdownDescription": "Denies the set_closable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_content_protected command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-content-protected",
+          "markdownDescription": "Denies the set_content_protected command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_grab command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-grab",
+          "markdownDescription": "Denies the set_cursor_grab command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-icon",
+          "markdownDescription": "Denies the set_cursor_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-position",
+          "markdownDescription": "Denies the set_cursor_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_cursor_visible command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-cursor-visible",
+          "markdownDescription": "Denies the set_cursor_visible command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_decorations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-decorations",
+          "markdownDescription": "Denies the set_decorations command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_effects command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-effects",
+          "markdownDescription": "Denies the set_effects command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_enabled command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-enabled",
+          "markdownDescription": "Denies the set_enabled command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_focus command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-focus",
+          "markdownDescription": "Denies the set_focus command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_focusable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-focusable",
+          "markdownDescription": "Denies the set_focusable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-fullscreen",
+          "markdownDescription": "Denies the set_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-icon",
+          "markdownDescription": "Denies the set_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_ignore_cursor_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-ignore-cursor-events",
+          "markdownDescription": "Denies the set_ignore_cursor_events command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_max_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-max-size",
+          "markdownDescription": "Denies the set_max_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_maximizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-maximizable",
+          "markdownDescription": "Denies the set_maximizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_min_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-min-size",
+          "markdownDescription": "Denies the set_min_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_minimizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-minimizable",
+          "markdownDescription": "Denies the set_minimizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_overlay_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-overlay-icon",
+          "markdownDescription": "Denies the set_overlay_icon command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_position command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-position",
+          "markdownDescription": "Denies the set_position command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_progress_bar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-progress-bar",
+          "markdownDescription": "Denies the set_progress_bar command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_resizable command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-resizable",
+          "markdownDescription": "Denies the set_resizable command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_shadow command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-shadow",
+          "markdownDescription": "Denies the set_shadow command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_simple_fullscreen command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-simple-fullscreen",
+          "markdownDescription": "Denies the set_simple_fullscreen command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_size command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-size",
+          "markdownDescription": "Denies the set_size command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_size_constraints command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-size-constraints",
+          "markdownDescription": "Denies the set_size_constraints command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_skip_taskbar command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-skip-taskbar",
+          "markdownDescription": "Denies the set_skip_taskbar command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-theme",
+          "markdownDescription": "Denies the set_theme command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-title",
+          "markdownDescription": "Denies the set_title command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-title-bar-style",
+          "markdownDescription": "Denies the set_title_bar_style command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the set_visible_on_all_organizations command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-visible-on-all-organizations",
+          "markdownDescription": "Denies the set_visible_on_all_organizations command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the show command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-show",
+          "markdownDescription": "Denies the show command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-start-dragging",
+          "markdownDescription": "Denies the start_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start_resize_dragging command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-start-resize-dragging",
+          "markdownDescription": "Denies the start_resize_dragging command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the theme command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-theme",
+          "markdownDescription": "Denies the theme command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the title command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-title",
+          "markdownDescription": "Denies the title command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the toggle_maximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-toggle-maximize",
+          "markdownDescription": "Denies the toggle_maximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the unmaximize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-unmaximize",
+          "markdownDescription": "Denies the unmaximize command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the unminimize command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-unminimize",
+          "markdownDescription": "Denies the unminimize command without any pre-configured scope."
+        },
+        {
+          "description": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`",
+          "type": "string",
+          "const": "shell:default",
+          "markdownDescription": "This permission set configures which\nshell functionality is exposed by default.\n\n#### Granted Permissions\n\nIt allows to use the `open` functionality with a reasonable\nscope pre-configured. It will allow opening `http(s)://`,\n`tel:` and `mailto:` links.\n\n#### This default permission set includes:\n\n- `allow-open`"
+        },
+        {
+          "description": "Enables the execute command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-execute",
+          "markdownDescription": "Enables the execute command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the kill command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-kill",
+          "markdownDescription": "Enables the kill command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the open command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-open",
+          "markdownDescription": "Enables the open command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the spawn command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-spawn",
+          "markdownDescription": "Enables the spawn command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the stdin_write command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:allow-stdin-write",
+          "markdownDescription": "Enables the stdin_write command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the execute command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-execute",
+          "markdownDescription": "Denies the execute command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the kill command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-kill",
+          "markdownDescription": "Denies the kill command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the open command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-open",
+          "markdownDescription": "Denies the open command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the spawn command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-spawn",
+          "markdownDescription": "Denies the spawn command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the stdin_write command without any pre-configured scope.",
+          "type": "string",
+          "const": "shell:deny-stdin-write",
+          "markdownDescription": "Denies the stdin_write command without any pre-configured scope."
+        }
+      ]
+    },
+    "Value": {
+      "description": "All supported ACL values.",
+      "anyOf": [
+        {
+          "description": "Represents a null JSON value.",
+          "type": "null"
+        },
+        {
+          "description": "Represents a [`bool`].",
+          "type": "boolean"
+        },
+        {
+          "description": "Represents a valid ACL [`Number`].",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Number"
+            }
+          ]
+        },
+        {
+          "description": "Represents a [`String`].",
+          "type": "string"
+        },
+        {
+          "description": "Represents a list of other [`Value`]s.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        },
+        {
+          "description": "Represents a map of [`String`] keys to [`Value`]s.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/Value"
+          }
+        }
+      ]
+    },
+    "Number": {
+      "description": "A valid ACL number.",
+      "anyOf": [
+        {
+          "description": "Represents an [`i64`].",
+          "type": "integer",
+          "format": "int64"
+        },
+        {
+          "description": "Represents a [`f64`].",
+          "type": "number",
+          "format": "double"
+        }
+      ]
+    },
+    "Target": {
+      "description": "Platform target.",
+      "oneOf": [
+        {
+          "description": "MacOS.",
+          "type": "string",
+          "enum": ["macOS"]
+        },
+        {
+          "description": "Windows.",
+          "type": "string",
+          "enum": ["windows"]
+        },
+        {
+          "description": "Linux.",
+          "type": "string",
+          "enum": ["linux"]
+        },
+        {
+          "description": "Android.",
+          "type": "string",
+          "enum": ["android"]
+        },
+        {
+          "description": "iOS.",
+          "type": "string",
+          "enum": ["iOS"]
+        }
+      ]
+    },
+    "ShellScopeEntryAllowedArg": {
+      "description": "A command argument allowed to be executed by the webview API.",
+      "anyOf": [
+        {
+          "description": "A non-configurable argument that is passed to the command in the order it was specified.",
+          "type": "string"
+        },
+        {
+          "description": "A variable that is set while calling the command from the webview API.",
+          "type": "object",
+          "required": ["validator"],
+          "properties": {
+            "raw": {
+              "description": "Marks the validator as a raw regex, meaning the plugin should not make any modification at runtime.\n\nThis means the regex will not match on the entire string by default, which might be exploited if your regex allow unexpected input to be considered valid. When using this option, make sure your regex is correct.",
+              "default": false,
+              "type": "boolean"
+            },
+            "validator": {
+              "description": "[regex] validator to require passed values to conform to an expected input.\n\nThis will require the argument value passed to this variable to match the `validator` regex before it will be executed.\n\nThe regex string is by default surrounded by `^...$` to match the full string. For example the `https?://\\w+` regex would be registered as `^https?://\\w+$`.\n\n[regex]: <https://docs.rs/regex/latest/regex/#syntax>",
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "ShellScopeEntryAllowedArgs": {
+      "description": "A set of command arguments allowed to be executed by the webview API.\n\nA value of `true` will allow any arguments to be passed to the command. `false` will disable all arguments. A list of [`ShellScopeEntryAllowedArg`] will set those arguments as the only valid arguments to be passed to the attached command configuration.",
+      "anyOf": [
+        {
+          "description": "Use a simple boolean to allow all or disable all arguments to this command configuration.",
+          "type": "boolean"
+        },
+        {
+          "description": "A specific set of [`ShellScopeEntryAllowedArg`] that are valid to call for the command configuration.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ShellScopeEntryAllowedArg"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/foundry/packages/desktop/src-tauri/icons/128x128.png b/foundry/packages/desktop/src-tauri/icons/128x128.png
new file mode 100644
index 0000000..40cb79f
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/128x128.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/128x128@2x.png b/foundry/packages/desktop/src-tauri/icons/128x128@2x.png
new file mode 100644
index 0000000..de99a94
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/128x128@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/32x32.png b/foundry/packages/desktop/src-tauri/icons/32x32.png
new file mode 100644
index 0000000..0b9b8d9
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/32x32.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/64x64.png b/foundry/packages/desktop/src-tauri/icons/64x64.png
new file mode 100644
index 0000000..4849c59
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/64x64.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square107x107Logo.png b/foundry/packages/desktop/src-tauri/icons/Square107x107Logo.png
new file mode 100644
index 0000000..4a7904a
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square107x107Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square142x142Logo.png b/foundry/packages/desktop/src-tauri/icons/Square142x142Logo.png
new file mode 100644
index 0000000..598a4e0
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square142x142Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square150x150Logo.png b/foundry/packages/desktop/src-tauri/icons/Square150x150Logo.png
new file mode 100644
index 0000000..1c33be7
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square150x150Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square284x284Logo.png b/foundry/packages/desktop/src-tauri/icons/Square284x284Logo.png
new file mode 100644
index 0000000..67eb476
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square284x284Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square30x30Logo.png b/foundry/packages/desktop/src-tauri/icons/Square30x30Logo.png
new file mode 100644
index 0000000..276c779
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square30x30Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square310x310Logo.png b/foundry/packages/desktop/src-tauri/icons/Square310x310Logo.png
new file mode 100644
index 0000000..41a103e
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square310x310Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square44x44Logo.png b/foundry/packages/desktop/src-tauri/icons/Square44x44Logo.png
new file mode 100644
index 0000000..ead9269
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square44x44Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square71x71Logo.png b/foundry/packages/desktop/src-tauri/icons/Square71x71Logo.png
new file mode 100644
index 0000000..ae7086c
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square71x71Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/Square89x89Logo.png b/foundry/packages/desktop/src-tauri/icons/Square89x89Logo.png
new file mode 100644
index 0000000..c38274b
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/Square89x89Logo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/StoreLogo.png b/foundry/packages/desktop/src-tauri/icons/StoreLogo.png
new file mode 100644
index 0000000..bfedcec
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/StoreLogo.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/foundry/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..2ffbf24
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..8300460
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..3fd9ebd
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8300460
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..7d4c93b
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..0e46d02
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..7d4c93b
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..fec86d5
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..1eae667
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..fec86d5
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e45a2dc
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d3bb642
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..e45a2dc
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..d72589c
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d290579
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d72589c
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml b/foundry/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml
new file mode 100644
index 0000000..ea9c223
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#fff</color>
+</resources>
\ No newline at end of file
diff --git a/foundry/packages/desktop/src-tauri/icons/icon-source.svg b/foundry/packages/desktop/src-tauri/icons/icon-source.svg
new file mode 100644
index 0000000..7db083d
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/icons/icon-source.svg
@@ -0,0 +1,130 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <!-- macOS squircle clip path (continuous corner radius ~22.37% = 229px) -->
+    <clipPath id="squircle-clip">
+      <path d="
+        M 229 0
+        H 795
+        C 921.5 0 1024 102.5 1024 229
+        V 795
+        C 1024 921.5 921.5 1024 795 1024
+        H 229
+        C 102.5 1024 0 921.5 0 795
+        V 229
+        C 0 102.5 102.5 0 229 0
+        Z
+      "/>
+    </clipPath>
+
+    <!-- macOS squircle shape for stroke -->
+    <path id="squircle-path" d="
+      M 229 0
+      H 795
+      C 921.5 0 1024 102.5 1024 229
+      V 795
+      C 1024 921.5 921.5 1024 795 1024
+      H 229
+      C 102.5 1024 0 921.5 0 795
+      V 229
+      C 0 102.5 102.5 0 229 0
+      Z
+    "/>
+
+    <!-- Base dark gradient with subtle depth -->
+    <linearGradient id="base-gradient" x1="0" y1="0" x2="1024" y2="1024" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#1A1A1A"/>
+      <stop offset="0.5" stop-color="#0F0F0F"/>
+      <stop offset="1" stop-color="#0A0A0A"/>
+    </linearGradient>
+
+    <!-- Glass highlight overlay (top-left lighter) -->
+    <linearGradient id="glass-overlay" x1="0" y1="0" x2="1024" y2="1024" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="white" stop-opacity="0.12"/>
+      <stop offset="0.35" stop-color="white" stop-opacity="0.04"/>
+      <stop offset="0.65" stop-color="white" stop-opacity="0"/>
+      <stop offset="1" stop-color="black" stop-opacity="0.15"/>
+    </linearGradient>
+
+    <!-- Top edge highlight (light reflection) -->
+    <linearGradient id="top-highlight" x1="256" y1="0" x2="768" y2="0" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="white" stop-opacity="0"/>
+      <stop offset="0.2" stop-color="white" stop-opacity="0.4"/>
+      <stop offset="0.5" stop-color="white" stop-opacity="0.6"/>
+      <stop offset="0.8" stop-color="white" stop-opacity="0.4"/>
+      <stop offset="1" stop-color="white" stop-opacity="0"/>
+    </linearGradient>
+
+    <!-- Inner border glow -->
+    <filter id="inner-border-glow" x="-10%" y="-10%" width="120%" height="120%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="6" result="blur"/>
+      <feMerge>
+        <feMergeNode in="blur"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+
+    <!-- Subtle inner shadow for depth -->
+    <radialGradient id="vignette" cx="0.5" cy="0.4" r="0.65" fx="0.5" fy="0.35">
+      <stop offset="0" stop-color="white" stop-opacity="0.03"/>
+      <stop offset="0.7" stop-color="black" stop-opacity="0"/>
+      <stop offset="1" stop-color="black" stop-opacity="0.2"/>
+    </radialGradient>
+
+    <!-- Inner rounded rect for the border -->
+    <rect id="inner-border-rect" x="152" y="152" width="720" height="720" rx="205"/>
+
+    <!-- Glow filter for inner border -->
+    <filter id="glow" x="-5%" y="-5%" width="110%" height="110%">
+      <feGaussianBlur in="SourceAlpha" stdDeviation="8" result="blur"/>
+      <feFlood flood-color="#F0F0F0" flood-opacity="0.15" result="color"/>
+      <feComposite in="color" in2="blur" operator="in" result="glow"/>
+      <feMerge>
+        <feMergeNode in="glow"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+
+    <!-- Specular highlight on the Y mark -->
+    <linearGradient id="logo-gradient" x1="380" y1="340" x2="640" y2="730" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#FFFFFF"/>
+      <stop offset="0.6" stop-color="#F0F0F0"/>
+      <stop offset="1" stop-color="#E0E0E0"/>
+    </linearGradient>
+  </defs>
+
+  <!-- Outer squircle shape -->
+  <g clip-path="url(#squircle-clip)">
+    <!-- Base fill with gradient -->
+    <use href="#squircle-path" fill="url(#base-gradient)"/>
+
+    <!-- Vignette/radial depth -->
+    <use href="#squircle-path" fill="url(#vignette)"/>
+
+    <!-- Glass overlay -->
+    <use href="#squircle-path" fill="url(#glass-overlay)"/>
+
+    <!-- Inner rounded border with glow -->
+    <g filter="url(#glow)">
+      <rect x="152" y="152" width="720" height="720" rx="205"
+            fill="none" stroke="#F0F0F0" stroke-width="67" stroke-opacity="0.9"/>
+    </g>
+
+    <!-- Y-shaped / triskelion logo mark, scaled from 130x128 to fit ~1024 -->
+    <!-- Original viewBox was 130x128, scaling factor ~7.87. Centered in the icon. -->
+    <g transform="translate(512, 512) scale(7.87) translate(-65, -64)">
+      <path fill-rule="evenodd" clip-rule="evenodd"
+            d="M88.0429 44.2658C89.3803 43.625 90.8907 44.1955 91.5731 45.3776C92.2556 46.5596 91.9945 48.1529 90.7709 48.9907L72.3923 62.885C71.8013 63.2262 71.4248 63.7062 71.1029 64.2861C70.781 64.8659 70.5554 65.3922 70.5443 66.0553L67.7403 88.9495C67.521 90.3894 66.4114 91.423 64.9867 91.4576C63.5619 91.4922 62.3731 90.3429 62.24 88.9751L59.3859 66.0642C59.3971 65.4011 59.2126 64.8489 58.8714 64.2579C58.5302 63.6669 58.1442 63.231 57.5643 62.9091L39.15 48.9819C38.032 48.1828 37.6311 46.5786 38.3734 45.362C39.1157 44.1454 40.5656 43.7013 41.9223 44.2314L63.1512 53.2502C63.731 53.5721 64.2996 53.6398 64.9627 53.651C65.6259 53.6622 66.2298 53.5761 66.8208 53.2349L88.0429 44.2658Z"
+            fill="url(#logo-gradient)"/>
+    </g>
+  </g>
+
+  <!-- Outer squircle border (subtle) -->
+  <use href="#squircle-path" fill="none" stroke="#333333" stroke-width="1.5" stroke-opacity="0.5"/>
+
+  <!-- Top edge highlight reflection -->
+  <path d="
+    M 229 2
+    H 795
+    C 920 2 1022 103 1022 229
+  " fill="none" stroke="url(#top-highlight)" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/foundry/packages/desktop/src-tauri/icons/icon.icns b/foundry/packages/desktop/src-tauri/icons/icon.icns
new file mode 100644
index 0000000..5757cea
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/icon.icns differ
diff --git a/foundry/packages/desktop/src-tauri/icons/icon.ico b/foundry/packages/desktop/src-tauri/icons/icon.ico
new file mode 100644
index 0000000..2dc8306
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/icon.ico differ
diff --git a/foundry/packages/desktop/src-tauri/icons/icon.png b/foundry/packages/desktop/src-tauri/icons/icon.png
new file mode 100644
index 0000000..c11a109
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/icon.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png
new file mode 100644
index 0000000..db892f7
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
new file mode 100644
index 0000000..1fe129d
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png
new file mode 100644
index 0000000..1fe129d
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png
new file mode 100644
index 0000000..866c461
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png
new file mode 100644
index 0000000..6eca363
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
new file mode 100644
index 0000000..092aab8
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png
new file mode 100644
index 0000000..092aab8
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png
new file mode 100644
index 0000000..119d3ca
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png
new file mode 100644
index 0000000..1fe129d
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
new file mode 100644
index 0000000..8b10e8a
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png
new file mode 100644
index 0000000..8b10e8a
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png
new file mode 100644
index 0000000..e9e7129
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png
new file mode 100644
index 0000000..45d9c6e
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png
new file mode 100644
index 0000000..e9e7129
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png
new file mode 100644
index 0000000..0eb464d
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png
new file mode 100644
index 0000000..671a540
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png
new file mode 100644
index 0000000..3958a90
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
new file mode 100644
index 0000000..c8290ee
Binary files /dev/null and b/foundry/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ
diff --git a/foundry/packages/desktop/src-tauri/src/lib.rs b/foundry/packages/desktop/src-tauri/src/lib.rs
new file mode 100644
index 0000000..efcbd75
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/src/lib.rs
@@ -0,0 +1,154 @@
+use std::sync::Mutex;
+use tauri::{AppHandle, LogicalPosition, Manager, WebviewUrl, WebviewWindowBuilder};
+use tauri_plugin_shell::process::CommandChild;
+use tauri_plugin_shell::ShellExt;
+
+struct BackendState {
+    child: Mutex<Option<CommandChild>>,
+}
+
+#[tauri::command]
+fn get_backend_url() -> String {
+    "http://127.0.0.1:7741".to_string()
+}
+
+#[tauri::command]
+async fn backend_health() -> Result<bool, String> {
+    match reqwest::get("http://127.0.0.1:7741/v1/rivet/metadata").await {
+        Ok(resp) => Ok(resp.status().is_success()),
+        Err(_) => Ok(false),
+    }
+}
+
+async fn wait_for_backend(timeout_secs: u64) -> Result<(), String> {
+    let start = std::time::Instant::now();
+    let timeout = std::time::Duration::from_secs(timeout_secs);
+
+    loop {
+        if start.elapsed() > timeout {
+            return Err(format!(
+                "Backend failed to start within {} seconds",
+                timeout_secs
+            ));
+        }
+
+        match reqwest::get("http://127.0.0.1:7741/v1/rivet/metadata").await {
+            Ok(resp) if resp.status().is_success() => return Ok(()),
+            _ => {}
+        }
+
+        tokio::time::sleep(std::time::Duration::from_millis(250)).await;
+    }
+}
+
+fn spawn_backend(app: &AppHandle) -> Result<(), String> {
+    let sidecar = app
+        .shell()
+        .sidecar("sidecars/foundry-backend")
+        .map_err(|e| format!("Failed to create sidecar command: {}", e))?
+        .args(["start", "--host", "127.0.0.1", "--port", "7741"]);
+
+    let (mut rx, child) = sidecar
+        .spawn()
+        .map_err(|e| format!("Failed to spawn backend sidecar: {}", e))?;
+
+    // Store the child process handle for cleanup
+    let state = app.state::<BackendState>();
+    *state.child.lock().unwrap() = Some(child);
+
+    // Log sidecar stdout/stderr in a background task
+    tauri::async_runtime::spawn(async move {
+        use tauri_plugin_shell::process::CommandEvent;
+        while let Some(event) = rx.recv().await {
+            match event {
+                CommandEvent::Stdout(line) => {
+                    eprintln!("[foundry-backend] {}", String::from_utf8_lossy(&line));
+                }
+                CommandEvent::Stderr(line) => {
+                    eprintln!("[foundry-backend] {}", String::from_utf8_lossy(&line));
+                }
+                CommandEvent::Terminated(payload) => {
+                    eprintln!(
+                        "[foundry-backend] process exited with code {:?}",
+                        payload.code
+                    );
+                    break;
+                }
+                CommandEvent::Error(err) => {
+                    eprintln!("[foundry-backend] error: {}", err);
+                    break;
+                }
+                _ => {}
+            }
+        }
+    });
+
+    Ok(())
+}
+
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
+    tauri::Builder::default()
+        .plugin(tauri_plugin_shell::init())
+        .manage(BackendState {
+            child: Mutex::new(None),
+        })
+        .invoke_handler(tauri::generate_handler![get_backend_url, backend_health])
+        .setup(|app| {
+            // Create main window programmatically so we can set traffic light position
+            let url = if cfg!(debug_assertions) {
+                WebviewUrl::External("http://localhost:4173".parse().unwrap())
+            } else {
+                WebviewUrl::default()
+            };
+
+            let mut builder = WebviewWindowBuilder::new(app, "main", url)
+                .title("Foundry")
+                .inner_size(1280.0, 800.0)
+                .min_inner_size(900.0, 600.0)
+                .resizable(true)
+                .theme(Some(tauri::Theme::Dark))
+                .title_bar_style(tauri::TitleBarStyle::Overlay)
+                .hidden_title(true);
+
+            #[cfg(target_os = "macos")]
+            {
+                builder = builder.traffic_light_position(LogicalPosition::new(14.0, 14.0));
+            }
+
+            builder.build()?;
+
+            // In debug mode, assume the developer is running the backend externally
+            if cfg!(debug_assertions) {
+                eprintln!("[foundry-desktop] Dev mode: skipping sidecar spawn. Run the backend separately.");
+                return Ok(());
+            }
+
+            let handle = app.handle().clone();
+            tauri::async_runtime::spawn(async move {
+                if let Err(e) = spawn_backend(&handle) {
+                    eprintln!("[foundry-desktop] Failed to start backend: {}", e);
+                    return;
+                }
+
+                match wait_for_backend(30).await {
+                    Ok(()) => eprintln!("[foundry-desktop] Backend is ready."),
+                    Err(e) => eprintln!("[foundry-desktop] {}", e),
+                }
+            });
+
+            Ok(())
+        })
+        .on_window_event(|window, event| {
+            if let tauri::WindowEvent::Destroyed = event {
+                let state = window.state::<BackendState>();
+                let child = state.child.lock().unwrap().take();
+                if let Some(child) = child {
+                    let _ = child.kill();
+                    eprintln!("[foundry-desktop] Backend sidecar killed.");
+                }
+            }
+        })
+        .run(tauri::generate_context!())
+        .expect("error while running Foundry");
+}
diff --git a/foundry/packages/desktop/src-tauri/src/main.rs b/foundry/packages/desktop/src-tauri/src/main.rs
new file mode 100644
index 0000000..bc7e592
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/src/main.rs
@@ -0,0 +1,5 @@
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    foundry::run();
+}
diff --git a/foundry/packages/desktop/src-tauri/tauri.conf.json b/foundry/packages/desktop/src-tauri/tauri.conf.json
new file mode 100644
index 0000000..53221cb
--- /dev/null
+++ b/foundry/packages/desktop/src-tauri/tauri.conf.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri-cli/schema.json",
+  "productName": "Foundry",
+  "version": "0.1.0",
+  "identifier": "dev.sandboxagent.foundry",
+  "build": {
+    "beforeDevCommand": "FOUNDRY_FRONTEND_CLIENT_MODE=mock VITE_DESKTOP=1 pnpm --filter @sandbox-agent/foundry-frontend dev",
+    "devUrl": "http://localhost:4173",
+    "frontendDist": "../frontend-dist"
+  },
+  "app": {
+    "windows": [],
+    "security": {
+      "csp": null
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": ["dmg", "app"],
+    "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
+    "macOS": {
+      "signingIdentity": null
+    },
+    "externalBin": ["sidecars/foundry-backend"]
+  },
+  "plugins": {
+    "shell": {
+      "open": true
+    }
+  }
+}
diff --git a/foundry/packages/frontend/index.html b/foundry/packages/frontend/index.html
new file mode 100644
index 0000000..4e72d23
--- /dev/null
+++ b/foundry/packages/frontend/index.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <script type="module">
+      if (import.meta.env.DEV) {
+        import("react-grab");
+        import("@react-grab/mcp/client");
+      }
+    </script>
+    <script>if(window.__TAURI_INTERNALS__)document.documentElement.dataset.tauri="1"</script>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Foundry</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script src="/__foundry_runtime_config.js"></script>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/foundry/packages/frontend/package.json b/foundry/packages/frontend/package.json
new file mode 100644
index 0000000..793a12d
--- /dev/null
+++ b/foundry/packages/frontend/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@sandbox-agent/foundry-frontend",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@sandbox-agent/foundry-client": "workspace:*",
+    "@sandbox-agent/foundry-shared": "workspace:*",
+    "@sandbox-agent/react": "workspace:*",
+    "@tanstack/react-query": "^5.85.5",
+    "@tanstack/react-router": "^1.132.23",
+    "@tanstack/react-virtual": "^3.13.22",
+    "baseui": "^16.1.1",
+    "lucide-react": "^0.542.0",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
+    "sandbox-agent": "workspace:*",
+    "styletron-engine-atomic": "^1.6.2",
+    "styletron-react": "^6.1.1"
+  },
+  "devDependencies": {
+    "@react-grab/mcp": "^0.1.13",
+    "@types/react": "^19.1.12",
+    "@types/react-dom": "^19.1.9",
+    "@vitejs/plugin-react": "^5.0.3",
+    "react-grab": "^0.1.13",
+    "tsup": "^8.5.0",
+    "vite": "^7.1.3"
+  }
+}
diff --git a/foundry/packages/frontend/public/favicon.svg b/foundry/packages/frontend/public/favicon.svg
new file mode 100644
index 0000000..ec605d6
--- /dev/null
+++ b/foundry/packages/frontend/public/favicon.svg
@@ -0,0 +1,5 @@
+<svg width="130" height="128" viewBox="0 0 130 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2" y="1" width="126" height="126" rx="44" fill="#0F0F0F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.0429 44.2658C89.3803 43.625 90.8907 44.1955 91.5731 45.3776C92.2556 46.5596 91.9945 48.1529 90.7709 48.9907L72.3923 62.885C71.8013 63.2262 71.4248 63.7062 71.1029 64.2861C70.781 64.8659 70.5554 65.3922 70.5443 66.0553L67.7403 88.9495C67.521 90.3894 66.4114 91.423 64.9867 91.4576C63.5619 91.4922 62.3731 90.3429 62.24 88.9751L59.3859 66.0642C59.3971 65.4011 59.2126 64.8489 58.8714 64.2579C58.5302 63.6669 58.1442 63.231 57.5643 62.9091L39.15 48.9819C38.032 48.1828 37.6311 46.5786 38.3734 45.362C39.1157 44.1454 40.5656 43.7013 41.9223 44.2314L63.1512 53.2502C63.731 53.5721 64.2996 53.6398 64.9627 53.651C65.6259 53.6622 66.2298 53.5761 66.8208 53.2349L88.0429 44.2658Z" fill="white"/>
+<rect x="19.25" y="18.25" width="91.5" height="91.5" rx="25.75" stroke="#F0F0F0" stroke-width="8.5"/>
+</svg>
diff --git a/foundry/packages/frontend/src/app/router.tsx b/foundry/packages/frontend/src/app/router.tsx
new file mode 100644
index 0000000..dd22724
--- /dev/null
+++ b/foundry/packages/frontend/src/app/router.tsx
@@ -0,0 +1,328 @@
+import { type ReactNode, useEffect } from "react";
+import type { FoundryBillingPlanId } from "@sandbox-agent/foundry-shared";
+import { useSubscription } from "@sandbox-agent/foundry-client";
+import { Navigate, Outlet, createRootRoute, createRoute, createRouter } from "@tanstack/react-router";
+import { MockLayout } from "../components/mock-layout";
+import {
+  MockAccountSettingsPage,
+  MockHostedCheckoutPage,
+  MockOrganizationBillingPage,
+  MockOrganizationSelectorPage,
+  MockOrganizationSettingsPage,
+  MockSignInPage,
+} from "../components/mock-onboarding";
+import { defaultOrganizationId, isMockFrontendClient } from "../lib/env";
+import { subscriptionManager } from "../lib/subscription";
+import { activeMockOrganization, getMockOrganizationById, isAppSnapshotBootstrapping, useMockAppClient, useMockAppSnapshot } from "../lib/mock-app";
+
+const rootRoute = createRootRoute({
+  component: RootLayout,
+});
+
+const indexRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/",
+  component: IndexRoute,
+});
+
+const signInRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/signin",
+  component: SignInRoute,
+});
+
+const accountRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/account",
+  component: AccountRoute,
+});
+
+const organizationsRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/organizations",
+  component: OrganizationsRoute,
+});
+
+const organizationSettingsRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/organizations/$organizationId/settings",
+  component: OrganizationSettingsRoute,
+});
+
+const organizationBillingRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/organizations/$organizationId/billing",
+  component: OrganizationBillingRoute,
+});
+
+const organizationCheckoutRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/organizations/$organizationId/checkout/$planId",
+  component: OrganizationCheckoutRoute,
+});
+
+const organizationRoute = createRoute({
+  getParentRoute: () => rootRoute,
+  path: "/organizations/$organizationId",
+  component: OrganizationLayoutRoute,
+});
+
+const organizationIndexRoute = createRoute({
+  getParentRoute: () => organizationRoute,
+  path: "/",
+  component: OrganizationRoute,
+});
+
+const taskRoute = createRoute({
+  getParentRoute: () => organizationRoute,
+  path: "tasks/$taskId",
+  validateSearch: (search: Record<string, unknown>) => ({
+    sessionId: typeof search.sessionId === "string" && search.sessionId.trim().length > 0 ? search.sessionId : undefined,
+  }),
+  component: TaskRoute,
+});
+
+const repoRoute = createRoute({
+  getParentRoute: () => organizationRoute,
+  path: "repos/$repoId",
+  component: RepoRoute,
+});
+
+const routeTree = rootRoute.addChildren([
+  indexRoute,
+  signInRoute,
+  accountRoute,
+  organizationsRoute,
+  organizationSettingsRoute,
+  organizationBillingRoute,
+  organizationCheckoutRoute,
+  organizationRoute.addChildren([organizationIndexRoute, taskRoute, repoRoute]),
+]);
+
+export const router = createRouter({ routeTree });
+
+declare module "@tanstack/react-router" {
+  interface Register {
+    router: typeof router;
+  }
+}
+
+function OrganizationLayoutRoute() {
+  return <Outlet />;
+}
+
+function AppLoadingScreen({ label }: { label: string }) {
+  return (
+    <div
+      style={{
+        minHeight: "100dvh",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        background:
+          "radial-gradient(circle at top left, rgba(255, 79, 0, 0.16), transparent 28%), radial-gradient(circle at top right, rgba(24, 140, 255, 0.18), transparent 32%), #050505",
+        color: "#ffffff",
+        fontSize: "16px",
+        fontWeight: 700,
+      }}
+    >
+      {label}
+    </div>
+  );
+}
+
+function IndexRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Restoring Foundry session..." />;
+  }
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  const activeOrganization = activeMockOrganization(snapshot);
+  if (activeOrganization) {
+    return <Navigate to="/organizations/$organizationId" params={{ organizationId: activeOrganization.organizationId }} replace />;
+  }
+
+  return <Navigate to="/organizations" replace />;
+}
+
+function SignInRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Restoring Foundry session..." />;
+  }
+  if (snapshot.auth.status === "signed_in") {
+    return <IndexRoute />;
+  }
+
+  return <MockSignInPage />;
+}
+
+function AccountRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Loading account..." />;
+  }
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  return <MockAccountSettingsPage />;
+}
+
+function OrganizationsRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Loading organizations..." />;
+  }
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  return <MockOrganizationSelectorPage />;
+}
+
+function OrganizationSettingsRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Loading organization settings..." />;
+  }
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  const { organizationId } = organizationSettingsRoute.useParams();
+  const organization = getMockOrganizationById(snapshot, organizationId);
+  if (!organization) {
+    return <Navigate to="/organizations" replace />;
+  }
+
+  return <MockOrganizationSettingsPage organization={organization} />;
+}
+
+function OrganizationBillingRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Loading billing..." />;
+  }
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  const { organizationId } = organizationBillingRoute.useParams();
+  const organization = getMockOrganizationById(snapshot, organizationId);
+  if (!organization) {
+    return <Navigate to="/organizations" replace />;
+  }
+
+  return <MockOrganizationBillingPage organization={organization} />;
+}
+
+function OrganizationCheckoutRoute() {
+  const snapshot = useMockAppSnapshot();
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Loading checkout..." />;
+  }
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  const { organizationId, planId } = organizationCheckoutRoute.useParams();
+  const organization = getMockOrganizationById(snapshot, organizationId);
+  if (!organization) {
+    return <Navigate to="/organizations" replace />;
+  }
+
+  return <MockHostedCheckoutPage organization={organization} planId={planId as FoundryBillingPlanId} />;
+}
+
+function OrganizationRoute() {
+  const { organizationId } = organizationRoute.useParams();
+  return (
+    <AppOrganizationGate organizationId={organizationId}>
+      <OrganizationView organizationId={organizationId} selectedTaskId={null} selectedSessionId={null} />
+    </AppOrganizationGate>
+  );
+}
+
+function OrganizationView({
+  organizationId,
+  selectedTaskId,
+  selectedSessionId,
+}: {
+  organizationId: string;
+  selectedTaskId: string | null;
+  selectedSessionId: string | null;
+}) {
+  return <MockLayout organizationId={organizationId} selectedTaskId={selectedTaskId} selectedSessionId={selectedSessionId} />;
+}
+
+function TaskRoute() {
+  const { organizationId, taskId } = taskRoute.useParams();
+  const { sessionId } = taskRoute.useSearch();
+  return (
+    <AppOrganizationGate organizationId={organizationId}>
+      <TaskView organizationId={organizationId} taskId={taskId} sessionId={sessionId ?? null} />
+    </AppOrganizationGate>
+  );
+}
+
+function TaskView({ organizationId, taskId, sessionId }: { organizationId: string; taskId: string; sessionId: string | null }) {
+  return <MockLayout organizationId={organizationId} selectedTaskId={taskId} selectedSessionId={sessionId} />;
+}
+
+function RepoRoute() {
+  const { organizationId, repoId } = repoRoute.useParams();
+  return (
+    <AppOrganizationGate organizationId={organizationId}>
+      <RepoRouteInner organizationId={organizationId} repoId={repoId} />
+    </AppOrganizationGate>
+  );
+}
+
+function AppOrganizationGate({ organizationId, children }: { organizationId: string; children: ReactNode }) {
+  const client = useMockAppClient();
+  const snapshot = useMockAppSnapshot();
+  const organization = snapshot.organizations.find((candidate) => candidate.organizationId === organizationId) ?? null;
+
+  useEffect(() => {
+    if (organization && snapshot.activeOrganizationId !== organization.id) {
+      void client.selectOrganization(organization.id);
+    }
+  }, [client, organization, snapshot.activeOrganizationId]);
+
+  if (!isMockFrontendClient && isAppSnapshotBootstrapping(snapshot)) {
+    return <AppLoadingScreen label="Loading organization..." />;
+  }
+
+  if (snapshot.auth.status === "signed_out") {
+    return <Navigate to="/signin" replace />;
+  }
+
+  if (!organization) {
+    return isMockFrontendClient ? <Navigate to="/organizations" replace /> : <Navigate to="/" replace />;
+  }
+
+  return <>{children}</>;
+}
+
+function RepoRouteInner({ organizationId, repoId }: { organizationId: string; repoId: string }) {
+  const organizationState = useSubscription(subscriptionManager, "organization", { organizationId });
+  const activeTaskId = organizationState.data?.taskSummaries.find((task) => task.repoId === repoId)?.id;
+  if (!activeTaskId) {
+    return <Navigate to="/organizations/$organizationId" params={{ organizationId }} replace />;
+  }
+  return (
+    <Navigate to="/organizations/$organizationId/tasks/$taskId" params={{ organizationId, taskId: activeTaskId }} search={{ sessionId: undefined }} replace />
+  );
+}
+
+function RootLayout() {
+  return (
+    <>
+      <Outlet />
+    </>
+  );
+}
diff --git a/foundry/packages/frontend/src/app/theme.ts b/foundry/packages/frontend/src/app/theme.ts
new file mode 100644
index 0000000..5b62453
--- /dev/null
+++ b/foundry/packages/frontend/src/app/theme.ts
@@ -0,0 +1,82 @@
+import { createContext, useContext } from "react";
+import { createDarkTheme, createLightTheme, type Theme } from "baseui";
+import { useStyletron } from "baseui";
+import { getFoundryTokens, type FoundryTokens } from "../styles/tokens";
+
+const STORAGE_KEY = "sandbox-agent-foundry:color-mode";
+
+export type ColorMode = "dark" | "light";
+
+export const darkTheme: Theme = createDarkTheme({
+  colors: {
+    primary: "#e4e4e7", // zinc-200
+    accent: "#ff4f00", // orange accent (inspector)
+    backgroundPrimary: "#09090b", // darkest — chat center panel
+    backgroundSecondary: "#0f0f11", // slightly lighter — sidebars
+    backgroundTertiary: "#0c0c0e", // center + right panel headers
+    backgroundInversePrimary: "#fafafa",
+    contentPrimary: "#ffffff", // white (inspector --text)
+    contentSecondary: "#a1a1aa", // zinc-400 (inspector --muted)
+    contentTertiary: "#71717a", // zinc-500
+    contentInversePrimary: "#000000",
+    borderOpaque: "rgba(255, 255, 255, 0.10)", // inspector --border
+    borderTransparent: "rgba(255, 255, 255, 0.07)", // inspector --border-2
+  },
+});
+
+export const lightTheme: Theme = createLightTheme({
+  colors: {
+    primary: "#27272a", // zinc-800
+    accent: "#ff4f00", // orange accent (inspector)
+    backgroundPrimary: "#ffffff",
+    backgroundSecondary: "#f4f4f5", // zinc-100
+    backgroundTertiary: "#fafafa", // zinc-50
+    backgroundInversePrimary: "#18181b",
+    contentPrimary: "#09090b", // zinc-950
+    contentSecondary: "#52525b", // zinc-600
+    contentTertiary: "#a1a1aa", // zinc-400
+    contentInversePrimary: "#ffffff",
+    borderOpaque: "rgba(0, 0, 0, 0.10)",
+    borderTransparent: "rgba(0, 0, 0, 0.06)",
+  },
+});
+
+/** Kept for backwards compat — defaults to dark */
+export const appTheme = darkTheme;
+
+export interface ColorModeContext {
+  colorMode: ColorMode;
+  setColorMode: (mode: ColorMode) => void;
+}
+
+export const ColorModeCtx = createContext<ColorModeContext>({
+  colorMode: "dark",
+  setColorMode: () => {},
+});
+
+export function useColorMode() {
+  return useContext(ColorModeCtx);
+}
+
+export function useFoundryTokens(): FoundryTokens {
+  const [, theme] = useStyletron();
+  return getFoundryTokens(theme);
+}
+
+export function getStoredColorMode(): ColorMode {
+  try {
+    const stored = localStorage.getItem(STORAGE_KEY);
+    if (stored === "light" || stored === "dark") return stored;
+  } catch {
+    // ignore
+  }
+  return "dark";
+}
+
+export function storeColorMode(mode: ColorMode) {
+  try {
+    localStorage.setItem(STORAGE_KEY, mode);
+  } catch {
+    // ignore
+  }
+}
diff --git a/foundry/packages/frontend/src/components/dev-panel.tsx b/foundry/packages/frontend/src/components/dev-panel.tsx
new file mode 100644
index 0000000..947331e
--- /dev/null
+++ b/foundry/packages/frontend/src/components/dev-panel.tsx
@@ -0,0 +1,593 @@
+import { memo, useEffect, useMemo, useState } from "react";
+import { useStyletron } from "baseui";
+import { useFoundryTokens } from "../app/theme";
+import { isMockFrontendClient } from "../lib/env";
+import { subscriptionManager } from "../lib/subscription";
+import type {
+  FoundryAppSnapshot,
+  FoundryOrganization,
+  TaskWorkspaceSnapshot,
+  WorkspaceSandboxSummary,
+  WorkspaceSessionSummary,
+  WorkspaceTaskStatus,
+} from "@sandbox-agent/foundry-shared";
+import { useSubscription } from "@sandbox-agent/foundry-client";
+import type { DebugSubscriptionTopic } from "@sandbox-agent/foundry-client";
+import { describeTaskState } from "../features/tasks/status";
+
+interface DevPanelProps {
+  organizationId: string;
+  snapshot: TaskWorkspaceSnapshot;
+  organization?: FoundryOrganization | null;
+  focusedTask?: DevPanelFocusedTask | null;
+}
+
+export interface DevPanelFocusedTask {
+  id: string;
+  repoId: string;
+  title: string | null;
+  status: WorkspaceTaskStatus;
+  branch?: string | null;
+  activeSandboxId?: string | null;
+  activeSessionId?: string | null;
+  sandboxes?: WorkspaceSandboxSummary[];
+  sessions?: WorkspaceSessionSummary[];
+}
+
+interface TopicInfo {
+  label: string;
+  key: string;
+  /** Parsed params portion of the cache key, or empty if none. */
+  params: string;
+  listenerCount: number;
+  hasConnection: boolean;
+  status: "loading" | "connected" | "error";
+  lastRefresh: number | null;
+}
+
+function topicLabel(topic: DebugSubscriptionTopic): string {
+  switch (topic.topicKey) {
+    case "app":
+      return "App";
+    case "organization":
+      return "Organization";
+    case "task":
+      return "Task";
+    case "session":
+      return "Session";
+    case "sandboxProcesses":
+      return "Sandbox";
+  }
+}
+
+/** Extract the params portion of a cache key (everything after the first `:`) */
+function topicParams(topic: DebugSubscriptionTopic): string {
+  const idx = topic.cacheKey.indexOf(":");
+  return idx >= 0 ? topic.cacheKey.slice(idx + 1) : "";
+}
+
+function timeAgo(ts: number | null): string {
+  if (!ts) return "never";
+  const seconds = Math.floor((Date.now() - ts) / 1000);
+  if (seconds < 5) return "now";
+  if (seconds < 60) return `${seconds}s ago`;
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return `${minutes}m ago`;
+  return `${Math.floor(minutes / 60)}h ago`;
+}
+
+function statusColor(status: string, t: ReturnType<typeof useFoundryTokens>): string {
+  if (status.startsWith("init_") || status.startsWith("archive_") || status.startsWith("kill_") || status.startsWith("pending_")) {
+    return t.statusWarning;
+  }
+  switch (status) {
+    case "connected":
+    case "running":
+    case "ready":
+      return t.statusSuccess;
+    case "loading":
+      return t.statusWarning;
+    case "archived":
+      return t.textMuted;
+    case "error":
+    case "failed":
+      return t.statusError;
+    default:
+      return t.textTertiary;
+  }
+}
+
+function syncStatusColor(status: string, t: ReturnType<typeof useFoundryTokens>): string {
+  switch (status) {
+    case "synced":
+      return t.statusSuccess;
+    case "syncing":
+    case "pending":
+      return t.statusWarning;
+    case "error":
+      return t.statusError;
+    default:
+      return t.textMuted;
+  }
+}
+
+function installStatusColor(status: string, t: ReturnType<typeof useFoundryTokens>): string {
+  switch (status) {
+    case "connected":
+      return t.statusSuccess;
+    case "install_required":
+      return t.statusWarning;
+    case "reconnect_required":
+      return t.statusError;
+    default:
+      return t.textMuted;
+  }
+}
+
+/** Format elapsed thinking time as a compact string. */
+function thinkingLabel(sinceMs: number | null, now: number): string | null {
+  if (!sinceMs) return null;
+  const elapsed = Math.floor((now - sinceMs) / 1000);
+  if (elapsed < 1) return "thinking";
+  return `thinking ${elapsed}s`;
+}
+
+export const DevPanel = memo(function DevPanel({ organizationId, snapshot, organization, focusedTask }: DevPanelProps) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [now, setNow] = useState(Date.now());
+
+  // Tick every 2s to keep relative timestamps fresh
+  useEffect(() => {
+    const id = setInterval(() => setNow(Date.now()), 2000);
+    return () => clearInterval(id);
+  }, []);
+
+  const topics = useMemo((): TopicInfo[] => {
+    return subscriptionManager.listDebugTopics().map((topic) => ({
+      label: topicLabel(topic),
+      key: topic.cacheKey,
+      params: topicParams(topic),
+      listenerCount: topic.listenerCount,
+      hasConnection: topic.status === "connected",
+      status: topic.status,
+      lastRefresh: topic.lastRefreshAt,
+    }));
+  }, [now]);
+
+  const appState = useSubscription(subscriptionManager, "app", {});
+  const organizationState = useSubscription(subscriptionManager, "organization", { organizationId });
+  const appSnapshot: FoundryAppSnapshot | null = appState.data ?? null;
+  const liveGithub = organizationState.data?.github ?? organization?.github ?? null;
+
+  const repos = snapshot.repos ?? [];
+  const tasks = snapshot.tasks ?? [];
+  const prCount = tasks.filter((task) => task.pullRequest != null).length;
+  const focusedTaskStatus = focusedTask?.status ?? null;
+  const focusedTaskState = describeTaskState(focusedTaskStatus);
+  const lastWebhookAt = liveGithub?.lastWebhookAt ?? null;
+  const hasRecentWebhook = lastWebhookAt != null && now - lastWebhookAt < 5 * 60_000;
+  const totalOrgs = appSnapshot?.organizations.length ?? 0;
+  const authStatus = appSnapshot?.auth.status ?? "unknown";
+
+  const mono = css({
+    fontFamily: "ui-monospace, SFMono-Regular, 'SF Mono', Consolas, monospace",
+    fontSize: "10px",
+  });
+
+  return (
+    <div
+      className={css({
+        position: "fixed",
+        bottom: "8px",
+        right: "8px",
+        width: "320px",
+        maxHeight: "50vh",
+        zIndex: 99999,
+        backgroundColor: t.surfaceElevated,
+        border: `1px solid ${t.borderMedium}`,
+        borderRadius: "6px",
+        boxShadow: t.shadow,
+        overflow: "hidden",
+        display: "flex",
+        flexDirection: "column",
+      })}
+    >
+      {/* Header */}
+      <div
+        className={css({
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "space-between",
+          padding: "4px 8px",
+          borderBottom: `1px solid ${t.borderSubtle}`,
+          backgroundColor: t.surfaceTertiary,
+          flexShrink: 0,
+        })}
+      >
+        <span
+          className={css({
+            fontSize: "10px",
+            fontWeight: 600,
+            color: t.textSecondary,
+            letterSpacing: "0.5px",
+            textTransform: "uppercase",
+            display: "flex",
+            alignItems: "center",
+            gap: "4px",
+          })}
+        >
+          Dev
+          {isMockFrontendClient && <span className={css({ fontSize: "8px", fontWeight: 600, color: t.statusWarning, letterSpacing: "0.3px" })}>MOCK</span>}
+        </span>
+        <span className={css({ fontSize: "9px", color: t.textMuted })}>Shift+D</span>
+      </div>
+
+      {/* Body */}
+      <div className={css({ overflowY: "auto", padding: "6px" })}>
+        {/* Subscription Topics */}
+        <Section label="Subscription Topics" t={t} css={css}>
+          {topics.map((topic) => (
+            <div
+              key={topic.key}
+              className={css({
+                display: "flex",
+                alignItems: "center",
+                gap: "6px",
+                padding: "2px 0",
+              })}
+            >
+              <span
+                className={css({
+                  width: "5px",
+                  height: "5px",
+                  borderRadius: "50%",
+                  backgroundColor: topic.hasConnection ? t.statusSuccess : t.textMuted,
+                  flexShrink: 0,
+                })}
+              />
+              <span className={css({ fontSize: "10px", color: t.textPrimary, flex: 1, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" })}>
+                {topic.label}
+              </span>
+              <span className={`${mono} ${css({ color: statusColor(topic.status, t) })}`}>{topic.status}</span>
+              {topic.params && (
+                <span
+                  className={`${mono} ${css({ color: t.textMuted, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", maxWidth: "100px" })}`}
+                >
+                  {topic.params}
+                </span>
+              )}
+              <span className={`${mono} ${css({ color: t.textTertiary })}`}>{timeAgo(topic.lastRefresh)}</span>
+            </div>
+          ))}
+          {topics.length === 0 && <span className={css({ fontSize: "10px", color: t.textMuted })}>No active subscriptions</span>}
+        </Section>
+
+        {/* App State */}
+        <Section label="App" t={t} css={css}>
+          <div className={css({ display: "flex", flexDirection: "column", gap: "3px", fontSize: "10px" })}>
+            <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+              <span
+                className={css({
+                  width: "5px",
+                  height: "5px",
+                  borderRadius: "50%",
+                  backgroundColor: authStatus === "signed_in" ? t.statusSuccess : authStatus === "signed_out" ? t.statusError : t.textMuted,
+                  flexShrink: 0,
+                })}
+              />
+              <span className={css({ color: t.textPrimary, flex: 1 })}>Auth</span>
+              <span className={`${mono} ${css({ color: authStatus === "signed_in" ? t.statusSuccess : t.statusError })}`}>{authStatus.replace(/_/g, " ")}</span>
+            </div>
+            <div className={css({ display: "flex", gap: "10px", marginTop: "2px" })}>
+              <Stat label="orgs" value={totalOrgs} t={t} css={css} />
+              <Stat label="users" value={appSnapshot?.users.length ?? 0} t={t} css={css} />
+            </div>
+            <div className={`${mono} ${css({ color: t.textTertiary })}`}>app topic: {appState.status}</div>
+          </div>
+        </Section>
+
+        {/* Snapshot Summary */}
+        <Section label="Organization Snapshot" t={t} css={css}>
+          <div className={css({ display: "flex", gap: "10px", fontSize: "10px" })}>
+            <Stat label="repos" value={repos.length} t={t} css={css} />
+            <Stat label="tasks" value={tasks.length} t={t} css={css} />
+            <Stat label="PRs" value={prCount} t={t} css={css} />
+          </div>
+        </Section>
+
+        <Section label="Focused Task" t={t} css={css}>
+          {focusedTask ? (
+            <div className={css({ display: "flex", flexDirection: "column", gap: "3px", fontSize: "10px" })}>
+              <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+                <span
+                  className={css({
+                    width: "5px",
+                    height: "5px",
+                    borderRadius: "50%",
+                    backgroundColor: statusColor(focusedTaskStatus ?? focusedTask.status, t),
+                    flexShrink: 0,
+                  })}
+                />
+                <span className={css({ color: t.textPrimary, flex: 1, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" })}>
+                  {focusedTask.title || focusedTask.id.slice(0, 12)}
+                </span>
+                <span className={`${mono} ${css({ color: statusColor(focusedTaskStatus ?? focusedTask.status, t) })}`}>
+                  {focusedTaskStatus ?? focusedTask.status}
+                </span>
+              </div>
+              <div className={`${mono} ${css({ color: t.textMuted })}`}>{focusedTaskState.detail}</div>
+              <div className={`${mono} ${css({ color: t.textTertiary })}`}>task: {focusedTask.id}</div>
+              <div className={`${mono} ${css({ color: t.textTertiary })}`}>repo: {focusedTask.repoId}</div>
+              <div className={`${mono} ${css({ color: t.textTertiary })}`}>branch: {focusedTask.branch ?? "-"}</div>
+            </div>
+          ) : (
+            <span className={css({ fontSize: "10px", color: t.textMuted })}>No task focused</span>
+          )}
+        </Section>
+
+        {/* Session — only when a task is focused */}
+        {focusedTask && (
+          <Section label="Session" t={t} css={css}>
+            {(focusedTask.sessions?.length ?? 0) > 0 ? (
+              focusedTask.sessions!.map((session) => {
+                const isActive = session.id === focusedTask.activeSessionId;
+                const thinking = thinkingLabel(session.thinkingSinceMs, now);
+                return (
+                  <div
+                    key={session.id}
+                    className={css({
+                      display: "flex",
+                      flexDirection: "column",
+                      gap: "1px",
+                      padding: "2px 0",
+                      fontSize: "10px",
+                    })}
+                  >
+                    <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+                      <span
+                        className={css({
+                          width: "5px",
+                          height: "5px",
+                          borderRadius: "50%",
+                          backgroundColor: statusColor(session.status, t),
+                          flexShrink: 0,
+                        })}
+                      />
+                      <span
+                        className={css({
+                          color: isActive ? t.textPrimary : t.textTertiary,
+                          flex: 1,
+                          overflow: "hidden",
+                          textOverflow: "ellipsis",
+                          whiteSpace: "nowrap",
+                        })}
+                      >
+                        {session.sessionName || session.id.slice(0, 12)}
+                        {isActive ? " *" : ""}
+                      </span>
+                      <span className={`${mono} ${css({ color: statusColor(session.status, t) })}`}>{session.status}</span>
+                    </div>
+                    <div className={css({ display: "flex", gap: "6px", paddingLeft: "11px" })}>
+                      <span className={`${mono} ${css({ color: t.textMuted })}`}>{session.agent}</span>
+                      <span className={`${mono} ${css({ color: t.textMuted })}`}>{session.model}</span>
+                      {!session.created && <span className={`${mono} ${css({ color: t.statusWarning })}`}>not created</span>}
+                      {session.unread && <span className={`${mono} ${css({ color: t.statusWarning })}`}>unread</span>}
+                      {thinking && <span className={`${mono} ${css({ color: t.statusWarning })}`}>{thinking}</span>}
+                    </div>
+                    {session.errorMessage && (
+                      <div className={`${mono} ${css({ color: t.statusError, paddingLeft: "11px", wordBreak: "break-word" })}`}>{session.errorMessage}</div>
+                    )}
+                    {session.sessionId && <div className={`${mono} ${css({ color: t.textTertiary, paddingLeft: "11px" })}`}>sid: {session.sessionId}</div>}
+                  </div>
+                );
+              })
+            ) : (
+              <span className={css({ fontSize: "10px", color: t.textMuted })}>No sessions</span>
+            )}
+          </Section>
+        )}
+
+        {/* Sandbox — only when a task is focused */}
+        {focusedTask && (
+          <Section label="Sandbox" t={t} css={css}>
+            {(focusedTask.sandboxes?.length ?? 0) > 0 ? (
+              focusedTask.sandboxes!.map((sandbox) => {
+                const isActive = sandbox.sandboxId === focusedTask.activeSandboxId;
+                return (
+                  <div
+                    key={sandbox.sandboxId}
+                    className={css({
+                      display: "flex",
+                      flexDirection: "column",
+                      gap: "1px",
+                      padding: "2px 0",
+                      fontSize: "10px",
+                    })}
+                  >
+                    <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+                      <span
+                        className={css({
+                          width: "5px",
+                          height: "5px",
+                          borderRadius: "50%",
+                          backgroundColor: isActive ? t.statusSuccess : t.textMuted,
+                          flexShrink: 0,
+                        })}
+                      />
+                      <span
+                        className={css({
+                          color: isActive ? t.textPrimary : t.textTertiary,
+                          flex: 1,
+                          overflow: "hidden",
+                          textOverflow: "ellipsis",
+                          whiteSpace: "nowrap",
+                        })}
+                      >
+                        {sandbox.sandboxId.slice(0, 16)}
+                        {isActive ? " *" : ""}
+                      </span>
+                      <span className={`${mono} ${css({ color: t.textMuted })}`}>{sandbox.sandboxProviderId}</span>
+                    </div>
+                    {sandbox.cwd && <div className={`${mono} ${css({ color: t.textTertiary, paddingLeft: "11px" })}`}>cwd: {sandbox.cwd}</div>}
+                  </div>
+                );
+              })
+            ) : (
+              <span className={css({ fontSize: "10px", color: t.textMuted })}>No sandboxes</span>
+            )}
+          </Section>
+        )}
+
+        {/* GitHub */}
+        <Section label="GitHub" t={t} css={css}>
+          {liveGithub ? (
+            <div className={css({ display: "flex", flexDirection: "column", gap: "3px", fontSize: "10px" })}>
+              <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+                <span
+                  className={css({
+                    width: "5px",
+                    height: "5px",
+                    borderRadius: "50%",
+                    backgroundColor: installStatusColor(liveGithub.installationStatus, t),
+                    flexShrink: 0,
+                  })}
+                />
+                <span className={css({ color: t.textPrimary, flex: 1 })}>App Install</span>
+                <span className={`${mono} ${css({ color: installStatusColor(liveGithub.installationStatus, t) })}`}>
+                  {liveGithub.installationStatus.replace(/_/g, " ")}
+                </span>
+              </div>
+              <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+                <span
+                  className={css({
+                    width: "5px",
+                    height: "5px",
+                    borderRadius: "50%",
+                    backgroundColor: syncStatusColor(liveGithub.syncStatus, t),
+                    flexShrink: 0,
+                  })}
+                />
+                <span className={css({ color: t.textPrimary, flex: 1 })}>Sync</span>
+                <span className={`${mono} ${css({ color: syncStatusColor(liveGithub.syncStatus, t) })}`}>{liveGithub.syncStatus}</span>
+                {liveGithub.lastSyncAt != null && <span className={`${mono} ${css({ color: t.textTertiary })}`}>{timeAgo(liveGithub.lastSyncAt)}</span>}
+              </div>
+              <div className={css({ display: "flex", alignItems: "center", gap: "6px" })}>
+                <span
+                  className={css({
+                    width: "5px",
+                    height: "5px",
+                    borderRadius: "50%",
+                    backgroundColor: hasRecentWebhook ? t.statusSuccess : t.textMuted,
+                    flexShrink: 0,
+                  })}
+                />
+                <span className={css({ color: t.textPrimary, flex: 1 })}>Webhook</span>
+                {lastWebhookAt != null ? (
+                  <span className={`${mono} ${css({ color: hasRecentWebhook ? t.textPrimary : t.textMuted })}`}>
+                    {liveGithub.lastWebhookEvent} · {timeAgo(lastWebhookAt)}
+                  </span>
+                ) : (
+                  <span className={`${mono} ${css({ color: t.statusWarning })}`}>never received</span>
+                )}
+              </div>
+              <div className={css({ display: "flex", gap: "10px", marginTop: "2px" })}>
+                <Stat label="imported" value={liveGithub.importedRepoCount} t={t} css={css} />
+                <Stat label="catalog" value={organization?.repoCatalog.length ?? repos.length} t={t} css={css} />
+                <Stat label="target" value={liveGithub.totalRepositoryCount ?? 0} t={t} css={css} />
+              </div>
+              {liveGithub.connectedAccount && <div className={`${mono} ${css({ color: t.textMuted, marginTop: "1px" })}`}>@{liveGithub.connectedAccount}</div>}
+              {liveGithub.lastSyncLabel && <div className={`${mono} ${css({ color: t.textMuted })}`}>last sync: {liveGithub.lastSyncLabel}</div>}
+              {liveGithub.syncPhase && (
+                <div className={`${mono} ${css({ color: t.textTertiary })}`}>
+                  phase: {liveGithub.syncPhase.replace(/^syncing_/, "").replace(/_/g, " ")} ({liveGithub.processedRepositoryCount}/
+                  {liveGithub.totalRepositoryCount})
+                </div>
+              )}
+            </div>
+          ) : (
+            <span className={css({ fontSize: "10px", color: t.textMuted })}>No organization data loaded</span>
+          )}
+        </Section>
+
+        {/* Organization */}
+        <Section label="Organization" t={t} css={css}>
+          <div className={`${mono} ${css({ color: t.textTertiary })}`}>{organizationId}</div>
+          {organization && (
+            <div className={`${mono} ${css({ color: t.textMuted, marginTop: "2px" })}`}>
+              org: {organization.settings.displayName} ({organization.kind})
+            </div>
+          )}
+        </Section>
+      </div>
+    </div>
+  );
+});
+
+function Section({
+  label,
+  t,
+  css: cssFn,
+  children,
+}: {
+  label: string;
+  t: ReturnType<typeof useFoundryTokens>;
+  css: ReturnType<typeof useStyletron>[0];
+  children: React.ReactNode;
+}) {
+  return (
+    <div className={cssFn({ marginBottom: "6px" })}>
+      <div
+        className={cssFn({
+          fontSize: "9px",
+          fontWeight: 600,
+          color: t.textMuted,
+          textTransform: "uppercase",
+          letterSpacing: "0.5px",
+          marginBottom: "2px",
+        })}
+      >
+        {label}
+      </div>
+      {children}
+    </div>
+  );
+}
+
+function Stat({
+  label,
+  value,
+  t,
+  css: cssFn,
+}: {
+  label: string;
+  value: number;
+  t: ReturnType<typeof useFoundryTokens>;
+  css: ReturnType<typeof useStyletron>[0];
+}) {
+  return (
+    <span>
+      <span className={cssFn({ fontWeight: 600, color: t.textPrimary })}>{value}</span>
+      <span className={cssFn({ color: t.textTertiary, marginLeft: "2px" })}>{label}</span>
+    </span>
+  );
+}
+
+export function useDevPanel() {
+  const [visible, setVisible] = useState(true);
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (e.shiftKey && e.key === "D" && !e.metaKey && !e.ctrlKey && !e.altKey) {
+        const tag = (e.target as HTMLElement)?.tagName;
+        if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return;
+        e.preventDefault();
+        setVisible((prev) => !prev);
+      }
+    };
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, []);
+
+  return visible;
+}
diff --git a/foundry/packages/frontend/src/components/mock-layout.tsx b/foundry/packages/frontend/src/components/mock-layout.tsx
new file mode 100644
index 0000000..4089e01
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout.tsx
@@ -0,0 +1,2237 @@
+import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type PointerEvent as ReactPointerEvent } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { useNavigate } from "@tanstack/react-router";
+import { useStyletron } from "baseui";
+import {
+  DEFAULT_WORKSPACE_MODEL_GROUPS,
+  DEFAULT_WORKSPACE_MODEL_ID,
+  createErrorContext,
+  type FoundryOrganization,
+  type TaskWorkspaceSnapshot,
+  type WorkspaceModelGroup,
+  type WorkspaceSessionSummary,
+  type WorkspaceTaskDetail,
+  type WorkspaceTaskSummary,
+} from "@sandbox-agent/foundry-shared";
+import { useSubscription } from "@sandbox-agent/foundry-client";
+
+import { CircleAlert, PanelLeft, PanelRight } from "lucide-react";
+import { useFoundryTokens } from "../app/theme";
+import { logger } from "../logging.js";
+
+import { DiffContent } from "./mock-layout/diff-content";
+import { MessageList } from "./mock-layout/message-list";
+import { PromptComposer } from "./mock-layout/prompt-composer";
+import { RightSidebar } from "./mock-layout/right-sidebar";
+import { Sidebar } from "./mock-layout/sidebar";
+import { SessionStrip } from "./mock-layout/session-strip";
+import { TerminalPane } from "./mock-layout/terminal-pane";
+import { TranscriptHeader } from "./mock-layout/transcript-header";
+import { PROMPT_TEXTAREA_MAX_HEIGHT, PROMPT_TEXTAREA_MIN_HEIGHT, SPanel, ScrollBody, Shell, SpinnerDot } from "./mock-layout/ui";
+import { DevPanel, useDevPanel } from "./dev-panel";
+import {
+  buildDisplayMessages,
+  diffPath,
+  diffTabId,
+  formatThinkingDuration,
+  isDiffTab,
+  buildHistoryEvents,
+  type Task,
+  type HistoryEvent,
+  type LineAttachment,
+  type Message,
+  type ModelId,
+} from "./mock-layout/view-model";
+import { activeMockOrganization, activeMockUser, getMockOrganizationById, useMockAppClient, useMockAppSnapshot } from "../lib/mock-app";
+import { backendClient } from "../lib/backend";
+import { subscriptionManager } from "../lib/subscription";
+import { describeTaskState, isProvisioningTaskStatus } from "../features/tasks/status";
+
+function firstAgentSessionId(task: Task): string | null {
+  return task.sessions[0]?.id ?? null;
+}
+
+function sanitizeOpenDiffs(task: Task, paths: string[] | undefined): string[] {
+  if (!paths) {
+    return [];
+  }
+
+  return paths.filter((path) => task.diffs[path] != null);
+}
+
+function sanitizeLastAgentSessionId(task: Task, sessionId: string | null | undefined): string | null {
+  if (sessionId && task.sessions.some((tab) => tab.id === sessionId)) {
+    return sessionId;
+  }
+
+  return firstAgentSessionId(task);
+}
+
+function sanitizeActiveSessionId(task: Task, sessionId: string | null | undefined, openDiffs: string[], lastAgentSessionId: string | null): string | null {
+  if (sessionId) {
+    if (task.sessions.some((tab) => tab.id === sessionId)) {
+      return sessionId;
+    }
+    if (isDiffTab(sessionId) && openDiffs.includes(diffPath(sessionId))) {
+      return sessionId;
+    }
+  }
+
+  return openDiffs.length > 0 ? diffTabId(openDiffs[openDiffs.length - 1]!) : lastAgentSessionId;
+}
+
+type GithubStatusView = Pick<
+  FoundryOrganization["github"],
+  "connectedAccount" | "installationStatus" | "syncStatus" | "importedRepoCount" | "lastSyncLabel"
+> & {
+  syncPhase?: string | null;
+  processedRepositoryCount?: number;
+  totalRepositoryCount?: number;
+};
+
+function githubInstallationWarningTitle(github: GithubStatusView): string {
+  return github.installationStatus === "install_required" ? "GitHub App not installed" : "GitHub App needs reconnection";
+}
+
+function githubInstallationWarningDetail(github: GithubStatusView): string {
+  const statusDetail = github.lastSyncLabel.trim();
+  const requirementDetail =
+    github.installationStatus === "install_required"
+      ? "Webhooks are required for Foundry to function. Repo sync and PR updates will not work until the GitHub App is installed for this organization."
+      : "Webhook delivery is unavailable. Repo sync and PR updates will not work until the GitHub App is reconnected.";
+  return statusDetail ? `${requirementDetail} ${statusDetail}.` : requirementDetail;
+}
+
+function GithubInstallationWarning({
+  github,
+  css,
+  t,
+}: {
+  github: GithubStatusView;
+  css: ReturnType<typeof useStyletron>[0];
+  t: ReturnType<typeof useFoundryTokens>;
+}) {
+  if (github.installationStatus === "connected") {
+    return null;
+  }
+
+  return (
+    <div
+      className={css({
+        position: "fixed",
+        bottom: "8px",
+        left: "8px",
+        zIndex: 99998,
+        display: "flex",
+        alignItems: "flex-start",
+        gap: "8px",
+        padding: "10px 12px",
+        backgroundColor: t.surfaceElevated,
+        border: `1px solid ${t.statusError}`,
+        borderRadius: "6px",
+        boxShadow: t.shadow,
+        maxWidth: "440px",
+      })}
+    >
+      <CircleAlert size={15} color={t.statusError} />
+      <div className={css({ display: "flex", flexDirection: "column", gap: "3px" })}>
+        <div className={css({ fontSize: "11px", fontWeight: 600, color: t.textPrimary })}>{githubInstallationWarningTitle(github)}</div>
+        <div className={css({ fontSize: "11px", lineHeight: 1.45, color: t.textMuted })}>{githubInstallationWarningDetail(github)}</div>
+      </div>
+    </div>
+  );
+}
+
+function toSessionModel(
+  summary: WorkspaceSessionSummary,
+  sessionDetail?: { draft: Task["sessions"][number]["draft"]; transcript: Task["sessions"][number]["transcript"] },
+): Task["sessions"][number] {
+  return {
+    id: summary.id,
+    sessionId: summary.sessionId,
+    sessionName: summary.sessionName,
+    agent: summary.agent,
+    model: summary.model,
+    status: summary.status,
+    thinkingSinceMs: summary.thinkingSinceMs,
+    unread: summary.unread,
+    created: summary.created,
+    errorMessage: summary.errorMessage ?? null,
+    draft: sessionDetail?.draft ?? {
+      text: "",
+      attachments: [],
+      updatedAtMs: null,
+    },
+    transcript: sessionDetail?.transcript ?? [],
+  };
+}
+
+function toTaskModel(
+  summary: WorkspaceTaskSummary,
+  detail?: WorkspaceTaskDetail,
+  sessionCache?: Map<string, { draft: Task["sessions"][number]["draft"]; transcript: Task["sessions"][number]["transcript"] }>,
+): Task {
+  const sessions = detail?.sessionsSummary ?? summary.sessionsSummary;
+  return {
+    id: summary.id,
+    repoId: summary.repoId,
+    title: detail?.title ?? summary.title,
+    status: detail?.status ?? summary.status,
+    repoName: detail?.repoName ?? summary.repoName,
+    updatedAtMs: detail?.updatedAtMs ?? summary.updatedAtMs,
+    branch: detail?.branch ?? summary.branch,
+    pullRequest: detail?.pullRequest ?? summary.pullRequest,
+    activeSessionId: detail?.activeSessionId ?? summary.activeSessionId ?? null,
+    sessions: sessions.map((session) => toSessionModel(session, sessionCache?.get(session.id))),
+    fileChanges: detail?.fileChanges ?? [],
+    diffs: detail?.diffs ?? {},
+    fileTree: detail?.fileTree ?? [],
+    minutesUsed: detail?.minutesUsed ?? 0,
+    sandboxes: detail?.sandboxes ?? [],
+    activeSandboxId: detail?.activeSandboxId ?? null,
+    primaryUserLogin: detail?.primaryUserLogin ?? summary.primaryUserLogin ?? null,
+    primaryUserAvatarUrl: detail?.primaryUserAvatarUrl ?? summary.primaryUserAvatarUrl ?? null,
+  };
+}
+
+function sessionStateMessage(tab: Task["sessions"][number] | null | undefined): string | null {
+  if (!tab) {
+    return null;
+  }
+  if (tab.status === "pending_provision") {
+    return "Provisioning sandbox...";
+  }
+  if (tab.status === "pending_session_create") {
+    return "Creating session...";
+  }
+  if (tab.status === "error") {
+    return tab.errorMessage ?? "Session failed to start.";
+  }
+  return null;
+}
+
+function groupRepositories(
+  repos: Array<{ id: string; label: string }>,
+  tasks: Task[],
+  openPullRequests?: Array<{
+    repoId: string;
+    repoFullName: string;
+    number: number;
+    title: string;
+    state: string;
+    url: string;
+    headRefName: string;
+    authorLogin: string | null;
+    isDraft: boolean;
+  }>,
+) {
+  return repos
+    .map((repo) => ({
+      id: repo.id,
+      label: repo.label,
+      updatedAtMs: tasks.filter((task) => task.repoId === repo.id).reduce((latest, task) => Math.max(latest, task.updatedAtMs), 0),
+      tasks: tasks.filter((task) => task.repoId === repo.id).sort((left, right) => right.updatedAtMs - left.updatedAtMs),
+      pullRequests: (openPullRequests ?? []).filter((pr) => pr.repoId === repo.id),
+    }))
+    .sort((a, b) => {
+      // Repos with tasks first, then repos with PRs, then alphabetical
+      const aHasActivity = a.tasks.length > 0 || a.pullRequests.length > 0;
+      const bHasActivity = b.tasks.length > 0 || b.pullRequests.length > 0;
+      if (aHasActivity && !bHasActivity) return -1;
+      if (!aHasActivity && bHasActivity) return 1;
+      if (a.updatedAtMs !== b.updatedAtMs) return b.updatedAtMs - a.updatedAtMs;
+      return a.label.localeCompare(b.label);
+    });
+}
+
+interface WorkspaceActions {
+  createTask(input: {
+    repoId: string;
+    task: string;
+    title?: string;
+    branch?: string;
+    onBranch?: string;
+    model?: ModelId;
+  }): Promise<{ taskId: string; sessionId?: string }>;
+  markTaskUnread(input: { repoId: string; taskId: string }): Promise<void>;
+  renameTask(input: { repoId: string; taskId: string; value: string }): Promise<void>;
+  archiveTask(input: { repoId: string; taskId: string }): Promise<void>;
+  publishPr(input: { repoId: string; taskId: string }): Promise<void>;
+  revertFile(input: { repoId: string; taskId: string; path: string }): Promise<void>;
+  updateDraft(input: { repoId: string; taskId: string; sessionId: string; text: string; attachments: LineAttachment[] }): Promise<void>;
+  sendMessage(input: { repoId: string; taskId: string; sessionId: string; text: string; attachments: LineAttachment[] }): Promise<void>;
+  stopAgent(input: { repoId: string; taskId: string; sessionId: string }): Promise<void>;
+  selectSession(input: { repoId: string; taskId: string; sessionId: string }): Promise<void>;
+  setSessionUnread(input: { repoId: string; taskId: string; sessionId: string; unread: boolean }): Promise<void>;
+  renameSession(input: { repoId: string; taskId: string; sessionId: string; title: string }): Promise<void>;
+  closeSession(input: { repoId: string; taskId: string; sessionId: string }): Promise<void>;
+  addSession(input: { repoId: string; taskId: string; model?: string }): Promise<{ sessionId: string }>;
+  changeModel(input: { repoId: string; taskId: string; sessionId: string; model: ModelId }): Promise<void>;
+  changeOwner(input: { repoId: string; taskId: string; targetUserId: string; targetUserName: string; targetUserEmail: string }): Promise<void>;
+  adminReloadGithubOrganization(): Promise<void>;
+  adminReloadGithubRepository(repoId: string): Promise<void>;
+}
+
+const TranscriptPanel = memo(function TranscriptPanel({
+  taskWorkspaceClient,
+  task,
+  hasSandbox,
+  activeSessionId,
+  lastAgentSessionId,
+  openDiffs,
+  onSyncRouteSession,
+  onSetActiveSessionId,
+  onSetLastAgentSessionId,
+  onSetOpenDiffs,
+  sidebarCollapsed,
+  onToggleSidebar,
+  onSidebarPeekStart,
+  onSidebarPeekEnd,
+  rightSidebarCollapsed,
+  onToggleRightSidebar,
+  selectedSessionHydrating = false,
+  modelGroups,
+  onNavigateToUsage,
+}: {
+  taskWorkspaceClient: WorkspaceActions;
+  task: Task;
+  hasSandbox: boolean;
+  activeSessionId: string | null;
+  lastAgentSessionId: string | null;
+  openDiffs: string[];
+  onSyncRouteSession: (taskId: string, sessionId: string | null, replace?: boolean) => void;
+  onSetActiveSessionId: (sessionId: string | null) => void;
+  onSetLastAgentSessionId: (sessionId: string | null) => void;
+  onSetOpenDiffs: (paths: string[]) => void;
+  sidebarCollapsed?: boolean;
+  onToggleSidebar?: () => void;
+  onSidebarPeekStart?: () => void;
+  onSidebarPeekEnd?: () => void;
+  rightSidebarCollapsed?: boolean;
+  onToggleRightSidebar?: () => void;
+  selectedSessionHydrating?: boolean;
+  modelGroups: WorkspaceModelGroup[];
+  onNavigateToUsage?: () => void;
+}) {
+  const t = useFoundryTokens();
+  const appSnapshot = useMockAppSnapshot();
+  const appClient = useMockAppClient();
+  const currentUser = activeMockUser(appSnapshot);
+  const defaultModel = currentUser?.defaultModel ?? DEFAULT_WORKSPACE_MODEL_ID;
+  const [editingField, setEditingField] = useState<"title" | null>(null);
+  const [editValue, setEditValue] = useState("");
+  const [editingSessionId, setEditingSessionId] = useState<string | null>(null);
+  const [editingSessionName, setEditingSessionName] = useState("");
+  const [pendingHistoryTarget, setPendingHistoryTarget] = useState<{ messageId: string; sessionId: string } | null>(null);
+  const [copiedMessageId, setCopiedMessageId] = useState<string | null>(null);
+  const [timerNowMs, setTimerNowMs] = useState(() => Date.now());
+  const [localDraft, setLocalDraft] = useState("");
+  const [localAttachments, setLocalAttachments] = useState<LineAttachment[]>([]);
+  const [pendingMessage, setPendingMessage] = useState<{ text: string; sessionId: string; sentAt: number } | null>(null);
+  const lastEditTimeRef = useRef(0);
+  const throttleTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const pendingDraftRef = useRef<{ text: string; attachments: LineAttachment[] } | null>(null);
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+  const messageRefs = useRef(new Map<string, HTMLDivElement>());
+  const activeDiff = activeSessionId && isDiffTab(activeSessionId) ? diffPath(activeSessionId) : null;
+  const activeAgentSession = activeDiff ? null : (task.sessions.find((candidate) => candidate.id === activeSessionId) ?? task.sessions[0] ?? null);
+  const promptSession = task.sessions.find((candidate) => candidate.id === lastAgentSessionId) ?? task.sessions[0] ?? null;
+  const isTerminal = task.status === "archived";
+  const historyEvents = useMemo(() => buildHistoryEvents(task.sessions), [task.sessions]);
+  const activeMessages = useMemo(() => buildDisplayMessages(activeAgentSession), [activeAgentSession]);
+  const taskState = describeTaskState(task.status);
+  const taskProvisioning = isProvisioningTaskStatus(task.status);
+  const taskProvisioningMessage = taskState.detail;
+  const activeSessionMessage = sessionStateMessage(activeAgentSession);
+  const showPendingSessionState =
+    !activeDiff &&
+    !!activeAgentSession &&
+    (activeAgentSession.status === "pending_provision" || activeAgentSession.status === "pending_session_create" || activeAgentSession.status === "error") &&
+    activeMessages.length === 0;
+  const serverDraft = promptSession?.draft.text ?? "";
+  const serverAttachments = promptSession?.draft.attachments;
+  const serverAttachmentsJson = JSON.stringify(serverAttachments ?? []);
+
+  // Sync server → local only when user hasn't typed recently (3s cooldown)
+  const DRAFT_SYNC_COOLDOWN_MS = 3_000;
+  useEffect(() => {
+    if (Date.now() - lastEditTimeRef.current > DRAFT_SYNC_COOLDOWN_MS) {
+      setLocalDraft(serverDraft);
+      setLocalAttachments(serverAttachments ?? []);
+    }
+  }, [serverDraft, serverAttachmentsJson]);
+
+  // Reset local draft immediately on session/task switch
+  useEffect(() => {
+    lastEditTimeRef.current = 0;
+    setLocalDraft(promptSession?.draft.text ?? "");
+    setLocalAttachments(promptSession?.draft.attachments ?? []);
+  }, [promptSession?.id, task.id]);
+
+  // Clear pending message once the real transcript contains a client message newer than when we sent
+  const pendingMessageClientCount = useRef(0);
+  useEffect(() => {
+    if (!pendingMessage) return;
+
+    const targetSession = task.sessions.find((s) => s.id === pendingMessage.sessionId);
+    if (!targetSession) return;
+
+    const clientEventCount = targetSession.transcript.filter((event) => event.sender === "client").length;
+    if (clientEventCount > pendingMessageClientCount.current) {
+      setPendingMessage(null);
+    }
+  }, [task.sessions, pendingMessage]);
+
+  const draft = localDraft;
+  const attachments = localAttachments;
+
+  useEffect(() => {
+    if (scrollRef.current) {
+      scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+    }
+  }, [activeMessages.length]);
+
+  useEffect(() => {
+    textareaRef.current?.focus();
+  }, [activeSessionId, task.id]);
+
+  useEffect(() => {
+    setEditingSessionId(null);
+    setEditingSessionName("");
+  }, [task.id]);
+
+  useLayoutEffect(() => {
+    const textarea = textareaRef.current;
+    if (!textarea) {
+      return;
+    }
+
+    textarea.style.height = `${PROMPT_TEXTAREA_MIN_HEIGHT}px`;
+    const nextHeight = Math.min(textarea.scrollHeight, PROMPT_TEXTAREA_MAX_HEIGHT);
+    textarea.style.height = `${Math.max(PROMPT_TEXTAREA_MIN_HEIGHT, nextHeight)}px`;
+    textarea.style.overflowY = textarea.scrollHeight > PROMPT_TEXTAREA_MAX_HEIGHT ? "auto" : "hidden";
+  }, [draft, activeSessionId, task.id]);
+
+  useEffect(() => {
+    if (!copiedMessageId) {
+      return;
+    }
+
+    const timer = setTimeout(() => {
+      setCopiedMessageId(null);
+    }, 1_200);
+
+    return () => clearTimeout(timer);
+  }, [copiedMessageId]);
+
+  useEffect(() => {
+    if (!activeAgentSession || activeAgentSession.status !== "running" || activeAgentSession.thinkingSinceMs === null) {
+      return;
+    }
+
+    setTimerNowMs(Date.now());
+    const timer = window.setInterval(() => {
+      setTimerNowMs(Date.now());
+    }, 1_000);
+
+    return () => window.clearInterval(timer);
+  }, [activeAgentSession?.id, activeAgentSession?.status, activeAgentSession?.thinkingSinceMs]);
+
+  useEffect(() => {
+    if (!activeAgentSession?.unread) {
+      return;
+    }
+
+    void taskWorkspaceClient.setSessionUnread({
+      repoId: task.repoId,
+      taskId: task.id,
+      sessionId: activeAgentSession.id,
+      unread: false,
+    });
+  }, [activeAgentSession?.id, activeAgentSession?.unread, task.id]);
+
+  const startEditingField = useCallback((field: "title", value: string) => {
+    setEditingField(field);
+    setEditValue(value);
+  }, []);
+
+  const cancelEditingField = useCallback(() => {
+    setEditingField(null);
+  }, []);
+
+  const commitEditingField = useCallback(
+    (field: "title") => {
+      const value = editValue.trim();
+      if (!value) {
+        setEditingField(null);
+        return;
+      }
+
+      void taskWorkspaceClient.renameTask({ repoId: task.repoId, taskId: task.id, value });
+      setEditingField(null);
+    },
+    [editValue, task.id],
+  );
+
+  const DRAFT_THROTTLE_MS = 500;
+
+  const flushDraft = useCallback(
+    (text: string, nextAttachments: LineAttachment[], sessionId: string) => {
+      void taskWorkspaceClient.updateDraft({
+        repoId: task.repoId,
+        taskId: task.id,
+        sessionId,
+        text,
+        attachments: nextAttachments,
+      });
+    },
+    [task.id],
+  );
+
+  // Clean up throttle timer on unmount
+  useEffect(() => {
+    return () => {
+      if (throttleTimerRef.current) {
+        clearTimeout(throttleTimerRef.current);
+      }
+    };
+  }, []);
+
+  const updateDraft = useCallback(
+    (nextText: string, nextAttachments: LineAttachment[]) => {
+      if (!promptSession) {
+        return;
+      }
+
+      // Update local state immediately for responsive typing
+      lastEditTimeRef.current = Date.now();
+      setLocalDraft(nextText);
+      setLocalAttachments(nextAttachments);
+
+      // Throttle the network call
+      pendingDraftRef.current = { text: nextText, attachments: nextAttachments };
+      if (!throttleTimerRef.current) {
+        throttleTimerRef.current = setTimeout(() => {
+          throttleTimerRef.current = null;
+          if (pendingDraftRef.current) {
+            flushDraft(pendingDraftRef.current.text, pendingDraftRef.current.attachments, promptSession.id);
+            pendingDraftRef.current = null;
+          }
+        }, DRAFT_THROTTLE_MS);
+      }
+    },
+    [promptSession, flushDraft],
+  );
+
+  const sendMessage = useCallback(() => {
+    const text = draft.trim();
+    if (!text || !promptSession) {
+      return;
+    }
+
+    // Clear draft and show optimistic message immediately (don't wait for server round-trip)
+    setLocalDraft("");
+    setLocalAttachments([]);
+    lastEditTimeRef.current = Date.now();
+    // Snapshot current client message count so we can detect when the server adds ours
+    pendingMessageClientCount.current = promptSession.transcript.filter((event) => event.sender === "client").length;
+    setPendingMessage({ text, sessionId: promptSession.id, sentAt: Date.now() });
+
+    onSetActiveSessionId(promptSession.id);
+    onSetLastAgentSessionId(promptSession.id);
+    void taskWorkspaceClient.sendMessage({
+      repoId: task.repoId,
+      taskId: task.id,
+      sessionId: promptSession.id,
+      text,
+      attachments,
+    });
+  }, [attachments, draft, task.id, onSetActiveSessionId, onSetLastAgentSessionId, promptSession]);
+
+  const stopAgent = useCallback(() => {
+    if (!promptSession) {
+      return;
+    }
+
+    void taskWorkspaceClient.stopAgent({
+      repoId: task.repoId,
+      taskId: task.id,
+      sessionId: promptSession.id,
+    });
+  }, [task.id, promptSession]);
+
+  const switchSession = useCallback(
+    (sessionId: string) => {
+      onSetActiveSessionId(sessionId);
+
+      if (!isDiffTab(sessionId)) {
+        onSetLastAgentSessionId(sessionId);
+        void taskWorkspaceClient.selectSession({
+          repoId: task.repoId,
+          taskId: task.id,
+          sessionId,
+        });
+        const session = task.sessions.find((candidate) => candidate.id === sessionId);
+        if (session?.unread) {
+          void taskWorkspaceClient.setSessionUnread({
+            repoId: task.repoId,
+            taskId: task.id,
+            sessionId,
+            unread: false,
+          });
+        }
+        onSyncRouteSession(task.id, sessionId);
+      }
+    },
+    [task.id, task.repoId, task.sessions, onSetActiveSessionId, onSetLastAgentSessionId, onSyncRouteSession],
+  );
+
+  const setSessionUnread = useCallback(
+    (sessionId: string, unread: boolean) => {
+      void taskWorkspaceClient.setSessionUnread({ repoId: task.repoId, taskId: task.id, sessionId, unread });
+    },
+    [task.id, task.repoId],
+  );
+
+  const startRenamingSession = useCallback(
+    (sessionId: string) => {
+      const targetSession = task.sessions.find((candidate) => candidate.id === sessionId);
+      if (!targetSession) {
+        throw new Error(`Unable to rename missing session ${sessionId}`);
+      }
+
+      setEditingSessionId(sessionId);
+      setEditingSessionName(targetSession.sessionName);
+    },
+    [task.sessions],
+  );
+
+  const cancelSessionRename = useCallback(() => {
+    setEditingSessionId(null);
+    setEditingSessionName("");
+  }, []);
+
+  const commitSessionRename = useCallback(() => {
+    if (!editingSessionId) {
+      return;
+    }
+
+    const trimmedName = editingSessionName.trim();
+    if (!trimmedName) {
+      cancelSessionRename();
+      return;
+    }
+
+    void taskWorkspaceClient.renameSession({
+      repoId: task.repoId,
+      taskId: task.id,
+      sessionId: editingSessionId,
+      title: trimmedName,
+    });
+    cancelSessionRename();
+  }, [cancelSessionRename, editingSessionName, editingSessionId, task.id]);
+
+  const closeSession = useCallback(
+    (sessionId: string) => {
+      const remainingSessions = task.sessions.filter((candidate) => candidate.id !== sessionId);
+      const nextSessionId = remainingSessions[0]?.id ?? null;
+
+      if (activeSessionId === sessionId) {
+        onSetActiveSessionId(nextSessionId);
+      }
+      if (lastAgentSessionId === sessionId) {
+        onSetLastAgentSessionId(nextSessionId);
+      }
+
+      onSyncRouteSession(task.id, nextSessionId);
+      void taskWorkspaceClient.closeSession({ repoId: task.repoId, taskId: task.id, sessionId });
+    },
+    [activeSessionId, task.id, task.repoId, task.sessions, lastAgentSessionId, onSetActiveSessionId, onSetLastAgentSessionId, onSyncRouteSession],
+  );
+
+  const closeDiffTab = useCallback(
+    (path: string) => {
+      const nextOpenDiffs = openDiffs.filter((candidate) => candidate !== path);
+      onSetOpenDiffs(nextOpenDiffs);
+      if (activeSessionId === diffTabId(path)) {
+        onSetActiveSessionId(
+          nextOpenDiffs.length > 0 ? diffTabId(nextOpenDiffs[nextOpenDiffs.length - 1]!) : (lastAgentSessionId ?? firstAgentSessionId(task)),
+        );
+      }
+    },
+    [activeSessionId, task, lastAgentSessionId, onSetActiveSessionId, onSetOpenDiffs, openDiffs],
+  );
+
+  const addSession = useCallback(() => {
+    void (async () => {
+      const { sessionId } = await taskWorkspaceClient.addSession({ repoId: task.repoId, taskId: task.id });
+      onSetLastAgentSessionId(sessionId);
+      onSetActiveSessionId(sessionId);
+      onSyncRouteSession(task.id, sessionId);
+    })();
+  }, [task.id, task.repoId, onSetActiveSessionId, onSetLastAgentSessionId, onSyncRouteSession]);
+
+  const changeModel = useCallback(
+    (model: ModelId) => {
+      if (!promptSession) {
+        throw new Error(`Unable to change model for task ${task.id} without an active prompt session`);
+      }
+
+      void taskWorkspaceClient.changeModel({
+        repoId: task.repoId,
+        taskId: task.id,
+        sessionId: promptSession.id,
+        model,
+      });
+    },
+    [task.id, promptSession],
+  );
+
+  const addAttachment = useCallback(
+    (filePath: string, lineNumber: number, lineContent: string) => {
+      if (!promptSession) {
+        return;
+      }
+
+      const nextAttachment = { id: `${filePath}:${lineNumber}`, filePath, lineNumber, lineContent };
+      if (attachments.some((attachment) => attachment.filePath === filePath && attachment.lineNumber === lineNumber)) {
+        return;
+      }
+
+      updateDraft(draft, [...attachments, nextAttachment]);
+    },
+    [attachments, draft, promptSession, updateDraft],
+  );
+
+  const removeAttachment = useCallback(
+    (id: string) => {
+      updateDraft(
+        draft,
+        attachments.filter((attachment) => attachment.id !== id),
+      );
+    },
+    [attachments, draft, updateDraft],
+  );
+
+  const jumpToHistoryEvent = useCallback(
+    (event: HistoryEvent) => {
+      setPendingHistoryTarget({ messageId: event.messageId, sessionId: event.sessionId });
+
+      if (activeSessionId !== event.sessionId) {
+        switchSession(event.sessionId);
+      }
+    },
+    [activeSessionId, switchSession],
+  );
+
+  const copyMessage = useCallback(async (message: Message) => {
+    try {
+      if (!window.navigator.clipboard) {
+        throw new Error("Clipboard API unavailable in mock layout");
+      }
+
+      await window.navigator.clipboard.writeText(message.text);
+      setCopiedMessageId(message.id);
+    } catch (error) {
+      logger.error(
+        {
+          messageId: message.id,
+          ...createErrorContext(error),
+        },
+        "failed_to_copy_transcript_message",
+      );
+    }
+  }, []);
+
+  const isOptimisticThinking = pendingMessage !== null && activeAgentSession?.id === pendingMessage.sessionId;
+  const thinkingTimerLabel =
+    activeAgentSession?.status === "running" && activeAgentSession.thinkingSinceMs !== null
+      ? formatThinkingDuration(timerNowMs - activeAgentSession.thinkingSinceMs)
+      : isOptimisticThinking
+        ? formatThinkingDuration(timerNowMs - pendingMessage.sentAt)
+        : null;
+
+  return (
+    <SPanel>
+      <TranscriptHeader
+        task={task}
+        hasSandbox={hasSandbox}
+        activeSession={activeAgentSession}
+        editingField={editingField}
+        editValue={editValue}
+        onEditValueChange={setEditValue}
+        onStartEditingField={startEditingField}
+        onCommitEditingField={commitEditingField}
+        onCancelEditingField={cancelEditingField}
+        onSetActiveSessionUnread={(unread) => {
+          if (activeAgentSession) {
+            setSessionUnread(activeAgentSession.id, unread);
+          }
+        }}
+        sidebarCollapsed={sidebarCollapsed}
+        onToggleSidebar={onToggleSidebar}
+        onSidebarPeekStart={onSidebarPeekStart}
+        onSidebarPeekEnd={onSidebarPeekEnd}
+        rightSidebarCollapsed={rightSidebarCollapsed}
+        onToggleRightSidebar={onToggleRightSidebar}
+        onNavigateToUsage={onNavigateToUsage}
+      />
+      <div
+        style={{
+          flex: 1,
+          minHeight: 0,
+          display: "flex",
+          flexDirection: "column",
+          backgroundColor: t.surfacePrimary,
+          overflow: "hidden",
+          borderTopLeftRadius: "12px",
+          borderTopRightRadius: rightSidebarCollapsed ? "12px" : 0,
+          borderBottomLeftRadius: "24px",
+          borderBottomRightRadius: rightSidebarCollapsed ? "24px" : 0,
+          border: `1px solid ${t.borderDefault}`,
+        }}
+      >
+        <SessionStrip
+          task={task}
+          activeSessionId={activeSessionId}
+          openDiffs={openDiffs}
+          editingSessionId={editingSessionId}
+          editingSessionName={editingSessionName}
+          onEditingSessionNameChange={setEditingSessionName}
+          onSwitchSession={switchSession}
+          onStartRenamingSession={startRenamingSession}
+          onCommitSessionRename={commitSessionRename}
+          onCancelSessionRename={cancelSessionRename}
+          onSetSessionUnread={setSessionUnread}
+          onCloseSession={closeSession}
+          onCloseDiffTab={closeDiffTab}
+          onAddSession={addSession}
+          sidebarCollapsed={sidebarCollapsed}
+        />
+        {activeDiff ? (
+          <DiffContent
+            filePath={activeDiff}
+            file={task.fileChanges.find((file) => file.path === activeDiff)}
+            diff={task.diffs[activeDiff]}
+            onAddAttachment={addAttachment}
+          />
+        ) : task.sessions.length === 0 ? (
+          <ScrollBody>
+            <div
+              style={{
+                minHeight: "100%",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                padding: "32px",
+              }}
+            >
+              <div
+                style={{
+                  maxWidth: "420px",
+                  textAlign: "center",
+                  display: "flex",
+                  flexDirection: "column",
+                  gap: "12px",
+                  alignItems: "center",
+                }}
+              >
+                {taskProvisioning ? (
+                  <>
+                    <SpinnerDot size={16} />
+                    <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600 }}>{taskState.title}</h2>
+                    <p style={{ margin: 0, opacity: 0.75 }}>{taskProvisioningMessage}</p>
+                  </>
+                ) : (
+                  <>
+                    <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600 }}>Create the first session</h2>
+                    <p style={{ margin: 0, opacity: 0.75 }}>Sessions are where you chat with the agent. Start one now to send the first prompt on this task.</p>
+                    <button
+                      type="button"
+                      onClick={addSession}
+                      style={{
+                        alignSelf: "center",
+                        border: 0,
+                        borderRadius: "999px",
+                        padding: "10px 18px",
+                        background: t.borderMedium,
+                        color: t.textPrimary,
+                        cursor: "pointer",
+                        fontWeight: 600,
+                      }}
+                    >
+                      New session
+                    </button>
+                  </>
+                )}
+              </div>
+            </div>
+          </ScrollBody>
+        ) : selectedSessionHydrating ? (
+          <ScrollBody>
+            <div
+              style={{
+                minHeight: "100%",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                padding: "32px",
+              }}
+            >
+              <div
+                style={{
+                  maxWidth: "420px",
+                  textAlign: "center",
+                  display: "flex",
+                  flexDirection: "column",
+                  gap: "12px",
+                  alignItems: "center",
+                }}
+              >
+                <SpinnerDot size={16} />
+                <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600 }}>Loading session</h2>
+                <p style={{ margin: 0, opacity: 0.75 }}>Fetching the latest transcript for this session.</p>
+              </div>
+            </div>
+          </ScrollBody>
+        ) : showPendingSessionState ? (
+          <ScrollBody>
+            <div
+              style={{
+                minHeight: "100%",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                padding: "32px",
+              }}
+            >
+              <div
+                style={{
+                  maxWidth: "420px",
+                  textAlign: "center",
+                  display: "flex",
+                  flexDirection: "column",
+                  gap: "12px",
+                  alignItems: "center",
+                }}
+              >
+                {activeAgentSession?.status === "error" ? null : <SpinnerDot size={16} />}
+                <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600 }}>
+                  {activeAgentSession?.status === "pending_provision"
+                    ? "Provisioning sandbox"
+                    : activeAgentSession?.status === "pending_session_create"
+                      ? "Creating session"
+                      : "Session unavailable"}
+                </h2>
+                <p style={{ margin: 0, opacity: 0.75 }}>{activeSessionMessage}</p>
+                {activeAgentSession?.status === "error" ? (
+                  <button
+                    type="button"
+                    onClick={addSession}
+                    style={{
+                      alignSelf: "center",
+                      border: 0,
+                      borderRadius: "999px",
+                      padding: "10px 18px",
+                      background: t.borderMedium,
+                      color: t.textPrimary,
+                      cursor: "pointer",
+                      fontWeight: 600,
+                    }}
+                  >
+                    Retry session
+                  </button>
+                ) : null}
+              </div>
+            </div>
+          </ScrollBody>
+        ) : (
+          <ScrollBody>
+            <MessageList
+              session={activeAgentSession}
+              scrollRef={scrollRef}
+              messageRefs={messageRefs}
+              historyEvents={historyEvents}
+              onSelectHistoryEvent={jumpToHistoryEvent}
+              targetMessageId={pendingHistoryTarget && activeAgentSession?.id === pendingHistoryTarget.sessionId ? pendingHistoryTarget.messageId : null}
+              onTargetMessageResolved={() => setPendingHistoryTarget(null)}
+              copiedMessageId={copiedMessageId}
+              onCopyMessage={(message) => {
+                void copyMessage(message);
+              }}
+              thinkingTimerLabel={thinkingTimerLabel}
+              pendingMessage={
+                pendingMessage && activeAgentSession?.id === pendingMessage.sessionId ? { text: pendingMessage.text, sentAt: pendingMessage.sentAt } : null
+              }
+            />
+          </ScrollBody>
+        )}
+        {!isTerminal && promptSession && (promptSession.status === "ready" || promptSession.status === "running" || promptSession.status === "idle") ? (
+          <PromptComposer
+            draft={draft}
+            textareaRef={textareaRef}
+            placeholder={!promptSession.created ? "Describe your task..." : "Send a message..."}
+            attachments={attachments}
+            modelGroups={modelGroups}
+            defaultModel={defaultModel}
+            model={promptSession.model}
+            isRunning={promptSession.status === "running"}
+            onDraftChange={(value) => updateDraft(value, attachments)}
+            onSend={sendMessage}
+            onStop={stopAgent}
+            onRemoveAttachment={removeAttachment}
+            onChangeModel={changeModel}
+            onSetDefaultModel={(model) => {
+              void appClient.setDefaultModel(model);
+            }}
+          />
+        ) : null}
+      </div>
+    </SPanel>
+  );
+});
+
+const LEFT_SIDEBAR_DEFAULT_WIDTH = 340;
+const RIGHT_SIDEBAR_DEFAULT_WIDTH = 380;
+const SIDEBAR_MIN_WIDTH = 220;
+const SIDEBAR_MAX_WIDTH = 600;
+const RESIZE_HANDLE_WIDTH = 1;
+const LEFT_WIDTH_STORAGE_KEY = "foundry:left-sidebar-width";
+const RIGHT_WIDTH_STORAGE_KEY = "foundry:right-sidebar-width";
+
+function readStoredWidth(key: string, fallback: number): number {
+  if (typeof window === "undefined") return fallback;
+  const stored = window.localStorage.getItem(key);
+  const parsed = stored ? Number.parseInt(stored, 10) : Number.NaN;
+  return Number.isFinite(parsed) ? Math.min(Math.max(parsed, SIDEBAR_MIN_WIDTH), SIDEBAR_MAX_WIDTH) : fallback;
+}
+
+const PanelResizeHandle = memo(function PanelResizeHandle({ onResizeStart, onResize }: { onResizeStart: () => void; onResize: (deltaX: number) => void }) {
+  const handlePointerDown = useCallback(
+    (event: ReactPointerEvent<HTMLDivElement>) => {
+      event.preventDefault();
+      const startX = event.clientX;
+      onResizeStart();
+      document.body.style.cursor = "col-resize";
+      document.body.style.userSelect = "none";
+
+      const handlePointerMove = (moveEvent: PointerEvent) => {
+        onResize(moveEvent.clientX - startX);
+      };
+
+      const stopResize = () => {
+        document.body.style.cursor = "";
+        document.body.style.userSelect = "";
+        window.removeEventListener("pointermove", handlePointerMove);
+        window.removeEventListener("pointerup", stopResize);
+      };
+
+      window.addEventListener("pointermove", handlePointerMove);
+      window.addEventListener("pointerup", stopResize, { once: true });
+    },
+    [onResize, onResizeStart],
+  );
+
+  return (
+    <div
+      role="separator"
+      aria-orientation="vertical"
+      onPointerDown={handlePointerDown}
+      style={{
+        width: `${RESIZE_HANDLE_WIDTH}px`,
+        flexShrink: 0,
+        cursor: "col-resize",
+        backgroundColor: "transparent",
+        position: "relative",
+        zIndex: 1,
+      }}
+    >
+      <div
+        style={{
+          position: "absolute",
+          top: 0,
+          bottom: 0,
+          left: "-3px",
+          right: "-3px",
+        }}
+      />
+    </div>
+  );
+});
+
+const RIGHT_RAIL_MIN_SECTION_HEIGHT = 180;
+const RIGHT_RAIL_SPLITTER_HEIGHT = 10;
+const DEFAULT_TERMINAL_HEIGHT = 320;
+const TERMINAL_HEIGHT_STORAGE_KEY = "foundry:terminal-height";
+
+const RightRail = memo(function RightRail({
+  organizationId,
+  task,
+  activeSessionId,
+  onOpenDiff,
+  onArchive,
+  onRevertFile,
+  onPublishPr,
+  onChangeOwner,
+  members,
+  onToggleSidebar,
+}: {
+  organizationId: string;
+  task: Task;
+  activeSessionId: string | null;
+  onOpenDiff: (path: string) => void;
+  onArchive: () => void;
+  onRevertFile: (path: string) => void;
+  onPublishPr: () => void;
+  onChangeOwner: (member: { id: string; name: string; email: string }) => void;
+  members: Array<{ id: string; name: string; email: string }>;
+  onToggleSidebar?: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const railRef = useRef<HTMLDivElement>(null);
+  const [terminalHeight, setTerminalHeight] = useState(() => {
+    if (typeof window === "undefined") {
+      return DEFAULT_TERMINAL_HEIGHT;
+    }
+
+    const stored = window.localStorage.getItem(TERMINAL_HEIGHT_STORAGE_KEY);
+    const parsed = stored ? Number.parseInt(stored, 10) : Number.NaN;
+    return Number.isFinite(parsed) ? parsed : DEFAULT_TERMINAL_HEIGHT;
+  });
+
+  const clampTerminalHeight = useCallback((nextHeight: number) => {
+    const railHeight = railRef.current?.getBoundingClientRect().height ?? 0;
+    const maxHeight = Math.max(RIGHT_RAIL_MIN_SECTION_HEIGHT, railHeight - RIGHT_RAIL_MIN_SECTION_HEIGHT - RIGHT_RAIL_SPLITTER_HEIGHT);
+
+    return Math.min(Math.max(nextHeight, 43), maxHeight);
+  }, []);
+
+  useEffect(() => {
+    if (typeof window === "undefined") {
+      return;
+    }
+
+    window.localStorage.setItem(TERMINAL_HEIGHT_STORAGE_KEY, String(terminalHeight));
+  }, [terminalHeight]);
+
+  useEffect(() => {
+    const handleResize = () => {
+      setTerminalHeight((current) => clampTerminalHeight(current));
+    };
+
+    window.addEventListener("resize", handleResize);
+    handleResize();
+    return () => window.removeEventListener("resize", handleResize);
+  }, [clampTerminalHeight]);
+
+  const startResize = useCallback(
+    (event: ReactPointerEvent) => {
+      event.preventDefault();
+
+      const startY = event.clientY;
+      const startHeight = terminalHeight;
+      document.body.style.cursor = "ns-resize";
+
+      const handlePointerMove = (moveEvent: PointerEvent) => {
+        const deltaY = moveEvent.clientY - startY;
+        setTerminalHeight(clampTerminalHeight(startHeight - deltaY));
+      };
+
+      const stopResize = () => {
+        document.body.style.cursor = "";
+        window.removeEventListener("pointermove", handlePointerMove);
+        window.removeEventListener("pointerup", stopResize);
+      };
+
+      window.addEventListener("pointermove", handlePointerMove);
+      window.addEventListener("pointerup", stopResize, { once: true });
+    },
+    [clampTerminalHeight, terminalHeight],
+  );
+
+  return (
+    <div
+      ref={railRef}
+      className={css({
+        minHeight: 0,
+        flex: 1,
+        display: "flex",
+        flexDirection: "column",
+        backgroundColor: t.surfacePrimary,
+      })}
+    >
+      <div
+        className={css({
+          minHeight: `${RIGHT_RAIL_MIN_SECTION_HEIGHT}px`,
+          flex: 1,
+          minWidth: 0,
+          display: "flex",
+          flexDirection: "column",
+        })}
+      >
+        <RightSidebar
+          task={task}
+          activeSessionId={activeSessionId}
+          onOpenDiff={onOpenDiff}
+          onArchive={onArchive}
+          onRevertFile={onRevertFile}
+          onPublishPr={onPublishPr}
+          onChangeOwner={onChangeOwner}
+          members={members}
+          onToggleSidebar={onToggleSidebar}
+        />
+      </div>
+      <div
+        className={css({
+          height: `${terminalHeight}px`,
+          minHeight: "43px",
+          backgroundColor: t.surfacePrimary,
+          overflow: "hidden",
+          borderBottomRightRadius: "12px",
+          borderRight: `1px solid ${t.borderDefault}`,
+          borderBottom: `1px solid ${t.borderDefault}`,
+          display: "flex",
+          flexDirection: "column",
+        })}
+      >
+        <TerminalPane
+          organizationId={organizationId}
+          taskId={task.id}
+          onStartResize={startResize}
+          isExpanded={(() => {
+            const railHeight = railRef.current?.getBoundingClientRect().height ?? 0;
+            return railHeight > 0 && terminalHeight >= railHeight * 0.7;
+          })()}
+          onExpand={() => {
+            const railHeight = railRef.current?.getBoundingClientRect().height ?? 0;
+            const maxHeight = Math.max(RIGHT_RAIL_MIN_SECTION_HEIGHT, railHeight - RIGHT_RAIL_SPLITTER_HEIGHT - 42);
+            setTerminalHeight(maxHeight);
+          }}
+          onCollapse={() => {
+            setTerminalHeight(43);
+          }}
+        />
+      </div>
+    </div>
+  );
+});
+
+interface MockLayoutProps {
+  organizationId: string;
+  selectedTaskId?: string | null;
+  selectedSessionId?: string | null;
+}
+
+function MockOrganizationOrgBar() {
+  const navigate = useNavigate();
+  const snapshot = useMockAppSnapshot();
+  const organization = activeMockOrganization(snapshot);
+  const t = useFoundryTokens();
+
+  if (!organization) {
+    return null;
+  }
+
+  const buttonStyle = {
+    border: `1px solid ${t.borderMedium}`,
+    borderRadius: "999px",
+    padding: "8px 12px",
+    background: t.interactiveSubtle,
+    color: t.textPrimary,
+    cursor: "pointer",
+    fontSize: "13px",
+    fontWeight: 600,
+  } satisfies React.CSSProperties;
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-between",
+        gap: "16px",
+        padding: "12px 20px",
+        borderBottom: `1px solid ${t.borderSubtle}`,
+        background: t.surfaceSecondary,
+      }}
+    >
+      <div style={{ display: "flex", flexDirection: "column", gap: "2px" }}>
+        <strong style={{ fontSize: "14px", fontWeight: 600 }}>{organization.settings.displayName}</strong>
+        <span style={{ fontSize: "12px", color: t.textMuted }}>{organization.settings.primaryDomain}</span>
+      </div>
+      <div style={{ display: "flex", gap: "8px", flexWrap: "wrap" }}>
+        <button
+          type="button"
+          style={buttonStyle}
+          onClick={() => {
+            void navigate({ to: "/organizations" });
+          }}
+        >
+          Switch org
+        </button>
+        <button
+          type="button"
+          style={buttonStyle}
+          onClick={() => {
+            void navigate({
+              to: "/organizations/$organizationId/settings",
+              params: { organizationId: organization.id },
+            });
+          }}
+        >
+          Settings
+        </button>
+        <button
+          type="button"
+          style={buttonStyle}
+          onClick={() => {
+            void navigate({
+              to: "/organizations/$organizationId/billing",
+              params: { organizationId: organization.id },
+            });
+          }}
+        >
+          Billing
+        </button>
+      </div>
+    </div>
+  );
+}
+
+export function MockLayout({ organizationId, selectedTaskId, selectedSessionId }: MockLayoutProps) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const navigate = useNavigate();
+  const taskWorkspaceClient = useMemo<WorkspaceActions>(
+    () => ({
+      createTask: (input) => backendClient.createWorkspaceTask(organizationId, input),
+      markTaskUnread: (input) => backendClient.markWorkspaceUnread(organizationId, input),
+      renameTask: (input) => backendClient.renameWorkspaceTask(organizationId, input),
+      archiveTask: async (input) => backendClient.runAction(organizationId, input.repoId, input.taskId, "archive"),
+      publishPr: (input) => backendClient.publishWorkspacePr(organizationId, input),
+      revertFile: (input) => backendClient.revertWorkspaceFile(organizationId, input),
+      updateDraft: (input) => backendClient.updateWorkspaceDraft(organizationId, input),
+      sendMessage: (input) => backendClient.sendWorkspaceMessage(organizationId, input),
+      stopAgent: (input) => backendClient.stopWorkspaceSession(organizationId, input),
+      selectSession: (input) => backendClient.selectWorkspaceSession(organizationId, input),
+      setSessionUnread: (input) => backendClient.setWorkspaceSessionUnread(organizationId, input),
+      renameSession: (input) => backendClient.renameWorkspaceSession(organizationId, input),
+      closeSession: (input) => backendClient.closeWorkspaceSession(organizationId, input),
+      addSession: (input) => backendClient.createWorkspaceSession(organizationId, input),
+      changeModel: (input) => backendClient.changeWorkspaceModel(organizationId, input),
+      changeOwner: (input) => backendClient.changeWorkspaceTaskOwner(organizationId, input),
+      adminReloadGithubOrganization: () => backendClient.adminReloadGithubOrganization(organizationId),
+      adminReloadGithubRepository: (repoId) => backendClient.adminReloadGithubRepository(organizationId, repoId),
+    }),
+    [organizationId],
+  );
+  const organizationState = useSubscription(subscriptionManager, "organization", { organizationId });
+  const organizationReposData = organizationState.data?.repos;
+  const taskSummariesData = organizationState.data?.taskSummaries;
+  const openPullRequestsData = organizationState.data?.openPullRequests;
+  const organizationRepos = organizationReposData ?? [];
+  const taskSummaries = taskSummariesData ?? [];
+  const selectedTaskSummary = useMemo(
+    () => taskSummaries.find((task) => task.id === selectedTaskId) ?? taskSummaries[0] ?? null,
+    [selectedTaskId, taskSummariesData],
+  );
+  const taskState = useSubscription(
+    subscriptionManager,
+    "task",
+    selectedTaskSummary
+      ? {
+          organizationId,
+          repoId: selectedTaskSummary.repoId,
+          taskId: selectedTaskSummary.id,
+        }
+      : null,
+  );
+  const sessionState = useSubscription(
+    subscriptionManager,
+    "session",
+    selectedTaskSummary && selectedSessionId
+      ? {
+          organizationId,
+          repoId: selectedTaskSummary.repoId,
+          taskId: selectedTaskSummary.id,
+          sessionId: selectedSessionId,
+        }
+      : null,
+  );
+  const activeSandbox = useMemo(() => {
+    if (!taskState.data?.activeSandboxId) return null;
+    return taskState.data.sandboxes?.find((s) => s.sandboxId === taskState.data!.activeSandboxId) ?? null;
+  }, [taskState.data?.activeSandboxId, taskState.data?.sandboxes]);
+  const sandboxState = useSubscription(
+    subscriptionManager,
+    "sandboxProcesses",
+    activeSandbox
+      ? {
+          organizationId,
+          sandboxProviderId: activeSandbox.sandboxProviderId,
+          sandboxId: activeSandbox.sandboxId,
+        }
+      : null,
+  );
+  const hasSandbox = Boolean(activeSandbox) && sandboxState.status !== "error";
+  const modelGroupsQuery = useQuery({
+    queryKey: ["mock-layout", "workspace-model-groups", organizationId, activeSandbox?.sandboxProviderId ?? "", activeSandbox?.sandboxId ?? ""],
+    enabled: Boolean(activeSandbox?.sandboxId),
+    staleTime: 30_000,
+    refetchOnWindowFocus: false,
+    queryFn: async () => {
+      if (!activeSandbox) {
+        throw new Error("Cannot load workspace model groups without an active sandbox.");
+      }
+
+      return await backendClient.getSandboxWorkspaceModelGroups(organizationId, activeSandbox.sandboxProviderId, activeSandbox.sandboxId);
+    },
+  });
+  const modelGroups = modelGroupsQuery.data && modelGroupsQuery.data.length > 0 ? modelGroupsQuery.data : DEFAULT_WORKSPACE_MODEL_GROUPS;
+  const tasks = useMemo(() => {
+    const sessionCache = new Map<string, { draft: Task["sessions"][number]["draft"]; transcript: Task["sessions"][number]["transcript"] }>();
+    if (selectedTaskSummary && taskState.data) {
+      for (const session of taskState.data.sessionsSummary) {
+        const cached =
+          (selectedSessionId && session.id === selectedSessionId ? sessionState.data : undefined) ??
+          subscriptionManager.getSnapshot("session", {
+            organizationId,
+            repoId: selectedTaskSummary.repoId,
+            taskId: selectedTaskSummary.id,
+            sessionId: session.id,
+          });
+        if (cached) {
+          sessionCache.set(session.id, {
+            draft: cached.draft,
+            transcript: cached.transcript,
+          });
+        }
+      }
+    }
+
+    const hydratedTasks = taskSummaries.map((summary) =>
+      summary.id === selectedTaskSummary?.id ? toTaskModel(summary, taskState.data, sessionCache) : toTaskModel(summary),
+    );
+    return hydratedTasks.sort((left, right) => right.updatedAtMs - left.updatedAtMs);
+  }, [selectedTaskSummary, selectedSessionId, sessionState.data, taskState.data, taskSummariesData, organizationId]);
+  const openPullRequests = openPullRequestsData ?? [];
+  const rawRepositories = useMemo(() => groupRepositories(organizationRepos, tasks, openPullRequests), [tasks, organizationReposData, openPullRequestsData]);
+  const appSnapshot = useMockAppSnapshot();
+  const currentUser = activeMockUser(appSnapshot);
+  const activeOrg = activeMockOrganization(appSnapshot);
+  const liveGithub = organizationState.data?.github ?? activeOrg?.github ?? null;
+  const navigateToUsage = useCallback(() => {
+    if (activeOrg) {
+      void navigate({ to: "/organizations/$organizationId/billing" as never, params: { organizationId: activeOrg.id } as never });
+    }
+  }, [activeOrg, navigate]);
+  const [repositoryOrder, setRepositoryOrder] = useState<string[] | null>(null);
+  const repositories = useMemo(() => {
+    if (!repositoryOrder) return rawRepositories;
+    const byId = new Map(rawRepositories.map((p) => [p.id, p]));
+    const ordered = repositoryOrder.map((id) => byId.get(id)).filter(Boolean) as typeof rawRepositories;
+    for (const p of rawRepositories) {
+      if (!repositoryOrder.includes(p.id)) ordered.push(p);
+    }
+    return ordered;
+  }, [rawRepositories, repositoryOrder]);
+  const [activeSessionIdByTask, setActiveSessionIdByTask] = useState<Record<string, string | null>>({});
+  const [lastAgentSessionIdByTask, setLastAgentSessionIdByTask] = useState<Record<string, string | null>>({});
+  const [openDiffsByTask, setOpenDiffsByTask] = useState<Record<string, string[]>>({});
+  const [selectedNewTaskRepoId, setSelectedNewTaskRepoId] = useState("");
+  const [leftWidth, setLeftWidth] = useState(() => readStoredWidth(LEFT_WIDTH_STORAGE_KEY, LEFT_SIDEBAR_DEFAULT_WIDTH));
+  const [rightWidth, setRightWidth] = useState(() => readStoredWidth(RIGHT_WIDTH_STORAGE_KEY, RIGHT_SIDEBAR_DEFAULT_WIDTH));
+  const leftWidthRef = useRef(leftWidth);
+  const rightWidthRef = useRef(rightWidth);
+  const autoCreatingSessionForTaskRef = useRef<Set<string>>(new Set());
+  const [leftSidebarOpen, setLeftSidebarOpen] = useState(true);
+  const [rightSidebarOpen, setRightSidebarOpen] = useState(true);
+  const [leftSidebarPeeking, setLeftSidebarPeeking] = useState(false);
+  const showDevPanel = useDevPanel();
+  const peekTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  const startPeek = useCallback(() => {
+    if (peekTimeoutRef.current) clearTimeout(peekTimeoutRef.current);
+    setLeftSidebarPeeking(true);
+  }, []);
+
+  const endPeek = useCallback(() => {
+    peekTimeoutRef.current = setTimeout(() => setLeftSidebarPeeking(false), 200);
+  }, []);
+
+  const reorderRepositories = useCallback(
+    (fromIndex: number, toIndex: number) => {
+      const ids = repositories.map((p) => p.id);
+      const [moved] = ids.splice(fromIndex, 1);
+      ids.splice(toIndex, 0, moved!);
+      setRepositoryOrder(ids);
+    },
+    [repositories],
+  );
+
+  const [taskOrderByRepository, setTaskOrderByRepository] = useState<Record<string, string[]>>({});
+  const reorderTasks = useCallback(
+    (repositoryId: string, fromIndex: number, toIndex: number) => {
+      const repository = repositories.find((p) => p.id === repositoryId);
+      if (!repository) return;
+      const currentOrder = taskOrderByRepository[repositoryId] ?? repository.tasks.map((t) => t.id);
+      const ids = [...currentOrder];
+      const [moved] = ids.splice(fromIndex, 1);
+      ids.splice(toIndex, 0, moved!);
+      setTaskOrderByRepository((prev) => ({ ...prev, [repositoryId]: ids }));
+    },
+    [repositories, taskOrderByRepository],
+  );
+
+  useEffect(() => {
+    leftWidthRef.current = leftWidth;
+    window.localStorage.setItem(LEFT_WIDTH_STORAGE_KEY, String(leftWidth));
+  }, [leftWidth]);
+
+  useEffect(() => {
+    rightWidthRef.current = rightWidth;
+    window.localStorage.setItem(RIGHT_WIDTH_STORAGE_KEY, String(rightWidth));
+  }, [rightWidth]);
+
+  const startLeftRef = useRef(leftWidth);
+  const startRightRef = useRef(rightWidth);
+
+  const onLeftResize = useCallback((deltaX: number) => {
+    setLeftWidth(Math.min(Math.max(startLeftRef.current + deltaX, SIDEBAR_MIN_WIDTH), SIDEBAR_MAX_WIDTH));
+  }, []);
+
+  const onLeftResizeStart = useCallback(() => {
+    startLeftRef.current = leftWidthRef.current;
+  }, []);
+
+  const onRightResize = useCallback((deltaX: number) => {
+    setRightWidth(Math.min(Math.max(startRightRef.current - deltaX, SIDEBAR_MIN_WIDTH), SIDEBAR_MAX_WIDTH));
+  }, []);
+
+  const onRightResizeStart = useCallback(() => {
+    startRightRef.current = rightWidthRef.current;
+  }, []);
+
+  const activeTask = useMemo(() => {
+    if (selectedTaskId) {
+      return tasks.find((task) => task.id === selectedTaskId) ?? tasks[0] ?? null;
+    }
+    return tasks[0] ?? null;
+  }, [selectedTaskId, tasks]);
+
+  useEffect(() => {
+    if (activeTask) {
+      return;
+    }
+
+    const fallbackTaskId = tasks[0]?.id;
+    if (!fallbackTaskId) {
+      return;
+    }
+
+    const fallbackTask = tasks.find((task) => task.id === fallbackTaskId) ?? null;
+
+    void navigate({
+      to: "/organizations/$organizationId/tasks/$taskId",
+      params: {
+        organizationId,
+        taskId: fallbackTaskId,
+      },
+      search: { sessionId: fallbackTask?.sessions[0]?.id ?? undefined },
+      replace: true,
+    });
+  }, [activeTask, navigate, tasks, organizationId]);
+
+  const openDiffs = activeTask ? sanitizeOpenDiffs(activeTask, openDiffsByTask[activeTask.id]) : [];
+  const lastAgentSessionId = activeTask ? sanitizeLastAgentSessionId(activeTask, lastAgentSessionIdByTask[activeTask.id]) : null;
+  const activeSessionId = activeTask
+    ? sanitizeActiveSessionId(activeTask, activeSessionIdByTask[activeTask.id] ?? activeTask.activeSessionId ?? null, openDiffs, lastAgentSessionId)
+    : null;
+  const selectedSessionHydrating = Boolean(
+    selectedSessionId && activeSessionId === selectedSessionId && sessionState.status === "loading" && !sessionState.data,
+  );
+
+  const syncRouteSession = useCallback(
+    (taskId: string, sessionId: string | null, replace = false) => {
+      void navigate({
+        to: "/organizations/$organizationId/tasks/$taskId",
+        params: {
+          organizationId,
+          taskId,
+        },
+        search: { sessionId: sessionId ?? undefined },
+        ...(replace ? { replace: true } : {}),
+      });
+    },
+    [navigate, organizationId],
+  );
+
+  useEffect(() => {
+    if (!activeTask) {
+      return;
+    }
+
+    const resolvedRouteSessionId = sanitizeLastAgentSessionId(activeTask, selectedSessionId);
+    if (!resolvedRouteSessionId) {
+      return;
+    }
+
+    if (selectedSessionId !== resolvedRouteSessionId) {
+      syncRouteSession(activeTask.id, resolvedRouteSessionId, true);
+      return;
+    }
+
+    if (lastAgentSessionIdByTask[activeTask.id] === resolvedRouteSessionId) {
+      return;
+    }
+
+    setLastAgentSessionIdByTask((current) => ({
+      ...current,
+      [activeTask.id]: resolvedRouteSessionId,
+    }));
+    setActiveSessionIdByTask((current) => {
+      const currentActive = current[activeTask.id];
+      if (currentActive && isDiffTab(currentActive)) {
+        return current;
+      }
+
+      return {
+        ...current,
+        [activeTask.id]: resolvedRouteSessionId,
+      };
+    });
+  }, [activeTask, lastAgentSessionIdByTask, selectedSessionId, syncRouteSession]);
+
+  useEffect(() => {
+    const organizationRepos = organizationReposData ?? [];
+    if (selectedNewTaskRepoId && organizationRepos.some((repo) => repo.id === selectedNewTaskRepoId)) {
+      return;
+    }
+
+    const fallbackRepoId =
+      activeTask?.repoId && organizationRepos.some((repo) => repo.id === activeTask.repoId) ? activeTask.repoId : (organizationRepos[0]?.id ?? "");
+    if (fallbackRepoId !== selectedNewTaskRepoId) {
+      setSelectedNewTaskRepoId(fallbackRepoId);
+    }
+  }, [activeTask?.repoId, selectedNewTaskRepoId, organizationReposData]);
+
+  useEffect(() => {
+    if (!activeTask) {
+      return;
+    }
+    if (activeTask.sessions.length > 0) {
+      autoCreatingSessionForTaskRef.current.delete(activeTask.id);
+      return;
+    }
+    if (selectedSessionId) {
+      return;
+    }
+    if (autoCreatingSessionForTaskRef.current.has(activeTask.id)) {
+      return;
+    }
+
+    autoCreatingSessionForTaskRef.current.add(activeTask.id);
+    void (async () => {
+      try {
+        const { sessionId } = await taskWorkspaceClient.addSession({ repoId: activeTask.repoId, taskId: activeTask.id });
+        syncRouteSession(activeTask.id, sessionId, true);
+      } catch (error) {
+        logger.error(
+          {
+            taskId: activeTask.id,
+            ...createErrorContext(error),
+          },
+          "failed_to_auto_create_workspace_session",
+        );
+        // Keep the guard in the set on error to prevent retry storms.
+        // The guard is cleared when sessions appear (line above) or the task changes.
+      }
+    })();
+  }, [activeTask, selectedSessionId, syncRouteSession, taskWorkspaceClient]);
+
+  const createTask = useCallback(
+    (overrideRepoId?: string, options?: { title?: string; task?: string; branch?: string; onBranch?: string }) => {
+      void (async () => {
+        const repoId = overrideRepoId || selectedNewTaskRepoId;
+        if (!repoId) {
+          throw new Error("Cannot create a task without an available repo");
+        }
+
+        const { taskId, sessionId } = await taskWorkspaceClient.createTask({
+          repoId,
+          task: options?.task ?? "New task",
+          model: currentUser?.defaultModel ?? DEFAULT_WORKSPACE_MODEL_ID,
+          title: options?.title ?? "New task",
+          ...(options?.branch ? { branch: options.branch } : {}),
+          ...(options?.onBranch ? { onBranch: options.onBranch } : {}),
+        });
+        await navigate({
+          to: "/organizations/$organizationId/tasks/$taskId",
+          params: {
+            organizationId,
+            taskId,
+          },
+          search: { sessionId: sessionId ?? undefined },
+        });
+      })();
+    },
+    [currentUser?.defaultModel, navigate, selectedNewTaskRepoId, taskWorkspaceClient, organizationId],
+  );
+
+  const openDiffTab = useCallback(
+    (path: string) => {
+      if (!activeTask) {
+        throw new Error("Cannot open a diff tab without an active task");
+      }
+      setOpenDiffsByTask((current) => {
+        const existing = sanitizeOpenDiffs(activeTask, current[activeTask.id]);
+        if (existing.includes(path)) {
+          return current;
+        }
+
+        return {
+          ...current,
+          [activeTask.id]: [...existing, path],
+        };
+      });
+      setActiveSessionIdByTask((current) => ({
+        ...current,
+        [activeTask.id]: diffTabId(path),
+      }));
+    },
+    [activeTask],
+  );
+
+  const selectTask = useCallback(
+    (id: string) => {
+      const task = tasks.find((candidate) => candidate.id === id) ?? null;
+      void navigate({
+        to: "/organizations/$organizationId/tasks/$taskId",
+        params: {
+          organizationId,
+          taskId: id,
+        },
+        search: { sessionId: task?.sessions[0]?.id ?? undefined },
+      });
+    },
+    [navigate, tasks, organizationId],
+  );
+
+  const markTaskUnread = useCallback(
+    (id: string) => {
+      const task = tasks.find((candidate) => candidate.id === id);
+      if (!task) {
+        return;
+      }
+      void taskWorkspaceClient.markTaskUnread({ repoId: task.repoId, taskId: id });
+    },
+    [tasks],
+  );
+
+  const renameTask = useCallback(
+    (id: string) => {
+      const currentTask = tasks.find((task) => task.id === id);
+      if (!currentTask) {
+        throw new Error(`Unable to rename missing task ${id}`);
+      }
+
+      const nextTitle = window.prompt("Rename task", currentTask.title);
+      if (nextTitle === null) {
+        return;
+      }
+
+      const trimmedTitle = nextTitle.trim();
+      if (!trimmedTitle) {
+        return;
+      }
+
+      void taskWorkspaceClient.renameTask({ repoId: currentTask.repoId, taskId: id, value: trimmedTitle });
+    },
+    [tasks],
+  );
+
+  const changeOwner = useCallback(
+    (member: { id: string; name: string; email: string }) => {
+      if (!activeTask) {
+        throw new Error("Cannot change owner without an active task");
+      }
+      void taskWorkspaceClient.changeOwner({
+        repoId: activeTask.repoId,
+        taskId: activeTask.id,
+        targetUserId: member.id,
+        targetUserName: member.name,
+        targetUserEmail: member.email,
+      });
+    },
+    [activeTask],
+  );
+
+  const archiveTask = useCallback(() => {
+    if (!activeTask) {
+      throw new Error("Cannot archive without an active task");
+    }
+    void taskWorkspaceClient.archiveTask({ repoId: activeTask.repoId, taskId: activeTask.id });
+  }, [activeTask]);
+
+  const publishPr = useCallback(() => {
+    if (!activeTask) {
+      throw new Error("Cannot publish PR without an active task");
+    }
+    void taskWorkspaceClient.publishPr({ repoId: activeTask.repoId, taskId: activeTask.id });
+  }, [activeTask]);
+
+  const revertFile = useCallback(
+    (path: string) => {
+      if (!activeTask) {
+        throw new Error("Cannot revert a file without an active task");
+      }
+      setOpenDiffsByTask((current) => ({
+        ...current,
+        [activeTask.id]: sanitizeOpenDiffs(activeTask, current[activeTask.id]).filter((candidate) => candidate !== path),
+      }));
+      setActiveSessionIdByTask((current) => ({
+        ...current,
+        [activeTask.id]:
+          current[activeTask.id] === diffTabId(path)
+            ? sanitizeLastAgentSessionId(activeTask, lastAgentSessionIdByTask[activeTask.id])
+            : (current[activeTask.id] ?? null),
+      }));
+
+      void taskWorkspaceClient.revertFile({
+        repoId: activeTask.repoId,
+        taskId: activeTask.id,
+        path,
+      });
+    },
+    [activeTask, lastAgentSessionIdByTask],
+  );
+
+  const isDesktop = !!import.meta.env.VITE_DESKTOP;
+  const onDragMouseDown = useCallback((event: ReactPointerEvent) => {
+    if (event.button !== 0) return;
+    // Tauri v2 IPC: invoke start_dragging on the webview window
+    const ipc = (window as unknown as Record<string, unknown>).__TAURI_INTERNALS__ as
+      | {
+          invoke: (cmd: string, args?: unknown) => Promise<unknown>;
+        }
+      | undefined;
+    if (ipc?.invoke) {
+      ipc.invoke("plugin:window|start_dragging").catch(() => {});
+    }
+  }, []);
+  const dragRegion = isDesktop ? (
+    <div
+      style={{
+        position: "fixed",
+        top: 0,
+        left: 0,
+        right: 0,
+        height: "38px",
+        zIndex: 9998,
+        pointerEvents: "none",
+      }}
+    >
+      {/* Background drag target – sits behind interactive elements */}
+      <div
+        onPointerDown={onDragMouseDown}
+        style={
+          {
+            position: "absolute",
+            inset: 0,
+            WebkitAppRegion: "drag",
+            pointerEvents: "auto",
+            zIndex: 0,
+          } as React.CSSProperties
+        }
+      />
+    </div>
+  ) : null;
+
+  const collapsedToggleClass = css({
+    width: "26px",
+    height: "26px",
+    borderRadius: "6px",
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "center",
+    cursor: "pointer",
+    color: t.textTertiary,
+    position: "relative",
+    zIndex: 9999,
+    flexShrink: 0,
+    ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+  });
+
+  const sidebarTransition = "width 200ms ease";
+  const contentFrameStyle: React.CSSProperties = {
+    flex: 1,
+    minWidth: 0,
+    display: "flex",
+    flexDirection: "row",
+    overflow: "hidden",
+    marginBottom: "8px",
+    marginRight: "8px",
+    marginLeft: leftSidebarOpen ? 0 : "8px",
+  };
+
+  if (!activeTask) {
+    return (
+      <>
+        {dragRegion}
+        <Shell>
+          <div
+            style={{
+              width: leftSidebarOpen ? `${leftWidth}px` : 0,
+              flexShrink: 0,
+              minWidth: 0,
+              display: "flex",
+              flexDirection: "column",
+              overflow: "hidden",
+              transition: sidebarTransition,
+            }}
+          >
+            <div style={{ minWidth: `${leftWidth}px`, flex: 1, minHeight: 0, display: "flex", flexDirection: "column" }}>
+              <Sidebar
+                repositories={repositories}
+                newTaskRepos={organizationRepos}
+                selectedNewTaskRepoId={selectedNewTaskRepoId}
+                activeId={selectedTaskId ?? ""}
+                onSelect={selectTask}
+                onCreate={createTask}
+                onSelectNewTaskRepo={setSelectedNewTaskRepoId}
+                onMarkUnread={markTaskUnread}
+                onRenameTask={renameTask}
+                onReorderRepositories={reorderRepositories}
+                taskOrderByRepository={taskOrderByRepository}
+                onReorderTasks={reorderTasks}
+                onReloadOrganization={() => void taskWorkspaceClient.adminReloadGithubOrganization()}
+                onReloadRepository={(repoId) => void taskWorkspaceClient.adminReloadGithubRepository(repoId)}
+                onToggleSidebar={() => setLeftSidebarOpen(false)}
+              />
+            </div>
+          </div>
+          <div style={contentFrameStyle}>
+            {leftSidebarOpen ? <PanelResizeHandle onResizeStart={onLeftResizeStart} onResize={onLeftResize} /> : null}
+            <SPanel $style={{ backgroundColor: t.surfacePrimary, flex: 1, minWidth: 0 }}>
+              {!leftSidebarOpen || !rightSidebarOpen ? (
+                <div style={{ display: "flex", alignItems: "center", padding: "8px 8px 0 8px" }}>
+                  {leftSidebarOpen ? null : (
+                    <div className={collapsedToggleClass} onClick={() => setLeftSidebarOpen(true)}>
+                      <PanelLeft size={14} />
+                    </div>
+                  )}
+                  <div style={{ flex: 1 }} />
+                  {rightSidebarOpen ? null : (
+                    <div className={collapsedToggleClass} onClick={() => setRightSidebarOpen(true)}>
+                      <PanelRight size={14} />
+                    </div>
+                  )}
+                </div>
+              ) : null}
+              <ScrollBody>
+                <div
+                  style={{
+                    minHeight: "100%",
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    padding: "32px",
+                  }}
+                >
+                  <div
+                    style={{
+                      maxWidth: "420px",
+                      textAlign: "center",
+                      display: "flex",
+                      flexDirection: "column",
+                      gap: "12px",
+                    }}
+                  >
+                    {liveGithub?.syncStatus === "syncing" || liveGithub?.syncStatus === "pending" ? (
+                      <>
+                        <div
+                          className={css({
+                            width: "24px",
+                            height: "24px",
+                            border: `2px solid ${t.borderSubtle}`,
+                            borderTopColor: t.textSecondary,
+                            borderRadius: "50%",
+                            animationName: {
+                              from: { transform: "rotate(0deg)" },
+                              to: { transform: "rotate(360deg)" },
+                            } as unknown as string,
+                            animationDuration: "0.8s",
+                            animationIterationCount: "infinite",
+                            animationTimingFunction: "linear",
+                            alignSelf: "center",
+                          })}
+                        />
+                        <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600 }}>Syncing with GitHub</h2>
+                        <p style={{ margin: 0, opacity: 0.75 }}>
+                          {liveGithub.lastSyncLabel || `Importing repos from @${liveGithub.connectedAccount || "GitHub"}...`}
+                          {(liveGithub.totalRepositoryCount ?? 0) > 0 && (
+                            <>
+                              {" "}
+                              {liveGithub.syncPhase === "syncing_repositories"
+                                ? `${liveGithub.importedRepoCount} of ${liveGithub.totalRepositoryCount} repos imported so far.`
+                                : `${liveGithub.processedRepositoryCount} of ${liveGithub.totalRepositoryCount} repos processed in ${liveGithub.syncPhase?.replace(/^syncing_/, "").replace(/_/g, " ") ?? "sync"}.`}
+                            </>
+                          )}
+                        </p>
+                      </>
+                    ) : liveGithub?.syncStatus === "error" ? (
+                      <>
+                        <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600, color: t.statusError }}>GitHub sync failed</h2>
+                        <p style={{ margin: 0, opacity: 0.75 }}>There was a problem syncing repos from GitHub. Check the dev panel for details.</p>
+                      </>
+                    ) : (
+                      <>
+                        <h2 style={{ margin: 0, fontSize: "20px", fontWeight: 600 }}>Create your first task</h2>
+                        <p style={{ margin: 0, opacity: 0.75 }}>
+                          {organizationRepos.length > 0
+                            ? "Start from the sidebar to create a task on the first available repo."
+                            : "No repos are available in this organization yet."}
+                        </p>
+                        <button
+                          type="button"
+                          onClick={() => createTask()}
+                          disabled={organizationRepos.length === 0}
+                          style={{
+                            alignSelf: "center",
+                            border: 0,
+                            borderRadius: "999px",
+                            padding: "10px 18px",
+                            background: organizationRepos.length > 0 ? t.borderMedium : t.textTertiary,
+                            color: t.textPrimary,
+                            cursor: organizationRepos.length > 0 ? "pointer" : "not-allowed",
+                            fontWeight: 600,
+                          }}
+                        >
+                          New task
+                        </button>
+                      </>
+                    )}
+                  </div>
+                </div>
+              </ScrollBody>
+            </SPanel>
+            {rightSidebarOpen ? <PanelResizeHandle onResizeStart={onRightResizeStart} onResize={onRightResize} /> : null}
+            <div
+              style={{
+                width: rightSidebarOpen ? `${rightWidth}px` : 0,
+                flexShrink: 0,
+                minWidth: 0,
+                display: "flex",
+                flexDirection: "column",
+                overflow: "hidden",
+                transition: sidebarTransition,
+              }}
+            >
+              <div style={{ minWidth: `${rightWidth}px`, flex: 1, display: "flex", flexDirection: "column" }}>
+                <SPanel />
+              </div>
+            </div>
+          </div>
+        </Shell>
+        {liveGithub && <GithubInstallationWarning github={liveGithub} css={css} t={t} />}
+        {showDevPanel && (
+          <DevPanel
+            organizationId={organizationId}
+            snapshot={{ organizationId, repos: organizationRepos, repositories: rawRepositories, tasks } as TaskWorkspaceSnapshot}
+            organization={activeOrg}
+            focusedTask={null}
+          />
+        )}
+      </>
+    );
+  }
+
+  return (
+    <>
+      {dragRegion}
+      <Shell $style={{ position: "relative" }}>
+        <div
+          style={{
+            width: leftSidebarOpen ? `${leftWidth}px` : 0,
+            flexShrink: 0,
+            minWidth: 0,
+            display: "flex",
+            flexDirection: "column",
+            overflow: "hidden",
+            transition: sidebarTransition,
+          }}
+        >
+          <div style={{ minWidth: `${leftWidth}px`, flex: 1, minHeight: 0, display: "flex", flexDirection: "column" }}>
+            <Sidebar
+              repositories={repositories}
+              newTaskRepos={organizationRepos}
+              selectedNewTaskRepoId={selectedNewTaskRepoId}
+              activeId={selectedTaskId ?? activeTask.id}
+              onSelect={selectTask}
+              onCreate={createTask}
+              onSelectNewTaskRepo={setSelectedNewTaskRepoId}
+              onMarkUnread={markTaskUnread}
+              onRenameTask={renameTask}
+              onReorderRepositories={reorderRepositories}
+              taskOrderByRepository={taskOrderByRepository}
+              onReorderTasks={reorderTasks}
+              onReloadOrganization={() => void taskWorkspaceClient.adminReloadGithubOrganization()}
+              onReloadRepository={(repoId) => void taskWorkspaceClient.adminReloadGithubRepository(repoId)}
+              onToggleSidebar={() => setLeftSidebarOpen(false)}
+            />
+          </div>
+        </div>
+        {!leftSidebarOpen && leftSidebarPeeking ? (
+          <>
+            <div
+              style={{
+                position: "absolute",
+                top: 0,
+                left: 0,
+                right: 0,
+                bottom: 0,
+                backgroundColor: "rgba(0, 0, 0, 0.4)",
+                zIndex: 99,
+              }}
+              onClick={() => setLeftSidebarPeeking(false)}
+              onMouseEnter={endPeek}
+            />
+            <div
+              style={{
+                position: "absolute",
+                top: 0,
+                left: 0,
+                bottom: 0,
+                width: `${leftWidth}px`,
+                zIndex: 100,
+                display: "flex",
+                flexDirection: "column",
+                boxShadow: "4px 0 24px rgba(0, 0, 0, 0.5)",
+              }}
+              onMouseEnter={startPeek}
+              onMouseLeave={endPeek}
+            >
+              <Sidebar
+                repositories={repositories}
+                newTaskRepos={organizationRepos}
+                selectedNewTaskRepoId={selectedNewTaskRepoId}
+                activeId={selectedTaskId ?? activeTask.id}
+                onSelect={(id) => {
+                  selectTask(id);
+                  setLeftSidebarPeeking(false);
+                }}
+                onCreate={createTask}
+                onSelectNewTaskRepo={setSelectedNewTaskRepoId}
+                onMarkUnread={markTaskUnread}
+                onRenameTask={renameTask}
+                onReorderRepositories={reorderRepositories}
+                taskOrderByRepository={taskOrderByRepository}
+                onReorderTasks={reorderTasks}
+                onReloadOrganization={() => void taskWorkspaceClient.adminReloadGithubOrganization()}
+                onReloadRepository={(repoId) => void taskWorkspaceClient.adminReloadGithubRepository(repoId)}
+                onToggleSidebar={() => {
+                  setLeftSidebarPeeking(false);
+                  setLeftSidebarOpen(true);
+                }}
+              />
+            </div>
+          </>
+        ) : null}
+        <div style={contentFrameStyle}>
+          {leftSidebarOpen ? <PanelResizeHandle onResizeStart={onLeftResizeStart} onResize={onLeftResize} /> : null}
+          <div style={{ flex: 1, minWidth: 0, display: "flex", flexDirection: "column" }}>
+            <TranscriptPanel
+              taskWorkspaceClient={taskWorkspaceClient}
+              task={activeTask}
+              hasSandbox={hasSandbox}
+              modelGroups={modelGroups}
+              activeSessionId={activeSessionId}
+              lastAgentSessionId={lastAgentSessionId}
+              openDiffs={openDiffs}
+              onSyncRouteSession={syncRouteSession}
+              onSetActiveSessionId={(sessionId) => {
+                setActiveSessionIdByTask((current) => ({ ...current, [activeTask.id]: sessionId }));
+              }}
+              onSetLastAgentSessionId={(sessionId) => {
+                setLastAgentSessionIdByTask((current) => ({ ...current, [activeTask.id]: sessionId }));
+              }}
+              onSetOpenDiffs={(paths) => {
+                setOpenDiffsByTask((current) => ({ ...current, [activeTask.id]: paths }));
+              }}
+              sidebarCollapsed={!leftSidebarOpen}
+              onToggleSidebar={() => {
+                setLeftSidebarPeeking(false);
+                setLeftSidebarOpen(true);
+              }}
+              onSidebarPeekStart={startPeek}
+              onSidebarPeekEnd={endPeek}
+              rightSidebarCollapsed={!rightSidebarOpen}
+              onToggleRightSidebar={() => setRightSidebarOpen(true)}
+              selectedSessionHydrating={selectedSessionHydrating}
+              onNavigateToUsage={navigateToUsage}
+            />
+          </div>
+          {rightSidebarOpen ? <PanelResizeHandle onResizeStart={onRightResizeStart} onResize={onRightResize} /> : null}
+          <div
+            style={{
+              width: rightSidebarOpen ? `${rightWidth}px` : 0,
+              flexShrink: 0,
+              minWidth: 0,
+              display: "flex",
+              flexDirection: "column",
+              overflow: "hidden",
+              transition: sidebarTransition,
+            }}
+          >
+            <div style={{ minWidth: `${rightWidth}px`, flex: 1, display: "flex", flexDirection: "column" }}>
+              <RightRail
+                organizationId={organizationId}
+                task={activeTask}
+                activeSessionId={activeSessionId}
+                onOpenDiff={openDiffTab}
+                onArchive={archiveTask}
+                onRevertFile={revertFile}
+                onPublishPr={publishPr}
+                onChangeOwner={changeOwner}
+                members={getMockOrganizationById(appSnapshot, organizationId)?.members ?? []}
+                onToggleSidebar={() => setRightSidebarOpen(false)}
+              />
+            </div>
+          </div>
+        </div>
+        {liveGithub && <GithubInstallationWarning github={liveGithub} css={css} t={t} />}
+        {showDevPanel && (
+          <DevPanel
+            organizationId={organizationId}
+            snapshot={{ organizationId, repos: organizationRepos, repositories: rawRepositories, tasks } as TaskWorkspaceSnapshot}
+            organization={activeOrg}
+            focusedTask={{
+              id: activeTask.id,
+              repoId: activeTask.repoId,
+              title: activeTask.title,
+              status: activeTask.status,
+              branch: activeTask.branch ?? null,
+              activeSandboxId: activeTask.activeSandboxId ?? null,
+              activeSessionId: activeTask.activeSessionId ?? selectedSessionId ?? activeTask.sessions[0]?.id ?? null,
+              sandboxes: [],
+              sessions:
+                activeTask.sessions?.map((tab) => ({
+                  id: tab.id,
+                  sessionId: tab.sessionId ?? null,
+                  sessionName: tab.sessionName ?? tab.id,
+                  agent: tab.agent,
+                  model: tab.model,
+                  status: tab.status,
+                  thinkingSinceMs: tab.thinkingSinceMs ?? null,
+                  unread: tab.unread ?? false,
+                  created: tab.created ?? false,
+                })) ?? [],
+            }}
+          />
+        )}
+      </Shell>
+    </>
+  );
+}
diff --git a/foundry/packages/frontend/src/components/mock-layout/diff-content.tsx b/foundry/packages/frontend/src/components/mock-layout/diff-content.tsx
new file mode 100644
index 0000000..8665e97
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/diff-content.tsx
@@ -0,0 +1,77 @@
+import { memo, useMemo } from "react";
+import { FileCode, Plus } from "lucide-react";
+
+import { ScrollBody } from "./ui";
+import { parseDiffLines, type FileChange } from "./view-model";
+
+export const DiffContent = memo(function DiffContent({
+  filePath,
+  file,
+  diff,
+  onAddAttachment,
+}: {
+  filePath: string;
+  file?: FileChange;
+  diff?: string;
+  onAddAttachment?: (filePath: string, lineNumber: number, lineContent: string) => void;
+}) {
+  const diffLines = useMemo(() => (diff ? parseDiffLines(diff) : []), [diff]);
+
+  return (
+    <>
+      <div className="mock-diff-header">
+        <FileCode size={14} color="#71717a" />
+        <div className="mock-diff-path">{filePath}</div>
+        {file ? (
+          <div className="mock-diff-stats">
+            <span className="mock-diff-added">+{file.added}</span>
+            <span className="mock-diff-removed">&minus;{file.removed}</span>
+          </div>
+        ) : null}
+      </div>
+      <ScrollBody>
+        {diff ? (
+          <div className="mock-diff-body">
+            {diffLines.map((line) => {
+              const isHunk = line.kind === "hunk";
+              return (
+                <div
+                  key={`${line.lineNumber}-${line.text}`}
+                  className="mock-diff-row"
+                  data-kind={line.kind}
+                  style={!isHunk && onAddAttachment ? { cursor: "pointer" } : undefined}
+                  onClick={!isHunk && onAddAttachment ? () => onAddAttachment(filePath, line.lineNumber, line.text) : undefined}
+                >
+                  <div className="mock-diff-gutter">
+                    {!isHunk && onAddAttachment ? (
+                      <button
+                        type="button"
+                        aria-label={`Attach line ${line.lineNumber}`}
+                        tabIndex={-1}
+                        className="mock-diff-attach-button"
+                        onClick={(event) => {
+                          event.stopPropagation();
+                          onAddAttachment(filePath, line.lineNumber, line.text);
+                        }}
+                      >
+                        <Plus size={13} />
+                      </button>
+                    ) : null}
+                    <span className="mock-diff-line-number">{isHunk ? "" : line.lineNumber}</span>
+                  </div>
+                  <div data-selectable className="mock-diff-line-text">
+                    {line.text}
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        ) : (
+          <div className="mock-diff-empty">
+            <div className="mock-diff-empty-copy">No diff data available for this file</div>
+          </div>
+        )}
+      </ScrollBody>
+    </>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/history-minimap.tsx b/foundry/packages/frontend/src/components/mock-layout/history-minimap.tsx
new file mode 100644
index 0000000..ae2443d
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/history-minimap.tsx
@@ -0,0 +1,128 @@
+import { memo, useEffect, useRef, useState } from "react";
+import { useStyletron } from "baseui";
+import { LabelXSmall } from "baseui/typography";
+import { History } from "lucide-react";
+
+import { useFoundryTokens } from "../../app/theme";
+import { formatMessageTimestamp, type HistoryEvent } from "./view-model";
+
+export const HistoryMinimap = memo(function HistoryMinimap({ events, onSelect }: { events: HistoryEvent[]; onSelect: (event: HistoryEvent) => void }) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [open, setOpen] = useState(false);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (!open) return;
+    const handleClick = (e: MouseEvent) => {
+      if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    };
+    document.addEventListener("mousedown", handleClick);
+    return () => document.removeEventListener("mousedown", handleClick);
+  }, [open]);
+
+  if (events.length === 0) {
+    return null;
+  }
+
+  return (
+    <div
+      ref={containerRef}
+      className={css({
+        position: "absolute",
+        top: "20px",
+        right: "16px",
+        zIndex: 3,
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "flex-end",
+        gap: "6px",
+      })}
+    >
+      <div
+        role="button"
+        tabIndex={0}
+        onClick={() => setOpen((prev) => !prev)}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" || e.key === " ") setOpen((prev) => !prev);
+        }}
+        className={css({
+          width: "26px",
+          height: "26px",
+          borderRadius: "6px",
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          cursor: "pointer",
+          color: open ? t.textSecondary : t.textTertiary,
+          backgroundColor: open ? t.interactiveHover : "transparent",
+          transition: "background 200ms ease, color 200ms ease",
+          ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+        })}
+      >
+        <History size={14} />
+      </div>
+
+      {open ? (
+        <div
+          className={css({
+            width: "240px",
+            maxHeight: "320px",
+            overflowY: "auto",
+            padding: "8px",
+            borderRadius: "10px",
+            backgroundColor: "rgba(32, 32, 32, 0.98)",
+            backdropFilter: "blur(12px)",
+            border: `1px solid ${t.borderDefault}`,
+            boxShadow: `0 8px 32px rgba(0, 0, 0, 0.5), 0 0 0 1px ${t.interactiveSubtle}`,
+          })}
+        >
+          <div className={css({ display: "flex", alignItems: "center", justifyContent: "space-between", marginBottom: "6px", padding: "0 4px" })}>
+            <LabelXSmall color={t.textTertiary} $style={{ letterSpacing: "0.02em" }}>
+              Task events
+            </LabelXSmall>
+            <LabelXSmall color={t.textTertiary}>{events.length}</LabelXSmall>
+          </div>
+          <div className={css({ display: "flex", flexDirection: "column", gap: "2px" })}>
+            {events.map((event) => (
+              <button
+                key={event.id}
+                type="button"
+                onClick={() => {
+                  onSelect(event);
+                  setOpen(false);
+                }}
+                className={css({
+                  appearance: "none",
+                  WebkitAppearance: "none",
+                  backgroundColor: "transparent",
+                  border: "none",
+                  margin: "0",
+                  padding: "6px 8px",
+                  borderRadius: "6px",
+                  cursor: "pointer",
+                  color: t.textSecondary,
+                  fontSize: "12px",
+                  fontWeight: 500,
+                  textAlign: "left",
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                  whiteSpace: "nowrap",
+                  transition: "background-color 160ms ease, color 160ms ease",
+                  ":hover": {
+                    backgroundColor: t.interactiveHover,
+                    color: t.textPrimary,
+                  },
+                })}
+              >
+                {event.preview}
+              </button>
+            ))}
+          </div>
+        </div>
+      ) : null}
+    </div>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/message-list.tsx b/foundry/packages/frontend/src/components/mock-layout/message-list.tsx
new file mode 100644
index 0000000..499e6cd
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/message-list.tsx
@@ -0,0 +1,376 @@
+import { AgentTranscript as AgentTranscript_, type AgentTranscriptClassNames, type TranscriptEntry } from "@sandbox-agent/react";
+import { memo, useEffect, useMemo, type MutableRefObject, type RefObject } from "react";
+
+// Cast needed: tsup-generated .d.ts returns react_jsx_runtime.JSX.Element which
+// doesn't unify with the consumer's JSX.Element under Bundler moduleResolution.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const AgentTranscript = AgentTranscript_ as any as React.FC<{
+  entries: TranscriptEntry[];
+  classNames?: Partial<AgentTranscriptClassNames>;
+  scrollRef?: RefObject<HTMLDivElement | null>;
+  scrollToEntryId?: string | null;
+  virtualize?: boolean;
+  isThinking?: boolean;
+  renderMessageText?: (entry: TranscriptEntry) => React.ReactNode;
+  renderThinkingState?: () => React.ReactNode;
+}>;
+import { useStyletron } from "baseui";
+import { LabelSmall, LabelXSmall } from "baseui/typography";
+import { Copy } from "lucide-react";
+
+import { useFoundryTokens } from "../../app/theme";
+import { HistoryMinimap } from "./history-minimap";
+import { SpinnerDot } from "./ui";
+import { buildDisplayMessages, formatMessageDuration, formatMessageTimestamp, type AgentSession, type HistoryEvent, type Message } from "./view-model";
+
+const TranscriptMessageBody = memo(function TranscriptMessageBody({
+  message,
+  messageRefs,
+  copiedMessageId,
+  onCopyMessage,
+  isTarget,
+  onTargetRendered,
+}: {
+  message: Message;
+  messageRefs: MutableRefObject<Map<string, HTMLDivElement>>;
+  copiedMessageId: string | null;
+  onCopyMessage: (message: Message) => void;
+  isTarget?: boolean;
+  onTargetRendered?: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const isUser = message.sender === "client";
+  const isCopied = copiedMessageId === message.id;
+  const messageTimestamp = formatMessageTimestamp(message.createdAtMs);
+  const displayFooter = isUser ? messageTimestamp : message.durationMs ? `${messageTimestamp} • Took ${formatMessageDuration(message.durationMs)}` : null;
+
+  useEffect(() => {
+    if (!isTarget) {
+      return;
+    }
+
+    const targetNode = messageRefs.current.get(message.id);
+    if (!targetNode) {
+      return;
+    }
+
+    targetNode.scrollIntoView({ behavior: "smooth", block: "center" });
+    onTargetRendered?.();
+  }, [isTarget, message.id, messageRefs, onTargetRendered]);
+
+  return (
+    <div
+      ref={(node) => {
+        if (node) {
+          messageRefs.current.set(message.id, node);
+        } else {
+          messageRefs.current.delete(message.id);
+        }
+      }}
+      className={css({
+        display: "flex",
+        flexDirection: "column",
+        alignItems: isUser ? "flex-end" : "flex-start",
+        gap: "6px",
+      })}
+    >
+      <div
+        className={css({
+          maxWidth: "80%",
+          ...(isUser
+            ? {
+                padding: "12px 16px",
+                backgroundColor: t.borderDefault,
+                color: t.textPrimary,
+                borderTopLeftRadius: "18px",
+                borderTopRightRadius: "18px",
+                borderBottomLeftRadius: "18px",
+                borderBottomRightRadius: "4px",
+              }
+            : {
+                backgroundColor: "transparent",
+                border: "none",
+                color: t.textPrimary,
+                borderRadius: "0",
+                padding: "0",
+              }),
+        })}
+      >
+        <div
+          data-selectable
+          className={css({
+            fontSize: "13px",
+            lineHeight: "1.6",
+            whiteSpace: "pre-wrap",
+            wordWrap: "break-word",
+          })}
+        >
+          {message.text}
+        </div>
+      </div>
+      <div
+        className={css({
+          display: "flex",
+          alignItems: "center",
+          gap: "10px",
+          justifyContent: isUser ? "flex-end" : "flex-start",
+          minHeight: "16px",
+          paddingLeft: isUser ? undefined : "2px",
+        })}
+      >
+        {displayFooter ? (
+          <LabelXSmall color={t.textTertiary} $style={{ fontFamily: '"IBM Plex Mono", monospace', letterSpacing: "0.01em" }}>
+            {displayFooter}
+          </LabelXSmall>
+        ) : null}
+        <button
+          type="button"
+          data-copy-action="true"
+          onClick={() => onCopyMessage(message)}
+          className={css({
+            appearance: "none",
+            WebkitAppearance: "none",
+            background: "none",
+            border: "none",
+            padding: "0",
+            margin: "0",
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "5px",
+            fontSize: "11px",
+            cursor: "pointer",
+            color: isCopied ? t.textPrimary : t.textSecondary,
+            transition: "color 160ms ease",
+            ":hover": { color: t.textPrimary },
+          })}
+        >
+          <Copy size={11} />
+          {isCopied ? "Copied" : null}
+        </button>
+      </div>
+    </div>
+  );
+});
+
+export const MessageList = memo(function MessageList({
+  session,
+  scrollRef,
+  messageRefs,
+  historyEvents,
+  onSelectHistoryEvent,
+  targetMessageId,
+  onTargetMessageResolved,
+  copiedMessageId,
+  onCopyMessage,
+  thinkingTimerLabel,
+  pendingMessage,
+}: {
+  session: AgentSession | null | undefined;
+  scrollRef: RefObject<HTMLDivElement | null>;
+  messageRefs: MutableRefObject<Map<string, HTMLDivElement>>;
+  historyEvents: HistoryEvent[];
+  onSelectHistoryEvent: (event: HistoryEvent) => void;
+  targetMessageId?: string | null;
+  onTargetMessageResolved?: () => void;
+  copiedMessageId: string | null;
+  onCopyMessage: (message: Message) => void;
+  thinkingTimerLabel: string | null;
+  pendingMessage: { text: string; sentAt: number } | null;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const PENDING_MESSAGE_ID = "__pending__";
+  const messages = useMemo(() => buildDisplayMessages(session), [session]);
+  const messagesById = useMemo(() => new Map(messages.map((message) => [message.id, message])), [messages]);
+  const messageIndexById = useMemo(() => new Map(messages.map((message, index) => [message.id, index])), [messages]);
+  const transcriptEntries = useMemo<TranscriptEntry[]>(() => {
+    const entries: TranscriptEntry[] = messages.map((message) => ({
+      id: message.id,
+      eventId: message.id,
+      kind: "message",
+      time: new Date(message.createdAtMs).toISOString(),
+      role: message.sender === "client" ? "user" : "assistant",
+      text: message.text,
+    }));
+    if (pendingMessage) {
+      entries.push({
+        id: PENDING_MESSAGE_ID,
+        eventId: PENDING_MESSAGE_ID,
+        kind: "message",
+        time: new Date(pendingMessage.sentAt).toISOString(),
+        role: "user",
+        text: pendingMessage.text,
+      });
+    }
+    return entries;
+  }, [messages, pendingMessage]);
+
+  const messageContentClass = css({
+    maxWidth: "100%",
+    display: "flex",
+    flexDirection: "column",
+  });
+
+  const transcriptClassNames: Partial<AgentTranscriptClassNames> = {
+    root: css({
+      display: "flex",
+      flexDirection: "column",
+      gap: "12px",
+    }),
+    message: css({
+      display: "flex",
+    }),
+    messageContent: messageContentClass,
+    messageText: css({
+      width: "100%",
+    }),
+    thinkingRow: css({
+      display: "flex",
+      alignItems: "center",
+      gap: "8px",
+      padding: "4px 0",
+    }),
+    thinkingIndicator: css({
+      display: "flex",
+      alignItems: "center",
+      gap: "8px",
+      color: t.accent,
+      fontSize: "11px",
+      fontFamily: '"IBM Plex Mono", monospace',
+      letterSpacing: "0.01em",
+    }),
+  };
+  const scrollContainerClass = css({
+    padding: "16px 52px 16px 20px",
+    display: "flex",
+    flexDirection: "column",
+    flex: 1,
+    minHeight: 0,
+    overflowY: "auto",
+  });
+
+  useEffect(() => {
+    if (!targetMessageId) {
+      return;
+    }
+
+    const targetNode = messageRefs.current.get(targetMessageId);
+    if (targetNode) {
+      targetNode.scrollIntoView({ behavior: "smooth", block: "center" });
+      onTargetMessageResolved?.();
+      return;
+    }
+
+    const targetIndex = messageIndexById.get(targetMessageId);
+    if (targetIndex == null) {
+      return;
+    }
+
+    scrollRef.current?.scrollTo({
+      top: Math.max(0, targetIndex * 88),
+      behavior: "smooth",
+    });
+  }, [messageIndexById, messageRefs, onTargetMessageResolved, scrollRef, targetMessageId]);
+
+  return (
+    <>
+      <style>{`
+        [data-variant="user"] > [data-slot="message-content"] {
+          margin-left: auto;
+        }
+      `}</style>
+      {historyEvents.length > 0 ? <HistoryMinimap events={historyEvents} onSelect={onSelectHistoryEvent} /> : null}
+      <div ref={scrollRef} className={scrollContainerClass}>
+        {session && transcriptEntries.length === 0 ? (
+          <div
+            className={css({
+              display: "flex",
+              flexDirection: "column",
+              alignItems: "center",
+              justifyContent: "center",
+              flex: 1,
+              minHeight: "200px",
+              gap: "8px",
+            })}
+          >
+            <LabelSmall color={t.textTertiary}>
+              {!session?.created ? "Choose an agent and model, then send your first message" : "No messages yet in this session"}
+            </LabelSmall>
+          </div>
+        ) : (
+          <AgentTranscript
+            entries={transcriptEntries}
+            classNames={transcriptClassNames}
+            scrollRef={scrollRef}
+            scrollToEntryId={targetMessageId}
+            virtualize
+            renderMessageText={(entry: TranscriptEntry) => {
+              if (entry.id === PENDING_MESSAGE_ID && pendingMessage) {
+                const pendingMsg: Message = {
+                  id: PENDING_MESSAGE_ID,
+                  sender: "client",
+                  text: pendingMessage.text,
+                  createdAtMs: pendingMessage.sentAt,
+                  event: {
+                    id: PENDING_MESSAGE_ID,
+                    eventIndex: -1,
+                    sessionId: "",
+                    connectionId: "",
+                    sender: "client",
+                    createdAt: pendingMessage.sentAt,
+                    payload: {},
+                  },
+                };
+                return (
+                  <div style={{ opacity: 0.5 }}>
+                    <TranscriptMessageBody message={pendingMsg} messageRefs={messageRefs} copiedMessageId={copiedMessageId} onCopyMessage={onCopyMessage} />
+                  </div>
+                );
+              }
+              const message = messagesById.get(entry.id);
+              if (!message) {
+                return null;
+              }
+
+              return (
+                <TranscriptMessageBody
+                  message={message}
+                  messageRefs={messageRefs}
+                  copiedMessageId={copiedMessageId}
+                  onCopyMessage={onCopyMessage}
+                  isTarget={targetMessageId === entry.id}
+                  onTargetRendered={onTargetMessageResolved}
+                />
+              );
+            }}
+            isThinking={Boolean((session && session.status === "running" && transcriptEntries.length > 0) || pendingMessage)}
+            renderThinkingState={() => (
+              <div className={transcriptClassNames.thinkingRow}>
+                <SpinnerDot size={12} />
+                <LabelXSmall color={t.accent} $style={{ display: "flex", alignItems: "center", gap: "8px" }}>
+                  <span>Agent is thinking</span>
+                  {thinkingTimerLabel ? (
+                    <span
+                      className={css({
+                        padding: "2px 7px",
+                        borderRadius: "999px",
+                        backgroundColor: t.accentSubtle,
+                        border: `1px solid rgba(255, 79, 0, 0.2)`,
+                        fontFamily: '"IBM Plex Mono", monospace',
+                        fontSize: "10px",
+                        letterSpacing: "0.04em",
+                      })}
+                    >
+                      {thinkingTimerLabel}
+                    </span>
+                  ) : null}
+                </LabelXSmall>
+              </div>
+            )}
+          />
+        )}
+      </div>
+    </>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/model-picker.tsx b/foundry/packages/frontend/src/components/mock-layout/model-picker.tsx
new file mode 100644
index 0000000..6ec6ea6
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/model-picker.tsx
@@ -0,0 +1,178 @@
+import { memo, useState } from "react";
+import { useStyletron } from "baseui";
+import { StatefulPopover, PLACEMENT } from "baseui/popover";
+import { ChevronUp, Star } from "lucide-react";
+import { workspaceModelLabel, type WorkspaceModelGroup } from "@sandbox-agent/foundry-shared";
+
+import { useFoundryTokens } from "../../app/theme";
+import { AgentIcon } from "./ui";
+import { type ModelId } from "./view-model";
+
+const ModelPickerContent = memo(function ModelPickerContent({
+  groups,
+  value,
+  defaultModel,
+  onChange,
+  onSetDefault,
+  close,
+}: {
+  groups: WorkspaceModelGroup[];
+  value: ModelId;
+  defaultModel: ModelId;
+  onChange: (id: ModelId) => void;
+  onSetDefault: (id: ModelId) => void;
+  close: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [hoveredId, setHoveredId] = useState<ModelId | null>(null);
+
+  return (
+    <div className={css({ minWidth: "220px", padding: "6px 0" })}>
+      {groups.map((group) => (
+        <div key={group.provider}>
+          <div
+            className={css({
+              padding: "6px 12px",
+              fontSize: "10px",
+              fontWeight: 700,
+              color: t.textTertiary,
+              textTransform: "uppercase",
+              letterSpacing: "0.05em",
+            })}
+          >
+            {group.provider}
+          </div>
+          {group.models.map((model) => {
+            const isActive = model.id === value;
+            const isDefault = model.id === defaultModel;
+            const isHovered = model.id === hoveredId;
+            const agent = group.agentKind;
+
+            return (
+              <div
+                key={model.id}
+                onMouseEnter={() => setHoveredId(model.id)}
+                onMouseLeave={() => setHoveredId(null)}
+                onClick={() => {
+                  onChange(model.id);
+                  close();
+                }}
+                className={css({
+                  display: "flex",
+                  alignItems: "center",
+                  gap: "8px",
+                  padding: "6px 12px",
+                  cursor: "pointer",
+                  fontSize: "12px",
+                  fontWeight: isActive ? 600 : 400,
+                  color: isActive ? t.textPrimary : t.textSecondary,
+                  borderRadius: "6px",
+                  marginLeft: "4px",
+                  marginRight: "4px",
+                  ":hover": { backgroundColor: t.borderSubtle },
+                })}
+              >
+                <AgentIcon agent={agent} size={12} />
+                <span className={css({ flex: 1 })}>{model.label}</span>
+                {isDefault ? <Star size={11} fill={t.accent} color={t.accent} /> : null}
+                {!isDefault && isHovered ? (
+                  <Star
+                    size={11}
+                    color={t.textTertiary}
+                    className={css({ cursor: "pointer", ":hover": { color: t.accent } })}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      onSetDefault(model.id);
+                    }}
+                  />
+                ) : null}
+              </div>
+            );
+          })}
+        </div>
+      ))}
+    </div>
+  );
+});
+
+export const ModelPicker = memo(function ModelPicker({
+  groups,
+  value,
+  defaultModel,
+  onChange,
+  onSetDefault,
+}: {
+  groups: WorkspaceModelGroup[];
+  value: ModelId;
+  defaultModel: ModelId;
+  onChange: (id: ModelId) => void;
+  onSetDefault: (id: ModelId) => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [isOpen, setIsOpen] = useState(false);
+  const [isHovered, setIsHovered] = useState(false);
+
+  return (
+    <StatefulPopover
+      placement={PLACEMENT.topLeft}
+      triggerType="click"
+      autoFocus={false}
+      onOpen={() => setIsOpen(true)}
+      onClose={() => setIsOpen(false)}
+      overrides={{
+        Body: {
+          style: {
+            backgroundColor: "rgba(32, 32, 32, 0.98)",
+            backdropFilter: "blur(12px)",
+            borderTopLeftRadius: "10px",
+            borderTopRightRadius: "10px",
+            borderBottomLeftRadius: "10px",
+            borderBottomRightRadius: "10px",
+            border: `1px solid ${t.borderDefault}`,
+            boxShadow: `0 8px 32px rgba(0, 0, 0, 0.5), 0 0 0 1px ${t.interactiveSubtle}`,
+            zIndex: 100,
+          },
+        },
+        Inner: {
+          style: {
+            backgroundColor: "transparent",
+            padding: "0",
+          },
+        },
+      }}
+      content={({ close }) => (
+        <ModelPickerContent groups={groups} value={value} defaultModel={defaultModel} onChange={onChange} onSetDefault={onSetDefault} close={close} />
+      )}
+    >
+      <div className={css({ display: "inline-flex" })}>
+        <button
+          onMouseEnter={() => setIsHovered(true)}
+          onMouseLeave={() => setIsHovered(false)}
+          className={css({
+            appearance: "none",
+            WebkitAppearance: "none",
+            border: "none",
+            margin: "0",
+            display: "flex",
+            alignItems: "center",
+            gap: "4px",
+            cursor: "pointer",
+            padding: "4px 8px",
+            borderRadius: "6px",
+            fontSize: "12px",
+            fontWeight: 500,
+            color: t.textTertiary,
+            backgroundColor: "transparent",
+            transition: "background 200ms ease, color 200ms ease",
+            ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+          })}
+        >
+          {workspaceModelLabel(value, groups)}
+          {(isHovered || isOpen) && <ChevronUp size={11} />}
+        </button>
+      </div>
+    </StatefulPopover>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/prompt-composer.tsx b/foundry/packages/frontend/src/components/mock-layout/prompt-composer.tsx
new file mode 100644
index 0000000..b7e27be
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/prompt-composer.tsx
@@ -0,0 +1,184 @@
+import { memo, type Ref } from "react";
+import { useStyletron } from "baseui";
+import { ChatComposer, type ChatComposerClassNames } from "@sandbox-agent/react";
+import { FileCode, SendHorizonal, Square, X } from "lucide-react";
+import { type WorkspaceModelGroup } from "@sandbox-agent/foundry-shared";
+
+import { useFoundryTokens } from "../../app/theme";
+import { ModelPicker } from "./model-picker";
+import { PROMPT_TEXTAREA_MAX_HEIGHT, PROMPT_TEXTAREA_MIN_HEIGHT } from "./ui";
+import { fileName, type LineAttachment, type ModelId } from "./view-model";
+
+export const PromptComposer = memo(function PromptComposer({
+  draft,
+  textareaRef,
+  placeholder,
+  attachments,
+  modelGroups,
+  defaultModel,
+  model,
+  isRunning,
+  onDraftChange,
+  onSend,
+  onStop,
+  onRemoveAttachment,
+  onChangeModel,
+  onSetDefaultModel,
+}: {
+  draft: string;
+  textareaRef: Ref<HTMLTextAreaElement>;
+  placeholder: string;
+  attachments: LineAttachment[];
+  modelGroups: WorkspaceModelGroup[];
+  defaultModel: ModelId;
+  model: ModelId;
+  isRunning: boolean;
+  onDraftChange: (value: string) => void;
+  onSend: () => void;
+  onStop: () => void;
+  onRemoveAttachment: (id: string) => void;
+  onChangeModel: (model: ModelId) => void;
+  onSetDefaultModel: (model: ModelId) => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const composerClassNames: Partial<ChatComposerClassNames> = {
+    form: css({
+      position: "relative",
+      backgroundColor: t.interactiveHover,
+      border: `1px solid ${t.borderDefault}`,
+      borderRadius: "12px",
+      minHeight: `${PROMPT_TEXTAREA_MIN_HEIGHT + 36}px`,
+      transition: "border-color 200ms ease",
+      ":focus-within": { borderColor: t.borderMedium },
+      display: "flex",
+      flexDirection: "column",
+    }),
+    input: css({
+      display: "block",
+      width: "100%",
+      minHeight: `${PROMPT_TEXTAREA_MIN_HEIGHT + 20}px`,
+      padding: "14px 58px 8px 14px",
+      background: "transparent",
+      border: "none",
+      borderRadius: "12px 12px 0 0",
+      color: t.textPrimary,
+      fontSize: "13px",
+      fontFamily: "inherit",
+      resize: "none",
+      outline: "none",
+      lineHeight: "1.4",
+      maxHeight: `${PROMPT_TEXTAREA_MAX_HEIGHT + 40}px`,
+      boxSizing: "border-box",
+      overflowY: "hidden",
+      "::placeholder": { color: t.textSecondary },
+    }),
+    submit: css({
+      appearance: "none",
+      WebkitAppearance: "none",
+      boxSizing: "border-box",
+      width: "32px",
+      height: "32px",
+      padding: "0",
+      margin: "0",
+      border: "none",
+      borderRadius: "10px",
+      cursor: "pointer",
+      position: "absolute",
+      right: "12px",
+      bottom: "12px",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      lineHeight: 0,
+      fontSize: 0,
+      color: t.textPrimary,
+      transition: "background 200ms ease",
+      backgroundColor: isRunning ? t.interactiveHover : t.borderMedium,
+      ":hover": {
+        backgroundColor: isRunning ? t.borderMedium : "rgba(255, 255, 255, 0.20)",
+      },
+      ":disabled": {
+        cursor: "not-allowed",
+        opacity: 0.45,
+      },
+    }),
+    submitContent: css({
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      width: "100%",
+      height: "100%",
+      lineHeight: 0,
+      color: isRunning ? t.textPrimary : t.textPrimary,
+    }),
+  };
+
+  return (
+    <div
+      className={css({
+        padding: "12px 12px",
+        borderTop: "none",
+        flexShrink: 0,
+        display: "flex",
+        flexDirection: "column",
+        gap: "8px",
+      })}
+    >
+      {attachments.length > 0 ? (
+        <div className={css({ display: "flex", flexWrap: "wrap", gap: "4px" })}>
+          {attachments.map((attachment) => (
+            <div
+              key={attachment.id}
+              className={css({
+                display: "inline-flex",
+                alignItems: "center",
+                gap: "4px",
+                padding: "2px 8px",
+                borderRadius: "4px",
+                backgroundColor: t.interactiveHover,
+                border: `1px solid ${t.borderMedium}`,
+                fontSize: "11px",
+                fontFamily: '"IBM Plex Mono", monospace',
+                color: t.textSecondary,
+              })}
+            >
+              <FileCode size={11} />
+              <span>
+                {fileName(attachment.filePath)}:{attachment.lineNumber}
+              </span>
+              <X size={10} className={css({ cursor: "pointer", opacity: 0.6, ":hover": { opacity: 1 } })} onClick={() => onRemoveAttachment(attachment.id)} />
+            </div>
+          ))}
+        </div>
+      ) : null}
+      <ChatComposer
+        message={draft}
+        onMessageChange={onDraftChange}
+        onSubmit={isRunning ? onStop : onSend}
+        onKeyDown={(event) => {
+          if (event.key === "Enter" && !event.shiftKey) {
+            event.preventDefault();
+            if (isRunning) {
+              onStop();
+            } else {
+              onSend();
+            }
+          }
+        }}
+        placeholder={placeholder}
+        inputRef={textareaRef}
+        rows={2}
+        allowEmptySubmit={isRunning}
+        submitLabel={isRunning ? "Stop" : "Send"}
+        classNames={composerClassNames}
+        renderSubmitContent={() => (isRunning ? <Square size={16} style={{ display: "block" }} /> : <SendHorizonal size={16} style={{ display: "block" }} />)}
+        renderFooter={() => (
+          <div className={css({ padding: "0 10px 8px" })}>
+            <ModelPicker groups={modelGroups} value={model} defaultModel={defaultModel} onChange={onChangeModel} onSetDefault={onSetDefaultModel} />
+          </div>
+        )}
+      />
+    </div>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/right-sidebar.tsx b/foundry/packages/frontend/src/components/mock-layout/right-sidebar.tsx
new file mode 100644
index 0000000..3565b44
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/right-sidebar.tsx
@@ -0,0 +1,759 @@
+import { memo, useCallback, useMemo, useRef, useState, type MouseEvent } from "react";
+import { useStyletron } from "baseui";
+import { LabelSmall, LabelXSmall } from "baseui/typography";
+import {
+  Archive,
+  ArrowUpFromLine,
+  ChevronDown,
+  ChevronRight,
+  FileCode,
+  FilePlus,
+  FileX,
+  FolderOpen,
+  ExternalLink,
+  GitBranch,
+  GitPullRequest,
+  PanelRight,
+  User,
+} from "lucide-react";
+
+import { useFoundryTokens } from "../../app/theme";
+import { createErrorContext } from "@sandbox-agent/foundry-shared";
+import { logger } from "../../logging.js";
+import { type ContextMenuItem, ContextMenuOverlay, PanelHeaderBar, SPanel, ScrollBody, useContextMenu } from "./ui";
+import { type FileTreeNode, type Task, diffTabId } from "./view-model";
+
+const FileTree = memo(function FileTree({
+  nodes,
+  depth,
+  onSelectFile,
+  onFileContextMenu,
+  changedPaths,
+}: {
+  nodes: FileTreeNode[];
+  depth: number;
+  onSelectFile: (path: string) => void;
+  onFileContextMenu: (event: MouseEvent, path: string) => void;
+  changedPaths: Set<string>;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [collapsed, setCollapsed] = useState<Set<string>>(new Set());
+
+  return (
+    <>
+      {nodes.map((node) => {
+        const isCollapsed = collapsed.has(node.path);
+        const isChanged = changedPaths.has(node.path);
+        return (
+          <div key={node.path}>
+            <div
+              onClick={() => {
+                if (node.isDir) {
+                  setCollapsed((current) => {
+                    const next = new Set(current);
+                    if (next.has(node.path)) {
+                      next.delete(node.path);
+                    } else {
+                      next.add(node.path);
+                    }
+                    return next;
+                  });
+                  return;
+                }
+
+                onSelectFile(node.path);
+              }}
+              onContextMenu={node.isDir ? undefined : (event) => onFileContextMenu(event, node.path)}
+              className={css({
+                display: "flex",
+                alignItems: "center",
+                gap: "4px",
+                paddingTop: "3px",
+                paddingRight: "10px",
+                paddingBottom: "3px",
+                paddingLeft: `${10 + depth * 16}px`,
+                cursor: "pointer",
+                fontSize: "12px",
+                fontFamily: '"IBM Plex Mono", monospace',
+                color: isChanged ? t.textPrimary : t.textTertiary,
+                ":hover": { backgroundColor: t.interactiveHover },
+              })}
+            >
+              {node.isDir ? (
+                <>
+                  <ChevronRight
+                    size={12}
+                    className={css({
+                      transform: isCollapsed ? undefined : "rotate(90deg)",
+                      transition: "transform 0.1s",
+                    })}
+                  />
+                  <FolderOpen size={13} />
+                </>
+              ) : (
+                <FileCode size={13} color={isChanged ? t.textPrimary : undefined} style={{ marginLeft: "16px" }} />
+              )}
+              <span>{node.name}</span>
+            </div>
+            {node.isDir && !isCollapsed && node.children ? (
+              <FileTree nodes={node.children} depth={depth + 1} onSelectFile={onSelectFile} onFileContextMenu={onFileContextMenu} changedPaths={changedPaths} />
+            ) : null}
+          </div>
+        );
+      })}
+    </>
+  );
+});
+
+export const RightSidebar = memo(function RightSidebar({
+  task,
+  activeSessionId,
+  onOpenDiff,
+  onArchive,
+  onRevertFile,
+  onPublishPr,
+  onChangeOwner,
+  members,
+  onToggleSidebar,
+}: {
+  task: Task;
+  activeSessionId: string | null;
+  onOpenDiff: (path: string) => void;
+  onArchive: () => void;
+  onRevertFile: (path: string) => void;
+  onPublishPr: () => void;
+  onChangeOwner: (member: { id: string; name: string; email: string }) => void;
+  members: Array<{ id: string; name: string; email: string }>;
+  onToggleSidebar?: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [rightTab, setRightTab] = useState<"overview" | "changes" | "files">("overview");
+  const contextMenu = useContextMenu();
+  const changedPaths = useMemo(() => new Set(task.fileChanges.map((file) => file.path)), [task.fileChanges]);
+  const isTerminal = task.status === "archived";
+  const [compact, setCompact] = useState(false);
+  const headerRef = useCallback((node: HTMLDivElement | null) => {
+    if (!node) return;
+    const observer = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        setCompact(entry.contentRect.width < 400);
+      }
+    });
+    observer.observe(node);
+  }, []);
+  const [ownerDropdownOpen, setOwnerDropdownOpen] = useState(false);
+  const ownerDropdownRef = useRef<HTMLDivElement>(null);
+  const pullRequestUrl = task.pullRequest?.url ?? null;
+
+  const copyFilePath = useCallback(async (path: string) => {
+    try {
+      if (!window.navigator.clipboard) {
+        throw new Error("Clipboard API unavailable in mock layout");
+      }
+
+      await window.navigator.clipboard.writeText(path);
+    } catch (error) {
+      logger.error(
+        {
+          path,
+          ...createErrorContext(error),
+        },
+        "failed_to_copy_file_path",
+      );
+    }
+  }, []);
+
+  const openFileMenu = useCallback(
+    (event: MouseEvent, path: string) => {
+      const items: ContextMenuItem[] = [];
+
+      if (changedPaths.has(path)) {
+        items.push({ label: "Revert", onClick: () => onRevertFile(path) });
+      }
+
+      items.push({ label: "Copy Path", onClick: () => void copyFilePath(path) });
+      contextMenu.open(event, items);
+    },
+    [changedPaths, contextMenu, copyFilePath, onRevertFile],
+  );
+
+  return (
+    <SPanel $style={{ backgroundColor: t.surfacePrimary, minWidth: 0 }}>
+      <PanelHeaderBar $style={{ backgroundColor: t.surfaceSecondary, borderBottom: "none", overflow: "hidden" }}>
+        <div ref={headerRef} className={css({ display: "flex", alignItems: "center", flex: 1, minWidth: 0, justifyContent: "flex-end", gap: "2px" })}>
+          {!isTerminal ? (
+            <div className={css({ display: "flex", alignItems: "center", gap: "2px", flexShrink: 1, minWidth: 0 })}>
+              <button
+                onClick={() => {
+                  if (pullRequestUrl) {
+                    window.open(pullRequestUrl, "_blank", "noopener,noreferrer");
+                    return;
+                  }
+
+                  onPublishPr();
+                }}
+                className={css({
+                  appearance: "none",
+                  WebkitAppearance: "none",
+                  backgroundColor: "transparent",
+                  border: "none",
+                  margin: "0",
+                  boxSizing: "border-box",
+                  display: "inline-flex",
+                  alignItems: "center",
+                  gap: "5px",
+                  padding: compact ? "4px 6px" : "4px 10px",
+                  borderRadius: "6px",
+                  fontSize: "11px",
+                  fontWeight: 500,
+                  lineHeight: 1,
+                  whiteSpace: "nowrap",
+                  flexShrink: 0,
+                  color: t.textSecondary,
+                  cursor: "pointer",
+                  transition: "all 200ms ease",
+                  ":hover": { backgroundColor: t.interactiveHover, color: t.textPrimary },
+                })}
+              >
+                <GitPullRequest size={12} style={{ flexShrink: 0 }} />
+                {!compact && <span>{pullRequestUrl ? "Open PR" : "Publish PR"}</span>}
+              </button>
+              <button
+                className={css({
+                  appearance: "none",
+                  WebkitAppearance: "none",
+                  backgroundColor: "transparent",
+                  border: "none",
+                  margin: "0",
+                  boxSizing: "border-box",
+                  display: "inline-flex",
+                  alignItems: "center",
+                  gap: "5px",
+                  padding: compact ? "4px 6px" : "4px 10px",
+                  borderRadius: "6px",
+                  fontSize: "11px",
+                  fontWeight: 500,
+                  lineHeight: 1,
+                  whiteSpace: "nowrap",
+                  flexShrink: 0,
+                  color: t.textSecondary,
+                  cursor: "pointer",
+                  transition: "all 200ms ease",
+                  ":hover": { backgroundColor: t.interactiveHover, color: t.textPrimary },
+                })}
+              >
+                <ArrowUpFromLine size={12} style={{ flexShrink: 0 }} />
+                {!compact && <span>Push</span>}
+              </button>
+              <button
+                onClick={onArchive}
+                className={css({
+                  appearance: "none",
+                  WebkitAppearance: "none",
+                  backgroundColor: "transparent",
+                  border: "none",
+                  margin: "0",
+                  boxSizing: "border-box",
+                  display: "inline-flex",
+                  alignItems: "center",
+                  gap: "5px",
+                  padding: compact ? "4px 6px" : "4px 10px",
+                  borderRadius: "6px",
+                  fontSize: "11px",
+                  fontWeight: 500,
+                  lineHeight: 1,
+                  whiteSpace: "nowrap",
+                  flexShrink: 0,
+                  color: t.textSecondary,
+                  cursor: "pointer",
+                  transition: "all 200ms ease",
+                  ":hover": { backgroundColor: t.interactiveHover, color: t.textPrimary },
+                })}
+              >
+                <Archive size={12} style={{ flexShrink: 0 }} />
+                {!compact && <span>Archive</span>}
+              </button>
+            </div>
+          ) : null}
+          {onToggleSidebar ? (
+            <div
+              role="button"
+              tabIndex={0}
+              onClick={onToggleSidebar}
+              onKeyDown={(event) => {
+                if (event.key === "Enter" || event.key === " ") onToggleSidebar();
+              }}
+              className={css({
+                width: "26px",
+                height: "26px",
+                borderRadius: "6px",
+                color: t.textTertiary,
+                cursor: "pointer",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                flexShrink: 0,
+                ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+              })}
+            >
+              <PanelRight size={14} />
+            </div>
+          ) : null}
+        </div>
+      </PanelHeaderBar>
+
+      <div
+        style={{
+          flex: 1,
+          minHeight: 0,
+          display: "flex",
+          flexDirection: "column",
+          borderTop: `1px solid ${t.borderDefault}`,
+          borderRight: `1px solid ${t.borderDefault}`,
+          borderTopRightRadius: "12px",
+          overflow: "hidden",
+        }}
+      >
+        <div
+          className={css({
+            display: "flex",
+            alignItems: "stretch",
+            gap: "4px",
+            borderBottom: `1px solid ${t.borderDefault}`,
+            backgroundColor: t.surfacePrimary,
+            height: "41px",
+            minHeight: "41px",
+            flexShrink: 0,
+            borderTopRightRadius: "12px",
+          })}
+        >
+          <button
+            onClick={() => setRightTab("overview")}
+            className={css({
+              appearance: "none",
+              WebkitAppearance: "none",
+              border: "none",
+              marginTop: "6px",
+              marginRight: "0",
+              marginBottom: "6px",
+              marginLeft: "6px",
+              boxSizing: "border-box",
+              display: "inline-flex",
+              alignItems: "center",
+              padding: "4px 12px",
+              borderRadius: "8px",
+              cursor: "pointer",
+              fontSize: "12px",
+              fontWeight: 500,
+              lineHeight: 1,
+              whiteSpace: "nowrap",
+              color: rightTab === "overview" ? t.textPrimary : t.textSecondary,
+              backgroundColor: rightTab === "overview" ? t.interactiveHover : "transparent",
+              transitionProperty: "color, background-color",
+              transitionDuration: "200ms",
+              transitionTimingFunction: "ease",
+              ":hover": { color: t.textPrimary, backgroundColor: rightTab === "overview" ? t.interactiveHover : t.interactiveSubtle },
+            })}
+          >
+            Overview
+          </button>
+          <button
+            onClick={() => setRightTab("changes")}
+            className={css({
+              appearance: "none",
+              WebkitAppearance: "none",
+              border: "none",
+              marginTop: "6px",
+              marginRight: "0",
+              marginBottom: "6px",
+              marginLeft: "0",
+              boxSizing: "border-box",
+              display: "inline-flex",
+              alignItems: "center",
+              gap: "6px",
+              padding: "4px 12px",
+              borderRadius: "8px",
+              cursor: "pointer",
+              fontSize: "12px",
+              fontWeight: 500,
+              lineHeight: 1,
+              whiteSpace: "nowrap",
+              color: rightTab === "changes" ? t.textPrimary : t.textSecondary,
+              backgroundColor: rightTab === "changes" ? t.interactiveHover : "transparent",
+              transitionProperty: "color, background-color",
+              transitionDuration: "200ms",
+              transitionTimingFunction: "ease",
+              ":hover": { color: t.textPrimary, backgroundColor: rightTab === "changes" ? t.interactiveHover : t.interactiveSubtle },
+            })}
+          >
+            Changes
+            {task.fileChanges.length > 0 ? (
+              <span
+                className={css({
+                  display: "inline-flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                  minWidth: "16px",
+                  height: "16px",
+                  padding: "0 5px",
+                  background: t.surfaceElevated,
+                  color: t.textSecondary,
+                  fontSize: "9px",
+                  fontWeight: 700,
+                  borderRadius: "8px",
+                })}
+              >
+                {task.fileChanges.length}
+              </span>
+            ) : null}
+          </button>
+          <button
+            onClick={() => setRightTab("files")}
+            className={css({
+              appearance: "none",
+              WebkitAppearance: "none",
+              border: "none",
+              marginTop: "6px",
+              marginRight: "0",
+              marginBottom: "6px",
+              marginLeft: "0",
+              boxSizing: "border-box",
+              display: "inline-flex",
+              alignItems: "center",
+              padding: "4px 12px",
+              borderRadius: "8px",
+              cursor: "pointer",
+              fontSize: "12px",
+              fontWeight: 500,
+              lineHeight: 1,
+              whiteSpace: "nowrap",
+              color: rightTab === "files" ? t.textPrimary : t.textSecondary,
+              backgroundColor: rightTab === "files" ? t.interactiveHover : "transparent",
+              transitionProperty: "color, background-color",
+              transitionDuration: "200ms",
+              transitionTimingFunction: "ease",
+              ":hover": { color: t.textPrimary, backgroundColor: rightTab === "files" ? t.interactiveHover : t.interactiveSubtle },
+            })}
+          >
+            All Files
+          </button>
+        </div>
+
+        <ScrollBody>
+          {rightTab === "overview" ? (
+            <div className={css({ padding: "16px 14px", display: "flex", flexDirection: "column", gap: "16px" })}>
+              <div className={css({ display: "flex", flexDirection: "column", gap: "8px" })}>
+                <LabelXSmall color={t.textTertiary} $style={{ textTransform: "uppercase", letterSpacing: "0.5px", fontWeight: 600 }}>
+                  Owner
+                </LabelXSmall>
+                <div ref={ownerDropdownRef} className={css({ position: "relative" })}>
+                  <div
+                    role="button"
+                    tabIndex={0}
+                    onClick={() => setOwnerDropdownOpen((prev) => !prev)}
+                    onKeyDown={(event) => {
+                      if (event.key === "Enter" || event.key === " ") setOwnerDropdownOpen((prev) => !prev);
+                    }}
+                    className={css({
+                      display: "flex",
+                      alignItems: "center",
+                      gap: "10px",
+                      paddingTop: "4px",
+                      paddingRight: "8px",
+                      paddingBottom: "4px",
+                      paddingLeft: "4px",
+                      borderRadius: "6px",
+                      cursor: "pointer",
+                      ":hover": { backgroundColor: t.interactiveHover },
+                    })}
+                  >
+                    {task.primaryUserLogin ? (
+                      <>
+                        {task.primaryUserAvatarUrl ? (
+                          <img
+                            src={task.primaryUserAvatarUrl}
+                            alt={task.primaryUserLogin}
+                            className={css({
+                              width: "28px",
+                              height: "28px",
+                              borderRadius: "50%",
+                              flexShrink: 0,
+                            })}
+                          />
+                        ) : (
+                          <div
+                            className={css({
+                              width: "28px",
+                              height: "28px",
+                              borderRadius: "50%",
+                              backgroundColor: t.surfaceElevated,
+                              display: "flex",
+                              alignItems: "center",
+                              justifyContent: "center",
+                              flexShrink: 0,
+                            })}
+                          >
+                            <User size={14} color={t.textTertiary} />
+                          </div>
+                        )}
+                        <LabelSmall color={t.textPrimary} $style={{ fontWeight: 500, flex: 1 }}>
+                          {task.primaryUserLogin}
+                        </LabelSmall>
+                      </>
+                    ) : (
+                      <>
+                        <div
+                          className={css({
+                            width: "28px",
+                            height: "28px",
+                            borderRadius: "50%",
+                            backgroundColor: t.surfaceElevated,
+                            display: "flex",
+                            alignItems: "center",
+                            justifyContent: "center",
+                            flexShrink: 0,
+                          })}
+                        >
+                          <User size={14} color={t.textTertiary} />
+                        </div>
+                        <LabelSmall color={t.textTertiary} $style={{ flex: 1 }}>
+                          No owner assigned
+                        </LabelSmall>
+                      </>
+                    )}
+                    <ChevronDown size={12} color={t.textTertiary} style={{ flexShrink: 0 }} />
+                  </div>
+                  {ownerDropdownOpen ? (
+                    <>
+                      <div
+                        onClick={() => setOwnerDropdownOpen(false)}
+                        className={css({ position: "fixed", top: 0, left: 0, right: 0, bottom: 0, zIndex: 99 })}
+                      />
+                      <div
+                        className={css({
+                          position: "absolute",
+                          top: "100%",
+                          left: 0,
+                          right: 0,
+                          zIndex: 100,
+                          marginTop: "4px",
+                          backgroundColor: t.surfaceElevated,
+                          borderRadius: "8px",
+                          boxShadow: "0 4px 12px rgba(0,0,0,0.3)",
+                          paddingTop: "4px",
+                          paddingBottom: "4px",
+                          maxHeight: "200px",
+                          overflowY: "auto",
+                        })}
+                      >
+                        {members.map((member) => (
+                          <div
+                            key={member.id}
+                            role="button"
+                            tabIndex={0}
+                            onClick={() => {
+                              onChangeOwner(member);
+                              setOwnerDropdownOpen(false);
+                            }}
+                            onKeyDown={(event) => {
+                              if (event.key === "Enter" || event.key === " ") {
+                                onChangeOwner(member);
+                                setOwnerDropdownOpen(false);
+                              }
+                            }}
+                            className={css({
+                              display: "flex",
+                              alignItems: "center",
+                              gap: "8px",
+                              paddingTop: "6px",
+                              paddingRight: "12px",
+                              paddingBottom: "6px",
+                              paddingLeft: "12px",
+                              cursor: "pointer",
+                              fontSize: "12px",
+                              color: t.textPrimary,
+                              ":hover": { backgroundColor: t.interactiveHover },
+                            })}
+                          >
+                            <div
+                              className={css({
+                                width: "20px",
+                                height: "20px",
+                                borderRadius: "50%",
+                                backgroundColor: t.surfacePrimary,
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                                flexShrink: 0,
+                              })}
+                            >
+                              <User size={10} color={t.textTertiary} />
+                            </div>
+                            <span>{member.name}</span>
+                          </div>
+                        ))}
+                        {members.length === 0 ? (
+                          <div
+                            className={css({
+                              paddingTop: "8px",
+                              paddingRight: "12px",
+                              paddingBottom: "8px",
+                              paddingLeft: "12px",
+                              fontSize: "12px",
+                              color: t.textTertiary,
+                            })}
+                          >
+                            No members
+                          </div>
+                        ) : null}
+                      </div>
+                    </>
+                  ) : null}
+                </div>
+              </div>
+              <div className={css({ display: "flex", flexDirection: "column", gap: "8px" })}>
+                <LabelXSmall color={t.textTertiary} $style={{ textTransform: "uppercase", letterSpacing: "0.5px", fontWeight: 600 }}>
+                  Branch
+                </LabelXSmall>
+                <div className={css({ display: "flex", alignItems: "center", gap: "8px" })}>
+                  <GitBranch size={14} color={t.textTertiary} style={{ flexShrink: 0 }} />
+                  <LabelSmall
+                    color={t.textSecondary}
+                    $style={{ fontFamily: '"IBM Plex Mono", monospace', overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
+                  >
+                    {task.branch ?? "No branch"}
+                  </LabelSmall>
+                </div>
+              </div>
+              <div className={css({ display: "flex", flexDirection: "column", gap: "8px" })}>
+                <LabelXSmall color={t.textTertiary} $style={{ textTransform: "uppercase", letterSpacing: "0.5px", fontWeight: 600 }}>
+                  Repository
+                </LabelXSmall>
+                <LabelSmall color={t.textSecondary}>{task.repoName}</LabelSmall>
+              </div>
+              {task.pullRequest ? (
+                <div className={css({ display: "flex", flexDirection: "column", gap: "8px" })}>
+                  <LabelXSmall color={t.textTertiary} $style={{ textTransform: "uppercase", letterSpacing: "0.5px", fontWeight: 600 }}>
+                    Pull Request
+                  </LabelXSmall>
+                  <div className={css({ display: "flex", alignItems: "center", gap: "8px" })}>
+                    <GitPullRequest size={14} color={t.textTertiary} style={{ flexShrink: 0 }} />
+                    <LabelSmall color={t.textSecondary}>
+                      #{task.pullRequest.number} {task.pullRequest.title ?? ""}
+                    </LabelSmall>
+                  </div>
+                </div>
+              ) : null}
+              {task.sandboxes?.find((s) => s.sandboxId === task.activeSandboxId)?.url ? (
+                <div className={css({ display: "flex", flexDirection: "column", gap: "8px" })}>
+                  <LabelXSmall color={t.textTertiary} $style={{ textTransform: "uppercase", letterSpacing: "0.5px", fontWeight: 600 }}>
+                    Sandbox
+                  </LabelXSmall>
+                  <a
+                    href={task.sandboxes.find((s) => s.sandboxId === task.activeSandboxId)!.url!}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className={css({
+                      display: "flex",
+                      alignItems: "center",
+                      gap: "8px",
+                      color: t.textSecondary,
+                      textDecoration: "none",
+                      borderRadius: "6px",
+                      paddingTop: "4px",
+                      paddingRight: "8px",
+                      paddingBottom: "4px",
+                      paddingLeft: "4px",
+                      ":hover": { backgroundColor: t.interactiveHover, color: t.textPrimary },
+                    })}
+                  >
+                    <ExternalLink size={14} color={t.textTertiary} style={{ flexShrink: 0 }} />
+                    <LabelSmall
+                      color="inherit"
+                      $style={{ fontFamily: '"IBM Plex Mono", monospace', overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
+                    >
+                      {task.sandboxes.find((s) => s.sandboxId === task.activeSandboxId)!.url!}
+                    </LabelSmall>
+                  </a>
+                </div>
+              ) : null}
+            </div>
+          ) : rightTab === "changes" ? (
+            <div className={css({ padding: "10px 14px", display: "flex", flexDirection: "column", gap: "2px" })}>
+              {task.fileChanges.length === 0 ? (
+                <div className={css({ padding: "20px 0", textAlign: "center" })}>
+                  <LabelSmall color={t.textTertiary}>No changes yet</LabelSmall>
+                </div>
+              ) : null}
+              {task.fileChanges.map((file) => {
+                const isActive = activeSessionId === diffTabId(file.path);
+                const TypeIcon = file.type === "A" ? FilePlus : file.type === "D" ? FileX : FileCode;
+                const iconColor = file.type === "A" ? t.statusSuccess : file.type === "D" ? t.statusError : t.textTertiary;
+                return (
+                  <div
+                    key={file.path}
+                    onClick={() => onOpenDiff(file.path)}
+                    onContextMenu={(event) => openFileMenu(event, file.path)}
+                    className={css({
+                      display: "flex",
+                      alignItems: "center",
+                      gap: "8px",
+                      padding: "6px 10px",
+                      borderRadius: "6px",
+                      backgroundColor: isActive ? t.interactiveHover : "transparent",
+                      cursor: "pointer",
+                      ":hover": { backgroundColor: t.interactiveHover },
+                    })}
+                  >
+                    <TypeIcon size={14} color={iconColor} style={{ flexShrink: 0 }} />
+                    <div
+                      className={css({
+                        flex: 1,
+                        minWidth: 0,
+                        fontFamily: '"IBM Plex Mono", monospace',
+                        fontSize: "12px",
+                        color: isActive ? t.textPrimary : t.textSecondary,
+                        overflow: "hidden",
+                        textOverflow: "ellipsis",
+                        whiteSpace: "nowrap",
+                      })}
+                    >
+                      {file.path}
+                    </div>
+                    <div
+                      className={css({
+                        display: "flex",
+                        alignItems: "center",
+                        gap: "6px",
+                        flexShrink: 0,
+                        fontSize: "11px",
+                        fontFamily: '"IBM Plex Mono", monospace',
+                      })}
+                    >
+                      <span className={css({ color: t.statusSuccess })}>+{file.added}</span>
+                      <span className={css({ color: t.statusError })}>-{file.removed}</span>
+                      <span className={css({ color: iconColor, fontWeight: 600, width: "10px", textAlign: "center" })}>{file.type}</span>
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+          ) : (
+            <div className={css({ padding: "6px 0" })}>
+              {task.fileTree.length > 0 ? (
+                <FileTree nodes={task.fileTree} depth={0} onSelectFile={onOpenDiff} onFileContextMenu={openFileMenu} changedPaths={changedPaths} />
+              ) : (
+                <div className={css({ padding: "20px 0", textAlign: "center" })}>
+                  <LabelSmall color={t.textTertiary}>No files yet</LabelSmall>
+                </div>
+              )}
+            </div>
+          )}
+        </ScrollBody>
+      </div>
+      {contextMenu.menu ? <ContextMenuOverlay menu={contextMenu.menu} onClose={contextMenu.close} /> : null}
+    </SPanel>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/session-strip.tsx b/foundry/packages/frontend/src/components/mock-layout/session-strip.tsx
new file mode 100644
index 0000000..105fbef
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/session-strip.tsx
@@ -0,0 +1,238 @@
+import { memo } from "react";
+import { useStyletron } from "baseui";
+import { LabelXSmall } from "baseui/typography";
+import { FileCode, Plus, X } from "lucide-react";
+
+import { useFoundryTokens } from "../../app/theme";
+import { ContextMenuOverlay, SessionAvatar, useContextMenu } from "./ui";
+import { diffTabId, fileName, type Task } from "./view-model";
+
+export const SessionStrip = memo(function SessionStrip({
+  task,
+  activeSessionId,
+  openDiffs,
+  editingSessionId,
+  editingSessionName,
+  onEditingSessionNameChange,
+  onSwitchSession,
+  onStartRenamingSession,
+  onCommitSessionRename,
+  onCancelSessionRename,
+  onSetSessionUnread,
+  onCloseSession,
+  onCloseDiffTab,
+  onAddSession,
+  sidebarCollapsed,
+}: {
+  task: Task;
+  activeSessionId: string | null;
+  openDiffs: string[];
+  editingSessionId: string | null;
+  editingSessionName: string;
+  onEditingSessionNameChange: (value: string) => void;
+  onSwitchSession: (sessionId: string) => void;
+  onStartRenamingSession: (sessionId: string) => void;
+  onCommitSessionRename: () => void;
+  onCancelSessionRename: () => void;
+  onSetSessionUnread: (sessionId: string, unread: boolean) => void;
+  onCloseSession: (sessionId: string) => void;
+  onCloseDiffTab: (path: string) => void;
+  onAddSession: () => void;
+  sidebarCollapsed?: boolean;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const isDesktop = !!import.meta.env.VITE_DESKTOP;
+  const contextMenu = useContextMenu();
+
+  return (
+    <>
+      <style>{`
+        [data-session]:hover [data-session-close] { opacity: 0.5 !important; }
+        [data-session]:hover [data-session-close]:hover { opacity: 1 !important; }
+      `}</style>
+      <div
+        className={css({
+          display: "flex",
+          alignItems: "stretch",
+          borderBottom: `1px solid ${t.borderDefault}`,
+          gap: "4px",
+          backgroundColor: t.surfacePrimary,
+          paddingLeft: sidebarCollapsed ? "14px" : "6px",
+          height: "41px",
+          minHeight: "41px",
+          overflowX: "auto",
+          scrollbarWidth: "none",
+          flexShrink: 0,
+          "::-webkit-scrollbar": { display: "none" },
+        })}
+      >
+        {task.sessions.map((tab) => {
+          const isActive = tab.id === activeSessionId;
+          return (
+            <div
+              key={tab.id}
+              onClick={() => onSwitchSession(tab.id)}
+              onDoubleClick={() => onStartRenamingSession(tab.id)}
+              onMouseDown={(event) => {
+                if (event.button === 1 && task.sessions.length > 1) {
+                  event.preventDefault();
+                  onCloseSession(tab.id);
+                }
+              }}
+              onContextMenu={(event) =>
+                contextMenu.open(event, [
+                  { label: "Rename session", onClick: () => onStartRenamingSession(tab.id) },
+                  {
+                    label: tab.unread ? "Mark as read" : "Mark as unread",
+                    onClick: () => onSetSessionUnread(tab.id, !tab.unread),
+                  },
+                  ...(task.sessions.length > 1 ? [{ label: "Close session", onClick: () => onCloseSession(tab.id) }] : []),
+                ])
+              }
+              data-session
+              className={css({
+                display: "flex",
+                alignItems: "center",
+                gap: "6px",
+                padding: "4px 12px",
+                marginTop: "6px",
+                marginBottom: "6px",
+                borderRadius: "8px",
+                backgroundColor: isActive ? t.interactiveHover : "transparent",
+                cursor: "pointer",
+                transition: "color 200ms ease, background-color 200ms ease",
+                flexShrink: 0,
+                ":hover": { color: t.textPrimary, backgroundColor: isActive ? t.interactiveHover : t.interactiveSubtle },
+              })}
+            >
+              <div
+                className={css({
+                  width: "14px",
+                  minWidth: "14px",
+                  height: "14px",
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                  flexShrink: 0,
+                })}
+              >
+                <SessionAvatar session={tab} />
+              </div>
+              {editingSessionId === tab.id ? (
+                <input
+                  autoFocus
+                  value={editingSessionName}
+                  onChange={(event) => onEditingSessionNameChange(event.target.value)}
+                  onBlur={onCommitSessionRename}
+                  onClick={(event) => event.stopPropagation()}
+                  onDoubleClick={(event) => event.stopPropagation()}
+                  onKeyDown={(event) => {
+                    if (event.key === "Enter") {
+                      onCommitSessionRename();
+                    } else if (event.key === "Escape") {
+                      onCancelSessionRename();
+                    }
+                  }}
+                  className={css({
+                    appearance: "none",
+                    WebkitAppearance: "none",
+                    background: "none",
+                    border: "none",
+                    padding: "0",
+                    margin: "0",
+                    outline: "none",
+                    minWidth: "72px",
+                    maxWidth: "180px",
+                    fontSize: "11px",
+                    fontWeight: 600,
+                    color: t.textPrimary,
+                    borderBottom: `1px solid ${t.borderFocus}`,
+                  })}
+                />
+              ) : (
+                <LabelXSmall color={isActive ? t.textPrimary : t.textSecondary} $style={{ fontWeight: 500 }}>
+                  {tab.sessionName}
+                </LabelXSmall>
+              )}
+              {task.sessions.length > 1 ? (
+                <X
+                  size={11}
+                  color={t.textTertiary}
+                  data-session-close
+                  className={css({ cursor: "pointer", opacity: 0 })}
+                  onClick={(event) => {
+                    event.stopPropagation();
+                    onCloseSession(tab.id);
+                  }}
+                />
+              ) : null}
+            </div>
+          );
+        })}
+        {openDiffs.map((path) => {
+          const sessionId = diffTabId(path);
+          const isActive = sessionId === activeSessionId;
+          return (
+            <div
+              key={sessionId}
+              onClick={() => onSwitchSession(sessionId)}
+              onMouseDown={(event) => {
+                if (event.button === 1) {
+                  event.preventDefault();
+                  onCloseDiffTab(path);
+                }
+              }}
+              data-session
+              className={css({
+                display: "flex",
+                alignItems: "center",
+                gap: "6px",
+                padding: "4px 12px",
+                marginTop: "6px",
+                marginBottom: "6px",
+                borderRadius: "8px",
+                backgroundColor: isActive ? t.interactiveHover : "transparent",
+                cursor: "pointer",
+                transition: "color 200ms ease, background-color 200ms ease",
+                flexShrink: 0,
+                ":hover": { color: t.textPrimary, backgroundColor: isActive ? t.interactiveHover : t.interactiveSubtle },
+              })}
+            >
+              <FileCode size={12} color={isActive ? t.textPrimary : t.textSecondary} />
+              <LabelXSmall color={isActive ? t.textPrimary : t.textSecondary} $style={{ fontWeight: 500, fontFamily: '"IBM Plex Mono", monospace' }}>
+                {fileName(path)}
+              </LabelXSmall>
+              <X
+                size={11}
+                color={t.textTertiary}
+                data-session-close
+                className={css({ cursor: "pointer", opacity: 0 })}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  onCloseDiffTab(path);
+                }}
+              />
+            </div>
+          );
+        })}
+        <div
+          onClick={onAddSession}
+          className={css({
+            display: "flex",
+            alignItems: "center",
+            padding: "0 10px",
+            cursor: "pointer",
+            opacity: 0.4,
+            lineHeight: 0,
+            ":hover": { opacity: 0.7 },
+            flexShrink: 0,
+          })}
+        >
+          <Plus size={14} color={t.textTertiary} />
+        </div>
+      </div>
+      {contextMenu.menu ? <ContextMenuOverlay menu={contextMenu.menu} onClose={contextMenu.close} /> : null}
+    </>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/sidebar.tsx b/foundry/packages/frontend/src/components/mock-layout/sidebar.tsx
new file mode 100644
index 0000000..6ebb026
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/sidebar.tsx
@@ -0,0 +1,1190 @@
+import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import { useNavigate } from "@tanstack/react-router";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { useStyletron } from "baseui";
+import { LabelSmall, LabelXSmall } from "baseui/typography";
+import { Select, type Value } from "baseui/select";
+import {
+  ChevronDown,
+  ChevronRight,
+  ChevronUp,
+  CloudUpload,
+  CreditCard,
+  GitPullRequestDraft,
+  ListChecks,
+  LogOut,
+  MoreHorizontal,
+  PanelLeft,
+  Plus,
+  Settings,
+  User,
+} from "lucide-react";
+
+import { formatRelativeAge, type Task, type RepositorySection } from "./view-model";
+import { ContextMenuOverlay, TaskIndicator, PanelHeaderBar, SPanel, ScrollBody, useContextMenu } from "./ui";
+import { activeMockOrganization, eligibleOrganizations, useMockAppClient, useMockAppSnapshot } from "../../lib/mock-app";
+import { useFoundryTokens } from "../../app/theme";
+import type { FoundryTokens } from "../../styles/tokens";
+
+const REPOSITORY_COLORS = ["#6366f1", "#f59e0b", "#10b981", "#ef4444", "#8b5cf6", "#ec4899", "#06b6d4", "#f97316"];
+
+/** Strip the org prefix (e.g. "rivet-dev/") when all repos share the same org. */
+function stripCommonOrgPrefix(label: string, repos: Array<{ label: string }>): string {
+  const slashIdx = label.indexOf("/");
+  if (slashIdx < 0) return label;
+  const prefix = label.slice(0, slashIdx + 1);
+  if (repos.every((r) => r.label.startsWith(prefix))) {
+    return label.slice(slashIdx + 1);
+  }
+  return label;
+}
+
+function repositoryInitial(label: string): string {
+  const parts = label.split("/");
+  const name = parts[parts.length - 1] ?? label;
+  return name.charAt(0).toUpperCase();
+}
+
+function repositoryIconColor(label: string): string {
+  let hash = 0;
+  for (let i = 0; i < label.length; i++) {
+    hash = (hash * 31 + label.charCodeAt(i)) | 0;
+  }
+  return REPOSITORY_COLORS[Math.abs(hash) % REPOSITORY_COLORS.length]!;
+}
+
+export const Sidebar = memo(function Sidebar({
+  repositories,
+  newTaskRepos,
+  selectedNewTaskRepoId,
+  activeId,
+  onSelect,
+  onCreate,
+  onSelectNewTaskRepo,
+  onMarkUnread,
+  onRenameTask,
+  onReorderRepositories,
+  taskOrderByRepository,
+  onReorderTasks,
+  onReloadOrganization,
+  onReloadRepository,
+  onToggleSidebar,
+}: {
+  repositories: RepositorySection[];
+  newTaskRepos: Array<{ id: string; label: string }>;
+  selectedNewTaskRepoId: string;
+  activeId: string;
+  onSelect: (id: string) => void;
+  onCreate: (repoId?: string) => void;
+  onSelectNewTaskRepo: (repoId: string) => void;
+  onMarkUnread: (id: string) => void;
+  onRenameTask: (id: string) => void;
+  onReorderRepositories: (fromIndex: number, toIndex: number) => void;
+  taskOrderByRepository: Record<string, string[]>;
+  onReorderTasks: (repositoryId: string, fromIndex: number, toIndex: number) => void;
+  onReloadOrganization: () => void;
+  onReloadRepository: (repoId: string) => void;
+  onToggleSidebar?: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const contextMenu = useContextMenu();
+  const [collapsedRepositories, setCollapsedRepositories] = useState<Record<string, boolean>>({});
+  const [hoveredRepositoryId, setHoveredRepositoryId] = useState<string | null>(null);
+  const [headerMenuOpen, setHeaderMenuOpen] = useState(false);
+  const headerMenuRef = useRef<HTMLDivElement>(null);
+  const scrollRef = useRef<HTMLDivElement>(null);
+
+  // Mouse-based drag and drop state
+  type DragState =
+    | { type: "repository"; fromIdx: number; overIdx: number | null }
+    | { type: "task"; repositoryId: string; fromIdx: number; overIdx: number | null }
+    | null;
+  const [drag, setDrag] = useState<DragState>(null);
+  const dragRef = useRef<DragState>(null);
+  const startYRef = useRef(0);
+  const didDragRef = useRef(false);
+
+  // Attach global mousemove/mouseup when dragging
+  useEffect(() => {
+    if (!drag) return;
+    const onMove = (e: MouseEvent) => {
+      // Detect which element is under the cursor using data attributes
+      const el = document.elementFromPoint(e.clientX, e.clientY);
+      if (!el) return;
+      const repositoryEl = (el as HTMLElement).closest?.("[data-repository-idx]") as HTMLElement | null;
+      const taskEl = (el as HTMLElement).closest?.("[data-task-idx]") as HTMLElement | null;
+
+      if (drag.type === "repository" && repositoryEl) {
+        const overIdx = Number(repositoryEl.dataset.repositoryIdx);
+        if (overIdx !== drag.overIdx) {
+          setDrag({ ...drag, overIdx });
+          dragRef.current = { ...drag, overIdx };
+        }
+      } else if (drag.type === "task" && taskEl) {
+        const overRepositoryId = taskEl.dataset.taskRepositoryId ?? "";
+        const overIdx = Number(taskEl.dataset.taskIdx);
+        if (overRepositoryId === drag.repositoryId && overIdx !== drag.overIdx) {
+          setDrag({ ...drag, overIdx });
+          dragRef.current = { ...drag, overIdx };
+        }
+      }
+      // Mark that we actually moved (to distinguish from clicks)
+      if (Math.abs(e.clientY - startYRef.current) > 4) {
+        didDragRef.current = true;
+      }
+    };
+    const onUp = () => {
+      const d = dragRef.current;
+      if (d && didDragRef.current && d.overIdx !== null && d.fromIdx !== d.overIdx) {
+        if (d.type === "repository") {
+          onReorderRepositories(d.fromIdx, d.overIdx);
+        } else {
+          onReorderTasks(d.repositoryId, d.fromIdx, d.overIdx);
+        }
+      }
+      dragRef.current = null;
+      didDragRef.current = false;
+      setDrag(null);
+    };
+    document.addEventListener("mousemove", onMove);
+    document.addEventListener("mouseup", onUp);
+    return () => {
+      document.removeEventListener("mousemove", onMove);
+      document.removeEventListener("mouseup", onUp);
+    };
+  }, [drag, onReorderRepositories, onReorderTasks]);
+
+  useEffect(() => {
+    if (!headerMenuOpen) {
+      return;
+    }
+    const onMouseDown = (event: MouseEvent) => {
+      if (headerMenuRef.current?.contains(event.target as Node)) {
+        return;
+      }
+      setHeaderMenuOpen(false);
+    };
+    document.addEventListener("mousedown", onMouseDown);
+    return () => document.removeEventListener("mousedown", onMouseDown);
+  }, [headerMenuOpen]);
+
+  const [createSelectOpen, setCreateSelectOpen] = useState(false);
+  const selectOptions = useMemo(() => newTaskRepos.map((repo) => ({ id: repo.id, label: stripCommonOrgPrefix(repo.label, newTaskRepos) })), [newTaskRepos]);
+  type FlatItem =
+    | { key: string; type: "repository-header"; repository: RepositorySection; repositoryIndex: number }
+    | { key: string; type: "task"; repository: RepositorySection; repositoryIndex: number; task: Task; taskIndex: number }
+    | { key: string; type: "task-drop-zone"; repository: RepositorySection; repositoryIndex: number; taskCount: number }
+    | { key: string; type: "repository-drop-zone"; repositoryCount: number };
+  const flatItems = useMemo<FlatItem[]>(() => {
+    const items: FlatItem[] = [];
+    repositories.forEach((repository, repositoryIndex) => {
+      items.push({ key: `repository:${repository.id}`, type: "repository-header", repository, repositoryIndex });
+      if (!collapsedRepositories[repository.id]) {
+        const orderedTaskIds = taskOrderByRepository[repository.id];
+        const orderedTasks = orderedTaskIds
+          ? (() => {
+              const byId = new Map(repository.tasks.map((t) => [t.id, t]));
+              const sorted = orderedTaskIds.map((id) => byId.get(id)).filter(Boolean) as typeof repository.tasks;
+              for (const t of repository.tasks) {
+                if (!orderedTaskIds.includes(t.id)) sorted.push(t);
+              }
+              return sorted;
+            })()
+          : repository.tasks;
+        orderedTasks.forEach((task, taskIndex) => {
+          items.push({ key: `task:${task.id}`, type: "task" as const, repository, repositoryIndex, task, taskIndex });
+        });
+        items.push({ key: `task-drop:${repository.id}`, type: "task-drop-zone", repository, repositoryIndex, taskCount: orderedTasks.length });
+      }
+    });
+    items.push({ key: "repository-drop-zone", type: "repository-drop-zone", repositoryCount: repositories.length });
+    return items;
+  }, [collapsedRepositories, repositories, taskOrderByRepository]);
+  const virtualizer = useVirtualizer({
+    count: flatItems.length,
+    getItemKey: (index) => flatItems[index]?.key ?? index,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 40,
+    overscan: 12,
+    measureElement: (element) => element.getBoundingClientRect().height,
+  });
+
+  return (
+    <SPanel>
+      <style>{`
+        [data-repository-header]:hover [data-chevron] {
+          display: inline-flex !important;
+        }
+        [data-repository-header]:hover [data-repository-icon] {
+          display: none !important;
+        }
+      `}</style>
+      {import.meta.env.VITE_DESKTOP ? (
+        <div
+          className={css({
+            height: "38px",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "flex-end",
+            paddingRight: "10px",
+            flexShrink: 0,
+            position: "relative",
+            zIndex: 9999,
+          })}
+        >
+          {onToggleSidebar ? (
+            <div
+              role="button"
+              tabIndex={0}
+              onClick={onToggleSidebar}
+              onKeyDown={(event) => {
+                if (event.key === "Enter" || event.key === " ") onToggleSidebar();
+              }}
+              className={css({
+                width: "26px",
+                height: "26px",
+                borderRadius: "6px",
+                color: t.textTertiary,
+                cursor: "pointer",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                flexShrink: 0,
+                ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+              })}
+            >
+              <PanelLeft size={14} />
+            </div>
+          ) : null}
+        </div>
+      ) : null}
+      <PanelHeaderBar $style={{ backgroundColor: "transparent", borderBottom: "none" }}>
+        <LabelSmall
+          color={t.textPrimary}
+          $style={{ fontWeight: 500, flex: 1, fontSize: "13px", display: "flex", alignItems: "center", gap: "6px", lineHeight: 1 }}
+        >
+          <ListChecks size={14} />
+          Tasks
+        </LabelSmall>
+        {!import.meta.env.VITE_DESKTOP && onToggleSidebar ? (
+          <div
+            role="button"
+            tabIndex={0}
+            onClick={onToggleSidebar}
+            onKeyDown={(event) => {
+              if (event.key === "Enter" || event.key === " ") onToggleSidebar();
+            }}
+            className={css({
+              width: "26px",
+              height: "26px",
+              borderRadius: "6px",
+              color: t.textTertiary,
+              cursor: "pointer",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              flexShrink: 0,
+              ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+            })}
+          >
+            <PanelLeft size={14} />
+          </div>
+        ) : null}
+        {createSelectOpen ? (
+          <div className={css({ flex: 1, minWidth: 0 })}>
+            <Select
+              options={selectOptions}
+              value={[]}
+              placeholder="Search repos..."
+              type="search"
+              openOnClick
+              autoFocus
+              onChange={({ value }: { value: Value }) => {
+                const selected = value[0];
+                if (selected) {
+                  onSelectNewTaskRepo(selected.id as string);
+                  setCreateSelectOpen(false);
+                  onCreate(selected.id as string);
+                }
+              }}
+              onClose={() => setCreateSelectOpen(false)}
+              overrides={{
+                Root: {
+                  style: {
+                    width: "100%",
+                  },
+                },
+                ControlContainer: {
+                  style: {
+                    backgroundColor: t.surfaceTertiary,
+                    borderTopColor: t.borderSubtle,
+                    borderBottomColor: t.borderSubtle,
+                    borderLeftColor: t.borderSubtle,
+                    borderRightColor: t.borderSubtle,
+                    borderTopWidth: "1px",
+                    borderBottomWidth: "1px",
+                    borderLeftWidth: "1px",
+                    borderRightWidth: "1px",
+                    borderTopLeftRadius: "6px",
+                    borderTopRightRadius: "6px",
+                    borderBottomLeftRadius: "6px",
+                    borderBottomRightRadius: "6px",
+                    minHeight: "28px",
+                    paddingLeft: "8px",
+                  },
+                },
+                ValueContainer: {
+                  style: {
+                    paddingTop: "0px",
+                    paddingBottom: "0px",
+                  },
+                },
+                Input: {
+                  style: {
+                    fontSize: "12px",
+                    color: t.textPrimary,
+                  },
+                },
+                Placeholder: {
+                  style: {
+                    fontSize: "12px",
+                    color: t.textMuted,
+                  },
+                },
+                Dropdown: {
+                  style: {
+                    backgroundColor: t.surfaceElevated,
+                    borderTopColor: t.borderDefault,
+                    borderBottomColor: t.borderDefault,
+                    borderLeftColor: t.borderDefault,
+                    borderRightColor: t.borderDefault,
+                    maxHeight: "min(320px, 50vh)",
+                  },
+                },
+                DropdownListItem: {
+                  style: {
+                    fontSize: "12px",
+                    paddingTop: "6px",
+                    paddingBottom: "6px",
+                  },
+                },
+                IconsContainer: {
+                  style: {
+                    paddingRight: "4px",
+                  },
+                },
+                SearchIconContainer: {
+                  style: {
+                    paddingLeft: "0px",
+                    paddingRight: "4px",
+                  },
+                },
+              }}
+            />
+          </div>
+        ) : (
+          <div className={css({ display: "flex", alignItems: "center", gap: "6px", position: "relative" })} ref={headerMenuRef}>
+            <button
+              type="button"
+              onClick={() => setHeaderMenuOpen((value) => !value)}
+              className={css({
+                width: "26px",
+                height: "26px",
+                borderRadius: "8px",
+                border: "none",
+                backgroundColor: t.interactiveHover,
+                color: t.textPrimary,
+                cursor: "pointer",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                transition: "background 200ms ease",
+                flexShrink: 0,
+                ":hover": { backgroundColor: t.borderMedium },
+              })}
+              title="GitHub actions"
+            >
+              <MoreHorizontal size={14} />
+            </button>
+            {headerMenuOpen ? (
+              <div
+                className={css({
+                  position: "absolute",
+                  top: "32px",
+                  right: 0,
+                  minWidth: "180px",
+                  padding: "6px",
+                  borderRadius: "10px",
+                  backgroundColor: t.surfaceElevated,
+                  border: `1px solid ${t.borderDefault}`,
+                  boxShadow: `${t.shadow}, 0 0 0 1px ${t.interactiveSubtle}`,
+                  display: "flex",
+                  flexDirection: "column",
+                  gap: "4px",
+                  zIndex: 20,
+                })}
+              >
+                <button
+                  type="button"
+                  onClick={() => {
+                    setHeaderMenuOpen(false);
+                    onReloadOrganization();
+                  }}
+                  className={css(menuButtonStyle(false, t))}
+                >
+                  Reload organization
+                </button>
+              </div>
+            ) : null}
+            <div
+              role="button"
+              tabIndex={0}
+              aria-disabled={newTaskRepos.length === 0}
+              onClick={() => {
+                if (newTaskRepos.length === 0) return;
+                if (newTaskRepos.length === 1) {
+                  onSelectNewTaskRepo(newTaskRepos[0]!.id);
+                  onCreate(newTaskRepos[0]!.id);
+                } else {
+                  setCreateSelectOpen(true);
+                }
+              }}
+              onKeyDown={(event) => {
+                if (newTaskRepos.length === 0) return;
+                if (event.key === "Enter" || event.key === " ") {
+                  if (newTaskRepos.length === 1) {
+                    onSelectNewTaskRepo(newTaskRepos[0]!.id);
+                    onCreate(newTaskRepos[0]!.id);
+                  } else {
+                    setCreateSelectOpen(true);
+                  }
+                }
+              }}
+              className={css({
+                width: "26px",
+                height: "26px",
+                borderRadius: "8px",
+                backgroundColor: newTaskRepos.length > 0 ? t.borderMedium : t.interactiveHover,
+                color: t.textPrimary,
+                cursor: newTaskRepos.length > 0 ? "pointer" : "not-allowed",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                transition: "background 200ms ease",
+                flexShrink: 0,
+                opacity: newTaskRepos.length > 0 ? 1 : 0.6,
+                ":hover": newTaskRepos.length > 0 ? { backgroundColor: "rgba(255, 255, 255, 0.20)" } : undefined,
+              })}
+            >
+              <Plus size={14} style={{ display: "block" }} />
+            </div>
+          </div>
+        )}
+      </PanelHeaderBar>
+      <ScrollBody ref={scrollRef}>
+        <div className={css({ padding: "8px" })}>
+          <div
+            className={css({ position: "relative", width: "100%" })}
+            style={{
+              height: `${virtualizer.getTotalSize()}px`,
+            }}
+          >
+            {virtualizer.getVirtualItems().map((virtualItem) => {
+              const item = flatItems[virtualItem.index];
+              if (!item) {
+                return null;
+              }
+
+              if (item.type === "repository-header") {
+                const { repository, repositoryIndex } = item;
+                const isCollapsed = collapsedRepositories[repository.id] === true;
+                const isRepositoryDropTarget = drag?.type === "repository" && drag.overIdx === repositoryIndex && drag.fromIdx !== repositoryIndex;
+                const isBeingDragged = drag?.type === "repository" && drag.fromIdx === repositoryIndex && didDragRef.current;
+
+                return (
+                  <div
+                    key={item.key}
+                    data-index={virtualItem.index}
+                    data-repository-idx={repositoryIndex}
+                    ref={(node) => {
+                      if (node) {
+                        virtualizer.measureElement(node);
+                      }
+                    }}
+                    style={{
+                      left: 0,
+                      position: "absolute",
+                      top: 0,
+                      transform: `translateY(${virtualItem.start}px)`,
+                      width: "100%",
+                      opacity: isBeingDragged ? 0.4 : 1,
+                      transition: "opacity 150ms ease",
+                    }}
+                  >
+                    {isRepositoryDropTarget ? (
+                      <div className={css({ height: "2px", backgroundColor: t.textPrimary, transition: "background-color 100ms ease" })} />
+                    ) : null}
+                    <div className={css({ paddingBottom: "4px" })}>
+                      <div
+                        onMouseEnter={() => setHoveredRepositoryId(repository.id)}
+                        onMouseLeave={() => setHoveredRepositoryId((cur) => (cur === repository.id ? null : cur))}
+                        onMouseDown={(event) => {
+                          if (event.button !== 0) return;
+                          startYRef.current = event.clientY;
+                          didDragRef.current = false;
+                          setHoveredRepositoryId(null);
+                          const state: DragState = { type: "repository", fromIdx: repositoryIndex, overIdx: null };
+                          dragRef.current = state;
+                          setDrag(state);
+                        }}
+                        onClick={() => {
+                          if (!didDragRef.current) {
+                            setCollapsedRepositories((current) => ({
+                              ...current,
+                              [repository.id]: !current[repository.id],
+                            }));
+                          }
+                        }}
+                        onContextMenu={(event) =>
+                          contextMenu.open(event, [
+                            { label: "Reload repository", onClick: () => onReloadRepository(repository.id) },
+                            { label: "New task", onClick: () => onCreate(repository.id) },
+                          ])
+                        }
+                        data-repository-header
+                        className={css({
+                          display: "flex",
+                          alignItems: "center",
+                          justifyContent: "space-between",
+                          padding: "10px 8px 4px",
+                          gap: "8px",
+                          cursor: "grab",
+                          userSelect: "none",
+                        })}
+                      >
+                        <div className={css({ display: "flex", alignItems: "center", gap: "4px", overflow: "hidden" })}>
+                          <div className={css({ position: "relative", width: "14px", height: "14px", flexShrink: 0 })}>
+                            <span
+                              className={css({
+                                position: "absolute",
+                                inset: 0,
+                                display: "inline-flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                                borderRadius: "3px",
+                                fontSize: "9px",
+                                fontWeight: 700,
+                                lineHeight: 1,
+                                color: t.textOnAccent,
+                                backgroundColor: repositoryIconColor(repository.label),
+                              })}
+                              data-repository-icon
+                            >
+                              {repositoryInitial(repository.label)}
+                            </span>
+                            <span
+                              className={css({ position: "absolute", inset: 0, display: "none", alignItems: "center", justifyContent: "center" })}
+                              data-chevron
+                            >
+                              {isCollapsed ? <ChevronDown size={12} color={t.textTertiary} /> : <ChevronUp size={12} color={t.textTertiary} />}
+                            </span>
+                          </div>
+                          <LabelSmall
+                            color={t.textSecondary}
+                            $style={{
+                              fontSize: "11px",
+                              fontWeight: 700,
+                              letterSpacing: "0.05em",
+                              textTransform: "uppercase",
+                              overflow: "hidden",
+                              textOverflow: "ellipsis",
+                              whiteSpace: "nowrap",
+                            }}
+                          >
+                            {stripCommonOrgPrefix(repository.label, repositories)}
+                          </LabelSmall>
+                        </div>
+                        <div className={css({ display: "flex", alignItems: "center", gap: "4px", flexShrink: 0 })}>
+                          {isCollapsed ? <LabelXSmall color={t.textTertiary}>{formatRelativeAge(repository.updatedAtMs)}</LabelXSmall> : null}
+                          <button
+                            onClick={(event) => {
+                              event.stopPropagation();
+                              setHoveredRepositoryId(null);
+                              onSelectNewTaskRepo(repository.id);
+                              onCreate(repository.id);
+                            }}
+                            onMouseDown={(e) => e.stopPropagation()}
+                            className={css({
+                              display: "inline-flex",
+                              alignItems: "center",
+                              justifyContent: "center",
+                              width: "26px",
+                              height: "26px",
+                              borderRadius: "6px",
+                              border: "none",
+                              backgroundColor: "transparent",
+                              padding: 0,
+                              margin: 0,
+                              cursor: "pointer",
+                              color: t.textTertiary,
+                              opacity: hoveredRepositoryId === repository.id ? 1 : 0,
+                              transition: "opacity 150ms ease, background-color 200ms ease, color 200ms ease",
+                              pointerEvents: hoveredRepositoryId === repository.id ? "auto" : "none",
+                              ":hover": { backgroundColor: t.interactiveHover, color: t.textSecondary },
+                            })}
+                            title={`New task in ${repository.label}`}
+                          >
+                            <Plus size={12} color={t.textTertiary} />
+                          </button>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                );
+              }
+
+              if (item.type === "task") {
+                const { repository, task, taskIndex } = item;
+                const isActive = task.id === activeId;
+                const isRunning = task.sessions.some((s) => s.status === "running");
+                const isProvisioning =
+                  (String(task.status).startsWith("init_") && task.status !== "init_complete") ||
+                  task.sessions.some((s) => s.status === "pending_provision" || s.status === "pending_session_create");
+                const hasUnread = task.sessions.some((s) => s.unread);
+                const isDraft = task.pullRequest?.isDraft ?? true;
+                const totalAdded = task.fileChanges.reduce((sum, file) => sum + file.added, 0);
+                const totalRemoved = task.fileChanges.reduce((sum, file) => sum + file.removed, 0);
+                const hasDiffs = totalAdded > 0 || totalRemoved > 0;
+                const isTaskDropTarget =
+                  drag?.type === "task" && drag.repositoryId === repository.id && drag.overIdx === taskIndex && drag.fromIdx !== taskIndex;
+                const isTaskBeingDragged = drag?.type === "task" && drag.repositoryId === repository.id && drag.fromIdx === taskIndex && didDragRef.current;
+
+                return (
+                  <div
+                    key={item.key}
+                    data-index={virtualItem.index}
+                    data-task-idx={taskIndex}
+                    data-task-repository-id={repository.id}
+                    ref={(node) => {
+                      if (node) {
+                        virtualizer.measureElement(node);
+                      }
+                    }}
+                    style={{
+                      left: 0,
+                      position: "absolute",
+                      top: 0,
+                      transform: `translateY(${virtualItem.start}px)`,
+                      width: "100%",
+                      opacity: isTaskBeingDragged ? 0.4 : 1,
+                      transition: "opacity 150ms ease",
+                    }}
+                    onMouseDown={(event) => {
+                      if (event.button !== 0) return;
+                      if (dragRef.current) return;
+                      event.stopPropagation();
+                      startYRef.current = event.clientY;
+                      didDragRef.current = false;
+                      const state: DragState = { type: "task", repositoryId: repository.id, fromIdx: taskIndex, overIdx: null };
+                      dragRef.current = state;
+                      setDrag(state);
+                    }}
+                  >
+                    {isTaskDropTarget ? (
+                      <div className={css({ height: "2px", backgroundColor: t.textPrimary, transition: "background-color 100ms ease" })} />
+                    ) : null}
+                    <div className={css({ paddingBottom: "4px" })}>
+                      <div
+                        onClick={() => onSelect(task.id)}
+                        onContextMenu={(event) => {
+                          const items = [
+                            { label: "Rename task", onClick: () => onRenameTask(task.id) },
+                            { label: "Mark as unread", onClick: () => onMarkUnread(task.id) },
+                          ];
+                          contextMenu.open(event, items);
+                        }}
+                        className={css({
+                          padding: "8px 12px",
+                          borderRadius: "8px",
+                          backgroundColor: isActive ? t.interactiveHover : "transparent",
+                          cursor: "pointer",
+                          transition: "all 150ms ease",
+                          ":hover": {
+                            backgroundColor: t.interactiveHover,
+                          },
+                        })}
+                      >
+                        <div className={css({ display: "flex", alignItems: "center", gap: "8px" })}>
+                          <div
+                            className={css({
+                              width: "14px",
+                              minWidth: "14px",
+                              height: "14px",
+                              display: "flex",
+                              alignItems: "center",
+                              justifyContent: "center",
+                              flexShrink: 0,
+                            })}
+                          >
+                            <TaskIndicator isRunning={isRunning} isProvisioning={isProvisioning} hasUnread={hasUnread} isDraft={isDraft} />
+                          </div>
+                          <div className={css({ minWidth: 0, flex: 1, display: "flex", flexDirection: "column", gap: "1px" })}>
+                            <LabelSmall
+                              $style={{
+                                fontWeight: hasUnread ? 600 : 400,
+                                overflow: "hidden",
+                                textOverflow: "ellipsis",
+                                whiteSpace: "nowrap",
+                                minWidth: 0,
+                                flexShrink: 1,
+                              }}
+                              color={hasUnread ? t.textPrimary : t.textSecondary}
+                            >
+                              {task.title}
+                            </LabelSmall>
+                          </div>
+                          {task.primaryUserLogin ? (
+                            <span
+                              className={css({
+                                fontSize: "10px",
+                                fontWeight: 500,
+                                color: t.statusSuccess,
+                                whiteSpace: "nowrap",
+                                flexShrink: 0,
+                                maxWidth: "80px",
+                                overflow: "hidden",
+                                textOverflow: "ellipsis",
+                              })}
+                              title={task.primaryUserLogin}
+                            >
+                              {task.primaryUserLogin}
+                            </span>
+                          ) : null}
+                          {task.pullRequest != null ? (
+                            <span className={css({ display: "inline-flex", alignItems: "center", gap: "4px", flexShrink: 0 })}>
+                              <LabelXSmall color={t.textSecondary} $style={{ fontWeight: 600 }}>
+                                #{task.pullRequest.number}
+                              </LabelXSmall>
+                              {task.pullRequest.isDraft ? <CloudUpload size={11} color={t.accent} /> : null}
+                            </span>
+                          ) : (
+                            <GitPullRequestDraft size={11} color={t.textTertiary} />
+                          )}
+                          {hasDiffs ? (
+                            <div className={css({ display: "flex", gap: "4px", flexShrink: 0, marginLeft: "auto" })}>
+                              <span className={css({ fontSize: "11px", color: t.statusSuccess })}>+{totalAdded}</span>
+                              <span className={css({ fontSize: "11px", color: t.statusError })}>-{totalRemoved}</span>
+                            </div>
+                          ) : null}
+                          <LabelXSmall color={t.textTertiary} $style={{ flexShrink: 0, marginLeft: hasDiffs ? undefined : "auto" }}>
+                            {formatRelativeAge(task.updatedAtMs)}
+                          </LabelXSmall>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                );
+              }
+
+              if (item.type === "task-drop-zone") {
+                const { repository, taskCount } = item;
+                const isDropTarget = drag?.type === "task" && drag.repositoryId === repository.id && drag.overIdx === taskCount && drag.fromIdx !== taskCount;
+                return (
+                  <div
+                    key={item.key}
+                    data-index={virtualItem.index}
+                    data-task-idx={taskCount}
+                    data-task-repository-id={repository.id}
+                    ref={(node) => {
+                      if (node) {
+                        virtualizer.measureElement(node);
+                      }
+                    }}
+                    style={{
+                      left: 0,
+                      position: "absolute",
+                      top: 0,
+                      transform: `translateY(${virtualItem.start}px)`,
+                      width: "100%",
+                    }}
+                    className={css({
+                      minHeight: "4px",
+                      position: "relative",
+                      "::before": {
+                        content: '""',
+                        position: "absolute",
+                        top: 0,
+                        left: 0,
+                        right: 0,
+                        height: "2px",
+                        backgroundColor: isDropTarget ? t.textPrimary : "transparent",
+                        transition: "background-color 100ms ease",
+                      },
+                    })}
+                  />
+                );
+              }
+
+              if (item.type === "repository-drop-zone") {
+                const isDropTarget = drag?.type === "repository" && drag.overIdx === item.repositoryCount && drag.fromIdx !== item.repositoryCount;
+                return (
+                  <div
+                    key={item.key}
+                    data-index={virtualItem.index}
+                    data-repository-idx={item.repositoryCount}
+                    ref={(node) => {
+                      if (node) {
+                        virtualizer.measureElement(node);
+                      }
+                    }}
+                    style={{
+                      left: 0,
+                      position: "absolute",
+                      top: 0,
+                      transform: `translateY(${virtualItem.start}px)`,
+                      width: "100%",
+                    }}
+                    className={css({
+                      minHeight: "4px",
+                      position: "relative",
+                      "::before": {
+                        content: '""',
+                        position: "absolute",
+                        top: 0,
+                        left: 0,
+                        right: 0,
+                        height: "2px",
+                        backgroundColor: isDropTarget ? t.textPrimary : "transparent",
+                        transition: "background-color 100ms ease",
+                      },
+                    })}
+                  />
+                );
+              }
+
+              return null;
+            })}
+          </div>
+        </div>
+      </ScrollBody>
+      <SidebarFooter />
+      {contextMenu.menu ? <ContextMenuOverlay menu={contextMenu.menu} onClose={contextMenu.close} /> : null}
+    </SPanel>
+  );
+});
+
+const menuButtonStyle = (highlight: boolean, tokens: FoundryTokens) =>
+  ({
+    display: "flex",
+    alignItems: "center",
+    gap: "10px",
+    width: "100%",
+    padding: "8px 12px",
+    borderRadius: "6px",
+    border: "none",
+    background: highlight ? tokens.interactiveHover : "transparent",
+    color: tokens.textSecondary,
+    cursor: "pointer",
+    fontSize: "13px",
+    fontWeight: 400 as const,
+    textAlign: "left" as const,
+    transition: "background 120ms ease, color 120ms ease",
+  }) satisfies React.CSSProperties;
+
+function SidebarFooter() {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const navigate = useNavigate();
+  const client = useMockAppClient();
+  const snapshot = useMockAppSnapshot();
+  const organization = activeMockOrganization(snapshot);
+  const [open, setOpen] = useState(false);
+  const [organizationFlyoutOpen, setOrganizationFlyoutOpen] = useState(false);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const flyoutTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const organizationTriggerRef = useRef<HTMLDivElement>(null);
+  const flyoutRef = useRef<HTMLDivElement>(null);
+  const [flyoutPos, setFlyoutPos] = useState<{ top: number; left: number } | null>(null);
+
+  useLayoutEffect(() => {
+    if (organizationFlyoutOpen && organizationTriggerRef.current) {
+      const rect = organizationTriggerRef.current.getBoundingClientRect();
+      setFlyoutPos({ top: rect.top, left: rect.right + 4 });
+    }
+  }, [organizationFlyoutOpen]);
+
+  useEffect(() => {
+    if (!open) return;
+    function handleClick(event: MouseEvent) {
+      const target = event.target as Node;
+      const inContainer = containerRef.current?.contains(target);
+      const inFlyout = flyoutRef.current?.contains(target);
+      if (!inContainer && !inFlyout) {
+        setOpen(false);
+        setOrganizationFlyoutOpen(false);
+      }
+    }
+    document.addEventListener("mousedown", handleClick);
+    return () => document.removeEventListener("mousedown", handleClick);
+  }, [open]);
+
+  const switchToOrg = useCallback(
+    (org: (typeof snapshot.organizations)[number]) => {
+      setOpen(false);
+      setOrganizationFlyoutOpen(false);
+      void (async () => {
+        await client.selectOrganization(org.id);
+        await navigate({ to: `/organizations/${org.organizationId}` as never });
+      })();
+    },
+    [client, navigate],
+  );
+
+  const openFlyout = useCallback(() => {
+    if (flyoutTimerRef.current) clearTimeout(flyoutTimerRef.current);
+    setOrganizationFlyoutOpen(true);
+  }, []);
+
+  const closeFlyout = useCallback(() => {
+    flyoutTimerRef.current = setTimeout(() => setOrganizationFlyoutOpen(false), 150);
+  }, []);
+
+  const menuItems: Array<{ icon: React.ReactNode; label: string; danger?: boolean; onClick: () => void }> = [];
+
+  if (organization) {
+    menuItems.push(
+      {
+        icon: <Settings size={14} />,
+        label: "Settings",
+        onClick: () => {
+          setOpen(false);
+          void navigate({ to: "/organizations/$organizationId/settings" as never, params: { organizationId: organization.id } as never });
+        },
+      },
+      {
+        icon: <CreditCard size={14} />,
+        label: "Billing",
+        onClick: () => {
+          setOpen(false);
+          void navigate({ to: "/organizations/$organizationId/billing" as never, params: { organizationId: organization.id } as never });
+        },
+      },
+    );
+  }
+
+  menuItems.push(
+    {
+      icon: <User size={14} />,
+      label: "Account",
+      onClick: () => {
+        setOpen(false);
+        void navigate({ to: "/account" as never });
+      },
+    },
+    {
+      icon: <LogOut size={14} />,
+      label: "Sign Out",
+      danger: true,
+      onClick: () => {
+        setOpen(false);
+        void (async () => {
+          await client.signOut();
+          await navigate({ to: "/signin" });
+        })();
+      },
+    },
+  );
+
+  const popoverStyle = css({
+    borderRadius: "10px",
+    border: `1px solid ${t.borderDefault}`,
+    backgroundColor: t.surfaceElevated,
+    boxShadow: `${t.shadow}, 0 0 0 1px ${t.interactiveSubtle}`,
+    padding: "4px",
+    display: "flex",
+    flexDirection: "column",
+    gap: "2px",
+  });
+
+  return (
+    <div ref={containerRef} className={css({ position: "relative", flexShrink: 0 })}>
+      {open ? (
+        <div
+          className={css({
+            position: "absolute",
+            bottom: "100%",
+            left: "8px",
+            right: "8px",
+            marginBottom: "4px",
+            zIndex: 9999,
+          })}
+        >
+          <div className={popoverStyle}>
+            {/* Organization flyout trigger */}
+            {organization ? (
+              <div ref={organizationTriggerRef} onMouseEnter={openFlyout} onMouseLeave={closeFlyout}>
+                <button
+                  type="button"
+                  onClick={() => setOrganizationFlyoutOpen((prev) => !prev)}
+                  className={css({
+                    ...menuButtonStyle(organizationFlyoutOpen, t),
+                    fontWeight: 500,
+                    ":hover": {
+                      backgroundColor: t.interactiveHover,
+                      color: t.textPrimary,
+                    },
+                  })}
+                >
+                  <span
+                    className={css({
+                      width: "18px",
+                      height: "18px",
+                      borderRadius: "4px",
+                      background: `linear-gradient(135deg, ${repositoryIconColor(organization.settings.displayName)}, ${repositoryIconColor(organization.settings.displayName + "x")})`,
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
+                      fontSize: "9px",
+                      fontWeight: 700,
+                      color: t.textOnAccent,
+                      flexShrink: 0,
+                    })}
+                  >
+                    {organization.settings.displayName.charAt(0).toUpperCase()}
+                  </span>
+                  <span className={css({ flex: 1, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" })}>
+                    {organization.settings.displayName}
+                  </span>
+                  <ChevronRight size={12} className={css({ flexShrink: 0, color: t.textMuted })} />
+                </button>
+              </div>
+            ) : null}
+
+            {/* Organization flyout portal */}
+            {organizationFlyoutOpen && organization && flyoutPos
+              ? createPortal(
+                  <div
+                    ref={flyoutRef}
+                    className={css({
+                      position: "fixed",
+                      top: `${flyoutPos.top}px`,
+                      left: `${flyoutPos.left}px`,
+                      minWidth: "200px",
+                      zIndex: 10000,
+                    })}
+                    onMouseEnter={() => {
+                      openFlyout();
+                    }}
+                    onMouseLeave={() => {
+                      closeFlyout();
+                    }}
+                  >
+                    <div className={popoverStyle}>
+                      {eligibleOrganizations(snapshot).map((org) => {
+                        const isActive = organization.id === org.id;
+                        return (
+                          <button
+                            key={org.id}
+                            type="button"
+                            onClick={() => {
+                              if (!isActive) switchToOrg(org);
+                              else {
+                                setOpen(false);
+                                setOrganizationFlyoutOpen(false);
+                              }
+                            }}
+                            className={css({
+                              ...menuButtonStyle(isActive, t),
+                              fontWeight: isActive ? 600 : 400,
+                              color: isActive ? t.textPrimary : t.textTertiary,
+                              ":hover": {
+                                backgroundColor: t.interactiveHover,
+                                color: t.textPrimary,
+                              },
+                            })}
+                          >
+                            <span
+                              className={css({
+                                width: "18px",
+                                height: "18px",
+                                borderRadius: "4px",
+                                background: `linear-gradient(135deg, ${repositoryIconColor(org.settings.displayName)}, ${repositoryIconColor(org.settings.displayName + "x")})`,
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                                fontSize: "9px",
+                                fontWeight: 700,
+                                color: t.textOnAccent,
+                                flexShrink: 0,
+                              })}
+                            >
+                              {org.settings.displayName.charAt(0).toUpperCase()}
+                            </span>
+                            <span className={css({ flex: 1, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" })}>
+                              {org.settings.displayName}
+                            </span>
+                          </button>
+                        );
+                      })}
+                    </div>
+                  </div>,
+                  document.body,
+                )
+              : null}
+
+            {menuItems.map((item) => (
+              <button
+                key={item.label}
+                type="button"
+                onClick={item.onClick}
+                className={css({
+                  ...menuButtonStyle(false, t),
+                  color: item.danger ? t.statusError : t.textSecondary,
+                  ":hover": {
+                    backgroundColor: t.interactiveHover,
+                    color: item.danger ? t.statusError : t.textPrimary,
+                  },
+                })}
+              >
+                {item.icon}
+                {item.label}
+              </button>
+            ))}
+          </div>
+        </div>
+      ) : null}
+      <div className={css({ padding: "8px" })}>
+        <button
+          type="button"
+          onClick={() => {
+            setOpen((prev) => {
+              if (prev) setOrganizationFlyoutOpen(false);
+              return !prev;
+            });
+          }}
+          className={css({
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            width: "28px",
+            height: "28px",
+            borderRadius: "6px",
+            border: "none",
+            background: open ? t.interactiveHover : "transparent",
+            color: open ? t.textPrimary : t.textTertiary,
+            cursor: "pointer",
+            transition: "all 160ms ease",
+            ":hover": {
+              backgroundColor: t.interactiveHover,
+              color: t.textSecondary,
+            },
+          })}
+        >
+          <Settings size={14} />
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/foundry/packages/frontend/src/components/mock-layout/terminal-pane.tsx b/foundry/packages/frontend/src/components/mock-layout/terminal-pane.tsx
new file mode 100644
index 0000000..10d74d7
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/terminal-pane.tsx
@@ -0,0 +1,787 @@
+import { type SandboxProcessRecord, useSubscription } from "@sandbox-agent/foundry-client";
+import { ProcessTerminal } from "@sandbox-agent/react";
+import { useQuery } from "@tanstack/react-query";
+import { useStyletron } from "baseui";
+import { useFoundryTokens } from "../../app/theme";
+import { ChevronDown, ChevronUp, Plus, SquareTerminal, Trash2 } from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { SandboxAgent } from "sandbox-agent";
+import { backendClient } from "../../lib/backend";
+import { subscriptionManager } from "../../lib/subscription";
+
+interface TerminalPaneProps {
+  organizationId: string;
+  taskId: string | null;
+  isExpanded?: boolean;
+  onExpand?: () => void;
+  onCollapse?: () => void;
+  onStartResize?: (e: React.PointerEvent) => void;
+}
+
+interface ProcessTab {
+  id: string;
+  processId: string;
+  title: string;
+}
+
+const MIN_TERMINAL_HEIGHT = 220;
+
+function defaultShellRequest(cwd?: string | null) {
+  return {
+    command: "/bin/bash",
+    args: ["-lc", 'if [ -n "$SHELL" ] && [ -x "$SHELL" ]; then exec "$SHELL" -l; fi; if [ -x /bin/zsh ]; then exec /bin/zsh -l; fi; exec /bin/bash -l'],
+    cwd: cwd ?? undefined,
+    interactive: true,
+    tty: true,
+  };
+}
+
+function formatProcessTabTitle(process: Pick<SandboxProcessRecord, "command" | "id">, fallbackIndex: number): string {
+  const label = process.command.split("/").pop()?.trim();
+  return label && label.length > 0 ? label : `Terminal ${fallbackIndex}`;
+}
+
+function formatCommandSummary(process: Pick<SandboxProcessRecord, "command" | "args">): string {
+  return [process.command, ...process.args].join(" ").trim();
+}
+
+function HeaderIconButton({
+  css,
+  t,
+  label,
+  disabled,
+  onClick,
+  children,
+}: {
+  css: ReturnType<typeof useStyletron>[0];
+  t: ReturnType<typeof useFoundryTokens>;
+  label: string;
+  disabled?: boolean;
+  onClick?: () => void;
+  children: React.ReactNode;
+}) {
+  return (
+    <div
+      role="button"
+      tabIndex={0}
+      aria-label={label}
+      onClick={() => {
+        if (!disabled) onClick?.();
+      }}
+      onKeyDown={(e) => {
+        if ((e.key === "Enter" || e.key === " ") && !disabled) onClick?.();
+      }}
+      className={css({
+        width: "26px",
+        height: "26px",
+        borderRadius: "6px",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        color: t.textTertiary,
+        cursor: disabled ? "not-allowed" : "pointer",
+        opacity: disabled ? 0.4 : 1,
+        transition: "background 200ms ease, color 200ms ease",
+        ":hover": disabled
+          ? undefined
+          : {
+              backgroundColor: t.interactiveHover,
+              color: t.textSecondary,
+            },
+      })}
+    >
+      {children}
+    </div>
+  );
+}
+
+export function TerminalPane({ organizationId, taskId, isExpanded, onExpand, onCollapse, onStartResize }: TerminalPaneProps) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const [activeSessionId, setActiveTabId] = useState<string | null>(null);
+  const [processTabs, setProcessTabs] = useState<ProcessTab[]>([]);
+  const [creatingProcess, setCreatingProcess] = useState(false);
+  const [hoveredTabId, setHoveredTabId] = useState<string | null>(null);
+  const [terminalClient, setTerminalClient] = useState<SandboxAgent | null>(null);
+  const [customTabNames, setCustomTabNames] = useState<Record<string, string>>({});
+  const [editingTabId, setEditingTabId] = useState<string | null>(null);
+  const editInputRef = useRef<HTMLInputElement>(null);
+
+  // Drag-to-reorder state
+  const [tabDrag, setTabDrag] = useState<{ fromIdx: number; overIdx: number | null } | null>(null);
+  const tabDragRef = useRef<{ fromIdx: number; overIdx: number | null } | null>(null);
+  const tabDragStartY = useRef(0);
+  const didTabDrag = useRef(false);
+
+  useEffect(() => {
+    if (!tabDrag) return;
+    const onMove = (e: MouseEvent) => {
+      const el = document.elementFromPoint(e.clientX, e.clientY);
+      if (!el) return;
+      const tabEl = (el as HTMLElement).closest?.("[data-terminal-idx]") as HTMLElement | null;
+      if (tabEl) {
+        const overIdx = Number(tabEl.dataset.terminalIdx);
+        if (overIdx !== tabDrag.overIdx) {
+          setTabDrag({ ...tabDrag, overIdx });
+          tabDragRef.current = { ...tabDrag, overIdx };
+        }
+      }
+      if (Math.abs(e.clientY - tabDragStartY.current) > 4) {
+        didTabDrag.current = true;
+      }
+    };
+    const onUp = () => {
+      const d = tabDragRef.current;
+      if (d && didTabDrag.current && d.overIdx !== null && d.fromIdx !== d.overIdx) {
+        setProcessTabs((prev) => {
+          const next = [...prev];
+          const [moved] = next.splice(d.fromIdx, 1);
+          if (!moved) {
+            return prev;
+          }
+          next.splice(d.overIdx!, 0, moved);
+          return next;
+        });
+      }
+      tabDragRef.current = null;
+      didTabDrag.current = false;
+      setTabDrag(null);
+    };
+    document.addEventListener("mousemove", onMove);
+    document.addEventListener("mouseup", onUp);
+    return () => {
+      document.removeEventListener("mousemove", onMove);
+      document.removeEventListener("mouseup", onUp);
+    };
+  }, [tabDrag]);
+
+  // Horizontal splitter for terminal list width
+  const DEFAULT_LIST_WIDTH = 180;
+  const MIN_LIST_WIDTH = 40;
+  const MAX_LIST_WIDTH = 360;
+  const [listWidth, setListWidth] = useState(DEFAULT_LIST_WIDTH);
+  const splitterRef = useRef<{ startX: number; startWidth: number } | null>(null);
+
+  const onSplitterPointerDown = useCallback(
+    (e: React.PointerEvent) => {
+      e.preventDefault();
+      splitterRef.current = { startX: e.clientX, startWidth: listWidth };
+      const onMove = (ev: PointerEvent) => {
+        if (!splitterRef.current) return;
+        // Dragging left = increase list width, dragging right = decrease
+        const delta = splitterRef.current.startX - ev.clientX;
+        const next = Math.min(MAX_LIST_WIDTH, Math.max(MIN_LIST_WIDTH, splitterRef.current.startWidth + delta));
+        setListWidth(next);
+      };
+      const onUp = () => {
+        splitterRef.current = null;
+        document.removeEventListener("pointermove", onMove);
+        document.removeEventListener("pointerup", onUp);
+      };
+      document.addEventListener("pointermove", onMove);
+      document.addEventListener("pointerup", onUp);
+    },
+    [listWidth],
+  );
+
+  const organizationState = useSubscription(subscriptionManager, "organization", { organizationId });
+  const taskSummary = useMemo(
+    () => (taskId ? (organizationState.data?.taskSummaries.find((task) => task.id === taskId) ?? null) : null),
+    [taskId, organizationState.data?.taskSummaries],
+  );
+  const taskState = useSubscription(
+    subscriptionManager,
+    "task",
+    taskSummary
+      ? {
+          organizationId,
+          repoId: taskSummary.repoId,
+          taskId: taskSummary.id,
+        }
+      : null,
+  );
+
+  const activeSandbox = useMemo(() => {
+    const task = taskState.data;
+    if (!task?.activeSandboxId) {
+      return null;
+    }
+
+    return task.sandboxes.find((sandbox) => sandbox.sandboxId === task.activeSandboxId) ?? null;
+  }, [taskState.data]);
+
+  const connectionQuery = useQuery({
+    queryKey: ["mock-layout", "sandbox-agent-connection", organizationId, activeSandbox?.sandboxProviderId ?? "", activeSandbox?.sandboxId ?? ""],
+    enabled: Boolean(activeSandbox?.sandboxId),
+    staleTime: 30_000,
+    refetchOnWindowFocus: false,
+    queryFn: async () => {
+      if (!activeSandbox) {
+        throw new Error("Cannot load a sandbox connection without an active sandbox.");
+      }
+
+      return await backendClient.getSandboxAgentConnection(organizationId, activeSandbox.sandboxProviderId, activeSandbox.sandboxId);
+    },
+  });
+
+  const processesState = useSubscription(
+    subscriptionManager,
+    "sandboxProcesses",
+    activeSandbox
+      ? {
+          organizationId,
+          sandboxProviderId: activeSandbox.sandboxProviderId,
+          sandboxId: activeSandbox.sandboxId,
+        }
+      : null,
+  );
+
+  useEffect(() => {
+    if (!connectionQuery.data) {
+      setTerminalClient((current) => {
+        if (current) {
+          void current.dispose();
+        }
+        return null;
+      });
+      return;
+    }
+
+    if (connectionQuery.data.endpoint.startsWith("mock://")) {
+      setTerminalClient((current) => {
+        if (current) {
+          void current.dispose();
+        }
+        return null;
+      });
+      return;
+    }
+
+    let cancelled = false;
+    void SandboxAgent.connect({
+      baseUrl: connectionQuery.data.endpoint,
+      token: connectionQuery.data.token,
+      waitForHealth: false,
+    })
+      .then((client) => {
+        if (cancelled) {
+          void client.dispose();
+          return;
+        }
+
+        setTerminalClient((current) => {
+          if (current) {
+            void current.dispose();
+          }
+          return client;
+        });
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setTerminalClient((current) => {
+            if (current) {
+              void current.dispose();
+            }
+            return null;
+          });
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [connectionQuery.data]);
+
+  useEffect(() => {
+    return () => {
+      if (terminalClient) {
+        void terminalClient.dispose();
+      }
+    };
+  }, [terminalClient]);
+
+  useEffect(() => {
+    setActiveTabId(null);
+    setProcessTabs([]);
+  }, [taskId]);
+
+  const processesData = processesState.data;
+  const processes = processesData ?? [];
+
+  const openTerminalTab = useCallback((process: SandboxProcessRecord) => {
+    setProcessTabs((current) => {
+      const existing = current.find((tab) => tab.processId === process.id);
+      if (existing) {
+        setActiveTabId(existing.id);
+        return current;
+      }
+
+      const nextTab: ProcessTab = {
+        id: `terminal:${process.id}`,
+        processId: process.id,
+        title: formatProcessTabTitle(process, current.length + 1),
+      };
+      setActiveTabId(nextTab.id);
+      return [...current, nextTab];
+    });
+  }, []);
+
+  const closeTerminalTab = useCallback((sessionId: string) => {
+    setProcessTabs((current) => {
+      const next = current.filter((tab) => tab.id !== sessionId);
+      setActiveTabId((currentActive) => {
+        if (currentActive === sessionId) {
+          return next.length > 0 ? next[next.length - 1]!.id : null;
+        }
+        return currentActive;
+      });
+      return next;
+    });
+  }, []);
+
+  const spawnTerminal = useCallback(async () => {
+    if (!activeSandbox?.sandboxId) {
+      return;
+    }
+
+    setCreatingProcess(true);
+    try {
+      const created = await backendClient.createSandboxProcess({
+        organizationId,
+        sandboxProviderId: activeSandbox.sandboxProviderId,
+        sandboxId: activeSandbox.sandboxId,
+        request: defaultShellRequest(activeSandbox.cwd),
+      });
+      openTerminalTab(created);
+    } finally {
+      setCreatingProcess(false);
+    }
+  }, [activeSandbox, openTerminalTab, organizationId]);
+
+  const processTabsById = useMemo(() => new Map(processTabs.map((tab) => [tab.id, tab])), [processTabs]);
+  const activeProcessTab = activeSessionId ? (processTabsById.get(activeSessionId) ?? null) : null;
+  const activeTerminalProcess = useMemo(
+    () => (activeProcessTab ? (processes.find((process) => process.id === activeProcessTab.processId) ?? null) : null),
+    [activeProcessTab, processesData],
+  );
+
+  const emptyBodyClassName = css({
+    flex: 1,
+    minHeight: `${MIN_TERMINAL_HEIGHT}px`,
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "center",
+    padding: "24px",
+    backgroundColor: t.surfacePrimary,
+  });
+
+  const emptyCopyClassName = css({
+    maxWidth: "340px",
+    display: "flex",
+    flexDirection: "column",
+    gap: "10px",
+    color: t.textSecondary,
+    fontSize: "12px",
+    lineHeight: 1.6,
+    textAlign: "center",
+  });
+
+  const renderTerminalView = () => {
+    if (!activeProcessTab) {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <SquareTerminal size={24} style={{ margin: "0 auto 4px", opacity: 0.4 }} />
+            <strong>No terminal open.</strong>
+            <span>Click + to open a new terminal session.</span>
+          </div>
+        </div>
+      );
+    }
+
+    if (!activeTerminalProcess) {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <strong>Process not found.</strong>
+            <span>This terminal tab points at a process that no longer exists.</span>
+          </div>
+        </div>
+      );
+    }
+
+    if (!terminalClient) {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <strong>Interactive terminal transport is unavailable.</strong>
+            <span>Mock mode does not open a live terminal transport.</span>
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div className={css({ flex: 1, minHeight: 0, display: "flex", flexDirection: "column", backgroundColor: t.surfacePrimary })}>
+        <div
+          className={css({
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "space-between",
+            gap: "10px",
+            padding: "10px 14px",
+            borderBottom: `1px solid ${t.borderDefault}`,
+            fontSize: "11px",
+            color: t.textMuted,
+          })}
+        >
+          <span>{formatCommandSummary(activeTerminalProcess)}</span>
+          <span>{activeTerminalProcess.id.slice(0, 8)}</span>
+        </div>
+        <ProcessTerminal
+          key={activeTerminalProcess.id}
+          client={terminalClient}
+          processId={activeTerminalProcess.id}
+          height="100%"
+          showStatusBar={false}
+          style={{
+            flex: 1,
+            minHeight: 0,
+            border: "none",
+            borderRadius: 0,
+            background: t.surfacePrimary,
+          }}
+          terminalStyle={{
+            minHeight: 0,
+            height: "100%",
+            padding: "18px 16px 14px",
+          }}
+        />
+      </div>
+    );
+  };
+
+  const renderBody = () => {
+    if (!taskId) {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <strong>Select a task to open a terminal.</strong>
+          </div>
+        </div>
+      );
+    }
+
+    if (taskState.status === "loading") {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <strong>Loading sandbox state...</strong>
+          </div>
+        </div>
+      );
+    }
+
+    if (taskState.error) {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <strong>Could not load task state.</strong>
+            <span>{taskState.error.message}</span>
+          </div>
+        </div>
+      );
+    }
+
+    if (!activeSandbox?.sandboxId) {
+      return (
+        <div className={emptyBodyClassName}>
+          <div className={emptyCopyClassName}>
+            <strong>Waiting for sandbox...</strong>
+            <span>The active task does not have a sandbox runtime yet.</span>
+          </div>
+        </div>
+      );
+    }
+
+    return renderTerminalView();
+  };
+
+  return (
+    <section
+      className={css({
+        flex: 1,
+        minHeight: 0,
+        display: "flex",
+        flexDirection: "column",
+        backgroundColor: t.surfacePrimary,
+        overflow: "hidden",
+      })}
+    >
+      {/* Resize handle */}
+      <div
+        onPointerDown={onStartResize}
+        className={css({
+          height: "3px",
+          flexShrink: 0,
+          cursor: "ns-resize",
+          position: "relative",
+          "::before": {
+            content: '""',
+            position: "absolute",
+            top: "-2px",
+            left: 0,
+            right: 0,
+            height: "7px",
+          },
+        })}
+      />
+      {/* Full-width header bar */}
+      <div
+        className={css({
+          display: "flex",
+          alignItems: "center",
+          gap: "6px",
+          minHeight: "39px",
+          maxHeight: "39px",
+          paddingTop: "0",
+          paddingRight: "14px",
+          paddingBottom: "0",
+          paddingLeft: "14px",
+          borderTop: `1px solid ${t.borderDefault}`,
+          backgroundColor: t.surfacePrimary,
+          flexShrink: 0,
+        })}
+      >
+        <SquareTerminal size={14} color={t.textTertiary} />
+        <span className={css({ fontSize: "12px", fontWeight: 600, color: t.textSecondary })}>Terminal</span>
+        <div className={css({ flex: 1 })} />
+        <div className={css({ display: "flex", alignItems: "center", gap: "2px" })}>
+          <HeaderIconButton
+            css={css}
+            t={t}
+            label="New terminal"
+            disabled={!activeSandbox?.sandboxId || creatingProcess}
+            onClick={() => {
+              if (activeSandbox?.sandboxId && !creatingProcess) void spawnTerminal();
+            }}
+          >
+            <Plus size={14} />
+          </HeaderIconButton>
+          <HeaderIconButton
+            css={css}
+            t={t}
+            label="Kill terminal"
+            disabled={!activeSessionId}
+            onClick={() => {
+              if (activeSessionId) closeTerminalTab(activeSessionId);
+            }}
+          >
+            <Trash2 size={13} />
+          </HeaderIconButton>
+          <HeaderIconButton css={css} t={t} label={isExpanded ? "Collapse terminal" : "Expand terminal"} onClick={isExpanded ? onCollapse : onExpand}>
+            {isExpanded ? <ChevronDown size={14} /> : <ChevronUp size={14} />}
+          </HeaderIconButton>
+        </div>
+      </div>
+
+      {/* Two-column body: terminal left, list right — hidden when no tabs */}
+      {processTabs.length > 0 && (
+        <div className={css({ flex: 1, minHeight: 0, display: "flex", flexDirection: "row" })}>
+          {/* Left: terminal content */}
+          <div className={css({ flex: 1, minWidth: 0, display: "flex", flexDirection: "column" })}>{renderBody()}</div>
+
+          {/* Splitter */}
+          <div
+            onPointerDown={onSplitterPointerDown}
+            className={css({
+              width: "1px",
+              flexShrink: 0,
+              cursor: "col-resize",
+              backgroundColor: t.borderDefault,
+              position: "relative",
+              "::before": {
+                content: '""',
+                position: "absolute",
+                top: 0,
+                bottom: 0,
+                left: "-3px",
+                width: "7px",
+              },
+            })}
+          />
+
+          {/* Right: vertical terminal list */}
+          <div
+            className={css({
+              width: `${listWidth}px`,
+              flexShrink: 0,
+              backgroundColor: t.surfacePrimary,
+              display: "flex",
+              flexDirection: "column",
+              overflowY: "auto",
+            })}
+          >
+            {processTabs.map((tab, tabIndex) => {
+              const isActive = activeSessionId === tab.id;
+              const isHovered = hoveredTabId === tab.id;
+              const isDropTarget = tabDrag !== null && tabDrag.overIdx === tabIndex && tabDrag.fromIdx !== tabIndex;
+              const isBeingDragged = tabDrag !== null && tabDrag.fromIdx === tabIndex && didTabDrag.current;
+              return (
+                <div
+                  key={tab.id}
+                  data-terminal-idx={tabIndex}
+                  onMouseEnter={() => setHoveredTabId(tab.id)}
+                  onMouseLeave={() => setHoveredTabId((cur) => (cur === tab.id ? null : cur))}
+                  onMouseDown={(e) => {
+                    if (e.button !== 0 || editingTabId === tab.id) return;
+                    tabDragStartY.current = e.clientY;
+                    didTabDrag.current = false;
+                    const state = { fromIdx: tabIndex, overIdx: null };
+                    tabDragRef.current = state;
+                    setTabDrag(state);
+                  }}
+                  onClick={() => {
+                    if (!didTabDrag.current) setActiveTabId(tab.id);
+                  }}
+                  className={css({
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: listWidth < 80 ? "center" : "flex-start",
+                    gap: "8px",
+                    padding: listWidth < 80 ? "8px 0" : "8px 12px",
+                    margin: "2px 4px",
+                    borderRadius: "8px",
+                    cursor: "pointer",
+                    overflow: "hidden",
+                    position: "relative",
+                    "::before": {
+                      content: '""',
+                      position: "absolute",
+                      top: "-2px",
+                      left: 0,
+                      right: 0,
+                      height: "2px",
+                      backgroundColor: isDropTarget ? t.textPrimary : "transparent",
+                      transition: "background-color 100ms ease",
+                    },
+                    backgroundColor: isActive ? t.interactiveHover : "transparent",
+                    opacity: isBeingDragged ? 0.4 : 1,
+                    color: isActive ? t.textPrimary : t.textTertiary,
+                    fontWeight: isActive ? 600 : 400,
+                    fontSize: "12px",
+                    transition: "all 150ms ease",
+                    ":hover": {
+                      backgroundColor: t.interactiveHover,
+                    },
+                  })}
+                >
+                  <SquareTerminal size={14} style={{ flexShrink: 0 }} />
+                  {listWidth >= 80 &&
+                    (editingTabId === tab.id ? (
+                      <input
+                        ref={editInputRef}
+                        defaultValue={customTabNames[tab.id] ?? tab.title}
+                        autoFocus
+                        onClick={(e) => e.stopPropagation()}
+                        onBlur={(e) => {
+                          const val = e.currentTarget.value.trim();
+                          if (val) {
+                            setCustomTabNames((prev) => ({ ...prev, [tab.id]: val }));
+                          }
+                          setEditingTabId(null);
+                        }}
+                        onKeyDown={(e) => {
+                          if (e.key === "Enter") {
+                            e.currentTarget.blur();
+                          } else if (e.key === "Escape") {
+                            setEditingTabId(null);
+                          }
+                        }}
+                        className={css({
+                          flex: 1,
+                          minWidth: 0,
+                          background: "transparent",
+                          border: "none",
+                          outline: "none",
+                          color: "inherit",
+                          font: "inherit",
+                          fontSize: "12px",
+                          padding: 0,
+                          margin: 0,
+                        })}
+                      />
+                    ) : (
+                      <span
+                        onDoubleClick={(e) => {
+                          e.stopPropagation();
+                          setEditingTabId(tab.id);
+                        }}
+                        className={css({ flex: 1, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" })}
+                      >
+                        {customTabNames[tab.id] ?? tab.title}
+                      </span>
+                    ))}
+                  {listWidth >= 80 && (
+                    <div
+                      role="button"
+                      tabIndex={0}
+                      aria-label={`Close ${tab.title}`}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        closeTerminalTab(tab.id);
+                      }}
+                      onKeyDown={(event) => {
+                        if (event.key === "Enter" || event.key === " ") closeTerminalTab(tab.id);
+                      }}
+                      className={css({
+                        width: "18px",
+                        height: "18px",
+                        borderRadius: "4px",
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        color: t.textMuted,
+                        flexShrink: 0,
+                        opacity: isHovered ? 1 : 0,
+                        pointerEvents: isHovered ? "auto" : "none",
+                        transition: "opacity 150ms ease, background 200ms ease, color 200ms ease",
+                        ":hover": {
+                          backgroundColor: "rgba(255, 255, 255, 0.20)",
+                          color: t.textSecondary,
+                        },
+                      })}
+                    >
+                      <Trash2 size={11} />
+                    </div>
+                  )}
+                </div>
+              );
+            })}
+
+            {/* Bottom drop zone for dragging to end of list */}
+            <div
+              data-terminal-idx={processTabs.length}
+              className={css({
+                flex: 1,
+                minHeight: "8px",
+                position: "relative",
+                "::before": {
+                  content: '""',
+                  position: "absolute",
+                  top: 0,
+                  left: 0,
+                  right: 0,
+                  height: "2px",
+                  backgroundColor:
+                    tabDrag !== null && tabDrag.overIdx === processTabs.length && tabDrag.fromIdx !== processTabs.length ? t.textPrimary : "transparent",
+                  transition: "background-color 100ms ease",
+                },
+              })}
+            />
+          </div>
+        </div>
+      )}
+    </section>
+  );
+}
diff --git a/foundry/packages/frontend/src/components/mock-layout/transcript-header.tsx b/foundry/packages/frontend/src/components/mock-layout/transcript-header.tsx
new file mode 100644
index 0000000..16f87e6
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/transcript-header.tsx
@@ -0,0 +1,185 @@
+import { memo, useMemo } from "react";
+import { useStyletron } from "baseui";
+import { LabelSmall } from "baseui/typography";
+import { Clock, PanelLeft, PanelRight } from "lucide-react";
+
+import { useFoundryTokens } from "../../app/theme";
+import { deriveHeaderStatus } from "../../features/tasks/status";
+import { HeaderStatusPill, PanelHeaderBar } from "./ui";
+import { type AgentSession, type Task } from "./view-model";
+
+export const TranscriptHeader = memo(function TranscriptHeader({
+  task,
+  hasSandbox,
+  activeSession,
+  editingField,
+  editValue,
+  onEditValueChange,
+  onStartEditingField,
+  onCommitEditingField,
+  onCancelEditingField,
+  onSetActiveSessionUnread,
+  sidebarCollapsed,
+  onToggleSidebar,
+  onSidebarPeekStart,
+  onSidebarPeekEnd,
+  rightSidebarCollapsed,
+  onToggleRightSidebar,
+  onNavigateToUsage,
+}: {
+  task: Task;
+  hasSandbox: boolean;
+  activeSession: AgentSession | null | undefined;
+  editingField: "title" | null;
+  editValue: string;
+  onEditValueChange: (value: string) => void;
+  onStartEditingField: (field: "title", value: string) => void;
+  onCommitEditingField: (field: "title") => void;
+  onCancelEditingField: () => void;
+  onSetActiveSessionUnread: (unread: boolean) => void;
+  sidebarCollapsed?: boolean;
+  onToggleSidebar?: () => void;
+  onSidebarPeekStart?: () => void;
+  onSidebarPeekEnd?: () => void;
+  rightSidebarCollapsed?: boolean;
+  onToggleRightSidebar?: () => void;
+  onNavigateToUsage?: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+  const isDesktop = !!import.meta.env.VITE_DESKTOP;
+  const needsTrafficLightInset = isDesktop && sidebarCollapsed;
+  const headerStatus = useMemo(
+    () => deriveHeaderStatus(task.status, activeSession?.status ?? null, activeSession?.errorMessage ?? null, hasSandbox),
+    [task.status, activeSession?.status, activeSession?.errorMessage, hasSandbox],
+  );
+
+  return (
+    <PanelHeaderBar $style={{ backgroundColor: t.surfaceSecondary, borderBottom: "none", paddingLeft: needsTrafficLightInset ? "74px" : "14px" }}>
+      {sidebarCollapsed && onToggleSidebar ? (
+        <div
+          className={css({
+            width: "26px",
+            height: "26px",
+            borderRadius: "6px",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            cursor: "pointer",
+            color: t.textTertiary,
+            flexShrink: 0,
+            ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+          })}
+          onClick={onToggleSidebar}
+          onMouseEnter={onSidebarPeekStart}
+          onMouseLeave={onSidebarPeekEnd}
+        >
+          <PanelLeft size={14} />
+        </div>
+      ) : null}
+      {editingField === "title" ? (
+        <input
+          autoFocus
+          value={editValue}
+          onChange={(event) => onEditValueChange(event.target.value)}
+          onBlur={() => onCommitEditingField("title")}
+          onKeyDown={(event) => {
+            if (event.key === "Enter") {
+              onCommitEditingField("title");
+            } else if (event.key === "Escape") {
+              onCancelEditingField();
+            }
+          }}
+          className={css({
+            appearance: "none",
+            WebkitAppearance: "none",
+            background: "none",
+            border: "none",
+            padding: "0",
+            margin: "0",
+            outline: "none",
+            fontWeight: 500,
+            fontSize: "14px",
+            color: t.textPrimary,
+            borderBottom: `1px solid ${t.borderFocus}`,
+            minWidth: "80px",
+            maxWidth: "300px",
+          })}
+        />
+      ) : (
+        <LabelSmall
+          title="Rename"
+          color={t.textPrimary}
+          $style={{ fontWeight: 400, whiteSpace: "nowrap", cursor: "pointer", ":hover": { textDecoration: "underline" } }}
+          onClick={() => onStartEditingField("title", task.title)}
+        >
+          {task.title}
+        </LabelSmall>
+      )}
+      {task.branch ? (
+        <span
+          className={css({
+            padding: "2px 8px",
+            borderRadius: "999px",
+            border: `1px solid ${t.borderMedium}`,
+            backgroundColor: t.interactiveSubtle,
+            color: t.textPrimary,
+            fontSize: "11px",
+            whiteSpace: "nowrap",
+            fontFamily: '"IBM Plex Mono", monospace',
+          })}
+        >
+          {task.branch}
+        </span>
+      ) : null}
+      <HeaderStatusPill status={headerStatus} />
+      <div className={css({ flex: 1 })} />
+      <div
+        role="button"
+        tabIndex={0}
+        onClick={onNavigateToUsage}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" || e.key === " ") onNavigateToUsage?.();
+        }}
+        className={css({
+          display: "inline-flex",
+          alignItems: "center",
+          gap: "5px",
+          padding: "4px 12px",
+          borderRadius: "6px",
+          backgroundColor: "transparent",
+          fontSize: "11px",
+          fontWeight: 500,
+          lineHeight: 1,
+          color: t.textTertiary,
+          whiteSpace: "nowrap",
+          cursor: "pointer",
+          transition: "background 200ms ease, color 200ms ease",
+          ":hover": { backgroundColor: t.interactiveHover, color: t.textSecondary },
+        })}
+      >
+        <Clock size={11} style={{ flexShrink: 0 }} />
+        <span>{task.minutesUsed ?? 0} min used</span>
+      </div>
+      {rightSidebarCollapsed && onToggleRightSidebar ? (
+        <div
+          className={css({
+            width: "26px",
+            height: "26px",
+            borderRadius: "6px",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            cursor: "pointer",
+            color: t.textTertiary,
+            flexShrink: 0,
+            ":hover": { color: t.textSecondary, backgroundColor: t.interactiveHover },
+          })}
+          onClick={onToggleRightSidebar}
+        >
+          <PanelRight size={14} />
+        </div>
+      ) : null}
+    </PanelHeaderBar>
+  );
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/ui.tsx b/foundry/packages/frontend/src/components/mock-layout/ui.tsx
new file mode 100644
index 0000000..b86ca18
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/ui.tsx
@@ -0,0 +1,315 @@
+import { memo, useCallback, useEffect, useState, type MouseEvent } from "react";
+import { styled, useStyletron } from "baseui";
+import { GitPullRequest, GitPullRequestDraft } from "lucide-react";
+
+import { useFoundryTokens } from "../../app/theme";
+import { getFoundryTokens } from "../../styles/tokens";
+import type { AgentKind, AgentSession } from "./view-model";
+
+export interface ContextMenuItem {
+  label: string;
+  onClick: () => void;
+}
+
+export function useContextMenu() {
+  const [menu, setMenu] = useState<{ x: number; y: number; items: ContextMenuItem[] } | null>(null);
+
+  useEffect(() => {
+    if (!menu) {
+      return;
+    }
+
+    const close = () => setMenu(null);
+    window.addEventListener("click", close);
+    window.addEventListener("contextmenu", close);
+    return () => {
+      window.removeEventListener("click", close);
+      window.removeEventListener("contextmenu", close);
+    };
+  }, [menu]);
+
+  const open = useCallback((event: MouseEvent, items: ContextMenuItem[]) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setMenu({ x: event.clientX, y: event.clientY, items });
+  }, []);
+
+  return { menu, open, close: useCallback(() => setMenu(null), []) };
+}
+
+export const ContextMenuOverlay = memo(function ContextMenuOverlay({
+  menu,
+  onClose,
+}: {
+  menu: { x: number; y: number; items: ContextMenuItem[] };
+  onClose: () => void;
+}) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+
+  return (
+    <div
+      className={css({
+        position: "fixed",
+        zIndex: 9999,
+        top: `${menu.y}px`,
+        left: `${menu.x}px`,
+        backgroundColor: t.surfaceElevated,
+        border: `1px solid ${t.borderMedium}`,
+        borderRadius: "8px",
+        padding: "4px 0",
+        minWidth: "160px",
+        boxShadow: t.shadow,
+      })}
+    >
+      {menu.items.map((item, index) => (
+        <div
+          key={index}
+          onClick={() => {
+            item.onClick();
+            onClose();
+          }}
+          className={css({
+            padding: "8px 14px",
+            fontSize: "12px",
+            color: t.textPrimary,
+            cursor: "pointer",
+            ":hover": { backgroundColor: t.interactiveHover },
+          })}
+        >
+          {item.label}
+        </div>
+      ))}
+    </div>
+  );
+});
+
+export const SpinnerDot = memo(function SpinnerDot({ size = 10 }: { size?: number }) {
+  const t = useFoundryTokens();
+
+  return (
+    <div
+      style={{
+        width: size,
+        height: size,
+        borderRadius: "50%",
+        border: `2px solid ${t.accentSubtle}`,
+        borderTopColor: t.accent,
+        animation: "hf-spin 0.8s linear infinite",
+        flexShrink: 0,
+      }}
+    />
+  );
+});
+
+export const UnreadDot = memo(function UnreadDot() {
+  const t = useFoundryTokens();
+
+  return (
+    <div
+      style={{
+        width: 7,
+        height: 7,
+        borderRadius: "50%",
+        backgroundColor: t.accent,
+        flexShrink: 0,
+      }}
+    />
+  );
+});
+
+export const TaskIndicator = memo(function TaskIndicator({
+  isRunning,
+  isProvisioning,
+  hasUnread,
+  isDraft,
+}: {
+  isRunning: boolean;
+  isProvisioning: boolean;
+  hasUnread: boolean;
+  isDraft: boolean;
+}) {
+  const t = useFoundryTokens();
+
+  if (isRunning) return <SpinnerDot size={8} />;
+  if (isProvisioning) return <SpinnerDot size={8} />;
+  if (hasUnread) return <UnreadDot />;
+  if (isDraft) return <GitPullRequestDraft size={12} color={t.textSecondary} />;
+  return <GitPullRequest size={12} color={t.statusSuccess} />;
+});
+
+const ClaudeIcon = memo(function ClaudeIcon({ size = 14 }: { size?: number }) {
+  return (
+    <svg width={size} height={size} viewBox="0 0 1200 1200" fill="none" style={{ flexShrink: 0 }}>
+      <path
+        fill="#D97757"
+        d="M 233.96 800.21 L 468.64 668.54 L 472.59 657.1 L 468.64 650.74 L 457.21 650.74 L 417.99 648.32 L 283.89 644.7 L 167.6 639.87 L 54.93 633.83 L 26.58 627.79 L 0 592.75 L 2.74 575.28 L 26.58 559.25 L 60.72 562.23 L 136.19 567.38 L 249.42 575.19 L 331.57 580.03 L 453.26 592.67 L 472.59 592.67 L 475.33 584.86 L 468.72 580.03 L 463.57 575.19 L 346.39 495.79 L 219.54 411.87 L 153.1 363.54 L 117.18 339.06 L 99.06 316.11 L 91.25 266.01 L 123.87 230.09 L 167.68 233.07 L 178.87 236.05 L 223.25 270.2 L 318.04 343.57 L 441.83 434.74 L 459.95 449.8 L 467.19 444.64 L 468.08 441.02 L 459.95 427.41 L 392.62 305.72 L 320.78 181.93 L 288.81 130.63 L 280.35 99.87 C 277.37 87.22 275.19 76.59 275.19 63.62 L 312.32 13.21 L 332.86 6.6 L 382.39 13.21 L 403.25 31.33 L 434.01 101.72 L 483.87 212.54 L 561.18 363.22 L 583.81 407.92 L 595.89 449.32 L 600.4 461.96 L 608.21 461.96 L 608.21 454.71 L 614.58 369.83 L 626.34 265.61 L 637.77 131.52 L 641.72 93.75 L 660.4 48.48 L 697.53 24 L 726.52 37.85 L 750.36 72 L 747.06 94.07 L 732.89 186.2 L 705.1 330.52 L 686.98 427.17 L 697.53 427.17 L 709.61 415.09 L 758.5 350.17 L 840.64 247.49 L 876.89 206.74 L 919.17 161.72 L 946.31 140.3 L 997.61 140.3 L 1035.38 196.43 L 1018.47 254.42 L 965.64 321.42 L 921.83 378.2 L 859.01 462.77 L 819.79 530.42 L 823.41 535.81 L 832.75 534.93 L 974.66 504.72 L 1051.33 490.87 L 1142.82 475.17 L 1184.21 494.5 L 1188.72 514.15 L 1172.46 554.34 L 1074.6 578.5 L 959.84 601.45 L 788.94 641.88 L 786.85 643.41 L 789.26 646.39 L 866.26 653.64 L 899.19 655.41 L 979.81 655.41 L 1129.93 666.6 L 1169.15 692.54 L 1192.67 724.27 L 1188.72 748.43 L 1128.32 779.19 L 1046.82 759.87 L 856.59 714.6 L 791.36 698.34 L 782.34 698.34 L 782.34 703.73 L 836.7 756.89 L 936.32 846.85 L 1061.07 962.82 L 1067.44 991.49 L 1051.41 1014.12 L 1034.5 1011.7 L 924.89 929.23 L 882.6 892.11 L 786.85 811.49 L 780.48 811.49 L 780.48 819.95 L 802.55 852.24 L 919.09 1027.41 L 925.13 1081.13 L 916.67 1098.6 L 886.47 1109.15 L 853.29 1103.11 L 785.07 1007.36 L 714.68 899.52 L 657.91 802.87 L 650.98 806.82 L 617.48 1167.7 L 601.77 1186.15 L 565.53 1200 L 535.33 1177.05 L 519.3 1139.92 L 535.33 1066.55 L 554.66 970.79 L 570.36 894.68 L 584.54 800.13 L 592.99 768.72 L 592.43 766.63 L 585.5 767.52 L 514.23 865.37 L 405.83 1011.87 L 320.05 1103.68 L 299.52 1111.81 L 263.92 1093.37 L 267.22 1060.43 L 287.11 1031.11 L 405.83 880.11 L 477.42 786.52 L 523.65 732.48 L 523.33 724.67 L 520.59 724.67 L 205.29 929.4 L 149.15 936.64 L 124.99 914.01 L 127.97 876.89 L 139.41 864.81 L 234.2 799.57 Z"
+      />
+    </svg>
+  );
+});
+
+const OpenAIIcon = memo(function OpenAIIcon({ size = 14 }: { size?: number }) {
+  const t = useFoundryTokens();
+
+  return (
+    <svg width={size} height={size} viewBox="0 0 24 24" fill="none" style={{ flexShrink: 0 }}>
+      <path
+        d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364l2.0153-1.1639a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"
+        fill={t.textPrimary}
+      />
+    </svg>
+  );
+});
+
+const CursorIcon = memo(function CursorIcon({ size = 14 }: { size?: number }) {
+  const t = useFoundryTokens();
+
+  return (
+    <svg width={size} height={size} viewBox="0 0 24 24" fill="none" style={{ flexShrink: 0 }}>
+      <rect x="3" y="3" width="18" height="18" rx="4" stroke={t.textSecondary} strokeWidth="1.5" />
+      <path d="M8 12h8M12 8v8" stroke={t.textSecondary} strokeWidth="1.5" strokeLinecap="round" />
+    </svg>
+  );
+});
+
+export const AgentIcon = memo(function AgentIcon({ agent, size = 14 }: { agent: AgentKind; size?: number }) {
+  switch (agent) {
+    case "Claude":
+      return <ClaudeIcon size={size} />;
+    case "Codex":
+      return <OpenAIIcon size={size} />;
+    case "Cursor":
+      return <CursorIcon size={size} />;
+    default:
+      return <CursorIcon size={size} />;
+  }
+});
+
+export type HeaderStatusVariant = "error" | "warning" | "success" | "neutral";
+
+export interface HeaderStatusInfo {
+  variant: HeaderStatusVariant;
+  label: string;
+  spinning: boolean;
+  tooltip?: string;
+}
+
+export const HeaderStatusPill = memo(function HeaderStatusPill({ status }: { status: HeaderStatusInfo }) {
+  const [css] = useStyletron();
+  const t = useFoundryTokens();
+
+  const colorMap: Record<HeaderStatusVariant, { bg: string; text: string; dot: string }> = {
+    error: { bg: `${t.statusError}18`, text: t.statusError, dot: t.statusError },
+    warning: { bg: `${t.statusWarning}18`, text: t.statusWarning, dot: t.statusWarning },
+    success: { bg: `${t.statusSuccess}18`, text: t.statusSuccess, dot: t.statusSuccess },
+    neutral: { bg: t.interactiveSubtle, text: t.textTertiary, dot: t.textTertiary },
+  };
+  const colors = colorMap[status.variant];
+
+  return (
+    <div
+      title={status.tooltip}
+      className={css({
+        display: "inline-flex",
+        alignItems: "center",
+        gap: "5px",
+        padding: "2px 8px",
+        borderRadius: "999px",
+        backgroundColor: colors.bg,
+        fontSize: "11px",
+        fontWeight: 500,
+        lineHeight: 1,
+        color: colors.text,
+        whiteSpace: "nowrap",
+        flexShrink: 0,
+      })}
+    >
+      {status.spinning ? (
+        <div
+          style={{
+            width: 8,
+            height: 8,
+            borderRadius: "50%",
+            border: `1.5px solid ${colors.dot}40`,
+            borderTopColor: colors.dot,
+            animation: "hf-spin 0.8s linear infinite",
+            flexShrink: 0,
+          }}
+        />
+      ) : (
+        <div
+          style={{
+            width: 6,
+            height: 6,
+            borderRadius: "50%",
+            backgroundColor: colors.dot,
+            flexShrink: 0,
+          }}
+        />
+      )}
+      <span>{status.label}</span>
+    </div>
+  );
+});
+
+export const SessionAvatar = memo(function SessionAvatar({ session }: { session: AgentSession }) {
+  if (session.status === "running" || session.status === "pending_provision" || session.status === "pending_session_create") return <SpinnerDot size={8} />;
+  if (session.unread) return <UnreadDot />;
+  return <AgentIcon agent={session.agent} size={13} />;
+});
+
+export const Shell = styled("div", ({ $theme }) => {
+  const t = getFoundryTokens($theme);
+  return {
+    display: "flex",
+    height: "100dvh",
+    backgroundColor: t.surfaceSecondary,
+    overflow: "hidden",
+  };
+});
+
+export const SPanel = styled("section", ({ $theme }) => {
+  const t = getFoundryTokens($theme);
+  return {
+    minHeight: 0,
+    flex: 1,
+    display: "flex",
+    flexDirection: "column" as const,
+    backgroundColor: t.surfaceSecondary,
+    overflow: "hidden",
+  };
+});
+
+export const ScrollBody = styled("div", () => ({
+  minHeight: 0,
+  flex: 1,
+  position: "relative" as const,
+  overflowY: "auto" as const,
+  display: "flex",
+  flexDirection: "column" as const,
+}));
+
+export const HEADER_HEIGHT = "42px";
+export const PROMPT_TEXTAREA_MIN_HEIGHT = 56;
+export const PROMPT_TEXTAREA_MAX_HEIGHT = 100;
+
+export const PanelHeaderBar = styled("div", ({ $theme }) => {
+  const t = getFoundryTokens($theme);
+  return {
+    display: "flex",
+    alignItems: "center",
+    minHeight: HEADER_HEIGHT,
+    maxHeight: HEADER_HEIGHT,
+    paddingTop: "0",
+    paddingRight: "14px",
+    paddingBottom: "0",
+    paddingLeft: "14px",
+    borderBottom: `1px solid ${t.borderDefault}`,
+    backgroundColor: t.surfaceTertiary,
+    gap: "8px",
+    flexShrink: 0,
+    position: "relative" as const,
+    zIndex: 9999,
+  };
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/view-model.test.ts b/foundry/packages/frontend/src/components/mock-layout/view-model.test.ts
new file mode 100644
index 0000000..bc6ab87
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/view-model.test.ts
@@ -0,0 +1,206 @@
+import { describe, expect, it } from "vitest";
+import type { WorkspaceSession } from "@sandbox-agent/foundry-shared";
+import { buildDisplayMessages } from "./view-model";
+
+function makeSession(transcript: WorkspaceSession["transcript"]): WorkspaceSession {
+  return {
+    id: "session-1",
+    sessionId: "session-1",
+    sessionName: "Session 1",
+    agent: "Codex",
+    model: "gpt-5.3-codex",
+    status: "idle",
+    thinkingSinceMs: null,
+    unread: false,
+    created: true,
+    draft: {
+      text: "",
+      attachments: [],
+      updatedAtMs: null,
+    },
+    transcript,
+  };
+}
+
+describe("buildDisplayMessages", () => {
+  it("collapses chunked agent output into a single display message", () => {
+    const messages = buildDisplayMessages(
+      makeSession([
+        {
+          id: "evt-setup",
+          eventIndex: 0,
+          sessionId: "session-1",
+          createdAt: 0,
+          connectionId: "conn-1",
+          sender: "client",
+          payload: {
+            method: "session/new",
+            params: {
+              cwd: "/repo",
+            },
+          },
+        },
+        {
+          id: "evt-client",
+          eventIndex: 1,
+          sessionId: "session-1",
+          createdAt: 1,
+          connectionId: "conn-1",
+          sender: "client",
+          payload: {
+            method: "session/prompt",
+            params: {
+              prompt: [{ type: "text", text: "hello" }],
+            },
+          },
+        },
+        {
+          id: "evt-config",
+          eventIndex: 1,
+          sessionId: "session-1",
+          createdAt: 1,
+          connectionId: "conn-1",
+          sender: "agent",
+          payload: {
+            result: {
+              configOptions: [],
+            },
+          },
+        },
+        {
+          id: "evt-chunk-1",
+          eventIndex: 2,
+          sessionId: "session-1",
+          createdAt: 2,
+          connectionId: "conn-1",
+          sender: "agent",
+          payload: {
+            method: "session/update",
+            params: {
+              update: {
+                sessionUpdate: "agent_message_chunk",
+                content: {
+                  type: "text",
+                  text: "hel",
+                },
+              },
+            },
+          },
+        },
+        {
+          id: "evt-chunk-2",
+          eventIndex: 3,
+          sessionId: "session-1",
+          createdAt: 3,
+          connectionId: "conn-1",
+          sender: "agent",
+          payload: {
+            method: "session/update",
+            params: {
+              update: {
+                sessionUpdate: "agent_message_chunk",
+                content: {
+                  type: "text",
+                  text: "lo",
+                },
+              },
+            },
+          },
+        },
+        {
+          id: "evt-stop",
+          eventIndex: 4,
+          sessionId: "session-1",
+          createdAt: 4,
+          connectionId: "conn-1",
+          sender: "agent",
+          payload: {
+            result: {
+              stopReason: "end_turn",
+            },
+          },
+        },
+      ]),
+    );
+
+    expect(messages).toEqual([
+      expect.objectContaining({
+        id: "evt-client",
+        sender: "client",
+        text: "hello",
+      }),
+      expect.objectContaining({
+        id: "evt-chunk-1",
+        sender: "agent",
+        text: "hello",
+      }),
+    ]);
+  });
+
+  it("hides non-message session update envelopes", () => {
+    const messages = buildDisplayMessages(
+      makeSession([
+        {
+          id: "evt-client",
+          eventIndex: 1,
+          sessionId: "session-1",
+          createdAt: 1,
+          connectionId: "conn-1",
+          sender: "client",
+          payload: {
+            method: "session/prompt",
+            params: {
+              prompt: [{ type: "text", text: "hello" }],
+            },
+          },
+        },
+        {
+          id: "evt-update",
+          eventIndex: 2,
+          sessionId: "session-1",
+          createdAt: 2,
+          connectionId: "conn-1",
+          sender: "agent",
+          payload: {
+            method: "session/update",
+            params: {
+              update: {
+                sessionUpdate: "agent_thought",
+                content: {
+                  type: "text",
+                  text: "thinking",
+                },
+              },
+            },
+          },
+        },
+        {
+          id: "evt-result",
+          eventIndex: 3,
+          sessionId: "session-1",
+          createdAt: 3,
+          connectionId: "conn-1",
+          sender: "agent",
+          payload: {
+            result: {
+              text: "done",
+            },
+          },
+        },
+      ]),
+    );
+
+    expect(messages).toEqual([
+      expect.objectContaining({
+        id: "evt-client",
+        sender: "client",
+        text: "hello",
+      }),
+      expect.objectContaining({
+        id: "evt-result",
+        sender: "agent",
+        text: "done",
+      }),
+    ]);
+  });
+});
diff --git a/foundry/packages/frontend/src/components/mock-layout/view-model.ts b/foundry/packages/frontend/src/components/mock-layout/view-model.ts
new file mode 100644
index 0000000..9232293
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-layout/view-model.ts
@@ -0,0 +1,325 @@
+import {
+  DEFAULT_WORKSPACE_MODEL_GROUPS as SharedModelGroups,
+  workspaceModelLabel as sharedWorkspaceModelLabel,
+  workspaceProviderAgent as sharedWorkspaceProviderAgent,
+} from "@sandbox-agent/foundry-shared";
+import type {
+  WorkspaceAgentKind as AgentKind,
+  WorkspaceSession as AgentSession,
+  WorkspaceDiffLineKind as DiffLineKind,
+  WorkspaceFileChange as FileChange,
+  WorkspaceFileTreeNode as FileTreeNode,
+  WorkspaceTask as Task,
+  WorkspaceHistoryEvent as HistoryEvent,
+  WorkspaceLineAttachment as LineAttachment,
+  WorkspaceModelGroup as ModelGroup,
+  WorkspaceModelId as ModelId,
+  WorkspaceParsedDiffLine as ParsedDiffLine,
+  WorkspaceRepositorySection as RepositorySection,
+  WorkspaceTranscriptEvent as TranscriptEvent,
+} from "@sandbox-agent/foundry-shared";
+import { extractEventText } from "../../features/sessions/model";
+
+export type { RepositorySection };
+
+export const MODEL_GROUPS: ModelGroup[] = SharedModelGroups;
+
+export function formatRelativeAge(updatedAtMs: number, nowMs = Date.now()): string {
+  const deltaSeconds = Math.max(0, Math.floor((nowMs - updatedAtMs) / 1000));
+  if (deltaSeconds < 60) return `${deltaSeconds}s`;
+  const minutes = Math.floor(deltaSeconds / 60);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h`;
+  const days = Math.floor(hours / 24);
+  return `${days}d`;
+}
+
+export function formatMessageTimestamp(createdAtMs: number, nowMs = Date.now()): string {
+  const createdAt = new Date(createdAtMs);
+  const now = new Date(nowMs);
+  const sameDay = createdAt.toDateString() === now.toDateString();
+
+  const timeLabel = createdAt.toLocaleTimeString([], {
+    hour: "numeric",
+    minute: "2-digit",
+  });
+
+  if (sameDay) {
+    return timeLabel;
+  }
+
+  const deltaDays = Math.floor((nowMs - createdAtMs) / (24 * 60 * 60 * 1000));
+  if (deltaDays < 7) {
+    const weekdayLabel = createdAt.toLocaleDateString([], { weekday: "short" });
+    return `${weekdayLabel} ${timeLabel}`;
+  }
+
+  return createdAt.toLocaleDateString([], {
+    month: "short",
+    day: "numeric",
+  });
+}
+
+export function formatThinkingDuration(durationMs: number): string {
+  const totalSeconds = Math.max(0, Math.floor(durationMs / 1000));
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}:${String(seconds).padStart(2, "0")}`;
+}
+
+export function formatMessageDuration(durationMs: number): string {
+  const totalSeconds = Math.max(1, Math.round(durationMs / 1000));
+  if (totalSeconds < 60) {
+    return `${totalSeconds}s`;
+  }
+
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}m ${String(seconds).padStart(2, "0")}s`;
+}
+
+export function modelLabel(id: ModelId): string {
+  return sharedWorkspaceModelLabel(id, MODEL_GROUPS);
+}
+
+export function providerAgent(provider: string): AgentKind {
+  return sharedWorkspaceProviderAgent(provider);
+}
+
+const DIFF_PREFIX = "diff:";
+
+export function isDiffTab(id: string): boolean {
+  return id.startsWith(DIFF_PREFIX);
+}
+
+export function diffPath(id: string): string {
+  return id.slice(DIFF_PREFIX.length);
+}
+
+export function diffTabId(path: string): string {
+  return `${DIFF_PREFIX}${path}`;
+}
+
+export function fileName(path: string): string {
+  return path.split("/").pop() ?? path;
+}
+
+function eventOrder(id: string): number {
+  const match = id.match(/\d+/);
+  return match ? Number(match[0]) : 0;
+}
+
+function historyPreview(event: TranscriptEvent): string {
+  const content = extractEventText(event.payload).trim() || "Untitled event";
+  return content.length > 42 ? `${content.slice(0, 39)}...` : content;
+}
+
+function historyDetail(event: TranscriptEvent): string {
+  const content = extractEventText(event.payload).trim();
+  return content || "Untitled event";
+}
+
+export function buildHistoryEvents(sessions: AgentSession[]): HistoryEvent[] {
+  return sessions
+    .flatMap((session) =>
+      session.transcript
+        .filter((event) => event.sender === "client")
+        .map((event) => ({
+          id: `history-${session.id}-${event.id}`,
+          messageId: event.id,
+          preview: historyPreview(event),
+          sessionName: session.sessionName,
+          sessionId: session.id,
+          createdAtMs: event.createdAt,
+          detail: historyDetail(event),
+        })),
+    )
+    .sort((left, right) => eventOrder(left.messageId) - eventOrder(right.messageId));
+}
+
+export interface Message {
+  id: string;
+  sender: "client" | "agent";
+  text: string;
+  createdAtMs: number;
+  durationMs?: number;
+  event: TranscriptEvent;
+}
+
+function isAgentChunkEvent(event: TranscriptEvent): string | null {
+  const payload = event.payload;
+  if (!payload || typeof payload !== "object") {
+    return null;
+  }
+
+  const params = (payload as { params?: unknown }).params;
+  if (!params || typeof params !== "object") {
+    return null;
+  }
+
+  const update = (params as { update?: unknown }).update;
+  if (!update || typeof update !== "object") {
+    return null;
+  }
+
+  if ((update as { sessionUpdate?: unknown }).sessionUpdate !== "agent_message_chunk") {
+    return null;
+  }
+
+  const content = (update as { content?: unknown }).content;
+  if (!content || typeof content !== "object") {
+    return null;
+  }
+
+  const text = (content as { text?: unknown }).text;
+  return typeof text === "string" ? text : null;
+}
+
+function isClientPromptEvent(event: TranscriptEvent): boolean {
+  const payload = event.payload;
+  if (!payload || typeof payload !== "object") {
+    return false;
+  }
+
+  return (payload as { method?: unknown }).method === "session/prompt";
+}
+
+function shouldDisplayEvent(event: TranscriptEvent): boolean {
+  const payload = event.payload;
+  if (event.sender === "client") {
+    return isClientPromptEvent(event) && Boolean(extractEventText(payload).trim());
+  }
+
+  if (!payload || typeof payload !== "object") {
+    return Boolean(extractEventText(payload).trim());
+  }
+
+  if ((payload as { error?: unknown }).error) {
+    return true;
+  }
+
+  if (isAgentChunkEvent(event) !== null) {
+    return false;
+  }
+
+  if ((payload as { method?: unknown }).method === "session/update") {
+    return false;
+  }
+
+  const result = (payload as { result?: unknown }).result;
+  if (result && typeof result === "object") {
+    if (typeof (result as { stopReason?: unknown }).stopReason === "string") {
+      return false;
+    }
+    if (typeof (result as { text?: unknown }).text !== "string") {
+      return false;
+    }
+  }
+
+  const params = (payload as { params?: unknown }).params;
+  if (params && typeof params === "object") {
+    const update = (params as { update?: unknown }).update;
+    if (update && typeof update === "object") {
+      const sessionUpdate = (update as { sessionUpdate?: unknown }).sessionUpdate;
+      if (
+        sessionUpdate === "usage_update" ||
+        sessionUpdate === "available_commands_update" ||
+        sessionUpdate === "config_options_update" ||
+        sessionUpdate === "available_modes_update" ||
+        sessionUpdate === "available_models_update"
+      ) {
+        return false;
+      }
+    }
+  }
+
+  return Boolean(extractEventText(payload).trim());
+}
+
+export function buildDisplayMessages(session: AgentSession | null | undefined): Message[] {
+  if (!session) {
+    return [];
+  }
+
+  const messages: Message[] = [];
+  let pendingAgentMessage: Message | null = null;
+
+  const flushPendingAgentMessage = () => {
+    if (pendingAgentMessage && pendingAgentMessage.text.length > 0) {
+      messages.push(pendingAgentMessage);
+    }
+    pendingAgentMessage = null;
+  };
+
+  for (const event of session.transcript) {
+    const chunkText = isAgentChunkEvent(event);
+    if (chunkText !== null) {
+      if (!pendingAgentMessage) {
+        pendingAgentMessage = {
+          id: event.id,
+          sender: "agent",
+          text: chunkText,
+          createdAtMs: event.createdAt,
+          event,
+        };
+      } else {
+        pendingAgentMessage.text += chunkText;
+      }
+      continue;
+    }
+
+    flushPendingAgentMessage();
+
+    if (!shouldDisplayEvent(event)) {
+      continue;
+    }
+
+    messages.push({
+      id: event.id,
+      sender: event.sender,
+      text: extractEventText(event.payload),
+      createdAtMs: event.createdAt,
+      durationMs:
+        event.payload && typeof event.payload === "object"
+          ? typeof (event.payload as { result?: { durationMs?: unknown } }).result?.durationMs === "number"
+            ? ((event.payload as { result?: { durationMs?: number } }).result?.durationMs ?? undefined)
+            : undefined
+          : undefined,
+      event,
+    });
+  }
+
+  flushPendingAgentMessage();
+  return messages;
+}
+
+export function parseDiffLines(diff: string): ParsedDiffLine[] {
+  return diff.split("\n").map((text, index) => {
+    if (text.startsWith("@@")) {
+      return { kind: "hunk", lineNumber: index + 1, text };
+    }
+    if (text.startsWith("+")) {
+      return { kind: "add", lineNumber: index + 1, text };
+    }
+    if (text.startsWith("-")) {
+      return { kind: "remove", lineNumber: index + 1, text };
+    }
+    return { kind: "context", lineNumber: index + 1, text };
+  });
+}
+
+export type {
+  AgentKind,
+  AgentSession,
+  DiffLineKind,
+  FileChange,
+  FileTreeNode,
+  Task,
+  HistoryEvent,
+  LineAttachment,
+  ModelGroup,
+  ModelId,
+  ParsedDiffLine,
+  TranscriptEvent,
+};
diff --git a/foundry/packages/frontend/src/components/mock-onboarding.tsx b/foundry/packages/frontend/src/components/mock-onboarding.tsx
new file mode 100644
index 0000000..4528695
--- /dev/null
+++ b/foundry/packages/frontend/src/components/mock-onboarding.tsx
@@ -0,0 +1,1274 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { type FoundryBillingPlanId, type FoundryOrganization, type FoundryOrganizationMember, type FoundryUser } from "@sandbox-agent/foundry-shared";
+import { useNavigate } from "@tanstack/react-router";
+import { ArrowLeft, Clock, CreditCard, FileText, Github, LogOut, Moon, Settings, Sun, Users } from "lucide-react";
+import { activeMockUser, eligibleOrganizations, useMockAppClient, useMockAppSnapshot } from "../lib/mock-app";
+import { isMockFrontendClient } from "../lib/env";
+import { useColorMode, useFoundryTokens } from "../app/theme";
+import type { FoundryTokens } from "../styles/tokens";
+import { appSurfaceStyle, primaryButtonStyle, secondaryButtonStyle, subtleButtonStyle, cardStyle, badgeStyle, inputStyle } from "../styles/shared-styles";
+
+const dateFormatter = new Intl.DateTimeFormat("en-US", {
+  month: "short",
+  day: "numeric",
+  year: "numeric",
+});
+
+const planCatalog: Record<
+  FoundryBillingPlanId,
+  {
+    label: string;
+    price: string;
+    pricePerMonth: number;
+    seats: string;
+    taskHours: number;
+    summary: string;
+  }
+> = {
+  free: {
+    label: "Free",
+    price: "$0",
+    pricePerMonth: 0,
+    seats: "1 seat included",
+    taskHours: 8,
+    summary: "Get started with up to 8 task hours per month.",
+  },
+  team: {
+    label: "Pro",
+    price: "$25/mo",
+    pricePerMonth: 25,
+    seats: "per seat",
+    taskHours: 200,
+    summary: "200 task hours per seat, with the ability to purchase additional hours.",
+  },
+};
+
+const taskHourPackages = [
+  { hours: 50, price: 6 },
+  { hours: 100, price: 12 },
+  { hours: 200, price: 24 },
+  { hours: 400, price: 48 },
+  { hours: 600, price: 72 },
+  { hours: 1000, price: 120 },
+];
+
+function DesktopDragRegion() {
+  const isDesktop = !!import.meta.env.VITE_DESKTOP;
+  const onDragMouseDown = useCallback((event: React.PointerEvent) => {
+    if (event.button !== 0) return;
+    const ipc = (window as unknown as Record<string, unknown>).__TAURI_INTERNALS__ as
+      | {
+          invoke: (cmd: string, args?: unknown) => Promise<unknown>;
+        }
+      | undefined;
+    if (ipc?.invoke) {
+      ipc.invoke("plugin:window|start_dragging").catch(() => {});
+    }
+  }, []);
+
+  if (!isDesktop) return null;
+
+  return (
+    <div
+      style={{
+        position: "fixed",
+        top: 0,
+        left: 0,
+        right: 0,
+        height: "38px",
+        zIndex: 9998,
+        pointerEvents: "none",
+      }}
+    >
+      <div
+        onPointerDown={onDragMouseDown}
+        style={
+          {
+            position: "absolute",
+            inset: 0,
+            WebkitAppRegion: "drag",
+            pointerEvents: "auto",
+            zIndex: 0,
+          } as React.CSSProperties
+        }
+      />
+    </div>
+  );
+}
+
+function formatDate(value: string | null): string {
+  if (!value) {
+    return "N/A";
+  }
+  return dateFormatter.format(new Date(value));
+}
+
+function organizationPath(organization: FoundryOrganization): string {
+  return `/organizations/${organization.organizationId}`;
+}
+
+function settingsPath(organization: FoundryOrganization): string {
+  return `/organizations/${organization.id}/settings`;
+}
+
+function billingPath(organization: FoundryOrganization): string {
+  return `/organizations/${organization.id}/billing`;
+}
+
+function checkoutPath(organization: FoundryOrganization, planId: FoundryBillingPlanId): string {
+  return `/organizations/${organization.id}/checkout/${planId}`;
+}
+
+function statusBadge(t: FoundryTokens, organization: FoundryOrganization) {
+  if (organization.kind === "personal") {
+    return <span style={badgeStyle(t, "rgba(24, 140, 255, 0.18)", "#b9d8ff")}>Personal organization</span>;
+  }
+  return <span style={badgeStyle(t, "rgba(255, 79, 0, 0.16)", "#ffd6c7")}>GitHub organization</span>;
+}
+
+function githubBadge(t: FoundryTokens, organization: FoundryOrganization) {
+  if (organization.github.installationStatus === "connected") {
+    return <span style={badgeStyle(t, "rgba(46, 160, 67, 0.16)", "#b7f0c3")}>GitHub connected</span>;
+  }
+  if (organization.github.installationStatus === "reconnect_required") {
+    return <span style={badgeStyle(t, "rgba(255, 193, 7, 0.18)", "#ffe6a6")}>Reconnect required</span>;
+  }
+  return <span style={badgeStyle(t, t.borderSubtle)}>Install GitHub App</span>;
+}
+
+function StatCard({ label, value, caption }: { label: string; value: string; caption: string }) {
+  const t = useFoundryTokens();
+  return (
+    <div
+      style={{
+        ...cardStyle(t),
+        padding: "14px 16px",
+        display: "flex",
+        flexDirection: "column",
+        gap: "6px",
+      }}
+    >
+      <div style={{ fontSize: "10px", color: t.textTertiary, textTransform: "uppercase", letterSpacing: "0.04em" }}>{label}</div>
+      <div style={{ fontSize: "16px", fontWeight: 600 }}>{value}</div>
+      <div style={{ fontSize: "11px", color: t.textTertiary, lineHeight: 1.5 }}>{caption}</div>
+    </div>
+  );
+}
+
+function MemberRow({ member }: { member: FoundryOrganizationMember }) {
+  const t = useFoundryTokens();
+  return (
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "minmax(0, 1.4fr) minmax(0, 1fr) 100px",
+        gap: "10px",
+        padding: "8px 0",
+        borderTop: `1px solid ${t.borderSubtle}`,
+        alignItems: "center",
+      }}
+    >
+      <div>
+        <div style={{ fontWeight: 500, fontSize: "12px" }}>{member.name}</div>
+        <div style={{ color: t.textSecondary, fontSize: "11px" }}>{member.email}</div>
+      </div>
+      <div style={{ color: t.textSecondary, fontSize: "12px", textTransform: "capitalize" }}>{member.role}</div>
+      <div>
+        <span
+          style={badgeStyle(
+            t,
+            member.state === "active" ? "rgba(46, 160, 67, 0.16)" : "rgba(255, 193, 7, 0.18)",
+            member.state === "active" ? "#b7f0c3" : "#ffe6a6",
+          )}
+        >
+          {member.state}
+        </span>
+      </div>
+    </div>
+  );
+}
+
+export function MockSignInPage() {
+  const client = useMockAppClient();
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+
+  return (
+    <div
+      style={{
+        position: "fixed",
+        inset: 0,
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "center",
+        justifyContent: "center",
+        background: t.surfacePrimary,
+        fontFamily: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+        color: t.textPrimary,
+      }}
+    >
+      <DesktopDragRegion />
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          textAlign: "center",
+          width: "100%",
+          maxWidth: "320px",
+        }}
+      >
+        {/* Foundry icon */}
+        <svg width="48" height="48" viewBox="0 0 130 128" fill="none" xmlns="http://www.w3.org/2000/svg" style={{ marginBottom: "24px" }}>
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M88.0429 44.2658C89.3803 43.625 90.8907 44.1955 91.5731 45.3776C92.2556 46.5596 91.9945 48.1529 90.7709 48.9907L72.3923 62.885C71.8013 63.2262 71.4248 63.7062 71.1029 64.2861C70.781 64.8659 70.5554 65.3922 70.5443 66.0553L67.7403 88.9495C67.521 90.3894 66.4114 91.423 64.9867 91.4576C63.5619 91.4922 62.3731 90.3429 62.24 88.9751L59.3859 66.0642C59.3971 65.4011 59.2126 64.8489 58.8714 64.2579C58.5302 63.6669 58.1442 63.231 57.5643 62.9091L39.15 48.9819C38.032 48.1828 37.6311 46.5786 38.3734 45.362C39.1157 44.1454 40.5656 43.7013 41.9223 44.2314L63.1512 53.2502C63.731 53.5721 64.2996 53.6398 64.9627 53.651C65.6259 53.6622 66.2298 53.5761 66.8208 53.2349L88.0429 44.2658Z"
+            fill="white"
+          />
+          <rect x="19.25" y="18.25" width="91.5" height="91.5" rx="25.75" stroke="#F0F0F0" strokeWidth="8.5" />
+        </svg>
+
+        <h1
+          style={{
+            fontSize: "20px",
+            fontWeight: 600,
+            color: t.textPrimary,
+            margin: "0 0 8px 0",
+            letterSpacing: "-0.01em",
+          }}
+        >
+          Sign in to Sandbox Agent Foundry
+        </h1>
+
+        <p
+          style={{
+            fontSize: "13px",
+            fontWeight: 400,
+            color: t.textTertiary,
+            margin: "0 0 32px 0",
+            lineHeight: 1.5,
+          }}
+        >
+          Connect your GitHub account to get started.
+        </p>
+
+        {/* GitHub sign-in button */}
+        <button
+          type="button"
+          onClick={() => {
+            void (async () => {
+              await client.signInWithGithub(isMockFrontendClient ? "user-nathan" : undefined);
+              if (isMockFrontendClient) {
+                await navigate({ to: "/organizations" });
+              }
+            })();
+          }}
+          style={{
+            display: "inline-flex",
+            alignItems: "center",
+            justifyContent: "center",
+            gap: "10px",
+            width: "100%",
+            height: "44px",
+            padding: "0 20px",
+            background: t.textPrimary,
+            color: t.textOnPrimary,
+            border: "none",
+            borderRadius: "8px",
+            fontFamily: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+            fontSize: "14px",
+            fontWeight: 500,
+            cursor: "pointer",
+          }}
+        >
+          <Github size={20} />
+          Continue with GitHub
+        </button>
+
+        {/* Footer */}
+        <a
+          href="https://sandbox-agent.dev"
+          target="_blank"
+          rel="noopener noreferrer"
+          style={{
+            marginTop: "32px",
+            fontSize: "13px",
+            color: t.textTertiary,
+            textDecoration: "none",
+          }}
+        >
+          Learn more
+        </a>
+      </div>
+    </div>
+  );
+}
+
+export function MockOrganizationSelectorPage() {
+  const client = useMockAppClient();
+  const snapshot = useMockAppSnapshot();
+  const organizations: FoundryOrganization[] = eligibleOrganizations(snapshot);
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+
+  return (
+    <div
+      style={{
+        position: "fixed",
+        inset: 0,
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "center",
+        justifyContent: "center",
+        background: t.surfacePrimary,
+        fontFamily: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+        color: t.textPrimary,
+      }}
+    >
+      <DesktopDragRegion />
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          width: "100%",
+          maxWidth: "400px",
+          padding: "0 24px",
+        }}
+      >
+        {/* Header */}
+        <div style={{ display: "flex", flexDirection: "column", alignItems: "center", marginBottom: "40px" }}>
+          <svg width="40" height="40" viewBox="0 0 130 128" fill="none" xmlns="http://www.w3.org/2000/svg" style={{ marginBottom: "20px" }}>
+            <path
+              fillRule="evenodd"
+              clipRule="evenodd"
+              d="M88.0429 44.2658C89.3803 43.625 90.8907 44.1955 91.5731 45.3776C92.2556 46.5596 91.9945 48.1529 90.7709 48.9907L72.3923 62.885C71.8013 63.2262 71.4248 63.7062 71.1029 64.2861C70.781 64.8659 70.5554 65.3922 70.5443 66.0553L67.7403 88.9495C67.521 90.3894 66.4114 91.423 64.9867 91.4576C63.5619 91.4922 62.3731 90.3429 62.24 88.9751L59.3859 66.0642C59.3971 65.4011 59.2126 64.8489 58.8714 64.2579C58.5302 63.6669 58.1442 63.231 57.5643 62.9091L39.15 48.9819C38.032 48.1828 37.6311 46.5786 38.3734 45.362C39.1157 44.1454 40.5656 43.7013 41.9223 44.2314L63.1512 53.2502C63.731 53.5721 64.2996 53.6398 64.9627 53.651C65.6259 53.6622 66.2298 53.5761 66.8208 53.2349L88.0429 44.2658Z"
+              fill="white"
+            />
+            <rect x="19.25" y="18.25" width="91.5" height="91.5" rx="25.75" stroke="#F0F0F0" strokeWidth="8.5" />
+          </svg>
+          <h1 style={{ fontSize: "20px", fontWeight: 600, margin: "0 0 6px 0", letterSpacing: "-0.01em" }}>Select a organization</h1>
+          <p style={{ fontSize: "13px", color: t.textTertiary, margin: 0 }}>Choose where you want to work.</p>
+        </div>
+
+        {/* Organization list */}
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "column",
+            borderRadius: "12px",
+            border: `1px solid ${t.borderSubtle}`,
+            overflow: "hidden",
+          }}
+        >
+          {organizations.map((organization, index) => (
+            <button
+              key={organization.id}
+              type="button"
+              onClick={() => {
+                void (async () => {
+                  await client.selectOrganization(organization.id);
+                  await navigate({ to: organizationPath(organization) });
+                })();
+              }}
+              style={{
+                display: "flex",
+                alignItems: "center",
+                gap: "14px",
+                padding: "16px 18px",
+                background: t.surfaceSecondary,
+                border: "none",
+                borderTop: index > 0 ? `1px solid ${t.borderSubtle}` : "none",
+                color: t.textPrimary,
+                cursor: "pointer",
+                textAlign: "left",
+                fontFamily: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+                transition: "background 150ms ease",
+              }}
+              onMouseEnter={(e) => {
+                e.currentTarget.style.background = t.interactiveSubtle;
+              }}
+              onMouseLeave={(e) => {
+                e.currentTarget.style.background = t.surfaceSecondary;
+              }}
+            >
+              {/* Avatar */}
+              <div
+                style={{
+                  width: "36px",
+                  height: "36px",
+                  borderRadius: "10px",
+                  background: organization.kind === "personal" ? "linear-gradient(135deg, #3b82f6, #6366f1)" : "linear-gradient(135deg, #f97316, #ef4444)",
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                  fontSize: "14px",
+                  fontWeight: 600,
+                  flexShrink: 0,
+                }}
+              >
+                {organization.settings.displayName.charAt(0).toUpperCase()}
+              </div>
+
+              {/* Info */}
+              <div style={{ flex: 1, minWidth: 0 }}>
+                <div style={{ fontSize: "14px", fontWeight: 500, lineHeight: 1.3 }}>{organization.settings.displayName}</div>
+                <div style={{ fontSize: "12px", color: t.textTertiary, lineHeight: 1.3, marginTop: "1px" }}>
+                  {organization.kind === "personal" ? "Personal" : "Organization"} · {planCatalog[organization.billing.planId]!.label} ·{" "}
+                  {organization.members.length} member{organization.members.length !== 1 ? "s" : ""}
+                </div>
+              </div>
+
+              {/* Arrow */}
+              <svg
+                width="16"
+                height="16"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke={t.textTertiary}
+                strokeWidth="2"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                style={{ flexShrink: 0 }}
+              >
+                <polyline points="9 18 15 12 9 6" />
+              </svg>
+            </button>
+          ))}
+        </div>
+
+        {/* Footer */}
+        <div style={{ display: "flex", justifyContent: "center", marginTop: "24px", gap: "16px" }}>
+          <button
+            type="button"
+            onClick={() => {
+              void (async () => {
+                await client.signOut();
+                await navigate({ to: "/signin" });
+              })();
+            }}
+            style={{
+              background: "none",
+              border: "none",
+              color: t.textTertiary,
+              fontSize: "13px",
+              cursor: "pointer",
+              fontFamily: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+              padding: 0,
+            }}
+          >
+            Sign out
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+type SettingsSection = "settings" | "members" | "billing" | "docs";
+
+function SettingsNavItem({ icon, label, active, onClick }: { icon: React.ReactNode; label: string; active: boolean; onClick: () => void }) {
+  const t = useFoundryTokens();
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      style={{
+        display: "flex",
+        alignItems: "center",
+        gap: "8px",
+        width: "100%",
+        padding: "5px 10px",
+        borderRadius: "6px",
+        border: "none",
+        background: active ? t.interactiveHover : "transparent",
+        color: active ? t.textPrimary : t.textMuted,
+        cursor: "pointer",
+        fontSize: "12px",
+        fontWeight: active ? 500 : 400,
+        textAlign: "left",
+        fontFamily: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+        transition: "all 120ms ease",
+        lineHeight: 1.4,
+      }}
+      onMouseEnter={(event) => {
+        if (!active) event.currentTarget.style.backgroundColor = t.interactiveSubtle;
+      }}
+      onMouseLeave={(event) => {
+        if (!active) event.currentTarget.style.backgroundColor = "transparent";
+      }}
+    >
+      {icon}
+      {label}
+    </button>
+  );
+}
+
+function SettingsContentSection({ title, description, children }: { title: string; description?: string; children: React.ReactNode }) {
+  const t = useFoundryTokens();
+  return (
+    <div>
+      <h2 style={{ margin: "0 0 2px", fontSize: "13px", fontWeight: 600, color: t.textPrimary }}>{title}</h2>
+      {description ? <p style={{ margin: "0 0 12px", fontSize: "11px", color: t.textMuted, lineHeight: 1.5 }}>{description}</p> : null}
+      <div style={{ display: "flex", flexDirection: "column", gap: "10px" }}>{children}</div>
+    </div>
+  );
+}
+
+function SettingsRow({ label, description, action }: { label: string; description?: string; action?: React.ReactNode }) {
+  const t = useFoundryTokens();
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-between",
+        gap: "12px",
+        padding: "10px 12px",
+        borderRadius: "6px",
+        border: `1px solid ${t.borderSubtle}`,
+        background: t.interactiveSubtle,
+      }}
+    >
+      <div>
+        <div style={{ fontSize: "12px", fontWeight: 500 }}>{label}</div>
+        {description ? <div style={{ fontSize: "11px", color: t.textMuted, marginTop: "1px" }}>{description}</div> : null}
+      </div>
+      {action ?? null}
+    </div>
+  );
+}
+
+function SettingsLayout({
+  organization,
+  activeSection,
+  onSectionChange,
+  children,
+}: {
+  organization: FoundryOrganization;
+  activeSection: SettingsSection;
+  onSectionChange?: (section: SettingsSection) => void;
+  children: React.ReactNode;
+}) {
+  const client = useMockAppClient();
+  const snapshot = useMockAppSnapshot();
+  const user = activeMockUser(snapshot);
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+
+  const navSections: Array<{ section: SettingsSection; icon: React.ReactNode; label: string }> = [
+    { section: "settings", icon: <Settings size={13} />, label: "Settings" },
+    { section: "members", icon: <Users size={13} />, label: "Members" },
+    { section: "billing", icon: <CreditCard size={13} />, label: "Billing & Invoices" },
+    { section: "docs", icon: <FileText size={13} />, label: "Docs" },
+  ];
+
+  return (
+    <div style={appSurfaceStyle(t)}>
+      <DesktopDragRegion />
+      <div style={{ display: "flex", flex: 1, minHeight: 0 }}>
+        {/* Left nav */}
+        <div
+          style={{
+            width: "200px",
+            flexShrink: 0,
+            borderRight: `1px solid ${t.borderSubtle}`,
+            padding: "44px 10px 16px",
+            display: "flex",
+            flexDirection: "column",
+            gap: "2px",
+            overflowY: "auto",
+          }}
+        >
+          {/* Back to organization */}
+          <button
+            type="button"
+            onClick={() => {
+              void (async () => {
+                await client.selectOrganization(organization.id);
+                await navigate({ to: organizationPath(organization) });
+              })();
+            }}
+            style={{
+              ...subtleButtonStyle(t),
+              display: "flex",
+              alignItems: "center",
+              gap: "5px",
+              marginBottom: "10px",
+              fontSize: "11px",
+            }}
+          >
+            <ArrowLeft size={12} />
+            Back to organization
+          </button>
+
+          {/* User header */}
+          <div style={{ padding: "2px 10px 12px", display: "flex", flexDirection: "column", gap: "1px" }}>
+            <span style={{ fontSize: "12px", fontWeight: 600 }}>{user?.name ?? "User"}</span>
+            <span style={{ fontSize: "10px", color: t.textMuted }}>
+              {planCatalog[organization.billing.planId]?.label ?? "Free"} Plan · {user?.email ?? ""}
+            </span>
+          </div>
+
+          {navSections.map((item) => (
+            <SettingsNavItem
+              key={item.section}
+              icon={item.icon}
+              label={item.label}
+              active={activeSection === item.section}
+              onClick={() => {
+                if (item.section === "billing") {
+                  void navigate({ to: billingPath(organization) });
+                } else if (onSectionChange) {
+                  onSectionChange(item.section);
+                } else {
+                  void navigate({ to: settingsPath(organization) });
+                }
+              }}
+            />
+          ))}
+        </div>
+
+        {/* Content */}
+        <div style={{ flex: 1, overflowY: "auto", padding: "80px 36px 40px" }}>
+          <div style={{ maxWidth: "560px" }}>{children}</div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export function MockOrganizationSettingsPage({ organization }: { organization: FoundryOrganization }) {
+  const client = useMockAppClient();
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+  const [section, setSection] = useState<SettingsSection>("settings");
+  const [displayName, setDisplayName] = useState(organization.settings.displayName);
+  const [slug, setSlug] = useState(organization.settings.slug);
+  const [primaryDomain, setPrimaryDomain] = useState(organization.settings.primaryDomain);
+
+  useEffect(() => {
+    setDisplayName(organization.settings.displayName);
+    setSlug(organization.settings.slug);
+    setPrimaryDomain(organization.settings.primaryDomain);
+  }, [organization.id, organization.settings.displayName, organization.settings.slug, organization.settings.primaryDomain]);
+
+  return (
+    <SettingsLayout organization={organization} activeSection={section} onSectionChange={setSection}>
+      {section === "settings" ? (
+        <div style={{ display: "flex", flexDirection: "column", gap: "24px" }}>
+          <div>
+            <h1 style={{ margin: "0 0 2px", fontSize: "15px", fontWeight: 600 }}>Settings</h1>
+          </div>
+
+          <SettingsContentSection title="Organization Profile">
+            <label style={{ display: "grid", gap: "4px" }}>
+              <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Display name</span>
+              <input value={displayName} onChange={(event) => setDisplayName(event.target.value)} style={inputStyle(t)} />
+            </label>
+            <div style={{ display: "grid", gridTemplateColumns: "1fr 1fr", gap: "12px" }}>
+              <label style={{ display: "grid", gap: "4px" }}>
+                <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Slug</span>
+                <input value={slug} onChange={(event) => setSlug(event.target.value)} style={inputStyle(t)} />
+              </label>
+              <label style={{ display: "grid", gap: "4px" }}>
+                <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Primary domain</span>
+                <input value={primaryDomain} onChange={(event) => setPrimaryDomain(event.target.value)} style={inputStyle(t)} />
+              </label>
+            </div>
+            <div>
+              <button
+                type="button"
+                onClick={() =>
+                  void client.updateOrganizationProfile({
+                    organizationId: organization.id,
+                    displayName,
+                    slug,
+                    primaryDomain,
+                  })
+                }
+                style={primaryButtonStyle(t)}
+              >
+                Save changes
+              </button>
+            </div>
+          </SettingsContentSection>
+
+          <AppearanceSection />
+
+          <SettingsContentSection
+            title="GitHub"
+            description={`Connected as ${organization.github.connectedAccount}. ${organization.github.importedRepoCount} repos imported.`}
+          >
+            <SettingsRow label="Installation status" description={`Last sync: ${organization.github.lastSyncLabel}`} action={githubBadge(t, organization)} />
+            <div style={{ display: "flex", gap: "8px" }}>
+              <button type="button" onClick={() => void client.reconnectGithub(organization.id)} style={secondaryButtonStyle(t)}>
+                Reconnect GitHub
+              </button>
+              <button type="button" onClick={() => void client.triggerGithubSync(organization.id)} style={subtleButtonStyle(t)}>
+                Sync repos
+              </button>
+            </div>
+          </SettingsContentSection>
+
+          <SettingsContentSection title="Sandbox Agent" description="Connect to Sandbox Agent for cloud development environments.">
+            <SettingsRow
+              label="Sandbox Agent connection"
+              description="Manage your Sandbox Agent integration and API keys."
+              action={
+                <button type="button" onClick={() => window.open("https://sandbox-agent.dev", "_blank", "noopener,noreferrer")} style={secondaryButtonStyle(t)}>
+                  Configure
+                </button>
+              }
+            />
+          </SettingsContentSection>
+
+          <SettingsContentSection title="More">
+            <SettingsRow
+              label="Delete organization"
+              description="Permanently delete this organization and all its data."
+              action={
+                <button
+                  type="button"
+                  style={{
+                    ...secondaryButtonStyle(t),
+                    borderColor: "rgba(255, 110, 110, 0.24)",
+                    color: t.statusError,
+                  }}
+                >
+                  Delete
+                </button>
+              }
+            />
+          </SettingsContentSection>
+        </div>
+      ) : null}
+
+      {section === "members" ? (
+        <div style={{ display: "flex", flexDirection: "column", gap: "24px" }}>
+          <div>
+            <h1 style={{ margin: "0 0 2px", fontSize: "15px", fontWeight: 600 }}>Members</h1>
+            <p style={{ margin: 0, fontSize: "11px", color: t.textMuted }}>
+              {organization.members.length} member{organization.members.length !== 1 ? "s" : ""}
+            </p>
+          </div>
+          <div style={{ display: "flex", flexDirection: "column", gap: "2px" }}>
+            {organization.members.map((member) => (
+              <MemberRow key={member.id} member={member} />
+            ))}
+          </div>
+
+          {/* Upgrade CTA for free plan */}
+          {!organization.billing.stripeCustomerId.trim() ? (
+            <div
+              style={{
+                ...cardStyle(t),
+                padding: "20px",
+                border: "1px solid rgba(99, 102, 241, 0.3)",
+                background: "linear-gradient(135deg, rgba(99, 102, 241, 0.06) 0%, rgba(139, 92, 246, 0.04) 100%)",
+              }}
+            >
+              <div style={{ fontSize: "14px", fontWeight: 600, marginBottom: "4px" }}>Invite your team</div>
+              <div style={{ fontSize: "11px", color: t.textSecondary, lineHeight: 1.6, marginBottom: "14px" }}>
+                Upgrade to Pro to add team members and unlock collaboration features:
+              </div>
+              <div style={{ display: "flex", flexDirection: "column", gap: "8px", marginBottom: "16px" }}>
+                {[
+                  "Hand off tasks to teammates for review or continuation",
+                  "Shared organization with unified billing across your org",
+                  "200 task hours per seat, with bulk hour purchases available",
+                  "Collaborative task history and audit trail",
+                ].map((feature) => (
+                  <div key={feature} style={{ display: "flex", alignItems: "flex-start", gap: "8px" }}>
+                    <span style={{ color: "#6366f1", fontSize: "14px", lineHeight: 1.2, flexShrink: 0 }}>+</span>
+                    <span style={{ fontSize: "11px", color: t.textSecondary, lineHeight: 1.5 }}>{feature}</span>
+                  </div>
+                ))}
+              </div>
+              <button type="button" onClick={() => void navigate({ to: checkoutPath(organization, "team") })} style={primaryButtonStyle(t)}>
+                Upgrade to Pro — $25/mo per seat
+              </button>
+            </div>
+          ) : null}
+        </div>
+      ) : null}
+
+      {section === "docs" ? (
+        <div style={{ display: "flex", flexDirection: "column", gap: "24px" }}>
+          <div>
+            <h1 style={{ margin: "0 0 2px", fontSize: "15px", fontWeight: 600 }}>Docs</h1>
+            <p style={{ margin: 0, fontSize: "11px", color: t.textMuted }}>Documentation and resources.</p>
+          </div>
+          <SettingsRow
+            label="Sandbox Agent Documentation"
+            description="Learn about Sandbox Agent features, APIs, and integrations."
+            action={
+              <button type="button" onClick={() => window.open("https://sandbox-agent.dev", "_blank", "noopener,noreferrer")} style={secondaryButtonStyle(t)}>
+                Open docs
+              </button>
+            }
+          />
+        </div>
+      ) : null}
+    </SettingsLayout>
+  );
+}
+
+export function MockOrganizationBillingPage({ organization }: { organization: FoundryOrganization }) {
+  const client = useMockAppClient();
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+  const hasStripeCustomer = organization.billing.stripeCustomerId.trim().length > 0;
+  const effectivePlanId: FoundryBillingPlanId = hasStripeCustomer ? organization.billing.planId : "free";
+  const currentPlan = planCatalog[effectivePlanId]!;
+  // Mock usage data
+  const taskHoursUsed = effectivePlanId === "free" ? 5.2 : 147.3;
+  const taskHoursIncluded = currentPlan.taskHours;
+  const taskHoursRemaining = Math.max(0, taskHoursIncluded - taskHoursUsed);
+  const usagePercent = Math.min(100, (taskHoursUsed / taskHoursIncluded) * 100);
+  const isOverage = taskHoursUsed > taskHoursIncluded;
+  const isFree = effectivePlanId === "free";
+
+  return (
+    <SettingsLayout organization={organization} activeSection="billing">
+      <div style={{ display: "flex", flexDirection: "column", gap: "24px" }}>
+        <div>
+          <h1 style={{ margin: "0 0 2px", fontSize: "15px", fontWeight: 600 }}>Billing & Invoices</h1>
+          <p style={{ margin: 0, fontSize: "11px", color: t.textMuted }}>Manage your plan, task hours, and invoices.</p>
+        </div>
+
+        {/* Overview stats */}
+        <div style={{ display: "grid", gridTemplateColumns: "1fr 1fr 1fr", gap: "10px" }}>
+          <StatCard label="Current plan" value={currentPlan.label} caption={isFree ? "Free tier" : `${currentPlan.price} per seat`} />
+          <StatCard label="Task hours used" value={`${taskHoursUsed.toFixed(1)}h`} caption={`of ${taskHoursIncluded}h included`} />
+          <StatCard
+            label="Remaining"
+            value={`${taskHoursRemaining.toFixed(1)}h`}
+            caption={isOverage ? "Overage — $0.12/min" : `Resets ${formatDate(organization.billing.renewalAt)}`}
+          />
+        </div>
+
+        {/* Task hours usage bar */}
+        <div style={{ ...cardStyle(t), padding: "16px" }}>
+          <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", marginBottom: "10px" }}>
+            <div style={{ display: "flex", alignItems: "center", gap: "6px" }}>
+              <Clock size={13} style={{ color: t.textSecondary }} />
+              <span style={{ fontSize: "12px", fontWeight: 600 }}>Task Hours</span>
+            </div>
+            <span style={{ fontSize: "11px", color: t.textSecondary }}>
+              {taskHoursUsed.toFixed(1)} / {taskHoursIncluded}h used
+            </span>
+          </div>
+          <div style={{ height: "6px", borderRadius: "3px", backgroundColor: t.borderSubtle, overflow: "hidden" }}>
+            <div
+              style={{
+                height: "100%",
+                width: `${usagePercent}%`,
+                borderRadius: "3px",
+                backgroundColor: usagePercent > 90 ? "#ef4444" : usagePercent > 70 ? "#f59e0b" : "#22c55e",
+                transition: "width 500ms ease",
+              }}
+            />
+          </div>
+          <div style={{ display: "flex", justifyContent: "space-between", marginTop: "6px" }}>
+            <span style={{ fontSize: "10px", color: t.textTertiary }}>Metered by the minute</span>
+            <span style={{ fontSize: "10px", color: t.textTertiary }}>$0.12 / task hour overage</span>
+          </div>
+        </div>
+
+        {/* Upgrade to Pro (only shown on Free plan) */}
+        {isFree ? (
+          <div
+            style={{
+              ...cardStyle(t),
+              padding: "18px",
+              border: "1px solid rgba(99, 102, 241, 0.3)",
+              background: "linear-gradient(135deg, rgba(99, 102, 241, 0.06) 0%, rgba(139, 92, 246, 0.04) 100%)",
+            }}
+          >
+            <div style={{ display: "flex", alignItems: "flex-start", justifyContent: "space-between", gap: "16px" }}>
+              <div style={{ display: "flex", flexDirection: "column", gap: "6px" }}>
+                <div style={{ fontSize: "14px", fontWeight: 600 }}>Upgrade to Pro</div>
+                <div style={{ fontSize: "11px", color: t.textSecondary, lineHeight: 1.5 }}>
+                  Get 200 task hours per month, plus the ability to purchase additional hours in bulk. Currently limited to {currentPlan.taskHours} hours on the
+                  Free plan.
+                </div>
+              </div>
+              <button
+                type="button"
+                onClick={() => void navigate({ to: checkoutPath(organization, "team") })}
+                style={{ ...primaryButtonStyle(t), whiteSpace: "nowrap", flexShrink: 0 }}
+              >
+                Upgrade — $25/mo
+              </button>
+            </div>
+          </div>
+        ) : null}
+
+        {/* Buy more task hours (only shown on Pro plan) */}
+        {!isFree ? (
+          <SettingsContentSection
+            title="Purchase Task Hours"
+            description="Buy additional task hours in bulk. Hours are added to your current balance and don't expire."
+          >
+            <div style={{ display: "grid", gridTemplateColumns: "1fr 1fr 1fr", gap: "8px" }}>
+              {taskHourPackages.map((pkg) => (
+                <div
+                  key={pkg.hours}
+                  style={{
+                    ...cardStyle(t),
+                    padding: "14px",
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: "8px",
+                    cursor: "pointer",
+                    transition: "border-color 150ms ease",
+                  }}
+                  onMouseEnter={(event) => {
+                    (event.currentTarget as HTMLDivElement).style.borderColor = t.borderMedium;
+                  }}
+                  onMouseLeave={(event) => {
+                    (event.currentTarget as HTMLDivElement).style.borderColor = t.borderSubtle;
+                  }}
+                >
+                  <div style={{ fontSize: "16px", fontWeight: 700 }}>{pkg.hours}h</div>
+                  <div style={{ fontSize: "11px", color: t.textSecondary }}>${((pkg.price / pkg.hours) * 60).toFixed(1)}¢/min</div>
+                  <button type="button" style={{ ...secondaryButtonStyle(t), width: "100%", textAlign: "center", marginTop: "auto" }}>
+                    ${pkg.price}
+                  </button>
+                </div>
+              ))}
+            </div>
+          </SettingsContentSection>
+        ) : null}
+
+        {/* Payment method */}
+        {hasStripeCustomer ? (
+          <SettingsContentSection title="Payment" description={organization.billing.paymentMethodLabel || "No payment method on file."}>
+            <div style={{ display: "flex", gap: "8px" }}>
+              <button
+                type="button"
+                onClick={() =>
+                  void (isMockFrontendClient ? navigate({ to: checkoutPath(organization, effectivePlanId) }) : client.openBillingPortal(organization.id))
+                }
+                style={secondaryButtonStyle(t)}
+              >
+                {isMockFrontendClient ? "Open hosted checkout mock" : "Manage in Stripe"}
+              </button>
+              {organization.billing.status === "scheduled_cancel" ? (
+                <button type="button" onClick={() => void client.resumeSubscription(organization.id)} style={primaryButtonStyle(t)}>
+                  Resume subscription
+                </button>
+              ) : (
+                <button type="button" onClick={() => void client.cancelScheduledRenewal(organization.id)} style={subtleButtonStyle(t)}>
+                  Cancel at period end
+                </button>
+              )}
+            </div>
+          </SettingsContentSection>
+        ) : null}
+
+        {/* Invoices */}
+        <SettingsContentSection title="Invoices" description="Recent billing activity.">
+          {organization.billing.invoices.length === 0 ? (
+            <div style={{ color: t.textSecondary, fontSize: "11px" }}>No invoices yet.</div>
+          ) : (
+            <div style={{ display: "flex", flexDirection: "column" }}>
+              {organization.billing.invoices.map((invoice) => (
+                <div
+                  key={invoice.id}
+                  style={{
+                    display: "grid",
+                    gridTemplateColumns: "minmax(0, 1fr) 80px 70px",
+                    gap: "10px",
+                    alignItems: "center",
+                    padding: "8px 0",
+                    borderTop: `1px solid ${t.borderSubtle}`,
+                  }}
+                >
+                  <div>
+                    <div style={{ fontSize: "12px", fontWeight: 500 }}>{invoice.label}</div>
+                    <div style={{ fontSize: "10px", color: t.textSecondary }}>{invoice.issuedAt}</div>
+                  </div>
+                  <div style={{ fontSize: "12px", fontWeight: 500 }}>${invoice.amountUsd}</div>
+                  <div>
+                    <span
+                      style={badgeStyle(
+                        t,
+                        invoice.status === "paid" ? "rgba(46, 160, 67, 0.16)" : "rgba(255, 193, 7, 0.18)",
+                        invoice.status === "paid" ? "#b7f0c3" : "#ffe6a6",
+                      )}
+                    >
+                      {invoice.status}
+                    </span>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </SettingsContentSection>
+      </div>
+    </SettingsLayout>
+  );
+}
+
+export function MockHostedCheckoutPage({ organization, planId }: { organization: FoundryOrganization; planId: FoundryBillingPlanId }) {
+  const client = useMockAppClient();
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+  const plan = planCatalog[planId]!;
+
+  return (
+    <SettingsLayout organization={organization} activeSection="billing">
+      <div style={{ display: "flex", flexDirection: "column", gap: "24px" }}>
+        <div>
+          <h1 style={{ margin: "0 0 2px", fontSize: "15px", fontWeight: 600 }}>Checkout {plan.label}</h1>
+          <p style={{ margin: 0, fontSize: "11px", color: t.textMuted }}>Complete payment to activate the {plan.label} plan.</p>
+        </div>
+
+        <SettingsContentSection title="Order summary" description={`${organization.settings.displayName} — ${plan.label} plan.`}>
+          <div style={{ display: "flex", flexDirection: "column" }}>
+            <CheckoutLine label="Plan" value={plan.label} />
+            <CheckoutLine label="Price" value={plan.price} />
+            <CheckoutLine label="Included seats" value={plan.seats} />
+            <CheckoutLine label="Payment method" value="Visa ending in 4242" />
+          </div>
+        </SettingsContentSection>
+
+        <SettingsContentSection title="Card details">
+          <label style={{ display: "grid", gap: "4px" }}>
+            <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Cardholder</span>
+            <input value={organization.settings.displayName} readOnly style={inputStyle(t)} />
+          </label>
+          <label style={{ display: "grid", gap: "4px" }}>
+            <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Card number</span>
+            <input value="4242 4242 4242 4242" readOnly style={inputStyle(t)} />
+          </label>
+          <div style={{ display: "flex", gap: "8px" }}>
+            <button
+              type="button"
+              onClick={() => {
+                void (async () => {
+                  await client.completeHostedCheckout(organization.id, planId);
+                  if (isMockFrontendClient) {
+                    await navigate({ to: billingPath(organization), replace: true });
+                  }
+                })();
+              }}
+              style={primaryButtonStyle(t)}
+            >
+              {isMockFrontendClient ? "Complete checkout" : "Continue to Stripe"}
+            </button>
+            <button type="button" onClick={() => void navigate({ to: billingPath(organization) })} style={subtleButtonStyle(t)}>
+              Cancel
+            </button>
+          </div>
+        </SettingsContentSection>
+      </div>
+    </SettingsLayout>
+  );
+}
+
+function CheckoutLine({ label, value }: { label: string; value: string }) {
+  const t = useFoundryTokens();
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-between",
+        gap: "10px",
+        padding: "7px 0",
+        borderTop: `1px solid ${t.borderSubtle}`,
+      }}
+    >
+      <div style={{ color: t.textSecondary, fontSize: "11px" }}>{label}</div>
+      <div style={{ fontSize: "12px", fontWeight: 500 }}>{value}</div>
+    </div>
+  );
+}
+
+export function MockAccountSettingsPage() {
+  const client = useMockAppClient();
+  const snapshot = useMockAppSnapshot();
+  const user = activeMockUser(snapshot);
+  const navigate = useNavigate();
+  const t = useFoundryTokens();
+  const [name, setName] = useState(user?.name ?? "");
+  const [email, setEmail] = useState(user?.email ?? "");
+
+  useEffect(() => {
+    setName(user?.name ?? "");
+    setEmail(user?.email ?? "");
+  }, [user?.name, user?.email]);
+
+  return (
+    <div style={appSurfaceStyle(t)}>
+      <DesktopDragRegion />
+      <div style={{ display: "flex", flex: 1, minHeight: 0 }}>
+        {/* Left nav */}
+        <div
+          style={{
+            width: "200px",
+            flexShrink: 0,
+            borderRight: `1px solid ${t.borderSubtle}`,
+            padding: "44px 10px 16px",
+            display: "flex",
+            flexDirection: "column",
+            gap: "2px",
+            overflowY: "auto",
+          }}
+        >
+          <button
+            type="button"
+            onClick={() => void navigate({ to: "/" })}
+            style={{
+              ...subtleButtonStyle(t),
+              display: "flex",
+              alignItems: "center",
+              gap: "5px",
+              marginBottom: "10px",
+              fontSize: "11px",
+            }}
+          >
+            <ArrowLeft size={12} />
+            Back to organization
+          </button>
+
+          <div style={{ padding: "2px 10px 12px", display: "flex", flexDirection: "column", gap: "1px" }}>
+            <span style={{ fontSize: "12px", fontWeight: 600 }}>{user?.name ?? "User"}</span>
+            <span style={{ fontSize: "10px", color: t.textMuted }}>{user?.email ?? ""}</span>
+          </div>
+
+          <SettingsNavItem icon={<Settings size={13} />} label="General" active onClick={() => {}} />
+        </div>
+
+        {/* Content */}
+        <div style={{ flex: 1, overflowY: "auto", padding: "80px 36px 40px" }}>
+          <div style={{ maxWidth: "560px" }}>
+            <div style={{ display: "flex", flexDirection: "column", gap: "24px" }}>
+              <div>
+                <h1 style={{ margin: "0 0 2px", fontSize: "15px", fontWeight: 600 }}>Account</h1>
+                <p style={{ margin: 0, fontSize: "11px", color: t.textMuted }}>Manage your personal account settings.</p>
+              </div>
+
+              <SettingsContentSection title="Profile">
+                <label style={{ display: "grid", gap: "4px" }}>
+                  <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Display name</span>
+                  <input value={name} onChange={(e) => setName(e.target.value)} style={inputStyle(t)} />
+                </label>
+                <label style={{ display: "grid", gap: "4px" }}>
+                  <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>Email</span>
+                  <input value={email} onChange={(e) => setEmail(e.target.value)} style={inputStyle(t)} />
+                </label>
+                <label style={{ display: "grid", gap: "4px" }}>
+                  <span style={{ fontSize: "11px", fontWeight: 500, color: t.textMuted }}>GitHub</span>
+                  <input value={`@${user?.githubLogin ?? ""}`} readOnly style={{ ...inputStyle(t), color: t.textMuted }} />
+                </label>
+                <div>
+                  <button type="button" style={primaryButtonStyle(t)}>
+                    Save changes
+                  </button>
+                </div>
+              </SettingsContentSection>
+
+              <SettingsContentSection title="Sessions" description="Manage your active sessions across devices.">
+                <SettingsRow label="Current session" description="This device — signed in via GitHub OAuth." />
+              </SettingsContentSection>
+
+              <SettingsContentSection title="Sign out" description="Sign out of Foundry on this device.">
+                <div>
+                  <button
+                    type="button"
+                    onClick={() => {
+                      void (async () => {
+                        await client.signOut();
+                        await navigate({ to: "/signin" });
+                      })();
+                    }}
+                    style={{ ...secondaryButtonStyle(t), display: "inline-flex", alignItems: "center", gap: "6px" }}
+                  >
+                    <LogOut size={12} />
+                    Sign out
+                  </button>
+                </div>
+              </SettingsContentSection>
+
+              <SettingsContentSection title="Danger zone">
+                <SettingsRow
+                  label="Delete account"
+                  description="Permanently delete your account and all data."
+                  action={
+                    <button
+                      type="button"
+                      style={{
+                        ...secondaryButtonStyle(t),
+                        borderColor: "rgba(255, 110, 110, 0.24)",
+                        color: t.statusError,
+                        whiteSpace: "nowrap",
+                        flexShrink: 0,
+                      }}
+                    >
+                      Delete
+                    </button>
+                  }
+                />
+              </SettingsContentSection>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function AppearanceSection() {
+  const { colorMode, setColorMode } = useColorMode();
+  const t = useFoundryTokens();
+  const isDark = colorMode === "dark";
+
+  return (
+    <SettingsContentSection title="Appearance" description="Customize how Foundry looks.">
+      <SettingsRow
+        label="Light mode"
+        description={isDark ? "Currently using dark mode." : "Currently using light mode."}
+        action={
+          <button
+            type="button"
+            onClick={() => setColorMode(isDark ? "light" : "dark")}
+            style={{
+              position: "relative",
+              width: "36px",
+              height: "20px",
+              borderRadius: "10px",
+              border: "1px solid rgba(128, 128, 128, 0.3)",
+              background: isDark ? t.borderDefault : t.accent,
+              cursor: "pointer",
+              padding: 0,
+              transition: "background 0.2s",
+              flexShrink: 0,
+            }}
+          >
+            <div
+              style={{
+                position: "absolute",
+                top: "2px",
+                left: isDark ? "2px" : "16px",
+                width: "14px",
+                height: "14px",
+                borderRadius: "50%",
+                background: isDark ? t.textTertiary : "#ffffff",
+                transition: "left 0.2s, background 0.2s",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+              {isDark ? <Moon size={8} /> : <Sun size={8} color={t.accent} />}
+            </div>
+          </button>
+        }
+      />
+    </SettingsContentSection>
+  );
+}
diff --git a/foundry/packages/frontend/src/components/organization-dashboard.tsx b/foundry/packages/frontend/src/components/organization-dashboard.tsx
new file mode 100644
index 0000000..4f54ac3
--- /dev/null
+++ b/foundry/packages/frontend/src/components/organization-dashboard.tsx
@@ -0,0 +1,1666 @@
+import { useEffect, useMemo, useState, type ReactNode } from "react";
+import type { RepoBranchRecord, RepoOverview, TaskWorkspaceSnapshot, WorkspaceTaskStatus } from "@sandbox-agent/foundry-shared";
+import { currentFoundryOrganization, useSubscription } from "@sandbox-agent/foundry-client";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { Link, useNavigate } from "@tanstack/react-router";
+import { Button } from "baseui/button";
+import { Input } from "baseui/input";
+import { Modal, ModalBody, ModalFooter, ModalHeader } from "baseui/modal";
+import { Select, type OnChangeParams, type Option, type Value } from "baseui/select";
+import { Skeleton } from "baseui/skeleton";
+import { Tag } from "baseui/tag";
+import { Textarea } from "baseui/textarea";
+import { StyledDivider } from "baseui/divider";
+import { styled, useStyletron } from "baseui";
+import { HeadingSmall, HeadingXSmall, LabelSmall, LabelXSmall, MonoLabelSmall, ParagraphSmall } from "baseui/typography";
+import { Bot, CircleAlert, FolderGit2, GitBranch, MessageSquareText, SendHorizontal } from "lucide-react";
+import { deriveHeaderStatus, describeTaskState } from "../features/tasks/status";
+import { HeaderStatusPill } from "./mock-layout/ui";
+import { buildTranscript, resolveSessionSelection } from "../features/sessions/model";
+import { backendClient } from "../lib/backend";
+import { subscriptionManager } from "../lib/subscription";
+import { DevPanel, useDevPanel } from "./dev-panel";
+
+interface OrganizationDashboardProps {
+  organizationId: string;
+  selectedTaskId?: string;
+  selectedRepoId?: string;
+}
+
+type RepoOverviewFilter = "active" | "archived" | "unmapped" | "all";
+type StatusTagKind = "neutral" | "positive" | "warning" | "negative";
+type SelectItem = Readonly<{ id: string; label: string; disabled?: boolean }>;
+
+const AppShell = styled("main", ({ $theme }) => ({
+  minHeight: "100dvh",
+  backgroundColor: $theme.colors.backgroundPrimary,
+}));
+
+const DashboardGrid = styled("div", ({ $theme }) => ({
+  display: "grid",
+  gap: "1px",
+  minHeight: "100dvh",
+  backgroundColor: $theme.colors.borderOpaque,
+  gridTemplateColumns: "minmax(0, 1fr)",
+  "@media screen and (min-width: 960px)": {
+    gridTemplateColumns: "260px minmax(0, 1fr)",
+  },
+  "@media screen and (min-width: 1480px)": {
+    gridTemplateColumns: "260px minmax(0, 1fr) 280px",
+  },
+}));
+
+const Panel = styled("section", ({ $theme }) => ({
+  minHeight: 0,
+  display: "flex",
+  flexDirection: "column",
+  backgroundColor: $theme.colors.backgroundSecondary,
+  overflow: "hidden",
+}));
+
+const PanelHeader = styled("div", ({ $theme }) => ({
+  padding: "10px 12px",
+  borderBottom: `1px solid ${$theme.colors.borderOpaque}`,
+  display: "flex",
+  flexDirection: "column",
+  gap: "8px",
+}));
+
+const ScrollBody = styled("div", ({ $theme }) => ({
+  minHeight: 0,
+  flex: 1,
+  overflowY: "auto",
+  padding: "10px 12px",
+  display: "flex",
+  flexDirection: "column",
+  gap: "8px",
+}));
+
+const DetailRail = styled("aside", ({ $theme }) => ({
+  minHeight: 0,
+  display: "none",
+  backgroundColor: $theme.colors.backgroundSecondary,
+  overflow: "hidden",
+  "@media screen and (min-width: 1480px)": {
+    display: "flex",
+    flexDirection: "column",
+  },
+}));
+
+const FILTER_OPTIONS: SelectItem[] = [
+  { id: "active", label: "Active + Unmapped" },
+  { id: "archived", label: "Archived Tasks" },
+  { id: "unmapped", label: "Unmapped Only" },
+  { id: "all", label: "All Branches" },
+];
+
+function statusKind(status: WorkspaceTaskStatus): StatusTagKind {
+  if (status === "running") return "positive";
+  if (status === "error") return "negative";
+  if (String(status).startsWith("init_")) return "warning";
+  return "neutral";
+}
+
+function formatTime(value: number): string {
+  return new Date(value).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
+}
+
+function formatRelativeAge(value: number): string {
+  const deltaSeconds = Math.max(0, Math.floor((Date.now() - value) / 1000));
+  if (deltaSeconds < 60) return `${deltaSeconds}s`;
+  const minutes = Math.floor(deltaSeconds / 60);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h`;
+  const days = Math.floor(hours / 24);
+  return `${days}d`;
+}
+
+function branchTestIdToken(value: string): string {
+  const token = value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "");
+  return token || "branch";
+}
+
+function repoSummary(overview: RepoOverview | undefined): {
+  total: number;
+  mapped: number;
+  unmapped: number;
+  openPrs: number;
+} {
+  if (!overview) {
+    return {
+      total: 0,
+      mapped: 0,
+      unmapped: 0,
+      openPrs: 0,
+    };
+  }
+
+  let mapped = 0;
+  let openPrs = 0;
+
+  for (const row of overview.branches) {
+    if (row.taskId) {
+      mapped += 1;
+    }
+    if (row.pullRequest && row.pullRequest.state !== "MERGED" && row.pullRequest.state !== "CLOSED") {
+      openPrs += 1;
+    }
+  }
+
+  return {
+    total: overview.branches.length,
+    mapped,
+    unmapped: Math.max(0, overview.branches.length - mapped),
+    openPrs,
+  };
+}
+
+function branchKind(row: RepoBranchRecord): StatusTagKind {
+  if (row.pullRequest?.isDraft || row.pullRequest?.state === "OPEN") {
+    return "warning";
+  }
+  if (row.pullRequest?.state === "MERGED") {
+    return "positive";
+  }
+  return "neutral";
+}
+
+function branchPullRequestLabel(branch: RepoBranchRecord): string {
+  if (!branch.pullRequest) {
+    return "no pr";
+  }
+  if (branch.pullRequest.isDraft) {
+    return "draft";
+  }
+  return branch.pullRequest.state.toLowerCase();
+}
+
+function matchesOverviewFilter(branch: RepoBranchRecord, filter: RepoOverviewFilter): boolean {
+  if (filter === "archived") {
+    return branch.taskStatus === "archived";
+  }
+  if (filter === "unmapped") {
+    return branch.taskId === null;
+  }
+  if (filter === "active") {
+    return branch.taskStatus !== "archived";
+  }
+  return true;
+}
+
+function selectValue(option: Option | null | undefined): Value {
+  return option ? [option] : [];
+}
+
+function optionId(value: Value): string | null {
+  const id = value[0]?.id;
+  if (typeof id === "string") return id;
+  if (typeof id === "number") return String(id);
+  return null;
+}
+
+function createOption(item: SelectItem): Option {
+  return {
+    id: item.id,
+    label: item.label,
+    disabled: item.disabled,
+  };
+}
+
+function inputTestIdOverrides(testId?: string) {
+  return testId
+    ? {
+        Input: {
+          props: {
+            "data-testid": testId,
+          },
+        },
+      }
+    : undefined;
+}
+
+function textareaTestIdOverrides(testId?: string) {
+  return testId
+    ? {
+        Input: {
+          props: {
+            "data-testid": testId,
+          },
+        },
+      }
+    : undefined;
+}
+
+function selectTestIdOverrides(testId?: string) {
+  return testId
+    ? {
+        ControlContainer: {
+          props: {
+            "data-testid": testId,
+          },
+        },
+      }
+    : undefined;
+}
+
+function EmptyState({ children, testId }: { children: string; testId?: string }) {
+  return (
+    <div
+      data-testid={testId}
+      style={{
+        padding: "12px",
+        borderRadius: "0",
+        border: "1px dashed rgba(166, 176, 191, 0.24)",
+        background: "rgba(255, 255, 255, 0.02)",
+      }}
+    >
+      <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+        {children}
+      </ParagraphSmall>
+    </div>
+  );
+}
+
+function StatusPill({ children, kind }: { children: ReactNode; kind: StatusTagKind }) {
+  return (
+    <Tag
+      closeable={false}
+      kind={kind}
+      hierarchy="secondary"
+      size="small"
+      overrides={{
+        Root: {
+          style: {
+            borderRadius: "2px",
+            minHeight: "20px",
+            fontFamily: '"IBM Plex Mono", "SFMono-Regular", monospace',
+            letterSpacing: "0.02em",
+          },
+        },
+      }}
+    >
+      {children}
+    </Tag>
+  );
+}
+
+function MetaRow({ label, value, mono = false }: { label: string; value: string; mono?: boolean }) {
+  return (
+    <div
+      style={{
+        display: "flex",
+        justifyContent: "space-between",
+        gap: "12px",
+        alignItems: "flex-start",
+      }}
+    >
+      <LabelXSmall color="contentSecondary">{label}</LabelXSmall>
+      {mono ? (
+        <MonoLabelSmall marginTop="0" marginBottom="0" overrides={{ Block: { style: { textAlign: "right", wordBreak: "break-word" } } }}>
+          {value}
+        </MonoLabelSmall>
+      ) : (
+        <LabelSmall marginTop="0" marginBottom="0" overrides={{ Block: { style: { textAlign: "right", wordBreak: "break-word" } } }}>
+          {value}
+        </LabelSmall>
+      )}
+    </div>
+  );
+}
+
+export function OrganizationDashboard({ organizationId, selectedTaskId, selectedRepoId }: OrganizationDashboardProps) {
+  const [css, theme] = useStyletron();
+  const navigate = useNavigate();
+  const showDevPanel = useDevPanel();
+  const repoOverviewMode = typeof selectedRepoId === "string" && selectedRepoId.length > 0;
+
+  const [draft, setDraft] = useState("");
+  const [activeSessionId, setActiveSessionId] = useState<string | null>(null);
+  const [createRepoId, setCreateRepoId] = useState("");
+  const [newTask, setNewTask] = useState("");
+  const [newTitle, setNewTitle] = useState("");
+  const [newBranchName, setNewBranchName] = useState("");
+  const [createOnBranch, setCreateOnBranch] = useState<string | null>(null);
+  const [createTaskOpen, setCreateTaskOpen] = useState(false);
+  const [selectedOverviewBranch, setSelectedOverviewBranch] = useState<string | null>(null);
+  const [overviewFilter, setOverviewFilter] = useState<RepoOverviewFilter>("active");
+  const [createError, setCreateError] = useState<string | null>(null);
+
+  const appState = useSubscription(subscriptionManager, "app", {});
+  const activeOrg = appState.data ? currentFoundryOrganization(appState.data) : null;
+
+  const organizationState = useSubscription(subscriptionManager, "organization", { organizationId });
+  const reposData = organizationState.data?.repos;
+  const rowsData = organizationState.data?.taskSummaries;
+  const repos = reposData ?? [];
+  const rows = rowsData ?? [];
+  const selectedSummary = useMemo(() => rows.find((row) => row.id === selectedTaskId) ?? rows[0] ?? null, [rowsData, selectedTaskId]);
+  const taskState = useSubscription(
+    subscriptionManager,
+    "task",
+    !repoOverviewMode && selectedSummary
+      ? {
+          organizationId,
+          repoId: selectedSummary.repoId,
+          taskId: selectedSummary.id,
+        }
+      : null,
+  );
+  const activeRepoId = selectedRepoId ?? createRepoId;
+
+  const repoOverviewQuery = useQuery({
+    queryKey: ["organization", organizationId, "repo-overview", activeRepoId],
+    enabled: Boolean(repoOverviewMode && activeRepoId),
+    queryFn: async () => {
+      if (!activeRepoId) {
+        throw new Error("No repo selected");
+      }
+      return backendClient.getRepoOverview(organizationId, activeRepoId);
+    },
+  });
+
+  useEffect(() => {
+    const repos = reposData ?? [];
+    if (repoOverviewMode && selectedRepoId) {
+      setCreateRepoId(selectedRepoId);
+      return;
+    }
+    if (!createRepoId && repos.length > 0) {
+      setCreateRepoId(repos[0]!.id);
+    }
+  }, [createRepoId, repoOverviewMode, reposData, selectedRepoId]);
+
+  const repoGroups = useMemo(() => {
+    const repos = reposData ?? [];
+    const rows = rowsData ?? [];
+    const byRepo = new Map<string, typeof rows>();
+    for (const row of rows) {
+      const bucket = byRepo.get(row.repoId);
+      if (bucket) {
+        bucket.push(row);
+      } else {
+        byRepo.set(row.repoId, [row]);
+      }
+    }
+
+    return repos
+      .map((repo) => {
+        const tasks = [...(byRepo.get(repo.id) ?? [])].sort((a, b) => b.updatedAtMs - a.updatedAtMs);
+        const latestTaskAt = tasks[0]?.updatedAtMs ?? 0;
+        return {
+          repoId: repo.id,
+          repoLabel: repo.label,
+          latestActivityAt: Math.max(repo.latestActivityMs, latestTaskAt),
+          tasks,
+        };
+      })
+      .sort((a, b) => {
+        if (a.latestActivityAt !== b.latestActivityAt) {
+          return b.latestActivityAt - a.latestActivityAt;
+        }
+        return a.repoLabel.localeCompare(b.repoLabel);
+      });
+  }, [reposData, rowsData]);
+
+  const selectedForSession = repoOverviewMode ? null : (taskState.data ?? null);
+
+  const activeSandbox = useMemo(() => {
+    if (!selectedForSession) return null;
+    const byActive = selectedForSession.activeSandboxId
+      ? (selectedForSession.sandboxes.find((sandbox) => sandbox.sandboxId === selectedForSession.activeSandboxId) ?? null)
+      : null;
+    return byActive ?? selectedForSession.sandboxes[0] ?? null;
+  }, [selectedForSession]);
+
+  useEffect(() => {
+    const rows = rowsData ?? [];
+    if (!repoOverviewMode && !selectedTaskId && rows.length > 0) {
+      void navigate({
+        to: "/organizations/$organizationId/tasks/$taskId",
+        params: {
+          organizationId,
+          taskId: rows[0]!.id,
+        },
+        search: { sessionId: undefined },
+        replace: true,
+      });
+    }
+  }, [navigate, repoOverviewMode, rowsData, selectedTaskId, organizationId]);
+
+  useEffect(() => {
+    setActiveSessionId(null);
+    setDraft("");
+  }, [selectedForSession?.id]);
+
+  const sessionRowsData = selectedForSession?.sessionsSummary;
+  const sessionRows = sessionRowsData ?? [];
+  const taskStatus = selectedForSession?.status ?? null;
+  const taskStatusState = describeTaskState(taskStatus);
+  const taskStateSummary = `${taskStatusState.title}. ${taskStatusState.detail}`;
+  const shouldUseTaskStateEmptyState = Boolean(selectedForSession && taskStatus && taskStatus !== "running" && taskStatus !== "idle");
+  const sessionSelection = useMemo(
+    () =>
+      resolveSessionSelection({
+        explicitSessionId: activeSessionId,
+        taskSessionId: selectedForSession?.activeSessionId ?? null,
+        sessions: sessionRows.map((session) => ({
+          id: session.id,
+          agent: session.agent,
+          agentSessionId: session.sessionId ?? "",
+          lastConnectionId: "",
+          createdAt: 0,
+          status: session.status,
+        })),
+      }),
+    [activeSessionId, selectedForSession?.activeSessionId, sessionRowsData],
+  );
+  const resolvedSessionId = sessionSelection.sessionId;
+  const staleSessionId = sessionSelection.staleSessionId;
+  const sessionState = useSubscription(
+    subscriptionManager,
+    "session",
+    selectedForSession && resolvedSessionId
+      ? {
+          organizationId,
+          repoId: selectedForSession.repoId,
+          taskId: selectedForSession.id,
+          sessionId: resolvedSessionId,
+        }
+      : null,
+  );
+  const selectedSessionSummary = useMemo(() => sessionRows.find((session) => session.id === resolvedSessionId) ?? null, [resolvedSessionId, sessionRowsData]);
+  const isPendingProvision = selectedSessionSummary?.status === "pending_provision";
+  const isPendingSessionCreate = selectedSessionSummary?.status === "pending_session_create";
+  const isSessionError = selectedSessionSummary?.status === "error";
+  const canStartSession = Boolean(selectedForSession && activeSandbox?.sandboxId);
+  const devPanelFocusedTask = useMemo(() => {
+    if (repoOverviewMode) {
+      return null;
+    }
+
+    const task = selectedForSession ?? selectedSummary;
+    if (!task) {
+      return null;
+    }
+
+    return {
+      id: task.id,
+      repoId: task.repoId,
+      title: task.title,
+      status: task.status,
+      branch: task.branch ?? null,
+      activeSandboxId: selectedForSession?.activeSandboxId ?? null,
+      activeSessionId: selectedForSession?.activeSessionId ?? null,
+      sandboxes: selectedForSession?.sandboxes ?? [],
+      sessions: selectedForSession?.sessionsSummary ?? [],
+    };
+  }, [repoOverviewMode, selectedForSession, selectedSummary]);
+  const devPanelSnapshot = useMemo(
+    (): TaskWorkspaceSnapshot => ({
+      organizationId,
+      repos: repos.map((repo) => ({ id: repo.id, label: repo.label })),
+      repositories: [],
+      tasks: rows.map((task) => ({
+        id: task.id,
+        repoId: task.repoId,
+        title: task.title,
+        status: task.status,
+        repoName: task.repoName,
+        updatedAtMs: task.updatedAtMs,
+        branch: task.branch ?? null,
+        pullRequest: task.pullRequest,
+        sessions: task.sessionsSummary.map((session) => ({
+          ...session,
+          draft: {
+            text: "",
+            attachments: [],
+            updatedAtMs: null,
+          },
+          transcript: [],
+        })),
+        fileChanges: [],
+        diffs: {},
+        fileTree: [],
+        minutesUsed: 0,
+        activeSandboxId: selectedForSession?.id === task.id ? selectedForSession.activeSandboxId : null,
+      })),
+    }),
+    [reposData, rowsData, selectedForSession, organizationId],
+  );
+
+  const startSessionFromTask = async (): Promise<{ id: string; status: "running" | "idle" | "error" }> => {
+    if (!selectedForSession || !activeSandbox?.sandboxId) {
+      throw new Error("No sandbox is available for this task");
+    }
+    const preferredAgent = selectedSessionSummary?.agent === "Claude" ? "claude" : selectedSessionSummary?.agent === "Codex" ? "codex" : undefined;
+    return backendClient.createSandboxSession({
+      organizationId,
+      sandboxProviderId: activeSandbox.sandboxProviderId,
+      sandboxId: activeSandbox.sandboxId,
+      prompt: selectedForSession.task,
+      cwd: activeSandbox.cwd ?? undefined,
+      agent: preferredAgent,
+    });
+  };
+
+  const createSession = useMutation({
+    mutationFn: async () => startSessionFromTask(),
+    onSuccess: (session) => {
+      setActiveSessionId(session.id);
+    },
+  });
+
+  const ensureSessionForPrompt = async (): Promise<string> => {
+    if (resolvedSessionId) {
+      return resolvedSessionId;
+    }
+    const created = await startSessionFromTask();
+    setActiveSessionId(created.id);
+    return created.id;
+  };
+
+  const sendPrompt = useMutation({
+    mutationFn: async (prompt: string) => {
+      if (!selectedForSession || !activeSandbox?.sandboxId) {
+        throw new Error("No sandbox is available for this task");
+      }
+      const sessionId = await ensureSessionForPrompt();
+      await backendClient.sendSandboxPrompt({
+        organizationId,
+        sandboxProviderId: activeSandbox.sandboxProviderId,
+        sandboxId: activeSandbox.sandboxId,
+        sessionId,
+        prompt,
+      });
+    },
+    onSuccess: () => {
+      setDraft("");
+    },
+  });
+
+  const transcript = buildTranscript(sessionState.data?.transcript ?? []);
+  const canCreateTask = createRepoId.trim().length > 0 && newTask.trim().length > 0;
+
+  const createTask = useMutation({
+    mutationFn: async () => {
+      const repoId = createRepoId.trim();
+      const task = newTask.trim();
+      if (!repoId || !task) {
+        throw new Error("Repository and task are required");
+      }
+
+      const draftTitle = newTitle.trim();
+      const draftBranchName = newBranchName.trim();
+
+      return backendClient.createTask({
+        organizationId,
+        repoId,
+        task,
+        explicitTitle: draftTitle || undefined,
+        explicitBranchName: createOnBranch ? undefined : draftBranchName || undefined,
+        onBranch: createOnBranch ?? undefined,
+      });
+    },
+    onSuccess: async (task) => {
+      setCreateError(null);
+      setNewTask("");
+      setNewTitle("");
+      setNewBranchName("");
+      setCreateOnBranch(null);
+      setCreateTaskOpen(false);
+      await navigate({
+        to: "/organizations/$organizationId/tasks/$taskId",
+        params: {
+          organizationId,
+          taskId: task.taskId,
+        },
+        search: { sessionId: undefined },
+      });
+    },
+    onError: (error) => {
+      setCreateError(error instanceof Error ? error.message : String(error));
+    },
+  });
+
+  const openCreateFromBranch = (repoId: string, branchName: string): void => {
+    setCreateRepoId(repoId);
+    setCreateOnBranch(branchName);
+    setNewBranchName("");
+    setCreateError(null);
+    if (!newTask.trim()) {
+      setNewTask(`Continue work on ${branchName}`);
+    }
+    setCreateTaskOpen(true);
+  };
+
+  const repoOptions = useMemo(() => repos.map((repo) => createOption({ id: repo.id, label: repo.label })), [reposData]);
+  const selectedRepoOption = repoOptions.find((option) => option.id === createRepoId) ?? null;
+  const selectedFilterOption = useMemo(
+    () => createOption(FILTER_OPTIONS.find((option) => option.id === overviewFilter) ?? FILTER_OPTIONS[0]!),
+    [overviewFilter],
+  );
+  const sessionOptions = useMemo(
+    () => sessionRows.map((session) => createOption({ id: session.id, label: `${session.sessionName} (${session.status})` })),
+    [sessionRowsData],
+  );
+  const selectedSessionOption = sessionOptions.find((option) => option.id === resolvedSessionId) ?? null;
+
+  const overview = repoOverviewQuery.data;
+  const overviewStats = repoSummary(overview);
+  const filteredOverviewBranches = useMemo(() => {
+    if (!overview?.branches?.length) {
+      return [];
+    }
+    return overview.branches.filter((branch) => matchesOverviewFilter(branch, overviewFilter));
+  }, [overview, overviewFilter]);
+  const selectedBranchOverview = useMemo(() => {
+    if (!filteredOverviewBranches.length) {
+      return null;
+    }
+    if (!selectedOverviewBranch) {
+      return filteredOverviewBranches[0] ?? null;
+    }
+    return filteredOverviewBranches.find((row) => row.branchName === selectedOverviewBranch) ?? filteredOverviewBranches[0] ?? null;
+  }, [filteredOverviewBranches, selectedOverviewBranch]);
+
+  useEffect(() => {
+    if (!filteredOverviewBranches.length) {
+      setSelectedOverviewBranch(null);
+      return;
+    }
+    if (!selectedOverviewBranch || !filteredOverviewBranches.some((row) => row.branchName === selectedOverviewBranch)) {
+      setSelectedOverviewBranch(filteredOverviewBranches[0]?.branchName ?? null);
+    }
+  }, [filteredOverviewBranches, selectedOverviewBranch]);
+
+  const modalOverrides = useMemo(
+    () => ({
+      Dialog: {
+        style: {
+          borderRadius: "0",
+          backgroundColor: theme.colors.backgroundSecondary,
+          border: `1px solid ${theme.colors.borderOpaque}`,
+          boxShadow: "0 18px 40px rgba(0, 0, 0, 0.45)",
+        },
+      },
+      Close: {
+        style: {
+          borderRadius: "0",
+        },
+      },
+    }),
+    [theme.colors.backgroundSecondary, theme.colors.borderOpaque],
+  );
+
+  return (
+    <AppShell>
+      <DashboardGrid>
+        <Panel>
+          <PanelHeader>
+            <div
+              className={css({
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "space-between",
+                gap: theme.sizing.scale400,
+              })}
+            >
+              <div
+                className={css({
+                  display: "flex",
+                  flexDirection: "column",
+                  alignItems: "flex-start",
+                  gap: "2px",
+                })}
+              >
+                <LabelXSmall color="contentTertiary">Organization</LabelXSmall>
+                <div
+                  className={css({
+                    display: "flex",
+                    alignItems: "center",
+                    gap: theme.sizing.scale300,
+                  })}
+                >
+                  <FolderGit2 size={14} />
+                  <HeadingXSmall marginTop="0" marginBottom="0">
+                    {organizationId}
+                  </HeadingXSmall>
+                </div>
+              </div>
+
+              <Button
+                size="compact"
+                kind="secondary"
+                onClick={() => {
+                  void navigate({
+                    to: "/organizations/$organizationId/settings",
+                    params: { organizationId },
+                  });
+                }}
+                data-testid="organization-settings-open"
+              >
+                GitHub Settings
+              </Button>
+            </div>
+
+            <div
+              className={css({
+                paddingTop: theme.sizing.scale200,
+                borderTop: `1px solid ${theme.colors.borderOpaque}`,
+              })}
+            >
+              <LabelXSmall color="contentSecondary">Tasks</LabelXSmall>
+            </div>
+          </PanelHeader>
+
+          <ScrollBody>
+            {organizationState.status === "loading" ? (
+              <>
+                <Skeleton rows={3} height="72px" />
+              </>
+            ) : null}
+
+            {organizationState.status !== "loading" && repoGroups.length === 0 ? (
+              <EmptyState>No repos or tasks yet. Create the repository in GitHub, then sync repos from organization settings.</EmptyState>
+            ) : null}
+
+            {repoGroups.map((group) => (
+              <section
+                key={group.repoId}
+                className={css({
+                  marginLeft: "-12px",
+                  marginRight: "-12px",
+                  paddingBottom: "8px",
+                  borderBottom: `1px solid ${theme.colors.borderOpaque}`,
+                })}
+              >
+                <Link
+                  to="/organizations/$organizationId/repos/$repoId"
+                  params={{ organizationId, repoId: group.repoId }}
+                  className={css({
+                    display: "block",
+                    textDecoration: "none",
+                    fontSize: theme.typography.LabelSmall.fontSize,
+                    fontWeight: 600,
+                    lineHeight: "1.35",
+                    color: theme.colors.contentSecondary,
+                    padding: "10px 12px 8px",
+                    wordBreak: "break-word",
+                    ":hover": {
+                      color: theme.colors.contentPrimary,
+                      backgroundColor: "rgba(255, 255, 255, 0.02)",
+                    },
+                  })}
+                  data-testid={group.repoId === activeRepoId ? "repo-overview-open" : `repo-overview-open-${group.repoId}`}
+                >
+                  {group.repoLabel}
+                </Link>
+
+                <div
+                  className={css({
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: "0",
+                  })}
+                >
+                  {group.tasks
+                    .filter((task) => task.status !== "archived" || task.id === selectedSummary?.id)
+                    .map((task) => {
+                      const isActive = !repoOverviewMode && task.id === selectedSummary?.id;
+                      return (
+                        <Link
+                          key={task.id}
+                          to="/organizations/$organizationId/tasks/$taskId"
+                          params={{ organizationId, taskId: task.id }}
+                          search={{ sessionId: undefined }}
+                          className={css({
+                            display: "block",
+                            textDecoration: "none",
+                            borderLeft: `2px solid ${isActive ? theme.colors.primary : "transparent"}`,
+                            borderTop: `1px solid ${theme.colors.borderOpaque}`,
+                            backgroundColor: isActive ? "rgba(143, 180, 255, 0.08)" : task.status === "archived" ? "rgba(255, 255, 255, 0.02)" : "transparent",
+                            padding: "10px 12px 10px 14px",
+                            transition: "background-color 0.15s ease, border-color 0.15s ease",
+                            ":hover": {
+                              backgroundColor: isActive ? "rgba(143, 180, 255, 0.1)" : "rgba(255, 255, 255, 0.03)",
+                            },
+                          })}
+                        >
+                          <LabelSmall marginTop="0" marginBottom="0">
+                            {task.title ?? "Determining title..."}
+                          </LabelSmall>
+                          <div
+                            className={css({
+                              marginTop: "8px",
+                              display: "flex",
+                              alignItems: "center",
+                              justifyContent: "space-between",
+                              gap: theme.sizing.scale300,
+                            })}
+                          >
+                            <ParagraphSmall
+                              marginTop="0"
+                              marginBottom="0"
+                              color="contentSecondary"
+                              overrides={{ Block: { style: { overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } } }}
+                            >
+                              {task.branch ?? "Determining branch..."}
+                            </ParagraphSmall>
+                            <StatusPill kind={statusKind(task.status)}>{task.status}</StatusPill>
+                          </div>
+                        </Link>
+                      );
+                    })}
+
+                  <Button
+                    size="compact"
+                    kind="tertiary"
+                    overrides={{
+                      BaseButton: {
+                        style: {
+                          justifyContent: "flex-start",
+                          borderRadius: "0",
+                          paddingLeft: "12px",
+                          paddingRight: "12px",
+                        },
+                      },
+                    }}
+                    onClick={() => {
+                      setCreateRepoId(group.repoId);
+                      setCreateOnBranch(null);
+                      setCreateError(null);
+                      setCreateTaskOpen(true);
+                    }}
+                    data-testid={group.repoId === createRepoId ? "task-create-open" : `task-create-open-${group.repoId}`}
+                  >
+                    Create Task
+                  </Button>
+                </div>
+              </section>
+            ))}
+          </ScrollBody>
+        </Panel>
+
+        <Panel>
+          {repoOverviewMode ? (
+            <>
+              <PanelHeader>
+                <div
+                  className={css({
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                    gap: theme.sizing.scale400,
+                    flexWrap: "wrap",
+                  })}
+                >
+                  <div
+                    className={css({
+                      display: "flex",
+                      alignItems: "center",
+                      gap: theme.sizing.scale300,
+                    })}
+                  >
+                    <GitBranch size={16} />
+                    <HeadingXSmall marginTop="0" marginBottom="0">
+                      Repo Overview
+                    </HeadingXSmall>
+                  </div>
+
+                  <div
+                    className={css({
+                      display: "flex",
+                      flexWrap: "wrap",
+                      alignItems: "center",
+                      gap: theme.sizing.scale300,
+                    })}
+                  >
+                    <div className={css({ minWidth: "220px" })}>
+                      <Select
+                        options={FILTER_OPTIONS.map(createOption)}
+                        value={selectValue(selectedFilterOption)}
+                        clearable={false}
+                        searchable={false}
+                        size="compact"
+                        onChange={(params: OnChangeParams) => {
+                          const next = optionId(params.value) as RepoOverviewFilter | null;
+                          if (next) {
+                            setOverviewFilter(next);
+                          }
+                        }}
+                        aria-label="Filter branches"
+                        overrides={selectTestIdOverrides("repo-overview-filter")}
+                      />
+                    </div>
+                  </div>
+                </div>
+
+                <div
+                  className={css({
+                    display: "flex",
+                    flexWrap: "wrap",
+                    gap: "8px",
+                  })}
+                >
+                  <StatusPill kind="neutral">Branches {overviewStats.total}</StatusPill>
+                  <StatusPill kind="positive">Mapped {overviewStats.mapped}</StatusPill>
+                  <StatusPill kind="warning">Unmapped {overviewStats.unmapped}</StatusPill>
+                  <StatusPill kind="neutral">Open PRs {overviewStats.openPrs}</StatusPill>
+                </div>
+              </PanelHeader>
+
+              <ScrollBody data-testid="repo-overview-center">
+                {repoOverviewQuery.isLoading ? <Skeleton rows={4} height="72px" /> : null}
+
+                {!repoOverviewQuery.isLoading && !overview ? <EmptyState>No repo overview is available yet.</EmptyState> : null}
+
+                {overview ? (
+                  <div
+                    className={css({
+                      overflowX: "auto",
+                      border: `1px solid ${theme.colors.borderOpaque}`,
+                    })}
+                  >
+                    <div
+                      className={css({
+                        minWidth: "980px",
+                        display: "grid",
+                        gridTemplateColumns: "2fr 1.3fr 1fr 1fr 0.9fr 1.2fr",
+                      })}
+                    >
+                      {["Branch", "Task", "PR", "CI / Review", "Updated", "Actions"].map((label) => (
+                        <div
+                          key={label}
+                          className={css({
+                            padding: `12px ${theme.sizing.scale400}`,
+                            backgroundColor: theme.colors.backgroundTertiary,
+                            borderBottom: `1px solid ${theme.colors.borderOpaque}`,
+                          })}
+                        >
+                          <LabelXSmall color="contentSecondary">{label}</LabelXSmall>
+                        </div>
+                      ))}
+
+                      {filteredOverviewBranches.length === 0 ? (
+                        <div
+                          className={css({
+                            gridColumn: "1 / -1",
+                            padding: theme.sizing.scale600,
+                          })}
+                          data-testid="repo-overview-filter-empty"
+                        >
+                          <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                            No branches match the selected filter.
+                          </ParagraphSmall>
+                        </div>
+                      ) : (
+                        filteredOverviewBranches.map((branch) => {
+                          const selectedRow = selectedBranchOverview?.branchName === branch.branchName;
+                          const branchToken = branchTestIdToken(branch.branchName);
+                          const rowClass = css({
+                            display: "contents",
+                          });
+                          const cellClass = css({
+                            padding: `${theme.sizing.scale400} ${theme.sizing.scale400}`,
+                            borderBottom: `1px solid ${theme.colors.borderOpaque}`,
+                            backgroundColor: selectedRow ? "rgba(29, 111, 95, 0.08)" : theme.colors.backgroundSecondary,
+                            fontSize: theme.typography.ParagraphSmall.fontSize,
+                            cursor: "pointer",
+                          });
+                          return (
+                            <div
+                              key={branch.branchName}
+                              className={rowClass}
+                              onClick={() => setSelectedOverviewBranch(branch.branchName)}
+                              data-testid={`repo-overview-row-${branchToken}`}
+                            >
+                              <div className={cellClass}>
+                                <LabelSmall marginTop="0" marginBottom="0">
+                                  {branch.branchName}
+                                </LabelSmall>
+                                <div
+                                  className={css({
+                                    marginTop: "8px",
+                                    display: "flex",
+                                    alignItems: "center",
+                                    flexWrap: "wrap",
+                                    gap: theme.sizing.scale200,
+                                  })}
+                                >
+                                  <StatusPill kind={branch.taskId ? "positive" : "warning"}>{branch.taskId ? "task" : "unmapped"}</StatusPill>
+                                  <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                                    {branch.commitSha.slice(0, 10) || "-"}
+                                  </ParagraphSmall>
+                                </div>
+                              </div>
+                              <div className={cellClass}>{branch.taskTitle ?? branch.taskId ?? "-"}</div>
+                              <div className={cellClass}>
+                                {branch.pullRequest ? (
+                                  <a
+                                    href={branch.pullRequest.url}
+                                    target="_blank"
+                                    rel="noreferrer"
+                                    className={css({
+                                      color: theme.colors.contentPrimary,
+                                    })}
+                                  >
+                                    #{branch.pullRequest.number} {branchPullRequestLabel(branch)}
+                                  </a>
+                                ) : (
+                                  <span className={css({ color: theme.colors.contentSecondary })}>-</span>
+                                )}
+                              </div>
+                              <div className={cellClass}>
+                                {branch.ciStatus ?? "-"} / {branch.pullRequest ? (branch.pullRequest.isDraft ? "draft" : "ready") : "-"}
+                              </div>
+                              <div className={cellClass}>{formatRelativeAge(branch.updatedAt)}</div>
+                              <div className={cellClass}>
+                                <div
+                                  className={css({
+                                    display: "flex",
+                                    flexWrap: "wrap",
+                                    gap: theme.sizing.scale200,
+                                  })}
+                                >
+                                  {!branch.taskId ? (
+                                    <Button
+                                      size="compact"
+                                      kind="secondary"
+                                      onClick={(event) => {
+                                        event.stopPropagation();
+                                        openCreateFromBranch(activeRepoId, branch.branchName);
+                                      }}
+                                      data-testid={`repo-overview-create-${branchToken}`}
+                                    >
+                                      Create Task
+                                    </Button>
+                                  ) : null}
+
+                                  <StatusPill kind={branchKind(branch)}>{branchPullRequestLabel(branch)}</StatusPill>
+                                </div>
+                              </div>
+                            </div>
+                          );
+                        })
+                      )}
+                    </div>
+                  </div>
+                ) : null}
+              </ScrollBody>
+            </>
+          ) : (
+            <>
+              <PanelHeader>
+                <div
+                  className={css({
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                    gap: theme.sizing.scale400,
+                    flexWrap: "wrap",
+                  })}
+                >
+                  <div
+                    className={css({
+                      display: "flex",
+                      alignItems: "center",
+                      gap: theme.sizing.scale300,
+                      flexWrap: "wrap",
+                    })}
+                  >
+                    <Bot size={16} />
+                    <HeadingXSmall marginTop="0" marginBottom="0">
+                      {selectedForSession ? (selectedForSession.title ?? "Determining title...") : "No task selected"}
+                    </HeadingXSmall>
+                    {selectedForSession ? (
+                      <HeaderStatusPill
+                        status={deriveHeaderStatus(
+                          taskStatus ?? selectedForSession.status,
+                          selectedSessionSummary?.status ?? null,
+                          selectedSessionSummary?.errorMessage ?? null,
+                          Boolean(activeSandbox?.sandboxId),
+                        )}
+                      />
+                    ) : null}
+                  </div>
+
+                  {selectedForSession && !resolvedSessionId ? (
+                    <Button
+                      size="compact"
+                      onClick={() => {
+                        void createSession.mutateAsync();
+                      }}
+                      disabled={createSession.isPending || !canStartSession}
+                    >
+                      {staleSessionId ? "Start New Session" : "Start Session"}
+                    </Button>
+                  ) : null}
+                </div>
+                {selectedForSession ? (
+                  <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary" data-testid="task-runtime-state">
+                    {taskStateSummary}
+                  </ParagraphSmall>
+                ) : null}
+              </PanelHeader>
+
+              <div
+                className={css({
+                  minHeight: 0,
+                  flex: 1,
+                  display: "grid",
+                  gridTemplateRows: "minmax(0, 1fr) auto",
+                  gap: "1px",
+                  padding: 0,
+                  backgroundColor: theme.colors.borderOpaque,
+                })}
+              >
+                {!selectedForSession ? (
+                  <EmptyState>Select a task from the left sidebar.</EmptyState>
+                ) : (
+                  <>
+                    <div
+                      className={css({
+                        minHeight: 0,
+                        display: "flex",
+                        flexDirection: "column",
+                        backgroundColor: theme.colors.backgroundSecondary,
+                        overflow: "hidden",
+                      })}
+                    >
+                      <div
+                        className={css({
+                          padding: `${theme.sizing.scale400} ${theme.sizing.scale500}`,
+                          borderBottom: `1px solid ${theme.colors.borderOpaque}`,
+                          display: "flex",
+                          alignItems: "center",
+                          justifyContent: "space-between",
+                          gap: theme.sizing.scale400,
+                          flexWrap: "wrap",
+                          backgroundColor: theme.colors.backgroundTertiary,
+                        })}
+                      >
+                        <div
+                          className={css({
+                            display: "flex",
+                            alignItems: "center",
+                            gap: "8px",
+                            color: theme.colors.contentSecondary,
+                          })}
+                        >
+                          <MessageSquareText size={14} />
+                          <LabelSmall marginTop="0" marginBottom="0">
+                            Session {resolvedSessionId ?? staleSessionId ?? "(none)"}
+                          </LabelSmall>
+                        </div>
+
+                        {sessionRows.length > 0 ? (
+                          <div className={css({ minWidth: "280px", maxWidth: "100%" })}>
+                            <Select
+                              options={sessionOptions}
+                              value={selectValue(selectedSessionOption)}
+                              clearable={false}
+                              searchable={false}
+                              size="compact"
+                              onChange={(params: OnChangeParams) => {
+                                const next = optionId(params.value);
+                                if (next) {
+                                  setActiveSessionId(next);
+                                }
+                              }}
+                              overrides={selectTestIdOverrides("task-session-select")}
+                            />
+                          </div>
+                        ) : null}
+                      </div>
+
+                      <div
+                        className={css({
+                          minHeight: 0,
+                          flex: 1,
+                          overflowY: "auto",
+                          padding: theme.sizing.scale400,
+                          backgroundColor: theme.colors.backgroundPrimary,
+                        })}
+                      >
+                        {resolvedSessionId && sessionState.status === "loading" ? <Skeleton rows={2} height="90px" /> : null}
+
+                        {selectedSessionSummary && (isPendingProvision || isPendingSessionCreate) ? (
+                          <div
+                            className={css({
+                              display: "flex",
+                              flexDirection: "column",
+                              gap: theme.sizing.scale300,
+                              padding: theme.sizing.scale500,
+                              border: `1px solid ${theme.colors.borderOpaque}`,
+                              backgroundColor: theme.colors.backgroundSecondary,
+                              marginBottom: theme.sizing.scale400,
+                            })}
+                          >
+                            <LabelSmall marginTop="0" marginBottom="0">
+                              {shouldUseTaskStateEmptyState ? taskStatusState.title : isPendingProvision ? "Provisioning sandbox..." : "Creating session..."}
+                            </LabelSmall>
+                            <Skeleton rows={1} height="32px" />
+                            <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                              {shouldUseTaskStateEmptyState
+                                ? taskStateSummary
+                                : isPendingProvision
+                                  ? "The task is still provisioning."
+                                  : "The session is being created."}
+                            </ParagraphSmall>
+                          </div>
+                        ) : null}
+
+                        {transcript.length === 0 && !(resolvedSessionId && sessionState.status === "loading") ? (
+                          <EmptyState testId="session-transcript-empty">
+                            {shouldUseTaskStateEmptyState
+                              ? taskStateSummary
+                              : isPendingProvision
+                                ? "Provisioning sandbox..."
+                                : isPendingSessionCreate
+                                  ? "Creating session..."
+                                  : isSessionError
+                                    ? (selectedSessionSummary?.errorMessage ?? "Session failed to start.")
+                                    : !activeSandbox?.sandboxId
+                                      ? "This task is still provisioning its sandbox."
+                                      : staleSessionId
+                                        ? `Session ${staleSessionId} is unavailable. Start a new session to continue.`
+                                        : resolvedSessionId
+                                          ? "No transcript events yet. Send a prompt to start this session."
+                                          : "No active session for this task."}
+                          </EmptyState>
+                        ) : null}
+
+                        <div
+                          className={css({
+                            display: "flex",
+                            flexDirection: "column",
+                            gap: theme.sizing.scale400,
+                          })}
+                          data-testid="session-transcript"
+                        >
+                          {transcript.map((entry) => (
+                            <article
+                              key={entry.id}
+                              data-testid="session-transcript-entry"
+                              className={css({
+                                borderLeft: `2px solid ${entry.sender === "agent" ? "rgba(29, 111, 95, 0.45)" : "rgba(32, 108, 176, 0.45)"}`,
+                                border: `1px solid ${entry.sender === "agent" ? "rgba(29, 111, 95, 0.22)" : "rgba(32, 108, 176, 0.22)"}`,
+                                backgroundColor: entry.sender === "agent" ? "rgba(29, 111, 95, 0.07)" : "rgba(32, 108, 176, 0.07)",
+                                padding: `12px ${theme.sizing.scale400}`,
+                              })}
+                            >
+                              <header
+                                className={css({
+                                  marginBottom: "8px",
+                                  display: "flex",
+                                  alignItems: "center",
+                                  justifyContent: "space-between",
+                                  gap: theme.sizing.scale300,
+                                })}
+                              >
+                                <LabelXSmall color="contentSecondary">{entry.sender}</LabelXSmall>
+                                <LabelXSmall color="contentSecondary">{formatTime(entry.createdAt)}</LabelXSmall>
+                              </header>
+                              <pre
+                                className={css({
+                                  margin: 0,
+                                  whiteSpace: "pre-wrap",
+                                  overflowX: "auto",
+                                  fontFamily: '"IBM Plex Mono", "SFMono-Regular", monospace',
+                                  fontSize: theme.typography.MonoParagraphSmall.fontSize,
+                                  lineHeight: theme.typography.MonoParagraphSmall.lineHeight,
+                                })}
+                              >
+                                {entry.text}
+                              </pre>
+                            </article>
+                          ))}
+                        </div>
+                      </div>
+                    </div>
+
+                    <div
+                      className={css({
+                        display: "flex",
+                        flexDirection: "column",
+                        gap: "1px",
+                        padding: "10px 12px",
+                        backgroundColor: theme.colors.backgroundSecondary,
+                      })}
+                    >
+                      <Textarea
+                        value={draft}
+                        onChange={(event) => setDraft(event.target.value)}
+                        placeholder="Send a follow-up prompt to this session"
+                        rows={5}
+                        disabled={!activeSandbox?.sandboxId || isPendingProvision || isPendingSessionCreate || isSessionError}
+                        overrides={textareaTestIdOverrides("task-session-prompt")}
+                      />
+                      <div
+                        className={css({
+                          display: "flex",
+                          justifyContent: "flex-end",
+                        })}
+                      >
+                        <Button
+                          onClick={() => {
+                            const prompt = draft.trim();
+                            if (!prompt) {
+                              return;
+                            }
+                            void sendPrompt.mutateAsync(prompt);
+                          }}
+                          disabled={
+                            sendPrompt.isPending ||
+                            createSession.isPending ||
+                            !selectedForSession ||
+                            !activeSandbox?.sandboxId ||
+                            isPendingProvision ||
+                            isPendingSessionCreate ||
+                            isSessionError ||
+                            draft.trim().length === 0
+                          }
+                        >
+                          <span
+                            className={css({
+                              display: "inline-flex",
+                              alignItems: "center",
+                              gap: theme.sizing.scale200,
+                            })}
+                          >
+                            <SendHorizontal size={14} />
+                            Send
+                          </span>
+                        </Button>
+                      </div>
+                    </div>
+                  </>
+                )}
+              </div>
+            </>
+          )}
+        </Panel>
+
+        <DetailRail>
+          <PanelHeader>
+            <HeadingSmall marginTop="0" marginBottom="0">
+              {repoOverviewMode ? "Repo Details" : "Task Details"}
+            </HeadingSmall>
+          </PanelHeader>
+
+          <ScrollBody>
+            {repoOverviewMode ? (
+              !overview ? (
+                <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                  No repo overview available.
+                </ParagraphSmall>
+              ) : (
+                <>
+                  <section>
+                    <HeadingXSmall marginTop="0" marginBottom="0">
+                      Repository
+                    </HeadingXSmall>
+                    <StyledDivider />
+                    <div
+                      className={css({
+                        display: "flex",
+                        flexDirection: "column",
+                        gap: theme.sizing.scale300,
+                      })}
+                    >
+                      <MetaRow label="Remote" value={overview.remoteUrl} />
+                      <MetaRow label="Base Ref" value={overview.baseRef ?? "-"} mono />
+                      <MetaRow label="Fetched" value={new Date(overview.fetchedAt).toLocaleTimeString()} />
+                    </div>
+                  </section>
+
+                  <section>
+                    <HeadingXSmall marginTop="0" marginBottom="0">
+                      Selected Branch
+                    </HeadingXSmall>
+                    <StyledDivider />
+                    {!selectedBranchOverview ? (
+                      <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                        Select a branch in the center panel.
+                      </ParagraphSmall>
+                    ) : (
+                      <div
+                        className={css({
+                          display: "flex",
+                          flexDirection: "column",
+                          gap: theme.sizing.scale300,
+                        })}
+                      >
+                        <MetaRow label="Branch" value={selectedBranchOverview.branchName} mono />
+                        <MetaRow label="Commit" value={selectedBranchOverview.commitSha.slice(0, 10)} mono />
+                        <MetaRow label="Task" value={selectedBranchOverview.taskTitle ?? selectedBranchOverview.taskId ?? "-"} />
+                        <MetaRow label="PR" value={selectedBranchOverview.pullRequest?.url ?? "-"} />
+                        <MetaRow label="Updated" value={new Date(selectedBranchOverview.updatedAt).toLocaleTimeString()} />
+                      </div>
+                    )}
+                  </section>
+                </>
+              )
+            ) : !selectedForSession ? (
+              <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                No task selected.
+              </ParagraphSmall>
+            ) : (
+              <>
+                <section>
+                  <HeadingXSmall marginTop="0" marginBottom="0">
+                    Identifiers
+                  </HeadingXSmall>
+                  <StyledDivider />
+                  <div
+                    className={css({
+                      display: "flex",
+                      flexDirection: "column",
+                      gap: theme.sizing.scale300,
+                    })}
+                  >
+                    <MetaRow label="State" value={taskStatus ?? "-"} mono />
+                    <MetaRow label="State detail" value={taskStatusState.detail} />
+                    <MetaRow label="Task" value={selectedForSession.id} mono />
+                    <MetaRow label="Sandbox" value={selectedForSession.activeSandboxId ?? "-"} mono />
+                    <MetaRow label="Session" value={resolvedSessionId ?? "-"} mono />
+                  </div>
+                </section>
+
+                <section>
+                  <HeadingXSmall marginTop="0" marginBottom="0">
+                    Branch + PR
+                  </HeadingXSmall>
+                  <StyledDivider />
+                  <div
+                    className={css({
+                      display: "flex",
+                      flexDirection: "column",
+                      gap: theme.sizing.scale300,
+                    })}
+                  >
+                    <MetaRow label="Branch" value={selectedForSession.branch ?? "-"} mono />
+                    <MetaRow label="PR" value={selectedForSession.pullRequest?.url ?? "-"} />
+                    <MetaRow label="Review" value={selectedForSession.pullRequest ? (selectedForSession.pullRequest.isDraft ? "draft" : "ready") : "-"} />
+                  </div>
+                </section>
+
+                <section>
+                  <HeadingXSmall marginTop="0" marginBottom="0">
+                    Task
+                  </HeadingXSmall>
+                  <StyledDivider />
+                  <div
+                    className={css({
+                      padding: theme.sizing.scale400,
+                      borderRadius: "0",
+                      backgroundColor: theme.colors.backgroundTertiary,
+                      border: `1px solid ${theme.colors.borderOpaque}`,
+                    })}
+                  >
+                    <ParagraphSmall marginTop="0" marginBottom="0">
+                      {selectedForSession.task}
+                    </ParagraphSmall>
+                  </div>
+                </section>
+
+                {taskStatus === "error" ? (
+                  <div
+                    className={css({
+                      padding: "12px",
+                      borderRadius: "0",
+                      border: `1px solid rgba(188, 57, 74, 0.28)`,
+                      backgroundColor: "rgba(188, 57, 74, 0.06)",
+                    })}
+                  >
+                    <div
+                      className={css({
+                        display: "flex",
+                        alignItems: "center",
+                        gap: theme.sizing.scale200,
+                        marginBottom: theme.sizing.scale200,
+                      })}
+                    >
+                      <CircleAlert size={14} />
+                      <LabelSmall marginTop="0" marginBottom="0">
+                        Task reported an error state
+                      </LabelSmall>
+                    </div>
+                    <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                      {taskStatusState.detail}
+                    </ParagraphSmall>
+                  </div>
+                ) : null}
+              </>
+            )}
+          </ScrollBody>
+        </DetailRail>
+
+        <Modal
+          isOpen={createTaskOpen}
+          onClose={() => {
+            setCreateTaskOpen(false);
+            setCreateOnBranch(null);
+          }}
+          overrides={modalOverrides}
+        >
+          <ModalHeader>Create Task</ModalHeader>
+          <ModalBody>
+            <div
+              className={css({
+                display: "flex",
+                flexDirection: "column",
+                gap: theme.sizing.scale500,
+              })}
+            >
+              <ParagraphSmall marginTop="0" marginBottom="0" color="contentSecondary">
+                Pick a repo, describe the task, and the backend will create a task.
+              </ParagraphSmall>
+
+              <div>
+                <LabelXSmall color="contentSecondary" marginBottom="scale200">
+                  Repo
+                </LabelXSmall>
+                <Select
+                  options={repoOptions}
+                  value={selectValue(selectedRepoOption)}
+                  clearable={false}
+                  searchable={false}
+                  disabled={repos.length === 0}
+                  onChange={(params: OnChangeParams) => {
+                    const next = optionId(params.value);
+                    if (next) {
+                      setCreateRepoId(next);
+                    }
+                  }}
+                  overrides={selectTestIdOverrides("task-create-repo")}
+                />
+                {repos.length === 0 ? (
+                  <ParagraphSmall marginTop="8px" marginBottom="0" color="contentSecondary">
+                    No imported repos yet. Create the repository in GitHub first, then sync repos from organization settings.
+                  </ParagraphSmall>
+                ) : null}
+              </div>
+
+              <div>
+                <LabelXSmall color="contentSecondary" marginBottom="scale200">
+                  Task
+                </LabelXSmall>
+                <Textarea
+                  value={newTask}
+                  onChange={(event) => setNewTask(event.target.value)}
+                  placeholder="Task"
+                  rows={6}
+                  overrides={textareaTestIdOverrides("task-create-task")}
+                />
+              </div>
+
+              <div>
+                <LabelXSmall color="contentSecondary" marginBottom="scale200">
+                  Title
+                </LabelXSmall>
+                <Input
+                  placeholder="Title (optional)"
+                  value={newTitle}
+                  onChange={(event) => setNewTitle(event.target.value)}
+                  overrides={inputTestIdOverrides("task-create-title")}
+                />
+              </div>
+
+              <div>
+                <LabelXSmall color="contentSecondary" marginBottom="scale200">
+                  Branch
+                </LabelXSmall>
+                {createOnBranch ? (
+                  <Input value={createOnBranch} disabled overrides={inputTestIdOverrides("task-create-branch")} />
+                ) : (
+                  <Input
+                    placeholder="Branch name (optional)"
+                    value={newBranchName}
+                    onChange={(event) => setNewBranchName(event.target.value)}
+                    overrides={inputTestIdOverrides("task-create-branch")}
+                  />
+                )}
+              </div>
+
+              {createError ? (
+                <ParagraphSmall marginTop="0" marginBottom="0" color="negative" data-testid="task-create-error">
+                  {createError}
+                </ParagraphSmall>
+              ) : null}
+            </div>
+          </ModalBody>
+          <ModalFooter>
+            <Button
+              kind="tertiary"
+              onClick={() => {
+                setCreateTaskOpen(false);
+                setCreateOnBranch(null);
+              }}
+            >
+              Cancel
+            </Button>
+            <Button
+              disabled={!canCreateTask || createTask.isPending}
+              onClick={() => {
+                setCreateError(null);
+                void createTask.mutateAsync();
+              }}
+              data-testid="task-create-submit"
+            >
+              {createTask.isPending ? "Creating..." : "Create Task"}
+            </Button>
+          </ModalFooter>
+        </Modal>
+      </DashboardGrid>
+      {showDevPanel ? (
+        <DevPanel organizationId={organizationId} snapshot={devPanelSnapshot} organization={activeOrg} focusedTask={devPanelFocusedTask} />
+      ) : null}
+    </AppShell>
+  );
+}
diff --git a/foundry/packages/frontend/src/features/sessions/model.test.ts b/foundry/packages/frontend/src/features/sessions/model.test.ts
new file mode 100644
index 0000000..2e77b3a
--- /dev/null
+++ b/foundry/packages/frontend/src/features/sessions/model.test.ts
@@ -0,0 +1,142 @@
+import { describe, expect, it } from "vitest";
+import type { SandboxSessionRecord } from "@sandbox-agent/foundry-client";
+import { buildTranscript, extractEventText, resolveSessionSelection } from "./model";
+
+describe("extractEventText", () => {
+  it("extracts prompt text arrays", () => {
+    expect(extractEventText({ params: { prompt: [{ type: "text", text: "hello" }] } })).toBe("hello");
+  });
+
+  it("falls back to method name", () => {
+    expect(extractEventText({ method: "session/started" })).toBe("session/started");
+  });
+
+  it("extracts agent result text when present", () => {
+    expect(
+      extractEventText({
+        result: {
+          text: "agent output",
+        },
+      }),
+    ).toBe("agent output");
+  });
+
+  it("extracts text from chunked session updates", () => {
+    expect(
+      extractEventText({
+        params: {
+          update: {
+            sessionUpdate: "agent_message_chunk",
+            content: {
+              type: "text",
+              text: "chunk",
+            },
+          },
+        },
+      }),
+    ).toBe("chunk");
+  });
+});
+
+describe("buildTranscript", () => {
+  it("maps sender/text/timestamp for UI transcript rendering", () => {
+    const rows = buildTranscript([
+      {
+        id: "evt-1",
+        eventIndex: 1,
+        sessionId: "sess-1",
+        createdAt: 1000,
+        connectionId: "conn-1",
+        sender: "client",
+        payload: { params: { prompt: [{ type: "text", text: "hello" }] } },
+      },
+      {
+        id: "evt-2",
+        eventIndex: 2,
+        sessionId: "sess-1",
+        createdAt: 2000,
+        connectionId: "conn-1",
+        sender: "agent",
+        payload: { params: { text: "world" } },
+      },
+    ]);
+
+    expect(rows).toEqual([
+      {
+        id: "evt-1",
+        sender: "client",
+        text: "hello",
+        createdAt: 1000,
+      },
+      {
+        id: "evt-2",
+        sender: "agent",
+        text: "world",
+        createdAt: 2000,
+      },
+    ]);
+  });
+});
+
+describe("resolveSessionSelection", () => {
+  const session = (id: string, status: "running" | "idle" | "error" = "running"): SandboxSessionRecord =>
+    ({
+      id,
+      agentSessionId: `agent-${id}`,
+      lastConnectionId: `conn-${id}`,
+      createdAt: 1,
+      status,
+    }) as SandboxSessionRecord;
+
+  it("prefers explicit selection when present in session list", () => {
+    const resolved = resolveSessionSelection({
+      explicitSessionId: "session-2",
+      taskSessionId: "session-1",
+      sessions: [session("session-1"), session("session-2")],
+    });
+
+    expect(resolved).toEqual({
+      sessionId: "session-2",
+      staleSessionId: null,
+    });
+  });
+
+  it("falls back to task session when explicit selection is missing", () => {
+    const resolved = resolveSessionSelection({
+      explicitSessionId: null,
+      taskSessionId: "session-1",
+      sessions: [session("session-1")],
+    });
+
+    expect(resolved).toEqual({
+      sessionId: "session-1",
+      staleSessionId: null,
+    });
+  });
+
+  it("falls back to the newest available session when configured session IDs are stale", () => {
+    const resolved = resolveSessionSelection({
+      explicitSessionId: null,
+      taskSessionId: "session-stale",
+      sessions: [session("session-fresh")],
+    });
+
+    expect(resolved).toEqual({
+      sessionId: "session-fresh",
+      staleSessionId: null,
+    });
+  });
+
+  it("marks stale session when no sessions are available", () => {
+    const resolved = resolveSessionSelection({
+      explicitSessionId: null,
+      taskSessionId: "session-stale",
+      sessions: [],
+    });
+
+    expect(resolved).toEqual({
+      sessionId: null,
+      staleSessionId: "session-stale",
+    });
+  });
+});
diff --git a/foundry/packages/frontend/src/features/sessions/model.ts b/foundry/packages/frontend/src/features/sessions/model.ts
new file mode 100644
index 0000000..9432df0
--- /dev/null
+++ b/foundry/packages/frontend/src/features/sessions/model.ts
@@ -0,0 +1,137 @@
+import type { SandboxSessionEventRecord } from "@sandbox-agent/foundry-client";
+import type { SandboxSessionRecord } from "@sandbox-agent/foundry-client";
+
+function fromPromptArray(value: unknown): string | null {
+  if (!Array.isArray(value)) {
+    return null;
+  }
+
+  const parts: string[] = [];
+  for (const item of value) {
+    if (!item || typeof item !== "object") {
+      continue;
+    }
+    const text = (item as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim().length > 0) {
+      parts.push(text.trim());
+    }
+  }
+
+  return parts.length > 0 ? parts.join("\n") : null;
+}
+
+function fromSessionUpdate(value: unknown): string | null {
+  if (!value || typeof value !== "object") {
+    return null;
+  }
+
+  const update = value as {
+    content?: unknown;
+    sessionUpdate?: unknown;
+  };
+  if (update.sessionUpdate !== "agent_message_chunk") {
+    return null;
+  }
+
+  const content = update.content;
+  if (!content || typeof content !== "object") {
+    return null;
+  }
+
+  const text = (content as { text?: unknown }).text;
+  return typeof text === "string" ? text : null;
+}
+
+export function extractEventText(payload: unknown): string {
+  if (!payload || typeof payload !== "object") {
+    return String(payload ?? "");
+  }
+
+  const envelope = payload as {
+    method?: unknown;
+    params?: unknown;
+    result?: unknown;
+    error?: unknown;
+  };
+
+  const params = envelope.params;
+  if (params && typeof params === "object") {
+    const updateText = fromSessionUpdate((params as { update?: unknown }).update);
+    if (typeof updateText === "string") {
+      return updateText;
+    }
+
+    const text = (params as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim().length > 0) {
+      return text.trim();
+    }
+
+    const prompt = fromPromptArray((params as { prompt?: unknown }).prompt);
+    if (prompt) {
+      return prompt;
+    }
+  }
+
+  const result = envelope.result;
+  if (result && typeof result === "object") {
+    const text = (result as { text?: unknown }).text;
+    if (typeof text === "string" && text.trim().length > 0) {
+      return text.trim();
+    }
+  }
+
+  if (envelope.error) {
+    return JSON.stringify(envelope.error, null, 2);
+  }
+
+  if (typeof envelope.method === "string") {
+    return envelope.method;
+  }
+
+  return JSON.stringify(payload, null, 2);
+}
+
+export function buildTranscript(events: SandboxSessionEventRecord[]): Array<{
+  id: string;
+  sender: "client" | "agent";
+  text: string;
+  createdAt: number;
+}> {
+  return events.map((event) => ({
+    id: event.id,
+    sender: event.sender,
+    text: extractEventText(event.payload),
+    createdAt: event.createdAt,
+  }));
+}
+
+export function resolveSessionSelection(input: { explicitSessionId: string | null; taskSessionId: string | null; sessions: SandboxSessionRecord[] }): {
+  sessionId: string | null;
+  staleSessionId: string | null;
+} {
+  const sessionIds = new Set(input.sessions.map((session) => session.id));
+  const hasSession = (id: string | null): id is string => Boolean(id && sessionIds.has(id));
+
+  if (hasSession(input.explicitSessionId)) {
+    return { sessionId: input.explicitSessionId, staleSessionId: null };
+  }
+
+  if (hasSession(input.taskSessionId)) {
+    return { sessionId: input.taskSessionId, staleSessionId: null };
+  }
+
+  const fallbackSessionId = input.sessions[0]?.id ?? null;
+  if (fallbackSessionId) {
+    return { sessionId: fallbackSessionId, staleSessionId: null };
+  }
+
+  if (input.explicitSessionId) {
+    return { sessionId: null, staleSessionId: input.explicitSessionId };
+  }
+
+  if (input.taskSessionId) {
+    return { sessionId: null, staleSessionId: input.taskSessionId };
+  }
+
+  return { sessionId: null, staleSessionId: null };
+}
diff --git a/foundry/packages/frontend/src/features/tasks/model.test.ts b/foundry/packages/frontend/src/features/tasks/model.test.ts
new file mode 100644
index 0000000..d977fc4
--- /dev/null
+++ b/foundry/packages/frontend/src/features/tasks/model.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it } from "vitest";
+import type { TaskRecord } from "@sandbox-agent/foundry-shared";
+import { groupTasksByRepo } from "./model";
+
+const base: TaskRecord = {
+  organizationId: "default",
+  repoId: "repo-a",
+  repoRemote: "https://example.com/repo-a.git",
+  taskId: "task-1",
+  branchName: "feature/one",
+  title: "Feature one",
+  task: "Ship one",
+  sandboxProviderId: "local",
+  status: "running",
+  activeSandboxId: "sandbox-1",
+  pullRequest: null,
+  sandboxes: [
+    {
+      sandboxId: "sandbox-1",
+      sandboxProviderId: "local",
+      sandboxActorId: null,
+      switchTarget: "sandbox://local/sandbox-1",
+      cwd: null,
+      createdAt: 10,
+      updatedAt: 10,
+    },
+  ],
+  createdAt: 10,
+  updatedAt: 10,
+};
+
+describe("groupTasksByRepo", () => {
+  it("groups by repo and sorts by recency", () => {
+    const rows: TaskRecord[] = [
+      { ...base, taskId: "h1", repoId: "repo-a", repoRemote: "https://example.com/repo-a.git", updatedAt: 10 },
+      { ...base, taskId: "h2", repoId: "repo-a", repoRemote: "https://example.com/repo-a.git", updatedAt: 50 },
+      { ...base, taskId: "h3", repoId: "repo-b", repoRemote: "https://example.com/repo-b.git", updatedAt: 30 },
+    ];
+
+    const groups = groupTasksByRepo(rows);
+    expect(groups).toHaveLength(2);
+    expect(groups[0]?.repoId).toBe("repo-a");
+    expect(groups[0]?.tasks[0]?.taskId).toBe("h2");
+  });
+
+  it("sorts repo groups by latest task activity first", () => {
+    const rows: TaskRecord[] = [
+      { ...base, taskId: "h1", repoId: "repo-z", repoRemote: "https://example.com/repo-z.git", updatedAt: 200 },
+      { ...base, taskId: "h2", repoId: "repo-a", repoRemote: "https://example.com/repo-a.git", updatedAt: 100 },
+    ];
+
+    const groups = groupTasksByRepo(rows);
+    expect(groups[0]?.repoId).toBe("repo-z");
+    expect(groups[1]?.repoId).toBe("repo-a");
+  });
+});
diff --git a/foundry/packages/frontend/src/features/tasks/model.ts b/foundry/packages/frontend/src/features/tasks/model.ts
new file mode 100644
index 0000000..008e0e5
--- /dev/null
+++ b/foundry/packages/frontend/src/features/tasks/model.ts
@@ -0,0 +1,39 @@
+import type { TaskRecord } from "@sandbox-agent/foundry-shared";
+
+export interface RepoGroup {
+  repoId: string;
+  repoRemote: string;
+  tasks: TaskRecord[];
+}
+
+export function groupTasksByRepo(tasks: TaskRecord[]): RepoGroup[] {
+  const groups = new Map<string, RepoGroup>();
+
+  for (const task of tasks) {
+    const group = groups.get(task.repoId);
+    if (group) {
+      group.tasks.push(task);
+      continue;
+    }
+
+    groups.set(task.repoId, {
+      repoId: task.repoId,
+      repoRemote: task.repoRemote,
+      tasks: [task],
+    });
+  }
+
+  return Array.from(groups.values())
+    .map((group) => ({
+      ...group,
+      tasks: [...group.tasks].sort((a, b) => b.updatedAt - a.updatedAt),
+    }))
+    .sort((a, b) => {
+      const aLatest = a.tasks[0]?.updatedAt ?? 0;
+      const bLatest = b.tasks[0]?.updatedAt ?? 0;
+      if (aLatest !== bLatest) {
+        return bLatest - aLatest;
+      }
+      return a.repoRemote.localeCompare(b.repoRemote);
+    });
+}
diff --git a/foundry/packages/frontend/src/features/tasks/status.test.ts b/foundry/packages/frontend/src/features/tasks/status.test.ts
new file mode 100644
index 0000000..80da16f
--- /dev/null
+++ b/foundry/packages/frontend/src/features/tasks/status.test.ts
@@ -0,0 +1,132 @@
+import { describe, expect, it } from "vitest";
+import { TaskStatusSchema } from "@sandbox-agent/foundry-shared";
+import { defaultTaskStatusMessage, deriveHeaderStatus, describeTaskState, isProvisioningTaskStatus, resolveTaskStateDetail } from "./status";
+
+describe("defaultTaskStatusMessage", () => {
+  it("covers every backend task status", () => {
+    for (const status of TaskStatusSchema.options) {
+      expect(defaultTaskStatusMessage(status)).toMatch(/\S/);
+    }
+  });
+
+  it("returns the expected copy for init_ensure_name", () => {
+    expect(defaultTaskStatusMessage("init_ensure_name")).toBe("Determining title and branch.");
+  });
+});
+
+describe("resolveTaskStateDetail", () => {
+  it("returns the default copy for the current task status", () => {
+    expect(resolveTaskStateDetail("init_complete")).toBe("Finalizing task initialization.");
+  });
+});
+
+describe("describeTaskState", () => {
+  it("includes the raw backend status code in the title", () => {
+    expect(describeTaskState("kill_destroy_sandbox")).toEqual({
+      title: "Task state: kill_destroy_sandbox",
+      detail: "Destroying sandbox resources.",
+    });
+  });
+});
+
+describe("isProvisioningTaskStatus", () => {
+  it("treats in-progress init states as provisioning", () => {
+    expect(isProvisioningTaskStatus("init_bootstrap_db")).toBe(true);
+    expect(isProvisioningTaskStatus("init_ensure_name")).toBe(true);
+  });
+
+  it("does not treat init_complete as provisioning (task is ready)", () => {
+    expect(isProvisioningTaskStatus("init_complete")).toBe(false);
+  });
+
+  it("does not treat steady-state or terminal states as provisioning", () => {
+    expect(isProvisioningTaskStatus("running")).toBe(false);
+    expect(isProvisioningTaskStatus("archived")).toBe(false);
+    expect(isProvisioningTaskStatus("killed")).toBe(false);
+  });
+});
+
+describe("deriveHeaderStatus", () => {
+  it("returns error variant when session has error", () => {
+    const result = deriveHeaderStatus("running", "error", "Sandbox crashed");
+    expect(result.variant).toBe("error");
+    expect(result.label).toBe("Session error");
+    expect(result.tooltip).toBe("Sandbox crashed");
+    expect(result.spinning).toBe(false);
+  });
+
+  it("returns error variant when task has error", () => {
+    const result = deriveHeaderStatus("error", null, null);
+    expect(result.variant).toBe("error");
+    expect(result.label).toBe("Error");
+    expect(result.spinning).toBe(false);
+  });
+
+  it("returns warning variant with spinner for provisioning task", () => {
+    const result = deriveHeaderStatus("init_enqueue_provision", null, null);
+    expect(result.variant).toBe("warning");
+    expect(result.label).toBe("Provisioning");
+    expect(result.spinning).toBe(true);
+  });
+
+  it("returns warning variant for pending_provision session", () => {
+    const result = deriveHeaderStatus("running", "pending_provision", null);
+    expect(result.variant).toBe("warning");
+    expect(result.label).toBe("Provisioning");
+    expect(result.spinning).toBe(true);
+  });
+
+  it("returns warning variant for pending_session_create session", () => {
+    const result = deriveHeaderStatus("running", "pending_session_create", null);
+    expect(result.variant).toBe("warning");
+    expect(result.label).toBe("Creating session");
+    expect(result.spinning).toBe(true);
+  });
+
+  it("returns success variant with spinner for running session", () => {
+    const result = deriveHeaderStatus("running", "running", null);
+    expect(result.variant).toBe("success");
+    expect(result.label).toBe("Running");
+    expect(result.spinning).toBe(true);
+  });
+
+  it("returns success variant for idle/ready state", () => {
+    const result = deriveHeaderStatus("idle", "idle", null);
+    expect(result.variant).toBe("success");
+    expect(result.label).toBe("Ready");
+    expect(result.spinning).toBe(false);
+  });
+
+  it("returns neutral variant for archived task", () => {
+    const result = deriveHeaderStatus("archived", null, null);
+    expect(result.variant).toBe("neutral");
+    expect(result.label).toBe("Archived");
+  });
+
+  it("session error takes priority over task error", () => {
+    const result = deriveHeaderStatus("error", "error", "Sandbox OOM");
+    expect(result.variant).toBe("error");
+    expect(result.label).toBe("Session error");
+    expect(result.tooltip).toBe("Sandbox OOM");
+  });
+
+  it("returns warning when no sandbox is available", () => {
+    const result = deriveHeaderStatus("idle", "idle", null, false);
+    expect(result.variant).toBe("warning");
+    expect(result.label).toBe("No sandbox");
+    expect(result.spinning).toBe(false);
+  });
+
+  it("still shows provisioning when no sandbox but task is provisioning", () => {
+    const result = deriveHeaderStatus("init_enqueue_provision", null, null, false);
+    expect(result.variant).toBe("warning");
+    expect(result.label).toBe("Provisioning");
+    expect(result.spinning).toBe(true);
+  });
+
+  it("shows error over no-sandbox when session has error", () => {
+    const result = deriveHeaderStatus("idle", "error", "Connection lost", false);
+    expect(result.variant).toBe("error");
+    expect(result.label).toBe("Session error");
+  });
+});
diff --git a/foundry/packages/frontend/src/features/tasks/status.ts b/foundry/packages/frontend/src/features/tasks/status.ts
new file mode 100644
index 0000000..9376786
--- /dev/null
+++ b/foundry/packages/frontend/src/features/tasks/status.ts
@@ -0,0 +1,168 @@
+import type { TaskStatus, WorkspaceSessionStatus } from "@sandbox-agent/foundry-shared";
+import type { HeaderStatusInfo } from "../../components/mock-layout/ui";
+
+export type TaskDisplayStatus = TaskStatus;
+
+export interface TaskStateDescriptor {
+  title: string;
+  detail: string;
+}
+
+export function isProvisioningTaskStatus(status: TaskDisplayStatus | null | undefined): boolean {
+  return status === "init_bootstrap_db" || status === "init_enqueue_provision" || status === "init_ensure_name" || status === "init_assert_name";
+}
+
+export function defaultTaskStatusMessage(status: TaskDisplayStatus | null | undefined): string {
+  switch (status) {
+    case "init_bootstrap_db":
+      return "Creating task records.";
+    case "init_enqueue_provision":
+      return "Queueing sandbox provisioning.";
+    case "init_ensure_name":
+      return "Determining title and branch.";
+    case "init_assert_name":
+      return "Validating title and branch.";
+    case "init_complete":
+      return "Finalizing task initialization.";
+    case "running":
+      return "Agent session is actively running.";
+    case "idle":
+      return "Sandbox is ready for the next prompt.";
+    case "archive_stop_status_sync":
+      return "Stopping sandbox status sync before archiving.";
+    case "archive_release_sandbox":
+      return "Releasing sandbox resources.";
+    case "archive_finalize":
+      return "Finalizing archive.";
+    case "archived":
+      return "Task has been archived.";
+    case "kill_destroy_sandbox":
+      return "Destroying sandbox resources.";
+    case "kill_finalize":
+      return "Finalizing task termination.";
+    case "killed":
+      return "Task has been terminated.";
+    case "error":
+      return "Task entered an error state.";
+    case null:
+    case undefined:
+      return "Task state unavailable.";
+  }
+}
+
+export function resolveTaskStateDetail(status: TaskDisplayStatus | null | undefined): string {
+  return defaultTaskStatusMessage(status);
+}
+
+export function describeTaskState(status: TaskDisplayStatus | null | undefined): TaskStateDescriptor {
+  return {
+    title: status ? `Task state: ${status}` : "Task state unavailable",
+    detail: resolveTaskStateDetail(status),
+  };
+}
+
+/**
+ * Derives the header status pill state from the combined task + active session + sandbox state.
+ * Priority: session error > task error > no sandbox > provisioning > running > ready/idle > neutral.
+ */
+export function deriveHeaderStatus(
+  taskStatus: TaskDisplayStatus | null | undefined,
+  sessionStatus: WorkspaceSessionStatus | null | undefined,
+  sessionErrorMessage: string | null | undefined,
+  hasSandbox?: boolean,
+): HeaderStatusInfo {
+  // Session error takes priority
+  if (sessionStatus === "error") {
+    return {
+      variant: "error",
+      label: "Session error",
+      spinning: false,
+      tooltip: sessionErrorMessage ?? "Session failed to start.",
+    };
+  }
+
+  // Task error
+  if (taskStatus === "error") {
+    return {
+      variant: "error",
+      label: "Error",
+      spinning: false,
+      tooltip: "Task entered an error state.",
+    };
+  }
+
+  // No sandbox available (not provisioning, not errored — just missing)
+  if (hasSandbox === false && !isProvisioningTaskStatus(taskStatus)) {
+    return {
+      variant: "warning",
+      label: "No sandbox",
+      spinning: false,
+      tooltip: "Sandbox is not available for this task.",
+    };
+  }
+
+  // Task provisioning (init_* states)
+  if (isProvisioningTaskStatus(taskStatus)) {
+    return {
+      variant: "warning",
+      label: "Provisioning",
+      spinning: true,
+      tooltip: resolveTaskStateDetail(taskStatus),
+    };
+  }
+
+  // Session pending states
+  if (sessionStatus === "pending_provision") {
+    return {
+      variant: "warning",
+      label: "Provisioning",
+      spinning: true,
+      tooltip: "Provisioning sandbox...",
+    };
+  }
+
+  if (sessionStatus === "pending_session_create") {
+    return {
+      variant: "warning",
+      label: "Creating session",
+      spinning: true,
+      tooltip: "Creating agent session...",
+    };
+  }
+
+  // Running
+  if (sessionStatus === "running") {
+    return {
+      variant: "success",
+      label: "Running",
+      spinning: true,
+      tooltip: "Agent is actively running.",
+    };
+  }
+
+  // Ready / idle
+  if (sessionStatus === "ready" || sessionStatus === "idle" || taskStatus === "idle" || taskStatus === "running") {
+    return {
+      variant: "success",
+      label: "Ready",
+      spinning: false,
+      tooltip: "Sandbox is ready.",
+    };
+  }
+
+  // Terminal states
+  if (taskStatus === "archived" || taskStatus === "killed") {
+    return {
+      variant: "neutral",
+      label: taskStatus === "archived" ? "Archived" : "Terminated",
+      spinning: false,
+    };
+  }
+
+  // Fallback
+  return {
+    variant: "neutral",
+    label: taskStatus ?? "Unknown",
+    spinning: false,
+  };
+}
diff --git a/foundry/packages/frontend/src/foundry-client-view-model.d.ts b/foundry/packages/frontend/src/foundry-client-view-model.d.ts
new file mode 100644
index 0000000..42a4012
--- /dev/null
+++ b/foundry/packages/frontend/src/foundry-client-view-model.d.ts
@@ -0,0 +1,7 @@
+declare module "@sandbox-agent/foundry-client/view-model" {
+  export {
+    TASK_STATUS_GROUPS,
+    groupTaskStatus,
+  } from "@sandbox-agent/foundry-client";
+  export type { TaskStatusGroup } from "@sandbox-agent/foundry-client";
+}
diff --git a/foundry/packages/frontend/src/lib/backend.ts b/foundry/packages/frontend/src/lib/backend.ts
new file mode 100644
index 0000000..be58cdd
--- /dev/null
+++ b/foundry/packages/frontend/src/lib/backend.ts
@@ -0,0 +1,9 @@
+import { createBackendClient } from "@sandbox-agent/foundry-client";
+import { backendEndpoint, defaultOrganizationId, frontendClientMode } from "./env";
+
+export const backendClient = createBackendClient({
+  endpoint: backendEndpoint,
+  defaultOrganizationId,
+  mode: frontendClientMode,
+  encoding: import.meta.env.DEV ? "json" : undefined,
+});
diff --git a/foundry/packages/frontend/src/lib/env.ts b/foundry/packages/frontend/src/lib/env.ts
new file mode 100644
index 0000000..5476f83
--- /dev/null
+++ b/foundry/packages/frontend/src/lib/env.ts
@@ -0,0 +1,45 @@
+type FoundryRuntimeConfig = {
+  backendEndpoint?: string;
+  defaultOrganizationId?: string;
+  frontendClientMode?: string;
+};
+
+declare global {
+  interface Window {
+    __FOUNDRY_RUNTIME_CONFIG__?: FoundryRuntimeConfig;
+  }
+}
+
+function resolveDefaultBackendEndpoint(): string {
+  if (typeof window !== "undefined" && window.location?.origin) {
+    return `${window.location.origin}/v1/rivet`;
+  }
+  return "http://127.0.0.1:7741/v1/rivet";
+}
+
+type FrontendImportMetaEnv = ImportMetaEnv & {
+  FOUNDRY_FRONTEND_CLIENT_MODE?: string;
+};
+
+const frontendEnv = import.meta.env as FrontendImportMetaEnv;
+const runtimeConfig = typeof window !== "undefined" ? window.__FOUNDRY_RUNTIME_CONFIG__ : undefined;
+
+export const backendEndpoint = runtimeConfig?.backendEndpoint?.trim() || import.meta.env.VITE_HF_BACKEND_ENDPOINT?.trim() || resolveDefaultBackendEndpoint();
+
+export const defaultOrganizationId = runtimeConfig?.defaultOrganizationId?.trim() || import.meta.env.VITE_HF_WORKSPACE?.trim() || "default";
+
+function resolveFrontendClientMode(): "mock" | "remote" {
+  const raw = runtimeConfig?.frontendClientMode?.trim().toLowerCase() || frontendEnv.FOUNDRY_FRONTEND_CLIENT_MODE?.trim().toLowerCase();
+  if (raw === "mock") {
+    return "mock";
+  }
+  if (raw === "remote" || raw === "" || raw === undefined) {
+    return "remote";
+  }
+  throw new Error(
+    `Unsupported FOUNDRY_FRONTEND_CLIENT_MODE value "${runtimeConfig?.frontendClientMode ?? frontendEnv.FOUNDRY_FRONTEND_CLIENT_MODE}". Expected "mock" or "remote".`,
+  );
+}
+
+export const frontendClientMode = resolveFrontendClientMode();
+export const isMockFrontendClient = frontendClientMode === "mock";
diff --git a/foundry/packages/frontend/src/lib/mock-app.ts b/foundry/packages/frontend/src/lib/mock-app.ts
new file mode 100644
index 0000000..09b23ad
--- /dev/null
+++ b/foundry/packages/frontend/src/lib/mock-app.ts
@@ -0,0 +1,163 @@
+import { useSyncExternalStore } from "react";
+import {
+  createFoundryAppClient,
+  useSubscription,
+  currentFoundryOrganization,
+  currentFoundryUser,
+  eligibleFoundryOrganizations,
+  type FoundryAppClient,
+} from "@sandbox-agent/foundry-client";
+import type {
+  FoundryAppSnapshot,
+  FoundryBillingPlanId,
+  FoundryOrganization,
+  UpdateFoundryOrganizationProfileInput,
+  WorkspaceModelId,
+} from "@sandbox-agent/foundry-shared";
+import { backendClient } from "./backend";
+import { subscriptionManager } from "./subscription";
+import { frontendClientMode } from "./env";
+
+const REMOTE_APP_SESSION_STORAGE_KEY = "sandbox-agent-foundry:remote-app-session";
+
+const EMPTY_APP_SNAPSHOT: FoundryAppSnapshot = {
+  auth: { status: "signed_out", currentUserId: null },
+  activeOrganizationId: null,
+  onboarding: {
+    starterRepo: {
+      repoFullName: "rivet-dev/sandbox-agent",
+      repoUrl: "https://github.com/rivet-dev/sandbox-agent",
+      status: "pending",
+      starredAt: null,
+      skippedAt: null,
+    },
+  },
+  users: [],
+  organizations: [],
+};
+
+const legacyAppClient: FoundryAppClient = createFoundryAppClient({
+  mode: frontendClientMode,
+  backend: frontendClientMode === "remote" ? backendClient : undefined,
+});
+
+const remoteAppClient: FoundryAppClient = {
+  getSnapshot(): FoundryAppSnapshot {
+    return subscriptionManager.getSnapshot("app", {}) ?? EMPTY_APP_SNAPSHOT;
+  },
+  subscribe(listener: () => void): () => void {
+    return subscriptionManager.subscribe("app", {}, listener);
+  },
+  async signInWithGithub(userId?: string): Promise<void> {
+    void userId;
+    await backendClient.signInWithGithub();
+  },
+  async signOut(): Promise<void> {
+    window.localStorage.removeItem(REMOTE_APP_SESSION_STORAGE_KEY);
+    await backendClient.signOutApp();
+  },
+  async skipStarterRepo(): Promise<void> {
+    await backendClient.skipAppStarterRepo();
+  },
+  async starStarterRepo(organizationId: string): Promise<void> {
+    await backendClient.starAppStarterRepo(organizationId);
+  },
+  async selectOrganization(organizationId: string): Promise<void> {
+    await backendClient.selectAppOrganization(organizationId);
+  },
+  async setDefaultModel(defaultModel: WorkspaceModelId): Promise<void> {
+    await backendClient.setAppDefaultModel(defaultModel);
+  },
+  async updateOrganizationProfile(input: UpdateFoundryOrganizationProfileInput): Promise<void> {
+    await backendClient.updateAppOrganizationProfile(input);
+  },
+  async triggerGithubSync(organizationId: string): Promise<void> {
+    await backendClient.triggerAppRepoImport(organizationId);
+  },
+  async completeHostedCheckout(organizationId: string, planId: FoundryBillingPlanId): Promise<void> {
+    await backendClient.completeAppHostedCheckout(organizationId, planId);
+  },
+  async openBillingPortal(organizationId: string): Promise<void> {
+    await backendClient.openAppBillingPortal(organizationId);
+  },
+  async cancelScheduledRenewal(organizationId: string): Promise<void> {
+    await backendClient.cancelAppScheduledRenewal(organizationId);
+  },
+  async resumeSubscription(organizationId: string): Promise<void> {
+    await backendClient.resumeAppSubscription(organizationId);
+  },
+  async reconnectGithub(organizationId: string): Promise<void> {
+    await backendClient.reconnectAppGithub(organizationId);
+  },
+  async recordSeatUsage(organizationId: string): Promise<void> {
+    await backendClient.recordAppSeatUsage(organizationId);
+  },
+};
+
+const appClient: FoundryAppClient = frontendClientMode === "remote" ? remoteAppClient : legacyAppClient;
+
+export function useMockAppSnapshot(): FoundryAppSnapshot {
+  if (frontendClientMode === "remote") {
+    const app = useSubscription(subscriptionManager, "app", {});
+    if (app.status !== "loading") {
+      firstSnapshotDelivered = true;
+      // Persist session sentinel so isAppSnapshotBootstrapping can show a loading
+      // screen instead of flashing /signin on the next page load / HMR reload.
+      const snapshot = app.data ?? EMPTY_APP_SNAPSHOT;
+      if (snapshot.auth.status === "signed_in") {
+        window.localStorage.setItem(REMOTE_APP_SESSION_STORAGE_KEY, "1");
+      } else {
+        window.localStorage.removeItem(REMOTE_APP_SESSION_STORAGE_KEY);
+      }
+    }
+    return app.data ?? EMPTY_APP_SNAPSHOT;
+  }
+
+  return useSyncExternalStore(appClient.subscribe.bind(appClient), appClient.getSnapshot.bind(appClient), appClient.getSnapshot.bind(appClient));
+}
+
+export function useMockAppClient(): FoundryAppClient {
+  return appClient;
+}
+
+export const activeMockUser = currentFoundryUser;
+export const activeMockOrganization = currentFoundryOrganization;
+export const eligibleOrganizations = eligibleFoundryOrganizations;
+
+// Track whether the remote client has delivered its first real snapshot.
+// Before the first fetch completes the snapshot is the default empty signed_out state,
+// so we show a loading screen.  Once the fetch returns we know the truth.
+let firstSnapshotDelivered = false;
+
+// The remote client notifies listeners after refresh(), which sets `firstSnapshotDelivered`.
+const origSubscribe = appClient.subscribe.bind(appClient);
+appClient.subscribe = (listener: () => void): (() => void) => {
+  const wrappedListener = () => {
+    firstSnapshotDelivered = true;
+    listener();
+  };
+  return origSubscribe(wrappedListener);
+};
+
+export function isAppSnapshotBootstrapping(snapshot: FoundryAppSnapshot): boolean {
+  if (frontendClientMode !== "remote" || typeof window === "undefined") {
+    return false;
+  }
+
+  const hasStoredSession = window.localStorage.getItem(REMOTE_APP_SESSION_STORAGE_KEY)?.trim().length;
+  if (!hasStoredSession) {
+    return false;
+  }
+
+  // If the backend has already responded and we're still signed_out, the session is stale.
+  if (firstSnapshotDelivered) {
+    return false;
+  }
+
+  // Still waiting for the initial fetch — show the loading screen.
+  return snapshot.auth.status === "signed_out" && snapshot.users.length === 0 && snapshot.organizations.length === 0;
+}
+
+export function getMockOrganizationById(snapshot: FoundryAppSnapshot, organizationId: string): FoundryOrganization | null {
+  return snapshot.organizations.find((organization) => organization.id === organizationId) ?? null;
+}
diff --git a/foundry/packages/frontend/src/lib/subscription.ts b/foundry/packages/frontend/src/lib/subscription.ts
new file mode 100644
index 0000000..c1618fb
--- /dev/null
+++ b/foundry/packages/frontend/src/lib/subscription.ts
@@ -0,0 +1,5 @@
+import { MockSubscriptionManager, RemoteSubscriptionManager } from "@sandbox-agent/foundry-client";
+import { backendClient } from "./backend";
+import { frontendClientMode } from "./env";
+
+export const subscriptionManager = frontendClientMode === "mock" ? new MockSubscriptionManager() : new RemoteSubscriptionManager(backendClient);
diff --git a/foundry/packages/frontend/src/logging.ts b/foundry/packages/frontend/src/logging.ts
new file mode 100644
index 0000000..08b15c6
--- /dev/null
+++ b/foundry/packages/frontend/src/logging.ts
@@ -0,0 +1,5 @@
+import { createFoundryLogger } from "@sandbox-agent/foundry-shared";
+
+export const logger = createFoundryLogger({
+  service: "foundry-frontend",
+});
diff --git a/foundry/packages/frontend/src/main.tsx b/foundry/packages/frontend/src/main.tsx
new file mode 100644
index 0000000..9c5acbb
--- /dev/null
+++ b/foundry/packages/frontend/src/main.tsx
@@ -0,0 +1,68 @@
+import { StrictMode, useEffect, useMemo, useState } from "react";
+import { createRoot } from "react-dom/client";
+import { BaseProvider } from "baseui";
+import { RouterProvider } from "@tanstack/react-router";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { Client as Styletron } from "styletron-engine-atomic";
+import { Provider as StyletronProvider } from "styletron-react";
+import { router } from "./app/router";
+import { ColorModeCtx, darkTheme, getStoredColorMode, lightTheme, storeColorMode, type ColorMode } from "./app/theme";
+import { applyCssTokens, getFoundryTokens } from "./styles/tokens";
+import "./styles.css";
+
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: 1,
+      refetchOnWindowFocus: true,
+    },
+  },
+});
+
+const styletronEngine = new Styletron();
+
+function App() {
+  const [colorMode, setColorModeState] = useState<ColorMode>(getStoredColorMode);
+
+  const colorModeCtx = useMemo(
+    () => ({
+      colorMode,
+      setColorMode: (mode: ColorMode) => {
+        storeColorMode(mode);
+        setColorModeState(mode);
+      },
+    }),
+    [colorMode],
+  );
+
+  const theme = colorMode === "dark" ? darkTheme : lightTheme;
+  const tokens = getFoundryTokens(theme);
+
+  // Sync CSS custom properties and root element styles with color mode
+  useEffect(() => {
+    applyCssTokens(tokens);
+    document.documentElement.style.colorScheme = colorMode;
+    document.documentElement.style.background = tokens.surfacePrimary;
+    document.documentElement.style.color = tokens.textPrimary;
+    document.body.style.background = tokens.surfacePrimary;
+    document.body.style.color = tokens.textPrimary;
+  }, [colorMode, tokens]);
+
+  return (
+    <ColorModeCtx.Provider value={colorModeCtx}>
+      <StyletronProvider value={styletronEngine}>
+        <BaseProvider theme={theme}>
+          <QueryClientProvider client={queryClient}>
+            <RouterProvider router={router} />
+          </QueryClientProvider>
+        </BaseProvider>
+      </StyletronProvider>
+    </ColorModeCtx.Provider>
+  );
+}
+
+createRoot(document.getElementById("root")!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+);
diff --git a/foundry/packages/frontend/src/sandbox-agent-react.d.ts b/foundry/packages/frontend/src/sandbox-agent-react.d.ts
new file mode 100644
index 0000000..60519b3
--- /dev/null
+++ b/foundry/packages/frontend/src/sandbox-agent-react.d.ts
@@ -0,0 +1,114 @@
+declare module "@sandbox-agent/react" {
+  import type { CSSProperties, KeyboardEvent, ReactNode, Ref, RefObject, TextareaHTMLAttributes } from "react";
+  import type { SandboxAgent } from "sandbox-agent";
+
+  export type PermissionReply = "once" | "always" | "reject";
+
+  export type PermissionOption = {
+    optionId: string;
+    name: string;
+    kind: string;
+  };
+
+  export type TranscriptEntry = {
+    id: string;
+    eventId?: string;
+    kind: "message" | "tool" | "meta" | "reasoning" | "permission";
+    time: string;
+    role?: "user" | "assistant";
+    text?: string;
+  };
+
+  export interface AgentTranscriptClassNames {
+    root: string;
+    message: string;
+    messageContent: string;
+    messageText: string;
+    thinkingRow: string;
+    thinkingIndicator: string;
+  }
+
+  export interface PermissionOptionRenderContext {
+    entry: TranscriptEntry;
+    option: PermissionOption;
+    label: string;
+    reply: PermissionReply;
+    selected: boolean;
+    dimmed: boolean;
+    resolved: boolean;
+  }
+
+  export interface AgentTranscriptProps {
+    entries: TranscriptEntry[];
+    className?: string;
+    classNames?: Partial<AgentTranscriptClassNames>;
+    endRef?: RefObject<HTMLDivElement>;
+    scrollRef?: RefObject<HTMLDivElement>;
+    scrollToEntryId?: string | null;
+    sessionError?: string | null;
+    eventError?: string | null;
+    isThinking?: boolean;
+    agentId?: string;
+    virtualize?: boolean;
+    onAtBottomChange?: (atBottom: boolean) => void;
+    onEventClick?: (eventId: string) => void;
+    onPermissionReply?: (permissionId: string, reply: PermissionReply) => void;
+    isDividerEntry?: (entry: TranscriptEntry) => boolean;
+    canOpenEvent?: (entry: TranscriptEntry) => boolean;
+    getToolGroupSummary?: (entries: TranscriptEntry[]) => string;
+    renderMessageText?: (entry: TranscriptEntry) => ReactNode;
+    renderInlinePendingIndicator?: () => ReactNode;
+    renderThinkingState?: (context: { agentId?: string }) => ReactNode;
+    renderToolItemIcon?: (entry: TranscriptEntry) => ReactNode;
+    renderToolGroupIcon?: (entries: TranscriptEntry[], expanded: boolean) => ReactNode;
+    renderChevron?: (expanded: boolean) => ReactNode;
+    renderEventLinkContent?: (entry: TranscriptEntry) => ReactNode;
+    renderPermissionIcon?: (entry: TranscriptEntry) => ReactNode;
+    renderPermissionOptionContent?: (context: PermissionOptionRenderContext) => ReactNode;
+  }
+
+  export const AgentTranscript: (props: AgentTranscriptProps) => ReactNode;
+
+  export interface ChatComposerClassNames {
+    root: string;
+    form: string;
+    input: string;
+    submit: string;
+    submitContent: string;
+  }
+
+  export interface ChatComposerProps {
+    message: string;
+    onMessageChange: (value: string) => void;
+    onSubmit: () => void;
+    onKeyDown?: (event: KeyboardEvent<HTMLTextAreaElement>) => void;
+    placeholder?: string;
+    disabled?: boolean;
+    submitDisabled?: boolean;
+    allowEmptySubmit?: boolean;
+    submitLabel?: string;
+    className?: string;
+    classNames?: Partial<ChatComposerClassNames>;
+    inputRef?: Ref<HTMLTextAreaElement>;
+    rows?: number;
+    textareaProps?: Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, "className" | "disabled" | "onChange" | "onKeyDown" | "placeholder" | "rows" | "value">;
+    renderSubmitContent?: () => ReactNode;
+    renderFooter?: () => ReactNode;
+  }
+
+  export const ChatComposer: (props: ChatComposerProps) => ReactNode;
+
+  export interface ProcessTerminalClient extends SandboxAgent {}
+
+  export interface ProcessTerminalProps {
+    client: SandboxAgent | null;
+    processId: string;
+    height?: string | number;
+    showStatusBar?: boolean;
+    style?: CSSProperties;
+    terminalStyle?: CSSProperties;
+    onExit?: () => void;
+  }
+
+  export const ProcessTerminal: (props: ProcessTerminalProps) => ReactNode;
+}
diff --git a/foundry/packages/frontend/src/styles.css b/foundry/packages/frontend/src/styles.css
new file mode 100644
index 0000000..9967938
--- /dev/null
+++ b/foundry/packages/frontend/src/styles.css
@@ -0,0 +1,204 @@
+@import url("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap");
+
+:root {
+  color-scheme: dark;
+  font-family: "IBM Plex Sans", "Segoe UI", sans-serif;
+  background: var(--f-surface-primary, #000000);
+  color: var(--f-text-primary, #ffffff);
+}
+
+html,
+body,
+#root {
+  height: 100%;
+}
+
+body {
+  margin: 0;
+  background: var(--f-surface-primary, #000000);
+  color: var(--f-text-primary, #ffffff);
+  overflow: hidden;
+}
+
+* {
+  box-sizing: border-box;
+  user-select: none;
+}
+
+/* Opt-in text selection for content areas */
+input,
+textarea,
+pre,
+code,
+[data-selectable] {
+  user-select: text;
+}
+
+a {
+  color: inherit;
+}
+
+@keyframes hf-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+button,
+input,
+textarea,
+select {
+  font: inherit;
+}
+
+code,
+pre {
+  font-family: "IBM Plex Mono", "SFMono-Regular", monospace;
+}
+
+.mock-diff-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 14px;
+  border-bottom: 1px solid var(--f-border-default, rgba(255, 255, 255, 0.12));
+  background: var(--f-surface-secondary, #111111);
+}
+
+.mock-diff-path {
+  color: var(--f-text-primary, #fafafa);
+  font-family: "IBM Plex Mono", "SFMono-Regular", monospace;
+  font-size: 13px;
+  font-weight: 600;
+}
+
+.mock-diff-stats {
+  display: flex;
+  gap: 8px;
+  margin-left: 4px;
+  font-size: 12px;
+}
+
+.mock-diff-added {
+  color: var(--f-status-success, #7ee787);
+}
+
+.mock-diff-removed {
+  color: var(--f-status-error, #ffa198);
+}
+
+.mock-diff-body {
+  font-family: "IBM Plex Mono", "SFMono-Regular", monospace;
+  font-size: 12px;
+  line-height: 20px;
+}
+
+.mock-diff-row {
+  display: flex;
+  align-items: stretch;
+  min-height: 20px;
+}
+
+.mock-diff-row[data-kind="add"] {
+  background: rgba(46, 160, 67, 0.12);
+}
+
+.mock-diff-row[data-kind="remove"] {
+  background: rgba(248, 81, 73, 0.1);
+}
+
+.mock-diff-row[data-kind="hunk"] {
+  background: rgba(255, 255, 255, 0.04);
+  border-bottom: 1px solid var(--f-border-default, rgba(255, 255, 255, 0.12));
+}
+
+.mock-diff-row[data-kind="hunk"]:not(:first-child) {
+  border-top: 1px solid var(--f-border-default, rgba(255, 255, 255, 0.12));
+}
+
+.mock-diff-gutter {
+  position: relative;
+  width: 36px;
+  flex-shrink: 0;
+  padding: 0 8px 0 0;
+  font-size: 11px;
+  line-height: 20px;
+  text-align: right;
+  user-select: none;
+}
+
+.mock-diff-line-number {
+  display: block;
+  color: var(--f-text-tertiary, #71717a);
+  opacity: 0.5;
+}
+
+.mock-diff-line-text {
+  flex: 1;
+  padding: 0 10px;
+  overflow: hidden;
+  color: var(--f-text-secondary, #a1a1aa);
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 20px;
+  text-overflow: ellipsis;
+  white-space: pre;
+}
+
+.mock-diff-row[data-kind="add"] .mock-diff-line-text {
+  color: var(--f-status-success, #7ee787);
+}
+
+.mock-diff-row[data-kind="remove"] .mock-diff-line-text {
+  color: var(--f-status-error, #ffa198);
+}
+
+.mock-diff-row[data-kind="hunk"] .mock-diff-line-text {
+  color: var(--f-text-tertiary, #71717a);
+}
+
+.mock-diff-row[data-kind="hunk"] .mock-diff-line-text {
+  font-size: 11px;
+  font-weight: 600;
+}
+
+.mock-diff-attach-button {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: var(--f-accent, #ff4f00);
+  cursor: pointer;
+  opacity: 0;
+  pointer-events: none;
+  z-index: 1;
+}
+
+.mock-diff-row:not([data-kind="hunk"]):hover {
+  background: rgba(255, 79, 0, 0.06);
+}
+
+.mock-diff-row:not([data-kind="hunk"]):hover .mock-diff-attach-button {
+  opacity: 1;
+  pointer-events: auto;
+  background: var(--f-accent-subtle, rgba(255, 79, 0, 0.1));
+}
+
+.mock-diff-row:not([data-kind="hunk"]):hover .mock-diff-line-number {
+  opacity: 0;
+}
+
+.mock-diff-empty {
+  padding: 40px;
+  text-align: center;
+}
+
+.mock-diff-empty-copy {
+  color: var(--f-text-tertiary, #71717a);
+  font-size: 14px;
+  line-height: 1.4;
+}
diff --git a/foundry/packages/frontend/src/styles/shared-styles.ts b/foundry/packages/frontend/src/styles/shared-styles.ts
new file mode 100644
index 0000000..c3f225f
--- /dev/null
+++ b/foundry/packages/frontend/src/styles/shared-styles.ts
@@ -0,0 +1,105 @@
+import type { CSSProperties } from "react";
+import type { FoundryTokens } from "./tokens";
+
+const fontFamily = "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif";
+
+export function appSurfaceStyle(t: FoundryTokens): CSSProperties {
+  return {
+    minHeight: "100dvh",
+    display: "flex",
+    flexDirection: "column",
+    background: t.surfacePrimary,
+    color: t.textPrimary,
+    fontFamily,
+  };
+}
+
+export function primaryButtonStyle(t: FoundryTokens): CSSProperties {
+  return {
+    border: 0,
+    borderRadius: "6px",
+    padding: "6px 12px",
+    background: t.textPrimary,
+    color: t.textOnPrimary,
+    fontWeight: 500,
+    fontSize: "12px",
+    cursor: "pointer",
+    fontFamily,
+    lineHeight: 1.4,
+  };
+}
+
+export function secondaryButtonStyle(t: FoundryTokens): CSSProperties {
+  return {
+    border: `1px solid ${t.borderDefault}`,
+    borderRadius: "6px",
+    padding: "5px 11px",
+    background: t.interactiveSubtle,
+    color: t.textSecondary,
+    fontWeight: 500,
+    fontSize: "12px",
+    cursor: "pointer",
+    fontFamily,
+    lineHeight: 1.4,
+  };
+}
+
+export function subtleButtonStyle(t: FoundryTokens): CSSProperties {
+  return {
+    border: 0,
+    borderRadius: "6px",
+    padding: "6px 10px",
+    background: t.interactiveHover,
+    color: t.textSecondary,
+    fontWeight: 500,
+    fontSize: "12px",
+    cursor: "pointer",
+    fontFamily,
+    lineHeight: 1.4,
+  };
+}
+
+export function cardStyle(t: FoundryTokens): CSSProperties {
+  return {
+    background: t.surfaceSecondary,
+    border: `1px solid ${t.borderSubtle}`,
+    borderRadius: "8px",
+  };
+}
+
+export function badgeStyle(_t: FoundryTokens, background: string, color?: string): CSSProperties {
+  return {
+    display: "inline-flex",
+    alignItems: "center",
+    gap: "4px",
+    padding: "2px 6px",
+    borderRadius: "4px",
+    background,
+    color: color ?? _t.textSecondary,
+    fontSize: "10px",
+    fontWeight: 500,
+  };
+}
+
+export function inputStyle(t: FoundryTokens): CSSProperties {
+  return {
+    width: "100%",
+    borderRadius: "6px",
+    border: `1px solid ${t.borderDefault}`,
+    background: t.interactiveSubtle,
+    color: t.textPrimary,
+    padding: "6px 10px",
+    fontSize: "12px",
+    fontFamily,
+    outline: "none",
+    lineHeight: 1.5,
+  };
+}
+
+export function settingsLabelStyle(t: FoundryTokens): CSSProperties {
+  return {
+    fontSize: "11px",
+    fontWeight: 500,
+    color: t.textTertiary,
+  };
+}
diff --git a/foundry/packages/frontend/src/styles/tokens.ts b/foundry/packages/frontend/src/styles/tokens.ts
new file mode 100644
index 0000000..85101a7
--- /dev/null
+++ b/foundry/packages/frontend/src/styles/tokens.ts
@@ -0,0 +1,141 @@
+import type { Theme } from "baseui";
+
+/**
+ * Semantic design tokens for the Foundry UI.
+ *
+ * These map visual intent to concrete color values and flip automatically
+ * when the BaseUI theme switches between dark and light.
+ */
+export interface FoundryTokens {
+  // ── Surfaces ──────────────────────────────────────────────────────────
+  surfacePrimary: string;
+  surfaceSecondary: string;
+  surfaceTertiary: string;
+  surfaceElevated: string;
+
+  // ── Interactive overlays ──────────────────────────────────────────────
+  interactiveHover: string;
+  interactiveActive: string;
+  interactiveSubtle: string;
+
+  // ── Borders ───────────────────────────────────────────────────────────
+  borderSubtle: string;
+  borderDefault: string;
+  borderMedium: string;
+  borderFocus: string;
+
+  // ── Text ──────────────────────────────────────────────────────────────
+  textPrimary: string;
+  textSecondary: string;
+  textTertiary: string;
+  textMuted: string;
+  textOnAccent: string;
+  textOnPrimary: string;
+
+  // ── Accent ────────────────────────────────────────────────────────────
+  accent: string;
+  accentSubtle: string;
+
+  // ── Status ────────────────────────────────────────────────────────────
+  statusSuccess: string;
+  statusError: string;
+  statusWarning: string;
+
+  // ── Misc ──────────────────────────────────────────────────────────────
+  shadow: string;
+}
+
+const darkTokens: FoundryTokens = {
+  surfacePrimary: "#09090b",
+  surfaceSecondary: "#0f0f11",
+  surfaceTertiary: "#0c0c0e",
+  surfaceElevated: "#1a1a1d",
+
+  interactiveHover: "rgba(255, 255, 255, 0.06)",
+  interactiveActive: "rgba(255, 255, 255, 0.10)",
+  interactiveSubtle: "rgba(255, 255, 255, 0.03)",
+
+  borderSubtle: "rgba(255, 255, 255, 0.06)",
+  borderDefault: "rgba(255, 255, 255, 0.10)",
+  borderMedium: "rgba(255, 255, 255, 0.14)",
+  borderFocus: "rgba(255, 255, 255, 0.30)",
+
+  textPrimary: "#ffffff",
+  textSecondary: "#a1a1aa",
+  textTertiary: "#71717a",
+  textMuted: "rgba(255, 255, 255, 0.40)",
+  textOnAccent: "#ffffff",
+  textOnPrimary: "#09090b",
+
+  accent: "#ff4f00",
+  accentSubtle: "rgba(255, 79, 0, 0.10)",
+
+  statusSuccess: "#7ee787",
+  statusError: "#ffa198",
+  statusWarning: "#fbbf24",
+
+  shadow: "0 4px 24px rgba(0, 0, 0, 0.5)",
+};
+
+const lightTokens: FoundryTokens = {
+  surfacePrimary: "#ffffff",
+  surfaceSecondary: "#f4f4f5",
+  surfaceTertiary: "#fafafa",
+  surfaceElevated: "#ffffff",
+
+  interactiveHover: "rgba(0, 0, 0, 0.04)",
+  interactiveActive: "rgba(0, 0, 0, 0.08)",
+  interactiveSubtle: "rgba(0, 0, 0, 0.02)",
+
+  borderSubtle: "rgba(0, 0, 0, 0.06)",
+  borderDefault: "rgba(0, 0, 0, 0.10)",
+  borderMedium: "rgba(0, 0, 0, 0.14)",
+  borderFocus: "rgba(0, 0, 0, 0.25)",
+
+  textPrimary: "#09090b",
+  textSecondary: "#52525b",
+  textTertiary: "#a1a1aa",
+  textMuted: "rgba(0, 0, 0, 0.40)",
+  textOnAccent: "#ffffff",
+  textOnPrimary: "#ffffff",
+
+  accent: "#ff4f00",
+  accentSubtle: "rgba(255, 79, 0, 0.08)",
+
+  statusSuccess: "#16a34a",
+  statusError: "#dc2626",
+  statusWarning: "#ca8a04",
+
+  shadow: "0 4px 24px rgba(0, 0, 0, 0.08)",
+};
+
+/**
+ * Resolve tokens from the active BaseUI theme.
+ * Works inside `styled()` callbacks where `$theme` is available.
+ */
+export function getFoundryTokens(theme: Theme): FoundryTokens {
+  // BaseUI dark themes have backgroundPrimary near black
+  const isDark = (theme.colors.backgroundPrimary ?? "#09090b").startsWith("#0");
+  return isDark ? darkTokens : lightTokens;
+}
+
+/**
+ * Inject CSS custom properties onto :root so styles.css can reference tokens.
+ */
+export function applyCssTokens(tokens: FoundryTokens) {
+  const root = document.documentElement;
+  root.style.setProperty("--f-surface-primary", tokens.surfacePrimary);
+  root.style.setProperty("--f-surface-secondary", tokens.surfaceSecondary);
+  root.style.setProperty("--f-surface-tertiary", tokens.surfaceTertiary);
+  root.style.setProperty("--f-text-primary", tokens.textPrimary);
+  root.style.setProperty("--f-text-secondary", tokens.textSecondary);
+  root.style.setProperty("--f-text-tertiary", tokens.textTertiary);
+  root.style.setProperty("--f-text-muted", tokens.textMuted);
+  root.style.setProperty("--f-border-subtle", tokens.borderSubtle);
+  root.style.setProperty("--f-border-default", tokens.borderDefault);
+  root.style.setProperty("--f-accent", tokens.accent);
+  root.style.setProperty("--f-accent-subtle", tokens.accentSubtle);
+  root.style.setProperty("--f-status-success", tokens.statusSuccess);
+  root.style.setProperty("--f-status-error", tokens.statusError);
+  root.style.setProperty("--f-interactive-hover", tokens.interactiveHover);
+}
diff --git a/foundry/packages/frontend/tsconfig.json b/foundry/packages/frontend/tsconfig.json
new file mode 100644
index 0000000..a925623
--- /dev/null
+++ b/foundry/packages/frontend/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "jsx": "react-jsx",
+    "declaration": false,
+    "types": ["vite/client", "vitest/globals"]
+  },
+  "include": ["src", "vite.config.ts", "vitest.config.ts"]
+}
diff --git a/foundry/packages/frontend/vite.config.ts b/foundry/packages/frontend/vite.config.ts
new file mode 100644
index 0000000..399c5ff
--- /dev/null
+++ b/foundry/packages/frontend/vite.config.ts
@@ -0,0 +1,30 @@
+import { defineConfig } from "vite";
+import { resolve } from "node:path";
+import react from "@vitejs/plugin-react";
+
+const backendProxyTarget = process.env.HF_BACKEND_HTTP?.trim() || "http://127.0.0.1:7741";
+const cacheDir = process.env.HF_VITE_CACHE_DIR?.trim() || undefined;
+export default defineConfig({
+  define: {
+    "import.meta.env.FOUNDRY_FRONTEND_CLIENT_MODE": JSON.stringify(process.env.FOUNDRY_FRONTEND_CLIENT_MODE?.trim() || "remote"),
+  },
+  plugins: [react()],
+  cacheDir,
+  resolve: {
+    alias: {
+      "@sandbox-agent/react": resolve(__dirname, "../../../sdks/react/dist/index.js"),
+    },
+  },
+  server: {
+    port: 4173,
+    proxy: {
+      "/v1": {
+        target: backendProxyTarget,
+        changeOrigin: true,
+      },
+    },
+  },
+  preview: {
+    port: 4173,
+  },
+});
diff --git a/foundry/packages/frontend/vitest.config.ts b/foundry/packages/frontend/vitest.config.ts
new file mode 100644
index 0000000..c1433e6
--- /dev/null
+++ b/foundry/packages/frontend/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    environment: "node",
+    include: ["src/**/*.test.ts"],
+  },
+});
diff --git a/foundry/packages/shared/package.json b/foundry/packages/shared/package.json
new file mode 100644
index 0000000..8d65361
--- /dev/null
+++ b/foundry/packages/shared/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@sandbox-agent/foundry-shared",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsup src/index.ts --format esm --dts --tsconfig tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "pino": "^10.3.1",
+    "sandbox-agent": "workspace:*",
+    "zod": "^4.1.5"
+  },
+  "devDependencies": {
+    "tsup": "^8.5.0"
+  }
+}
diff --git a/foundry/packages/shared/src/app-shell.ts b/foundry/packages/shared/src/app-shell.ts
new file mode 100644
index 0000000..fa1e969
--- /dev/null
+++ b/foundry/packages/shared/src/app-shell.ts
@@ -0,0 +1,112 @@
+import type { WorkspaceModelId } from "./workspace.js";
+
+export type FoundryBillingPlanId = "free" | "team";
+export type FoundryBillingStatus = "active" | "trialing" | "past_due" | "scheduled_cancel";
+export type FoundryGithubInstallationStatus = "connected" | "install_required" | "reconnect_required";
+export type FoundryGithubSyncStatus = "pending" | "syncing" | "synced" | "error";
+export type FoundryGithubSyncPhase =
+  | "discovering_repositories"
+  | "syncing_repositories"
+  | "syncing_branches"
+  | "syncing_members"
+  | "syncing_pull_requests";
+export type FoundryOrganizationKind = "personal" | "organization";
+export type FoundryStarterRepoStatus = "pending" | "starred" | "skipped";
+
+export interface FoundryUser {
+  id: string;
+  name: string;
+  email: string;
+  githubLogin: string;
+  roleLabel: string;
+  eligibleOrganizationIds: string[];
+  defaultModel: WorkspaceModelId;
+}
+
+export interface FoundryOrganizationMember {
+  id: string;
+  name: string;
+  email: string;
+  role: "owner" | "admin" | "member";
+  state: "active" | "invited";
+}
+
+export interface FoundryInvoice {
+  id: string;
+  label: string;
+  issuedAt: string;
+  amountUsd: number;
+  status: "paid" | "open";
+}
+
+export interface FoundryBillingState {
+  planId: FoundryBillingPlanId;
+  status: FoundryBillingStatus;
+  seatsIncluded: number;
+  trialEndsAt: string | null;
+  renewalAt: string | null;
+  stripeCustomerId: string;
+  paymentMethodLabel: string;
+  invoices: FoundryInvoice[];
+}
+
+export interface FoundryGithubState {
+  connectedAccount: string;
+  installationStatus: FoundryGithubInstallationStatus;
+  syncStatus: FoundryGithubSyncStatus;
+  importedRepoCount: number;
+  lastSyncLabel: string;
+  lastSyncAt: number | null;
+  lastWebhookAt: number | null;
+  lastWebhookEvent: string;
+  syncGeneration?: number;
+  syncPhase?: FoundryGithubSyncPhase | null;
+  processedRepositoryCount?: number;
+  totalRepositoryCount?: number;
+}
+
+export interface FoundryOrganizationSettings {
+  displayName: string;
+  slug: string;
+  primaryDomain: string;
+  seatAccrualMode: "first_prompt";
+  autoImportRepos: boolean;
+}
+
+export interface FoundryOrganization {
+  id: string;
+  organizationId: string;
+  kind: FoundryOrganizationKind;
+  settings: FoundryOrganizationSettings;
+  github: FoundryGithubState;
+  billing: FoundryBillingState;
+  members: FoundryOrganizationMember[];
+  seatAssignments: string[];
+  repoCatalog: string[];
+}
+
+export interface FoundryAppSnapshot {
+  auth: {
+    status: "signed_out" | "signed_in";
+    currentUserId: string | null;
+  };
+  activeOrganizationId: string | null;
+  onboarding: {
+    starterRepo: {
+      repoFullName: string;
+      repoUrl: string;
+      status: FoundryStarterRepoStatus;
+      starredAt: number | null;
+      skippedAt: number | null;
+    };
+  };
+  users: FoundryUser[];
+  organizations: FoundryOrganization[];
+}
+
+export interface UpdateFoundryOrganizationProfileInput {
+  organizationId: string;
+  displayName: string;
+  slug: string;
+  primaryDomain: string;
+}
diff --git a/foundry/packages/shared/src/config.ts b/foundry/packages/shared/src/config.ts
new file mode 100644
index 0000000..44ea722
--- /dev/null
+++ b/foundry/packages/shared/src/config.ts
@@ -0,0 +1,59 @@
+import { z } from "zod";
+
+export const AgentEnumSchema = z.enum(["claude", "codex"]);
+
+export const NotifyBackendSchema = z.enum(["openclaw", "macos-osascript", "linux-notify-send", "terminal"]);
+
+export const ConfigSchema = z.object({
+  theme: z.string().min(1).optional(),
+  auto_submit: z.boolean().default(false),
+  default_agent: AgentEnumSchema.default("codex"),
+  model: z
+    .object({
+      provider: z.string(),
+      model: z.string(),
+    })
+    .optional(),
+  notify: z.array(NotifyBackendSchema).default(["terminal"]),
+  organization: z
+    .object({
+      default: z.string().min(1).default("default"),
+    })
+    .default({ default: "default" }),
+  backend: z
+    .object({
+      host: z.string().default("127.0.0.1"),
+      port: z.number().int().min(1).max(65535).default(7741),
+      dbPath: z.string().default("~/.local/share/foundry/task.db"),
+      opencode_poll_interval: z.number().default(2),
+      github_poll_interval: z.number().default(30),
+      backup_interval_secs: z.number().default(3600),
+      backup_retention_days: z.number().default(7),
+    })
+    .default({
+      host: "127.0.0.1",
+      port: 7741,
+      dbPath: "~/.local/share/foundry/task.db",
+      opencode_poll_interval: 2,
+      github_poll_interval: 30,
+      backup_interval_secs: 3600,
+      backup_retention_days: 7,
+    }),
+  sandboxProviders: z
+    .object({
+      local: z
+        .object({
+          image: z.string().optional(),
+        })
+        .default({}),
+      e2b: z
+        .object({
+          apiKey: z.string().optional(),
+          template: z.string().optional(),
+        })
+        .default({}),
+    })
+    .default({ local: {}, e2b: {} }),
+});
+
+export type AppConfig = z.infer<typeof ConfigSchema>;
diff --git a/foundry/packages/shared/src/contracts.ts b/foundry/packages/shared/src/contracts.ts
new file mode 100644
index 0000000..8d2b382
--- /dev/null
+++ b/foundry/packages/shared/src/contracts.ts
@@ -0,0 +1,222 @@
+import { z } from "zod";
+
+export const OrganizationIdSchema = z
+  .string()
+  .min(1)
+  .max(64)
+  .regex(/^[a-zA-Z0-9._-]+$/);
+export type OrganizationId = z.infer<typeof OrganizationIdSchema>;
+
+export const SandboxProviderIdSchema = z.enum(["e2b", "local"]);
+export type SandboxProviderId = z.infer<typeof SandboxProviderIdSchema>;
+
+export const AgentTypeSchema = z.enum(["claude", "codex"]);
+export type AgentType = z.infer<typeof AgentTypeSchema>;
+
+export const RepoIdSchema = z.string().min(1).max(128);
+export type RepoId = z.infer<typeof RepoIdSchema>;
+
+export const RepoRemoteSchema = z.string().min(1).max(2048);
+export type RepoRemote = z.infer<typeof RepoRemoteSchema>;
+
+export const TaskStatusSchema = z.enum([
+  "init_bootstrap_db",
+  "init_enqueue_provision",
+  "init_ensure_name",
+  "init_assert_name",
+  "init_complete",
+  "running",
+  "idle",
+  "archive_stop_status_sync",
+  "archive_release_sandbox",
+  "archive_finalize",
+  "archived",
+  "kill_destroy_sandbox",
+  "kill_finalize",
+  "killed",
+  "error",
+]);
+export type TaskStatus = z.infer<typeof TaskStatusSchema>;
+
+export const RepoRecordSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: RepoIdSchema,
+  remoteUrl: RepoRemoteSchema,
+  createdAt: z.number().int(),
+  updatedAt: z.number().int(),
+});
+export type RepoRecord = z.infer<typeof RepoRecordSchema>;
+
+export const CreateTaskInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: RepoIdSchema,
+  task: z.string().min(1),
+  explicitTitle: z.string().trim().min(1).optional(),
+  explicitBranchName: z.string().trim().min(1).optional(),
+  sandboxProviderId: SandboxProviderIdSchema.optional(),
+  onBranch: z.string().trim().min(1).optional(),
+});
+export type CreateTaskInput = z.infer<typeof CreateTaskInputSchema>;
+
+export const WorkspacePullRequestSummarySchema = z.object({
+  number: z.number().int(),
+  status: z.enum(["draft", "ready"]),
+  title: z.string().min(1),
+  state: z.string().min(1),
+  url: z.string().min(1),
+  headRefName: z.string().min(1),
+  baseRefName: z.string().min(1),
+  repoFullName: z.string().min(1),
+  authorLogin: z.string().nullable(),
+  isDraft: z.boolean(),
+  updatedAtMs: z.number().int(),
+});
+
+export const TaskRecordSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: z.string().min(1),
+  repoRemote: RepoRemoteSchema,
+  taskId: z.string().min(1),
+  branchName: z.string().min(1).nullable(),
+  title: z.string().min(1).nullable(),
+  task: z.string().min(1),
+  sandboxProviderId: SandboxProviderIdSchema,
+  status: TaskStatusSchema,
+  activeSandboxId: z.string().nullable(),
+  pullRequest: WorkspacePullRequestSummarySchema.nullable(),
+  sandboxes: z.array(
+    z.object({
+      sandboxId: z.string().min(1),
+      sandboxProviderId: SandboxProviderIdSchema,
+      sandboxActorId: z.string().nullable(),
+      switchTarget: z.string().min(1),
+      cwd: z.string().nullable(),
+      createdAt: z.number().int(),
+      updatedAt: z.number().int(),
+    }),
+  ),
+  createdAt: z.number().int(),
+  updatedAt: z.number().int(),
+});
+export type TaskRecord = z.infer<typeof TaskRecordSchema>;
+
+export const TaskSummarySchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: z.string().min(1),
+  taskId: z.string().min(1),
+  branchName: z.string().min(1).nullable(),
+  title: z.string().min(1).nullable(),
+  status: TaskStatusSchema,
+  updatedAt: z.number().int(),
+  pullRequest: WorkspacePullRequestSummarySchema.nullable(),
+});
+export type TaskSummary = z.infer<typeof TaskSummarySchema>;
+
+export const TaskActionInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: RepoIdSchema,
+  taskId: z.string().min(1),
+});
+export type TaskActionInput = z.infer<typeof TaskActionInputSchema>;
+
+export const SwitchResultSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  taskId: z.string().min(1),
+  sandboxProviderId: SandboxProviderIdSchema,
+  switchTarget: z.string().min(1),
+});
+export type SwitchResult = z.infer<typeof SwitchResultSchema>;
+
+export const ListTasksInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: RepoIdSchema.optional(),
+});
+export type ListTasksInput = z.infer<typeof ListTasksInputSchema>;
+
+export const RepoBranchRecordSchema = z.object({
+  branchName: z.string().min(1),
+  commitSha: z.string(),
+  taskId: z.string().nullable(),
+  taskTitle: z.string().nullable(),
+  taskStatus: TaskStatusSchema.nullable(),
+  pullRequest: WorkspacePullRequestSummarySchema.nullable(),
+  ciStatus: z.string().nullable(),
+  updatedAt: z.number().int(),
+});
+export type RepoBranchRecord = z.infer<typeof RepoBranchRecordSchema>;
+
+export const RepoOverviewSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: RepoIdSchema,
+  remoteUrl: RepoRemoteSchema,
+  baseRef: z.string().nullable(),
+  fetchedAt: z.number().int(),
+  branches: z.array(RepoBranchRecordSchema),
+});
+export type RepoOverview = z.infer<typeof RepoOverviewSchema>;
+
+export const OrganizationUseInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+});
+export type OrganizationUseInput = z.infer<typeof OrganizationUseInputSchema>;
+
+export const StarSandboxAgentRepoInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+});
+export type StarSandboxAgentRepoInput = z.infer<typeof StarSandboxAgentRepoInputSchema>;
+
+export const StarSandboxAgentRepoResultSchema = z.object({
+  repo: z.string().min(1),
+  starredAt: z.number().int(),
+});
+export type StarSandboxAgentRepoResult = z.infer<typeof StarSandboxAgentRepoResultSchema>;
+
+export const HistoryQueryInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: z.string().min(1).optional(),
+  limit: z.number().int().positive().max(500).optional(),
+  branch: z.string().min(1).optional(),
+  taskId: z.string().min(1).optional(),
+});
+export type HistoryQueryInput = z.infer<typeof HistoryQueryInputSchema>;
+
+export const AuditLogEventSchema = z.object({
+  id: z.number().int(),
+  organizationId: OrganizationIdSchema,
+  repoId: z.string().nullable(),
+  taskId: z.string().nullable(),
+  branchName: z.string().nullable(),
+  kind: z.string().min(1),
+  payloadJson: z.string().min(1),
+  createdAt: z.number().int(),
+});
+export type AuditLogEvent = z.infer<typeof AuditLogEventSchema>;
+
+export const PruneInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  dryRun: z.boolean(),
+  yes: z.boolean(),
+});
+export type PruneInput = z.infer<typeof PruneInputSchema>;
+
+export const KillInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  repoId: RepoIdSchema,
+  taskId: z.string().min(1),
+  deleteBranch: z.boolean(),
+  abandon: z.boolean(),
+});
+export type KillInput = z.infer<typeof KillInputSchema>;
+
+export const StatuslineInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  format: z.enum(["table", "claude-code"]),
+});
+export type StatuslineInput = z.infer<typeof StatuslineInputSchema>;
+
+export const ListInputSchema = z.object({
+  organizationId: OrganizationIdSchema,
+  format: z.enum(["table", "json"]),
+  full: z.boolean(),
+});
+export type ListInput = z.infer<typeof ListInputSchema>;
diff --git a/foundry/packages/shared/src/index.ts b/foundry/packages/shared/src/index.ts
new file mode 100644
index 0000000..14eee7b
--- /dev/null
+++ b/foundry/packages/shared/src/index.ts
@@ -0,0 +1,8 @@
+export * from "./app-shell.js";
+export * from "./contracts.js";
+export * from "./config.js";
+export * from "./logging.js";
+export * from "./models.js";
+export * from "./realtime-events.js";
+export * from "./workspace.js";
+export * from "./organization.js";
diff --git a/foundry/packages/shared/src/logging.ts b/foundry/packages/shared/src/logging.ts
new file mode 100644
index 0000000..12e9abc
--- /dev/null
+++ b/foundry/packages/shared/src/logging.ts
@@ -0,0 +1,186 @@
+import { pino, type LogFn, type Logger, type LoggerOptions } from "pino";
+
+export interface FoundryLoggerOptions {
+  service: string;
+  bindings?: Record<string, unknown>;
+  level?: string;
+  format?: "json" | "logfmt";
+}
+
+type ProcessLike = {
+  env?: Record<string, string | undefined>;
+  stdout?: {
+    write?: (chunk: string) => unknown;
+  };
+};
+
+function resolveEnvVar(name: string): string | undefined {
+  const value = (globalThis as { process?: ProcessLike }).process?.env?.[name];
+  if (typeof value !== "string") {
+    return undefined;
+  }
+
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+
+function defaultLevel(): string {
+  return resolveEnvVar("FOUNDRY_LOG_LEVEL") ?? resolveEnvVar("LOG_LEVEL") ?? resolveEnvVar("RIVET_LOG_LEVEL") ?? "info";
+}
+
+function isBrowserRuntime(): boolean {
+  return typeof window !== "undefined" && typeof document !== "undefined";
+}
+
+function serializeLogValue(value: unknown): string | number | boolean | null {
+  if (value === undefined || value === null) {
+    return null;
+  }
+
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  }
+
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+
+  if (value instanceof Error) {
+    return JSON.stringify({
+      name: value.name,
+      message: value.message,
+      stack: value.stack,
+    });
+  }
+
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return "[unserializable]";
+  }
+}
+
+function formatLogfmtValue(value: string | number | boolean | null): string {
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+
+  const raw = value ?? "null";
+  if (raw.length > 0 && !/[\s="\\]/.test(raw)) {
+    return raw;
+  }
+
+  return `"${raw.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n")}"`;
+}
+
+function formatLogfmtLine(record: Record<string, unknown>): string {
+  return Object.entries(record)
+    .filter(([, value]) => value !== undefined)
+    .map(([key, value]) => `${key}=${formatLogfmtValue(serializeLogValue(value))}`)
+    .join(" ");
+}
+
+function stringifyMessagePart(value: unknown): string {
+  if (typeof value === "string") {
+    return value;
+  }
+
+  const serialized = serializeLogValue(value);
+  return typeof serialized === "string" ? serialized : String(serialized);
+}
+
+function buildLogRecord(level: string, bindings: Record<string, unknown>, args: Parameters<Logger["info"]>): Record<string, unknown> {
+  const record: Record<string, unknown> = {
+    time: new Date().toISOString(),
+    level,
+  };
+
+  for (const [key, value] of Object.entries(bindings)) {
+    if (key !== "time" && key !== "level" && key !== "msg" && value !== undefined) {
+      record[key] = value;
+    }
+  }
+
+  if (args.length === 0) {
+    return record;
+  }
+
+  const [first, ...rest] = args;
+  if (first && typeof first === "object") {
+    if (first instanceof Error) {
+      record.err = {
+        name: first.name,
+        message: first.message,
+        stack: first.stack,
+      };
+    } else {
+      for (const [key, value] of Object.entries(first)) {
+        if (key !== "time" && key !== "level" && key !== "msg" && value !== undefined) {
+          record[key] = value;
+        }
+      }
+    }
+
+    if (rest.length > 0) {
+      record.msg = rest.map(stringifyMessagePart).join(" ");
+    }
+
+    return record;
+  }
+
+  record.msg = [first, ...rest].map(stringifyMessagePart).join(" ");
+  return record;
+}
+
+function writeLogfmtLine(line: string): void {
+  const processLike = (globalThis as { process?: ProcessLike }).process;
+  if (processLike?.stdout?.write) {
+    processLike.stdout.write(`${line}\n`);
+    return;
+  }
+
+  console.log(line);
+}
+
+export function createFoundryLogger(options: FoundryLoggerOptions): Logger {
+  const browser = isBrowserRuntime();
+  const loggerOptions: LoggerOptions = {
+    level: options.level ?? defaultLevel(),
+    base: {
+      service: options.service,
+      ...(options.bindings ?? {}),
+    },
+  };
+
+  if (browser) {
+    loggerOptions.browser = {
+      asObject: true,
+    };
+  } else {
+    loggerOptions.timestamp = pino.stdTimeFunctions.isoTime;
+    if (options.format === "logfmt") {
+      loggerOptions.hooks = {
+        logMethod(this: Logger, args: Parameters<LogFn>, _method: LogFn, level: number) {
+          const levelLabel = this.levels.labels[level] ?? "info";
+          const record = buildLogRecord(levelLabel, this.bindings(), args);
+          writeLogfmtLine(formatLogfmtLine(record));
+        },
+      };
+    }
+  }
+
+  return pino(loggerOptions);
+}
+
+export function createErrorContext(error: unknown): { errorMessage: string; errorStack?: string } {
+  if (error instanceof Error) {
+    return {
+      errorMessage: error.message,
+      errorStack: error.stack,
+    };
+  }
+
+  return {
+    errorMessage: String(error),
+  };
+}
diff --git a/foundry/packages/shared/src/models.ts b/foundry/packages/shared/src/models.ts
new file mode 100644
index 0000000..a140a66
--- /dev/null
+++ b/foundry/packages/shared/src/models.ts
@@ -0,0 +1,217 @@
+import claudeConfig from "../../../../scripts/agent-configs/resources/claude.json" with { type: "json" };
+import codexConfig from "../../../../scripts/agent-configs/resources/codex.json" with { type: "json" };
+
+export type WorkspaceAgentKind = string;
+export type WorkspaceModelId = string;
+
+export interface WorkspaceModelOption {
+  id: WorkspaceModelId;
+  label: string;
+}
+
+export interface WorkspaceModelGroup {
+  provider: string;
+  agentKind: WorkspaceAgentKind;
+  sandboxAgentId: string;
+  models: WorkspaceModelOption[];
+}
+
+interface AgentConfigResource {
+  defaultModel?: string;
+  models?: Array<{ id?: string; name?: string }>;
+}
+
+interface SandboxAgentInfoLike {
+  id?: unknown;
+  configOptions?: unknown;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function normalizeModelLabel(model: { id?: string; name?: string }): string {
+  const name = model.name?.trim();
+  if (name && name.length > 0) {
+    return name;
+  }
+  return model.id?.trim() || "Unknown";
+}
+
+function buildGroup(provider: string, agentKind: WorkspaceAgentKind, sandboxAgentId: string, config: AgentConfigResource): WorkspaceModelGroup {
+  return {
+    provider,
+    agentKind,
+    sandboxAgentId,
+    models: (config.models ?? [])
+      .map((model) => {
+        const id = model.id?.trim();
+        if (!id) {
+          return null;
+        }
+        return {
+          id,
+          label: normalizeModelLabel(model),
+        };
+      })
+      .filter((model): model is WorkspaceModelOption => model != null),
+  };
+}
+
+function titleCaseIdentifier(value: string): string {
+  return value
+    .split(/[\s_-]+/)
+    .filter(Boolean)
+    .map((part) => part.slice(0, 1).toUpperCase() + part.slice(1))
+    .join(" ");
+}
+
+function workspaceAgentMetadata(agentId: string): { provider: string; agentKind: string } {
+  const normalized = agentId.trim().toLowerCase();
+  switch (normalized) {
+    case "claude":
+      return { provider: "Claude", agentKind: "Claude" };
+    case "codex":
+      return { provider: "Codex", agentKind: "Codex" };
+    default:
+      return {
+        provider: titleCaseIdentifier(agentId),
+        agentKind: titleCaseIdentifier(agentId),
+      };
+  }
+}
+
+function normalizeOptionLabel(entry: Record<string, unknown>): string | null {
+  const name = typeof entry.name === "string" ? entry.name.trim() : "";
+  if (name) {
+    return name;
+  }
+
+  const label = typeof entry.label === "string" ? entry.label.trim() : "";
+  if (label) {
+    return label;
+  }
+
+  const value = typeof entry.value === "string" ? entry.value.trim() : "";
+  return value || null;
+}
+
+function appendSelectOptionModels(target: WorkspaceModelOption[], options: unknown): void {
+  if (!Array.isArray(options)) {
+    return;
+  }
+
+  for (const entry of options) {
+    if (!isRecord(entry)) {
+      continue;
+    }
+
+    const value = typeof entry.value === "string" ? entry.value.trim() : "";
+    if (value) {
+      target.push({
+        id: value,
+        label: normalizeOptionLabel(entry) ?? value,
+      });
+      continue;
+    }
+
+    appendSelectOptionModels(target, entry.options);
+  }
+}
+
+function normalizeAgentModels(configOptions: unknown): WorkspaceModelOption[] {
+  if (!Array.isArray(configOptions)) {
+    return [];
+  }
+
+  const options = configOptions.find((entry) => isRecord(entry) && entry.category === "model" && entry.type === "select");
+  if (!isRecord(options)) {
+    return [];
+  }
+
+  const models: WorkspaceModelOption[] = [];
+  appendSelectOptionModels(models, options.options);
+
+  const seen = new Set<string>();
+  return models.filter((model) => {
+    if (!model.id || seen.has(model.id)) {
+      return false;
+    }
+    seen.add(model.id);
+    return true;
+  });
+}
+
+export function workspaceModelGroupsFromSandboxAgents(agents: SandboxAgentInfoLike[]): WorkspaceModelGroup[] {
+  return agents
+    .map((agent) => {
+      const sandboxAgentId = typeof agent.id === "string" ? agent.id.trim() : "";
+      if (!sandboxAgentId) {
+        return null;
+      }
+
+      const models = normalizeAgentModels(agent.configOptions);
+      if (models.length === 0) {
+        return null;
+      }
+
+      const metadata = workspaceAgentMetadata(sandboxAgentId);
+      return {
+        provider: metadata.provider,
+        agentKind: metadata.agentKind,
+        sandboxAgentId,
+        models,
+      } satisfies WorkspaceModelGroup;
+    })
+    .filter((group): group is WorkspaceModelGroup => group != null);
+}
+
+export const DEFAULT_WORKSPACE_MODEL_GROUPS: WorkspaceModelGroup[] = [
+  buildGroup("Claude", "Claude", "claude", claudeConfig as AgentConfigResource),
+  buildGroup("Codex", "Codex", "codex", codexConfig as AgentConfigResource),
+].filter((group) => group.models.length > 0);
+
+export const DEFAULT_WORKSPACE_MODEL_ID: WorkspaceModelId =
+  ((codexConfig as AgentConfigResource).defaultModel ?? DEFAULT_WORKSPACE_MODEL_GROUPS[0]?.models[0]?.id ?? "default").trim();
+
+export function workspaceProviderAgent(
+  provider: string,
+  groups: WorkspaceModelGroup[] = DEFAULT_WORKSPACE_MODEL_GROUPS,
+): WorkspaceAgentKind {
+  return groups.find((group) => group.provider === provider)?.agentKind ?? provider;
+}
+
+export function workspaceModelGroupForId(
+  id: WorkspaceModelId,
+  groups: WorkspaceModelGroup[] = DEFAULT_WORKSPACE_MODEL_GROUPS,
+): WorkspaceModelGroup | null {
+  return groups.find((group) => group.models.some((model) => model.id === id)) ?? null;
+}
+
+export function workspaceModelLabel(
+  id: WorkspaceModelId,
+  groups: WorkspaceModelGroup[] = DEFAULT_WORKSPACE_MODEL_GROUPS,
+): string {
+  const group = workspaceModelGroupForId(id, groups);
+  const model = group?.models.find((candidate) => candidate.id === id);
+  return model && group ? `${group.provider} ${model.label}` : id;
+}
+
+export function workspaceAgentForModel(
+  id: WorkspaceModelId,
+  groups: WorkspaceModelGroup[] = DEFAULT_WORKSPACE_MODEL_GROUPS,
+): WorkspaceAgentKind {
+  const group = workspaceModelGroupForId(id, groups);
+  if (group) {
+    return group.agentKind;
+  }
+  return groups[0]?.agentKind ?? "Claude";
+}
+
+export function workspaceSandboxAgentIdForModel(
+  id: WorkspaceModelId,
+  groups: WorkspaceModelGroup[] = DEFAULT_WORKSPACE_MODEL_GROUPS,
+): string {
+  const group = workspaceModelGroupForId(id, groups);
+  return group?.sandboxAgentId ?? groups[0]?.sandboxAgentId ?? "claude";
+}
diff --git a/foundry/packages/shared/src/organization.ts b/foundry/packages/shared/src/organization.ts
new file mode 100644
index 0000000..73e1867
--- /dev/null
+++ b/foundry/packages/shared/src/organization.ts
@@ -0,0 +1,13 @@
+import type { AppConfig } from "./config.js";
+
+export function resolveOrganizationId(flagOrganization: string | undefined, config: AppConfig): string {
+  if (flagOrganization && flagOrganization.trim().length > 0) {
+    return flagOrganization.trim();
+  }
+
+  if (config.organization.default.trim().length > 0) {
+    return config.organization.default.trim();
+  }
+
+  return "default";
+}
diff --git a/foundry/packages/shared/src/realtime-events.ts b/foundry/packages/shared/src/realtime-events.ts
new file mode 100644
index 0000000..2cb07e3
--- /dev/null
+++ b/foundry/packages/shared/src/realtime-events.ts
@@ -0,0 +1,31 @@
+import type { FoundryAppSnapshot } from "./app-shell.js";
+import type { OrganizationSummarySnapshot, WorkspaceSessionDetail, WorkspaceTaskDetail } from "./workspace.js";
+
+export interface SandboxProcessSnapshot {
+  id: string;
+  command: string;
+  args: string[];
+  createdAtMs: number;
+  cwd?: string | null;
+  exitCode?: number | null;
+  exitedAtMs?: number | null;
+  interactive: boolean;
+  pid?: number | null;
+  status: "running" | "exited";
+  tty: boolean;
+}
+
+/** Organization-level events broadcast by the organization actor. */
+export type OrganizationEvent = { type: "organizationUpdated"; snapshot: OrganizationSummarySnapshot };
+
+/** Task-level events broadcast by the task actor. */
+export type TaskEvent = { type: "taskUpdated"; detail: WorkspaceTaskDetail };
+
+/** Session-level events broadcast by the task actor and filtered by sessionId on the client. */
+export type SessionEvent = { type: "sessionUpdated"; session: WorkspaceSessionDetail };
+
+/** App-level events broadcast by the app organization actor. */
+export type AppEvent = { type: "appUpdated"; snapshot: FoundryAppSnapshot };
+
+/** Sandbox process events broadcast by the sandbox instance actor. */
+export type SandboxProcessesEvent = { type: "processesUpdated"; processes: SandboxProcessSnapshot[] };
diff --git a/foundry/packages/shared/src/workspace.ts b/foundry/packages/shared/src/workspace.ts
new file mode 100644
index 0000000..e33f189
--- /dev/null
+++ b/foundry/packages/shared/src/workspace.ts
@@ -0,0 +1,333 @@
+import type { SandboxProviderId, TaskStatus } from "./contracts.js";
+import type { WorkspaceAgentKind, WorkspaceModelGroup, WorkspaceModelId, WorkspaceModelOption } from "./models.js";
+
+export type WorkspaceTaskStatus = TaskStatus;
+export type WorkspaceSessionStatus = "pending_provision" | "pending_session_create" | "ready" | "running" | "idle" | "error";
+
+export type { WorkspaceAgentKind, WorkspaceModelGroup, WorkspaceModelId, WorkspaceModelOption } from "./models.js";
+
+export interface WorkspaceTranscriptEvent {
+  id: string;
+  eventIndex: number;
+  sessionId: string;
+  createdAt: number;
+  connectionId: string;
+  sender: "client" | "agent";
+  payload: unknown;
+}
+
+export interface WorkspaceComposerDraft {
+  text: string;
+  attachments: WorkspaceLineAttachment[];
+  updatedAtMs: number | null;
+}
+
+/** Session metadata without transcript content. */
+export interface WorkspaceSessionSummary {
+  id: string;
+  /** Stable UI session id used for routing and task-local identity. */
+  sessionId: string;
+  /** Underlying sandbox session id when provisioning has completed. */
+  sandboxSessionId?: string | null;
+  sessionName: string;
+  agent: WorkspaceAgentKind;
+  model: WorkspaceModelId;
+  status: WorkspaceSessionStatus;
+  thinkingSinceMs: number | null;
+  unread: boolean;
+  created: boolean;
+  errorMessage?: string | null;
+}
+
+/** Full session content — only fetched when viewing a specific session. */
+export interface WorkspaceSessionDetail {
+  /** Stable UI session id used for the session topic key and routing. */
+  sessionId: string;
+  sandboxSessionId: string | null;
+  sessionName: string;
+  agent: WorkspaceAgentKind;
+  model: WorkspaceModelId;
+  status: WorkspaceSessionStatus;
+  thinkingSinceMs: number | null;
+  unread: boolean;
+  created: boolean;
+  errorMessage?: string | null;
+  draft: WorkspaceComposerDraft;
+  transcript: WorkspaceTranscriptEvent[];
+}
+
+export interface WorkspaceFileChange {
+  path: string;
+  added: number;
+  removed: number;
+  type: "M" | "A" | "D";
+}
+
+export interface WorkspaceFileTreeNode {
+  name: string;
+  path: string;
+  isDir: boolean;
+  children?: WorkspaceFileTreeNode[];
+}
+
+export interface WorkspaceLineAttachment {
+  id: string;
+  filePath: string;
+  lineNumber: number;
+  lineContent: string;
+}
+
+export interface WorkspaceHistoryEvent {
+  id: string;
+  messageId: string;
+  preview: string;
+  sessionName: string;
+  sessionId: string;
+  createdAtMs: number;
+  detail: string;
+}
+
+export type WorkspaceDiffLineKind = "context" | "add" | "remove" | "hunk";
+
+export interface WorkspaceParsedDiffLine {
+  kind: WorkspaceDiffLineKind;
+  lineNumber: number;
+  text: string;
+}
+
+export interface WorkspacePullRequestSummary {
+  number: number;
+  status: "draft" | "ready";
+  title?: string;
+  state?: string;
+  url?: string;
+  headRefName?: string;
+  baseRefName?: string;
+  repoFullName?: string;
+  authorLogin?: string | null;
+  isDraft?: boolean;
+  updatedAtMs?: number;
+}
+
+export interface WorkspaceSandboxSummary {
+  sandboxProviderId: SandboxProviderId;
+  sandboxId: string;
+  cwd: string | null;
+  url: string | null;
+}
+
+/** Sidebar-level task data. Materialized in the organization actor's SQLite. */
+export interface WorkspaceTaskSummary {
+  id: string;
+  repoId: string;
+  title: string;
+  status: WorkspaceTaskStatus;
+  repoName: string;
+  updatedAtMs: number;
+  branch: string | null;
+  pullRequest: WorkspacePullRequestSummary | null;
+  activeSessionId: string | null;
+  /** Summary of sessions — no transcript content. */
+  sessionsSummary: WorkspaceSessionSummary[];
+  /** GitHub login of the current primary user (task owner). */
+  primaryUserLogin: string | null;
+  /** Avatar URL of the current primary user. */
+  primaryUserAvatarUrl: string | null;
+}
+
+/** Full task detail — only fetched when viewing a specific task. */
+export interface WorkspaceTaskDetail extends WorkspaceTaskSummary {
+  /** Original task prompt/instructions shown in the detail view. */
+  task: string;
+  fileChanges: WorkspaceFileChange[];
+  diffs: Record<string, string>;
+  fileTree: WorkspaceFileTreeNode[];
+  minutesUsed: number;
+  /** Sandbox info for this task. */
+  sandboxes: WorkspaceSandboxSummary[];
+  activeSandboxId: string | null;
+}
+
+/** Repo-level summary for organization sidebar. */
+export interface WorkspaceRepositorySummary {
+  id: string;
+  label: string;
+  /** Aggregated branch/task overview state (replaces getRepoOverview polling). */
+  taskCount: number;
+  latestActivityMs: number;
+}
+
+export type OrganizationGithubSyncPhase =
+  | "discovering_repositories"
+  | "syncing_repositories"
+  | "syncing_branches"
+  | "syncing_members"
+  | "syncing_pull_requests";
+
+export interface OrganizationGithubSummary {
+  connectedAccount: string;
+  installationStatus: "connected" | "install_required" | "reconnect_required";
+  syncStatus: "pending" | "syncing" | "synced" | "error";
+  importedRepoCount: number;
+  lastSyncLabel: string;
+  lastSyncAt: number | null;
+  lastWebhookAt: number | null;
+  lastWebhookEvent: string;
+  syncGeneration: number;
+  syncPhase: OrganizationGithubSyncPhase | null;
+  processedRepositoryCount: number;
+  totalRepositoryCount: number;
+}
+
+export interface WorkspaceOpenPullRequest {
+  repoId: string;
+  repoFullName: string;
+  number: number;
+  title: string;
+  status: string;
+  state: string;
+  url: string;
+  headRefName: string;
+  baseRefName: string;
+  authorLogin: string | null;
+  isDraft: boolean;
+}
+
+/** Organization-level snapshot — initial fetch for the organization topic. */
+export interface OrganizationSummarySnapshot {
+  organizationId: string;
+  github: OrganizationGithubSummary;
+  repos: WorkspaceRepositorySummary[];
+  taskSummaries: WorkspaceTaskSummary[];
+  openPullRequests?: WorkspaceOpenPullRequest[];
+}
+
+export interface WorkspaceSession extends WorkspaceSessionSummary {
+  draft: WorkspaceComposerDraft;
+  transcript: WorkspaceTranscriptEvent[];
+}
+
+export interface WorkspaceTask {
+  id: string;
+  repoId: string;
+  title: string;
+  status: WorkspaceTaskStatus;
+  repoName: string;
+  updatedAtMs: number;
+  branch: string | null;
+  pullRequest: WorkspacePullRequestSummary | null;
+  activeSessionId?: string | null;
+  sessions: WorkspaceSession[];
+  fileChanges: WorkspaceFileChange[];
+  diffs: Record<string, string>;
+  fileTree: WorkspaceFileTreeNode[];
+  minutesUsed: number;
+  sandboxes?: WorkspaceSandboxSummary[];
+  activeSandboxId?: string | null;
+  /** GitHub login of the current primary user (task owner). */
+  primaryUserLogin?: string | null;
+  /** Avatar URL of the current primary user. */
+  primaryUserAvatarUrl?: string | null;
+}
+
+export interface WorkspaceRepo {
+  id: string;
+  label: string;
+}
+
+export interface WorkspaceRepositorySection {
+  id: string;
+  label: string;
+  updatedAtMs: number;
+  tasks: WorkspaceTask[];
+}
+
+export interface TaskWorkspaceSnapshot {
+  organizationId: string;
+  repos: WorkspaceRepo[];
+  repositories: WorkspaceRepositorySection[];
+  tasks: WorkspaceTask[];
+}
+
+export interface TaskWorkspaceSelectInput {
+  repoId: string;
+  taskId: string;
+  authSessionId?: string;
+}
+
+export interface TaskWorkspaceCreateTaskInput {
+  repoId: string;
+  task: string;
+  title?: string;
+  branch?: string;
+  onBranch?: string;
+  model?: WorkspaceModelId;
+  authSessionId?: string;
+}
+
+export interface TaskWorkspaceRenameInput {
+  repoId: string;
+  taskId: string;
+  value: string;
+  authSessionId?: string;
+}
+
+export interface TaskWorkspaceSendMessageInput {
+  repoId: string;
+  taskId: string;
+  sessionId: string;
+  text: string;
+  attachments: WorkspaceLineAttachment[];
+  authSessionId?: string;
+}
+
+export interface TaskWorkspaceSessionInput {
+  repoId: string;
+  taskId: string;
+  sessionId: string;
+  authSessionId?: string;
+}
+
+export interface TaskWorkspaceRenameSessionInput extends TaskWorkspaceSessionInput {
+  title: string;
+}
+
+export interface TaskWorkspaceChangeModelInput extends TaskWorkspaceSessionInput {
+  model: WorkspaceModelId;
+}
+
+export interface TaskWorkspaceUpdateDraftInput extends TaskWorkspaceSessionInput {
+  text: string;
+  attachments: WorkspaceLineAttachment[];
+}
+
+export interface TaskWorkspaceSetSessionUnreadInput extends TaskWorkspaceSessionInput {
+  unread: boolean;
+}
+
+export interface TaskWorkspaceChangeOwnerInput {
+  repoId: string;
+  taskId: string;
+  /** User ID of the target owner (from FoundryOrganizationMember.id). */
+  targetUserId: string;
+  /** Display name to use as fallback if GitHub login cannot be resolved. */
+  targetUserName: string;
+  /** Email to use as fallback if GitHub email cannot be resolved. */
+  targetUserEmail: string;
+  authSessionId?: string;
+}
+
+export interface TaskWorkspaceDiffInput {
+  repoId: string;
+  taskId: string;
+  path: string;
+}
+
+export interface TaskWorkspaceCreateTaskResponse {
+  taskId: string;
+  sessionId?: string;
+}
+
+export interface TaskWorkspaceAddSessionResponse {
+  sessionId: string;
+}
diff --git a/foundry/packages/shared/test/logging.test.ts b/foundry/packages/shared/test/logging.test.ts
new file mode 100644
index 0000000..a6714e8
--- /dev/null
+++ b/foundry/packages/shared/test/logging.test.ts
@@ -0,0 +1,29 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { createFoundryLogger } from "../src/logging.js";
+
+describe("createFoundryLogger", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("emits logfmt output when requested", () => {
+    const writes: string[] = [];
+    const write = vi.fn((chunk: string | Uint8Array) => {
+      writes.push(typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8"));
+      return true;
+    });
+    vi.spyOn(process.stdout, "write").mockImplementation(write as typeof process.stdout.write);
+
+    const logger = createFoundryLogger({
+      service: "foundry-backend",
+      format: "logfmt",
+    }).child({
+      requestId: "req-123",
+    });
+
+    logger.info({ count: 2, nested: { ok: true } }, "backend started");
+
+    expect(write).toHaveBeenCalledTimes(1);
+    expect(writes[0]).toMatch(/^time=\S+ level=info service=foundry-backend requestId=req-123 count=2 nested="\{\\"ok\\":true\}" msg="backend started"\n$/);
+  });
+});
diff --git a/foundry/packages/shared/test/organization.test.ts b/foundry/packages/shared/test/organization.test.ts
new file mode 100644
index 0000000..f1cd3f6
--- /dev/null
+++ b/foundry/packages/shared/test/organization.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+import { ConfigSchema, resolveOrganizationId, type AppConfig } from "../src/index.js";
+
+const cfg: AppConfig = ConfigSchema.parse({
+  auto_submit: true,
+  notify: ["terminal"],
+  organization: { default: "team-a" },
+  backend: {
+    host: "127.0.0.1",
+    port: 7741,
+    dbPath: "~/.local/share/foundry/task.db",
+    opencode_poll_interval: 2,
+    github_poll_interval: 30,
+    backup_interval_secs: 3600,
+    backup_retention_days: 7,
+  },
+  sandboxProviders: {
+    local: {},
+    e2b: {},
+  },
+});
+
+describe("resolveOrganizationId", () => {
+  it("prefers explicit flag", () => {
+    expect(resolveOrganizationId("feature", cfg)).toBe("feature");
+  });
+
+  it("falls back to config default", () => {
+    expect(resolveOrganizationId(undefined, cfg)).toBe("team-a");
+  });
+
+  it("falls back to literal default when config value is empty", () => {
+    const empty = {
+      ...cfg,
+      organization: { default: "" },
+    } as AppConfig;
+
+    expect(resolveOrganizationId(undefined, empty)).toBe("default");
+  });
+});
diff --git a/foundry/packages/shared/tsconfig.build.json b/foundry/packages/shared/tsconfig.build.json
new file mode 100644
index 0000000..35bcdb2
--- /dev/null
+++ b/foundry/packages/shared/tsconfig.build.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "ignoreDeprecations": "6.0"
+  }
+}
diff --git a/foundry/packages/shared/tsconfig.json b/foundry/packages/shared/tsconfig.json
new file mode 100644
index 0000000..ae5ba21
--- /dev/null
+++ b/foundry/packages/shared/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src", "test"]
+}
diff --git a/foundry/railway.toml b/foundry/railway.toml
new file mode 100644
index 0000000..599bb99
--- /dev/null
+++ b/foundry/railway.toml
@@ -0,0 +1,7 @@
+[build]
+builder = "DOCKERFILE"
+dockerfilePath = "Dockerfile"
+
+[deploy]
+restartPolicyType = "ON_FAILURE"
+restartPolicyMaxRetries = 10
diff --git a/foundry/research/friction/general.mdx b/foundry/research/friction/general.mdx
new file mode 100644
index 0000000..fce920b
--- /dev/null
+++ b/foundry/research/friction/general.mdx
@@ -0,0 +1,387 @@
+# General Friction Log
+
+## 2026-03-13 - uncommitted
+
+### What I Was Working On
+
+Debugging slow GitHub OAuth sign-in in production after deploying backend request logging (d0ed0a4).
+
+### Friction / Issue
+
+Production logs showed two separate HTTP requests (different request IDs, ~9s apart) hitting `GET /v1/auth/github/callback` with the same `code` and `state` parameters. The first request succeeded (`exchangeCode` returned a token) but took ~18s total due to `syncGithubSessionFromToken` making multiple sequential GitHub API calls. The second request arrived while the first was still syncing, passed the oauth state validation (state was never cleared), and attempted `exchangeCode` with the already-consumed code, which GitHub rejected with `bad_verification_code`.
+
+The root cause of the duplicate HTTP request is unknown. It is not `appWorkspaceAction` (no retry logic in the current version), not Railway proxy retry (no such config), and not a frontend double-navigation (the SPA is not involved during the OAuth redirect chain). Best hypothesis is the user refreshing during the ~18s blank page wait, but unconfirmed.
+
+### Attempted Fix / Workaround
+
+1. Made `completeAppGithubAuth` clear `oauthState`/`oauthStateExpiresAt` immediately after validation and before `exchangeCode`, so any duplicate request fails the state check instead of hitting GitHub with a consumed code.
+2. Split `syncGithubSessionFromToken` into a fast path (`initGithubSession` — exchange code, get viewer, store token+identity) and a slow path (`syncGithubOrganizations` — list orgs, list installations, sync each organization).
+3. `completeAppGithubAuth` now uses the fast path and enqueues the slow org sync to the organization workflow queue (`organization.command.syncGithubSession`, fire-and-forget). The HTTP callback returns a 302 redirect in ~2s instead of ~18s, eliminating the proxy timeout window.
+4. The frontend already polls `getAppSnapshot` every 500ms when any org has `syncStatus === "syncing"`, so the deferred sync is transparent to the user.
+5. `bootstrapAppGithubSession` (dev-only) still calls the full synchronous `syncGithubSessionFromToken` since proxy timeouts are not a concern in dev and it needs the session fully populated before returning.
+
+### Outcome
+
+- OAuth callback responds in ~2s (exchangeCode + getViewer) instead of ~18s.
+- Proxy retry window is eliminated — no duplicate requests should occur.
+- Duplicate requests are still guarded by the state-clearing idempotency check.
+- Organization data populates asynchronously via the workflow queue; the frontend shows loading state and polls until complete.
+- Root cause of the duplicate HTTP request (likely Railway/Cloudflare proxy retry on slow GET) remains uninvestigated but is no longer a practical problem.
+
+## 2026-03-05 - uncommitted
+
+### What I Was Working On
+
+Verifying the BaseUI frontend against the real `rivet-dev/sandbox-agent-testing` repo, creating live PR-backed tasks, and driving the flow through the browser.
+
+### Friction / Issue
+
+Three separate issues stacked together during live verification:
+
+1. A half-created task actor remained in repository indexes after earlier runtime failures. The actor state existed, but its durable task row did not, so repo overview polling spammed `Task not found` and kept trying to load an orphaned task.
+2. Rebuilding the backend container outside `just dev` dropped injected GitHub auth, which made repo overview fall back to `Open PRs 0` until `GITHUB_TOKEN`/`GH_TOKEN` were passed back into `docker compose`.
+3. In the create-task modal, the BaseUI-controlled form looked populated in the browser, but submit gating/click behavior was unreliable under browser automation, making it hard to distinguish frontend state bugs from backend failures.
+
+### Attempted Fix / Workaround
+
+1. Updated repository-actor stale task pruning to treat `Task not found:` the same as actor-not-found and rebuilt the backend image.
+2. Recovered the orphaned task by forcing an initialize attempt, which surfaced a missing `body?.providerId` guard in the task init workflow and led to pruning the stale repository index row.
+3. Recreated the backend with `GITHUB_TOKEN="$(gh auth token)" GH_TOKEN="$(gh auth token)" docker compose ... up -d --build backend` so PR sync could see live GitHub data again.
+4. Used `agent-browser` plus screenshots to separate working paths (repo overview + PR visibility) from the remaining broken path (modal submit / task creation UI).
+
+### Outcome
+
+- Live repo overview now shows the real `sandbox-agent-testing` PRs again.
+- The stale task actor no longer blocks repo overview polling.
+- The remaining blocker is narrowed to the frontend create-task interaction path, plus missing agent API credentials for exercising real agent messaging end to end.
+
+## 2026-03-06 - uncommitted
+
+### What I Was Working On
+
+Exercising the live selected-task UI end to end, including session creation, prompt send, and agent response rendering.
+
+### Friction / Issue
+
+The Docker dev backend container was starting on Bun `1.2.23` and accepting TCP connections on `7741`/`7750`, but every HTTP request stalled indefinitely. The same backend code responded immediately when started directly on the host with Bun `1.3.5`, so the hang was specific to the older Bun runtime in `docker/backend.dev.Dockerfile`.
+
+### Attempted Fix / Workaround
+
+1. Verified the stall both from the host and from inside the backend container with `curl`/`fetch`.
+2. Started the backend directly on the host on an alternate port to confirm the code path itself was healthy.
+3. Updated the dev backend image base from `oven/bun:1.2` to `oven/bun:1.3` so `docker compose` uses the working Bun line.
+
+### Outcome
+
+- Dev-runtime debugging is narrowed from "backend/UI path is broken" to a concrete Docker Bun version issue.
+- After rebuild, the next verification step is the real selected-task transcript flow with agent messaging.
+
+## 2026-02-17 - uncommitted
+
+### What I Was Working On
+
+Implementing Daytona snapshot-based sandbox creation and running required organization validation.
+
+### Friction / Issue
+
+The organization `node_modules` tree is partially root-owned in this environment. `pnpm install`/cleanup failed with `EACCES` and left missing local tool entrypoints (for example `turbo`/`typescript`), which blocked `pnpm -w typecheck/build/test` from running end-to-end.
+
+### Attempted Fix / Workaround
+
+1. Attempted organization reinstall (`pnpm install`, `CI=true pnpm install`) and package-level reinstall.
+2. Attempted cleanup/recreate of `node_modules`, but root-owned files could not be removed.
+3. Added temporary local shims for missing tool entrypoints to continue targeted validation.
+
+### Outcome
+
+- Daytona-specific changes and backend tests were validated.
+- Full organization validation remains blocked until `node_modules` ownership is repaired (or container is recreated).
+
+## 2026-02-16 - uncommitted
+
+### What I Was Working On
+
+Implementing git-spice-backed stack actions and repo overview in the frontend/actors.
+
+### Friction / Issue
+
+The `gs` binary on this environment resolves to Ghostscript (`/usr/bin/gs`), not git-spice. Relying on `gs` directly would execute the wrong tool and silently break stack actions.
+
+### Attempted Fix / Workaround
+
+1. Added git-spice command resolution that tries:
+   - `HF_GIT_SPICE_BIN` override
+   - `git-spice`
+   - `git spice` (git plugin form)
+2. Avoided `gs` as a default executable.
+3. Added explicit unavailability messaging when git-spice is not installed.
+
+### Outcome
+
+- Stack actions no longer depend on ambiguous `gs` resolution.
+- Backend behavior is predictable across environments with/without git-spice installed.
+
+## 2026-02-12 - c2517f2
+
+### What I Was Working On
+
+Fixing Daytona `hf create` failures where `task.attach` would exhaust retries with `Task not found`.
+
+### Friction / Issue
+
+Foundry was using RivetKit's KV-backed durable SQLite VFS via `rivetkit/db/drizzle`, which opens the SQLite DB keyed by `ctx.actorId`. Since actor instances can be rescheduled (new `actorId`) between requests, DB writes from initialization were not visible to later actions (e.g. `attach`), causing “Task not found” errors and action timeouts.
+
+Separately, importing `bun:sqlite` directly broke:
+
+- `tsup` builds (esbuild can't resolve `bun:sqlite` unless externalized)
+- `vitest` runs (Vite resolver can't resolve `bun:` specifiers)
+
+### Attempted Fix / Workaround
+
+- Switched backend actor DB provider to a shared on-disk SQLite database at `config.backend.dbPath` using Bun's `bun:sqlite` + Drizzle, with inline migrations and per-connection PRAGMAs.
+- Hid Bun-only module resolution behind dynamic imports so `vitest` can load modules.
+- Used the KV-backed DB provider only for Node/Vitest environments (tests), while Bun runtime uses the shared on-disk DB.
+
+### Outcome
+
+- Daytona `hf create` now completes and returns a valid session and `daytona://...` target.
+- `pnpm -w typecheck`, `pnpm -w build`, and `pnpm -w test` are green.
+
+## 2026-02-09 - uncommitted
+
+### What I Was Working On
+
+Making `hf`/backend Bun-native and integrating OpenTUI without a Node fallback path.
+
+### Friction / Issue
+
+OpenTUI (`@opentui/core`) could not run under Node due Bun-specific imports/assets (`bun:ffi`, `.scm` module loading), which broke `hf` default interactive mode.
+
+### Attempted Fix / Workaround
+
+1. Removed runtime assumptions that backend/CLI would execute under Node.
+2. Switched CLI entrypoint and backend launch commands to Bun.
+3. Updated docs and tooling guidance to require Bun for runtime execution.
+
+### Outcome
+
+- OpenTUI remains the single TUI path.
+- Runtime expectations are explicit: Bun is required for `hf` interactive execution.
+
+## 2026-02-09 - uncommitted
+
+### What I Was Working On
+
+Implementing `hf` backend auto-ensure/auto-restart-on-outdated behavior and adding CLI tests for backend lifecycle logic.
+
+### Friction / Issue
+
+Vitest ESM module namespace exports are non-configurable, so `vi.spyOn(childProcess, "spawn")` failed when testing backend launch behavior.
+
+### Attempted Fix / Workaround
+
+1. Replaced direct `spyOn` with a hoisted `vi.mock("node:child_process", ...)`.
+2. Injected mocked `spawn`/`execFileSync` via the module mock.
+3. Updated tests to assert lifecycle behavior through the mocked module functions.
+
+### Outcome
+
+- Backend manager tests are stable under ESM.
+- Full organization tests pass with lifecycle coverage for outdated-backend restart behavior.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Finalizing migration implementation and validation across code, docs, and tests.
+
+### Friction / Issue
+
+The environment did not provide `rg`, and docs/policy files still described Rust-era workflows after runtime migration.
+
+### Attempted Fix / Workaround
+
+1. Switched repository discovery to `find`/`grep`.
+2. Rewrote repository guidance files (`CLAUDE.md`, `skills/SKILL.md`, docs, `SPEC.md`) to match the TypeScript architecture.
+3. Added missing TUI test coverage so monorepo-wide test runs no longer fail on packages without tests.
+
+### Outcome
+
+- Full workflow is now documented around TypeScript + pnpm + Turborepo + RivetKit actors.
+- Validation pipeline is runnable with one consistent command set.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Running full organization test validation (`pnpm -w test`) for the migrated monorepo.
+
+### Friction / Issue
+
+Backend integration tests depend on native `better-sqlite3` bindings, which were unavailable in this environment.
+
+### Attempted Fix / Workaround
+
+1. Attempted `pnpm --filter @sandbox-agent/foundry-backend rebuild better-sqlite3`.
+2. Added runtime capability detection in DB-backed backend tests.
+3. Marked DB-backed tests with `it.skipIf(!hasBetterSqliteBinding)` so tests run when native bindings exist and skip cleanly otherwise.
+
+### Outcome
+
+- Full organization test suite passes consistently.
+- Backend unit coverage always runs; DB integration tests run automatically on environments with native bindings.
+
+## 2026-02-09 - aab1012 (working tree)
+
+### What I Was Working On
+
+Cleaning up CLI UX noise while validating `hf` flows repeatedly.
+
+### Friction / Issue
+
+Bun emitted a warning on every `hf` invocation due unsupported wildcard `sideEffects` patterns in vendored RivetKit `package.json`.
+
+### Attempted Fix / Workaround
+
+1. Replaced wildcard `sideEffects` array in `packages/rivetkit-vendor/rivetkit/package.json` with `false`.
+
+### Outcome
+
+- Per-command warning spam is gone.
+- `hf` command output is now readable during normal usage and smoke testing.
+
+## 2026-02-09 - aab1012 (working tree)
+
+### What I Was Working On
+
+Fixing `hf` launch behavior after `just install` when OpenTUI assets were loaded under Node.
+
+### Friction / Issue
+
+Global launcher resolution depended on pnpm global bin + shell PATH state. In environments where Bun was not on PATH (or where another `hf` shim was used), CLI could execute under Node and fail with:
+
+- `Unknown file extension ".scm"` from `@opentui/core/assets/...`
+
+### Attempted Fix / Workaround
+
+1. Updated `just install` to install a deterministic launcher at `~/.local/bin/hf`.
+2. Launcher explicitly resolves Bun from `$HF_BUN` or `~/.bun/bin/bun` (with `command -v bun` fallback).
+3. Launcher exits with a clear Bun-required error if Bun is unavailable.
+
+### Outcome
+
+- `hf` runs through Bun consistently after install, independent of pnpm global-bin PATH quirks.
+- OpenTUI `.scm` asset load no longer goes through Node.
+
+## 2026-02-09 - aab1012 (working tree)
+
+### What I Was Working On
+
+Eliminating `.scm` loader failures when `hf` is accidentally launched via Node.
+
+### Friction / Issue
+
+Even with Bun-first install scripts, user shells can still invoke `hf` through stale/hash/alias Node-based launch paths, causing OpenTUI asset load failure:
+
+- `ERR_UNKNOWN_FILE_EXTENSION .scm`
+
+### Attempted Fix / Workaround
+
+1. Added CLI bootstrap guard in `packages/cli/src/index.ts`:
+   - If runtime is not Bun, re-exec with Bun (`$HF_BUN`, `~/.bun/bin/bun`, then `bun` on PATH).
+2. Deferred OpenTUI import to dynamic import (`import("./tui.js")`) so Node can reach the bootstrap guard before loading OpenTUI assets.
+
+### Outcome
+
+- `node packages/cli/dist/index.js --help` now works (auto re-execs to Bun).
+- `.scm` extension crash path is eliminated even when launcher is Node-based.
+
+## 2026-02-17 - uncommitted
+
+### What I Was Working On
+
+Validating new git-spice stack integration tests under `HF_ENABLE_ACTOR_INTEGRATION_TESTS=1`.
+
+### Friction / Issue
+
+Running backend tests with the integration flag enabled triggered unrelated actor integration suites and produced long noisy failures (`Failed query ...`, `memory access out of bounds`) unrelated to the stack changes, making targeted validation difficult.
+
+### Attempted Fix / Workaround
+
+1. Switched to package-targeted test runs for deterministic coverage (`@sandbox-agent/foundry-backend` + `@sandbox-agent/foundry-frontend`).
+2. Relied on required organization validation (`pnpm -w typecheck`, `pnpm -w build`, `pnpm -w test`) plus targeted stack test files.
+3. Stopped the runaway integration run and recorded this friction for follow-up.
+
+### Outcome
+
+- New stack-focused tests pass in deterministic targeted runs.
+- Full required organization checks pass.
+- Integration-gated suite remains noisy and needs separate stabilization.
+
+## 2026-03-05 - uncommitted
+
+### What I Was Working On
+
+Reviewing architecture for simplification opportunities.
+
+### Friction / Issue
+
+Considered merging `repositoryPrSync` (30s) and `repositoryBranchSync` (5s) into a single `repositorySync` actor that polls at the faster cadence and does PR fetches every Nth tick. This would reduce actor count by one per repo but violates the single-responsibility-per-actor pattern established in the codebase. Mixed cadences within one actor add conditional tick logic, make the polling intervals harder to reason about independently, and couple two unrelated data sources (git branches vs GitHub API) into one failure domain.
+
+### Attempted Fix / Workaround
+
+None — rejected the idea during review.
+
+### Outcome
+
+- Keep `repositoryPrSync` and `repositoryBranchSync` as separate actors.
+- Single-responsibility-per-sync-actor is the right pattern for this codebase.
+
+## 2026-03-06 - 77341ff
+
+### What I Was Working On
+
+Bringing up the Docker-based local dev stack with `just dev` after the BaseUI frontend migration.
+
+### Friction / Issue
+
+Docker Desktop recovered, but the frontend container failed immediately with `Cannot find module @rollup/rollup-linux-arm64-gnu`. The dev compose setup bind-mounted the host organization into `/app`, so the Linux container picked up macOS `node_modules` and missed Rollup's Linux optional package.
+
+### Attempted Fix / Workaround
+
+1. Confirmed Docker itself was healthy again by checking the Unix socket, `docker version`, and the backend health endpoint.
+2. Reproduced the frontend crash inside `docker compose`.
+3. Changed the frontend dev service to use named volumes for organization `node_modules` and the pnpm store, and to run `pnpm install --frozen-lockfile` inside the container before starting Vite.
+
+### Outcome
+
+- Docker engine startup was restored.
+- The compose stack no longer depends on host-architecture frontend dependencies.
+- `just dev` can proceed to start the backend and Linux-native frontend services cleanly.
+
+## 2026-03-06 - uncommitted
+
+### What I Was Working On
+
+Verifying the selected-task UI flow end to end in the browser: create repo, create task, select the task, start an agent session, and send a follow-up message.
+
+### Friction / Issue
+
+Local dev hit three stacked runtime issues during live UI verification:
+
+1. The frontend’s Vite proxy and the backend/manager startup order were brittle enough that `/api/rivet/metadata` or the manager port `7750` could briefly hang or refuse connections during restarts, which made browser verification look flaky even when the backend eventually came up.
+2. The new local sandbox provider initially persisted only the sandbox-agent endpoint, not its bearer token, so ACP session creation later failed with `401 Token Invalid`.
+3. The exported local `OPENAI_API_KEY` / `CODEX_API_KEY` credentials came from local ChatGPT/Codex auth state but did not include the `api.responses.write` scope required by Codex ACP, so the agent session could start but failed when the model tried to answer.
+
+### Attempted Fix / Workaround
+
+1. Added permissive CORS on the backend wrapper and iterated on live browser verification until the wrapper + manager startup sequence was stable again.
+2. Updated the local provider to return both sandbox-agent `endpoint` and `token`.
+3. Updated `sandbox-instance` to refresh local-provider agent credentials instead of trusting stale persisted metadata across backend restarts.
+4. Stopped injecting `OPENAI_API_KEY` / `CODEX_API_KEY` into the host-local sandbox-agent process so local Codex can fall back to machine-native auth instead of the under-scoped exported token.
+
+### Outcome
+
+- The browser flow now reaches the real selected-task transcript screen.
+- Task creation and initial session creation work in the UI against the local provider.
+- A remaining upstream auth/runtime blocker still prevents a clean verified assistant text response in the final follow-up-message step, so that part of the end-to-end flow is not yet reliable enough to claim complete.
diff --git a/foundry/research/friction/rivet.mdx b/foundry/research/friction/rivet.mdx
new file mode 100644
index 0000000..a2e4649
--- /dev/null
+++ b/foundry/research/friction/rivet.mdx
@@ -0,0 +1,757 @@
+# Rivet Friction Log
+
+## 2026-03-12 - 63df393
+
+### What I Was Working On
+
+Resolving GitHub OAuth callback failures caused by stale actor state after squashing Drizzle migrations.
+
+### Friction / Issue
+
+1. **Squashing Drizzle migrations breaks existing actors on Rivet Cloud.** When Drizzle migrations are squashed into a new baseline (`0000_*.sql`), the squashed migration has a different hash/name than the original migrations tracked in each actor's `__drizzle_migrations` journal table. On next wake, Drizzle sees the squashed baseline as a "new" migration and attempts to re-run `CREATE TABLE` statements, which fail because the tables already exist. This silently poisons the actor — RivetKit wraps the migration error as a generic "Internal error" on the action response, making root-cause diagnosis difficult.
+
+2. **No programmatic way to list or destroy actors on Rivet Cloud without the service key.** The public runner token (`pk_*`) lacks permissions for actor management (list/destroy). The Cloud API token (`cloud_api_*`) in our `.env` was returning "token not found". The actual working token format is the service key (`sk_*`) from the namespace connection URL. This was not documented — the destroy docs reference "admin tokens" which are described as "currently not supported on Rivet Cloud" ([#3530](https://github.com/rivet-dev/rivet/issues/3530)), but the `sk_*` token works. The disconnect between the docs and reality cost significant debugging time.
+
+3. **Actor errors during `getOrCreate` are opaque.** When the `organization.completeAppGithubAuth` action triggered `getOrCreate` for org organization actors, the migration failure inside the newly-woken actor was surfaced as `"Internal error"` with no indication that it was a migration/schema issue. The actual error (`table already exists`) was only visible in actor-level logs, not in the action response or the calling backend's logs.
+
+### Attempted Fix / Workaround
+
+1. Initially tried adding `IF NOT EXISTS` to all `CREATE TABLE`/`CREATE UNIQUE INDEX` statements in the squashed baseline migrations. This masked the symptom but violated Drizzle's migration tracking contract — the journal would still be inconsistent.
+
+2. Reverted the `IF NOT EXISTS` hack and instead destroyed all stale actors via the Rivet Cloud API (`DELETE /actors/{actorId}?namespace={ns}` with the `sk_*` service key). Fresh actors get a clean migration journal matching the squashed baseline.
+
+### Outcome
+
+- All 4 stale organization actors destroyed (3 org organizations + 1 old v2-prefixed app organization).
+- Reverted `IF NOT EXISTS` migration changes so Drizzle migrations remain standard.
+- After redeploy, new actors will be created fresh with the correct squashed migration journal.
+- **RivetKit improvement opportunities:**
+  - Surface migration errors in action responses instead of generic "Internal error".
+  - Document the `sk_*` service key as the correct token for actor management API calls, or make `cloud_api_*` tokens work.
+  - Consider a migration reconciliation mode for Drizzle actors that detects "tables exist but journal doesn't match" and adopts the current schema state instead of failing.
+
+## 2026-02-18 - uncommitted
+
+### What I Was Working On
+
+Debugging tasks stuck in `init_create_sandbox` and diagnosing why failures were not obvious in the UI.
+
+### Friction / Issue
+
+1. Workflow failure detection is opaque during long-running provisioning steps: the task can remain in a status (for example `init_create_sandbox`) without clear indication of whether it is still progressing, stalled, or failed-but-unsurfaced.
+2. Frontend monitoring of current workflow state is too coarse for diagnosis: users can see a status label but not enough live step-level context (last progress timestamp, in-flight substep, provider command phase, or timeout boundary) to understand what is happening.
+
+### Attempted Fix / Workaround
+
+1. Correlated task status/history with backend logs and provider-side sandbox state to determine where execution actually stopped.
+2. Manually probed provider behavior outside the workflow to separate Daytona resource creation from provider post-create initialization.
+
+### Outcome
+
+- Root cause analysis required backend log inspection and direct provider probing; frontend status alone was insufficient to diagnose stuck workflow state.
+- Follow-up needed: add first-class progress/error telemetry to workflow state and surface it in the frontend in real time.
+
+## 2026-02-18 - uncommitted
+
+### What I Was Working On
+
+Root-causing tasks stuck in `init_create_session` / missing transcripts and archive actions hanging during codex Daytona E2E.
+
+### Friction / Issue
+
+1. Actor identity drift: runtime session data was written under one `sandbox-instance` actor identity, but later reads were resolved through a different handle path, producing empty/missing transcript views.
+2. Handle selection semantics were too permissive: using create-capable resolution patterns in non-provisioning paths made it easier to accidentally resolve the wrong actor instance when identity assumptions broke.
+3. Existing timeouts were present but insufficient for UX correctness:
+   - Step/activity timeouts only bound one step, but did not guarantee fast user-facing completion for archive.
+   - Provider release in archive was still awaited synchronously, so archive calls could stall even when final archive state could be committed immediately.
+
+### Attempted Fix / Workaround
+
+1. Persisted sandbox actor identity and exposed it via contracts/records, then added actor-id fallback resolution in client sandbox APIs.
+2. Codified actor-handle pattern: use `get`/`getForId` for expected-existing actors; reserve `getOrCreate` for explicit provisioning flows.
+3. Changed archive command behavior so the action returns immediately after archive finalization while sandbox release continues best-effort in the background.
+4. Expanded codex E2E timing envelope for cold Daytona provisioning and validated transcript + archive behavior in real backend E2E.
+
+### Outcome
+
+- New tasks now resolve session/event reads against the correct actor identity, restoring transcript continuity.
+- Archive no longer hangs user-facing action completion on slow provider teardown.
+- Patterns are now documented in `AGENTS.md`/`PRD.md` to prevent reintroducing the same class of bug.
+- Follow-up: update the RivetKit skill guidance to explicitly teach `get` vs `create` workflow intent (and avoid default `getOrCreate` in non-provisioning paths).
+
+## 2026-02-17 - uncommitted
+
+### What I Was Working On
+
+Hardening task initialization around sandbox-agent session bootstrap failures (`init_create_session`) and replay safety for already-running workflows.
+
+### Friction / Issue
+
+1. New tasks repeatedly failed with ACP 504 timeouts during `createSession`, leaving tasks in `error` without a session/transcript.
+2. Existing tasks created before workflow step refactors emitted repeated `HistoryDivergedError` (`init-failed` / `init-enqueue-provision`) after backend restarts.
+
+### Attempted Fix / Workaround
+
+1. Added transient retry/backoff in `sandbox-instance.createSession` (timeout/502/503/504/gateway-class failures), with explicit terminal error detail after retries are exhausted.
+2. Increased task workflow `init-create-session` step timeout to allow retry envelope.
+3. Added workflow migration guards via `ctx.removed()` for legacy step names and moved failure handling to `init-failed-v2`.
+4. Added integration test coverage for retry success and retry exhaustion, plus client E2E assertion that a created task must produce session events (transcript bootstrap) before proceeding.
+
+### Outcome
+
+- New tasks now fail fast with explicit, surfaced error text (`createSession failed after N attempts: ...`) instead of opaque init hangs.
+- Recent backend logs stopped emitting new `HistoryDivergedError` for the migrated legacy step names.
+- Upstream ACP timeout behavior still occurs in this environment and remains the blocking issue for successful session creation.
+
+## 2026-02-17 - uncommitted
+
+### What I Was Working On
+
+Diagnosing stuck tasks (`init_create_sandbox`) after switching to a linked RivetKit worktree and restarting the backend.
+
+### Friction / Issue
+
+1. File-system driver actor-state writes still attempted to serialize legacy `kvStorage`, which can exceed Bare's buffer limit and trigger `Failed to save actor state: BareError: (byte:0) too large buffer`.
+2. Repository snapshots swallowed missing task actors and only logged warnings, so stale `task_index` rows persisted and appeared as stuck/ghost tasks in the UI.
+
+### Attempted Fix / Workaround
+
+1. In RivetKit file-system driver writes, force persisted `kvStorage` to `[]` (runtime KV is SQLite-only) so oversized legacy payloads are never re-serialized.
+2. In backend repository actor flows (`hydrate`, `snapshot`, `repo overview`, branch registration, PR-close archive), detect `Actor not found` and prune stale `task_index` rows immediately.
+
+### Outcome
+
+- Prevents repeated serialization crashes caused by legacy oversized state blobs.
+- Missing task actors are now self-healed from repository indexes instead of repeatedly surfacing as silent warnings.
+
+## 2026-02-12 - uncommitted
+
+### What I Was Working On
+
+Running `compose.dev.yaml` end-to-end (backend + frontend) and driving the browser UI with `agent-browser`.
+
+### Friction / Issue
+
+1. RivetKit serverless `GET /api/rivet/metadata` redirects browser clients to the **manager** endpoint in dev (`http://127.0.0.1:<managerPort>`). If the manager port is not reachable from the browser, the GUI fails with `HTTP request error: ... Failed to fetch` while still showing the serverless “This is a RivetKit server” banner.
+2. KV-backed SQLite (`@rivetkit/sqlite-vfs` + `wa-sqlite`) intermittently failed under Bun-in-Docker (`sqlite3_open_v2` and WASM out-of-bounds), preventing actors from starting.
+
+### Attempted Fix / Workaround
+
+1. Exposed the manager port (`7750`) in `compose.dev.yaml` so browser clients can reach the manager after metadata redirect.
+2. Switched actor DB providers to a Bun SQLite-backed Drizzle client in the backend runtime, while keeping a fallback to RivetKit's KV-backed Drizzle provider for backend tests (Vitest runs in a Node-ish environment where Bun-only imports are not supported).
+
+### Outcome
+
+- The compose stack can be driven via `agent-browser` to create a task successfully.
+- Sandbox sessions still require a reachable sandbox-agent endpoint (worktree provider defaults to `http://127.0.0.1:4097`, which is container-local in Docker).
+
+## 2026-02-12 - uncommitted
+
+### What I Was Working On
+
+Clarifying storage guidance for actors while refactoring SQLite/Drizzle migrations (including migration-per-actor).
+
+### Friction / Issue
+
+SQLite usage in actors needs a clear separation from “simple state” to avoid unnecessary schema/migration overhead for trivial data, while still ensuring anything non-trivial is queryable and durable.
+
+### Attempted Fix / Workaround
+
+Adopt a hard rule of thumb:
+
+- **Use `c.state` (basic KV-backed state)** for simple actor-local values: small scalars and identifiers (e.g. `{ taskId }`), flags, counters, last-run timestamps, current status strings.
+- **Use SQLite (Drizzle) for anything else**: multi-row datasets, history/event logs, query/filter needs, consistency across multiple records, data you expect to inspect/debug outside the actor.
+
+### Outcome
+
+Captured the guidance here so future actor work doesn’t mix the two models arbitrarily.
+
+## 2026-02-12 - uncommitted
+
+### What I Was Working On
+
+Standardizing SQLite + Drizzle setup for RivetKit actors (migration-per-actor) to match the `rivet/examples/sandbox` pattern while keeping the Foundry repo TypeScript-only.
+
+### Friction / Issue
+
+Getting a repeatable, low-footgun Drizzle migration workflow in a Bun-first codebase, while:
+
+- Keeping migrations scoped per actor (one schema/migration stream per SQLite-backed actor).
+- Avoiding committing DrizzleKit-generated JavaScript (`drizzle/migrations.js`) in a TypeScript-only repo.
+- Avoiding test failures caused by importing Bun-only SQLite code in environments that don’t expose `globalThis.Bun`.
+
+### Attempted Fix / Workaround
+
+Adopt these concrete repo conventions:
+
+- Per-actor DB folder layout:
+- `packages/backend/src/actors/<actor>/db/schema.ts`: Drizzle schema (tables owned by that actor only).
+- `packages/backend/src/actors/<actor>/db/drizzle.config.ts`: DrizzleKit config via `defineConfig` from `rivetkit/db/drizzle`.
+- `packages/backend/src/actors/<actor>/db/drizzle/`: DrizzleKit output (`*.sql` + `meta/_journal.json`).
+- `packages/backend/src/actors/<actor>/db/migrations.ts`: generated TypeScript migrations (do not hand-edit).
+- `packages/backend/src/actors/<actor>/db/db.ts`: actor db provider export (imports schema + migrations).
+
+- Schema rule (critical):
+- SQLite is **per actor instance**, not a shared DB across all instances.
+- Do not “namespace” rows with `organizationId`/`repoId`/`taskId` columns when those identifiers already live in the actor key/state.
+- Prefer single-row tables for single-instance storage (e.g. `id=1`) when appropriate.
+
+- Migration generation flow (Bun + DrizzleKit):
+- Run `pnpm -C packages/backend db:generate`.
+- This should:
+  - `drizzle-kit generate` for every `src/actors/**/db/drizzle.config.ts`.
+  - Convert `drizzle/meta/_journal.json` + `*.sql` into `db/migrations.ts` (TypeScript default export) and delete `drizzle/migrations.js`.
+
+- Per-actor migration tracking tables:
+- Even if all actors share one SQLite file, each actor must use its own migration table, e.g.
+  - `__foundry_migrations_<migrationNamespace>`
+  - `migrationNamespace` should be stable and sanitized to `[a-z0-9_]`.
+
+- Provider wiring pattern inside an actor:
+- Import migrations as a default export from the local file:
+  - `import migrations from "./migrations.js";` (resolves to `migrations.ts`)
+- Create the provider:
+  - `sqliteActorDb({ schema, migrations, migrationNamespace: "<actor>" })`
+
+- Test/runtime compatibility rule:
+- If `bun x vitest` runs in a context where `globalThis.Bun` is missing, Bun-only SQLite logic must not crash module imports.
+- Preferred approach: have the SQLite provider fall back to `rivetkit/db/drizzle` in non-Bun contexts so tests can run without needing Bun SQLite.
+
+### Outcome
+
+Captured the exact folder layout + script workflow so future actor DB work can follow one consistent pattern (and avoid re-learning DrizzleKit TS-vs-JS quirks each time).
+
+## 2026-02-12 - 26c3e27b9 (rivet-dev/rivet PR #4186)
+
+### What I Was Working On
+
+Diagnosing `StepExhaustedError` surfacing as `unknown error` during step replay (affecting Foundry Daytona `hf create`).
+
+### Friction / Issue
+
+The workflow engine treated “step completed” as `stepData.output !== undefined`. For steps that intentionally return `undefined` (void steps), JSON serialization omits `output`, so on restart the engine incorrectly considered the step incomplete and retried until `maxRetries`, producing `StepExhaustedError` despite no underlying step failure.
+
+### Attempted Fix / Workaround
+
+- None in Foundry; this is a workflow-engine correctness bug.
+
+### Outcome
+
+- Fixed replay completion semantics by honoring `metadata.status === “completed”` regardless of output presence.
+- Added regression test: “should treat void step outputs as completed on restart”.
+## 2026-02-12 - uncommitted
+
+### What I Was Working On
+
+Verifying Daytona-backed task/session flows for the new frontend and sandbox-instance session API.
+
+### Friction / Issue
+
+Task workflow steps intermittently entered failed state with `StepExhaustedError` and `unknown error` during initialization replay (`init-start-sandbox-instance`, then `init-write-db`), which caused `task.get` to time out and cascaded into `repository snapshot timed out` / `organization list_tasks timed out`.
+
+### Attempted Fix / Workaround
+
+1. Hardened `sandbox-instance` queue actions to return structured `{ ok, data?, error? }` responses instead of crashing the actor run loop.
+2. Increased `sandboxInstance.ensure` queue timeout and validated queue responses in action wrappers.
+3. Made `task` initialization step `init-start-sandbox-instance` non-fatal and captured step errors into runtime status.
+4. Guarded `sandboxInstance.getOrCreate` inside the same non-fatal `try` block to prevent direct step failures.
+
+### Outcome
+
+- Browser/frontend implementation and backend build/tests are green.
+- Daytona workflow initialization still has an unresolved Rivet workflow replay failure path that can poison task state after creation.
+- Follow-up needed in actor workflow error instrumentation/replay semantics before Daytona E2E can be marked stable.
+
+## 2026-02-08 - f2f2a02
+
+### What I Was Working On
+
+Defining the actor runtime model for the TypeScript + RivetKit migration, specifically `run` loop behavior and queue processing semantics.
+
+### Friction / Issue
+
+We need to avoid complex context switching from parallel internal loops and keep actor behavior serial and predictable.
+
+There was ambiguity on:
+
+1. How strongly to center write ownership in `run` handlers.
+2. When queue message coalescing is safe vs when separate tick handling is required.
+3. A concrete coalescing pattern for tick-driven workloads.
+
+### Decision / Guidance
+
+1. **Write ownership first in `run`:**
+- Every actor write should happen in the actor's main `run` message loop.
+- No parallel background writers for actor-owned rows.
+- Read/compute/write/emit happens in one serialized handler path.
+
+2. **Coalesce only for equivalent/idempotent queue messages:**
+- Safe to coalesce repeated "refresh/snapshot/recompute" style messages.
+- Not safe to coalesce ordered lifecycle mutations (`create`, `kill`, `archive`, `merge`, etc).
+
+3. **Separate tick intent from mutation intent:**
+- Tick should enqueue a tick message (`TickX`) into the same queue.
+- Actor still handles `TickX` in the same serialized loop.
+- Avoid independent "tick loop that mutates state" outside queue handling.
+
+4. **Tick coalesce with timeout pattern:**
+- For expensive tick work, wait briefly to absorb duplicate ticks, then run once.
+- This keeps load bounded without dropping important non-tick commands.
+
+```ts
+// inside run: async c => { while (true) { ... } }
+if (msg.type === "TickProjectRefresh") {
+  const deadline = Date.now() + 75;
+
+  // Coalesce duplicate ticks for a short window.
+  while (Date.now() < deadline) {
+    const next = await c.queue.next("repository", { timeout: deadline - Date.now() });
+    if (!next) break; // timeout
+
+    if (next.type === "TickProjectRefresh") {
+      continue; // drop duplicate tick
+    }
+
+    // Non-tick message should be handled in order.
+    await handle(next);
+  }
+
+  await refreshProjectSnapshot(); // single expensive run
+  continue;
+}
+```
+
+### Attempted Workaround and Outcome
+
+- Workaround considered: separate async interval loops that mutate actor state directly.
+- Outcome: rejected due to harder reasoning, race potential, and ownership violations.
+- Adopted approach: one queue-driven `run` loop, with selective coalescing and queued ticks.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Correcting the tick/coalescing proposal for actor loops to match Rivet queue semantics.
+
+### Friction / Issue
+
+Two mistakes in the prior proposal:
+
+1. Suggested `setInterval`, which is not the pattern we want.
+2. Used `msg.type` coalescing instead of coalescing by message/queue names (including multiple tick names together).
+
+### Correction
+
+1. **No `setInterval` for actor ticks.**
+- Use `c.queue.next(name, { timeout })` in the actor `run` loop.
+- Timeout expiry is the tick trigger.
+
+2. **Coalesce by message names, not `msg.type`.**
+- Keep one message name per command/tick channel.
+- When a tick window opens, drain and coalesce multiple tick names (e.g. `tick.repository.refresh`, `tick.pr.refresh`, `tick.sandbox.health`) into one execution per name.
+
+3. **Tick coalesce pattern with timeout (single loop):**
+
+```ts
+// Pseudocode: single actor loop, no parallel interval loop.
+const TICK_COALESCE_MS = 75;
+
+let nextProjectRefreshAt = Date.now() + 5_000;
+let nextPrRefreshAt = Date.now() + 30_000;
+let nextSandboxHealthAt = Date.now() + 2_000;
+
+while (true) {
+  const now = Date.now();
+  const nextDeadline = Math.min(nextProjectRefreshAt, nextPrRefreshAt, nextSandboxHealthAt);
+  const waitMs = Math.max(0, nextDeadline - now);
+
+  // Wait for command queue input, but timeout when the next tick is due.
+  const cmd = await c.queue.next("command", { timeout: waitMs });
+  if (cmd) {
+    await handleCommandByName(cmd.name, cmd);
+    continue;
+  }
+
+  // Timeout reached => one or more ticks are due.
+  const due = new Set<string>();
+  const at = Date.now();
+  if (at >= nextProjectRefreshAt) due.add("tick.repository.refresh");
+  if (at >= nextPrRefreshAt) due.add("tick.pr.refresh");
+  if (at >= nextSandboxHealthAt) due.add("tick.sandbox.health");
+
+  // Short coalesce window: absorb additional due tick names.
+  const coalesceUntil = Date.now() + TICK_COALESCE_MS;
+  while (Date.now() < coalesceUntil) {
+    const maybeTick = await c.queue.next("tick", { timeout: coalesceUntil - Date.now() });
+    if (!maybeTick) break;
+    due.add(maybeTick.name); // name-based coalescing
+  }
+
+  // Execute each due tick once, in deterministic order.
+  if (due.has("tick.repository.refresh")) {
+    await refreshProjectSnapshot();
+    nextProjectRefreshAt = Date.now() + 5_000;
+  }
+  if (due.has("tick.pr.refresh")) {
+    await refreshPrCache();
+    nextPrRefreshAt = Date.now() + 30_000;
+  }
+  if (due.has("tick.sandbox.health")) {
+    await pollSandboxHealth();
+    nextSandboxHealthAt = Date.now() + 2_000;
+  }
+}
+```
+
+### Outcome
+
+- Updated guidance now matches desired constraints:
+  - single serialized run loop
+  - timeout-driven tick triggers
+  - name-based multi-tick coalescing
+  - no separate interval mutation loops
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Refining the actor timer model to avoid multi-timeout complexity in a single actor loop.
+
+### Friction / Issue
+
+Even with queue-timeout ticks, packing multiple independent timer cadences into one actor `run` loop created avoidable complexity and made ownership reasoning harder.
+
+### Final Pattern
+
+1. **Parent actors are command-only loops with no timeout.**
+- `OrganizationActor`, `RepositoryActor`, `TaskActor`, and `HistoryActor` wait on queue messages only.
+
+2. **Periodic work moves to dedicated child sync actors.**
+- Each child actor has exactly one timeout cadence (e.g. PR sync, branch sync, task status sync).
+- Child actors are read-only pollers and send results back to the parent actor.
+
+3. **Single-writer focus per actor design.**
+- For each actor, define:
+  - main run loop shape
+  - exact data it mutates
+- Avoid shared table writers across parent/child actors.
+- If child actors poll external systems, parent actor applies results and performs DB writes.
+
+### Example Structure
+
+- `RepositoryActor` (no timeout): handles commands + applies `repository.pr_sync.result` / `repository.branch_sync.result` writes.
+- `ProjectPrSyncActor` (timeout 30s): polls PR data, sends result message.
+- `ProjectBranchSyncActor` (timeout 5s): polls branch data, sends result message.
+- `TaskActor` (no timeout): handles lifecycle + applies `task.status_sync.result` writes.
+- `TaskStatusSyncActor` (timeout 2s): polls session/sandbox status, sends result message.
+
+### Outcome
+
+- Lower cognitive load in each loop.
+- Clearer ownership boundaries.
+- Easier auditing of correctness: "what loop handles what messages and what rows it writes."
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Completing the TypeScript backend actor migration and stabilizing the monorepo build/tests.
+
+### Friction / Issue
+
+Rivet actor typing around queue-driven handlers and exported actor values produced unstable inferred public types (`TS2742`/`TS4023`) in declaration builds.
+
+### Attempted Fix / Workaround
+
+1. Kept runtime behavior strictly typed at API boundaries (`shared` schemas and actor message names).
+2. Disabled backend declaration emit and used runtime JS output for backend package build.
+3. Used targeted `@ts-nocheck` in actor implementation files to unblock migration while preserving behavior tests.
+
+### Outcome
+
+- Build, typecheck, and test pipelines are passing.
+- Actor runtime behavior is validated by integration tests.
+- Follow-up cleanup item: replace `@ts-nocheck` with explicit actor/action typings once Rivet type inference constraints are resolved.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Aligning actor module structure so the registry lives in `actors/index.ts` rather than a separate `actors/registry.ts`.
+
+### Friction / Issue
+
+Bulk path rewrites initially introduced a self-referential export in `actors/index.ts` (`export * from "./index.js"`), which would break module resolution.
+
+### Attempted Fix / Workaround
+
+1. Moved registry definition directly into `packages/backend/src/actors/index.ts`.
+2. Updated all registry imports/type references to `./index.js` (including tests and actor `c.client<typeof import(...)>` references).
+3. Deleted `packages/backend/src/actors/registry.ts`.
+
+### Outcome
+
+- Actor registry ownership is now co-located with actor exports in `actors/index.ts`.
+- Import graph is consistent with the intended module layout.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Removing custom backend REST endpoints and migrating CLI/TUI calls to direct `rivetkit/client` actor calls.
+
+### Friction / Issue
+
+We had implemented a `/v1/*` HTTP shim (`/v1/tasks`, `/v1/organizations/use`, etc.) between clients and actors, which duplicated actor APIs and introduced an unnecessary transport layer.
+
+### Attempted Fix / Workaround
+
+1. Deleted `packages/backend/src/transport/server.ts` and `packages/backend/src/transport/types.ts`.
+2. Switched backend serving to `registry.serve()` only.
+3. Replaced CLI fetch client with actor-direct calls through `rivetkit/client`.
+4. Replaced TUI fetch client with actor-direct calls through `rivetkit/client`.
+
+### Outcome
+
+- No custom `/v1/*` endpoints remain in backend source.
+- CLI/TUI now use actor RPC directly, which matches the intended RivetKit architecture and removes duplicate API translation logic.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Refactoring backend persistence to remove process-global SQLite state and use Rivet actor database wiring (`c.db`) with Drizzle.
+
+### Friction / Issue
+
+I accidentally introduced a global SQLite singleton (`db/client.ts` with process-level `sqlite`/`db` variables) during migration, which bypassed Rivet actor database patterns and made DB lifecycle management global instead of actor-scoped.
+
+### Attempted Fix / Workaround
+
+1. Removed the global DB module and backend-level init/close hooks.
+2. Added actor database provider wiring (`db: actorDatabase`) on DB-writing actors.
+3. Moved all DB access to `c.db` so database access follows actor context and lifecycle.
+4. Kept shared-file semantics by overriding Drizzle client creation per actor to the configured backend DB path.
+
+### Outcome
+
+- No backend-level global SQLite singleton remains.
+- DB access now routes through Rivet actor database context (`c.db`) while preserving current shared SQLite behavior.
+
+## 2026-02-09 - aab1012 (working tree)
+
+### What I Was Working On
+
+Stabilizing `hf` end-to-end backend/client flows on Bun (`status`, `create`, `history`, `switch`, `attach`, `archive`).
+
+### Friction / Issue
+
+Rivet manager endpoint redirection (`/api/rivet/metadata` -> `clientEndpoint`) was pointing to `http://127.0.0.1:6420`, but that manager endpoint responded with Bun's default page (`Welcome to Bun`) instead of manager JSON.
+
+Additional runtime friction in Bun logs:
+
+- `Expected a Response object, but received '_Response ...'` while serving the manager API.
+- This broke `rivetkit/client` requests (JSON parse failures / actor API failures).
+
+### Attempted Fix / Workaround
+
+1. Verified `/api/rivet/metadata` and `clientEndpoint` behavior directly with curl.
+2. Patched vendored RivetKit serving behavior for manager runtime:
+   - Bound `app.fetch` when passing handlers to server adapters.
+   - Routed Bun runtime through the Node server adapter path for manager serving to avoid Bun `_Response` type mismatch.
+3. Kept `rivetkit/client` direct usage (no custom REST layer), with health checks validating real Rivet metadata payload shape.
+
+### Outcome
+
+- Manager API at `127.0.0.1:6420` now returns valid Rivet metadata/actors responses.
+- CLI/backend actor RPC path is functional again under Bun.
+- `hf` end-to-end command flows pass in local smoke tests.
+
+## 2026-02-09 - uncommitted
+
+### What I Was Working On
+
+Removing `*Actor` suffix from all actor export names and registry keys.
+
+### Friction / Issue
+
+RivetKit's `setup({ use: { ... } })` uses property names as actor identifiers in `client.<name>` calls. All 8 actors were exported as `organization`, `repository`, `taskActor`, etc., which meant client code used verbose `client.organization.getOrCreate(...)` instead of `client.organization.getOrCreate(...)`.
+
+The `Actor` suffix is redundant — everything in the registry is an actor by definition. It also leaked into type names (`WorkspaceActorHandle`, `ProjectActorInput`, `HistoryActorInput`) and local function names (`workspaceActorKey`, `taskActorKey`).
+
+### Attempted Fix / Workaround
+
+1. Renamed all 8 actor exports: `organization` → `organization`, `repository` → `repository`, `taskActor` → `task`, `sandboxInstanceActor` → `sandboxInstance`, `historyActor` → `history`, `repositoryPrSync` → `repositoryPrSync`, `repositoryBranchSync` → `repositoryBranchSync`, `taskStatusSyncActor` → `taskStatusSync`.
+2. Updated registry keys in `actors/index.ts`.
+3. Renamed all `client.<name>Actor` references across 14 files (actor definitions, backend entry, CLI client, tests).
+4. Renamed associated types (`ProjectActorInput` → `RepositoryInput`, `HistoryActorInput` → `HistoryInput`, `WorkspaceActorHandle` → `OrganizationHandle`, `TaskActorHandle` → `TaskHandle`).
+
+### Outcome
+
+- Actor names are now concise and match their semantic role.
+- Client code reads naturally: `client.organization.getOrCreate(...)`, `client.task.get(...)`.
+- No runtime behavior change — registry property names drive actor routing.
+
+## 2026-02-09 - uncommitted
+
+### What I Was Working On
+
+Deciding which actor `run` loops should use durable workflows vs staying as queue-driven command loops.
+
+### Friction / Issue
+
+RivetKit doesn't articulate when to use a plain `run` loop vs a durable workflow. After auditing all 8 actors in our system, the decision heuristic is clear but undocumented:
+
+- **Plain `run` loop**: when every message handler is a single-step operation (one DB write, one delegation, one query) or when the loop is an infinite polling pattern (timeout-driven sync actors). These are idempotent or trivially retriable.
+- **Durable workflow**: when a message handler triggers a multi-step, ordered, side-effecting sequence where partial completion leaves inconsistent state. The key signal is: "if this crashes halfway through, can I safely re-run from the top?" If no, it needs a workflow.
+
+Concrete examples from our codebase:
+
+| Actor | Pattern | Why |
+|-------|---------|-----|
+| `organization` | Plain run | Every handler is a DB query or single actor delegation |
+| `repository` | Plain run | Handlers are DB upserts or delegate to task actor |
+| `task` | **Needs workflow** | `initialize` is a 7-step pipeline (createSandbox → ensureAgent → createSession → DB writes → start child actors); post-idle is a 5-step pipeline (commit → push → PR → cache → notify) |
+| `history` | Plain run | Single DB insert per message |
+| `sandboxInstance` | Plain run | Single-table CRUD per message |
+| `*Sync` actors (3) | Plain run | Infinite timeout-driven polling loops, not finite sequences |
+
+### Decision / Guidance
+
+RivetKit docs should articulate this heuristic explicitly:
+
+1. **Use plain `run` loops** for command routers, single-step handlers, CRUD actors, and infinite polling patterns.
+2. **Use durable workflows** when a handler contains a multi-step sequence of side effects where partial failure leaves broken state — especially when steps involve external systems (sandbox creation, git push, GitHub API).
+3. **The litmus test**: "If the process crashes after step N of M, does re-running from step 1 produce correct results?" If yes → plain run. If no → durable workflow.
+
+### Outcome
+
+- Identified `task` actor as the only actor needing workflow migration (both `initialize` and post-idle pipelines).
+- All other actors stay as plain `run` loops.
+- This heuristic should be documented in RivetKit's actor design patterns guide.
+
+## 2026-02-09 - uncommitted
+
+### What I Was Working On
+
+Understanding queue message scoping when planning workflow migration for the task actor.
+
+### Friction / Issue
+
+It's not clear from RivetKit docs/API that queue message names are scoped per actor instance, not global. When you call `c.queue.next(["task.command.initialize", ...])`, those names only match messages sent to *this specific actor instance* — not a global bus. But the dotted naming convention (e.g. `task.command.initialize`) suggests a global namespace/routing scheme, which is misleading.
+
+This matters when reasoning about workflow `listen()` behavior: you might assume you need globally unique names or worry about cross-actor message collisions, when in reality each actor instance has its own isolated queue namespace.
+
+### Decision / Guidance
+
+RivetKit docs should clarify:
+
+1. Queue names are **per-actor-instance** — two different actor instances can use the same queue name without collision.
+2. The dotted naming convention (e.g. `repository.command.ensure`) is a user convention for readability, not a routing hierarchy.
+3. `c.queue.next(["a", "b"])` listens on queues named `"a"` and `"b"` *within this actor*, not across actors.
+
+### Outcome
+
+- No code change needed — the scoping is correct, the documentation is just unclear.
+
+## 2026-02-09 - uncommitted
+
+### What I Was Working On
+
+Migrating task actor to durable workflows. AI-generated queue names used dotted convention.
+
+### Friction / Issue
+
+When generating actor queue names, the AI (and our own codebase) defaulted to dotted names like `task.command.initialize`, `repository.pr_sync.result`, `task.status_sync.control.start`. These work fine in plain `run` loops, but create friction when interacting with the workflow system because `workflowQueueName()` prefixes them with `__workflow:`, producing names like `__workflow:task.command.initialize`.
+
+Queue names should always be **camelCase** (e.g. `initializeTask`, `statusSyncResult`, `attachTask`). Dotted names are misleading — they imply hierarchy or routing semantics that don't exist (queues are flat, per-actor-instance strings). They also look like object property paths, which causes confusion when used as dynamic property keys on queue handles (`actor.queue["task.command.initialize"]`).
+
+### Decision / Guidance
+
+RivetKit docs and examples should establish:
+
+1. **Queue names must be camelCase** — e.g. `initialize`, `attach`, `statusSyncResult`, not `task.command.initialize`.
+2. **No dots in queue names** — dots suggest hierarchy that doesn't exist and conflict with JS property access patterns.
+3. **AI code generation guidance** should explicitly call this out, since LLMs tend to generate dotted names when given actor/queue context.
+
+### Outcome
+
+- Existing codebase uses dotted names throughout all 8 actors. Not renaming now (low priority), but documenting the convention for future work.
+- RivetKit should enforce or lint for camelCase queue names.
+
+## 2026-02-09 - de4424e (working tree)
+
+### What I Was Working On
+
+Setting up integration tests for backend actors with `setupTest` from `rivetkit/test`.
+
+### Friction / Issue
+
+Do **not** reimplement your own SQLite driver for actors. RivetKit's `db()` Drizzle provider (`rivetkit/db/drizzle`) already provides a fully managed SQLite backend via its KV-backed VFS. When actors declare `db: actorDatabase` (where `actorDatabase = db({ schema, migrations })`), RivetKit handles the full SQLite lifecycle — opening, closing, persistence, and storage — through the actor context (`c.db`).
+
+Previous attempts to work around test failures by importing `bun:sqlite` directly, adding `better-sqlite3` as a fallback, or using `overrideDrizzleDatabaseClient` to inject a custom SQLite client all bypassed RivetKit's built-in driver and introduced cascading issues:
+
+1. `bun:sqlite` is not available in vitest Node.js workers → crash
+2. `better-sqlite3` native addon has symbol errors under Bun → crash
+3. `overrideDrizzleDatabaseClient` bypasses the KV-backed VFS, breaking actor state persistence semantics
+
+The correct `actor-database.ts` is exactly 4 lines:
+
+```ts
+import { db } from "rivetkit/db/drizzle";
+import { migrations } from "./migrations.js";
+import * as schema from "./schema.js";
+export const actorDatabase = db({ schema, migrations });
+```
+
+The RivetKit SQLite VFS has three backends, all of which are broken for vitest/Node.js integration tests:
+
+1. **Native VFS** (`@rivetkit/sqlite-vfs-linux-x64`): The prebuilt `.node` binary causes a **segfault** (exit code 139) when loaded in Node.js v24. This crashes the vitest worker process with "Channel closed".
+
+2. **WASM VFS** (`sql.js`): Loads successfully, but the WASM `Database.exec()` wrapper calls `db.export()` + `persistDatabaseBytes()` after every single SQL statement. This breaks the migration handler's explicit `BEGIN`/`COMMIT`/`ROLLBACK` transaction wrapping — `db.export()` after `BEGIN` likely interferes with sql.js transaction state, so `ROLLBACK` fails with "cannot rollback - no transaction is active".
+
+3. **RivetKit's `useNativeSqlite` option** (in file-system driver): Uses `better-sqlite3` via `overrideRawDatabaseClient`/`overrideDrizzleDatabaseClient`. This works correctly **if** `better-sqlite3` native bindings are built (`npx node-gyp rebuild`). This is the correct path for Node.js test environments.
+
+Additionally, with `useNativeSqlite: true`, each actor gets its own isolated database file at `getActorDbPath(actorId)` → `dbs/${actorId}.db`. Our architecture requires a shared database across actors (cross-actor table queries). Patched `getActorDbPath` to return a shared path (`dbs/shared.db`).
+
+### Attempted Fix / Workaround
+
+1. Removed all custom SQLite loading from `actor-database.ts` (4-line file using `db()` provider).
+2. Patched vendored `setupTest` to pass `useNativeSqlite: true` to `createFileSystemOrMemoryDriver`.
+3. Added `better-sqlite3` as devDependency with native bindings compiled for test environment.
+4. Patched vendored `getActorDbPath` to return shared path instead of per-actor path.
+5. Patched vendored `onMigrate` handler to remove `BEGIN`/`COMMIT`/`ROLLBACK` wrapping (fixes WASM, harmless for native since native uses `durableMigrate` path).
+
+### Outcome
+
+- Actor database wiring is correct and minimal (4-line `actor-database.ts`).
+- Integration tests pass using `better-sqlite3` via RivetKit's built-in `useNativeSqlite` option.
+- Three vendored patches required (should be upstreamed to RivetKit):
+  - `setupTest` → `useNativeSqlite: true`
+  - `getActorDbPath` → shared path
+  - `onMigrate` → remove transaction wrapping for WASM fallback path
+
+## 2026-02-09 - aab1012 (working tree)
+
+### What I Was Working On
+
+Fixing Bun-native SQLite integration for actor DB wiring.
+
+### Friction / Issue
+
+Using `better-sqlite3` and `node:sqlite` in backend DB bootstrap caused Bun runtime failures:
+
+- `No such built-in module: node:sqlite`
+- native addon symbol errors from `better-sqlite3` under Bun runtime
+
+### Attempted Fix / Workaround
+
+1. Switched DB bootstrap/client wiring to dynamic Bun SQLite imports (`bun:sqlite` + `drizzle-orm/bun-sqlite`).
+2. Marked `bun:sqlite` external in backend tsup build.
+3. Removed `better-sqlite3` backend dependency and adjusted tests that referenced it directly.
+
+### Outcome
+
+- Backend starts successfully under Bun.
+- Shared Drizzle/SQLite actor DB path still works.
+- Organization build + tests pass.
diff --git a/foundry/research/friction/sandbox-agent.mdx b/foundry/research/friction/sandbox-agent.mdx
new file mode 100644
index 0000000..5fb9ba8
--- /dev/null
+++ b/foundry/research/friction/sandbox-agent.mdx
@@ -0,0 +1,69 @@
+# Sandbox Agent Friction Log
+
+## 2026-02-17 - uncommitted
+
+### What I Was Working On
+
+Stabilizing Daytona-backed Codex task initialization (`init_create_session`) and diagnosing repeated sandbox-agent `session/new` failures.
+
+### Friction / Issue
+
+Two issues compounded each other:
+
+1. The backend added a local `45s` Promise timeout around `sandbox-agent` SDK `createSession()`, but the underlying ACP call is not abortable. Timed-out calls kept running in the background while retries started new session creates, causing overlapping ACP requests and noisy failures.
+2. Daytona sandboxes were missing `node`/`npm`/`npx`, while the installed Codex ACP launcher is `npx @zed-industries/codex-acp`. Session initialization could hang/time out because the launcher dependency chain was incomplete.
+
+### Attempted Fix / Workaround
+
+1. Removed the local `45s` timeout wrapper around `SandboxAgent.createSession()` in backend integration.
+2. Updated sandbox-instance retry classification to avoid immediate retries for timeout/504 failures, while still retrying quick transient transport failures (502/503/connection reset/refused).
+3. Kept Daytona on published `sandbox-agent 0.2.0` and set `SANDBOX_AGENT_ACP_REQUEST_TIMEOUT_MS` via backend env override (`HF_SANDBOX_AGENT_ACP_REQUEST_TIMEOUT_MS`, default `120000`).
+4. Updated Daytona bootstrap to install `nodejs` + `npm` (and validate `npx` availability) so `codex-acp` launcher can run.
+
+### Outcome
+
+- `createSession` no longer races itself due local timeout.
+- Timeout errors are surfaced directly instead of hidden behind repeated local timeout retries.
+- Daytona sandboxes keep published sandbox-agent bootstrap with compatible runtime prerequisites for Codex ACP launch.
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Wiring task initialization to create/poll sandbox-agent sessions through provider-resolved endpoints.
+
+### Friction / Issue
+
+Local test runs cannot assume a live sandbox-agent backend, so session bootstrap is inherently optional in tests and on clean machines.
+
+### Attempted Fix / Workaround
+
+1. Wrapped session creation in guarded error handling during task initialization.
+2. Persisted task state as `queued` when session creation fails, while keeping sandbox metadata written.
+3. Continued status tracking through runtime messages when a session is available.
+
+### Outcome
+
+- Task creation remains deterministic without hard dependency on a running sandbox-agent process.
+- Behavior is testable in CI/local environments that do not run sandbox-agent.
+
+## 2026-02-12 - uncommitted
+
+### What I Was Working On
+
+Upgrading backend integration from legacy sandbox-agent session endpoints to `sandbox-agent@0.2.0` and validating Daytona-backed execution.
+
+### Friction / Issue
+
+`0.2.0` no longer exposes the legacy session REST endpoints used by the backend integration; direct session create/status polling via those paths returns `404`.
+
+### Attempted Fix / Workaround
+
+1. Switched backend integration to `sandbox-agent` SDK (`SandboxAgent.connect`, `createSession`, `getSession`, `getEvents`).
+2. Added status inference from SDK state/events for compatibility with existing task status sync actor.
+3. Upgraded Daytona provider to install/start `sandbox-agent 0.2.0` in sandboxes and expose a preview endpoint for SDK calls.
+
+### Outcome
+
+- Backend no longer depends on removed legacy session REST endpoints.
+- Daytona flow is aligned with `sandbox-agent 0.2.0` runtime and SDK usage.
diff --git a/foundry/research/friction/sandboxes.mdx b/foundry/research/friction/sandboxes.mdx
new file mode 100644
index 0000000..38d4b3f
--- /dev/null
+++ b/foundry/research/friction/sandboxes.mdx
@@ -0,0 +1,65 @@
+# Sandboxes Friction Log
+
+## 2026-02-08 - uncommitted
+
+### What I Was Working On
+
+Implementing provider adapters (`worktree`, `daytona`) under the backend package.
+
+### Friction / Issue
+
+Provider interface intentionally keeps `DestroySandboxRequest` minimal (`organizationId`, `sandboxId`), but local git worktree cleanup may need repo context.
+
+### Attempted Fix / Workaround
+
+1. Kept provider API stable and provider-agnostic.
+2. Implemented safe best-effort destroy in `worktree` provider and avoided hard failures when repo context is unavailable.
+3. Preserved status updates in task runtime/events so kill/archive state remains consistent.
+
+### Outcome
+
+- Provider abstraction remains consistent across local/remote backends.
+- Follow-up item: enrich destroy flow with provider-owned metadata lookup so `worktree` cleanup can be fully deterministic without extra request fields.
+
+## 2026-02-12 - uncommitted
+
+### What I Was Working On
+
+Upgrading the Daytona provider to bootstrap `sandbox-agent 0.2.0` and install the codex agent at sandbox initialization time.
+
+### Friction / Issue
+
+Daytona sandbox network/DNS restrictions can block agent binary download from GitHub (`codex` install step fails with DNS resolution errors), even when Daytona API access succeeds.
+
+### Attempted Fix / Workaround
+
+1. Added bootstrap steps to install missing base tools (`curl`) in minimal `ubuntu:24.04` sandboxes.
+2. Switched sandbox-agent installation to strict `bash -lc` flows with `set -euo pipefail` and explicit health checks.
+3. Verified that bootstrap reaches running sandbox-agent endpoint, then observed intermittent/blocked codex install due upstream DNS/network limits in sandbox runtime.
+
+### Outcome
+
+- Daytona provider lifecycle and sandbox-agent server bootstrap are functional.
+- Codex agent installation remains environment-dependent when outbound GitHub access is blocked by sandbox networking policy.
+
+## 2026-02-13 - uncommitted
+
+### What I Was Working On
+
+Removing the local `worktree` provider entirely and migrating the product workflow to sandboxes-only with repo remotes (backend-owned local clones + daytona sandbox workdirs).
+
+### Friction / Issue
+
+The previous end-to-end flow implicitly depended on local filesystem paths (`repoPath`, `worktreePath`) being passed through contracts and used directly by actors for git operations and PR creation.
+
+### Attempted Fix / Workaround
+
+1. Introduced explicit imported repository records sourced from GitHub sync instead of local organization paths.
+2. Made `RepositoryActor` assert a backend-owned local clone exists on wake and fetch remote branch state from that clone.
+3. Updated PR creation to avoid requiring a checked-out branch by using `gh pr create --head <branch>`.
+4. Updated `DaytonaProvider.createSandbox` to clone the repo and checkout the branch into a deterministic workdir and return it as `cwd` for sandbox-agent sessions.
+
+### Outcome
+
+- Worktree support is removed; UI/CLI no longer accept local repo paths.
+- Repo state is tracked via remote + backend-owned clones, and agent sessions can start in a repo directory inside the sandbox.
diff --git a/foundry/research/realtime-interest-manager-spec.md b/foundry/research/realtime-interest-manager-spec.md
new file mode 100644
index 0000000..dff2aea
--- /dev/null
+++ b/foundry/research/realtime-interest-manager-spec.md
@@ -0,0 +1,919 @@
+# Realtime Interest Manager — Implementation Spec
+
+## Overview
+
+Replace the current polling + empty-notification + full-refetch architecture with a push-based realtime system. The client subscribes to topics, receives the initial state, and then receives full replacement payloads for changed entities over WebSocket. No polling. No re-fetching.
+
+This spec covers three layers: backend (materialized state + broadcast), client library (subscription manager), and frontend (hook consumption). Comment architecture-related code throughout so new contributors can understand the data flow from comments alone.
+
+---
+
+## 1. Data Model: What Changes
+
+### 1.1 Split `WorkbenchTask` into summary and detail types
+
+**File:** `packages/shared/src/workbench.ts`
+
+Currently `WorkbenchTask` is a single flat type carrying everything (sidebar fields + transcripts + diffs + file tree). Split it:
+
+```typescript
+/** Sidebar-level task data. Materialized in the organization actor's SQLite. */
+export interface WorkbenchTaskSummary {
+  id: string;
+  repoId: string;
+  title: string;
+  status: WorkbenchTaskStatus;
+  repoName: string;
+  updatedAtMs: number;
+  branch: string | null;
+  pullRequest: WorkbenchPullRequestSummary | null;
+  /** Summary of sessions — no transcript content. */
+  sessionsSummary: WorkbenchSessionSummary[];
+}
+
+/** Session metadata without transcript content. */
+export interface WorkbenchSessionSummary {
+  id: string;
+  sessionId: string | null;
+  sessionName: string;
+  agent: WorkbenchAgentKind;
+  model: WorkbenchModelId;
+  status: "running" | "idle" | "error";
+  thinkingSinceMs: number | null;
+  unread: boolean;
+  created: boolean;
+}
+
+/** Repo-level summary for organization sidebar. */
+export interface WorkbenchRepoSummary {
+  id: string;
+  label: string;
+  /** Aggregated branch/task overview state (replaces getRepoOverview polling). */
+  taskCount: number;
+  latestActivityMs: number;
+}
+
+/** Full task detail — only fetched when viewing a specific task. */
+export interface WorkbenchTaskDetail {
+  id: string;
+  repoId: string;
+  title: string;
+  status: WorkbenchTaskStatus;
+  repoName: string;
+  updatedAtMs: number;
+  branch: string | null;
+  pullRequest: WorkbenchPullRequestSummary | null;
+  sessionsSummary: WorkbenchSessionSummary[];
+  fileChanges: WorkbenchFileChange[];
+  diffs: Record<string, string>;
+  fileTree: WorkbenchFileTreeNode[];
+  minutesUsed: number;
+  /** Sandbox info for this task. */
+  sandboxes: WorkbenchSandboxSummary[];
+  activeSandboxId: string | null;
+}
+
+export interface WorkbenchSandboxSummary {
+  providerId: string;
+  sandboxId: string;
+  cwd: string | null;
+}
+
+/** Full session content — only fetched when viewing a specific session tab. */
+export interface WorkbenchSessionDetail {
+  sessionId: string;
+  tabId: string;
+  sessionName: string;
+  agent: WorkbenchAgentKind;
+  model: WorkbenchModelId;
+  status: "running" | "idle" | "error";
+  thinkingSinceMs: number | null;
+  unread: boolean;
+  draft: WorkbenchComposerDraft;
+  transcript: WorkbenchTranscriptEvent[];
+}
+
+/** Organization-level snapshot — initial fetch for the organization topic. */
+export interface OrganizationSummarySnapshot {
+  organizationId: string;
+  repos: WorkbenchRepoSummary[];
+  taskSummaries: WorkbenchTaskSummary[];
+}
+```
+
+Remove the old `TaskWorkbenchSnapshot` type and `WorkbenchTask` type once migration is complete.
+
+### 1.2 Event payload types
+
+**File:** `packages/shared/src/realtime-events.ts` (new file)
+
+Each event carries the full new state of the changed entity — not a patch, not an empty notification.
+
+```typescript
+/** Organization-level events broadcast by the organization actor. */
+export type OrganizationEvent =
+  | { type: "taskSummaryUpdated"; taskSummary: WorkbenchTaskSummary }
+  | { type: "taskRemoved"; taskId: string }
+  | { type: "repoAdded"; repo: WorkbenchRepoSummary }
+  | { type: "repoUpdated"; repo: WorkbenchRepoSummary }
+  | { type: "repoRemoved"; repoId: string };
+
+/** Task-level events broadcast by the task actor. */
+export type TaskEvent =
+  | { type: "taskDetailUpdated"; detail: WorkbenchTaskDetail };
+
+/** Session-level events broadcast by the task actor, filtered by sessionId on the client. */
+export type SessionEvent =
+  | { type: "sessionUpdated"; session: WorkbenchSessionDetail };
+
+/** App-level events broadcast by the app organization actor. */
+export type AppEvent =
+  | { type: "appUpdated"; snapshot: FoundryAppSnapshot };
+
+/** Sandbox process events broadcast by the sandbox instance actor. */
+export type SandboxProcessesEvent =
+  | { type: "processesUpdated"; processes: SandboxProcessRecord[] };
+```
+
+---
+
+## 2. Backend: Materialized State + Broadcasts
+
+### 2.1 Organization actor — materialized sidebar state
+
+**Files:**
+- `packages/backend/src/actors/organization/db/schema.ts` — add tables
+- `packages/backend/src/actors/organization/actions.ts` — replace `buildWorkbenchSnapshot`, add delta handlers
+
+Add to organization actor SQLite schema:
+
+```typescript
+export const taskSummaries = sqliteTable("task_summaries", {
+  taskId: text("task_id").primaryKey(),
+  repoId: text("repo_id").notNull(),
+  title: text("title").notNull(),
+  status: text("status").notNull(), // WorkbenchTaskStatus
+  repoName: text("repo_name").notNull(),
+  updatedAtMs: integer("updated_at_ms").notNull(),
+  branch: text("branch"),
+  pullRequestJson: text("pull_request_json"), // JSON-serialized WorkbenchPullRequestSummary | null
+  sessionsSummaryJson: text("sessions_summary_json").notNull().default("[]"), // JSON array of WorkbenchSessionSummary
+});
+```
+
+New organization actions:
+
+```typescript
+/**
+ * Called by task actors when their summary-level state changes.
+ * Upserts the task summary row and broadcasts the update to all connected clients.
+ *
+ * This is the core of the materialized state pattern: task actors push their
+ * summary changes here instead of requiring clients to fan out to every task.
+ */
+async applyTaskSummaryUpdate(c, input: { taskSummary: WorkbenchTaskSummary }) {
+  // Upsert into taskSummaries table
+  await c.db.insert(taskSummaries).values(toRow(input.taskSummary))
+    .onConflictDoUpdate({ target: taskSummaries.taskId, set: toRow(input.taskSummary) }).run();
+  // Broadcast to connected clients
+  c.broadcast("organizationUpdated", { type: "taskSummaryUpdated", taskSummary: input.taskSummary });
+}
+
+async removeTaskSummary(c, input: { taskId: string }) {
+  await c.db.delete(taskSummaries).where(eq(taskSummaries.taskId, input.taskId)).run();
+  c.broadcast("organizationUpdated", { type: "taskRemoved", taskId: input.taskId });
+}
+
+/**
+ * Initial fetch for the organization topic.
+ * Reads entirely from local SQLite — no fan-out to child actors.
+ */
+async getWorkspaceSummary(c, input: { organizationId: string }): Promise<OrganizationSummarySnapshot> {
+  const repoRows = await c.db.select().from(repos).orderBy(desc(repos.updatedAt)).all();
+  const taskRows = await c.db.select().from(taskSummaries).orderBy(desc(taskSummaries.updatedAtMs)).all();
+  return {
+    organizationId: c.state.organizationId,
+    repos: repoRows.map(toRepoSummary),
+    taskSummaries: taskRows.map(toTaskSummary),
+  };
+}
+```
+
+Replace `buildWorkbenchSnapshot` (the fan-out) — keep it only as a `reconcileWorkbenchState` background action for recovery/rebuild.
+
+### 2.2 Task actor — push summaries to organization + broadcast detail
+
+**Files:**
+- `packages/backend/src/actors/task/workbench.ts` — replace `notifyWorkbenchUpdated` calls
+
+Every place that currently calls `notifyWorkbenchUpdated(c)` (there are ~20 call sites) must instead:
+
+1. Build the current `WorkbenchTaskSummary` from local state.
+2. Push it to the organization actor: `organization.applyTaskSummaryUpdate({ taskSummary })`.
+3. Build the current `WorkbenchTaskDetail` from local state.
+4. Broadcast to directly-connected clients: `c.broadcast("taskUpdated", { type: "taskDetailUpdated", detail })`.
+5. If session state changed, also broadcast: `c.broadcast("sessionUpdated", { type: "sessionUpdated", session: buildSessionDetail(c, sessionId) })`.
+
+Add helper functions:
+
+```typescript
+/**
+ * Builds a WorkbenchTaskSummary from local task actor state.
+ * This is what gets pushed to the organization actor for sidebar materialization.
+ */
+function buildTaskSummary(c: any): WorkbenchTaskSummary { ... }
+
+/**
+ * Builds a WorkbenchTaskDetail from local task actor state.
+ * This is broadcast to clients directly connected to this task.
+ */
+function buildTaskDetail(c: any): WorkbenchTaskDetail { ... }
+
+/**
+ * Builds a WorkbenchSessionDetail for a specific session.
+ * Broadcast to clients subscribed to this session's updates.
+ */
+function buildSessionDetail(c: any, sessionId: string): WorkbenchSessionDetail { ... }
+
+/**
+ * Replaces the old notifyWorkbenchUpdated pattern.
+ * Pushes summary to organization actor + broadcasts detail to direct subscribers.
+ */
+async function broadcastTaskUpdate(c: any, options?: { sessionId?: string }) {
+  // Push summary to parent organization actor
+  const organization = await getOrCreateOrganization(c, c.state.organizationId);
+  await organization.applyTaskSummaryUpdate({ taskSummary: buildTaskSummary(c) });
+
+  // Broadcast detail to clients connected to this task
+  c.broadcast("taskUpdated", { type: "taskDetailUpdated", detail: buildTaskDetail(c) });
+
+  // If a specific session changed, broadcast session detail
+  if (options?.sessionId) {
+    c.broadcast("sessionUpdated", {
+      type: "sessionUpdated",
+      session: buildSessionDetail(c, options.sessionId),
+    });
+  }
+}
+```
+
+### 2.3 Task actor — new actions for initial fetch
+
+```typescript
+/**
+ * Initial fetch for the task topic.
+ * Reads from local SQLite only — no cross-actor calls.
+ */
+async getTaskDetail(c): Promise<WorkbenchTaskDetail> { ... }
+
+/**
+ * Initial fetch for the session topic.
+ * Returns full session content including transcript.
+ */
+async getSessionDetail(c, input: { sessionId: string }): Promise<WorkbenchSessionDetail> { ... }
+```
+
+### 2.4 App organization actor
+
+**File:** `packages/backend/src/actors/organization/app-shell.ts`
+
+Change `c.broadcast("appUpdated", { at: Date.now(), sessionId })` to:
+```typescript
+c.broadcast("appUpdated", { type: "appUpdated", snapshot: await buildAppSnapshot(c, sessionId) });
+```
+
+### 2.5 Sandbox instance actor
+
+**File:** `packages/backend/src/actors/sandbox-instance/index.ts`
+
+Change `broadcastProcessesUpdated` to include the process list:
+```typescript
+function broadcastProcessesUpdated(c: any): void {
+  const processes = /* read from local DB */;
+  c.broadcast("processesUpdated", { type: "processesUpdated", processes });
+}
+```
+
+---
+
+## 3. Client Library: Interest Manager
+
+### 3.1 Topic definitions
+
+**File:** `packages/client/src/interest/topics.ts` (new)
+
+```typescript
+/**
+ * Topic definitions for the subscription manager.
+ *
+ * Each topic defines how to connect to an actor, fetch initial state,
+ * which event to listen for, and how to apply incoming events to cached state.
+ *
+ * The subscription manager uses these definitions to manage WebSocket connections,
+ * cached state, and subscriptions for all realtime data flows.
+ */
+
+export interface TopicDefinition<TData, TParams, TEvent> {
+  /** Derive a unique cache key from params. */
+  key: (params: TParams) => string;
+
+  /** Which broadcast event name to listen for on the actor connection. */
+  event: string;
+
+  /** Open a WebSocket connection to the actor. */
+  connect: (backend: BackendClient, params: TParams) => Promise<ActorConn>;
+
+  /** Fetch the initial snapshot from the actor. */
+  fetchInitial: (backend: BackendClient, params: TParams) => Promise<TData>;
+
+  /** Apply an incoming event to the current cached state. Returns the new state. */
+  applyEvent: (current: TData, event: TEvent) => TData;
+}
+
+export interface AppTopicParams {}
+export interface OrganizationTopicParams { organizationId: string }
+export interface TaskTopicParams { organizationId: string; repoId: string; taskId: string }
+export interface SessionTopicParams { organizationId: string; repoId: string; taskId: string; sessionId: string }
+export interface SandboxProcessesTopicParams { organizationId: string; providerId: string; sandboxId: string }
+
+export const topicDefinitions = {
+  app: {
+    key: () => "app",
+    event: "appUpdated",
+    connect: (b, _p) => b.connectWorkspace("app"),
+    fetchInitial: (b, _p) => b.getAppSnapshot(),
+    applyEvent: (_current, event: AppEvent) => event.snapshot,
+  } satisfies TopicDefinition<FoundryAppSnapshot, AppTopicParams, AppEvent>,
+
+  organization: {
+    key: (p) => `organization:${p.organizationId}`,
+    event: "organizationUpdated",
+    connect: (b, p) => b.connectWorkspace(p.organizationId),
+    fetchInitial: (b, p) => b.getWorkspaceSummary(p.organizationId),
+    applyEvent: (current, event: OrganizationEvent) => {
+      switch (event.type) {
+        case "taskSummaryUpdated":
+          return {
+            ...current,
+            taskSummaries: upsertById(current.taskSummaries, event.taskSummary),
+          };
+        case "taskRemoved":
+          return {
+            ...current,
+            taskSummaries: current.taskSummaries.filter(t => t.id !== event.taskId),
+          };
+        case "repoAdded":
+        case "repoUpdated":
+          return {
+            ...current,
+            repos: upsertById(current.repos, event.repo),
+          };
+        case "repoRemoved":
+          return {
+            ...current,
+            repos: current.repos.filter(r => r.id !== event.repoId),
+          };
+      }
+    },
+  } satisfies TopicDefinition<OrganizationSummarySnapshot, OrganizationTopicParams, OrganizationEvent>,
+
+  task: {
+    key: (p) => `task:${p.organizationId}:${p.taskId}`,
+    event: "taskUpdated",
+    connect: (b, p) => b.connectTask(p.organizationId, p.repoId, p.taskId),
+    fetchInitial: (b, p) => b.getTaskDetail(p.organizationId, p.repoId, p.taskId),
+    applyEvent: (_current, event: TaskEvent) => event.detail,
+  } satisfies TopicDefinition<WorkbenchTaskDetail, TaskTopicParams, TaskEvent>,
+
+  session: {
+    key: (p) => `session:${p.organizationId}:${p.taskId}:${p.sessionId}`,
+    event: "sessionUpdated",
+    // Reuses the task actor connection — same actor, different event.
+    connect: (b, p) => b.connectTask(p.organizationId, p.repoId, p.taskId),
+    fetchInitial: (b, p) => b.getSessionDetail(p.organizationId, p.repoId, p.taskId, p.sessionId),
+    applyEvent: (current, event: SessionEvent) => {
+      // Filter: only apply if this event is for our session
+      if (event.session.sessionId !== current.sessionId) return current;
+      return event.session;
+    },
+  } satisfies TopicDefinition<WorkbenchSessionDetail, SessionTopicParams, SessionEvent>,
+
+  sandboxProcesses: {
+    key: (p) => `sandbox:${p.organizationId}:${p.sandboxId}`,
+    event: "processesUpdated",
+    connect: (b, p) => b.connectSandbox(p.organizationId, p.providerId, p.sandboxId),
+    fetchInitial: (b, p) => b.listSandboxProcesses(p.organizationId, p.providerId, p.sandboxId),
+    applyEvent: (_current, event: SandboxProcessesEvent) => event.processes,
+  } satisfies TopicDefinition<SandboxProcessRecord[], SandboxProcessesTopicParams, SandboxProcessesEvent>,
+} as const;
+
+/** Derive TypeScript types from the topic registry. */
+export type TopicKey = keyof typeof topicDefinitions;
+export type TopicParams<K extends TopicKey> = Parameters<(typeof topicDefinitions)[K]["fetchInitial"]>[1];
+export type TopicData<K extends TopicKey> = Awaited<ReturnType<(typeof topicDefinitions)[K]["fetchInitial"]>>;
+```
+
+### 3.2 Subscription manager interface
+
+**File:** `packages/client/src/interest/manager.ts` (new)
+
+```typescript
+/**
+ * The SubscriptionManager owns all realtime actor connections and cached state.
+ *
+ * Architecture:
+ * - Each topic (app, organization, task, session, sandboxProcesses) maps to an actor + event.
+ * - On first subscription, the manager opens a WebSocket connection, fetches initial state,
+ *   and listens for events. Events carry full replacement payloads for the changed entity.
+ * - Multiple subscribers to the same topic share one connection and one cached state.
+ * - When the last subscriber leaves, a 30-second grace period keeps the connection alive
+ *   to avoid thrashing during screen navigation or React double-renders.
+ * - The interface is identical for mock and remote implementations.
+ */
+export interface SubscriptionManager {
+  /**
+   * Subscribe to a topic. Returns an unsubscribe function.
+   * On first subscriber: opens connection, fetches initial state, starts listening.
+   * On last unsubscribe: starts 30s grace period before teardown.
+   */
+  subscribe<K extends TopicKey>(
+    topicKey: K,
+    params: TopicParams<K>,
+    listener: () => void,
+  ): () => void;
+
+  /** Get the current cached state for a topic. Returns undefined if not yet loaded. */
+  getSnapshot<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicData<K> | undefined;
+
+  /** Get the connection/loading status for a topic. */
+  getStatus<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicStatus;
+
+  /** Get the error (if any) for a topic. */
+  getError<K extends TopicKey>(topicKey: K, params: TopicParams<K>): Error | null;
+
+  /** Dispose all connections and cached state. */
+  dispose(): void;
+}
+
+export type TopicStatus = "loading" | "connected" | "error";
+
+export interface TopicState<K extends TopicKey> {
+  data: TopicData<K> | undefined;
+  status: TopicStatus;
+  error: Error | null;
+}
+```
+
+### 3.3 Remote implementation
+
+**File:** `packages/client/src/interest/remote-manager.ts` (new)
+
+```typescript
+const GRACE_PERIOD_MS = 30_000;
+
+/**
+ * Remote implementation of SubscriptionManager.
+ * Manages WebSocket connections to RivetKit actors via BackendClient.
+ */
+export class RemoteSubscriptionManager implements SubscriptionManager {
+  private entries = new Map<string, TopicEntry<any, any, any>>();
+
+  constructor(private backend: BackendClient) {}
+
+  subscribe<K extends TopicKey>(topicKey: K, params: TopicParams<K>, listener: () => void): () => void {
+    const def = topicDefinitions[topicKey];
+    const cacheKey = def.key(params);
+    let entry = this.entries.get(cacheKey);
+
+    if (!entry) {
+      entry = new TopicEntry(def, this.backend, params);
+      this.entries.set(cacheKey, entry);
+    }
+
+    entry.cancelTeardown();
+    entry.addListener(listener);
+    entry.ensureStarted();
+
+    return () => {
+      entry!.removeListener(listener);
+      if (entry!.listenerCount === 0) {
+        entry!.scheduleTeardown(GRACE_PERIOD_MS, () => {
+          this.entries.delete(cacheKey);
+        });
+      }
+    };
+  }
+
+  getSnapshot<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicData<K> | undefined {
+    const cacheKey = topicDefinitions[topicKey].key(params);
+    return this.entries.get(cacheKey)?.data;
+  }
+
+  getStatus<K extends TopicKey>(topicKey: K, params: TopicParams<K>): TopicStatus {
+    const cacheKey = topicDefinitions[topicKey].key(params);
+    return this.entries.get(cacheKey)?.status ?? "loading";
+  }
+
+  getError<K extends TopicKey>(topicKey: K, params: TopicParams<K>): Error | null {
+    const cacheKey = topicDefinitions[topicKey].key(params);
+    return this.entries.get(cacheKey)?.error ?? null;
+  }
+
+  dispose(): void {
+    for (const entry of this.entries.values()) {
+      entry.dispose();
+    }
+    this.entries.clear();
+  }
+}
+
+/**
+ * Internal entry managing one topic's connection, state, and listeners.
+ *
+ * Lifecycle:
+ * 1. ensureStarted() — opens WebSocket, fetches initial state, subscribes to events.
+ * 2. Events arrive — applyEvent() updates cached state, notifies listeners.
+ * 3. Last listener leaves — scheduleTeardown() starts 30s timer.
+ * 4. Timer fires or dispose() called — closes WebSocket, drops state.
+ * 5. If a new subscriber arrives during grace period — cancelTeardown(), reuse connection.
+ */
+class TopicEntry<TData, TParams, TEvent> {
+  data: TData | undefined = undefined;
+  status: TopicStatus = "loading";
+  error: Error | null = null;
+  listenerCount = 0;
+
+  private listeners = new Set<() => void>();
+  private conn: ActorConn | null = null;
+  private unsubscribeEvent: (() => void) | null = null;
+  private teardownTimer: ReturnType<typeof setTimeout> | null = null;
+  private started = false;
+  private startPromise: Promise<void> | null = null;
+
+  constructor(
+    private def: TopicDefinition<TData, TParams, TEvent>,
+    private backend: BackendClient,
+    private params: TParams,
+  ) {}
+
+  addListener(listener: () => void) {
+    this.listeners.add(listener);
+    this.listenerCount = this.listeners.size;
+  }
+
+  removeListener(listener: () => void) {
+    this.listeners.delete(listener);
+    this.listenerCount = this.listeners.size;
+  }
+
+  ensureStarted() {
+    if (this.started || this.startPromise) return;
+    this.startPromise = this.start().finally(() => { this.startPromise = null; });
+  }
+
+  private async start() {
+    try {
+      // Open connection
+      this.conn = await this.def.connect(this.backend, this.params);
+
+      // Subscribe to events
+      this.unsubscribeEvent = this.conn.on(this.def.event, (event: TEvent) => {
+        if (this.data !== undefined) {
+          this.data = this.def.applyEvent(this.data, event);
+          this.notify();
+        }
+      });
+
+      // Fetch initial state
+      this.data = await this.def.fetchInitial(this.backend, this.params);
+      this.status = "connected";
+      this.started = true;
+      this.notify();
+    } catch (err) {
+      this.status = "error";
+      this.error = err instanceof Error ? err : new Error(String(err));
+      this.notify();
+    }
+  }
+
+  scheduleTeardown(ms: number, onTeardown: () => void) {
+    this.teardownTimer = setTimeout(() => {
+      this.dispose();
+      onTeardown();
+    }, ms);
+  }
+
+  cancelTeardown() {
+    if (this.teardownTimer) {
+      clearTimeout(this.teardownTimer);
+      this.teardownTimer = null;
+    }
+  }
+
+  dispose() {
+    this.cancelTeardown();
+    this.unsubscribeEvent?.();
+    if (this.conn) {
+      void (this.conn as any).dispose?.();
+    }
+    this.conn = null;
+    this.data = undefined;
+    this.status = "loading";
+    this.started = false;
+  }
+
+  private notify() {
+    for (const listener of [...this.listeners]) {
+      listener();
+    }
+  }
+}
+```
+
+### 3.4 Mock implementation
+
+**File:** `packages/client/src/interest/mock-manager.ts` (new)
+
+Same `SubscriptionManager` interface. Uses in-memory state. Topic definitions provide mock data. Mutations call `applyEvent` directly on the entry to simulate broadcasts. No WebSocket connections.
+
+### 3.5 React hook
+
+**File:** `packages/client/src/interest/use-interest.ts` (new)
+
+```typescript
+import { useSyncExternalStore, useMemo } from "react";
+
+/**
+ * Subscribe to a realtime topic. Returns the current state, loading status, and error.
+ *
+ * - Pass `null` as params to disable the subscription (conditional interest).
+ * - Data is cached for 30 seconds after the last subscriber leaves.
+ * - Multiple components subscribing to the same topic share one connection.
+ *
+ * @example
+ * // Subscribe to organization sidebar data
+ * const organization = useSubscription("organization", { organizationId });
+ *
+ * // Subscribe to task detail (only when viewing a task)
+ * const task = useSubscription("task", selectedTaskId ? { organizationId, repoId, taskId } : null);
+ *
+ * // Subscribe to active session content
+ * const session = useSubscription("session", activeSessionId ? { organizationId, repoId, taskId, sessionId } : null);
+ */
+export function useSubscription<K extends TopicKey>(
+  manager: SubscriptionManager,
+  topicKey: K,
+  params: TopicParams<K> | null,
+): TopicState<K> {
+  // Stabilize params reference to avoid unnecessary resubscriptions
+  const paramsKey = params ? topicDefinitions[topicKey].key(params) : null;
+
+  const subscribe = useMemo(() => {
+    return (listener: () => void) => {
+      if (!params) return () => {};
+      return manager.subscribe(topicKey, params, listener);
+    };
+  }, [manager, topicKey, paramsKey]);
+
+  const getSnapshot = useMemo(() => {
+    return (): TopicState<K> => {
+      if (!params) return { data: undefined, status: "loading", error: null };
+      return {
+        data: manager.getSnapshot(topicKey, params),
+        status: manager.getStatus(topicKey, params),
+        error: manager.getError(topicKey, params),
+      };
+    };
+  }, [manager, topicKey, paramsKey]);
+
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
+```
+
+### 3.6 BackendClient additions
+
+**File:** `packages/client/src/backend-client.ts`
+
+Add to the `BackendClient` interface:
+
+```typescript
+// New connection methods (return WebSocket-based ActorConn)
+connectWorkspace(organizationId: string): Promise<ActorConn>;
+connectTask(organizationId: string, repoId: string, taskId: string): Promise<ActorConn>;
+connectSandbox(organizationId: string, providerId: string, sandboxId: string): Promise<ActorConn>;
+
+// New fetch methods (read from materialized state)
+getWorkspaceSummary(organizationId: string): Promise<OrganizationSummarySnapshot>;
+getTaskDetail(organizationId: string, repoId: string, taskId: string): Promise<WorkbenchTaskDetail>;
+getSessionDetail(organizationId: string, repoId: string, taskId: string, sessionId: string): Promise<WorkbenchSessionDetail>;
+```
+
+Remove:
+- `subscribeWorkbench`, `subscribeApp`, `subscribeSandboxProcesses` (replaced by subscription manager)
+- `getWorkbench` (replaced by `getWorkspaceSummary` + `getTaskDetail`)
+
+---
+
+## 4. Frontend: Hook Consumption
+
+### 4.1 Provider setup
+
+**File:** `packages/frontend/src/lib/interest.ts` (new)
+
+```typescript
+import { RemoteSubscriptionManager } from "@sandbox-agent/foundry-client";
+import { backendClient } from "./backend";
+
+export const subscriptionManager = new RemoteSubscriptionManager(backendClient);
+```
+
+Or for mock mode:
+```typescript
+import { MockSubscriptionManager } from "@sandbox-agent/foundry-client";
+export const subscriptionManager = new MockSubscriptionManager();
+```
+
+### 4.2 Replace MockLayout workbench subscription
+
+**File:** `packages/frontend/src/components/mock-layout.tsx`
+
+Before:
+```typescript
+const taskWorkbenchClient = useMemo(() => getTaskWorkbenchClient(organizationId), [organizationId]);
+const viewModel = useSyncExternalStore(
+  taskWorkbenchClient.subscribe.bind(taskWorkbenchClient),
+  taskWorkbenchClient.getSnapshot.bind(taskWorkbenchClient),
+);
+const tasks = viewModel.tasks ?? [];
+```
+
+After:
+```typescript
+const organization = useSubscription(subscriptionManager, "organization", { organizationId });
+const taskSummaries = organization.data?.taskSummaries ?? [];
+const repos = organization.data?.repos ?? [];
+```
+
+### 4.3 Replace MockLayout task detail
+
+When a task is selected, subscribe to its detail:
+
+```typescript
+const taskDetail = useSubscription(subscriptionManager, "task",
+  selectedTaskId ? { organizationId, repoId: activeRepoId, taskId: selectedTaskId } : null
+);
+```
+
+### 4.4 Replace session subscription
+
+When a session tab is active:
+
+```typescript
+const sessionDetail = useSubscription(subscriptionManager, "session",
+  activeSessionId ? { organizationId, repoId, taskId, sessionId: activeSessionId } : null
+);
+```
+
+### 4.5 Replace organization-dashboard.tsx polling
+
+Remove ALL `useQuery` with `refetchInterval` in this file:
+- `tasksQuery` (2.5s polling) → `useSubscription("organization", ...)`
+- `taskDetailQuery` (2.5s polling) → `useSubscription("task", ...)`
+- `reposQuery` (10s polling) → `useSubscription("organization", ...)`
+- `repoOverviewQuery` (5s polling) → `useSubscription("organization", ...)`
+- `sessionsQuery` (3s polling) → `useSubscription("task", ...)` (sessionsSummary field)
+- `eventsQuery` (2.5s polling) → `useSubscription("session", ...)`
+
+### 4.6 Replace terminal-pane.tsx polling
+
+- `taskQuery` (2s polling) → `useSubscription("task", ...)`
+- `processesQuery` (3s polling) → `useSubscription("sandboxProcesses", ...)`
+- Remove `subscribeSandboxProcesses` useEffect
+
+### 4.7 Replace app client subscription
+
+**File:** `packages/frontend/src/lib/mock-app.ts`
+
+Before:
+```typescript
+export function useMockAppSnapshot(): FoundryAppSnapshot {
+  return useSyncExternalStore(appClient.subscribe.bind(appClient), appClient.getSnapshot.bind(appClient));
+}
+```
+
+After:
+```typescript
+export function useAppSnapshot(): FoundryAppSnapshot {
+  const app = useSubscription(subscriptionManager, "app", {});
+  return app.data ?? DEFAULT_APP_SNAPSHOT;
+}
+```
+
+### 4.8 Mutations
+
+Mutations (`createTask`, `renameTask`, `sendMessage`, etc.) no longer need manual `refetch()` or `refresh()` calls after completion. The backend mutation triggers a broadcast, which the subscription manager receives and applies automatically.
+
+Before:
+```typescript
+const createSession = useMutation({
+  mutationFn: async () => startSessionFromTask(),
+  onSuccess: async (session) => {
+    setActiveSessionId(session.id);
+    await Promise.all([sessionsQuery.refetch(), eventsQuery.refetch()]);
+  },
+});
+```
+
+After:
+```typescript
+const createSession = useMutation({
+  mutationFn: async () => startSessionFromTask(),
+  onSuccess: (session) => {
+    setActiveSessionId(session.id);
+    // No refetch needed — server broadcast updates the task and session topics automatically
+  },
+});
+```
+
+---
+
+## 5. Files to Delete / Remove
+
+| File/Code | Reason |
+|---|---|
+| `packages/client/src/remote/workbench-client.ts` | Replaced by subscription manager `organization` + `task` topics |
+| `packages/client/src/remote/app-client.ts` | Replaced by subscription manager `app` topic |
+| `packages/client/src/workbench-client.ts` | Factory for above — no longer needed |
+| `packages/client/src/app-client.ts` | Factory for above — no longer needed |
+| `packages/frontend/src/lib/workbench.ts` | Workbench client singleton — replaced by subscription manager |
+| `subscribeWorkbench` in `backend-client.ts` | Replaced by `connectWorkspace` + subscription manager |
+| `subscribeSandboxProcesses` in `backend-client.ts` | Replaced by `connectSandbox` + subscription manager |
+| `subscribeApp` in `backend-client.ts` | Replaced by `connectWorkspace("app")` + subscription manager |
+| `buildWorkbenchSnapshot` in `organization/actions.ts` | Replaced by `getWorkspaceSummary` (local reads). Keep as `reconcileWorkbenchState` for recovery only. |
+| `notifyWorkbenchUpdated` in `organization/actions.ts` | Replaced by `applyTaskSummaryUpdate` + `c.broadcast` with payload |
+| `notifyWorkbenchUpdated` in `task/workbench.ts` | Replaced by `broadcastTaskUpdate` helper |
+| `TaskWorkbenchSnapshot` in `shared/workbench.ts` | Replaced by `OrganizationSummarySnapshot` + `WorkbenchTaskDetail` |
+| `WorkbenchTask` in `shared/workbench.ts` | Split into `WorkbenchTaskSummary` + `WorkbenchTaskDetail` |
+| `getWorkbench` action on organization actor | Replaced by `getWorkspaceSummary` |
+| `TaskWorkbenchClient` interface | Replaced by `SubscriptionManager` + `useSubscription` hook |
+| All `useQuery` with `refetchInterval` in `organization-dashboard.tsx` | Replaced by `useSubscription` |
+| All `useQuery` with `refetchInterval` in `terminal-pane.tsx` | Replaced by `useSubscription` |
+| Mock workbench client (`packages/client/src/mock/workbench-client.ts`) | Replaced by `MockSubscriptionManager` |
+
+---
+
+## 6. Migration Order
+
+Implement in this order to keep the system working at each step:
+
+### Phase 1: Types and backend materialization
+1. Add new types to `packages/shared` (`WorkbenchTaskSummary`, `WorkbenchTaskDetail`, `WorkbenchSessionSummary`, `WorkbenchSessionDetail`, `OrganizationSummarySnapshot`, event types).
+2. Add `taskSummaries` table to organization actor schema.
+3. Add `applyTaskSummaryUpdate`, `removeTaskSummary`, `getWorkspaceSummary` actions to organization actor.
+4. Add `getTaskDetail`, `getSessionDetail` actions to task actor.
+5. Replace all `notifyWorkbenchUpdated` call sites with `broadcastTaskUpdate` that pushes summary + broadcasts detail with payload.
+6. Change app actor broadcast to include snapshot payload.
+7. Change sandbox actor broadcast to include process list payload.
+8. Add one-time reconciliation action to populate `taskSummaries` table from existing task actors (run on startup or on-demand).
+
+### Phase 2: Client subscription manager
+9. Add `SubscriptionManager` interface, `RemoteSubscriptionManager`, `MockSubscriptionManager` to `packages/client`.
+10. Add topic definitions registry.
+11. Add `useSubscription` hook.
+12. Add `connectWorkspace`, `connectTask`, `connectSandbox`, `getWorkspaceSummary`, `getTaskDetail`, `getSessionDetail` to `BackendClient`.
+
+### Phase 3: Frontend migration
+13. Replace `useMockAppSnapshot` with `useSubscription("app", ...)`.
+14. Replace `MockLayout` workbench subscription with `useSubscription("organization", ...)`.
+15. Replace task detail view with `useSubscription("task", ...)` + `useSubscription("session", ...)`.
+16. Replace `organization-dashboard.tsx` polling queries with `useSubscription`.
+17. Replace `terminal-pane.tsx` polling queries with `useSubscription`.
+18. Remove manual `refetch()` calls from mutations.
+
+### Phase 4: Cleanup
+19. Delete old files (workbench-client, app-client, old subscribe functions, old types).
+20. Remove `buildWorkbenchSnapshot` from hot path (keep as `reconcileWorkbenchState`).
+21. Verify `pnpm -w typecheck`, `pnpm -w build`, `pnpm -w test` pass.
+
+---
+
+## 7. Architecture Comments
+
+Add doc comments at these locations:
+
+- **Topic definitions** — explain the materialized state pattern, why events carry full entity state instead of patches, and the relationship between topics.
+- **`broadcastTaskUpdate` helper** — explain the dual-broadcast pattern (push summary to organization + broadcast detail to direct subscribers).
+- **`SubscriptionManager` interface** — explain the grace period, deduplication, and why mock/remote share the same interface.
+- **`useSubscription` hook** — explain `useSyncExternalStore` integration, null params for conditional interest, and how params key stabilization works.
+- **Organization actor `taskSummaries` table** — explain this is a materialized read projection maintained by task actor pushes, not a source of truth.
+- **`applyTaskSummaryUpdate` action** — explain this is the write path for the materialized projection, called by task actors, not by clients.
+- **`getWorkspaceSummary` action** — explain this reads from local SQLite only, no fan-out, and why that's the correct pattern.
+
+---
+
+## 8. Testing
+
+- Subscription manager unit tests: subscribe/unsubscribe lifecycle, grace period, deduplication, event application.
+- Mock implementation tests: verify same behavior as remote through shared test suite against the `SubscriptionManager` interface.
+- Backend integration: verify `applyTaskSummaryUpdate` correctly materializes and broadcasts.
+- E2E: verify that a task mutation (e.g. rename) updates the sidebar in realtime without polling.
diff --git a/foundry/research/roadmap.md b/foundry/research/roadmap.md
new file mode 100644
index 0000000..f511e8a
--- /dev/null
+++ b/foundry/research/roadmap.md
@@ -0,0 +1,4 @@
+- github auth
+- git commits
+- figure out collaboration
+
diff --git a/foundry/research/specs/async-action-fixes/00-end-to-end-async-realtime-plan.md b/foundry/research/specs/async-action-fixes/00-end-to-end-async-realtime-plan.md
new file mode 100644
index 0000000..1cb4d37
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/00-end-to-end-async-realtime-plan.md
@@ -0,0 +1,308 @@
+# End-To-End Async + Realtime Plan
+
+## Purpose
+
+This is the umbrella plan for the Foundry issues we traced across app shell, workbench, and actor runtime behavior:
+
+- long-running work still sits inline in request/action paths
+- monolithic snapshot reads fan out across too many actors
+- the client uses polling and full refreshes where it should use realtime subscriptions
+- websocket subscriptions reconnect too aggressively
+- actor shutdown can race in-flight actions and clear `c.db` underneath them
+
+The goal is not just to make individual endpoints faster. The goal is to move Foundry to a model where:
+
+- request paths only validate, create minimal state, and enqueue background work
+- list views read actor-owned projections instead of recomputing deep state
+- detail views connect directly to the actor that owns the visible state
+- polling is replaced by actor events and bounded bootstrap fetches
+- actor shutdown drains active work before cleaning up resources
+
+## Problem Summary
+
+### App shell
+
+- `getAppSnapshot` still rebuilds app shell state by reading the app session row and fanning out to every eligible organization actor.
+- `RemoteFoundryAppStore` still polls every `500ms` while any org is `syncing`.
+- Org sync/import is now off the select path, but the steady-state read path is still snapshot-based instead of subscription-based.
+
+### Workbench
+
+- `getWorkbench` still represents a monolithic organization read that aggregates repo, repository, and task state.
+- The remote workbench store still responds to every event by pulling a full fresh snapshot.
+- Some task/workbench detail is still too expensive to compute inline and too broad to refresh after every mutation.
+
+### Realtime transport
+
+- `subscribeWorkbench` and related connection helpers keep one connection per shared key, but the client contract still treats the socket as an invalidation channel for a later snapshot pull.
+- Reconnect/error handling is weak, so connection churn amplifies backend load instead of settling into long-lived subscriptions.
+
+### Runtime
+
+- RivetKit currently lets shutdown proceed far enough to clean up actor resources while actions can still be in flight or still be routed to the actor.
+- That creates the `Database not enabled` / missing `c.db` failure mode under stop/replay pressure.
+
+## Target Architecture
+
+### Request-path rule
+
+Every request/action should do only one of these:
+
+1. return actor-owned cached state
+2. persist a cheap mutation
+3. enqueue or signal background work
+
+Requests should not block on provider calls, repo sync, sandbox provisioning, transcript enumeration, or deep cross-actor fan-out unless the UI cannot render at all without the result.
+
+### View-model rule
+
+- App shell view connects to app/session state and only the org actors visible on screen.
+- Organization/task-list view connects to a organization-owned summary projection.
+- Task detail view connects directly to the selected task actor.
+- Sandbox/session detail connects only when the user opens that detail.
+
+Do not replace one monolith with one connection per row. List screens should still come from actor-owned projections.
+
+### Runtime rule
+
+Stopping actors must stop accepting new work and must not clear actor resources until active actions and requests have drained or been cancelled.
+
+## Workstreams
+
+### 1. Runtime hardening first
+
+This is the only workstream that is not Foundry-only. It should start immediately because it is the only direct fix for the `c.db` shutdown race.
+
+#### Changes
+
+1. Add active action/request accounting in RivetKit actor instances.
+2. Mark actors as draining before cleanup starts.
+3. Reject or reroute new requests/actions once draining begins.
+4. Wait for active actions to finish or abort before `#cleanupDatabase()` runs.
+5. Delay clearing `#db` until no active actions remain.
+6. Add actor stop logs with:
+   - actor id
+   - active action count
+   - active request count
+   - drain start/end timestamps
+   - cleanup start/end timestamps
+
+#### Acceptance criteria
+
+- No action can successfully enter user code after actor draining begins.
+- `Database not enabled` cannot be produced by an in-flight action after stop has begun.
+- Stop logs make it obvious whether shutdown delay is run-handler time, active-action drain time, background promise time, or routing delay.
+
+### 2. App shell moves from snapshot polling to subscriptions
+
+The app shell should stop using `/app/snapshot` as the steady-state read model.
+
+#### Changes
+
+1. Introduce a small app-shell projection owned by the app organization actor:
+   - auth status
+   - current user summary
+   - active org id
+   - visible org ids
+   - per-org lightweight status summary
+2. Add app actor events, for example:
+   - `appSessionUpdated`
+   - `activeOrganizationChanged`
+   - `organizationSyncStatusChanged`
+3. Expose connection helpers from the backend client for:
+   - app actor subscription
+   - organization actor subscription by id
+4. Update `RemoteFoundryAppStore` so it:
+   - does one bootstrap fetch on first subscribe
+   - connects to the app actor for ongoing updates
+   - connects only to the org actors needed for the current view
+   - disposes org subscriptions when they are no longer visible
+5. Remove `scheduleSyncPollingIfNeeded()` and the `500ms` refresh loop.
+
+#### Likely files
+
+- `foundry/packages/backend/src/actors/organization/app-shell.ts`
+- `foundry/packages/client/src/backend-client.ts`
+- `foundry/packages/client/src/remote/app-client.ts`
+- `foundry/packages/shared/src/app-shell.ts`
+- app shell frontend consumers
+
+#### Acceptance criteria
+
+- No app shell polling loop remains.
+- Selecting an org returns quickly and the UI updates from actor events.
+- App shell refresh cost is bounded by visible state, not every eligible organization on every poll.
+
+### 3. Organization summary becomes a projection, not a full snapshot
+
+The task list should read a organization-owned summary projection instead of calling into every task actor on each refresh.
+
+#### Changes
+
+1. Define a durable organization summary model with only list-screen fields:
+   - repo summary
+   - repository summary
+   - task summary
+   - selected/open task ids
+   - unread/session status summary
+   - coarse git/PR state summary
+2. Update organization actor workflows so task/repository changes incrementally update this projection.
+3. Change `getWorkbench` to return the projection only.
+4. Change `workbenchUpdated` from "invalidate and refetch everything" to "here is the updated projection version or changed entity ids".
+5. Remove task-actor fan-out from the default list read path.
+
+#### Likely files
+
+- `foundry/packages/backend/src/actors/organization/actions.ts`
+- `foundry/packages/backend/src/actors/repository/actions.ts`
+- `foundry/packages/backend/src/actors/task/index.ts`
+- `foundry/packages/backend/src/actors/task/workbench.ts`
+- task/organization DB schema and migrations
+- `foundry/packages/client/src/remote/workbench-client.ts`
+
+#### Acceptance criteria
+
+- Workbench list refresh does not call every task actor.
+- A websocket event does not force a full cross-actor rebuild.
+- Initial task-list load time scales roughly with organization summary size, not repo count times task count times detail reads.
+
+### 4. Task detail moves to direct actor reads and events
+
+Heavy task detail should move out of the organization summary and into the selected task actor.
+
+#### Changes
+
+1. Split task detail into focused reads/subscriptions:
+   - task header/meta
+   - tabs/session summary
+   - transcript stream
+   - diff/file tree
+   - sandbox process state
+2. Open a task actor connection only for the selected task.
+3. Open sandbox/session subscriptions only for the active tab/pane.
+4. Dispose those subscriptions when the user changes selection.
+5. Keep expensive derived state cached in actor-owned tables and update it from background jobs or event ingestion.
+
+#### Acceptance criteria
+
+- Opening the task list does not open connections to every task actor.
+- Opening a task shows staged loading for heavy panes instead of blocking the whole workbench snapshot.
+- Transcript, diff, and file-tree reads are not recomputed for unrelated tasks.
+
+### 5. Finish moving long-running mutations to background workflows
+
+This extends and completes the existing async-action briefs in this folder.
+
+#### Existing briefs to implement under this workstream
+
+1. `01-task-creation-bootstrap-only.md`
+2. `02-repo-overview-from-cached-projection.md`
+3. `03-repo-actions-via-background-workflow.md`
+4. `04-workbench-session-creation-without-inline-provisioning.md`
+5. `05-workbench-snapshot-from-derived-state.md`
+6. `06-daytona-provisioning-staged-background-flow.md`
+
+#### Additional rule
+
+Every workflow-backed mutation should leave behind durable status rows or events that realtime clients can observe without polling.
+
+### 6. Subscription lifecycle and reconnect behavior need one shared model
+
+The current client-side connection pattern is too ad hoc. It needs a single lifecycle policy so sockets are long-lived and bounded.
+
+#### Changes
+
+1. Create one shared subscription manager in the client for:
+   - reference counting
+   - connection reuse
+   - reconnect backoff
+   - connection state events
+   - clean disposal
+2. Make invalidation optional. Prefer payload-bearing events or projection version updates.
+3. Add structured logs/metrics in the client for:
+   - connection created/disposed
+   - reconnect attempts
+   - subscription count per actor key
+   - refresh triggered by event vs bootstrap vs mutation
+4. Stop calling full `refresh()` after every mutation when the mutation result or follow-up event already contains enough state to update locally.
+
+#### Acceptance criteria
+
+- Idle screens maintain stable websocket counts.
+- Transient socket failures do not create refresh storms.
+- The client can explain why any given refresh happened.
+
+### 7. Clean up HTTP surface after realtime migration
+
+Do not delete bootstrap endpoints first. Shrink them after the subscription model is working.
+
+#### Changes
+
+1. Keep one-shot bootstrap/read endpoints only where they still add value:
+   - initial app load
+   - initial workbench load
+   - deep-link fallback
+2. Remove or de-emphasize monolithic snapshot endpoints for steady-state use.
+3. Keep HTTP for control-plane and external integrations.
+
+#### Acceptance criteria
+
+- Main interactive screens do not depend on polling.
+- Snapshot endpoints are bootstrap/fallback paths, not the primary UI contract.
+
+## Suggested Implementation Order
+
+1. Runtime hardening in RivetKit
+2. `01-task-creation-bootstrap-only.md`
+3. `03-repo-actions-via-background-workflow.md`
+4. `06-daytona-provisioning-staged-background-flow.md`
+5. App shell realtime subscription model
+6. `02-repo-overview-from-cached-projection.md`
+7. Organization summary projection
+8. `04-workbench-session-creation-without-inline-provisioning.md`
+9. `05-workbench-snapshot-from-derived-state.md`
+10. Task-detail direct actor reads/subscriptions
+11. Client subscription lifecycle cleanup
+12. `07-auth-identity-simplification.md`
+
+## Why This Order
+
+- Runtime hardening removes the most dangerous correctness bug before more UI load shifts onto actor connections.
+- The first async workflow items reduce the biggest user-visible stalls quickly.
+- App shell realtime is smaller and lower-risk than the workbench migration, and it removes the current polling loop.
+- Organization summary and task-detail split should happen after the async workflow moves so the projection model does not encode old synchronous assumptions.
+- Auth simplification is valuable but not required to remove the current refresh/polling/runtime problems.
+
+## Observability Requirements
+
+Before or alongside implementation, add metrics/logs for:
+
+- app snapshot bootstrap duration
+- workbench bootstrap duration
+- actor connection count by actor type and view
+- reconnect count by actor key
+- projection rebuild/update duration
+- workflow queue latency
+- actor drain duration and active-action counts during stop
+
+Each log line should include a request id or actor/event correlation id where possible.
+
+## Rollout Strategy
+
+1. Ship runtime hardening and observability first.
+2. Ship app-shell realtime behind a client flag while keeping snapshot bootstrap.
+3. Ship organization summary projection behind a separate flag.
+4. Migrate one heavy detail pane at a time off the monolithic workbench payload.
+5. Remove polling once the matching event path is proven stable.
+6. Only then remove or demote the old snapshot-heavy steady-state flows.
+
+## Done Means
+
+This initiative is done when all of the following are true:
+
+- no user-visible screen depends on `500ms` polling
+- no list view recomputes deep task/session/diff state inline on every refresh
+- long-running repo/provider/sandbox work always runs in durable background workflows
+- the client connects only to actors relevant to the current view and disposes them when the view changes
+- websocket counts stay stable on idle screens
+- actor shutdown cannot invalidate `c.db` underneath active actions
diff --git a/foundry/research/specs/async-action-fixes/01-task-creation-bootstrap-only.md b/foundry/research/specs/async-action-fixes/01-task-creation-bootstrap-only.md
new file mode 100644
index 0000000..1eb1594
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/01-task-creation-bootstrap-only.md
@@ -0,0 +1,78 @@
+# Task Creation Should Return After Actor Bootstrap
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Task creation currently waits for full provisioning: naming, repo checks, sandbox creation/resume, sandbox-agent install/start, sandbox-instance wiring, and session creation.
+
+That makes a user-facing action depend on queue-backed and provider-backed work that can take minutes. The client only needs the task actor to exist so it can navigate to the task and observe progress.
+
+## Current Code Context
+
+- Organization entry point: `foundry/packages/backend/src/actors/organization/actions.ts`
+- Repository task creation path: `foundry/packages/backend/src/actors/repository/actions.ts`
+- Task action surface: `foundry/packages/backend/src/actors/task/index.ts`
+- Task workflow: `foundry/packages/backend/src/actors/task/workflow/index.ts`
+- Task init/provision steps: `foundry/packages/backend/src/actors/task/workflow/init.ts`
+- Provider-backed long steps currently happen inside the task provision workflow.
+
+## Target Contract
+
+- `createTask` returns once the task actor exists and initial task metadata is persisted.
+- The response includes the task identity the client needs for follow-up reads and subscriptions.
+- Provisioning continues in the background through the task workflow.
+- Progress and failure are surfaced through task state, history events, and workbench updates.
+
+## Proposed Fix
+
+1. Restore the async split between `initialize` and `provision`.
+2. Keep `task.command.initialize` responsible for:
+   - creating the task actor
+   - bootstrapping DB rows
+   - persisting any immediately-known metadata
+   - returning the current task record
+3. After initialize completes, enqueue `task.command.provision` with `wait: false`.
+4. Change `organization.createTask` to:
+   - create or resolve the repository
+   - create the task actor
+   - call `task.initialize(...)`
+   - stop awaiting `task.provision(...)`
+   - broadcast a workbench/task update
+   - return the task record immediately
+5. Persist a clear queued/running state for provisioning so the frontend can distinguish:
+   - `init_enqueue_provision`
+   - `init_ensure_name`
+   - `init_create_sandbox`
+   - `init_ensure_agent`
+   - `init_create_session`
+   - `running`
+   - `error`
+
+## Files Likely To Change
+
+- `foundry/packages/backend/src/actors/organization/actions.ts`
+- `foundry/packages/backend/src/actors/repository/actions.ts`
+- `foundry/packages/backend/src/actors/task/index.ts`
+- `foundry/packages/backend/src/actors/task/workflow/index.ts`
+- `foundry/packages/backend/src/actors/task/workflow/init.ts`
+- `foundry/packages/frontend/src/components/organization-dashboard.tsx`
+- `foundry/packages/client/src/remote/workbench-client.ts`
+
+## Client Impact
+
+- Task creation UI should navigate immediately to the task page.
+- The page should render a provisioning state from task status instead of treating create as an all-or-nothing spinner.
+- Any tab/session creation that depends on provisioning should observe task state and wait for readiness asynchronously.
+
+## Acceptance Criteria
+
+- Creating a task never waits on sandbox creation or session creation.
+- A timeout in provider setup does not make the original create request fail after several minutes.
+- After a backend restart, the task workflow can resume provisioning from durable state without requiring the client to retry create.
+
+## Implementation Notes
+
+- Preserve the existing task actor as the single writer for task runtime state.
+- Do not introduce a second creator path for task actors; keep one create/bootstrap path and one background provision path.
+- Fresh-agent check: verify that `createWorkbenchTask` and any dashboard create flow still have enough data to navigate immediately after this change.
diff --git a/foundry/research/specs/async-action-fixes/02-repo-overview-from-cached-projection.md b/foundry/research/specs/async-action-fixes/02-repo-overview-from-cached-projection.md
new file mode 100644
index 0000000..1d31216
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/02-repo-overview-from-cached-projection.md
@@ -0,0 +1,71 @@
+# Repo Overview Should Read Cached State Only
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Repo overview currently forces PR sync and branch sync inline before returning data. That turns a read path into:
+
+- repo fetch
+- branch enumeration
+- diff/conflict calculations
+- GitHub PR listing
+
+The frontend polls repo overview repeatedly, so this design multiplies slow work and ties normal browsing to sync latency.
+
+## Current Code Context
+
+- Organization overview entry point: `foundry/packages/backend/src/actors/organization/actions.ts`
+- Repository overview implementation: `foundry/packages/backend/src/actors/repository/actions.ts`
+- Branch sync poller: `foundry/packages/backend/src/actors/repository-branch-sync/index.ts`
+- PR sync poller: `foundry/packages/backend/src/actors/repository-pr-sync/index.ts`
+- Repo overview client polling: `foundry/packages/frontend/src/components/organization-dashboard.tsx`
+
+## Target Contract
+
+- `getRepoOverview` returns the latest cached repo projection immediately.
+- Sync happens on a background cadence or on an explicit async refresh trigger.
+- Overview responses include freshness metadata so the client can show "refreshing" or "stale" state without blocking.
+
+## Proposed Fix
+
+1. Remove inline `forceProjectSync()` from `getRepoOverview`.
+2. Add freshness fields to the repository projection, for example:
+   - `branchSyncAt`
+   - `prSyncAt`
+   - `branchSyncStatus`
+   - `prSyncStatus`
+3. Let the existing polling actors own cache refresh.
+4. If the client needs a manual refresh, add a non-blocking command such as `repository.requestOverviewRefresh` that:
+   - enqueues refresh work
+   - updates sync status to `queued` or `running`
+   - returns immediately
+5. Keep `getRepoOverview` as a pure read over repository SQLite state.
+
+## Files Likely To Change
+
+- `foundry/packages/backend/src/actors/organization/actions.ts`
+- `foundry/packages/backend/src/actors/repository/actions.ts`
+- `foundry/packages/backend/src/actors/repository/db/schema.ts`
+- `foundry/packages/backend/src/actors/repository/db/migrations.ts`
+- `foundry/packages/backend/src/actors/repository-branch-sync/index.ts`
+- `foundry/packages/backend/src/actors/repository-pr-sync/index.ts`
+- `foundry/packages/frontend/src/components/organization-dashboard.tsx`
+
+## Client Impact
+
+- The repo overview screen should render cached rows immediately.
+- If the user requests a refresh, the UI should show a background sync indicator instead of waiting for the GET call to complete.
+- Polling frequency can be reduced because reads are now cheap and sync is event-driven.
+
+## Acceptance Criteria
+
+- `getRepoOverview` does not call `force()` on polling actors.
+- Opening the repo overview page does not trigger network/git work inline.
+- Slow branch sync or PR sync no longer blocks the page request.
+
+## Implementation Notes
+
+- Favor adding explicit freshness metadata over implicit timing assumptions in the frontend.
+- The overview query should remain safe to call frequently even if the UI still polls during the transition.
+- Fresh-agent check: confirm no other read paths call `forceProjectSync()` inline after this change.
diff --git a/foundry/research/specs/async-action-fixes/03-repo-actions-via-background-workflow.md b/foundry/research/specs/async-action-fixes/03-repo-actions-via-background-workflow.md
new file mode 100644
index 0000000..9fdd46a
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/03-repo-actions-via-background-workflow.md
@@ -0,0 +1,74 @@
+# Repo Sync And Stack Actions Should Run In Background Workflows
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Repo stack actions currently run inside a synchronous action and surround the action with forced sync before and after. Branch-backed task creation also forces repo sync inline before it can proceed.
+
+These flows depend on repo/network state and can take minutes. They should not hold an action open.
+
+## Current Code Context
+
+- Organization repo action entry point: `foundry/packages/backend/src/actors/organization/actions.ts`
+- Repository repo action implementation: `foundry/packages/backend/src/actors/repository/actions.ts`
+- Branch/task index state lives in the repository actor SQLite DB.
+- Current forced sync uses the PR and branch polling actors before and after the action.
+
+## Target Contract
+
+- Repo-affecting actions are accepted quickly and run in the background.
+- The repository actor owns a durable action record with progress and final result.
+- Clients observe status via repository/task state instead of waiting for a single response.
+
+## Proposed Fix
+
+1. Introduce a repository-level workflow/job model for repo actions, for example:
+   - `sync_repo`
+   - `restack_repo`
+   - `restack_subtree`
+   - `rebase_branch`
+   - `reparent_branch`
+   - `register_existing_branch`
+2. Persist a job row with:
+   - job id
+   - action kind
+   - target branch fields
+   - status
+   - message
+   - timestamps
+3. Change `runRepoStackAction` to:
+   - validate cheap local inputs only
+   - create a job row
+   - enqueue the workflow with `wait: false`
+   - return the job id and accepted status immediately
+4. Move pre/post sync into the background workflow.
+5. For branch-backed task creation:
+   - use the cached branch projection if present
+   - if branch data is stale or missing, enqueue branch registration/refresh work and surface pending state instead of blocking create
+
+## Files Likely To Change
+
+- `foundry/packages/backend/src/actors/organization/actions.ts`
+- `foundry/packages/backend/src/actors/repository/actions.ts`
+- `foundry/packages/backend/src/actors/repository/db/schema.ts`
+- `foundry/packages/backend/src/actors/repository/db/migrations.ts`
+- `foundry/packages/frontend/src/components/organization-dashboard.tsx`
+- Any shared types in `foundry/packages/shared/src`
+
+## Client Impact
+
+- Repo action buttons should show queued/running/completed/error job state.
+- Task creation from an existing branch may produce a task in a pending branch-attach state rather than blocking on repo sync.
+
+## Acceptance Criteria
+
+- No repo stack action waits for full git-spice execution inside the request.
+- No action forces branch sync or PR sync inline.
+- Action result state survives retries and backend restarts because the workflow status is persisted.
+
+## Implementation Notes
+
+- Keep validation cheap in the request path; expensive repo inspection belongs in the workflow.
+- If job rows are added, decide whether they are repository-owned only or also mirrored into history events for UI consumption.
+- Fresh-agent check: branch-backed task creation and explicit repo stack actions should use the same background job/status vocabulary where possible.
diff --git a/foundry/research/specs/async-action-fixes/04-workbench-session-creation-without-inline-provisioning.md b/foundry/research/specs/async-action-fixes/04-workbench-session-creation-without-inline-provisioning.md
new file mode 100644
index 0000000..d48e4f0
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/04-workbench-session-creation-without-inline-provisioning.md
@@ -0,0 +1,62 @@
+# Workbench Session Creation Must Not Trigger Inline Provisioning
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Creating a workbench tab currently provisions the whole task if no active sandbox exists. A user action that looks like "open tab" can therefore block on sandbox creation and agent setup.
+
+## Current Code Context
+
+- Organization workbench action entry point: `foundry/packages/backend/src/actors/organization/actions.ts`
+- Task workbench behavior: `foundry/packages/backend/src/actors/task/workbench.ts`
+- Task provision action: `foundry/packages/backend/src/actors/task/index.ts`
+- Sandbox session creation path: `foundry/packages/backend/src/actors/sandbox-instance/index.ts`
+- Remote workbench refresh behavior: `foundry/packages/client/src/remote/workbench-client.ts`
+
+## Target Contract
+
+- Creating a tab returns quickly.
+- If the task is not provisioned yet, the tab enters a pending state and becomes usable once provisioning completes.
+- Provisioning remains a task workflow concern, not a workbench request concern.
+
+## Proposed Fix
+
+1. Split tab creation from sandbox session creation.
+2. On `createWorkbenchSession`:
+   - create session metadata or a placeholder tab row immediately
+   - if the task is not provisioned, enqueue the required background work and return the placeholder id
+   - if the task is provisioned, enqueue background session creation if that step can also be slow
+3. Add a tab/session state model such as:
+   - `pending_provision`
+   - `pending_session_create`
+   - `ready`
+   - `error`
+4. When provisioning or session creation finishes, update the placeholder row with the real sandbox/session identifiers and notify the workbench.
+
+## Files Likely To Change
+
+- `foundry/packages/backend/src/actors/organization/actions.ts`
+- `foundry/packages/backend/src/actors/task/workbench.ts`
+- `foundry/packages/backend/src/actors/task/index.ts`
+- `foundry/packages/backend/src/actors/task/db/schema.ts`
+- `foundry/packages/backend/src/actors/task/db/migrations.ts`
+- `foundry/packages/client/src/remote/workbench-client.ts`
+- `foundry/packages/frontend/src/components/mock-layout.tsx`
+
+## Client Impact
+
+- The workbench can show a disabled composer or "Preparing environment" state for a pending tab.
+- The UI no longer needs to block on the mutation itself.
+
+## Acceptance Criteria
+
+- `createWorkbenchSession` never calls task provisioning inline.
+- Opening a tab on an unprovisioned task returns promptly with a placeholder tab id.
+- The tab transitions to ready through background updates only.
+
+## Implementation Notes
+
+- The main design choice here is placeholder identity. Decide early whether placeholder tab ids are durable synthetic ids or whether a pending row can be updated in place once a real session exists.
+- Avoid coupling this design to Daytona specifically; it should work for local and remote providers.
+- Fresh-agent check: confirm composer, unread state, and tab close behavior all handle pending/error tabs cleanly.
diff --git a/foundry/research/specs/async-action-fixes/05-workbench-snapshot-from-derived-state.md b/foundry/research/specs/async-action-fixes/05-workbench-snapshot-from-derived-state.md
new file mode 100644
index 0000000..07cc0a5
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/05-workbench-snapshot-from-derived-state.md
@@ -0,0 +1,69 @@
+# Workbench Snapshots Should Read Derived State, Not Recompute It
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Workbench snapshot reads currently execute expensive sandbox commands and transcript reads inline:
+
+- `git status`
+- `git diff --numstat`
+- one diff per changed file
+- file tree enumeration
+- transcript reads for each session
+- session status lookups
+
+The remote workbench client refreshes after each action and on update events, so this synchronous snapshot work is amplified.
+
+## Current Code Context
+
+- Organization workbench snapshot builder: `foundry/packages/backend/src/actors/organization/actions.ts`
+- Task workbench snapshot builder: `foundry/packages/backend/src/actors/task/workbench.ts`
+- Sandbox session event persistence: `foundry/packages/backend/src/actors/sandbox-instance/persist.ts`
+- Remote workbench client refresh loop: `foundry/packages/client/src/remote/workbench-client.ts`
+- Mock layout consumer: `foundry/packages/frontend/src/components/mock-layout.tsx`
+
+## Target Contract
+
+- `getWorkbench` reads a cached projection only.
+- Expensive sandbox- or session-derived data is updated asynchronously and stored in actor-owned tables.
+- Detail-heavy payloads are fetched separately when the user actually opens that view.
+
+## Proposed Fix
+
+1. Split the current monolithic workbench snapshot into:
+   - lightweight task/workbench summary
+   - session transcript endpoint
+   - file diff endpoint
+   - file tree endpoint
+2. Cache derived git state in SQLite, updated by background jobs or targeted invalidation after mutating actions.
+3. Cache transcript/session metadata incrementally from sandbox events instead of reading full transcripts on every snapshot.
+4. Keep `getWorkbench` limited to summary fields needed for the main screen.
+5. Update the remote workbench client to rely more on push updates and less on immediate full refresh after every mutation.
+
+## Files Likely To Change
+
+- `foundry/packages/backend/src/actors/organization/actions.ts`
+- `foundry/packages/backend/src/actors/task/workbench.ts`
+- `foundry/packages/backend/src/actors/task/db/schema.ts`
+- `foundry/packages/backend/src/actors/task/db/migrations.ts`
+- `foundry/packages/client/src/remote/workbench-client.ts`
+- `foundry/packages/shared/src`
+- `foundry/packages/frontend/src/components/mock-layout.tsx`
+
+## Client Impact
+
+- Main workbench loads faster and remains responsive with many tasks/files/sessions.
+- Heavy panes can show their own loading states when opened.
+
+## Acceptance Criteria
+
+- `getWorkbench` does not run per-file diff commands inline.
+- `getWorkbench` does not read full transcripts for every tab inline.
+- Full workbench refresh cost stays roughly proportional to task count, not task count times changed files times sessions.
+
+## Implementation Notes
+
+- This is the broadest UI-facing refactor in the set.
+- Prefer introducing lighter cached summary fields first, then moving heavy detail into separate reads.
+- Fresh-agent check: define the final snapshot contract before changing frontend consumers, otherwise the refactor will sprawl.
diff --git a/foundry/research/specs/async-action-fixes/06-daytona-provisioning-staged-background-flow.md b/foundry/research/specs/async-action-fixes/06-daytona-provisioning-staged-background-flow.md
new file mode 100644
index 0000000..287d9fa
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/06-daytona-provisioning-staged-background-flow.md
@@ -0,0 +1,77 @@
+# Daytona Provisioning Should Be A Staged Background Flow
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Daytona provisioning currently performs long-running setup inline:
+
+- sandbox create/start
+- package/tool installation
+- repo clone/fetch/checkout
+- sandbox-agent install
+- agent plugin install
+- sandbox-agent boot
+- health wait loop
+
+This is acceptable inside a durable background workflow, but not as part of a user-facing action response.
+
+## Current Code Context
+
+- Daytona provider implementation: `foundry/packages/backend/src/providers/daytona/index.ts`
+- Task provisioning workflow: `foundry/packages/backend/src/actors/task/workflow/index.ts`
+- Task init activities: `foundry/packages/backend/src/actors/task/workflow/init.ts`
+- Sandbox-instance actor: `foundry/packages/backend/src/actors/sandbox-instance/index.ts`
+- Provider registry/runtime context: `foundry/packages/backend/src/providers/index.ts` and `foundry/packages/backend/src/actors/context.ts`
+
+## Target Contract
+
+- Requests that need Daytona resources only wait for persisted actor/job creation.
+- Daytona setup progresses through durable stages with explicit status.
+- Follow-up work resumes from persisted state after crashes or restarts.
+
+## Proposed Fix
+
+1. Introduce a provider-facing staged readiness model, for example:
+   - `sandbox_allocated`
+   - `repo_prepared`
+   - `agent_installing`
+   - `agent_starting`
+   - `agent_ready`
+   - `session_creating`
+   - `ready`
+   - `error`
+2. Persist stage transitions in task or sandbox-instance state.
+3. Keep provider calls inside background workflow steps only.
+4. Replace synchronous health-wait loops in request paths with:
+   - background step execution
+   - status updates after each step
+   - follow-up workflow progression once the prior stage completes
+5. If sandbox-agent session creation is also slow, treat that as its own stage instead of folding it into request completion.
+
+## Files Likely To Change
+
+- `foundry/packages/backend/src/providers/daytona/index.ts`
+- `foundry/packages/backend/src/actors/task/workflow/index.ts`
+- `foundry/packages/backend/src/actors/task/workflow/init.ts`
+- `foundry/packages/backend/src/actors/task/db/schema.ts`
+- `foundry/packages/backend/src/actors/task/db/migrations.ts`
+- `foundry/packages/backend/src/actors/sandbox-instance/index.ts`
+- Potentially shared provider types in `foundry/packages/backend/src/providers/provider-api/index.ts`
+
+## Client Impact
+
+- Users see staged progress instead of a long spinner.
+- Failures point to a concrete stage, which makes retries and debugging much easier.
+
+## Acceptance Criteria
+
+- No user-facing request waits for Daytona package installs, repo clone, sandbox-agent installation, or health polling.
+- Progress survives backend restarts because the stage is persisted.
+- The system can resume from the last completed stage instead of replaying the whole provisioning path blindly.
+
+## Implementation Notes
+
+- If this is implemented after item 1, much of the user-facing pain disappears immediately; this item then becomes about reliability and clearer progress reporting.
+- Keep the stage model provider-agnostic where possible so local and future providers can share the same task runtime semantics.
+- Fresh-agent check: decide whether stage ownership lives on the task actor, sandbox-instance actor, or both before changing schema.
diff --git a/foundry/research/specs/async-action-fixes/07-auth-identity-simplification.md b/foundry/research/specs/async-action-fixes/07-auth-identity-simplification.md
new file mode 100644
index 0000000..dbaf976
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/07-auth-identity-simplification.md
@@ -0,0 +1,328 @@
+# Auth & Identity Simplification: Adopt BetterAuth + Extract User Model
+
+Read `00-end-to-end-async-realtime-plan.md` first for the governing migration order, runtime constraints, and realtime client model this brief assumes.
+
+## Problem
+
+Authentication and user identity are conflated into a single `appSessions` table that serves as the session store, user record, OAuth credential store, navigation state, and onboarding tracker simultaneously. There is no canonical user record — identity fields are denormalized into every session row. BetterAuth env vars exist (`BETTER_AUTH_URL`, `BETTER_AUTH_SECRET`) but the library is not used; all OAuth and session handling is hand-rolled.
+
+### Specific issues
+
+1. **No user table.** Same GitHub user in two browsers = two independent copies of identity fields with no shared record. Org membership, onboarding state, and role are per-session instead of per-user.
+2. **Unsigned session tokens.** Session IDs are plain UUIDs in `localStorage`, sent via `x-foundry-session` header. The backend trusts them at face value — no signature verification.
+3. **Unstable user IDs.** User ID is `user-${slugify(viewer.login)}` which breaks on GitHub username renames. GitHub numeric `id` is available from the API but not used as the stable key.
+4. **Dead BetterAuth references.** `BETTER_AUTH_URL` is used as a URL alias in `app-shell-runtime.ts:65`. `BETTER_AUTH_SECRET` is documented but never read. This creates confusion about what auth system is actually in use.
+5. **Overloaded session row.** `appSessions` has 15+ columns mixing auth credentials, user identity, org navigation, onboarding state, and transient OAuth flow state.
+
+## Current Code Context
+
+- Custom OAuth flow: `foundry/packages/backend/src/services/app-github.ts` (`buildAuthorizeUrl`, `exchangeCode`, `getViewer`)
+- Session + identity management: `foundry/packages/backend/src/actors/organization/app-shell.ts` (`ensureAppSession`, `updateAppSession`, `initGithubSession`, `syncGithubOrganizations`)
+- Session schema: `foundry/packages/backend/src/actors/organization/db/schema.ts` (`appSessions` table)
+- Shared types: `foundry/packages/shared/src/app-shell.ts` (`FoundryUser`, `FoundryAppSnapshot`)
+- HTTP routes: `foundry/packages/backend/src/index.ts` (`resolveSessionId`, `/v1/auth/github/*`, all `/v1/app/*` routes)
+- Frontend session persistence: `foundry/packages/client/src/backend-client.ts` (`persistAppSessionId`, `x-foundry-session` header, `foundrySession` URL param extraction)
+- Runtime config: `foundry/packages/backend/src/services/app-shell-runtime.ts` (`BETTER_AUTH_URL` fallback)
+- Compose config: `foundry/compose.dev.yaml` (`BETTER_AUTH_URL`, `BETTER_AUTH_SECRET` env vars)
+- Self-hosting docs: `docs/deploy/foundry-self-hosting.mdx` (documents both env vars)
+
+## Target State
+
+### BetterAuth owns auth plumbing
+
+- BetterAuth handles GitHub OAuth (authorize URL, code exchange, CSRF state, token storage).
+- BetterAuth manages session lifecycle (signed tokens, expiration, revocation).
+- BetterAuth creates and maintains `user`, `session`, and `account` tables with proper FKs.
+- `BETTER_AUTH_SECRET` is actually used for session signing.
+- `BETTER_AUTH_URL` is actually used as the auth callback base URL.
+
+### Custom actor-routed adapter
+
+- BetterAuth uses a custom adapter that routes all DB operations through RivetKit actors.
+- Each user has their own actor. BetterAuth's `user`, `session`, and `account` tables live in the per-user actor's SQLite via `c.db`.
+- The adapter resolves which actor to target based on the primary key BetterAuth passes for each operation (user ID, session ID, account ID).
+- A lightweight **session index** on the app-shell organization actor maps session tokens → user actor identity, so inbound requests can be routed to the correct user actor without knowing the user ID upfront.
+
+### Canonical user record
+
+- Users are identified by GitHub numeric account ID (immutable across renames).
+- BetterAuth's `user` table in the per-user actor is the single source of truth for identity.
+- App-specific user fields (`eligibleOrganizationIds`, `starterRepoStatus`, `roleLabel`) live in a `userProfiles` table in the same per-user actor, keyed by user ID, not duplicated per session.
+
+### Thin sessions
+
+- Sessions reference a user ID (FK) instead of duplicating identity fields.
+- App-specific session state (`activeOrganizationId`) lives in a `sessionState` table in the per-user actor or as BetterAuth session additional fields.
+- Transient OAuth flow state (`oauthState`, `oauthStateExpiresAt`) is handled by BetterAuth internally.
+
+### Snapshot projection unchanged
+
+- `FoundryAppSnapshot` and `FoundryUser` types remain the same — they're already the right shape.
+- The snapshot builder reads from the user actor's BetterAuth tables + `userProfiles` instead of reading everything from `appSessions`.
+
+## Architecture: Custom Actor-Routed BetterAuth Adapter
+
+### Why a custom adapter
+
+BetterAuth expects a single database. Foundry uses per-actor SQLite — each actor instance gets its own `c.db`. Users each have their own actor, so BetterAuth's `user`, `session`, and `account` records must live inside the correct user actor's database. The adapter must route each BetterAuth DB operation to the right actor based on the primary key.
+
+### Routing challenge: session → user actor
+
+When an HTTP request arrives, the backend has a session token but doesn't know the user ID yet. BetterAuth calls adapter methods like `findSession(sessionId)` to resolve this. But which actor holds that session row?
+
+**Solution: session index on the app-shell organization actor.**
+
+The app-shell organization actor (which already handles auth routing) maintains a lightweight index table:
+
+```
+sessionIndex
+├── sessionId (text, PK)
+├── userActorKey (text) — actor key for the user actor that owns this session
+├── createdAt (integer)
+```
+
+The adapter flow for session lookup:
+1. BetterAuth calls `findSession(sessionId)`.
+2. Adapter queries `sessionIndex` on the organization actor to resolve `userActorKey`.
+3. Adapter gets the user actor handle and queries BetterAuth's `session` table in that actor's `c.db`.
+
+The adapter flow for user creation (OAuth callback):
+1. BetterAuth calls `createUser(userData)`.
+2. Adapter resolves the GitHub numeric ID from the user data.
+3. Adapter creates/gets the user actor keyed by GitHub ID.
+4. Adapter inserts into BetterAuth's `user` table in that actor's `c.db`.
+5. When `createSession` follows, adapter writes to the user actor's `session` table AND inserts into the organization actor's `sessionIndex`.
+
+### User actor shape
+
+```text
+UserActor (key: ["ws", organizationId, "user", githubNumericId])
+├── BetterAuth tables: user, session, account (managed by BetterAuth schema)
+├── userProfiles (app-specific: eligibleOrganizationIds, starterRepoStatus, roleLabel)
+└── sessionState (app-specific: activeOrganizationId per session)
+```
+
+### BetterAuth adapter interface (concrete)
+
+BetterAuth uses `createAdapterFactory` from `"better-auth/adapters"`. The adapter is **model-based, not entity-based** — it receives a `model` string (`"user"`, `"session"`, `"account"`, `"verification"`) and generic CRUD parameters. All methods are **async** and return Promises. The adapter can do arbitrary async work including actor handle resolution and cross-actor messages.
+
+```typescript
+// Adapter methods (all async, all receive model name + generic params):
+create:     ({ model, data, select? }) => Promise<T>
+findOne:    ({ model, where, select?, join? }) => Promise<T | null>
+findMany:   ({ model, where, limit?, offset?, sortBy?, join? }) => Promise<T[]>
+update:     ({ model, where, update }) => Promise<T | null>
+updateMany: ({ model, where, update }) => Promise<number>
+delete:     ({ model, where }) => Promise<void>
+deleteMany: ({ model, where }) => Promise<number>
+count:      ({ model, where }) => Promise<number>
+```
+
+The `where` clauses use `{ field, value, operator?, connector? }` objects (operators: `eq`, `ne`, `in`, `contains`, etc.).
+
+#### Routing logic inside the adapter
+
+The adapter must inspect `model` and `where` to determine the target actor:
+
+| Model | Routing strategy |
+|-------|-----------------|
+| `user` (by id) | User actor key derived directly from user ID |
+| `user` (by email) | `emailIndex` on organization actor → user actor key |
+| `session` (by token) | `sessionIndex` on organization actor → user actor key |
+| `session` (by id) | `sessionIndex` on organization actor → user actor key |
+| `session` (by userId) | User actor key derived directly from userId |
+| `account` | Always has `userId` in where or data → user actor key |
+| `verification` | Organization actor (not user-scoped — used for email verification, password reset) |
+
+On `create` for `session` model: write to user actor's `session` table AND insert into organization actor's `sessionIndex`.
+On `delete` for `session` model: delete from user actor's `session` table AND remove from organization actor's `sessionIndex`.
+
+#### Adapter construction
+
+The adapter is instantiated at BetterAuth init time with a closure over the RivetKit registry. It does **not** depend on an ambient actor context — it resolves actor handles on demand via the registry.
+
+```typescript
+import { createAdapterFactory } from "better-auth/adapters";
+
+const actorRoutedAdapter = (registry: Registry) => {
+  return createAdapterFactory({
+    config: {
+      adapterId: "rivetkit-actor",
+      adapterName: "RivetKit Actor Adapter",
+      supportsJSON: false,    // SQLite — auto-serialize JSON
+      supportsDates: false,   // SQLite — ISO string conversion
+      supportsBooleans: false, // SQLite — 0/1 conversion
+    },
+    adapter: ({ getModelName, transformInput, transformOutput, transformWhereClause }) => ({
+      create: async ({ model, data }) => {
+        const actorKey = resolveActorKeyForCreate(model, data);
+        const actor = await registry.get("user", actorKey);
+        // delegate insert to actor's c.db
+        // if model === "session", also write sessionIndex
+      },
+      findOne: async ({ model, where }) => {
+        const actorKey = await resolveActorKeyForQuery(model, where);
+        // ...
+      },
+      // ... remaining methods
+    }),
+  });
+};
+```
+
+#### BetterAuth session tokens
+
+BetterAuth uses **opaque session tokens** stored in the `session` table's `token` column. By default, the token is set as a cookie (`better-auth.session_token`). On every request, BetterAuth looks up the session in the DB by token and checks `expiresAt`.
+
+**Cookie caching** can be enabled to reduce DB lookups: the session data is signed (HMAC-SHA256) or encrypted (AES-256) and embedded in the cookie. When the cache is fresh (configurable `maxAge`, e.g., 5 minutes), BetterAuth validates the signature locally without hitting the adapter. This **eliminates the hot-path actor lookup for most requests** — the adapter is only called when the cache expires or on write operations.
+
+```typescript
+session: {
+  cookieCache: {
+    enabled: true,
+    maxAge: 5 * 60, // 5 minutes — most requests skip the adapter entirely
+    strategy: "compact", // HMAC-signed, minimal size
+  },
+}
+```
+
+#### BetterAuth core tables
+
+Four tables, all in the per-user actor's SQLite (except `verification` which goes on organization actor):
+
+**`user`**: `id`, `name`, `email`, `emailVerified`, `image`, `createdAt`, `updatedAt`
+**`session`**: `id`, `token`, `userId`, `expiresAt`, `ipAddress?`, `userAgent?`, `createdAt`, `updatedAt`
+**`account`**: `id`, `userId`, `accountId` (GitHub numeric ID), `providerId` ("github"), `accessToken?`, `refreshToken?`, `scope?`, `createdAt`, `updatedAt`
+**`verification`**: `id`, `identifier`, `value`, `expiresAt`, `createdAt`, `updatedAt`
+
+For `findUserByEmail`, a secondary index (email → user actor key) is needed on the organization actor alongside `sessionIndex`.
+
+## Implementation Plan
+
+### Phase 0: Spike — custom adapter feasibility
+
+Research confirms:
+- BetterAuth adapter methods are **fully async** (`Promise`-based). Arbitrary async work (actor handle resolution, cross-actor messages) is allowed.
+- The adapter is instantiated at BetterAuth init time and receives no request context — it's a plain object of async functions. This means the adapter can close over a RivetKit registry reference and resolve actor handles on demand.
+- Cookie caching (`cookieCache.enabled: true`) eliminates the adapter hot-path for most read requests — the session is validated from the signed cookie, and the adapter is only called when the cache expires or on writes.
+
+**Remaining spike work:**
+
+1. **Prototype the adapter + user actor end-to-end** — wire up `createAdapterFactory` with a minimal actor-routed implementation. Confirm that BetterAuth's GitHub OAuth flow completes successfully with user/session/account records landing in the correct per-user actor's SQLite.
+2. **Verify `findOne` for session model** — confirm the `where` clause BetterAuth passes for session lookup includes the `token` field (not just `id`), so the adapter can route via `sessionIndex` keyed by token.
+3. **Measure cookie-cached vs uncached request latency** — confirm that with cookie caching enabled, the adapter is not called on every request, and that the uncached fallback (organization actor index → user actor → session table) is acceptable.
+
+### Phase 1: User actor + adapter infrastructure (no behavior change)
+
+1. **Install `better-auth` package** in `packages/backend`.
+2. **Define `UserActor`** with actor key `["ws", organizationId, "user", githubNumericId]`. Include BetterAuth's required tables (`user`, `session`, `account`) plus app-specific tables in its schema.
+3. **Create `userProfiles` table** in user actor schema:
+   ```
+   userProfiles
+   ├── userId (text, PK) — GitHub numeric account ID (string form)
+   ├── githubLogin (text)
+   ├── roleLabel (text)
+   ├── eligibleOrganizationIdsJson (text)
+   ├── starterRepoStatus (text)
+   ├── starterRepoStarredAt (integer, nullable)
+   ├── starterRepoSkippedAt (integer, nullable)
+   ├── createdAt (integer)
+   ├── updatedAt (integer)
+   ```
+4. **Create `sessionState` table** in user actor schema:
+   ```
+   sessionState
+   ├── sessionId (text, PK) — references BetterAuth session ID
+   ├── activeOrganizationId (text, nullable)
+   ├── createdAt (integer)
+   ├── updatedAt (integer)
+   ```
+5. **Create `sessionIndex` and `emailIndex` tables** on the app-shell organization actor:
+   ```
+   sessionIndex
+   ├── sessionId (text, PK)
+   ├── userActorKey (text)
+   ├── createdAt (integer)
+
+   emailIndex
+   ├── email (text, PK)
+   ├── userActorKey (text)
+   ├── updatedAt (integer)
+   ```
+6. **Implement the custom BetterAuth adapter** that routes operations through the index tables and user actors.
+7. **Configure BetterAuth** with GitHub OAuth provider using existing `GITHUB_CLIENT_ID`, `GITHUB_CLIENT_SECRET` env vars. Wire `BETTER_AUTH_SECRET` for session signing and `BETTER_AUTH_URL` as the auth base URL.
+8. **Keep `appSessions` table operational** — no reads/writes change yet.
+
+### Phase 2: Migrate OAuth flow to BetterAuth
+
+1. **Replace `startAppGithubAuth`** — delegate to BetterAuth's GitHub OAuth initiation instead of hand-rolling `buildAuthorizeUrl` + `oauthState` + `oauthStateExpiresAt`.
+2. **Replace `completeAppGithubAuth`** — delegate to BetterAuth's callback handler. BetterAuth creates/updates the user record in the user actor and creates a signed session. The adapter writes to `sessionIndex` on the organization actor.
+3. **After BetterAuth callback completes**, populate `userProfiles` in the user actor with app-specific fields and enqueue the slow org sync (same background workflow pattern as today).
+4. **Replace `signOutApp`** — delegate to BetterAuth session invalidation. Adapter removes entry from `sessionIndex`.
+5. **Update `resolveSessionId`** in `index.ts` — validate the session via BetterAuth (which routes through the adapter → `sessionIndex` → user actor). BetterAuth verifies the signature and checks expiration.
+6. **Keep `bootstrapAppGithubSession`** (dev-only) — adapt it to create a BetterAuth session from a raw token for local development.
+
+### Phase 3: Migrate reads to new tables
+
+1. **Update `getAppSnapshot`** — read user identity from BetterAuth's user table in the user actor, app-specific fields from `userProfiles`, and active org from `sessionState`.
+2. **Update `selectOrganization`** — write to `sessionState` in the user actor instead of `appSessions`.
+3. **Update `syncGithubOrganizations`** — write `eligibleOrganizationIds` to `userProfiles` in the user actor instead of `appSessions`. This fixes the multi-session divergence bug.
+4. **Update onboarding actions** (`skipAppStarterRepo`, `starAppStarterRepo`) — write to `userProfiles` in the user actor instead of `appSessions`.
+5. **Update `FoundryUser.id`** — use GitHub numeric ID (from BetterAuth's `account.providerAccountId`) instead of `user-${slugify(login)}`.
+
+### Phase 4: Frontend migration
+
+1. **Replace `x-foundry-session` header** with BetterAuth's session mechanism (likely a signed cookie or Authorization header, depending on BetterAuth config).
+2. **Remove `foundrySession` URL param extraction** from `backend-client.ts` — BetterAuth handles post-OAuth session establishment via cookies.
+3. **Remove `localStorage` session persistence** — BetterAuth manages this via HTTP-only cookies.
+4. **Update `signInWithGithub`** — redirect to BetterAuth's auth endpoint instead of `/v1/auth/github/start`.
+
+### Phase 5: Cleanup
+
+1. **Drop `appSessions` table** (migration).
+2. **Remove hand-rolled OAuth functions** from `app-shell.ts`: `ensureAppSession`, `updateAppSession`, `initGithubSession`, `encodeOauthState`, `decodeOauthState`, `requireAppSessionRow`, `requireSignedInSession`.
+3. **Remove `buildAuthorizeUrl` and `exchangeCode`** from `GitHubAppClient` (keep `getViewer`, installation token methods, webhook verification).
+4. **Update `foundry-self-hosting.mdx`** — document `BETTER_AUTH_SECRET` as required for session signing (already documented, now actually true).
+5. **Remove `BETTER_AUTH_URL` fallback** from `app-shell-runtime.ts` — BetterAuth reads it directly.
+
+## Constraints
+
+- **Actor-routed adapter.** BetterAuth does not natively support per-user actor databases. The custom adapter must route every DB operation to the correct actor. This adds a layer of indirection and latency (actor handle resolution + message) on adapter calls.
+- **Session index cost is mitigated by cookie caching.** With `cookieCache` enabled, BetterAuth validates sessions from a signed cookie on most requests — the adapter (and thus the `sessionIndex` lookup + user actor round-trip) is only called when the cache expires or on writes. Without caching, every authenticated request would hit the organization actor's `sessionIndex` table then the user actor.
+- **Two-actor write on session create/destroy.** Creating or destroying a session requires writing to both the user actor (BetterAuth's `session` table) and the organization actor (`sessionIndex`). These must be consistent — if the user actor write succeeds but the index write fails, the session exists but is unreachable.
+- **Background org sync pattern must be preserved.** The fast-path/slow-path split (`initGithubSession` returns immediately, `syncGithubOrganizations` runs in workflow queue) is critical for avoiding proxy timeout retries. BetterAuth handles the OAuth exchange, but the org sync stays as a background workflow.
+- **`GitHubAppClient` is still needed.** BetterAuth replaces the OAuth user-auth flow, but installation tokens, webhook verification, repo listing, and org listing are GitHub App operations that BetterAuth does not cover.
+- **User ID migration.** Changing user IDs from `user-${slugify(login)}` to GitHub numeric IDs affects `organizationMembers`, `seatAssignments`, and any cross-actor references to user IDs. Existing data needs a migration path.
+- **`findUserByEmail` requires a secondary index.** BetterAuth sometimes looks up users by email (e.g., account linking). An `emailIndex` table on the organization actor is needed. This must be kept in sync with the user actor's email field.
+
+## Risk Assessment
+
+- **Adapter call context — RESOLVED.** Research confirms BetterAuth adapter methods are plain async functions with no request context dependency. The adapter closes over the RivetKit registry at init time and resolves actor handles on demand. No ambient `c` context needed.
+- **Hot-path latency — MITIGATED.** Cookie caching (`cookieCache` with `strategy: "compact"`) means most authenticated requests validate the session from a signed cookie without calling the adapter at all. The adapter (and thus the actor round-trip) is only hit when the cache expires (configurable, e.g., every 5 minutes) or on writes. This makes the session index + user actor lookup acceptable.
+- **Two-actor consistency.** Session create/destroy touches two actors (user actor + organization index). If either write fails, the system is in an inconsistent state. Recommended: write index first, then user actor. A dangling index entry pointing to a nonexistent session is benign — BetterAuth treats it as "session not found" and the user just re-authenticates.
+- **Cookie vs header auth.** BetterAuth defaults to HTTP-only cookies (`better-auth.session_token`). The current system uses a custom `x-foundry-session` header with `localStorage`. BetterAuth supports `bearer` token mode for programmatic clients via its `bearer` plugin. Enable both for browser + API access.
+- **Dev bootstrap flow.** `bootstrapAppGithubSession` bypasses the normal OAuth flow for local development. BetterAuth supports programmatic session creation via its internal adapter — the dev path can call the adapter's `create` method directly for the `session` and `account` models.
+- **Actor lifecycle for users.** User actors are long-lived but low-traffic. RivetKit will idle/unload them. With cookie caching, cold-start only happens when the cache expires — not on every request. Acceptable.
+
+## Suggested Implementation Order
+
+1. **Phase 0 spike** — confirm adapter feasibility (go/no-go gate)
+2. Phase 1 (user actor + adapter infrastructure, no behavior change)
+3. Phase 2 (OAuth migration)
+4. Phase 3 (read path migration)
+5. Phase 4 (frontend migration)
+6. Phase 5 (cleanup)
+
+Phases 2-4 can be deployed incrementally. Each phase should leave the system fully functional — no big-bang cutover.
+
+## Alternative: Fix Without BetterAuth
+
+If the BetterAuth + actor SQLite spike fails, the same goals can be achieved without BetterAuth:
+
+1. Extract `userProfiles` and `sessionState` tables (same as Phase 1).
+2. Sign session tokens with HMAC using `BETTER_AUTH_SECRET` (rename to `SESSION_SECRET`).
+3. Use GitHub numeric ID as user PK.
+4. Keep the custom OAuth flow but thin it out.
+5. Drop `appSessions` once migration is complete.
+
+This is more code to maintain but avoids the BetterAuth integration risk.
diff --git a/foundry/research/specs/async-action-fixes/README.md b/foundry/research/specs/async-action-fixes/README.md
new file mode 100644
index 0000000..a26fd0e
--- /dev/null
+++ b/foundry/research/specs/async-action-fixes/README.md
@@ -0,0 +1,56 @@
+# Async Action Fixes Handoff
+
+## Purpose
+
+This folder contains implementation briefs for removing long-running synchronous waits from Foundry request and action paths.
+
+Start with `00-end-to-end-async-realtime-plan.md`. It is the umbrella plan for the broader migration away from monolithic snapshots and polling, and it adds the missing runtime hardening and subscription-lifecycle work that the numbered implementation briefs did not previously cover.
+
+The governing policy now lives in `foundry/CLAUDE.md`:
+
+- always await `send(...)`
+- default to `wait: false`
+- only use `wait: true` for short, bounded mutations
+- do not force repo/provider sync in read paths
+- only block until the minimum client-needed resource exists
+
+## Shared Context
+
+- Backend actor entry points live under `foundry/packages/backend/src/actors`.
+- Provider-backed long-running work lives under `foundry/packages/backend/src/providers`.
+- The main UI consumers are:
+  - `foundry/packages/frontend/src/components/organization-dashboard.tsx`
+  - `foundry/packages/frontend/src/components/mock-layout.tsx`
+  - `foundry/packages/client/src/remote/workbench-client.ts`
+- Existing non-blocking examples already exist in app-shell GitHub auth/import flows. Use those as the reference pattern for request returns plus background completion.
+
+## Suggested Implementation Order
+
+1. `00-end-to-end-async-realtime-plan.md`
+2. `01-task-creation-bootstrap-only.md`
+3. `03-repo-actions-via-background-workflow.md`
+4. `06-daytona-provisioning-staged-background-flow.md`
+5. App shell realtime subscription work from `00-end-to-end-async-realtime-plan.md`
+6. `02-repo-overview-from-cached-projection.md`
+7. Organization summary projection work from `00-end-to-end-async-realtime-plan.md`
+8. `04-workbench-session-creation-without-inline-provisioning.md`
+9. `05-workbench-snapshot-from-derived-state.md`
+10. Task-detail direct subscription work from `00-end-to-end-async-realtime-plan.md`
+11. `07-auth-identity-simplification.md`
+
+## Why This Order
+
+- Runtime hardening and the first async workflow items remove the highest-risk correctness and timeout issues first.
+- App shell realtime is a smaller migration than the workbench and removes the current polling loop early.
+- Organization summary and task-detail subscription work are easier once long-running mutations already report durable background state.
+- Auth simplification is important, but it should not block the snapshot/polling/runtime fixes.
+
+## Fresh Agent Checklist
+
+Before implementing any item:
+
+1. Read `foundry/CLAUDE.md` runtime and actor rules.
+2. Read the specific item doc in this folder.
+3. Confirm the current code paths named in that doc still match the repo.
+4. Preserve actor single-writer ownership.
+5. Prefer workflow status and push updates over synchronous completion.
diff --git a/foundry/research/specs/frontend.md b/foundry/research/specs/frontend.md
new file mode 100644
index 0000000..6c384ae
--- /dev/null
+++ b/foundry/research/specs/frontend.md
@@ -0,0 +1,40 @@
+# frontend
+
+we need to build a browser-friendly version of our tui. we should try to keep the tui and gui as close together as possible. add this to agents.md
+
+be thorough and careful with your impelmentaiton. this is going to be the ground 0 for a lot of work so it needs to be clean and well structured with support for routing, clean state architecture, etc.
+
+## tech
+
+- vite
+- baseui
+- tanstack
+
+## arch
+
+- make sure that rivetkit is not imported in to either the cli or the gui. this should all be isoaletd in our client package. add this to agents.md
+
+## agent session api
+
+- expose the sandbox agent api on sandbox instance actor for managing sessions and sendin messages
+- agent session api should use @sandbox-agent/persist-rivet for persisting to rivet
+
+## layout
+
+- left sidebar is similar to the hf switch ui:
+    - list each repo
+    - under each repo, show all of the tasks
+    - you should see all tasks for the entire organization here grouped by repo
+- the main content area shows the current organization
+    - there is a main agent session for the main agent thatn's making the change, so show this by default
+    - build a ui for interacting with sessions
+    - see ~/sandbox-agent/frontend/packages/inspector/ for reference ui
+- right sidebar
+    - show all information about the current task
+
+## testing
+
+- use agent-browser cli to veirfy that all of this functionality works
+    - create task
+    - can see the task in the sidear
+    - clik on task to see the agent transcript
diff --git a/foundry/research/specs/github-data-actor.md b/foundry/research/specs/github-data-actor.md
new file mode 100644
index 0000000..75a71a1
--- /dev/null
+++ b/foundry/research/specs/github-data-actor.md
@@ -0,0 +1,169 @@
+# Spec: GitHub Data Actor & Webhook-Driven State
+
+## Summary
+
+Replace the per-repo polling PR sync actor (`ProjectPrSyncActor`) and per-repo PR cache (`prCache` table) with a single organization-scoped `github-state` actor that owns all GitHub data (repos, PRs, members). All GitHub state updates flow exclusively through webhooks, with a one-shot full sync on initial connection. Manual reload actions are exposed per-entity (org, repo, PR) for recovery from missed webhooks.
+
+Open PRs are surfaced in the left sidebar alongside tasks via a unified organization subscription topic, with lazy task/sandbox creation when a user clicks on a PR.
+
+## Reference Implementation
+
+A prior implementation of the `github-state` actor exists in git checkpoint `0aca2c7` (from PR #247 "Refactor Foundry GitHub state and sandbox runtime"). This was never merged to a branch but contains working code for:
+
+- `foundry/packages/backend/src/actors/github-state/index.ts` — full actor with DB, sync workflow, webhook handler, PR CRUD
+- `foundry/packages/backend/src/actors/github-state/db/schema.ts` — `github_meta`, `github_repositories`, `github_members`, `github_pull_requests` tables
+- `foundry/packages/backend/src/actors/organization/app-shell.ts` lines 1056-1180 — webhook dispatch to `githubState.handlePullRequestWebhook()` and `githubState.fullSync()`
+
+Use `git show 0aca2c7:<path>` to read the reference files. Adapt (don't copy blindly) — the current branch structure has diverged.
+
+## Constraints
+
+1. **No polling.** Delete `ProjectPrSyncActor` (`actors/repository-pr-sync/`), all references to it in handles/keys/index, and the `prCache` table in `RepositoryActor`'s DB schema. Remove `prSyncStatus`/`prSyncAt` from `getRepoOverview`.
+2. **Keep `ProjectBranchSyncActor`.** This polls the local git clone (not GitHub API) and is the sandbox git status mechanism. It stays.
+3. **Webhooks are the sole live update path.** The only GitHub API calls happen during:
+   - Initial full sync on org connection/installation
+   - Manual reload actions (per-entity)
+4. **GitHub does not auto-retry failed webhook deliveries** ([docs](https://docs.github.com/en/webhooks/using-webhooks/handling-failed-webhook-deliveries)). Manual reload is the recovery mechanism.
+5. **No `user-github-data` actor in this spec.** OAuth/auth is already handled correctly on the current branch. Only the org-scoped `github-state` actor is in scope.
+
+## Architecture
+
+### Actor: `github-state` (one per organization)
+
+**Key:** `["org", organizationId, "github"]`
+
+**DB tables:**
+- `github_meta` — sync status, installation info, connected account
+- `github_repositories` — repos accessible via the GitHub App installation
+- `github_pull_requests` — all open PRs across all repos in the org
+- `github_members` — org members (existing from checkpoint, keep for completeness)
+
+**Actions (from checkpoint, to adapt):**
+- `fullSync(input)` — one-shot fetch of repos + PRs via installation token. Enqueues as a workflow step. Used on initial connection and `installation.created`/`unsuspend` webhooks.
+- `handlePullRequestWebhook(input)` — upserts a single PR from webhook payload, notifies downstream.
+- `getSummary()` — returns sync meta + row counts.
+- `listRepositories()` — returns all known repos.
+- `listPullRequestsForRepository({ repoId })` — returns PRs for a repo.
+- `getPullRequestForBranch({ repoId, branchName })` — returns PR info for a branch.
+- `createPullRequest({ repoId, repoPath, branchName, title, body })` — creates PR via GitHub API, stores locally.
+- `clearState(input)` — wipes all data (on `installation.deleted`, `suspend`).
+
+**New actions (not in checkpoint):**
+- `reloadOrganization()` — re-fetches repos + members from GitHub API (not PRs). Updates `github_repositories` and `github_members`. Notifies downstream.
+- `reloadRepository({ repoId })` — re-fetches metadata for a single repo from GitHub API. Updates the `github_repositories` row. Does NOT re-fetch PRs.
+- `reloadPullRequest({ repoId, prNumber })` — re-fetches a single PR from GitHub API by number. Updates the `github_pull_requests` row. Notifies downstream.
+
+### Webhook Dispatch (in app-shell)
+
+Replace the current TODO at `app-shell.ts:1521` with dispatch logic adapted from checkpoint `0aca2c7:foundry/packages/backend/src/actors/organization/app-shell.ts` lines 1056-1180:
+
+| Webhook event | Action |
+|---|---|
+| `installation.created` | `githubState.fullSync({ force: true })` |
+| `installation.deleted` | `githubState.clearState(...)` |
+| `installation.suspend` | `githubState.clearState(...)` |
+| `installation.unsuspend` | `githubState.fullSync({ force: true })` |
+| `installation_repositories` | `githubState.fullSync({ force: true })` |
+| `pull_request` (any action) | `githubState.handlePullRequestWebhook(...)` |
+| `push`, `create`, `delete`, `check_run`, `check_suite`, `status`, `pull_request_review`, `pull_request_review_comment` | Log for now, extend later |
+
+### Downstream Notifications
+
+When `github-state` receives a PR update (webhook or manual reload), it should:
+
+1. Update its own `github_pull_requests` table
+2. Call `notifyOrganizationUpdated()` → which broadcasts `organizationUpdated` to connected clients
+3. If the PR branch matches an existing task's branch, update that task's `pullRequest` summary in the organization actor
+
+### Organization Summary Changes
+
+Extend `OrganizationSummarySnapshot` to include open PRs:
+
+```typescript
+export interface OrganizationSummarySnapshot {
+  organizationId: string;
+  repos: WorkbenchRepoSummary[];
+  taskSummaries: WorkbenchTaskSummary[];
+  openPullRequests: WorkbenchOpenPrSummary[];  // NEW
+}
+
+export interface WorkbenchOpenPrSummary {
+  prId: string;              // "repoId#number"
+  repoId: string;
+  repoFullName: string;
+  number: number;
+  title: string;
+  state: string;
+  url: string;
+  headRefName: string;
+  baseRefName: string;
+  authorLogin: string | null;
+  isDraft: boolean;
+  updatedAtMs: number;
+}
+```
+
+The organization actor fetches open PRs from the `github-state` actor when building the summary snapshot. PRs that already have an associated task (matched by branch name) should be excluded from `openPullRequests` (they already appear in `taskSummaries` with their `pullRequest` field populated).
+
+### Interest Manager
+
+The `organization` subscription topic already returns `OrganizationSummarySnapshot`. Adding `openPullRequests` to that type means the sidebar automatically gets PR data without a new topic.
+
+`organizationUpdated` events should include a new variant for PR changes:
+```typescript
+{ type: "pullRequestUpdated", pullRequest: WorkbenchOpenPrSummary }
+{ type: "pullRequestRemoved", prId: string }
+```
+
+### Sidebar Changes
+
+The left sidebar currently renders `repositories: RepositorySection[]` where each repository has `tasks: Task[]`. Extend this to include open PRs as lightweight entries within each repository section:
+
+- Open PRs appear in the same list as tasks, sorted by `updatedAtMs`
+- PRs should be visually distinct: show PR icon instead of task indicator, display `#number` and author
+- Clicking a PR creates a task lazily (creates the task + sandbox on demand), then navigates to it
+- PRs that already have a task are filtered out (they show as the task instead)
+
+This is similar to what `buildPrTasks()` does in the mock data (`workbench-model.ts:1154-1182`), but driven by real data from the `github-state` actor.
+
+### Frontend: Manual Reload
+
+Add a "three dots" menu button in the top-right of the sidebar header. Dropdown options:
+
+- **Reload organization** — calls `githubState.reloadOrganization()` via backend API
+- **Reload all PRs** — calls `githubState.fullSync({ force: true })` (convenience shortcut)
+
+For per-repo and per-PR reload, add context menu options:
+- Right-click a repository header → "Reload repository"
+- Right-click a PR entry → "Reload pull request"
+
+These call the corresponding `reloadRepository`/`reloadPullRequest` actions on the `github-state` actor.
+
+## Deletions
+
+Files/code to remove:
+
+1. `foundry/packages/backend/src/actors/repository-pr-sync/` — entire directory
+2. `foundry/packages/backend/src/actors/repository/db/schema.ts` — `prCache` table
+3. `foundry/packages/backend/src/actors/repository/actions.ts` — `applyPrSyncResultMutation`, `getPullRequestForBranch` (moves to github-state), `prSyncStatus`/`prSyncAt` from `getRepoOverview`
+4. `foundry/packages/backend/src/actors/handles.ts` — `getOrCreateProjectPrSync`, `selfProjectPrSync`
+5. `foundry/packages/backend/src/actors/keys.ts` — any PR sync key helper
+6. `foundry/packages/backend/src/actors/index.ts` — `repositoryPrSync` import and registration
+7. All call sites in `RepositoryActor` that spawn or call the PR sync actor (`initProject`, `refreshProject`)
+
+## Migration Path
+
+The `prCache` table in `RepositoryActor`'s DB can simply be dropped — no data migration needed since the `github-state` actor will re-fetch everything on its first `fullSync`. Existing task `pullRequest` fields are populated from the github-state actor going forward.
+
+## Implementation Order
+
+1. Create `github-state` actor (adapt from checkpoint `0aca2c7`)
+2. Wire up actor in registry, handles, keys
+3. Implement webhook dispatch in app-shell (replace TODO)
+4. Delete `ProjectPrSyncActor` and `prCache` from repository actor
+5. Add manual reload actions to github-state
+6. Extend `OrganizationSummarySnapshot` with `openPullRequests`
+7. Wire through subscription manager + organization events
+8. Update sidebar to render open PRs
+9. Add three-dots menu with reload options
+10. Update task creation flow for lazy PR→task conversion
diff --git a/foundry/research/specs/remove-local-git-clone.md b/foundry/research/specs/remove-local-git-clone.md
new file mode 100644
index 0000000..261ffc2
--- /dev/null
+++ b/foundry/research/specs/remove-local-git-clone.md
@@ -0,0 +1,381 @@
+# Remove Local Git Clone from Backend
+
+## Goal
+
+The Foundry backend stores zero git state. No clones, no refs, no working trees, no git-spice. All git operations execute inside sandboxes. Repo metadata (branches, default branch, PRs) comes from GitHub API/webhooks which we already have.
+
+## Terminology renames
+
+Rename Foundry domain terms across the entire `foundry/` directory. All changes are breaking — no backwards compatibility needed. Execute as separate atomic commits in this order. `pnpm -w typecheck && pnpm -w build && pnpm -w test` must pass between each.
+
+| New name | Old name (current code) |
+|---|---|
+| **Organization** | Workspace |
+| **Repository** | Project |
+| **Session** (not "tab") | Tab / Session (mixed) |
+| **Subscription** | Interest |
+| **SandboxProviderId** | ProviderId |
+
+### Rename 1: `interest` → `subscription`
+
+The realtime pub/sub system in `client/src/interest/`. Rename the directory, all types (`InterestManager` → `SubscriptionManager`, `MockInterestManager` → `MockSubscriptionManager`, `RemoteInterestManager` → `RemoteSubscriptionManager`, `DebugInterestTopic` → `DebugSubscriptionTopic`), the `useInterest` hook → `useSubscription`, and all imports in client + frontend. Rename `frontend/src/lib/interest.ts` → `subscription.ts`. Rename test file `client/test/interest-manager.test.ts` → `subscription-manager.test.ts`.
+
+### Rename 2: `tab` → `session`
+
+The UI "tab" concept is really a session. Rename `TabStrip` → `SessionStrip`, `tabId` → `sessionId`, `closeTab` → `closeSession`, `addTab` → `addSession`, `WorkbenchAgentTab` → `WorkbenchAgentSession`, `TaskWorkbenchTabInput` → `TaskWorkbenchSessionInput`, `TaskWorkbenchAddTabResponse` → `TaskWorkbenchAddSessionResponse`, and all related props/DOM attrs (`activeTabId` → `activeSessionId`, `onSwitchTab` → `onSwitchSession`, `onCloseTab` → `onCloseSession`, `data-tab` → `data-session`, `editingSessionTabId` → `editingSessionId`). Rename file `tab-strip.tsx` → `session-strip.tsx`. **Leave "diff tabs" alone** (`isDiffTab`, `diffTabId`) — those are file viewer panes, a different concept.
+
+### Rename 3: `ProviderId` → `SandboxProviderId`
+
+The `ProviderId` type (`"e2b" | "local"`) is specifically a sandbox provider. Rename the type (`ProviderId` → `SandboxProviderId`), schema (`ProviderIdSchema` → `SandboxProviderIdSchema`), and all `providerId` fields that refer to sandbox hosting (`CreateTaskInput`, `TaskRecord`, `SwitchResult`, `WorkbenchSandboxSummary`, task DB schema `task.provider_id` → `sandbox_provider_id`, `task_sandboxes.provider_id` → `sandbox_provider_id`, topic params). Rename config key `providers` → `sandboxProviders`. DB column renames need Drizzle migrations.
+
+**Do NOT rename**: `model.provider` (AI model provider), `auth_account_index.provider_id` (auth provider), `providerAgent()` (model→agent mapping), `WorkbenchModelGroup.provider`.
+
+Also **delete the `providerProfiles` table entirely** — it's written but never read (dead code). Remove the table definition from the organization actor DB schema, all writes in organization actions, and the `refreshProviderProfiles` queue command/handler/interface.
+
+### Rename 4: `project` → `repository`
+
+The "project" actor/entity is a git repository. Rename:
+- Actor directory `actors/project/` → `actors/repository/`
+- Actor directory `actors/project-branch-sync/` → `actors/repository-branch-sync/`
+- Actor registry keys `project` → `repository`, `projectBranchSync` → `repositoryBranchSync`
+- Actor name string `"Project"` → `"Repository"`
+- All functions: `projectKey` → `repositoryKey`, `getOrCreateProject` → `getOrCreateRepository`, `getProject` → `getRepository`, `selfProject` → `selfRepository`, `projectBranchSyncKey` → `repositoryBranchSyncKey`, `projectPrSyncKey` → `repositoryPrSyncKey`, `projectWorkflowQueueName` → `repositoryWorkflowQueueName`
+- Types: `ProjectInput` → `RepositoryInput`, `WorkbenchProjectSection` → `WorkbenchRepositorySection`, `PROJECT_QUEUE_NAMES` → `REPOSITORY_QUEUE_NAMES`
+- Queue names: `"project.command.*"` → `"repository.command.*"`
+- Actor key strings: change `"project"` to `"repository"` in key arrays (e.g. `["ws", id, "project", repoId]` → `["org", id, "repository", repoId]`)
+- Frontend: `projects` → `repositories`, `collapsedProjects` → `collapsedRepositories`, `hoveredProjectId` → `hoveredRepositoryId`, `PROJECT_COLORS` → `REPOSITORY_COLORS`, `data-project-*` → `data-repository-*`, `groupWorkbenchProjects` → `groupWorkbenchRepositories`
+- Client keys: `projectKey()` → `repositoryKey()`, `projectBranchSyncKey()` → `repositoryBranchSyncKey()`, `projectPrSyncKey()` → `repositoryPrSyncKey()`
+
+### Rename 5: `workspace` → `organization`
+
+The "workspace" is really an organization. Rename:
+- Actor directory `actors/workspace/` → `actors/organization/`
+- Actor registry key `workspace` → `organization`
+- Actor name string `"Workspace"` → `"Organization"`
+- All types: `WorkspaceIdSchema` → `OrganizationIdSchema`, `WorkspaceId` → `OrganizationId`, `WorkspaceEvent` → `OrganizationEvent`, `WorkspaceSummarySnapshot` → `OrganizationSummarySnapshot`, `WorkspaceUseInputSchema` → `OrganizationUseInputSchema`, `WorkspaceHandle` → `OrganizationHandle`, `WorkspaceTopicParams` → `OrganizationTopicParams`
+- All `workspaceId` fields/params → `organizationId` (~20+ schemas in contracts.ts, plus topic params, task snapshot, etc.)
+- `FoundryOrganization.workspaceId` → `FoundryOrganization.organizationId` (or just `id`)
+- All functions: `workspaceKey` → `organizationKey`, `getOrCreateWorkspace` → `getOrCreateOrganization`, `selfWorkspace` → `selfOrganization`, `resolveWorkspaceId` → `resolveOrganizationId`, `defaultWorkspace` → `defaultOrganization`, `workspaceWorkflowQueueName` → `organizationWorkflowQueueName`, `WORKSPACE_QUEUE_NAMES` → `ORGANIZATION_QUEUE_NAMES`
+- Actor key strings: change `"ws"` to `"org"` in key arrays (e.g. `["ws", id]` → `["org", id]`)
+- Queue names: `"workspace.command.*"` → `"organization.command.*"`
+- Topic keys: `"workspace:${id}"` → `"organization:${id}"`, event `"workspaceUpdated"` → `"organizationUpdated"`
+- Methods: `connectWorkspace` → `connectOrganization`, `getWorkspaceSummary` → `getOrganizationSummary`, `useWorkspace` → `useOrganization`
+- Files: `shared/src/workspace.ts` → `organization.ts`, `backend/src/config/workspace.ts` → `organization.ts`
+- Config keys: `config.workspace.default` → `config.organization.default`
+- URL paths: `/workspaces/$workspaceId` → `/organizations/$organizationId`
+- UI strings: `"Loading workspace..."` → `"Loading organization..."`
+- Tests: rename `workspace-*.test.ts` files, update `workspaceSnapshot()` → `organizationSnapshot()`, `workspaceId: "ws-1"` → `organizationId: "org-1"`
+
+### After all renames: update CLAUDE.md files
+
+Update `foundry/CLAUDE.md` and `foundry/packages/backend/CLAUDE.md` to use new terminology throughout (organization instead of workspace, repository instead of project, etc.). The rest of this spec already uses the new names.
+
+## What gets deleted
+
+### Entire directories/files
+
+| Path (relative to `packages/backend/src/`) | Reason |
+|---|---|
+| `integrations/git/index.ts` | All local git operations |
+| `integrations/git-spice/index.ts` | Stack management via git-spice |
+| `actors/repository-branch-sync/` (currently `project-branch-sync/`) | Polling actor that fetches + reads local clone every 5s |
+| `actors/project-pr-sync/` | Empty directory, already dead |
+| `actors/repository/stack-model.ts` (currently `project/stack-model.ts`) | Stack parent/sort model (git-spice dependent) |
+| `test/git-spice.test.ts` | Tests for deleted git-spice integration |
+| `test/git-validate-remote.test.ts` | Tests for deleted git validation |
+| `test/stack-model.test.ts` | Tests for deleted stack model |
+
+### Driver interfaces removed from `driver.ts`
+
+- `GitDriver` — entire interface deleted
+- `StackDriver` — entire interface deleted
+- `BackendDriver.git` — removed
+- `BackendDriver.stack` — removed
+- All imports from `integrations/git/` and `integrations/git-spice/`
+
+`BackendDriver` keeps only `github` and `tmux`.
+
+### Test driver cleanup (`test/helpers/test-driver.ts`)
+
+- Delete `createTestGitDriver()`
+- Delete `createTestStackDriver()`
+- Remove `git` and `stack` from `createTestDriver()`
+
+### Docker volume removed (`compose.dev.yaml`, `compose.preview.yaml`)
+
+- Remove `foundry_git_repos` volume and its mount at `/root/.local/share/foundry/repos`
+- Remove the CLAUDE.md note about the repos volume
+
+### Actor registry cleanup (`actors/index.ts`, `actors/keys.ts`, `actors/handles.ts`)
+
+- Remove `RepositoryBranchSyncActor` (currently `ProjectBranchSyncActor`) registration
+- Remove `repositoryBranchSyncKey` (currently `projectBranchSyncKey`)
+- Remove branch sync handle helpers
+
+### Client key cleanup (`packages/client/src/keys.ts`, `packages/client/test/keys.test.ts`)
+
+- Remove `repositoryBranchSyncKey` (currently `projectBranchSyncKey`) if exported
+
+### Dead code removal: `providerProfiles` table
+
+The `providerProfiles` table in the organization actor (currently workspace actor) DB is written but never read. Delete:
+
+- Table definition in `actors/organization/db/schema.ts` (currently `workspace/db/schema.ts`)
+- All writes in `actors/organization/actions.ts` (currently `workspace/actions.ts`)
+- The `refreshProviderProfiles` queue command and handler
+- The `RefreshProviderProfilesCommand` interface
+- Add a DB migration to drop the `provider_profiles` table
+
+### Ensure pattern cleanup (`actors/repository/actions.ts`, currently `project/actions.ts`)
+
+Delete all `ensure*` functions that block action handlers on external I/O or cross-actor fan-out:
+
+- **`ensureLocalClone()`** — Delete (git clone removal).
+- **`ensureProjectReady()`** / **`ensureRepositoryReady()`** — Delete (wrapper around `ensureLocalClone` + sync actors).
+- **`ensureProjectReadyForRead()`** / **`ensureRepositoryReadyForRead()`** — Delete (dispatches ensure with 10s wait on read path).
+- **`ensureProjectSyncActors()`** / **`ensureRepositorySyncActors()`** — Delete (spawns branch sync actor which is being removed).
+- **`forceProjectSync()`** / **`forceRepositorySync()`** — Delete (triggers branch sync actor).
+- **`ensureTaskIndexHydrated()`** — Delete. This is the migration path from `HistoryActor` → `task_index` table. Since we assume fresh repositories, no migration needed. The task index is populated on write (`createTask` inserts the row).
+- **`ensureTaskIndexHydratedForRead()`** — Delete (wrapper that dispatches `hydrateTaskIndex`).
+- **`taskIndexHydrated` state flag** — Delete from repository actor state.
+
+The `ensureAskpassScript()` is fine — it's a fast local operation.
+
+### Dead schema tables and helpers (`actors/repository/db/schema.ts`, `actors/repository/actions.ts`)
+
+With the branch sync actor and git-spice stack operations deleted, these tables have no writer and should be removed:
+
+- **`branches` table** — populated by `RepositoryBranchSyncActor` from the local clone. Delete the table, its schema definition, and all reads from it (including `enrichTaskRecord` which reads `diffStat`, `hasUnpushed`, `conflictsWithMain`, `parentBranch` from this table).
+- **`repoActionJobs` table** — populated by `runRepoStackAction()` for git-spice stack operations. Delete the table, its schema definition, and all helpers: `ensureRepoActionJobsTable()`, `writeRepoActionJob()`, `listRepoActionJobRows()`.
+
+## What gets modified
+
+### `actors/repository/actions.ts` (currently `project/actions.ts`)
+
+This is the biggest change. Current git operations in this file:
+
+1. **`createTaskMutation()`** — Currently calls `listLocalRemoteRefs` to check branch name conflicts against remote branches. Replace: branch conflict checking uses only the repository actor's `task_index` table (which branches are already taken by tasks). We don't need to check against remote branches — if the branch already exists on the remote, `git push` in the sandbox will handle it.
+2. **`registerTaskBranch()`** — Currently does `fetch` + `remoteDefaultBaseRef` + `revParse` + git-spice stack tracking. Replace: default base branch comes from GitHub repo metadata (already stored from webhook/API at repo add time). SHA resolution is not needed at task creation — the sandbox handles it. Delete all git-spice stack tracking.
+3. **`getRepoOverview()`** — Currently calls `listLocalRemoteRefs` + `remoteDefaultBaseRef` + `stack.available` + `stack.listStack`. Replace: branch data comes from GitHub API data we already store from webhooks (push/create/delete events feed branch state). Stack data is deleted. The overview returns branches from stored GitHub webhook data.
+4. **`runRepoStackAction()`** — Delete entirely (all git-spice stack operations).
+5. **All `normalizeBaseBranchName` imports from git-spice** — Inline or move to a simple utility if still needed.
+6. **All `ensureTaskIndexHydrated*` / `ensureRepositoryReady*` call sites** — Remove. Read actions query the `task_index` table directly; if it's empty, it's empty. Write actions populate it on create.
+
+### `actors/repository/index.ts` (currently `project/index.ts`)
+
+- Remove local clone path from state/initialization
+- Remove branch sync actor spawning
+- Remove any `ensureLocalClone` calls in lifecycle
+
+### `actors/task/workbench.ts`
+
+- **`ensureSandboxRepo()` line 405**: Currently calls `driver.git.remoteDefaultBaseRef()` on the local clone. Replace: read default branch from repository actor state (which gets it from GitHub API/webhook data at repo add time).
+
+### `actors/organization/actions.ts` (currently `workspace/actions.ts`)
+
+- **`addRemote()` line 320**: Currently calls `driver.git.validateRemote()` which runs `git ls-remote`. Replace: validate via GitHub API — `GET /repos/{owner}/{repo}` returns 404 for invalid repos. We already parse the remote URL into owner/repo for GitHub operations.
+
+### `actors/keys.ts` / `actors/handles.ts`
+
+- Remove `repositoryBranchSyncKey` (currently `projectBranchSyncKey`) export
+- Remove branch sync handle creation
+
+## What stays the same
+
+- `driver.github.*` — already uses GitHub API, no changes
+- `driver.tmux.*` — unrelated, no changes
+- `integrations/github/index.ts` — already GitHub API based, keeps working
+- All sandbox execution (`executeInSandbox()`) — already correct pattern
+- Webhook handlers for push/create/delete events — already feed GitHub data into backend
+
+## CLAUDE.md updates
+
+### `foundry/packages/backend/CLAUDE.md`
+
+Remove `RepositoryBranchSyncActor` (currently `ProjectBranchSyncActor`) from the actor hierarchy tree:
+
+```text
+OrganizationActor
+├─ HistoryActor(organization-scoped global feed)
+├─ GithubDataActor
+├─ RepositoryActor(repo)
+│  └─ TaskActor(task)
+│     ├─ TaskSessionActor(session) x N
+│     │  └─ SessionStatusSyncActor(session) x 0..1
+│     └─ Task-local workbench state
+└─ SandboxInstanceActor(sandboxProviderId, sandboxId) x N
+```
+
+Add to Ownership Rules:
+
+> - The backend stores no local git state. No clones, no refs, no working trees, no git-spice. Repo metadata (branches, default branch) comes from GitHub API and webhook events. All git operations that require a working tree execute inside sandboxes via `executeInSandbox()`.
+
+### `foundry/CLAUDE.md`
+
+Add a new section:
+
+```markdown
+## Git State Policy
+
+- The backend stores **zero git state**. No local clones, no refs, no working trees, no git-spice.
+- Repo metadata (branches, default branch, PRs) comes from GitHub API and webhook events already flowing into the system.
+- All git operations that require a working tree (diff, push, conflict check, rev-parse) execute inside the task's sandbox via `executeInSandbox()`.
+- Do not add local git clone paths, `git fetch`, `git for-each-ref`, or any direct git CLI calls to the backend. If you need git data, either read it from stored GitHub webhook/API data or run it in a sandbox.
+- The `BackendDriver` has no `GitDriver` or `StackDriver`. Only `GithubDriver` and `TmuxDriver` remain.
+- git-spice is not used anywhere in the system.
+```
+
+Remove from CLAUDE.md:
+
+> - Docker dev: `compose.dev.yaml` mounts a named volume at `/root/.local/share/foundry/repos` to persist backend-managed git clones across restarts. Code must still work if this volume is not present (create directories as needed).
+
+## Concerns
+
+1. **Concurrent agent work**: Another agent is currently modifying `workspace/actions.ts`, `project/actions.ts`, `task/workbench.ts`, `task/workflow/init.ts`, `task/workflow/queue.ts`, `driver.ts`, and `project-branch-sync/index.ts`. Those changes are adding `listLocalRemoteRefs` to the driver and removing polling loops/timeouts. The git clone removal work will **delete** the code the other agent is modifying. Coordinate: let the other agent's changes land first, then this spec deletes the git integration entirely.
+
+2. **Rename ordering**: The rename spec (workspace→organization, project→repository, etc.) should ideally land **before** this spec is executed, so the file paths and identifiers match. If not, the implementing agent should map old names → new names using the table above.
+
+3. **`project-pr-sync/` directory**: This is already an empty directory. Delete it as part of cleanup.
+
+4. **`ensureRepoActionJobsTable()`**: The current spec mentions this should stay but the `repoActionJobs` table is being deleted. Updating: both the table and the ensure function should be deleted.
+
+## Validation
+
+After implementation, run:
+
+```bash
+pnpm -w typecheck
+pnpm -w build
+pnpm -w test
+```
+
+Then restart the dev stack and run the main user flow end-to-end:
+
+```bash
+just foundry-dev-down && just foundry-dev
+```
+
+Verify:
+1. Add a repo to an organization
+2. Create a task (should return immediately with taskId)
+3. Task appears in sidebar with pending status
+4. Task provisions and transitions to ready
+5. Session is created and initial message is sent
+6. Agent responds in the session transcript
+
+This must work against a real GitHub repo (`rivet-dev/sandbox-agent-testing`) with the dev environment credentials.
+
+### Codebase grep validation
+
+After implementation, verify no local git operations or git-spice references remain in the backend:
+
+```bash
+# No local git CLI calls (excludes integrations/github which is GitHub API, not local git)
+rg -l 'execFileAsync\("git"' foundry/packages/backend/src/ && echo "FAIL: local git CLI calls found" || echo "PASS"
+
+# No git-spice references
+rg -l 'git.spice|gitSpice|git_spice' foundry/packages/backend/src/ && echo "FAIL: git-spice references found" || echo "PASS"
+
+# No GitDriver or StackDriver references
+rg -l 'GitDriver|StackDriver' foundry/packages/backend/src/ && echo "FAIL: deleted driver interfaces still referenced" || echo "PASS"
+
+# No local clone path references
+rg -l 'localPath|ensureCloned|ensureLocalClone|foundryRepoClonePath' foundry/packages/backend/src/ && echo "FAIL: local clone references found" || echo "PASS"
+
+# No branch sync actor references
+rg -l 'BranchSync|branchSync|branch.sync' foundry/packages/backend/src/ && echo "FAIL: branch sync references found" || echo "PASS"
+
+# No deleted ensure patterns
+rg -l 'ensureProjectReady|ensureTaskIndexHydrated|taskIndexHydrated' foundry/packages/backend/src/ && echo "FAIL: deleted ensure patterns found" || echo "PASS"
+
+# integrations/git/ and integrations/git-spice/ directories should not exist
+ls foundry/packages/backend/src/integrations/git/index.ts 2>/dev/null && echo "FAIL: git integration not deleted" || echo "PASS"
+ls foundry/packages/backend/src/integrations/git-spice/index.ts 2>/dev/null && echo "FAIL: git-spice integration not deleted" || echo "PASS"
+```
+
+All checks must pass before the change is considered complete.
+
+### Rename verification
+
+After the rename spec has landed, verify no old names remain anywhere in `foundry/`:
+
+```bash
+# --- workspace → organization ---
+# No "WorkspaceActor", "WorkspaceEvent", "WorkspaceId", "WorkspaceSummary", etc. (exclude pnpm-workspace.yaml, node_modules, .turbo)
+rg -l 'WorkspaceActor|WorkspaceEvent|WorkspaceId|WorkspaceSummary|WorkspaceHandle|WorkspaceUseInput|WorkspaceTopicParams' foundry/packages/ && echo "FAIL: workspace type references remain" || echo "PASS"
+
+# No workspaceId in domain code (exclude pnpm-workspace, node_modules, .turbo, this spec file)
+rg -l 'workspaceId' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: workspaceId references remain" || echo "PASS"
+
+# No workspace actor directory
+ls foundry/packages/backend/src/actors/workspace/ 2>/dev/null && echo "FAIL: workspace actor directory not renamed" || echo "PASS"
+
+# No workspaceKey function
+rg 'workspaceKey|selfWorkspace|getOrCreateWorkspace|resolveWorkspaceId|defaultWorkspace' foundry/packages/ --glob '!node_modules' && echo "FAIL: workspace function references remain" || echo "PASS"
+
+# No "ws" actor key string (the old key prefix)
+rg '"\\"ws\\""|\["ws"' foundry/packages/ --glob '!node_modules' && echo "FAIL: old 'ws' actor key strings remain" || echo "PASS"
+
+# No workspace queue names
+rg 'workspace\.command\.' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: workspace queue names remain" || echo "PASS"
+
+# No /workspaces/ URL paths
+rg '/workspaces/' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: /workspaces/ URL paths remain" || echo "PASS"
+
+# No config.workspace
+rg 'config\.workspace' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: config.workspace references remain" || echo "PASS"
+
+# --- project → repository ---
+# No ProjectActor, ProjectInput, ProjectSection, etc.
+rg -l 'ProjectActor|ProjectInput|ProjectSection|PROJECT_QUEUE|PROJECT_COLORS' foundry/packages/ --glob '!node_modules' && echo "FAIL: project type references remain" || echo "PASS"
+
+# No project actor directory
+ls foundry/packages/backend/src/actors/project/ 2>/dev/null && echo "FAIL: project actor directory not renamed" || echo "PASS"
+
+# No projectKey, selfProject, getOrCreateProject, etc.
+rg 'projectKey|selfProject|getOrCreateProject|getProject\b|projectBranchSync|projectPrSync|projectWorkflow' foundry/packages/ --glob '!node_modules' && echo "FAIL: project function references remain" || echo "PASS"
+
+# No "project" actor key string
+rg '"\\"project\\""|\[".*"project"' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: old project actor key strings remain" || echo "PASS"
+
+# No project.command.* queue names
+rg 'project\.command\.' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: project queue names remain" || echo "PASS"
+
+# --- tab → session ---
+# No WorkbenchAgentTab, TaskWorkbenchTabInput, TabStrip, tabId (in workbench context)
+rg -l 'WorkbenchAgentTab|TaskWorkbenchTabInput|TaskWorkbenchAddTabResponse|TabStrip' foundry/packages/ --glob '!node_modules' && echo "FAIL: tab type references remain" || echo "PASS"
+
+# No tabId (should be sessionId now)
+rg '\btabId\b' foundry/packages/ --glob '!node_modules' && echo "FAIL: tabId references remain" || echo "PASS"
+
+# No tab-strip.tsx file
+ls foundry/packages/frontend/src/components/mock-layout/tab-strip.tsx 2>/dev/null && echo "FAIL: tab-strip.tsx not renamed" || echo "PASS"
+
+# No closeTab/addTab (should be closeSession/addSession)
+rg '\bcloseTab\b|\baddTab\b' foundry/packages/ --glob '!node_modules' && echo "FAIL: closeTab/addTab references remain" || echo "PASS"
+
+# --- interest → subscription ---
+# No InterestManager, useInterest, etc.
+rg -l 'InterestManager|useInterest|DebugInterestTopic' foundry/packages/ --glob '!node_modules' && echo "FAIL: interest type references remain" || echo "PASS"
+
+# No interest/ directory
+ls foundry/packages/client/src/interest/ 2>/dev/null && echo "FAIL: interest directory not renamed" || echo "PASS"
+
+# --- ProviderId → SandboxProviderId ---
+# No bare ProviderId/ProviderIdSchema (but allow sandboxProviderId, model.provider, auth provider_id)
+rg '\bProviderIdSchema\b|\bProviderId\b' foundry/packages/shared/src/contracts.ts && echo "FAIL: bare ProviderId in contracts.ts" || echo "PASS"
+
+# No bare providerId for sandbox context (check task schema)
+rg '\bproviderId\b' foundry/packages/backend/src/actors/task/db/schema.ts && echo "FAIL: bare providerId in task schema" || echo "PASS"
+
+# No providerProfiles table (dead code, should be deleted)
+rg 'providerProfiles|provider_profiles|refreshProviderProfiles' foundry/packages/ --glob '!node_modules' --glob '!*.md' && echo "FAIL: providerProfiles references remain" || echo "PASS"
+
+# --- Verify new names exist ---
+rg -l 'OrganizationActor|OrganizationEvent|OrganizationId' foundry/packages/ --glob '!node_modules' | head -3 || echo "WARN: new organization names not found"
+rg -l 'RepositoryActor|RepositoryInput|RepositorySection' foundry/packages/ --glob '!node_modules' | head -3 || echo "WARN: new repository names not found"
+rg -l 'SubscriptionManager|useSubscription' foundry/packages/ --glob '!node_modules' | head -3 || echo "WARN: new subscription names not found"
+rg -l 'SandboxProviderIdSchema|SandboxProviderId' foundry/packages/ --glob '!node_modules' | head -3 || echo "WARN: new sandbox provider names not found"
+```
+
+All checks must pass. False positives from markdown files, comments referencing old names in migration context, or `node_modules` should be excluded via the globs above.
diff --git a/foundry/research/specs/rivetkit-opentui-migration-plan.md b/foundry/research/specs/rivetkit-opentui-migration-plan.md
new file mode 100644
index 0000000..78acccc
--- /dev/null
+++ b/foundry/research/specs/rivetkit-opentui-migration-plan.md
@@ -0,0 +1,554 @@
+# RivetKit + Sandbox Provider + OpenTUI Migration Spec
+
+Status: implemented baseline (Phase 1-4 complete, Phase 5 partial)
+Date: 2026-02-08
+
+## Locked Decisions
+
+1. Entire rewrite is TypeScript. All Rust code will be deleted at cutover.
+2. Repo stays a single monorepo, managed with `pnpm` organizations + Turborepo.
+3. `core` package is renamed to `shared`.
+4. `integrations` and `providers` live inside the backend package (not top-level packages).
+5. Rivet-backed state uses SQLite + Drizzle only.
+6. RivetKit dependencies come from local `../rivet` builds only; no published npm packages.
+7. Everything is organization-scoped. Organization is configurable from CLI.
+8. `ControlPlaneActor` is renamed to `OrganizationActor` (organization coordinator).
+9. Every actor key is prefixed by organization.
+10. `--organization` is optional; commands resolve organization via flag -> config default -> `default`.
+11. RivetKit local dependency wiring is `link:`-based.
+12. Keep the existing config file path (`~/.config/foundry/config.toml`) and evolve keys in place.
+13. `.agents` and skill files are in scope for migration updates.
+14. Parent orchestration actors (`organization`, `repository`, `task`) use command-only loops with no timeout.
+15. Periodic syncing/polling runs in dedicated child actors, each with a single timeout cadence.
+16. For each actor, define the main loop and exactly what data it mutates; keep single-writer ownership strict.
+
+## Executive Summary
+
+We will replace the existing Rust backend/CLI/TUI with TypeScript services and UIs:
+
+- Backend: RivetKit actor runtime
+- Agent orchestration: Sandbox Agent through provider adapters
+- CLI: TypeScript
+- TUI: TypeScript + OpenTUI
+- State: SQLite + Drizzle (actor-owned writes)
+
+The core architecture changes from "worktree-per-task" to "provider-selected sandbox-per-task." Local worktrees remain supported through a `worktree` provider.
+
+## Breaking Changes (Intentional)
+
+1. Rust binaries/backend removed.
+2. Existing IPC replaced by new TypeScript transport.
+3. Configuration schema changes for organization selection and sandbox provider defaults.
+4. Runtime model changes from global control plane to organization coordinator actor.
+5. Database schema migrates to organization + provider + sandbox identity model.
+6. Command options evolve to include organization and provider selection.
+
+## Monorepo and Build Tooling
+
+Root tooling is standardized:
+
+- `pnpm-workspace.yaml`
+- `turbo.json`
+- organization scripts through `pnpm` + `turbo run ...`
+
+Target package layout:
+
+```text
+packages/
+  shared/                         # shared types, contracts, validation
+  backend/
+    src/
+      actors/
+        organization.ts
+        repository.ts
+        task.ts
+        sandbox-instance.ts
+        history.ts
+        repository-pr-sync.ts
+        repository-branch-sync.ts
+        task-status-sync.ts
+        keys.ts
+        events.ts
+        registry.ts
+        index.ts
+      providers/                  # provider-api + implementations
+        provider-api/
+        worktree/
+        daytona/
+      integrations/               # sandbox-agent + git/github/graphite adapters
+        sandbox-agent/
+        git/
+        github/
+        graphite/
+      db/                         # drizzle schema, queries, migrations
+        schema.ts
+        client.ts
+        migrations/
+      transport/
+        server.ts
+        types.ts
+      config/
+        organization.ts
+        backend.ts
+  cli/                            # hf command surface
+    src/
+      commands/
+      client/                     # backend transport client
+      organization/                  # organization selection resolver
+  tui/                            # OpenTUI app
+    src/
+      app/
+      views/
+      state/
+      client/                     # backend stream client
+research/specs/
+  rivetkit-opentui-migration-plan.md (this file)
+```
+
+CLI and TUI are separate packages in the same monorepo, not separate repositories.
+
+## Actor File Map (Concrete)
+
+Backend actor files and responsibilities:
+
+1. `packages/backend/src/actors/organization.ts`
+- `OrganizationActor` implementation.
+- Provider profile resolution and organization-level coordination.
+- Spawns/routes to `RepositoryActor` handles.
+
+2. `packages/backend/src/actors/repository.ts`
+- `RepositoryActor` implementation.
+- Branch snapshot refresh, PR cache orchestration, stream publication.
+- Routes task actions to `TaskActor`.
+
+3. `packages/backend/src/actors/task.ts`
+- `TaskActor` implementation.
+- Task lifecycle, session/sandbox orchestration, post-idle automation.
+
+4. `packages/backend/src/actors/sandbox-instance.ts`
+- `SandboxInstanceActor` implementation.
+- Provider sandbox lifecycle, heartbeat, reconnect/recovery.
+
+5. `packages/backend/src/actors/history.ts`
+- `HistoryActor` implementation.
+- Writes workflow events to SQLite via Drizzle.
+
+6. `packages/backend/src/actors/keys.ts`
+- Organization-prefixed actor key builders/parsers.
+
+7. `packages/backend/src/actors/events.ts`
+- Internal actor event envelopes and stream payload types.
+
+8. `packages/backend/src/actors/registry.ts`
+- RivetKit registry setup and actor registration.
+
+9. `packages/backend/src/actors/index.ts`
+- Actor exports and composition wiring.
+
+10. `packages/backend/src/actors/repository-pr-sync.ts`
+- Read-only PR polling loop (single timeout cadence).
+- Sends sync results back to `RepositoryActor`.
+
+11. `packages/backend/src/actors/repository-branch-sync.ts`
+- Read-only branch snapshot polling loop (single timeout cadence).
+- Sends sync results back to `RepositoryActor`.
+
+12. `packages/backend/src/actors/task-status-sync.ts`
+- Read-only session/sandbox status polling loop (single timeout cadence).
+- Sends status updates back to `TaskActor`.
+
+## RivetKit Source Policy (Local Only)
+
+Do not use published RivetKit packages.
+
+1. Build RivetKit from local source:
+```bash
+cd ../rivet
+pnpm build -F rivetkit
+```
+2. Consume via local `link:` dependencies to built artifacts.
+3. Keep dependency wiring deterministic and documented in repo scripts.
+
+## Organization Model
+
+Every command executes against a resolved organization context.
+
+Organization selection:
+
+1. CLI flag: `--organization <name>`
+2. Config default organization
+3. Fallback to `default`
+
+Organization controls:
+
+1. provider profile defaults
+2. sandbox policy
+3. repo membership / resolution
+4. actor namespaces and database partitioning
+
+## New Actor Implementation Overview
+
+RivetKit registry actor keys are organization-prefixed:
+
+1. `OrganizationActor` (organization coordinator)
+- Key: `["ws", organizationId]`
+- Owns organization config/runtime coordination, provider registry, organization health.
+- Resolves provider defaults and organization-level policies.
+
+2. `RepositoryActor`
+- Key: `["ws", organizationId, "repository", repoId]`
+- Owns repo snapshot cache and PR cache refresh orchestration.
+- Routes branch/task commands to task actors.
+- Streams repository updates to CLI/TUI subscribers.
+
+3. `TaskActor`
+- Key: `["ws", organizationId, "repository", repoId, "task", taskId]`
+- Owns task metadata/runtime state.
+- Creates/resumes sandbox + session through provider adapter.
+- Handles attach/push/sync/merge/archive/kill and post-idle automation.
+
+4. `SandboxInstanceActor` (optional but recommended)
+- Key: `["ws", organizationId, "provider", providerId, "sandbox", sandboxId]`
+- Owns sandbox lifecycle, heartbeat, endpoint readiness, recovery.
+
+5. `HistoryActor`
+- Key: `["ws", organizationId, "repository", repoId, "history"]`
+- Owns `events` writes and workflow timeline completeness.
+
+6. `ProjectPrSyncActor` (child poller)
+- Key: `["ws", organizationId, "repository", repoId, "pr-sync"]`
+- Polls PR state on interval and emits results to `RepositoryActor`.
+- Does not write DB directly.
+
+7. `ProjectBranchSyncActor` (child poller)
+- Key: `["ws", organizationId, "repository", repoId, "branch-sync"]`
+- Polls branch/worktree state on interval and emits results to `RepositoryActor`.
+- Does not write DB directly.
+
+8. `TaskStatusSyncActor` (child poller)
+- Key: `["ws", organizationId, "repository", repoId, "task", taskId, "status-sync"]`
+- Polls agent/session/sandbox health on interval and emits results to `TaskActor`.
+- Does not write DB directly.
+
+Ownership rule: each table/row has one actor writer.
+
+## Single-Writer Mutation Map
+
+Always define actor run-loop + mutated state together:
+
+1. `OrganizationActor`
+- Mutates: `organizations`, `workspace_provider_profiles`.
+
+2. `RepositoryActor`
+- Mutates: `repos`, `branches`, `pr_cache` (applies child poller results).
+
+3. `TaskActor`
+- Mutates: `tasks`, `task_runtime` (applies child poller results).
+
+4. `SandboxInstanceActor`
+- Mutates: `sandbox_instances`.
+
+5. `HistoryActor`
+- Mutates: `events`.
+
+6. Child sync actors (`repository-pr-sync`, `repository-branch-sync`, `task-status-sync`)
+- Mutates: none (read-only pollers; publish result messages only).
+
+## Run Loop Patterns (Required)
+
+Parent orchestration actors: no timeout, command-only queue loops.
+
+### `OrganizationActor` (no timeout)
+
+```ts
+run: async (c) => {
+  while (true) {
+    const msg = await c.queue.next("organization.command");
+    await handleOrganizationCommand(c, msg); // writes organization-owned tables only
+  }
+};
+```
+
+### `RepositoryActor` (no timeout)
+
+```ts
+run: async (c) => {
+  while (true) {
+    const msg = await c.queue.next("repository.command");
+    await handleProjectCommand(c, msg); // includes applying sync results to branches/pr_cache
+  }
+};
+```
+
+### `TaskActor` (no timeout)
+
+```ts
+run: async (c) => {
+  while (true) {
+    const msg = await c.queue.next("task.command");
+    await handleTaskCommand(c, msg); // includes applying status results to task_runtime
+  }
+};
+```
+
+### `SandboxInstanceActor` (no timeout)
+
+```ts
+run: async (c) => {
+  while (true) {
+    const msg = await c.queue.next("sandbox_instance.command");
+    await handleSandboxInstanceCommand(c, msg); // sandbox_instances table only
+  }
+};
+```
+
+### `HistoryActor` (no timeout)
+
+```ts
+run: async (c) => {
+  while (true) {
+    const msg = await c.queue.next("history.command");
+    await persistEvent(c, msg); // events table only
+  }
+};
+```
+
+Child sync actors: one timeout each, one cadence each.
+
+### `ProjectPrSyncActor` (single timeout cadence)
+
+```ts
+run: async (c) => {
+  const intervalMs = 30_000;
+  while (true) {
+    const msg = await c.queue.next("repository.pr_sync.command", { timeout: intervalMs });
+    if (!msg) {
+      const result = await pollPrState();
+      await sendToProject({ name: "repository.pr_sync.result", result });
+      continue;
+    }
+    await handlePrSyncControl(c, msg); // force/stop/update-interval
+  }
+};
+```
+
+### `ProjectBranchSyncActor` (single timeout cadence)
+
+```ts
+run: async (c) => {
+  const intervalMs = 5_000;
+  while (true) {
+    const msg = await c.queue.next("repository.branch_sync.command", { timeout: intervalMs });
+    if (!msg) {
+      const result = await pollBranchState();
+      await sendToProject({ name: "repository.branch_sync.result", result });
+      continue;
+    }
+    await handleBranchSyncControl(c, msg);
+  }
+};
+```
+
+### `TaskStatusSyncActor` (single timeout cadence)
+
+```ts
+run: async (c) => {
+  const intervalMs = 2_000;
+  while (true) {
+    const msg = await c.queue.next("task.status_sync.command", { timeout: intervalMs });
+    if (!msg) {
+      const result = await pollSessionAndSandboxStatus();
+      await sendToTask({ name: "task.status_sync.result", result });
+      continue;
+    }
+    await handleStatusSyncControl(c, msg);
+  }
+};
+```
+
+## Sandbox Provider Interface
+
+Provider contract lives under `packages/backend/src/providers/provider-api` and is consumed by organization/repository/task actors.
+
+```ts
+interface SandboxProvider {
+  id(): string;
+  capabilities(): ProviderCapabilities;
+  validateConfig(input: unknown): Promise<ValidatedConfig>;
+
+  createSandbox(req: CreateSandboxRequest): Promise<SandboxHandle>;
+  resumeSandbox(req: ResumeSandboxRequest): Promise<SandboxHandle>;
+  destroySandbox(req: DestroySandboxRequest): Promise<void>;
+
+  ensureSandboxAgent(req: EnsureAgentRequest): Promise<AgentEndpoint>;
+  health(req: SandboxHealthRequest): Promise<SandboxHealth>;
+  attachTarget(req: AttachTargetRequest): Promise<AttachTarget>;
+}
+```
+
+Initial providers:
+
+1. `worktree`
+- Local git worktree-backed sandbox.
+- Sandbox Agent local/shared endpoint.
+- Preserves tmux + `cd` ergonomics.
+
+2. `daytona`
+- Remote sandbox lifecycle via Daytona.
+- Boots/ensures Sandbox Agent inside sandbox.
+- Returns endpoint/token for session operations.
+
+## Command Surface (Organization + Provider Aware)
+
+1. `hf create ... --organization <ws> --provider <worktree|daytona>`
+2. `hf switch --organization <ws> [target]`
+3. `hf attach --organization <ws> [task]`
+4. `hf list --organization <ws>`
+5. `hf kill|archive|merge|push|sync --organization <ws> ...`
+6. `hf organization use <ws>` to set default organization
+
+List/TUI include provider and sandbox health metadata.
+
+`--organization` remains optional; omitted values use the standard resolution order.
+
+## Data Model v2 (SQLite + Drizzle)
+
+All persistent state is SQLite via Drizzle schema + migrations.
+
+Tables (organization-scoped):
+
+1. `organizations`
+2. `workspace_provider_profiles`
+3. `repos` (`workspace_id`, `repo_id`, ...)
+4. `branches` (`workspace_id`, `repo_id`, ...)
+5. `tasks` (`workspace_id`, `task_id`, `provider_id`, ...)
+6. `task_runtime` (`workspace_id`, `task_id`, `sandbox_id`, `session_id`, ...)
+7. `sandbox_instances` (`workspace_id`, `provider_id`, `sandbox_id`, ...)
+8. `pr_cache` (`workspace_id`, `repo_id`, ...)
+9. `events` (`workspace_id`, `repo_id`, ...)
+
+Migration approach: one-way migration from existing schema during TS backend bootstrap.
+
+## Transport and Runtime
+
+1. TypeScript backend exposes local control API (socket or localhost HTTP).
+2. CLI/TUI are thin clients; all mutations go through backend actors.
+3. OpenTUI subscribes to repository streams from organization-scoped repository actors.
+4. Organization is required context on all backend mutation requests.
+
+CLI/TUI are responsible for resolving organization context before calling backend mutations.
+
+## CLI + TUI Packaging
+
+CLI and TUI ship from one package:
+
+1. `packages/cli`
+- command-oriented UX (`hf create`, `hf push`, scripting, JSON output)
+- interactive OpenTUI mode via `hf tui`
+- shared client/runtime wiring in one distributable
+
+The package still calls the same backend API and shares contracts from `packages/shared`.
+
+## Implementation Phases
+
+## Phase 0: Contracts and Organization Spec
+
+1. Freeze organization model, provider contract, and actor ownership map.
+2. Freeze command flags for organization + provider selection.
+3. Define Drizzle schema draft and migration plan.
+
+Exit criteria:
+- Approved architecture RFC.
+
+## Phase 1: TypeScript Monorepo Bootstrap
+
+1. Add `pnpm` organization + Turborepo pipeline.
+2. Create `shared`, `backend`, and `cli` packages (with TUI integrated into CLI).
+3. Add strict TypeScript config and CI checks.
+
+Exit criteria:
+- `pnpm -w typecheck` and `turbo run build` pass.
+
+## Phase 2: RivetKit + Drizzle Foundations
+
+1. Wire local RivetKit dependency from `../rivet`.
+2. Add SQLite + Drizzle migrations and query layer.
+3. Implement actor registry with organization-prefixed keys.
+
+Exit criteria:
+- Backend boot + organization actor health checks pass.
+
+## Phase 3: Provider Layer in Backend
+
+1. Implement provider API inside backend package.
+2. Implement `worktree` provider end-to-end.
+3. Integrate sandbox-agent session lifecycle through provider.
+
+Exit criteria:
+- `create/list/switch/attach/push/sync/kill` pass on worktree provider.
+
+## Phase 4: Organization/Task Lifecycle
+
+1. Implement organization coordinator flows.
+2. Implement TaskActor full lifecycle + post-idle automation.
+3. Implement history events and PR/CI/review change tracking.
+
+Exit criteria:
+- history/event completeness with parity checks.
+
+## Phase 5: Daytona Provider
+
+1. Implement Daytona sandbox lifecycle adapter.
+2. Ensure sandbox-agent boot and reconnection behavior.
+3. Validate attach/switch/kill flows for remote sandboxes.
+
+Exit criteria:
+- e2e pass on daytona provider.
+
+## Phase 6: OpenTUI Rewrite
+
+1. Build interactive list/switch UI in OpenTUI.
+2. Implement key actions (attach/open PR/archive/merge/sync).
+3. Add organization switcher UX and provider/sandbox indicators.
+
+Exit criteria:
+- TUI parity and responsive streaming updates.
+
+## Phase 7: Cutover + Rust Deletion
+
+1. Migrate existing DB to v2.
+2. Replace runtime entrypoints with TS CLI/backend/TUI.
+3. Delete Rust code, Cargo files, Rust scripts.
+4. Update docs and `skills/SKILL.md`.
+
+Exit criteria:
+- no Rust code remains, fresh install + upgrade validated.
+
+## Testing Strategy
+
+1. Unit tests
+- actor actions and ownership rules
+- provider adapters
+- event emission correctness
+- drizzle query/migration tests
+
+2. Integration tests
+- backend + sqlite + provider fakes
+- organization isolation boundaries
+- session recovery and restart handling
+
+3. E2E tests
+- worktree provider in local test repo
+- daytona provider in controlled env
+- OpenTUI interactive flows
+
+4. Reliability tests
+- sandbox-agent restarts
+- transient provider failures
+- backend restart with in-flight tasks
+
+## Open Questions To Resolve Before Implementation
+
+1. Daytona production adapter parity:
+- Current `daytona` provider in this repo is intentionally a fallback adapter so local development remains testable without a Daytona backend.
+- Final deployment integration should replace placeholder lifecycle calls with Daytona API operations (create/destroy/health/auth/session boot inside sandbox).
diff --git a/foundry/screenshots/dev-panel-github.png b/foundry/screenshots/dev-panel-github.png
new file mode 100644
index 0000000..469f8a0
Binary files /dev/null and b/foundry/screenshots/dev-panel-github.png differ
diff --git a/foundry/scripts/build-test-image.sh b/foundry/scripts/build-test-image.sh
new file mode 100755
index 0000000..a8cae9b
--- /dev/null
+++ b/foundry/scripts/build-test-image.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "Docker integration test image is not part of the TypeScript migration baseline."
+echo "Use monorepo tests instead:"
+echo "  pnpm -w typecheck"
+echo "  pnpm -w build"
+echo "  pnpm -w test"
diff --git a/foundry/scripts/data/rivet-dev.json b/foundry/scripts/data/rivet-dev.json
new file mode 100644
index 0000000..3534cac
--- /dev/null
+++ b/foundry/scripts/data/rivet-dev.json
@@ -0,0 +1,1332 @@
+{
+  "pulledAt": "2026-03-14T03:31:52.336Z",
+  "login": "rivet-dev",
+  "id": 57733614,
+  "name": "Rivet",
+  "description": "Helping developers build and scale stateful workloads",
+  "email": null,
+  "blog": "https://rivet.dev",
+  "avatarUrl": "https://avatars.githubusercontent.com/u/57733614?v=4",
+  "repos": [
+    {
+      "fullName": "rivet-dev/rivet",
+      "cloneUrl": "https://github.com/rivet-dev/rivet.git",
+      "description": "Rivet Actors are the primitive for stateful workloads. Built for AI agents, collaborative apps, and durable execution.",
+      "language": "Rust",
+      "stars": 5223,
+      "updatedAt": "2026-03-13T21:02:54Z"
+    },
+    {
+      "fullName": "rivet-dev/sandbox-agent",
+      "cloneUrl": "https://github.com/rivet-dev/sandbox-agent.git",
+      "description": "Run Coding Agents in Sandboxes. Control Them Over HTTP. Supports Claude Code, Codex, OpenCode, and Amp.",
+      "language": "TypeScript",
+      "stars": 1075,
+      "updatedAt": "2026-03-14T00:48:35Z"
+    },
+    {
+      "fullName": "rivet-dev/vbare",
+      "cloneUrl": "https://github.com/rivet-dev/vbare.git",
+      "description": "Versioned Binary Application Record Encoding",
+      "language": "Rust",
+      "stars": 11,
+      "updatedAt": "2026-01-20T05:14:00Z"
+    },
+    {
+      "fullName": "rivet-dev/proposal-stateful-serverless-api",
+      "cloneUrl": "https://github.com/rivet-dev/proposal-stateful-serverless-api.git",
+      "description": "https://rivet.gg/blog/2025-03-23-what-would-a-w3c-standard-look-like-for-stateful-serverless-",
+      "language": "HTML",
+      "stars": 11,
+      "updatedAt": "2025-10-05T03:06:18Z"
+    },
+    {
+      "fullName": "rivet-dev/skills",
+      "cloneUrl": "https://github.com/rivet-dev/skills.git",
+      "description": "Generated skill files for Rivet AI integrations",
+      "language": null,
+      "stars": 7,
+      "updatedAt": "2026-03-13T21:07:08Z"
+    },
+    {
+      "fullName": "rivet-dev/godot-docker",
+      "cloneUrl": "https://github.com/rivet-dev/godot-docker.git",
+      "description": "Dockerfiles to help containerize Godot 4",
+      "language": "Dockerfile",
+      "stars": 4,
+      "updatedAt": "2025-04-23T20:39:29Z"
+    },
+    {
+      "fullName": "rivet-dev/template-railway",
+      "cloneUrl": "https://github.com/rivet-dev/template-railway.git",
+      "description": null,
+      "language": "TypeScript",
+      "stars": 3,
+      "updatedAt": "2026-02-23T10:55:48Z"
+    },
+    {
+      "fullName": "rivet-dev/preview-namespace-action",
+      "cloneUrl": "https://github.com/rivet-dev/preview-namespace-action.git",
+      "description": "Automatically create Rivet namespaces for Vercel preview deployments",
+      "language": "TypeScript",
+      "stars": 2,
+      "updatedAt": "2026-02-06T00:57:17Z"
+    },
+    {
+      "fullName": "rivet-dev/template-vercel",
+      "cloneUrl": "https://github.com/rivet-dev/template-vercel.git",
+      "description": "Next.js template with RivetKit integration for Vercel deployment",
+      "language": "TypeScript",
+      "stars": 2,
+      "updatedAt": "2026-02-06T00:47:13Z"
+    },
+    {
+      "fullName": "rivet-dev/.github",
+      "cloneUrl": "https://github.com/rivet-dev/.github.git",
+      "description": null,
+      "language": null,
+      "stars": 1,
+      "updatedAt": "2026-02-24T08:32:42Z"
+    },
+    {
+      "fullName": "rivet-dev/rivetkit-swift",
+      "cloneUrl": "https://github.com/rivet-dev/rivetkit-swift.git",
+      "description": "Swift SDK for Rivet Actors.",
+      "language": "Swift",
+      "stars": 1,
+      "updatedAt": "2026-01-28T14:19:11Z"
+    },
+    {
+      "fullName": "rivet-dev/opengb",
+      "cloneUrl": "https://github.com/rivet-dev/opengb.git",
+      "description": "Moved to https://github.com/rivet-gg/toolchain",
+      "language": null,
+      "stars": 1,
+      "updatedAt": "2025-02-14T00:41:22Z"
+    },
+    {
+      "fullName": "rivet-dev/plugin-colyseus-server",
+      "cloneUrl": "https://github.com/rivet-dev/plugin-colyseus-server.git",
+      "description": null,
+      "language": "TypeScript",
+      "stars": 1,
+      "updatedAt": "2023-04-03T22:30:41Z"
+    },
+    {
+      "fullName": "rivet-dev/deploy-action",
+      "cloneUrl": "https://github.com/rivet-dev/deploy-action.git",
+      "description": null,
+      "language": "TypeScript",
+      "stars": 0,
+      "updatedAt": "2026-03-13T19:21:43Z"
+    },
+    {
+      "fullName": "rivet-dev/vite-plugin-srvx",
+      "cloneUrl": "https://github.com/rivet-dev/vite-plugin-srvx.git",
+      "description": null,
+      "language": "TypeScript",
+      "stars": 0,
+      "updatedAt": "2026-02-10T01:50:44Z"
+    },
+    {
+      "fullName": "rivet-dev/template-railway-multiregion",
+      "cloneUrl": "https://github.com/rivet-dev/template-railway-multiregion.git",
+      "description": "Railway template with multi-region serverless configuration",
+      "language": "TypeScript",
+      "stars": 0,
+      "updatedAt": "2026-01-14T19:33:47Z"
+    },
+    {
+      "fullName": "rivet-dev/template-aws-ecs",
+      "cloneUrl": "https://github.com/rivet-dev/template-aws-ecs.git",
+      "description": null,
+      "language": "TypeScript",
+      "stars": 0,
+      "updatedAt": "2026-01-05T23:46:47Z"
+    },
+    {
+      "fullName": "rivet-dev/template-freestyle",
+      "cloneUrl": "https://github.com/rivet-dev/template-freestyle.git",
+      "description": null,
+      "language": "TypeScript",
+      "stars": 0,
+      "updatedAt": "2025-12-11T01:04:22Z"
+    },
+    {
+      "fullName": "rivet-dev/rivet-term",
+      "cloneUrl": "https://github.com/rivet-dev/rivet-term.git",
+      "description": null,
+      "language": "Rust",
+      "stars": 0,
+      "updatedAt": "2025-05-30T21:59:40Z"
+    },
+    {
+      "fullName": "rivet-dev/nomad-client",
+      "cloneUrl": "https://github.com/rivet-dev/nomad-client.git",
+      "description": null,
+      "language": "Rust",
+      "stars": 0,
+      "updatedAt": "2024-01-17T20:53:39Z"
+    },
+    {
+      "fullName": "rivet-dev/cloud-benchmarks",
+      "cloneUrl": "https://github.com/rivet-dev/cloud-benchmarks.git",
+      "description": null,
+      "language": "HCL",
+      "stars": 0,
+      "updatedAt": "2023-06-20T18:47:22Z"
+    },
+    {
+      "fullName": "rivet-dev/terraform-generic-server",
+      "cloneUrl": "https://github.com/rivet-dev/terraform-generic-server.git",
+      "description": null,
+      "language": "HCL",
+      "stars": 0,
+      "updatedAt": "2023-06-20T01:40:11Z"
+    },
+    {
+      "fullName": "rivet-dev/service-client-documentation-generator",
+      "cloneUrl": "https://github.com/rivet-dev/service-client-documentation-generator.git",
+      "description": null,
+      "language": "JavaScript",
+      "stars": 0,
+      "updatedAt": "2022-07-09T02:41:26Z"
+    }
+  ],
+  "members": [
+    {
+      "id": "3322446",
+      "login": "NathanFlurry",
+      "avatarUrl": "https://avatars.githubusercontent.com/u/3322446?v=4",
+      "role": "member"
+    },
+    {
+      "id": "28816635",
+      "login": "NicholasKissel",
+      "avatarUrl": "https://avatars.githubusercontent.com/u/28816635?v=4",
+      "role": "member"
+    }
+  ],
+  "openPullRequests": [
+    {
+      "number": 4423,
+      "title": "fix(pegboard): unwrap actor name metadata",
+      "state": "open",
+      "draft": false,
+      "headRefName": "metadata-double-nesting",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-14T00:41:44Z"
+    },
+    {
+      "number": 4422,
+      "title": "docs: clarify service keys vs admin tokens for actor management",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix-cloud-token-docs",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T22:04:18Z"
+    },
+    {
+      "number": 4421,
+      "title": "fix: ignore invalid base64 input",
+      "state": "open",
+      "draft": false,
+      "headRefName": "03-13-fix_ignore_invalid_base64_input",
+      "author": "MasterPtato",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T23:51:56Z"
+    },
+    {
+      "number": 4420,
+      "title": "feat(actor): add metadata patching and projection",
+      "state": "open",
+      "draft": false,
+      "headRefName": "actor-metadata-api",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T21:55:58Z"
+    },
+    {
+      "number": 4419,
+      "title": "feat(rivetkit): add support for tanstack query",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat/react-query",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T21:13:07Z"
+    },
+    {
+      "number": 4417,
+      "title": "fix(rivetkit): validate runner version fits in u32",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix/runner-version-u32-validation",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T09:40:35Z"
+    },
+    {
+      "number": 4414,
+      "title": "Add inspector SQLite shell and property bindings",
+      "state": "open",
+      "draft": false,
+      "headRefName": "wider-inspector-shots",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T04:54:56Z"
+    },
+    {
+      "number": 4413,
+      "title": "Add workflow try helpers and visualizer support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "workflow-try-step-api",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T05:49:52Z"
+    },
+    {
+      "number": 4411,
+      "title": "Add workflow rerun controls to RivetKit Inspector",
+      "state": "open",
+      "draft": false,
+      "headRefName": "workflow-step-resume",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T19:54:15Z"
+    },
+    {
+      "number": 4410,
+      "title": "Add inspector SQLite shell and property bindings",
+      "state": "open",
+      "draft": false,
+      "headRefName": "inspector-sqlite-shell",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T17:44:43Z"
+    },
+    {
+      "number": 4409,
+      "title": "fix(rivetkit): pack inspector in pkg-pr-new",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix-pkg-prp-inspector",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T05:19:49Z"
+    },
+    {
+      "number": 4401,
+      "title": "chore(deps): bump the cargo group across 1 directory with 4 updates",
+      "state": "open",
+      "draft": false,
+      "headRefName": "dependabot/cargo/cargo-5ada01758a",
+      "author": "dependabot[bot]",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-11T00:20:45Z"
+    },
+    {
+      "number": 4400,
+      "title": "Add actor reschedule endpoint",
+      "state": "open",
+      "draft": false,
+      "headRefName": "actor-reschedule-endpoint",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-11T00:03:30Z"
+    },
+    {
+      "number": 4397,
+      "title": "feat: dynamic actors",
+      "state": "open",
+      "draft": false,
+      "headRefName": "03-08-feat_rivetkit_dynamic_actors",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-12T05:47:58Z"
+    },
+    {
+      "number": 4396,
+      "title": "Fix mcp-hub to serve built docs metadata",
+      "state": "open",
+      "draft": false,
+      "headRefName": "docs-mcp-server-plan",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-10T18:08:58Z"
+    },
+    {
+      "number": 4395,
+      "title": "feat: dynamic actors",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat/dynamic-actors",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-10T16:27:33Z"
+    },
+    {
+      "number": 4389,
+      "title": "Add Cloudflare migration cookbook and evals",
+      "state": "open",
+      "draft": false,
+      "headRefName": "cf-cookbook",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-12T07:05:32Z"
+    },
+    {
+      "number": 4388,
+      "title": "fix(gasoline): fix postgres contention and stuck workflow race condition",
+      "state": "open",
+      "draft": true,
+      "headRefName": "fix/gasoline-postgres-contention",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-09T16:48:33Z"
+    },
+    {
+      "number": 4384,
+      "title": "Use KV range ops in workflow, queue, and SQLite",
+      "state": "open",
+      "draft": false,
+      "headRefName": "kv-range-opportunities",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-08T07:54:26Z"
+    },
+    {
+      "number": 4375,
+      "title": "feat(frontend): local-first onboarding flow",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NicholasKissel/onboarding-local-first",
+      "author": "NicholasKissel",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-07T20:15:13Z"
+    },
+    {
+      "number": 4356,
+      "title": "fix: prevent white background flash on docs redirect pages",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NicholasKissel/fix-docs-redirect-flash",
+      "author": "NicholasKissel",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T20:56:00Z"
+    },
+    {
+      "number": 4355,
+      "title": "Add Render connect guide for RivetKit applications",
+      "state": "open",
+      "draft": false,
+      "headRefName": "main",
+      "author": "ojusave",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-05T04:21:54Z"
+    },
+    {
+      "number": 4354,
+      "title": "Add Render connect guide for RivetKit applications",
+      "state": "open",
+      "draft": false,
+      "headRefName": "add-render-connect-guide",
+      "author": "ojusave",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-04T21:40:54Z"
+    },
+    {
+      "number": 4352,
+      "title": "fix(website): use PostHog React hook instead of direct import",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NicholasKissel/fix-posthog-forms",
+      "author": "NicholasKissel",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-12T18:20:51Z"
+    },
+    {
+      "number": 4348,
+      "title": "refactor: redesign landing hero with animated benchmark",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NathanFlurry/landing-hero-update",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-04T03:30:19Z"
+    },
+    {
+      "number": 4345,
+      "title": "fix(website): eliminate sidebar and tab flicker on docs navigation",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix/docs-sidebar-flicker",
+      "author": "bohdanbirdie",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-03T23:32:21Z"
+    },
+    {
+      "number": 4339,
+      "title": "chore: update wording",
+      "state": "open",
+      "draft": false,
+      "headRefName": "chore-udpate-wording",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T20:57:10Z"
+    },
+    {
+      "number": 4331,
+      "title": "chore: move ActorDefinition and ActorInstance to interfaces",
+      "state": "open",
+      "draft": false,
+      "headRefName": "chore-move-actordefinition-and",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T19:09:34Z"
+    },
+    {
+      "number": 4330,
+      "title": "feat: dynamic actors",
+      "state": "open",
+      "draft": true,
+      "headRefName": "feat-dynamic-actors",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T18:40:20Z"
+    },
+    {
+      "number": 4325,
+      "title": "feat: dev toolbar",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-27-feat_dev_toolbar",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T20:02:23Z"
+    },
+    {
+      "number": 4323,
+      "title": "fix(frontend): fix inspector public path",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-20-fix_frontend_fix_inspector_public_path",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T08:49:55Z"
+    },
+    {
+      "number": 4322,
+      "title": "chore(website): add troubleshooting doc",
+      "state": "open",
+      "draft": false,
+      "headRefName": "chore-website-add",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-07T20:08:33Z"
+    },
+    {
+      "number": 4321,
+      "title": "fix(rivetkit0: fix wf history diverged bug",
+      "state": "open",
+      "draft": true,
+      "headRefName": "02-26-fix_rivetkit0_fix_wf_history_diverged_bug",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-07T00:46:20Z"
+    },
+    {
+      "number": 4312,
+      "title": "feat: add @rivetkit/effect package",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat/rivetkit-effect",
+      "author": "Makisuo",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-02-27T16:18:18Z"
+    },
+    {
+      "number": 4289,
+      "title": "feat(rust/engine-runner): minimal rust engine runner",
+      "state": "open",
+      "draft": true,
+      "headRefName": "02-23-feat_rust_engine-runner_feature_parity_with_typescript",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-07T21:33:09Z"
+    },
+    {
+      "number": 4245,
+      "title": "feat(inspector): expose http api for inspector",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-20-feat_inspector_expose_http_api_for_inspector",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-12T11:21:50Z"
+    },
+    {
+      "number": 4177,
+      "title": "chore(site): adjusted photos and seo",
+      "state": "open",
+      "draft": true,
+      "headRefName": "02-10-chore_site_adjusted_photos_and_seo",
+      "author": "NicholasKissel",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-14T01:08:34Z"
+    },
+    {
+      "number": 4172,
+      "title": "feat: better charts",
+      "state": "open",
+      "draft": true,
+      "headRefName": "02-11-feat_better_charts",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T16:00:09Z"
+    },
+    {
+      "number": 4152,
+      "title": "chore(site): weekly changelog",
+      "state": "open",
+      "draft": true,
+      "headRefName": "02-06-chore_site_weekly_changelog",
+      "author": "NicholasKissel",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T11:29:50Z"
+    },
+    {
+      "number": 4141,
+      "title": "chore(site): weekly changelog 2026-06",
+      "state": "open",
+      "draft": false,
+      "headRefName": "changelog-2026-06",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T15:30:07Z"
+    },
+    {
+      "number": 4136,
+      "title": "chore: route sentry through caddy",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-05-chore_route_sentry_through_caddy",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-02-18T03:26:14Z"
+    },
+    {
+      "number": 4096,
+      "title": "feat(examples): add tanstack start on cloudflare example",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-03-feat_examples_add_tanstack_start_on_cloudflare_example",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T14:03:45Z"
+    },
+    {
+      "number": 4095,
+      "title": "feat(examples): add tanstack start example",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-02-feat_examples_add_tanstack_start_example",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T15:51:26Z"
+    },
+    {
+      "number": 4065,
+      "title": "fix(ci): copy skills to skills/ directory instead of repo root",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix/skills-workflow-path",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T03:23:11Z"
+    },
+    {
+      "number": 4064,
+      "title": "feat(rivetkit): add runner override option to getOrCreate and create",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat/runner-override-options",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T20:07:23Z"
+    },
+    {
+      "number": 4063,
+      "title": "fix(rivetkit): deserialize actor keys properly in manager router",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix/actor-keys-array",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-29T12:15:23Z"
+    },
+    {
+      "number": 4062,
+      "title": "fix(rivetkit): shorten local dev client retry backoff",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix/local-dev-backoff",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-29T12:16:02Z"
+    },
+    {
+      "number": 4040,
+      "title": "Enforce browser/node code boundaries with linter and build plugin",
+      "state": "open",
+      "draft": false,
+      "headRefName": "claude/vite-detection-library-trZOL",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-26T18:45:23Z"
+    },
+    {
+      "number": 4031,
+      "title": "fix(rivetkit): use localhost instead of 127.0.0.1 to fix wsl support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "01-24-fix_rivetkit_use_localhost_instead_of_127.0.0.1_to_fix_wsl_support",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T20:12:56Z"
+    },
+    {
+      "number": 4018,
+      "title": "feat(rivetkit): convex support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "convex-adapter",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-02-17T08:58:33Z"
+    },
+    {
+      "number": 4008,
+      "title": "feat(examples): effect",
+      "state": "open",
+      "draft": true,
+      "headRefName": "01-21-feat_examples_effect",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T01:49:01Z"
+    },
+    {
+      "number": 4004,
+      "title": "feat(rivetkit): add clearAlarm",
+      "state": "open",
+      "draft": true,
+      "headRefName": "01-21-feat_rivetkit_add_clearalarm",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-02-19T19:47:34Z"
+    },
+    {
+      "number": 3972,
+      "title": "fix(website): output raw MDX for docs markdown",
+      "state": "open",
+      "draft": false,
+      "headRefName": "codex/render-raw-.mdx-files-without-modification",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-18T23:15:32Z"
+    },
+    {
+      "number": 3971,
+      "title": "fix(website): align Typesense env var to PUBLIC_TYPESENSE_API_KEY",
+      "state": "open",
+      "draft": false,
+      "headRefName": "codex/fix-search-box-after-astro-migration",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T13:51:36Z"
+    },
+    {
+      "number": 3968,
+      "title": "chore: fix /api routing for dev with new examples",
+      "state": "open",
+      "draft": false,
+      "headRefName": "01-16-chore_fix__api_routing_for_dev_with_new_examples",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T14:37:46Z"
+    },
+    {
+      "number": 3967,
+      "title": "feat(examples): better vercel support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "01-17-feat_examples_better_vercel_support",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-17T06:05:14Z"
+    },
+    {
+      "number": 3900,
+      "title": "chore(site): add auto-generated og image",
+      "state": "open",
+      "draft": true,
+      "headRefName": "01-14-chore_site_add_auto-generated_og_image",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T20:48:15Z"
+    },
+    {
+      "number": 3890,
+      "title": "DO NOT MERGE: cloudflare w/o do support",
+      "state": "open",
+      "draft": true,
+      "headRefName": "01-13-do_not_merge_cloudflare_w_o_do_support",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-13T23:18:34Z"
+    },
+    {
+      "number": 3832,
+      "title": "Add import conditions to prevent node dependencies in client bundle",
+      "state": "open",
+      "draft": false,
+      "headRefName": "claude/add-import-conditions-Iu81W",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-03-01T23:59:27Z"
+    },
+    {
+      "number": 3746,
+      "title": "Add deploy template support for serverless examples (FRONT-908)",
+      "state": "open",
+      "draft": true,
+      "headRefName": "copilot/add-deploy-template-front-908",
+      "author": "Copilot",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-05T17:44:40Z"
+    },
+    {
+      "number": 3740,
+      "title": "chore: update engine-full sdk",
+      "state": "open",
+      "draft": false,
+      "headRefName": "01-02-chore_update_engine-full_sdk",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-09T00:04:24Z"
+    },
+    {
+      "number": 3736,
+      "title": "Adopt unified endpoint format in UI and environment variables",
+      "state": "open",
+      "draft": true,
+      "headRefName": "copilot/update-ui-env-vars-unified-endpoint-front-904",
+      "author": "Copilot",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-05T14:36:11Z"
+    },
+    {
+      "number": 3718,
+      "title": "chore(scripts): add --reuse-engine & validate provided engine version",
+      "state": "open",
+      "draft": true,
+      "headRefName": "12-29-chore_scripts_add_--reuse-engine_validate_provided_engine_version",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-29T19:44:14Z"
+    },
+    {
+      "number": 3714,
+      "title": "Add \"Show metadata\" action to runner list",
+      "state": "open",
+      "draft": true,
+      "headRefName": "copilot/add-show-metadata-to-runner-list-rvt-5040",
+      "author": "Copilot",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-28T19:39:47Z"
+    },
+    {
+      "number": 3662,
+      "title": "feat(examples): pong & agario examples",
+      "state": "open",
+      "draft": true,
+      "headRefName": "12-20-feat_examples_pong_agario_examples",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-20T20:05:58Z"
+    },
+    {
+      "number": 3645,
+      "title": "Add GitHub Copilot instructions with separate sections for engine, rivetkit, frontend, and website",
+      "state": "open",
+      "draft": true,
+      "headRefName": "copilot/setup-copilot-instructions",
+      "author": "Copilot",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-12T22:51:20Z"
+    },
+    {
+      "number": 3640,
+      "title": "feat(rivetkit): configure server port via env (for serverless auto-start)",
+      "state": "open",
+      "draft": false,
+      "headRefName": "12-12-feat_rivetkit_configure_server_port_via_env_for_serverless_auto-start_",
+      "author": "abcxff",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-12T03:07:38Z"
+    },
+    {
+      "number": 3627,
+      "title": "Add KV inspector backend endpoints and WebSocket protocol support",
+      "state": "open",
+      "draft": true,
+      "headRefName": "copilot/add-kv-inspector-feature",
+      "author": "Copilot",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2026-01-17T01:37:38Z"
+    },
+    {
+      "number": 3617,
+      "title": "feat(examples): ai-ap-builder-freestyle",
+      "state": "open",
+      "draft": true,
+      "headRefName": "12-09-feat_examples_ai-ap-builder-freestyle",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-12T00:49:19Z"
+    },
+    {
+      "number": 3418,
+      "title": "docs: rebrand examples and docs to rivet",
+      "state": "open",
+      "draft": false,
+      "headRefName": "docs/examples-rivet-rebrand",
+      "author": "atqamz",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-11-08T17:18:37Z"
+    },
+    {
+      "number": 3297,
+      "title": "chore(deps): bump the cargo group across 1 directory with 2 updates",
+      "state": "open",
+      "draft": false,
+      "headRefName": "dependabot/cargo/cargo-56740afe0f",
+      "author": "dependabot[bot]",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-12-02T05:18:18Z"
+    },
+    {
+      "number": 3264,
+      "title": "chore(rivetkit-typescript): remove dependency on node modules",
+      "state": "open",
+      "draft": true,
+      "headRefName": "10-25-chore_rivetkit-typescript_remove_dependency_on_node_modules",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-11-07T04:48:58Z"
+    },
+    {
+      "number": 3218,
+      "title": "chore(main): release 25.8.1",
+      "state": "open",
+      "draft": false,
+      "headRefName": "release-please--branches--main",
+      "author": "github-actions[bot]",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-10-22T06:31:57Z"
+    },
+    {
+      "number": 3161,
+      "title": "chore(sdk): fix cjs support",
+      "state": "open",
+      "draft": true,
+      "headRefName": "10-12-chore_sdk_fix_cjs_support",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-10-12T17:50:53Z"
+    },
+    {
+      "number": 2930,
+      "title": "chore: clean up tests",
+      "state": "open",
+      "draft": true,
+      "headRefName": "09-17-chore_clean_up_tests",
+      "author": "abcxff",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-09-24T19:51:14Z"
+    },
+    {
+      "number": 2888,
+      "title": "chore(deps-dev): bump esbuild from 0.19.12 to 0.25.0 in /sdks/typescript/api-full in the npm_and_yarn group across 1 directory",
+      "state": "open",
+      "draft": false,
+      "headRefName": "dependabot/npm_and_yarn/sdks/typescript/api-full/npm_and_yarn-392d5e510b",
+      "author": "dependabot[bot]",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-10-14T04:20:28Z"
+    },
+    {
+      "number": 2775,
+      "title": "feat(studio): db",
+      "state": "open",
+      "draft": true,
+      "headRefName": "05-12-feat_studio_db",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-07-20T22:01:19Z"
+    },
+    {
+      "number": 2603,
+      "title": "fix(site): break long code snippets",
+      "state": "open",
+      "draft": true,
+      "headRefName": "06-14-fix_site_break_long_code_snippets",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/rivet",
+      "updatedAt": "2025-09-08T07:21:21Z"
+    },
+    {
+      "number": 249,
+      "title": "Consolidate example install commands",
+      "state": "open",
+      "draft": false,
+      "headRefName": "extract-install-command",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-13T20:51:01Z"
+    },
+    {
+      "number": 246,
+      "title": "Add Foundry mobile layout with Tauri iOS/Android support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NicholasKissel/foundry-mobile-layout",
+      "author": "NicholasKissel",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-13T07:42:38Z"
+    },
+    {
+      "number": 230,
+      "title": "fix: update Rivet doc examples and peer dep",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NathanFlurry/fix-rivet-docs",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T04:23:48Z"
+    },
+    {
+      "number": 227,
+      "title": "fix: normalize Pi ACP bootstrap payloads",
+      "state": "open",
+      "draft": false,
+      "headRefName": "NathanFlurry/pi-bootstrap-fix",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T22:16:40Z"
+    },
+    {
+      "number": 226,
+      "title": "Expand desktop computer-use APIs with recording, streaming, and Docker tests",
+      "state": "open",
+      "draft": false,
+      "headRefName": "desktop-computer-use",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-14T02:29:04Z"
+    },
+    {
+      "number": 225,
+      "title": "feat: add hooks example for Claude, Codex, and OpenCode",
+      "state": "open",
+      "draft": false,
+      "headRefName": "hooks-example",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 223,
+      "title": "feat: auto-inject builtin agent skills and CLAUDE.md at startup",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat/builtin-agent-skills",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T22:26:44Z"
+    },
+    {
+      "number": 222,
+      "title": "Recover wellington organization state",
+      "state": "open",
+      "draft": false,
+      "headRefName": "recovery/wellington-20260309",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T19:06:08Z"
+    },
+    {
+      "number": 220,
+      "title": "Recover lisbon organization state",
+      "state": "open",
+      "draft": false,
+      "headRefName": "recovery/lisbon-20260309",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T12:49:52Z"
+    },
+    {
+      "number": 219,
+      "title": "Recover karachi-v2 organization state",
+      "state": "open",
+      "draft": false,
+      "headRefName": "recovery/karachi-v2-20260309",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T04:15:49Z"
+    },
+    {
+      "number": 218,
+      "title": "Recover hamburg organization state",
+      "state": "open",
+      "draft": false,
+      "headRefName": "recovery/hamburg-20260309",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T07:03:12Z"
+    },
+    {
+      "number": 217,
+      "title": "Recover geneva organization state",
+      "state": "open",
+      "draft": false,
+      "headRefName": "recovery/geneva-20260309",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T17:56:48Z"
+    },
+    {
+      "number": 216,
+      "title": "Recover edinburgh organization state",
+      "state": "open",
+      "draft": false,
+      "headRefName": "recovery/edinburgh-20260309",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 211,
+      "title": "Add desktop APIs and Docker-backed integration tests",
+      "state": "open",
+      "draft": false,
+      "headRefName": "desktop-use",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T05:48:24Z"
+    },
+    {
+      "number": 209,
+      "title": "Fix inspector CWD handling",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix-inspector-cwd",
+      "author": "svetly",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 202,
+      "title": "feat: add configuration for model, mode, and thought level",
+      "state": "open",
+      "draft": false,
+      "headRefName": "effort-level-validation",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T20:29:01Z"
+    },
+    {
+      "number": 200,
+      "title": "feat: add configuration for model, mode, and thought level",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat-add-configuration-for-model",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 197,
+      "title": "Add support for image content blocks in agent messages",
+      "state": "open",
+      "draft": false,
+      "headRefName": "claude/add-image-support-MjMZz",
+      "author": "Glavin001",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 196,
+      "title": "Add image support to ACP agent message handling",
+      "state": "open",
+      "draft": false,
+      "headRefName": "claude/add-image-support-sandbox-MdKa0",
+      "author": "Glavin001",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 192,
+      "title": "Add modal sandbox support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "walter/modal-support",
+      "author": "waltertang27",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 190,
+      "title": "feat: download batch",
+      "state": "open",
+      "draft": true,
+      "headRefName": "02-23-feat_download_batch",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-10T21:24:06Z"
+    },
+    {
+      "number": 175,
+      "title": "chore: migrate skill generator to TypeScript",
+      "state": "open",
+      "draft": false,
+      "headRefName": "chore/skill-generator-typescript",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 174,
+      "title": "chore: improve error output",
+      "state": "open",
+      "draft": false,
+      "headRefName": "fix/mcp-skills-examples-working",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-14T00:57:25Z"
+    },
+    {
+      "number": 173,
+      "title": "fix: fix missing permissions handler",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-11-fix_fix_missing_permissions_handler",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-12T15:23:44Z"
+    },
+    {
+      "number": 172,
+      "title": "chore: improve error output",
+      "state": "open",
+      "draft": false,
+      "headRefName": "02-11-chore_improve_error_output",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 163,
+      "title": "fix: ensure sandbox-agent is on PATH in Compute SDK sandbox",
+      "state": "open",
+      "draft": false,
+      "headRefName": "computesdk-example",
+      "author": "kisernl",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-11T05:13:06Z"
+    },
+    {
+      "number": 64,
+      "title": "feat: add Docker Sandbox deployment support",
+      "state": "open",
+      "draft": true,
+      "headRefName": "feat/docker-sandbox",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/sandbox-agent",
+      "updatedAt": "2026-03-13T14:42:49Z"
+    },
+    {
+      "number": 2,
+      "title": "feat(vbare-compiler): emit schema version metadata",
+      "state": "open",
+      "draft": false,
+      "headRefName": "schema-version-output",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/vbare",
+      "updatedAt": "2026-03-08T21:55:34Z"
+    },
+    {
+      "number": 1,
+      "title": "simplify spec",
+      "state": "open",
+      "draft": true,
+      "headRefName": "simplify-spec",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/proposal-stateful-serverless-api",
+      "updatedAt": "2025-03-25T23:51:12Z"
+    },
+    {
+      "number": 1,
+      "title": "chore: upgrade rivetkit",
+      "state": "open",
+      "draft": false,
+      "headRefName": "chore-upgrade-rivetkit",
+      "author": "abcxff",
+      "repoFullName": "rivet-dev/template-railway",
+      "updatedAt": "2026-03-09T22:39:31Z"
+    },
+    {
+      "number": 8,
+      "title": "feat: add serverRoutes option for SPA support",
+      "state": "open",
+      "draft": false,
+      "headRefName": "feat/server-routes-spa-support",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/vite-plugin-srvx",
+      "updatedAt": "2026-01-20T01:32:38Z"
+    },
+    {
+      "number": 7,
+      "title": "fix: fix default path to api/idnex.ts",
+      "state": "open",
+      "draft": false,
+      "headRefName": "01-16-fix_fix_default_path_to_api_idnex.ts",
+      "author": "NathanFlurry",
+      "repoFullName": "rivet-dev/vite-plugin-srvx",
+      "updatedAt": "2026-01-17T05:56:11Z"
+    },
+    {
+      "number": 6,
+      "title": "feat: add prefix opt",
+      "state": "open",
+      "draft": false,
+      "headRefName": "01-17-feat_add_prefix_opt",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/vite-plugin-srvx",
+      "updatedAt": "2026-01-17T05:56:03Z"
+    },
+    {
+      "number": 5,
+      "title": "fix: vercel build",
+      "state": "open",
+      "draft": true,
+      "headRefName": "01-17-fix_vercel_build",
+      "author": "jog1t",
+      "repoFullName": "rivet-dev/vite-plugin-srvx",
+      "updatedAt": "2026-01-17T05:05:49Z"
+    }
+  ]
+}
diff --git a/foundry/scripts/publish-foundry-base.sh b/foundry/scripts/publish-foundry-base.sh
new file mode 100755
index 0000000..c6f1b15
--- /dev/null
+++ b/foundry/scripts/publish-foundry-base.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+#
+# Build and push the Foundry base sandbox image to Docker Hub.
+#
+# Usage:
+#   ./foundry/scripts/publish-foundry-base.sh          # build + push
+#   ./foundry/scripts/publish-foundry-base.sh --dry-run # build only, no push
+#
+# Prerequisites:
+#   - docker login to Docker Hub (rivetdev org)
+#   - Docker buildx available (ships with Docker Desktop / modern Docker)
+#
+# The image is tagged:
+#   rivetdev/sandbox-agent:foundry-base-<YYYYMMDD>T<HHMMSS>Z
+#   rivetdev/sandbox-agent:foundry-base-latest
+#
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+IMAGE="rivetdev/sandbox-agent"
+TIMESTAMP="$(date -u '+%Y%m%dT%H%M%SZ')"
+TAG_DATED="${IMAGE}:foundry-base-${TIMESTAMP}"
+TAG_LATEST="${IMAGE}:foundry-base-latest"
+DRY_RUN=false
+
+for arg in "$@"; do
+  case "$arg" in
+    --dry-run) DRY_RUN=true ;;
+    *) echo "Unknown argument: $arg" >&2; exit 1 ;;
+  esac
+done
+
+echo "==> Building ${TAG_DATED}"
+echo "    (also tagged ${TAG_LATEST})"
+echo "    Platform: linux/amd64"
+echo ""
+
+docker build \
+  --platform linux/amd64 \
+  -f "${REPO_ROOT}/foundry/docker/foundry-base.Dockerfile" \
+  -t "${TAG_DATED}" \
+  -t "${TAG_LATEST}" \
+  "${REPO_ROOT}"
+
+echo ""
+echo "==> Build complete"
+echo "    ${TAG_DATED}"
+echo "    ${TAG_LATEST}"
+
+if [ "$DRY_RUN" = true ]; then
+  echo ""
+  echo "==> Dry run — skipping push"
+  exit 0
+fi
+
+echo ""
+echo "==> Pushing ${TAG_DATED}"
+docker push "${TAG_DATED}"
+
+echo "==> Pushing ${TAG_LATEST}"
+docker push "${TAG_LATEST}"
+
+echo ""
+echo "==> Done"
+echo "    ${TAG_DATED}"
diff --git a/foundry/scripts/pull-org-data.ts b/foundry/scripts/pull-org-data.ts
new file mode 100644
index 0000000..3580baa
--- /dev/null
+++ b/foundry/scripts/pull-org-data.ts
@@ -0,0 +1,290 @@
+#!/usr/bin/env bun
+/**
+ * Pull public GitHub organization data into a JSON fixture file.
+ *
+ * This script mirrors the sync logic in the backend organization actor
+ * (see: packages/backend/src/actors/organization/app-shell.ts — syncGithubOrganizations
+ * and syncGithubOrganizationRepos). Keep the two in sync: when the backend
+ * sync workflow changes what data it fetches or how it structures organizations,
+ * update this script to match.
+ *
+ * Key difference from the backend sync: this script only fetches **public** data
+ * from the GitHub API (no auth token required, no private repos). It is used to
+ * populate realistic mock/test data for the Foundry frontend without needing
+ * GitHub OAuth credentials or a GitHub App installation.
+ *
+ * Usage:
+ *   bun foundry/scripts/pull-org-data.ts <org-login> [--out <path>]
+ *
+ * Examples:
+ *   bun foundry/scripts/pull-org-data.ts rivet-gg
+ *   bun foundry/scripts/pull-org-data.ts rivet-gg --out foundry/scripts/data/rivet-gg.json
+ */
+
+import { parseArgs } from "node:util";
+import { writeFileSync, mkdirSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+
+// ── Types matching the backend sync output ──
+// See: packages/shared/src/app-shell.ts
+
+interface OrgFixtureRepo {
+  fullName: string;
+  cloneUrl: string;
+  description: string | null;
+  language: string | null;
+  stars: number;
+  updatedAt: string;
+}
+
+interface OrgFixtureMember {
+  id: string;
+  login: string;
+  avatarUrl: string;
+  role: "admin" | "member";
+}
+
+interface OrgFixturePullRequest {
+  number: number;
+  title: string;
+  state: "open";
+  draft: boolean;
+  headRefName: string;
+  author: string;
+  repoFullName: string;
+  updatedAt: string;
+}
+
+interface OrgFixture {
+  /** ISO timestamp of when this data was pulled */
+  pulledAt: string;
+  /** GitHub organization login (e.g. "rivet-gg") */
+  login: string;
+  /** GitHub numeric ID */
+  id: number;
+  /** Display name */
+  name: string | null;
+  /** Organization description */
+  description: string | null;
+  /** Public email */
+  email: string | null;
+  /** Blog/website URL */
+  blog: string | null;
+  /** Avatar URL */
+  avatarUrl: string;
+  /** Public repositories (excludes forks by default) */
+  repos: OrgFixtureRepo[];
+  /** Public members (only those with public membership) */
+  members: OrgFixtureMember[];
+  /** Open pull requests across all public repos */
+  openPullRequests: OrgFixturePullRequest[];
+}
+
+// ── GitHub API helpers ──
+// Mirrors the pagination approach in packages/backend/src/services/app-github.ts
+
+const API_BASE = "https://api.github.com";
+const GITHUB_TOKEN = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN ?? null;
+
+function authHeaders(): Record<string, string> {
+  const headers: Record<string, string> = {
+    Accept: "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28",
+    "User-Agent": "foundry-pull-org-data/1.0",
+  };
+  if (GITHUB_TOKEN) {
+    headers["Authorization"] = `Bearer ${GITHUB_TOKEN}`;
+  }
+  return headers;
+}
+
+async function githubGet<T>(url: string): Promise<T> {
+  const response = await fetch(url, { headers: authHeaders() });
+  if (!response.ok) {
+    const body = await response.text().catch(() => "");
+    throw new Error(`GitHub API ${response.status}: ${url}\n${body.slice(0, 500)}`);
+  }
+  return (await response.json()) as T;
+}
+
+function parseNextLink(linkHeader: string | null): string | null {
+  if (!linkHeader) return null;
+  for (const part of linkHeader.split(",")) {
+    const [urlPart, relPart] = part.split(";").map((v) => v.trim());
+    if (urlPart && relPart?.includes('rel="next"')) {
+      return urlPart.replace(/^<|>$/g, "");
+    }
+  }
+  return null;
+}
+
+async function githubPaginate<T>(path: string): Promise<T[]> {
+  let url: string | null = `${API_BASE}${path.startsWith("/") ? path : `/${path}`}`;
+  const items: T[] = [];
+
+  while (url) {
+    const response = await fetch(url, { headers: authHeaders() });
+    if (!response.ok) {
+      const body = await response.text().catch(() => "");
+      throw new Error(`GitHub API ${response.status}: ${url}\n${body.slice(0, 500)}`);
+    }
+    const page = (await response.json()) as T[];
+    items.push(...page);
+    url = parseNextLink(response.headers.get("link"));
+  }
+
+  return items;
+}
+
+// ── Main ──
+
+async function pullOrgData(orgLogin: string): Promise<OrgFixture> {
+  console.log(`Fetching organization: ${orgLogin}`);
+
+  // 1. Fetch org profile
+  // Backend equivalent: getViewer() + listOrganizations() derive org identity
+  const org = await githubGet<{
+    id: number;
+    login: string;
+    name: string | null;
+    description: string | null;
+    email: string | null;
+    blog: string | null;
+    avatar_url: string;
+    public_repos: number;
+    public_members_url: string;
+  }>(`${API_BASE}/orgs/${orgLogin}`);
+
+  console.log(`  ${org.name ?? org.login} — ${org.public_repos} public repos`);
+
+  // 2. Fetch public repos (non-fork, non-archived)
+  // Backend equivalent: listInstallationRepositories() or listUserRepositories()
+  // Key difference: we only fetch public repos here (type=public)
+  const rawRepos = await githubPaginate<{
+    full_name: string;
+    clone_url: string;
+    description: string | null;
+    language: string | null;
+    stargazers_count: number;
+    updated_at: string;
+    fork: boolean;
+    archived: boolean;
+    private: boolean;
+  }>(`/orgs/${orgLogin}/repos?per_page=100&type=public&sort=updated`);
+
+  const repos: OrgFixtureRepo[] = rawRepos
+    .filter((r) => !r.fork && !r.archived && !r.private)
+    .map((r) => ({
+      fullName: r.full_name,
+      cloneUrl: r.clone_url,
+      description: r.description,
+      language: r.language,
+      stars: r.stargazers_count,
+      updatedAt: r.updated_at,
+    }))
+    .sort((a, b) => b.stars - a.stars);
+
+  console.log(`  ${repos.length} public repos (excluding forks/archived)`);
+
+  // 3. Fetch public members
+  // Backend equivalent: members are derived from the OAuth user + org membership
+  // Here we can only see members with public membership visibility
+  const rawMembers = await githubPaginate<{
+    id: number;
+    login: string;
+    avatar_url: string;
+  }>(`/orgs/${orgLogin}/members?per_page=100`);
+
+  const members: OrgFixtureMember[] = rawMembers.map((m) => ({
+    id: String(m.id),
+    login: m.login,
+    avatarUrl: m.avatar_url,
+    role: "member" as const,
+  }));
+
+  console.log(`  ${members.length} public members`);
+
+  // 4. Fetch open PRs across all public repos
+  // Backend equivalent: open PR metadata is pulled from GitHub and merged into
+  // the organization/repository projections used by the UI.
+  const openPullRequests: OrgFixturePullRequest[] = [];
+  for (const repo of repos) {
+    const rawPrs = await githubPaginate<{
+      number: number;
+      title: string;
+      state: string;
+      draft: boolean;
+      head: { ref: string };
+      user: { login: string } | null;
+      updated_at: string;
+    }>(`/repos/${repo.fullName}/pulls?state=open&per_page=100`);
+
+    for (const pr of rawPrs) {
+      openPullRequests.push({
+        number: pr.number,
+        title: pr.title,
+        state: "open",
+        draft: pr.draft,
+        headRefName: pr.head.ref,
+        author: pr.user?.login ?? "unknown",
+        repoFullName: repo.fullName,
+        updatedAt: pr.updated_at,
+      });
+    }
+
+    if (rawPrs.length > 0) {
+      console.log(`  ${repo.fullName}: ${rawPrs.length} open PRs`);
+    }
+  }
+
+  console.log(`  ${openPullRequests.length} total open PRs`);
+
+  return {
+    pulledAt: new Date().toISOString(),
+    login: org.login,
+    id: org.id,
+    name: org.name,
+    description: org.description,
+    email: org.email,
+    blog: org.blog,
+    avatarUrl: org.avatar_url,
+    repos,
+    members,
+    openPullRequests,
+  };
+}
+
+// ── CLI ──
+
+const { values, positionals } = parseArgs({
+  args: process.argv.slice(2),
+  options: {
+    out: { type: "string", short: "o" },
+    help: { type: "boolean", short: "h" },
+  },
+  allowPositionals: true,
+});
+
+if (values.help || positionals.length === 0) {
+  console.log("Usage: bun foundry/scripts/pull-org-data.ts <org-login> [--out <path>]");
+  console.log("");
+  console.log("Pulls public GitHub organization data into a JSON fixture file.");
+  console.log("Set GITHUB_TOKEN or GH_TOKEN to avoid rate limits.");
+  process.exit(positionals.length === 0 && !values.help ? 1 : 0);
+}
+
+const orgLogin = positionals[0]!;
+const defaultOutDir = resolve(import.meta.dirname ?? ".", "data");
+const outPath = values.out ?? resolve(defaultOutDir, `${orgLogin}.json`);
+
+try {
+  const data = await pullOrgData(orgLogin);
+
+  mkdirSync(dirname(outPath), { recursive: true });
+  writeFileSync(outPath, JSON.stringify(data, null, 2) + "\n");
+
+  console.log(`\nWrote ${outPath}`);
+} catch (error) {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exit(1);
+}
diff --git a/foundry/tsconfig.base.json b/foundry/tsconfig.base.json
new file mode 100644
index 0000000..dbde20d
--- /dev/null
+++ b/foundry/tsconfig.base.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "target": "ES2023",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "lib": ["ES2023", "DOM"],
+    "strict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "declaration": true,
+    "sourceMap": true,
+    "paths": {
+      "@sandbox-agent/foundry-client": ["packages/client/src/index.ts"],
+      "@sandbox-agent/foundry-shared": ["packages/shared/src/index.ts"],
+      "@sandbox-agent/foundry-backend": ["packages/backend/src/index.ts"]
+    },
+    "noUncheckedIndexedAccess": true,
+    "noImplicitOverride": true
+  }
+}
diff --git a/frontend/CLAUDE.md b/frontend/CLAUDE.md
index 4ae817d..c4515dc 100644
--- a/frontend/CLAUDE.md
+++ b/frontend/CLAUDE.md
@@ -1,26 +1,4 @@
 # Frontend Instructions
 
-## Inspector Architecture
-
-- Inspector source is `frontend/packages/inspector/`.
-- `/ui/` must use ACP over HTTP (`/v2/rpc`) for session/prompt traffic.
-- Primary flow:
-  - `initialize`
-  - `session/new`
-  - `session/prompt`
-  - `session/update` over SSE
-- Keep backend/protocol changes in client bindings; avoid unnecessary full UI rewrites.
-
-## Testing
-
-Run inspector checks after transport or chat-flow changes:
-```bash
-pnpm --filter @sandbox-agent/inspector test
-pnpm --filter @sandbox-agent/inspector test:agent-browser
-```
-
-## Docs Sync
-
-- Update `docs/inspector.mdx` when `/ui/` behavior changes.
-- Update `docs/sdks/typescript.mdx` when inspector SDK bindings or ACP transport behavior changes.
-
+- When the user asks for UI changes, capture screenshots of the updated UI after implementation and verification.
+- At the end, offer to open those screenshots for the user and provide absolute filesystem paths to the screenshot files.
diff --git a/frontend/packages/inspector/Dockerfile b/frontend/packages/inspector/Dockerfile
index e57acf2..dff28db 100644
--- a/frontend/packages/inspector/Dockerfile
+++ b/frontend/packages/inspector/Dockerfile
@@ -9,6 +9,7 @@ COPY sdks/typescript/package.json ./sdks/typescript/
 COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 COPY sdks/acp-http-client/package.json ./sdks/acp-http-client/
 COPY sdks/persist-indexeddb/package.json ./sdks/persist-indexeddb/
+COPY sdks/react/package.json ./sdks/react/
 
 # Install dependencies
 RUN pnpm install --filter @sandbox-agent/inspector...
@@ -29,6 +30,10 @@ RUN cd sdks/typescript && pnpm exec tsup
 COPY sdks/persist-indexeddb ./sdks/persist-indexeddb
 RUN cd sdks/persist-indexeddb && pnpm exec tsup
 
+# Copy react and build (depends on SDK)
+COPY sdks/react ./sdks/react
+RUN cd sdks/react && pnpm exec tsup
+
 # Copy inspector source
 COPY frontend/packages/inspector ./frontend/packages/inspector
 
diff --git a/frontend/packages/inspector/index.html b/frontend/packages/inspector/index.html
index b7b284d..6a5d064 100644
--- a/frontend/packages/inspector/index.html
+++ b/frontend/packages/inspector/index.html
@@ -5,31 +5,37 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <title>Sandbox Agent</title>
+    <!-- Preconnect to font providers -->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700&display=swap" rel="stylesheet" />
     <style>
       :root {
         color-scheme: dark;
-        --bg: #0a0a0a;
-        --surface: #1c1c1e;
-        --surface-2: #0f0f0f;
-        --border: #1c1c1e;
-        --border-2: #2c2c2e;
-        --input-bg: #1c1c1e;
-        --input-border: #2c2c2e;
-        --text: #f5f5f7;
-        --text-secondary: #e5e5e7;
-        --muted: #6e6e73;
-        --muted-2: #4a4a4c;
+        /* Match landing page colors - high contrast */
+        --bg: #000000;
+        --bg-panel: #0a0a0b;
+        --surface: rgba(255, 255, 255, 0.06);
+        --surface-2: rgba(255, 255, 255, 0.03);
+        --border: rgba(255, 255, 255, 0.18);
+        --border-2: rgba(255, 255, 255, 0.14);
+        --input-bg: rgba(255, 255, 255, 0.07);
+        --input-border: rgba(255, 255, 255, 0.22);
+        --text: #ffffff;
+        --text-secondary: #e4e4e7; /* zinc-200 */
+        --muted: #a1a1aa; /* zinc-400 */
+        --muted-2: #8b8b93; /* between zinc-400 and zinc-500 */
         --accent: #ff4f00;
         --accent-hover: #ff6a00;
-        --success: #30d158;
-        --warning: #ff9f0a;
-        --danger: #ff3b30;
-        --purple: #bf5af2;
-        --cyan: #64d2ff;
+        --success: #4ade80; /* green-400 */
+        --warning: #fbbf24; /* amber-400 */
+        --danger: #dc2626; /* red-600 */
+        --purple: #a78bfa; /* violet-400 */
+        --cyan: #22d3ee; /* cyan-400 */
         --radius: 8px;
         --radius-sm: 6px;
-        --radius-lg: 12px;
-        --transition: 150ms ease;
+        --radius-lg: 16px;
+        --transition: 200ms ease;
       }
 
       * {
@@ -45,9 +51,23 @@
 
       body {
         color: var(--text);
-        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Inter", Roboto, sans-serif;
+        font-family: 'Manrope', system-ui, sans-serif;
+        font-weight: 500;
         font-size: 13px;
-        line-height: 1.4;
+        line-height: 1.5;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+      }
+
+      /* Text selection - match landing page */
+      ::selection {
+        background-color: rgba(255, 79, 0, 0.3);
+        color: #fed7aa;
+      }
+
+      ::-moz-selection {
+        background-color: rgba(255, 79, 0, 0.3);
+        color: #fed7aa;
       }
 
       a {
@@ -69,7 +89,7 @@
         justify-content: space-between;
         padding: 12px 20px;
         border-bottom: 1px solid var(--border);
-        background: var(--bg);
+        background: var(--bg-panel);
         flex-shrink: 0;
       }
 
@@ -111,22 +131,31 @@
       }
 
       .header-link {
-        display: inline-flex;
+        display: flex;
         align-items: center;
-        gap: 5px;
-        padding: 5px 10px;
-        border: 1px solid var(--border-2);
+        gap: 6px;
+        padding: 6px 10px;
         border-radius: var(--radius-sm);
-        font-size: 11px;
-        font-weight: 600;
-        color: var(--muted);
-        text-decoration: none;
-        transition: color var(--transition), border-color var(--transition);
+        font-size: 12px;
+        font-weight: 500;
+        color: var(--text-secondary);
+        background: transparent;
+        border: 1px solid transparent;
+        transition: all var(--transition);
       }
 
       .header-link:hover {
-        color: var(--accent);
-        border-color: var(--accent);
+        color: var(--text);
+        background: var(--surface);
+        border-color: var(--border);
+      }
+
+      .header-link svg {
+        opacity: 0.7;
+      }
+
+      .header-link:hover svg {
+        opacity: 1;
       }
 
       .status-indicator.disconnected {
@@ -198,9 +227,14 @@
 
       .connect-card {
         background: var(--surface);
-        border: 1px solid var(--border-2);
+        border: 1px solid var(--border);
         border-radius: var(--radius-lg);
         padding: 24px;
+        transition: border-color var(--transition);
+      }
+
+      .connect-card:hover {
+        border-color: rgba(255, 255, 255, 0.2);
       }
 
       .connect-card-title {
@@ -287,36 +321,46 @@
         align-items: center;
         justify-content: center;
         gap: 8px;
-        padding: 10px 16px;
-        border-radius: var(--radius-sm);
+        padding: 10px 20px;
+        border-radius: var(--radius);
         border: none;
-        font-size: 13px;
-        font-weight: 600;
+        font-size: 14px;
+        font-weight: 500;
         cursor: pointer;
-        transition: background var(--transition), opacity var(--transition);
+        transition: all var(--transition);
       }
 
       .button.primary {
-        background: var(--accent);
-        color: #fff;
+        background: #ffffff;
+        color: #000000;
         width: 100%;
       }
 
       .button.primary:hover:not(:disabled) {
-        background: var(--accent-hover);
+        background: #e4e4e7;
       }
 
       .button.secondary {
-        background: var(--border-2);
+        background: transparent;
+        border: 1px solid var(--border);
         color: var(--text);
       }
 
+      .button.secondary:hover:not(:disabled) {
+        border-color: rgba(255, 255, 255, 0.2);
+      }
+
       .button.ghost {
         background: transparent;
-        color: var(--accent);
+        color: var(--text-secondary);
         padding: 6px 10px;
       }
 
+      .button.ghost:hover:not(:disabled) {
+        background: var(--surface);
+        color: var(--text);
+      }
+
       .button.danger {
         background: var(--danger);
         color: #fff;
@@ -324,12 +368,12 @@
 
       .button.success {
         background: var(--success);
-        color: #fff;
+        color: #000;
       }
 
       .button.small {
-        padding: 6px 10px;
-        font-size: 11px;
+        padding: 8px 14px;
+        font-size: 12px;
       }
 
       .button:disabled {
@@ -409,12 +453,36 @@
         font-size: 10px;
       }
 
+      .persist-callout {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 8px;
+        margin-top: 24px;
+        padding: 12px 16px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+        font-size: 12px;
+        color: var(--muted);
+      }
+
+      .persist-callout svg {
+        flex-shrink: 0;
+        color: var(--muted);
+      }
+
       /* Main Layout (Connected) */
       .main-layout {
         display: grid;
         grid-template-columns: 200px 1fr 1fr;
         flex: 1;
         overflow: hidden;
+        transition: grid-template-columns 0.2s ease;
+      }
+
+      .main-layout.debug-collapsed {
+        grid-template-columns: 200px 1fr 42px;
       }
 
       /* Session Sidebar */
@@ -422,8 +490,8 @@
         display: flex;
         flex-direction: column;
         border-right: 1px solid var(--border);
-        background: var(--surface-2);
-        min-height: 0;
+        background: var(--bg-panel);
+        overflow: visible;
       }
 
       .sidebar-header {
@@ -445,6 +513,23 @@
         overflow: visible;
       }
 
+      .sidebar-header-actions .button.secondary.small {
+        width: 24px;
+        height: 24px;
+        min-width: 24px;
+        padding: 0;
+        border-radius: 4px;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .sidebar-header-actions .button.secondary.small.active {
+        background: #fff;
+        color: #000;
+        border-color: #fff;
+      }
+
       .sidebar-icon-btn {
         width: 24px;
         height: 24px;
@@ -465,11 +550,9 @@
       }
 
       .sidebar-title {
-        font-size: 11px;
+        font-size: 13px;
         font-weight: 600;
-        text-transform: uppercase;
-        letter-spacing: 0.5px;
-        color: var(--muted);
+        color: var(--text);
       }
 
       .sidebar-add-btn {
@@ -502,10 +585,10 @@
         top: 36px;
         left: 0;
         min-width: 220px;
-        background: var(--surface);
-        border: 1px solid var(--border-2);
+        background: #000000;
+        border: 1px solid var(--border);
         border-radius: 8px;
-        box-shadow: 0 8px 24px rgba(0, 0, 0, 0.35);
+        box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5);
         padding: 6px;
         display: flex;
         flex-direction: column;
@@ -574,20 +657,6 @@
         min-width: 0;
       }
 
-      .setup-custom-back {
-        flex-shrink: 0;
-        background: none;
-        border: none;
-        color: var(--accent);
-        font-size: 10px;
-        cursor: pointer;
-        padding: 2px 4px;
-      }
-
-      .setup-custom-back:hover {
-        text-decoration: underline;
-      }
-
       .session-create-section {
         overflow: hidden;
       }
@@ -943,22 +1012,39 @@
       }
 
       .sidebar-add-option:hover {
-        background: var(--accent);
-        color: #fff;
+        background: rgba(255, 255, 255, 0.08);
+        border-color: rgba(255, 255, 255, 0.22);
+        color: var(--text);
       }
 
-      .sidebar-add-option:hover .agent-badge {
-        color: rgba(255, 255, 255, 0.6);
+      .sidebar-add-option:active,
+      .sidebar-add-option:focus-visible {
+        background: rgba(255, 255, 255, 0.08);
+        border-color: rgba(255, 255, 255, 0.22);
+        color: var(--text);
+        outline: none;
+      }
+
+      .sidebar-add-option:hover .agent-badge,
+      .sidebar-add-option:active .agent-badge,
+      .sidebar-add-option:focus-visible .agent-badge {
+        color: var(--muted);
       }
 
       .agent-option-left {
         display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        gap: 2px;
+        align-items: center;
+        gap: 10px;
         min-width: 0;
       }
 
+      .agent-option-logo {
+        width: 20px;
+        height: 20px;
+        object-fit: contain;
+        flex-shrink: 0;
+      }
+
       .agent-option-name {
         white-space: nowrap;
         min-width: 0;
@@ -970,8 +1056,10 @@
         white-space: nowrap;
       }
 
-      .sidebar-add-option:hover .agent-option-version {
-        color: rgba(255, 255, 255, 0.6);
+      .sidebar-add-option:hover .agent-option-version,
+      .sidebar-add-option:active .agent-option-version,
+      .sidebar-add-option:focus-visible .agent-option-version {
+        color: var(--muted);
       }
 
       .agent-option-badges {
@@ -986,8 +1074,16 @@
         transition: color var(--transition);
       }
 
-      .sidebar-add-option:hover .agent-option-arrow {
-        color: rgba(255, 255, 255, 0.6);
+      .sidebar-add-option:hover .agent-option-arrow,
+      .sidebar-add-option:active .agent-option-arrow,
+      .sidebar-add-option:focus-visible .agent-option-arrow {
+        color: var(--text-secondary);
+      }
+
+      .agent-divider {
+        height: 1px;
+        background: var(--border);
+        margin: 6px 0;
       }
 
       .agent-badge {
@@ -1020,15 +1116,13 @@
       }
 
       .session-item {
-        display: block;
+        display: flex;
+        align-items: stretch;
         width: 100%;
         background: transparent;
         border: 1px solid transparent;
-        border-radius: var(--radius-sm);
-        padding: 10px;
+        border-radius: var(--radius);
         margin-bottom: 4px;
-        cursor: pointer;
-        text-align: left;
         transition: all var(--transition);
       }
 
@@ -1038,12 +1132,21 @@
 
       .session-item:hover {
         background: var(--surface);
-        border-color: var(--border-2);
+        border-color: var(--border);
       }
 
       .session-item.active {
-        background: rgba(255, 79, 0, 0.1);
-        border-color: var(--accent);
+        background: rgba(255, 255, 255, 0.06);
+        border-color: rgba(255, 255, 255, 0.2);
+      }
+
+      .session-item-content {
+        flex: 1;
+        background: transparent;
+        border: none;
+        padding: 12px;
+        cursor: pointer;
+        text-align: left;
       }
 
       .session-item-id {
@@ -1069,12 +1172,30 @@
         color: var(--accent);
       }
 
-      .session-item-events {
+      .session-item.ended {
+        opacity: 0.5;
+      }
+
+      .session-item.ended .session-item-agent {
         color: var(--muted);
       }
 
+      .session-item-events {
+        color: #a1a1aa;
+        background: #3f3f46;
+        padding: 2px 6px;
+        border-radius: 8px;
+        font-size: 10px;
+      }
+
       .session-item-ended {
-        color: var(--danger);
+        color: #fecaca;
+        background: #3f1212;
+        padding: 2px 6px;
+        border-radius: 8px;
+        font-size: 9px;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
       }
 
       .sidebar-empty {
@@ -1089,20 +1210,23 @@
       }
 
       .session-persistence-note {
-        padding: 8px 10px 10px;
-        border-top: 1px solid var(--border);
-        font-size: 10px;
-        line-height: 1.45;
+        margin: 8px;
+        padding: 10px 12px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+        font-size: 11px;
         color: var(--muted);
+        line-height: 1.5;
+        flex-shrink: 0;
       }
 
       .session-persistence-note a {
-        color: var(--accent);
-        text-decoration: none;
+        color: var(--text-secondary);
       }
 
       .session-persistence-note a:hover {
-        text-decoration: underline;
+        color: var(--text);
       }
 
       /* Chat Panel */
@@ -1117,7 +1241,7 @@
         height: 41px;
         padding: 0 16px;
         border-bottom: 1px solid var(--border);
-        background: var(--surface-2);
+        background: var(--bg-panel);
         flex-shrink: 0;
         display: flex;
         align-items: center;
@@ -1125,6 +1249,23 @@
         gap: 8px;
       }
 
+      .error-banner {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 8px;
+        padding: 12px 16px;
+        background: var(--danger);
+        color: #fff;
+        font-size: 13px;
+        font-weight: 500;
+        flex-shrink: 0;
+        text-align: center;
+      }
+      .error-banner svg {
+        flex-shrink: 0;
+      }
+
       .panel-header-left {
         display: flex;
         align-items: center;
@@ -1132,17 +1273,44 @@
       }
 
       .panel-title {
-        font-size: 11px;
+        font-size: 13px;
         font-weight: 600;
-        text-transform: uppercase;
-        letter-spacing: 0.5px;
-        color: var(--muted);
+        color: var(--text);
+      }
+
+      .header-meta-pill {
+        max-width: 320px;
+        padding: 2px 8px;
+        border-radius: 999px;
+        border: 1px solid var(--border-2);
+        background: var(--surface-2);
+        color: var(--text-secondary);
+        font-size: 11px;
+        line-height: 1.4;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       .session-id-display {
         font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, monospace;
         font-size: 12px;
         color: var(--text-secondary);
+        background: none;
+        border: 0;
+        padding: 0;
+        cursor: pointer;
+      }
+
+      .session-id-display:hover {
+        color: var(--text);
+      }
+
+      .no-session-subtext {
+        white-space: normal;
+        text-align: center;
+        margin-left: auto;
+        margin-right: auto;
       }
 
       .session-agent-display {
@@ -1166,13 +1334,31 @@
         gap: 8px;
       }
 
+      .button.ghost.session-ended-status {
+        background: transparent;
+        border: 1px solid transparent;
+        color: #dc2626 !important;
+        opacity: 1 !important;
+        cursor: default;
+      }
+
       .messages-container {
         flex: 1;
         overflow-y: auto;
         padding: 16px;
       }
 
+      .chat-conversation {
+        display: flex;
+        flex: 1;
+        min-height: 0;
+        flex-direction: column;
+      }
+
       .messages-container:has(.empty-state) {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         overflow: visible;
       }
 
@@ -1187,37 +1373,67 @@
         flex-direction: column;
         align-items: center;
         justify-content: center;
+        width: 100%;
         height: 100%;
         color: var(--muted);
         text-align: center;
-        padding: 32px;
+        padding: 48px 24px;
+        gap: 0;
       }
 
       .empty-state-icon {
-        width: 48px;
-        height: 48px;
+        width: 40px;
+        height: 40px;
         color: var(--muted-2);
-        margin-bottom: 16px;
+        margin-bottom: 20px;
+        stroke-width: 1.5;
+      }
+
+      .empty-state-icon.accent {
+        color: var(--accent);
+        opacity: 0.7;
       }
 
       .empty-state-title {
-        font-size: 14px;
-        font-weight: 600;
+        font-size: 16px;
+        font-weight: 500;
         color: var(--text);
-        margin-bottom: 8px;
+        margin-bottom: 6px;
+        letter-spacing: -0.01em;
       }
 
       .empty-state-text {
         font-size: 13px;
-        max-width: 280px;
-        line-height: 1.5;
+        max-width: 260px;
+        line-height: 1.6;
+        color: var(--text-secondary);
       }
 
       .empty-state .button {
-        margin-top: 16px;
+        margin-top: 24px;
         width: auto;
       }
 
+      .mock-agent-hint {
+        margin-top: 16px;
+        padding: 12px 16px;
+        background: var(--surface);
+        border: 1px solid var(--border-2);
+        border-radius: var(--radius);
+        font-size: 12px;
+        color: var(--text-secondary);
+        max-width: 320px;
+        line-height: 1.5;
+      }
+
+      .mock-agent-hint code {
+        background: var(--border-2);
+        padding: 2px 6px;
+        border-radius: 4px;
+        font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, monospace;
+        font-size: 11px;
+      }
+
       .empty-state-menu-wrapper {
         position: relative;
       }
@@ -1271,26 +1487,34 @@
         color: var(--text);
       }
 
+      .ai-label {
+        font-size: 10px;
+        font-weight: 700;
+        letter-spacing: 0.5px;
+      }
+
       .message-content {
-        padding: 10px 14px;
+        padding: 12px 16px;
         border-radius: var(--radius-lg);
         max-width: 80%;
-        line-height: 1.5;
-        font-size: 13px;
+        line-height: 1.6;
+        font-size: 14px;
         white-space: pre-wrap;
         word-wrap: break-word;
       }
 
       .message.user .message-content {
-        background: var(--accent);
-        color: #fff;
+        background: #ffffff;
+        color: #000000;
         border-bottom-right-radius: 4px;
       }
 
       .message.assistant .message-content {
-        background: var(--surface);
+        background: none;
+        border: none;
         color: var(--text-secondary);
-        border-bottom-left-radius: 4px;
+        border-radius: 0;
+        padding: 0 16px;
       }
 
       .message.system .avatar {
@@ -1326,6 +1550,517 @@
         color: var(--danger);
       }
 
+      .message.no-avatar {
+        padding-left: 12px;
+      }
+
+      .chat-loading-skeleton {
+        display: flex;
+        flex-direction: column;
+        gap: 12px;
+        padding: 14px 16px;
+      }
+
+      .chat-skeleton-row {
+        display: flex;
+      }
+
+      .chat-skeleton-row.user {
+        justify-content: flex-end;
+      }
+
+      .chat-skeleton-bubble {
+        height: 42px;
+        border-radius: var(--radius-lg);
+        border: 1px solid var(--border);
+        background: linear-gradient(
+          90deg,
+          rgba(255, 255, 255, 0.04) 25%,
+          rgba(255, 255, 255, 0.12) 50%,
+          rgba(255, 255, 255, 0.04) 75%
+        );
+        background-size: 220% 100%;
+        animation: chat-skeleton-shimmer 1.35s ease-in-out infinite;
+      }
+
+      .chat-skeleton-bubble.w-sm { width: 32%; }
+      .chat-skeleton-bubble.w-md { width: 46%; }
+      .chat-skeleton-bubble.w-lg { width: 58%; }
+      .chat-skeleton-bubble.w-xl { width: 72%; }
+
+      @keyframes chat-skeleton-shimmer {
+        0% { background-position: 200% 0; }
+        100% { background-position: -200% 0; }
+      }
+
+      .error-icon {
+        color: var(--danger);
+        flex-shrink: 0;
+      }
+
+      .system-icon {
+        color: var(--muted);
+        flex-shrink: 0;
+      }
+
+      /* Permission prompt */
+      .permission-prompt {
+        margin: 8px 0;
+        padding: 12px 14px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: var(--radius-sm);
+      }
+
+      .permission-prompt.resolved {
+        opacity: 0.7;
+      }
+
+      .permission-header {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-bottom: 6px;
+      }
+
+      .permission-icon {
+        color: var(--warning, #f59e0b);
+        flex-shrink: 0;
+      }
+
+      .permission-prompt.resolved .permission-icon {
+        color: var(--muted);
+      }
+
+      .permission-title {
+        font-size: 13px;
+        font-weight: 500;
+        color: var(--text);
+      }
+
+      .permission-description {
+        font-size: 12px;
+        color: var(--text-secondary);
+        margin-bottom: 8px;
+        padding-left: 22px;
+      }
+
+      .permission-actions {
+        display: flex;
+        gap: 6px;
+        padding-left: 22px;
+      }
+
+      .permission-btn {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        padding: 4px 10px;
+        font-size: 12px;
+        font-weight: 500;
+        border-radius: var(--radius-sm);
+        border: 1px solid var(--border);
+        background: transparent;
+        color: var(--text-secondary);
+        cursor: pointer;
+        transition: background var(--transition), color var(--transition), border-color var(--transition);
+      }
+
+      .permission-btn:hover:not(:disabled) {
+        background: var(--surface);
+        color: var(--text);
+        border-color: rgba(255, 255, 255, 0.2);
+      }
+
+      .permission-btn.allow:hover:not(:disabled) {
+        background: rgba(34, 197, 94, 0.1);
+        border-color: rgba(34, 197, 94, 0.3);
+        color: #22c55e;
+      }
+
+      .permission-btn.reject:hover:not(:disabled) {
+        background: rgba(239, 68, 68, 0.1);
+        border-color: rgba(239, 68, 68, 0.3);
+        color: #ef4444;
+      }
+
+      .permission-btn:disabled {
+        cursor: default;
+        opacity: 0.6;
+      }
+
+      .permission-btn.selected {
+        opacity: 1;
+      }
+
+      .permission-btn.selected.allow {
+        background: rgba(34, 197, 94, 0.15);
+        border-color: rgba(34, 197, 94, 0.4);
+        color: #22c55e;
+      }
+
+      .permission-btn.selected.reject {
+        background: rgba(239, 68, 68, 0.15);
+        border-color: rgba(239, 68, 68, 0.4);
+        color: #ef4444;
+      }
+
+      .permission-btn.dimmed {
+        opacity: 0.35;
+      }
+
+      .permission-auto-resolved {
+        font-size: 11px;
+        color: var(--muted);
+        font-style: italic;
+      }
+
+      .status-divider {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        padding: 8px 0;
+      }
+
+      .status-divider-line {
+        flex: 1;
+        height: 1px;
+        background: var(--border);
+      }
+
+      .status-divider-text {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        font-size: 11px;
+        color: var(--muted);
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+        white-space: nowrap;
+      }
+
+      /* Collapsible Messages */
+      .collapsible-message {
+        border-radius: var(--radius);
+        overflow: hidden;
+      }
+
+      .collapsible-header {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        width: 100%;
+        padding: 8px 12px;
+        background: transparent;
+        border: none;
+        color: var(--muted);
+        font-size: 12px;
+        cursor: pointer;
+        transition: color var(--transition);
+        text-align: left;
+      }
+
+      .collapsible-header:hover {
+        color: var(--text-secondary);
+      }
+
+      .collapsible-message.tool .collapsible-header {
+        color: var(--cyan);
+      }
+
+      .collapsible-message.tool .collapsible-header:hover {
+        color: var(--cyan);
+      }
+
+      .collapsible-message.error .collapsible-header {
+        color: var(--danger);
+      }
+
+      .collapsible-message.system .collapsible-header {
+        color: var(--muted);
+      }
+
+      .simple-status-message {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        padding: 8px 12px;
+        font-size: 12px;
+        color: var(--muted);
+      }
+
+      .simple-status-message.error {
+        color: var(--danger);
+      }
+
+      .tool-icon {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        width: 18px;
+        height: 18px;
+        border-radius: 4px;
+        background: rgba(100, 210, 255, 0.15);
+        color: var(--cyan);
+        font-size: 10px;
+        font-weight: 600;
+      }
+
+      .collapsible-content {
+        padding: 0 12px 12px 38px;
+        font-size: 13px;
+        color: var(--text-secondary);
+        white-space: pre-wrap;
+        word-wrap: break-word;
+      }
+
+      /* Tool Group - Connected Chain */
+      .tool-group-single {
+        margin: 8px 0;
+        padding-left: 12px;
+      }
+
+      .tool-group-container {
+        margin: 8px 0;
+      }
+
+      .tool-group-header {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        width: 100%;
+        padding: 8px 12px;
+        background: transparent;
+        border: none;
+        color: var(--muted);
+        font-size: 12px;
+        cursor: pointer;
+        text-align: left;
+        border-radius: var(--radius-sm);
+        transition: background var(--transition), color var(--transition);
+      }
+
+      .tool-group-header:hover {
+        background: var(--surface);
+        color: var(--text-secondary);
+      }
+
+      .tool-group-icon {
+        display: flex;
+        align-items: center;
+        color: var(--muted);
+      }
+
+      .tool-group-avatar {
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        background: var(--accent);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-shrink: 0;
+      }
+
+      .tool-group-avatar .ai-label {
+        font-size: 9px;
+        font-weight: 700;
+        color: #fff;
+      }
+
+      .tool-group-label {
+        flex: 1;
+      }
+
+      .tool-group-spinner {
+        display: flex;
+        align-items: center;
+        gap: 3px;
+      }
+
+      .tool-group-chevron {
+        display: flex;
+        align-items: center;
+        color: var(--muted);
+      }
+
+      .tool-group-container.failed .tool-group-header {
+        color: var(--danger);
+      }
+
+      .tool-group-container.failed .tool-group-icon {
+        color: var(--danger);
+      }
+
+      .tool-group {
+        display: flex;
+        flex-direction: column;
+        margin-top: 8px;
+        padding: 10px 12px;
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+        background: var(--surface);
+      }
+
+      .tool-item {
+        display: flex;
+        gap: 0;
+        position: relative;
+      }
+
+      .tool-item-connector {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        width: 20px;
+        flex-shrink: 0;
+      }
+
+      .tool-item-dot {
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+        background: var(--border);
+        border: 2px solid var(--bg);
+        margin-top: 10px;
+        z-index: 1;
+      }
+
+      .tool-item.failed .tool-item-dot {
+        background: var(--danger);
+      }
+
+      .tool-item-line {
+        width: 2px;
+        flex: 1;
+        background: var(--border);
+        margin-top: -2px;
+      }
+
+      .tool-item-content {
+        flex: 1;
+        min-width: 0;
+      }
+
+      .tool-item-header {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        width: 100%;
+        padding: 6px 10px;
+        background: transparent;
+        border: none;
+        color: var(--muted);
+        font-size: 12px;
+        cursor: pointer;
+        text-align: left;
+        border-radius: var(--radius-sm);
+        transition: background var(--transition), color var(--transition);
+      }
+
+      .tool-item-header:hover:not(:disabled) {
+        background: var(--surface);
+        color: var(--text-secondary);
+      }
+
+      .tool-item-header:disabled {
+        cursor: default;
+      }
+
+      .tool-item-icon {
+        display: flex;
+        align-items: center;
+        color: var(--muted);
+      }
+
+      .tool-item-label {
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .tool-item-chevron {
+        display: flex;
+        align-items: center;
+        color: var(--muted);
+        opacity: 0.6;
+      }
+
+      .tool-item-link {
+        display: flex;
+        align-items: center;
+        padding: 2px 4px;
+        color: var(--muted);
+        opacity: 0;
+        transition: opacity var(--transition), color var(--transition);
+        cursor: pointer;
+      }
+
+      .tool-item-header:hover .tool-item-link {
+        opacity: 1;
+      }
+
+      .tool-item-link:hover {
+        color: var(--accent);
+      }
+
+      .tool-item-spinner {
+        display: flex;
+        align-items: center;
+        gap: 3px;
+      }
+
+      .tool-item.failed .tool-item-header {
+        color: var(--danger);
+      }
+
+      .tool-item.failed .tool-item-icon {
+        color: var(--danger);
+      }
+
+      .tool-item-body {
+        padding: 0 10px 10px 10px;
+      }
+
+      .tool-section {
+        margin-bottom: 8px;
+      }
+
+      .tool-section:last-child {
+        margin-bottom: 0;
+      }
+
+      .tool-section-title {
+        font-size: 10px;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+        color: var(--muted);
+        margin-bottom: 4px;
+      }
+
+      .tool-code {
+        font-family: 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', monospace;
+        font-size: 11px;
+        line-height: 1.5;
+        color: var(--text-secondary);
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: var(--radius-sm);
+        padding: 8px 10px;
+        margin: 0;
+        overflow-x: auto;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+        max-height: 200px;
+        overflow-y: auto;
+      }
+
+      .tool-code.muted {
+        color: var(--muted);
+      }
+
       .message-meta {
         display: flex;
         align-items: center;
@@ -1362,6 +2097,84 @@
         white-space: pre-wrap;
       }
 
+      .markdown-body p {
+        margin: 0;
+      }
+
+      .markdown-body p + p {
+        margin-top: 8px;
+      }
+
+      .markdown-body h1,
+      .markdown-body h2,
+      .markdown-body h3,
+      .markdown-body h4,
+      .markdown-body h5,
+      .markdown-body h6 {
+        margin: 0 0 8px;
+        line-height: 1.35;
+        font-weight: 700;
+      }
+
+      .markdown-body h1 { font-size: 1.35em; }
+      .markdown-body h2 { font-size: 1.22em; }
+      .markdown-body h3 { font-size: 1.12em; }
+      .markdown-body h4,
+      .markdown-body h5,
+      .markdown-body h6 { font-size: 1em; }
+
+      .markdown-body ul,
+      .markdown-body ol {
+        margin: 8px 0 0 18px;
+        padding: 0;
+      }
+
+      .markdown-body li + li {
+        margin-top: 4px;
+      }
+
+      .markdown-body blockquote {
+        margin: 8px 0 0;
+        padding: 6px 10px;
+        border-left: 3px solid var(--border-2);
+        background: var(--surface-2);
+        color: var(--muted);
+        border-radius: 4px;
+      }
+
+      .markdown-body code {
+        font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, monospace;
+        font-size: 0.9em;
+        background: rgba(255, 255, 255, 0.08);
+        border: 1px solid var(--border-2);
+        border-radius: 4px;
+        padding: 1px 5px;
+      }
+
+      .message.user .markdown-body code {
+        background: rgba(0, 0, 0, 0.08);
+        border-color: rgba(0, 0, 0, 0.12);
+      }
+
+      .markdown-body .md-pre {
+        margin: 8px 0 0;
+        padding: 8px 10px;
+        border-radius: 6px;
+        border: 1px solid var(--border);
+        background: var(--surface-2);
+        overflow-x: auto;
+      }
+
+      .markdown-body .md-pre code {
+        background: transparent;
+        border: none;
+        border-radius: 0;
+        padding: 0;
+        font-size: 11px;
+        line-height: 1.5;
+        display: block;
+      }
+
       .message-error {
         background: rgba(255, 59, 48, 0.1);
         border: 1px solid rgba(255, 59, 48, 0.3);
@@ -1372,64 +2185,6 @@
         margin-top: 8px;
       }
 
-      .toast-stack {
-        position: fixed;
-        right: 16px;
-        bottom: 16px;
-        z-index: 1000;
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-        width: min(420px, calc(100vw - 24px));
-        pointer-events: none;
-      }
-
-      .toast {
-        pointer-events: auto;
-        display: flex;
-        align-items: flex-start;
-        gap: 10px;
-        padding: 10px 12px;
-        border-radius: var(--radius-sm);
-        border: 1px solid rgba(255, 59, 48, 0.35);
-        background: rgba(28, 8, 8, 0.95);
-        box-shadow: 0 10px 25px rgba(0, 0, 0, 0.35);
-      }
-
-      .toast-content {
-        min-width: 0;
-      }
-
-      .toast-title {
-        font-size: 10px;
-        text-transform: uppercase;
-        letter-spacing: 0.4px;
-        color: var(--danger);
-        margin-bottom: 4px;
-      }
-
-      .toast-message {
-        color: var(--text-secondary);
-        font-size: 12px;
-        line-height: 1.4;
-        word-break: break-word;
-      }
-
-      .toast-close {
-        background: transparent;
-        border: none;
-        color: var(--muted);
-        font-size: 12px;
-        line-height: 1;
-        cursor: pointer;
-        padding: 2px;
-        margin-top: 1px;
-      }
-
-      .toast-close:hover {
-        color: var(--text);
-      }
-
       .cursor {
         display: inline-block;
         width: 2px;
@@ -1445,6 +2200,28 @@
         51%, 100% { opacity: 0; }
       }
 
+      .thinking-row {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        padding: 12px 12px;
+      }
+
+      .thinking-avatar {
+        width: 24px;
+        height: 24px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-shrink: 0;
+      }
+
+      .thinking-avatar-img {
+        width: 24px;
+        height: 24px;
+        object-fit: contain;
+      }
+
       .thinking-indicator {
         display: inline-flex;
         align-items: center;
@@ -1503,16 +2280,17 @@
 
       .input-wrapper {
         display: flex;
+        align-items: center;
         gap: 10px;
         background: var(--surface);
-        border: 1px solid var(--border-2);
+        border: 1px solid var(--border);
         border-radius: var(--radius-lg);
-        padding: 10px 12px;
+        padding: 12px 14px;
         transition: border-color var(--transition);
       }
 
       .input-wrapper:focus-within {
-        border-color: var(--accent);
+        border-color: rgba(255, 255, 255, 0.3);
       }
 
       .input-wrapper textarea {
@@ -1553,8 +2331,10 @@
       }
 
       .send-button:disabled {
-        background: var(--border-2);
+        background: rgba(255, 255, 255, 0.05);
+        color: var(--muted-2);
         cursor: not-allowed;
+        opacity: 0.5;
       }
 
       .send-button svg {
@@ -1589,7 +2369,15 @@
 
       .session-config-value {
         font-size: 12px;
-        color: #8e8e93;
+        color: var(--muted);
+      }
+
+      .token-pill {
+        font-size: 10px;
+        color: var(--muted);
+        background: rgba(255, 255, 255, 0.1);
+        padding: 4px 8px;
+        border-radius: 10px;
       }
 
       /* Setup Row */
@@ -1794,13 +2582,14 @@
         display: flex;
         flex-direction: column;
         overflow: hidden;
+        background: var(--bg-panel);
       }
 
       .debug-tabs {
         display: flex;
         height: 41px;
         border-bottom: 1px solid var(--border);
-        background: var(--surface-2);
+        background: var(--bg-panel);
         flex-shrink: 0;
         overflow-x: auto;
       }
@@ -1808,14 +2597,13 @@
       .debug-tab {
         height: 100%;
         padding: 0 16px;
-        font-size: 11px;
+        font-size: 12px;
         font-weight: 600;
-        text-transform: uppercase;
-        letter-spacing: 0.5px;
         color: var(--muted);
         background: transparent;
         border: none;
         border-bottom: 2px solid transparent;
+        margin-bottom: -1px;
         cursor: pointer;
         transition: color var(--transition), border-color var(--transition);
         white-space: nowrap;
@@ -1840,8 +2628,8 @@
         height: 16px;
         padding: 0 5px;
         margin-left: 6px;
-        background: var(--accent);
-        color: #fff;
+        background: #3f3f46;
+        color: #a1a1aa;
         font-size: 9px;
         font-weight: 700;
         border-radius: 8px;
@@ -1853,6 +2641,49 @@
         padding: 16px;
       }
 
+      .debug-panel.collapsed .debug-content {
+        display: none;
+      }
+
+      .debug-panel.collapsed .debug-tabs {
+        flex-direction: column;
+        height: auto;
+        border-bottom: none;
+        overflow: visible;
+      }
+
+      .debug-panel.collapsed .debug-tab {
+        display: none;
+      }
+
+      .debug-collapse-btn {
+        width: 28px;
+        height: 28px;
+        min-width: 28px;
+        margin: 6px;
+        padding: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: transparent;
+        border: 1px solid var(--border);
+        border-radius: var(--radius-sm);
+        color: var(--muted);
+        cursor: pointer;
+        transition: color var(--transition), border-color var(--transition), background var(--transition);
+        flex-shrink: 0;
+      }
+
+      .debug-collapse-btn:hover {
+        color: var(--text);
+        border-color: var(--text-secondary);
+        background: var(--surface);
+      }
+
+      .debug-panel.collapsed .debug-collapse-btn {
+        margin: 6px auto;
+      }
+
       /* Session Setup */
       .setup-grid {
         display: grid;
@@ -1873,10 +2704,15 @@
       /* Cards */
       .card {
         background: var(--surface);
-        border: 1px solid var(--border-2);
-        border-radius: var(--radius-sm);
-        padding: 12px;
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+        padding: 16px;
         margin-bottom: 12px;
+        transition: border-color var(--transition);
+      }
+
+      .card:hover {
+        border-color: rgba(255, 255, 255, 0.2);
       }
 
       .card:last-child {
@@ -1923,10 +2759,535 @@
 
       .card-actions {
         display: flex;
+        justify-content: flex-end;
         gap: 6px;
         margin-top: 10px;
       }
 
+      .card-actions .button {
+        width: auto;
+        flex-shrink: 0;
+      }
+
+      /* ── Process form buttons ── */
+      .process-run-form .button.primary,
+      .process-create-form .button.primary {
+        width: auto;
+      }
+
+      .process-detail > .button {
+        align-self: flex-start;
+      }
+
+      /* ── Run Once tab ── */
+      .process-run-container {
+        display: flex;
+        flex-direction: column;
+        gap: 16px;
+      }
+
+      .process-run-form {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+      }
+
+      .process-run-row {
+        display: flex;
+        gap: 10px;
+      }
+
+      .process-run-field {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+      }
+
+      .process-run-field-grow {
+        flex: 1;
+        min-width: 0;
+      }
+
+      .process-run-field .setup-input {
+        width: 100%;
+      }
+
+      .process-run-field textarea.setup-input {
+        resize: vertical;
+        min-height: 42px;
+      }
+
+      .process-advanced-toggle {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        background: none;
+        border: none;
+        color: var(--muted);
+        font-size: 11px;
+        cursor: pointer;
+        padding: 2px 0;
+        align-self: flex-start;
+      }
+
+      .process-advanced-toggle:hover {
+        color: var(--text-secondary);
+      }
+
+      .process-run-result {
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+        overflow: hidden;
+      }
+
+      .process-run-result-header {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        padding: 10px 12px;
+        border-bottom: 1px solid var(--border);
+        background: var(--surface);
+      }
+
+      .process-run-output {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 0;
+      }
+
+      .process-run-output-section {
+        display: flex;
+        flex-direction: column;
+        min-width: 0;
+      }
+
+      .process-run-output-section + .process-run-output-section {
+        border-left: 1px solid var(--border);
+      }
+
+      .process-run-output-label {
+        padding: 6px 12px;
+        font-size: 10px;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.3px;
+        color: var(--muted);
+        border-bottom: 1px solid rgba(255, 255, 255, 0.06);
+        background: var(--surface-2);
+      }
+
+      .process-run-output-section .process-log-block {
+        border: none;
+        border-radius: 0;
+        min-height: 80px;
+      }
+
+      /* ── Processes tab ── */
+      .processes-container {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+      }
+
+      .desktop-panel {
+        display: flex;
+        flex-direction: column;
+        gap: 16px;
+      }
+
+      .desktop-state-grid {
+        display: grid;
+        grid-template-columns: repeat(3, minmax(0, 1fr));
+        gap: 12px;
+        margin-bottom: 12px;
+      }
+
+      .desktop-start-controls {
+        display: grid;
+        grid-template-columns: repeat(3, minmax(0, 1fr));
+        gap: 10px;
+      }
+
+      .desktop-screenshot-controls {
+        display: flex;
+        align-items: flex-end;
+        gap: 10px;
+        flex-wrap: wrap;
+        margin-bottom: 12px;
+      }
+
+      .desktop-checkbox-label {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        font-size: 12px;
+        cursor: pointer;
+        white-space: nowrap;
+        padding-bottom: 4px;
+      }
+
+      .desktop-advanced-grid {
+        display: grid;
+        grid-template-columns: repeat(3, minmax(0, 1fr));
+        gap: 10px;
+        margin-top: 8px;
+      }
+
+      .desktop-input-group {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+      }
+
+      .desktop-chip-list {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 8px;
+      }
+
+      .desktop-command {
+        margin-top: 6px;
+        padding: 8px 10px;
+        border-radius: var(--radius);
+        border: 1px solid var(--border);
+        background: var(--surface);
+        overflow-x: auto;
+      }
+
+      .desktop-diagnostic-block + .desktop-diagnostic-block {
+        margin-top: 14px;
+      }
+
+      .desktop-process-list {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        margin-top: 8px;
+      }
+
+      .desktop-process-item {
+        padding: 10px;
+        border-radius: var(--radius);
+        border: 1px solid var(--border);
+        background: var(--surface);
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+      }
+
+      .desktop-clipboard-text {
+        margin: 4px 0 0;
+        padding: 8px 10px;
+        border-radius: var(--radius);
+        border: 1px solid var(--border);
+        background: var(--surface);
+        font-size: 12px;
+        white-space: pre-wrap;
+        word-break: break-all;
+        max-height: 120px;
+        overflow-y: auto;
+      }
+
+      .desktop-window-item {
+        padding: 10px;
+        border-radius: var(--radius);
+        border: 1px solid var(--border);
+        background: var(--surface);
+        display: flex;
+        flex-direction: column;
+        gap: 6px;
+      }
+
+      .desktop-window-focused {
+        border-color: var(--success);
+        box-shadow: inset 0 0 0 1px var(--success);
+      }
+
+      .desktop-window-editor {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        margin-top: 6px;
+        padding-top: 6px;
+        border-top: 1px solid var(--border);
+      }
+
+      .desktop-launch-row {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-top: 6px;
+        flex-wrap: wrap;
+      }
+
+      .desktop-mouse-pos {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-top: 8px;
+      }
+
+      .desktop-stream-hint {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 12px;
+        margin-bottom: 8px;
+        font-size: 11px;
+        color: var(--muted);
+      }
+
+      .desktop-screenshot-empty {
+        padding: 18px;
+        border: 1px dashed var(--border);
+        border-radius: var(--radius);
+        color: var(--muted);
+        background: var(--surface);
+        text-align: center;
+      }
+
+      .desktop-screenshot-frame {
+        border-radius: calc(var(--radius) + 2px);
+        overflow: hidden;
+        border: 1px solid var(--border);
+        background:
+          linear-gradient(135deg, rgba(15, 23, 42, 0.9), rgba(30, 41, 59, 0.92)),
+          radial-gradient(circle at top right, rgba(56, 189, 248, 0.12), transparent 40%);
+        padding: 10px;
+      }
+
+      .desktop-screenshot-image {
+        display: block;
+        width: 100%;
+        height: auto;
+        border-radius: var(--radius);
+        background: rgba(0, 0, 0, 0.24);
+      }
+
+      .processes-section {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+      }
+
+      .processes-section-toggle {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        background: none;
+        border: none;
+        color: var(--text);
+        font-size: 12px;
+        font-weight: 600;
+        cursor: pointer;
+        padding: 2px 0;
+        align-self: flex-start;
+      }
+
+      .processes-section-toggle:hover {
+        color: var(--accent);
+      }
+
+      .processes-section-label {
+        font-size: 12px;
+        font-weight: 600;
+        color: var(--text);
+      }
+
+      .processes-list-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+
+      .process-create-form {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        padding: 12px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+      }
+
+      .process-checkbox-row {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 14px;
+      }
+
+      .process-checkbox {
+        display: inline-flex;
+        align-items: center;
+        gap: 6px;
+        font-size: 11px;
+        color: var(--text-secondary);
+        cursor: pointer;
+      }
+
+      .process-checkbox input {
+        margin: 0;
+      }
+
+      /* Process list items */
+      .process-list {
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
+      }
+
+      .process-list-item {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        padding: 8px 10px;
+        border-radius: var(--radius-sm);
+        cursor: pointer;
+        transition: background var(--transition);
+      }
+
+      .process-list-item:hover {
+        background: var(--surface);
+      }
+
+      .process-list-item.selected {
+        background: var(--surface);
+      }
+
+      .process-list-item-main {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        min-width: 0;
+      }
+
+      .process-status-dot {
+        width: 6px;
+        height: 6px;
+        border-radius: 50%;
+        flex-shrink: 0;
+        background: var(--muted);
+      }
+
+      .process-status-dot.running {
+        background: var(--success);
+      }
+
+      .process-status-dot.exited {
+        background: var(--muted);
+      }
+
+      .process-list-item-cmd {
+        font-size: 12px;
+        color: var(--text);
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        min-width: 0;
+      }
+
+      .process-list-item-meta {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        font-size: 10px;
+        color: var(--muted);
+        padding-left: 14px;
+      }
+
+      .process-list-item-id {
+        font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, monospace;
+        opacity: 0.7;
+      }
+
+      .process-list-item-actions {
+        display: flex;
+        gap: 4px;
+        padding-left: 14px;
+        margin-top: 2px;
+      }
+
+      .process-list-item-actions .button {
+        padding: 4px 8px;
+        font-size: 11px;
+      }
+
+      /* Process detail panel */
+      .process-detail {
+        padding: 12px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: var(--radius);
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+      }
+
+      .process-detail-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 8px;
+      }
+
+      .process-detail-cmd {
+        font-size: 12px;
+        color: var(--text);
+        word-break: break-word;
+      }
+
+      .process-detail-meta {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 6px 14px;
+        font-size: 11px;
+        color: var(--muted);
+      }
+
+      .process-detail-logs {
+        display: flex;
+        flex-direction: column;
+        gap: 6px;
+      }
+
+      .process-detail-logs-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+
+      .process-detail-logs-header .button {
+        padding: 4px 8px;
+        font-size: 11px;
+      }
+
+      .process-terminal-empty {
+        margin-top: 4px;
+        padding: 10px 12px;
+        border: 1px dashed rgba(255, 255, 255, 0.1);
+        border-radius: var(--radius-sm);
+        color: var(--muted);
+        font-size: 11px;
+      }
+
+      /* Log block (shared) */
+      .process-log-block {
+        margin: 0;
+        min-height: 80px;
+        max-height: 280px;
+        overflow: auto;
+        padding: 10px 12px;
+        border-radius: var(--radius);
+        border: 1px solid rgba(255, 255, 255, 0.08);
+        background: rgba(9, 9, 11, 0.95);
+        color: #e4e4e7;
+        font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, monospace;
+        font-size: 11px;
+        line-height: 1.55;
+        white-space: pre-wrap;
+        word-break: break-word;
+      }
+
       .pill {
         display: inline-flex;
         align-items: center;
@@ -1966,14 +3327,25 @@
       }
 
       .event-item {
-        background: var(--surface);
-        border: 1px solid var(--border-2);
-        border-radius: var(--radius-sm);
+        background: rgba(255, 255, 255, 0.02);
+        border: 1px solid rgba(255, 255, 255, 0.08);
+        border-radius: var(--radius);
         overflow: hidden;
+        transition: border-color var(--transition);
+      }
+
+      .event-item:hover {
+        border-color: rgba(255, 255, 255, 0.12);
       }
 
       .event-item.expanded {
-        box-shadow: 0 0 0 1px rgba(255, 79, 0, 0.12);
+        border-color: rgba(255, 255, 255, 0.12);
+      }
+
+      .event-item.highlighted {
+        outline: 2px solid var(--accent);
+        outline-offset: 0;
+        border-color: var(--accent);
       }
 
       .event-summary {
@@ -2002,9 +3374,9 @@
         width: 28px;
         height: 28px;
         border-radius: 8px;
-        border: 1px solid var(--border-2);
-        background: rgba(255, 255, 255, 0.04);
-        color: var(--text-secondary);
+        border: 1px solid rgba(255, 255, 255, 0.06);
+        background: rgba(255, 255, 255, 0.02);
+        color: var(--muted);
         flex-shrink: 0;
       }
 
@@ -2040,89 +3412,87 @@
         letter-spacing: 0.3px;
       }
 
-      /* ACP event categories: connection */
-      .event-type.connection,
-      .event-type.session {
+      .event-type.session,
+      .event-type.session-started,
+      .event-type.session-ended {
         color: var(--success);
       }
-      .event-icon.connection,
-      .event-icon.session {
+
+      .event-type.item,
+      .event-type.item-started,
+      .event-type.item-completed {
+        color: var(--accent);
+      }
+
+      .event-type.item-delta {
+        color: var(--cyan);
+      }
+
+      .event-type.error,
+      .event-type.agent-unparsed {
+        color: var(--danger);
+      }
+
+      .event-type.question,
+      .event-type.question-requested,
+      .event-type.question-resolved {
+        color: var(--warning);
+      }
+
+      .event-type.permission,
+      .event-type.permission-requested,
+      .event-type.permission-resolved {
+        color: var(--purple);
+      }
+
+      .event-icon.session,
+      .event-icon.session-started,
+      .event-icon.session-ended {
         color: var(--success);
         border-color: rgba(48, 209, 88, 0.35);
         background: rgba(48, 209, 88, 0.12);
       }
 
-      /* ACP event categories: prompt / tool */
-      .event-type.prompt,
-      .event-type.tool {
-        color: var(--accent);
-      }
-      .event-icon.prompt,
-      .event-icon.tool {
+      .event-icon.item,
+      .event-icon.item-started,
+      .event-icon.item-completed {
         color: var(--accent);
         border-color: rgba(255, 79, 0, 0.35);
         background: rgba(255, 79, 0, 0.12);
       }
 
-      /* ACP event categories: update / terminal (streaming, realtime) */
-      .event-type.update,
-      .event-type.terminal {
-        color: var(--cyan);
-      }
-      .event-icon.update,
-      .event-icon.terminal {
+      .event-icon.item-delta {
         color: var(--cyan);
         border-color: rgba(100, 210, 255, 0.35);
         background: rgba(100, 210, 255, 0.12);
       }
 
-      /* ACP event categories: cancel */
-      .event-type.cancel {
-        color: var(--danger);
-      }
-      .event-icon.cancel {
+      .event-icon.error,
+      .event-icon.agent-unparsed {
         color: var(--danger);
         border-color: rgba(255, 59, 48, 0.35);
         background: rgba(255, 59, 48, 0.12);
       }
 
-      /* ACP event categories: filesystem */
-      .event-type.filesystem {
-        color: var(--warning);
-      }
-      .event-icon.filesystem {
+      .event-icon.question,
+      .event-icon.question-requested,
+      .event-icon.question-resolved {
         color: var(--warning);
         border-color: rgba(255, 159, 10, 0.35);
         background: rgba(255, 159, 10, 0.12);
       }
 
-      /* ACP event categories: config / permission */
-      .event-type.config,
-      .event-type.permission {
-        color: var(--purple);
-      }
-      .event-icon.config,
-      .event-icon.permission {
+      .event-icon.permission,
+      .event-icon.permission-requested,
+      .event-icon.permission-resolved {
         color: var(--purple);
         border-color: rgba(191, 90, 242, 0.35);
         background: rgba(191, 90, 242, 0.12);
       }
 
-      /* ACP event categories: response (fallback) */
-      .event-type.response {
-        color: var(--muted);
-      }
-      .event-icon.response {
-        color: var(--muted);
-      }
-
       .event-time {
         font-size: 10px;
         color: var(--muted);
-        padding: 2px 8px;
-        border-radius: 999px;
-        border: 1px solid var(--border-2);
-        background: rgba(255, 255, 255, 0.04);
       }
 
       .event-id {
@@ -2175,7 +3545,7 @@
       .log-method {
         font-size: 11px;
         font-weight: 700;
-        color: var(--accent);
+        color: var(--text);
       }
 
       .log-url {
@@ -2283,8 +3653,8 @@
       }
 
       .feature-coverage-badge.enabled {
-        background: rgba(48, 209, 88, 0.12);
-        color: var(--success);
+        background: rgba(255, 255, 255, 0.08);
+        color: var(--text);
       }
 
       .feature-coverage-badge.disabled {
@@ -2296,26 +3666,52 @@
         flex-shrink: 0;
       }
 
-      /* Scrollbar */
-      .messages-container::-webkit-scrollbar,
-      .debug-content::-webkit-scrollbar {
-        width: 6px;
+      @media (max-width: 900px) {
+        .process-run-row {
+          flex-direction: column;
+        }
+
+        .process-run-output {
+          grid-template-columns: 1fr;
+        }
+
+        .process-run-output-section + .process-run-output-section {
+          border-left: none;
+          border-top: 1px solid var(--border);
+        }
+
+        .process-terminal-meta {
+          flex-direction: column;
+          align-items: flex-start;
+        }
       }
 
-      .messages-container::-webkit-scrollbar-track,
-      .debug-content::-webkit-scrollbar-track {
+      /* Scrollbar - match landing page */
+      * {
+        scrollbar-width: thin;
+        scrollbar-color: #3f3f46 transparent;
+      }
+
+      ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+      }
+
+      ::-webkit-scrollbar-track {
         background: transparent;
       }
 
-      .messages-container::-webkit-scrollbar-thumb,
-      .debug-content::-webkit-scrollbar-thumb {
-        background: #3a3a3c;
-        border-radius: 3px;
+      ::-webkit-scrollbar-thumb {
+        background: #3f3f46;
+        border-radius: 9999px;
       }
 
-      .messages-container::-webkit-scrollbar-thumb:hover,
-      .debug-content::-webkit-scrollbar-thumb:hover {
-        background: #48484a;
+      ::-webkit-scrollbar-thumb:hover {
+        background: #52525b;
+      }
+
+      ::-webkit-scrollbar-corner {
+        background: transparent;
       }
 
       /* Responsive */
@@ -2330,6 +3726,12 @@
           grid-template-columns: 1fr;
         }
 
+        .desktop-state-grid,
+        .desktop-start-controls,
+        .desktop-advanced-grid {
+          grid-template-columns: 1fr;
+        }
+
         .session-sidebar {
           display: none;
         }
@@ -2353,12 +3755,102 @@
         .header-title {
           display: none;
         }
+      }
 
-        .toast-stack {
-          left: 12px;
-          right: 12px;
-          bottom: 12px;
-          width: auto;
+      /* Toast notifications - centered cutout/drop style */
+      .toast-stack {
+        position: fixed;
+        top: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+        z-index: 9999;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 8px;
+        width: min(680px, calc(100vw - 20px));
+        pointer-events: none;
+      }
+
+      .toast {
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 12px;
+        width: min(620px, 100%);
+        min-height: 32px;
+        padding: 5px 12px;
+        background: var(--surface);
+        border: 1px solid var(--border);
+        border-radius: 14px;
+        box-shadow: 0 10px 24px rgba(0, 0, 0, 0.35);
+        color: #fff;
+        font-size: 11px;
+        font-weight: 500;
+        animation: toast-slide-in 0.24s cubic-bezier(0.22, 0.61, 0.36, 1);
+        pointer-events: auto;
+      }
+
+      .toast-content {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        gap: 6px;
+        min-width: 0;
+        padding-right: 6px;
+      }
+
+      .toast-title {
+        font-weight: 600;
+        letter-spacing: 0.01em;
+        white-space: nowrap;
+        line-height: 1.2;
+      }
+
+      .toast-message {
+        opacity: 0.9;
+        color: #d4d4d8;
+        font-size: 10px;
+        line-height: 1.2;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .toast-close {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        background: transparent;
+        border: 1px solid rgba(255, 255, 255, 0.16);
+        border-radius: 999px;
+        width: 18px;
+        height: 18px;
+        color: #fff;
+        cursor: pointer;
+        padding: 0;
+        font-size: 12px;
+        line-height: 1;
+        opacity: 0.7;
+        transition: opacity var(--transition), background var(--transition), border-color var(--transition);
+        flex-shrink: 0;
+      }
+
+      .toast-close:hover {
+        opacity: 1;
+        background: rgba(255, 255, 255, 0.1);
+        border-color: rgba(255, 255, 255, 0.24);
+      }
+
+      @keyframes toast-slide-in {
+        from {
+          transform: translateY(-16px) scale(0.98);
+          opacity: 0;
+        }
+        to {
+          transform: translateY(0);
+          opacity: 1;
         }
       }
     </style>
diff --git a/frontend/packages/inspector/package.json b/frontend/packages/inspector/package.json
index 119b8ce..6d86357 100644
--- a/frontend/packages/inspector/package.json
+++ b/frontend/packages/inspector/package.json
@@ -6,23 +6,24 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "SKIP_OPENAPI_GEN=1 pnpm --filter @sandbox-agent/persist-indexeddb build && vite build",
+    "build": "SKIP_OPENAPI_GEN=1 pnpm --filter @sandbox-agent/react build && vite build",
     "preview": "vite preview",
-    "typecheck": "SKIP_OPENAPI_GEN=1 pnpm --filter @sandbox-agent/persist-indexeddb build && tsc --noEmit",
-    "test": "SKIP_OPENAPI_GEN=1 pnpm --filter @sandbox-agent/persist-indexeddb build && vitest run"
+    "typecheck": "SKIP_OPENAPI_GEN=1 pnpm --filter @sandbox-agent/react build && tsc --noEmit",
+    "test": "SKIP_OPENAPI_GEN=1 pnpm --filter @sandbox-agent/react build && vitest run"
   },
   "devDependencies": {
+    "@sandbox-agent/react": "workspace:*",
     "sandbox-agent": "workspace:*",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^19.1.12",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.3.1",
     "fake-indexeddb": "^6.2.4",
+    "jsdom": "^26.1.0",
     "typescript": "^5.7.3",
     "vite": "^5.4.7",
     "vitest": "^3.0.0"
   },
   "dependencies": {
-    "@sandbox-agent/persist-indexeddb": "workspace:*",
     "lucide-react": "^0.469.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
diff --git a/frontend/packages/inspector/public/logos/amp.svg b/frontend/packages/inspector/public/logos/amp.svg
new file mode 100644
index 0000000..624c311
--- /dev/null
+++ b/frontend/packages/inspector/public/logos/amp.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 281 124" fill="#ffffff" xmlns="http://www.w3.org/2000/svg"><path d="M236.014 0C260.431 9.71106e-05 280.602 17.4115 280.603 44.7432C280.602 73.5337 260.065 94.1657 233.52 94.166C224.158 94.166 215.639 92.4222 208.63 88.4902C202.886 85.2698 198.203 80.6054 194.919 74.3379L188.115 121.822L187.946 123.016H174.214L174.448 121.423L191.772 2.49414H205.372L203.937 11.3369C212.143 3.86078 223.2 0.000153635 236.014 0ZM47.082 0.154297C56.4435 0.154297 65.0012 1.8991 72.0488 5.84863C77.8222 9.08305 82.5323 13.7713 85.8271 20.085L88.1201 3.69238L88.2861 2.49316H101.863L89.1611 90.6328L88.9873 91.8262H75.4092L76.7227 82.8555C68.5854 90.4564 57.3981 94.3231 44.5889 94.3232C20.1709 94.3232 0.000167223 76.9087 0 49.5771C0.000149745 20.7854 20.54 0.154871 47.082 0.154297ZM116.234 90.6357L116.061 91.8271H102.485L115.351 3.68555L115.521 2.49414H129.083L116.234 90.6357ZM140.673 90.6357L140.499 91.8271H126.924L139.789 3.68555L139.96 2.49414H153.521L140.673 90.6357ZM177.958 2.49414L165.108 90.6357L164.935 91.8271H151.36L164.225 3.68555L164.396 2.49414H177.958ZM48.4854 11.9844C27.8638 11.985 14.0133 28.3799 14.0127 48.9521C14.0127 57.7907 16.8094 66.1771 22.3145 72.334C27.7973 78.4657 36.0631 82.4932 47.2402 82.4932C67.8534 82.4925 81.7122 65.9487 81.7129 45.3682C81.7129 35.4076 78.2493 27.0792 72.4131 21.2441C66.5794 15.4088 58.2871 11.9844 48.4854 11.9844ZM233.362 11.8291C212.749 11.8297 198.89 28.3716 198.89 48.9521C198.89 58.9123 202.356 67.2403 208.189 73.0742C214.023 78.9107 222.315 82.3358 232.116 82.3359C252.738 82.3355 266.589 65.9407 266.59 45.3682C266.59 36.5296 263.795 28.1424 258.29 21.9863C252.807 15.8551 244.542 11.8291 233.362 11.8291Z"/></svg>
\ No newline at end of file
diff --git a/frontend/packages/inspector/public/logos/claude.svg b/frontend/packages/inspector/public/logos/claude.svg
new file mode 100644
index 0000000..879ad81
--- /dev/null
+++ b/frontend/packages/inspector/public/logos/claude.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by Pixelmator Pro 3.6.17 -->
+<svg width="1200" height="1200" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+    <g id="g314">
+        <path id="path147" fill="#d97757" stroke="none" d="M 233.959793 800.214905 L 468.644287 668.536987 L 472.590637 657.100647 L 468.644287 650.738403 L 457.208069 650.738403 L 417.986633 648.322144 L 283.892639 644.69812 L 167.597321 639.865845 L 54.926208 633.825623 L 26.577238 627.785339 L 3.3e-05 592.751709 L 2.73832 575.27533 L 26.577238 559.248352 L 60.724873 562.228149 L 136.187973 567.382629 L 249.422867 575.194763 L 331.570496 580.026978 L 453.261841 592.671082 L 472.590637 592.671082 L 475.328857 584.859009 L 468.724915 580.026978 L 463.570557 575.194763 L 346.389313 495.785217 L 219.543671 411.865906 L 153.100723 363.543762 L 117.181267 339.060425 L 99.060455 316.107361 L 91.248367 266.01355 L 123.865784 230.093994 L 167.677887 233.073853 L 178.872513 236.053772 L 223.248367 270.201477 L 318.040283 343.570496 L 441.825592 434.738342 L 459.946411 449.798706 L 467.194672 444.64447 L 468.080597 441.020203 L 459.946411 427.409485 L 392.617493 305.718323 L 320.778564 181.932983 L 288.80542 130.630859 L 280.348999 99.865845 C 277.369171 87.221436 275.194641 76.590698 275.194641 63.624268 L 312.322174 13.20813 L 332.8591 6.604126 L 382.389313 13.20813 L 403.248352 31.328979 L 434.013519 101.71814 L 483.865753 212.537048 L 561.181274 363.221497 L 583.812134 407.919434 L 595.892639 449.315491 L 600.40271 461.959839 L 608.214783 461.959839 L 608.214783 454.711609 L 614.577271 369.825623 L 626.335632 265.61084 L 637.771851 131.516846 L 641.718201 93.745117 L 660.402832 48.483276 L 697.530334 24.000122 L 726.52356 37.852417 L 750.362549 72 L 747.060486 94.067139 L 732.886047 186.201416 L 705.100708 330.52356 L 686.979919 427.167847 L 697.530334 427.167847 L 709.61084 415.087341 L 758.496704 350.174561 L 840.644348 247.490051 L 876.885925 206.738342 L 919.167847 161.71814 L 946.308838 140.29541 L 997.61084 140.29541 L 1035.38269 196.429626 L 1018.469849 254.416199 L 965.637634 321.422852 L 921.825562 378.201538 L 859.006714 462.765259 L 819.785278 530.41626 L 823.409424 535.812073 L 832.75177 534.92627 L 974.657776 504.724915 L 1051.328979 490.872559 L 1142.818848 475.167786 L 1184.214844 494.496582 L 1188.724854 514.147644 L 1172.456421 554.335693 L 1074.604126 578.496765 L 959.838989 601.449829 L 788.939636 641.879272 L 786.845764 643.409485 L 789.261841 646.389343 L 866.255127 653.637634 L 899.194702 655.409424 L 979.812134 655.409424 L 1129.932861 666.604187 L 1169.154419 692.537109 L 1192.671265 724.268677 L 1188.724854 748.429688 L 1128.322144 779.194641 L 1046.818848 759.865845 L 856.590759 714.604126 L 791.355774 698.335754 L 782.335693 698.335754 L 782.335693 703.731567 L 836.69812 756.885986 L 936.322205 846.845581 L 1061.073975 962.81897 L 1067.436279 991.490112 L 1051.409424 1014.120911 L 1034.496704 1011.704712 L 924.885986 929.234924 L 882.604126 892.107544 L 786.845764 811.48999 L 780.483276 811.48999 L 780.483276 819.946289 L 802.550415 852.241699 L 919.087341 1027.409424 L 925.127625 1081.127686 L 916.671204 1098.604126 L 886.469849 1109.154419 L 853.288696 1103.114136 L 785.073914 1007.355835 L 714.684631 899.516785 L 657.906067 802.872498 L 650.979858 806.81897 L 617.476624 1167.704834 L 601.771851 1186.147705 L 565.530212 1200 L 535.328857 1177.046997 L 519.302124 1139.919556 L 535.328857 1066.550537 L 554.657776 970.792053 L 570.362488 894.68457 L 584.536926 800.134277 L 592.993347 768.724976 L 592.429626 766.630859 L 585.503479 767.516968 L 514.22821 865.369263 L 405.825531 1011.865906 L 320.053711 1103.677979 L 299.516815 1111.812256 L 263.919525 1093.369263 L 267.221497 1060.429688 L 287.114136 1031.114136 L 405.825531 880.107361 L 477.422913 786.52356 L 523.651062 732.483276 L 523.328918 724.671265 L 520.590698 724.671265 L 205.288605 929.395935 L 149.154434 936.644409 L 124.993355 914.01355 L 127.973183 876.885986 L 139.409409 864.80542 L 234.201385 799.570435 L 233.879227 799.8927 Z"/>
+    </g>
+</svg>
diff --git a/frontend/packages/inspector/public/logos/openai.svg b/frontend/packages/inspector/public/logos/openai.svg
new file mode 100644
index 0000000..ee3125f
--- /dev/null
+++ b/frontend/packages/inspector/public/logos/openai.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v 2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v 2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
\ No newline at end of file
diff --git a/frontend/packages/inspector/public/logos/opencode.svg b/frontend/packages/inspector/public/logos/opencode.svg
new file mode 100644
index 0000000..c2404f2
--- /dev/null
+++ b/frontend/packages/inspector/public/logos/opencode.svg
@@ -0,0 +1 @@
+<svg width='32' height='40' viewBox='0 0 32 40' fill='none' xmlns='http://www.w3.org/2000/svg'><g clip-path='url(#clip0_1311_94973)'><path d='M24 32H8V16H24V32Z' fill='#4B4646'/><path d='M24 8H8V32H24V8ZM32 40H0V0H32V40Z' fill='#F1ECEC'/></g><defs><clipPath id='clip0_1311_94973'><rect width='32' height='40' fill='white'/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/frontend/packages/inspector/public/logos/pi.svg b/frontend/packages/inspector/public/logos/pi.svg
new file mode 100644
index 0000000..ed14b63
--- /dev/null
+++ b/frontend/packages/inspector/public/logos/pi.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800">
+  <!-- P shape: outer boundary clockwise, inner hole counter-clockwise -->
+  <path fill="#fff" fill-rule="evenodd" d="
+    M165.29 165.29
+    H517.36
+    V400
+    H400
+    V517.36
+    H282.65
+    V634.72
+    H165.29
+    Z
+    M282.65 282.65
+    V400
+    H400
+    V282.65
+    Z
+  "/>
+  <!-- i dot -->
+  <path fill="#fff" d="M517.36 400 H634.72 V634.72 H517.36 Z"/>
+</svg>
diff --git a/frontend/packages/inspector/src/App.tsx b/frontend/packages/inspector/src/App.tsx
index b99bc72..f6e319c 100644
--- a/frontend/packages/inspector/src/App.tsx
+++ b/frontend/packages/inspector/src/App.tsx
@@ -1,3 +1,4 @@
+import type { TranscriptEntry } from "@sandbox-agent/react";
 import { BookOpen } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
@@ -6,6 +7,8 @@ import {
   type AgentInfo,
   type SessionEvent,
   type Session,
+  type SessionPermissionRequest,
+  type PermissionReply,
   InMemorySessionPersistDriver,
   type SessionPersistDriver,
 } from "sandbox-agent";
@@ -21,18 +24,15 @@ type ConfigOption = {
 };
 type AgentModeInfo = { id: string; name: string; description: string };
 type AgentModelInfo = { id: string; name?: string };
-import { IndexedDbSessionPersistDriver } from "@sandbox-agent/persist-indexeddb";
+import { IndexedDbSessionPersistDriver } from "./persist-indexeddb";
 import ChatPanel from "./components/chat/ChatPanel";
-import type { TimelineEntry } from "./components/chat/types";
 import ConnectScreen from "./components/ConnectScreen";
 import DebugPanel, { type DebugTab } from "./components/debug/DebugPanel";
 import SessionSidebar from "./components/SessionSidebar";
 import type { RequestLog } from "./types/requestLog";
 import { buildCurl } from "./utils/http";
 
-const flattenSelectOptions = (
-  options: ConfigSelectOption[] | Array<{ group: string; name: string; options: ConfigSelectOption[] }>
-): ConfigSelectOption[] => {
+const flattenSelectOptions = (options: ConfigSelectOption[] | Array<{ group: string; name: string; options: ConfigSelectOption[] }>): ConfigSelectOption[] => {
   if (options.length === 0) return [];
   if ("value" in options[0]) return options as ConfigSelectOption[];
   return (options as Array<{ options: ConfigSelectOption[] }>).flatMap((g) => g.options);
@@ -50,11 +50,15 @@ type SessionListItem = {
   sessionId: string;
   agent: string;
   ended: boolean;
+  archived: boolean;
 };
 
 const ERROR_TOAST_MS = 6000;
 const MAX_ERROR_TOASTS = 3;
+const CREATE_SESSION_SLOW_WARNING_MS = 90_000;
 const HTTP_ERROR_EVENT = "inspector-http-error";
+const ARCHIVED_SESSIONS_KEY = "sandbox-agent-inspector-archived-sessions";
+const SESSION_MODELS_KEY = "sandbox-agent-inspector-session-models";
 
 const DEFAULT_ENDPOINT = "http://localhost:2468";
 
@@ -112,6 +116,31 @@ const getHttpErrorMessage = (status: number, statusText: string, responseBody: s
   return `${base}: ${clippedBody}`;
 };
 
+const shouldIgnoreGlobalError = (value: unknown): boolean => {
+  const name = value instanceof Error ? value.name : "";
+  const message = (() => {
+    if (typeof value === "string") return value;
+    if (value instanceof Error) return value.message;
+    if (value && typeof value === "object" && "message" in value && typeof (value as { message?: unknown }).message === "string") {
+      return (value as { message: string }).message;
+    }
+    return "";
+  })().toLowerCase();
+
+  if (name === "AbortError") return true;
+  if (!message) return false;
+
+  return (
+    message.includes("aborterror") ||
+    message.includes("the operation was aborted") ||
+    message.includes("signal is aborted") ||
+    message.includes("acp client is closed") ||
+    (message.includes("method not found") && message.includes("unstable/set_session_model")) ||
+    message.includes("resizeobserver loop limit exceeded") ||
+    message.includes("resizeobserver loop completed with undelivered notifications")
+  );
+};
+
 const getSessionIdFromPath = (): string => {
   const basePath = import.meta.env.BASE_URL;
   const path = window.location.pathname;
@@ -120,6 +149,48 @@ const getSessionIdFromPath = (): string => {
   return match ? match[1] : "";
 };
 
+const getArchivedSessionIds = (): Set<string> => {
+  if (typeof window === "undefined") return new Set<string>();
+  try {
+    const raw = window.localStorage.getItem(ARCHIVED_SESSIONS_KEY);
+    if (!raw) return new Set<string>();
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) return new Set<string>();
+    return new Set(parsed.filter((value): value is string => typeof value === "string" && value.length > 0));
+  } catch {
+    return new Set<string>();
+  }
+};
+
+const archiveSessionId = (id: string): void => {
+  if (typeof window === "undefined" || !id) return;
+  const archived = getArchivedSessionIds();
+  archived.add(id);
+  window.localStorage.setItem(ARCHIVED_SESSIONS_KEY, JSON.stringify([...archived]));
+};
+
+const unarchiveSessionId = (id: string): void => {
+  if (typeof window === "undefined" || !id) return;
+  const archived = getArchivedSessionIds();
+  if (!archived.delete(id)) return;
+  window.localStorage.setItem(ARCHIVED_SESSIONS_KEY, JSON.stringify([...archived]));
+};
+
+const getPersistedSessionModels = (): Record<string, string> => {
+  if (typeof window === "undefined") return {};
+  try {
+    const raw = window.localStorage.getItem(SESSION_MODELS_KEY);
+    if (!raw) return {};
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+    return Object.fromEntries(
+      Object.entries(parsed).filter((entry): entry is [string, string] => typeof entry[0] === "string" && typeof entry[1] === "string" && entry[1].length > 0),
+    );
+  } catch {
+    return {};
+  }
+};
+
 const updateSessionPath = (id: string) => {
   const basePath = import.meta.env.BASE_URL;
   const params = window.location.search;
@@ -129,6 +200,15 @@ const updateSessionPath = (id: string) => {
   }
 };
 
+const areEventsEqualById = (a: SessionEvent[], b: SessionEvent[]): boolean => {
+  if (a === b) return true;
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i += 1) {
+    if (a[i]?.id !== b[i]?.id) return false;
+  }
+  return true;
+};
+
 const getInitialConnection = () => {
   if (typeof window === "undefined") {
     return { endpoint: "http://127.0.0.1:2468", token: "", headers: {} as Record<string, string>, hasUrlParam: false };
@@ -146,11 +226,12 @@ const getInitialConnection = () => {
     }
   }
   const hasUrlParam = urlParam != null && urlParam.length > 0;
+  const defaultEndpoint = import.meta.env.DEV ? DEFAULT_ENDPOINT : (getCurrentOriginEndpoint() ?? DEFAULT_ENDPOINT);
   return {
-    endpoint: hasUrlParam ? urlParam : (getCurrentOriginEndpoint() ?? DEFAULT_ENDPOINT),
+    endpoint: hasUrlParam ? urlParam : defaultEndpoint,
     token: tokenParam,
     headers,
-    hasUrlParam
+    hasUrlParam,
   };
 };
 
@@ -160,7 +241,7 @@ const agentDisplayNames: Record<string, string> = {
   opencode: "OpenCode",
   amp: "Amp",
   pi: "Pi",
-  cursor: "Cursor"
+  cursor: "Cursor",
 };
 
 export default function App() {
@@ -185,10 +266,12 @@ export default function App() {
   const [agentId, setAgentId] = useState("claude");
   const [sessionId, setSessionId] = useState(getSessionIdFromPath());
   const [sessionError, setSessionError] = useState<string | null>(null);
+  const [sessionModelById, setSessionModelById] = useState<Record<string, string>>(() => getPersistedSessionModels());
 
   const [message, setMessage] = useState("");
   const [events, setEvents] = useState<SessionEvent[]>([]);
-  const [sending, setSending] = useState(false);
+  const [sendingSessionId, setSendingSessionId] = useState<string | null>(null);
+  const [historyLoadingSessionId, setHistoryLoadingSessionId] = useState<string | null>(null);
 
   const [requestLog, setRequestLog] = useState<RequestLog[]>([]);
   const logIdRef = useRef(1);
@@ -196,14 +279,37 @@ export default function App() {
   const [errorToasts, setErrorToasts] = useState<ErrorToast[]>([]);
   const toastIdRef = useRef(1);
   const toastTimeoutsRef = useRef<Map<number, number>>(new Map());
+  const toastExpiryRef = useRef<Map<number, number>>(new Map());
+  const toastRemainingMsRef = useRef<Map<number, number>>(new Map());
 
   const [debugTab, setDebugTab] = useState<DebugTab>("events");
+  const [highlightedEventId, setHighlightedEventId] = useState<string | null>(null);
+  const [debugPanelCollapsed, setDebugPanelCollapsed] = useState(false);
 
-  const messagesEndRef = useRef<HTMLDivElement>(null);
+  const transcriptScrollRef = useRef<HTMLDivElement>(null);
 
   const clientRef = useRef<SandboxAgent | null>(null);
   const activeSessionRef = useRef<Session | null>(null);
   const eventUnsubRef = useRef<(() => void) | null>(null);
+  const permissionUnsubRef = useRef<(() => void) | null>(null);
+  const pendingPermissionsRef = useRef<Map<string, SessionPermissionRequest>>(new Map());
+  const permissionToolCallToIdRef = useRef<Map<string, string>>(new Map());
+  const [pendingPermissionIds, setPendingPermissionIds] = useState<Set<string>>(new Set());
+  const [resolvedPermissions, setResolvedPermissions] = useState<Map<string, string>>(new Map());
+  const sessionEventsCacheRef = useRef<Map<string, SessionEvent[]>>(new Map());
+  const selectedSessionIdRef = useRef(sessionId);
+  const resumeInFlightSessionIdRef = useRef<string | null>(null);
+  const subscriptionGenerationRef = useRef(0);
+  const reconnectingAfterCreateFailureRef = useRef(false);
+  const creatingSessionRef = useRef(false);
+  const createNoiseIgnoreUntilRef = useRef(0);
+
+  useEffect(() => {
+    selectedSessionIdRef.current = sessionId;
+    if (!sessionId) {
+      setHistoryLoadingSessionId(null);
+    }
+  }, [sessionId]);
 
   const logRequest = useCallback((entry: RequestLog) => {
     setRequestLog((prev) => {
@@ -212,96 +318,94 @@ export default function App() {
     });
   }, []);
 
-  const createClient = useCallback(async (overrideEndpoint?: string) => {
-    const targetEndpoint = overrideEndpoint ?? endpoint;
-    const fetchWithLog: typeof fetch = async (input, init) => {
-      const method = init?.method ?? "GET";
-      const url =
-        typeof input === "string"
-          ? input
-          : input instanceof URL
-            ? input.toString()
-            : input.url;
-      const bodyText = typeof init?.body === "string" ? init.body : undefined;
-      const curl = buildCurl(method, url, bodyText, token);
-      const logId = logIdRef.current++;
+  const createClient = useCallback(
+    async (overrideEndpoint?: string) => {
+      const targetEndpoint = overrideEndpoint ?? endpoint;
+      const fetchWithLog: typeof fetch = async (input, init) => {
+        const method = init?.method ?? "GET";
+        const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
+        const bodyText = typeof init?.body === "string" ? init.body : undefined;
+        const curl = buildCurl(method, url, bodyText, token);
+        const logId = logIdRef.current++;
 
-      const headers: Record<string, string> = {};
-      if (init?.headers) {
-        const h = new Headers(init.headers as HeadersInit);
-        h.forEach((v, k) => { headers[k] = v; });
-      }
+        const headers: Record<string, string> = {};
+        if (init?.headers) {
+          const h = new Headers(init.headers as HeadersInit);
+          h.forEach((v, k) => {
+            headers[k] = v;
+          });
+        }
 
-      const entry: RequestLog = {
-        id: logId,
-        method,
-        url,
-        headers,
-        body: bodyText,
-        time: new Date().toLocaleTimeString(),
-        curl
-      };
-      let logged = false;
+        const entry: RequestLog = {
+          id: logId,
+          method,
+          url,
+          headers,
+          body: bodyText,
+          time: new Date().toLocaleTimeString(),
+          curl,
+        };
+        let logged = false;
 
-      const fetchInit = {
-        ...init,
-        targetAddressSpace: "loopback"
-      };
+        const fetchInit = {
+          ...init,
+          targetAddressSpace: "loopback",
+        };
 
-      try {
-        const response = await fetch(input, fetchInit);
-        const acceptsStream = headers["accept"]?.includes("text/event-stream");
-        if (acceptsStream) {
-          const ct = response.headers.get("content-type") ?? "";
-          if (!ct.includes("text/event-stream")) {
-            throw new Error(
-              `Expected text/event-stream from ${method} ${url} but got ${ct || "(no content-type)"} (HTTP ${response.status})`
-            );
+        try {
+          const response = await fetch(input, fetchInit);
+          const acceptsStream = headers["accept"]?.includes("text/event-stream");
+          if (acceptsStream) {
+            const ct = response.headers.get("content-type") ?? "";
+            if (!ct.includes("text/event-stream")) {
+              throw new Error(`Expected text/event-stream from ${method} ${url} but got ${ct || "(no content-type)"} (HTTP ${response.status})`);
+            }
+            logRequest({ ...entry, status: response.status, responseBody: "(SSE stream)" });
+            logged = true;
+            return response;
+          }
+          const clone = response.clone();
+          const responseBody = await clone.text().catch(() => "");
+          logRequest({ ...entry, status: response.status, responseBody });
+          if (!response.ok && response.status >= 500) {
+            const messageText = getHttpErrorMessage(response.status, response.statusText, responseBody);
+            window.dispatchEvent(new CustomEvent<string>(HTTP_ERROR_EVENT, { detail: messageText }));
           }
-          logRequest({ ...entry, status: response.status, responseBody: "(SSE stream)" });
           logged = true;
           return response;
+        } catch (error) {
+          const messageText = error instanceof Error ? error.message : "Request failed";
+          if (!logged) {
+            logRequest({ ...entry, status: 0, error: messageText });
+          }
+          throw error;
         }
-        const clone = response.clone();
-        const responseBody = await clone.text().catch(() => "");
-        logRequest({ ...entry, status: response.status, responseBody });
-        if (!response.ok && response.status >= 500) {
-          const messageText = getHttpErrorMessage(response.status, response.statusText, responseBody);
-          window.dispatchEvent(new CustomEvent<string>(HTTP_ERROR_EVENT, { detail: messageText }));
-        }
-        logged = true;
-        return response;
-      } catch (error) {
-        const messageText = error instanceof Error ? error.message : "Request failed";
-        if (!logged) {
-          logRequest({ ...entry, status: 0, error: messageText });
-        }
-        throw error;
+      };
+
+      let persist: SessionPersistDriver;
+      try {
+        persist = new IndexedDbSessionPersistDriver({
+          databaseName: "sandbox-agent-inspector",
+        });
+      } catch {
+        persist = new InMemorySessionPersistDriver({
+          maxSessions: 512,
+          maxEventsPerSession: 5_000,
+        });
       }
-    };
 
-    let persist: SessionPersistDriver;
-    try {
-      persist = new IndexedDbSessionPersistDriver({
-        databaseName: "sandbox-agent-inspector",
+      const client = await SandboxAgent.connect({
+        baseUrl: targetEndpoint,
+        token: token || undefined,
+        fetch: fetchWithLog,
+        headers: Object.keys(extraHeaders).length > 0 ? extraHeaders : undefined,
+        persist,
       });
-    } catch {
-      persist = new InMemorySessionPersistDriver({
-        maxSessions: 512,
-        maxEventsPerSession: 5_000,
-      });
-    }
-
-    const client = await SandboxAgent.connect({
-      baseUrl: targetEndpoint,
-      token: token || undefined,
-      fetch: fetchWithLog,
-      headers: Object.keys(extraHeaders).length > 0 ? extraHeaders : undefined,
-      persist,
-    });
-    clientRef.current = client;
-    return client;
-  }, [endpoint, token, extraHeaders, logRequest]);
+      clientRef.current = client;
+      return client;
+    },
+    [endpoint, token, extraHeaders, logRequest],
+  );
 
   const getClient = useCallback((): SandboxAgent => {
     if (!clientRef.current) {
@@ -316,58 +420,172 @@ export default function App() {
       window.clearTimeout(timeoutId);
       toastTimeoutsRef.current.delete(toastId);
     }
+    toastExpiryRef.current.delete(toastId);
+    toastRemainingMsRef.current.delete(toastId);
     setErrorToasts((prev) => prev.filter((toast) => toast.id !== toastId));
   }, []);
 
-  const pushErrorToast = useCallback((error: unknown, fallback: string) => {
-    const messageText = getErrorMessage(error, fallback).trim() || fallback;
-    const toastId = toastIdRef.current++;
-    setErrorToasts((prev) => {
-      if (prev.some((toast) => toast.message === messageText)) {
-        return prev;
+  const scheduleErrorToastDismiss = useCallback(
+    (toastId: number, delayMs: number) => {
+      const existingTimeoutId = toastTimeoutsRef.current.get(toastId);
+      if (existingTimeoutId != null) {
+        window.clearTimeout(existingTimeoutId);
+        toastTimeoutsRef.current.delete(toastId);
       }
-      return [...prev, { id: toastId, message: messageText }].slice(-MAX_ERROR_TOASTS);
-    });
-    const timeoutId = window.setTimeout(() => {
-      dismissErrorToast(toastId);
-    }, ERROR_TOAST_MS);
-    toastTimeoutsRef.current.set(toastId, timeoutId);
-  }, [dismissErrorToast]);
+
+      const clampedDelayMs = Math.max(0, delayMs);
+      const timeoutId = window.setTimeout(() => {
+        dismissErrorToast(toastId);
+      }, clampedDelayMs);
+
+      toastTimeoutsRef.current.set(toastId, timeoutId);
+      toastExpiryRef.current.set(toastId, Date.now() + clampedDelayMs);
+      toastRemainingMsRef.current.set(toastId, clampedDelayMs);
+    },
+    [dismissErrorToast],
+  );
+
+  const pauseErrorToastDismiss = useCallback((toastId: number) => {
+    const expiryMs = toastExpiryRef.current.get(toastId);
+    if (expiryMs == null) return;
+    const remainingMs = Math.max(0, expiryMs - Date.now());
+    toastRemainingMsRef.current.set(toastId, remainingMs);
+
+    const timeoutId = toastTimeoutsRef.current.get(toastId);
+    if (timeoutId != null) {
+      window.clearTimeout(timeoutId);
+      toastTimeoutsRef.current.delete(toastId);
+    }
+    toastExpiryRef.current.delete(toastId);
+  }, []);
+
+  const resumeErrorToastDismiss = useCallback(
+    (toastId: number) => {
+      if (toastTimeoutsRef.current.has(toastId)) return;
+      const remainingMs = toastRemainingMsRef.current.get(toastId);
+      if (remainingMs == null) return;
+      scheduleErrorToastDismiss(toastId, remainingMs);
+    },
+    [scheduleErrorToastDismiss],
+  );
+
+  const pushErrorToast = useCallback(
+    (error: unknown, fallback: string) => {
+      const messageText = getErrorMessage(error, fallback).trim() || fallback;
+      const toastId = toastIdRef.current++;
+      setErrorToasts((prev) => {
+        if (prev.some((toast) => toast.message === messageText)) {
+          return prev;
+        }
+        return [...prev, { id: toastId, message: messageText }].slice(-MAX_ERROR_TOASTS);
+      });
+      scheduleErrorToastDismiss(toastId, ERROR_TOAST_MS);
+    },
+    [scheduleErrorToastDismiss],
+  );
 
   // Subscribe to events for the current active session
-  const subscribeToSession = useCallback((session: Session) => {
-    // Unsubscribe from previous
-    if (eventUnsubRef.current) {
-      eventUnsubRef.current();
-      eventUnsubRef.current = null;
-    }
+  const subscribeToSession = useCallback(
+    (session: Session) => {
+      const generation = ++subscriptionGenerationRef.current;
+      const isCurrentSubscription = (): boolean =>
+        subscriptionGenerationRef.current === generation && activeSessionRef.current?.id === session.id && selectedSessionIdRef.current === session.id;
 
-    activeSessionRef.current = session;
-
-    // Hydrate existing events from persistence
-    const hydrateEvents = async () => {
-      const allEvents: SessionEvent[] = [];
-      let cursor: string | undefined;
-      while (true) {
-        const page = await getClient().getEvents({
-          sessionId: session.id,
-          cursor,
-          limit: 250,
-        });
-        allEvents.push(...page.items);
-        if (!page.nextCursor) break;
-        cursor = page.nextCursor;
+      // Unsubscribe from previous
+      if (eventUnsubRef.current) {
+        eventUnsubRef.current();
+        eventUnsubRef.current = null;
       }
-      setEvents(allEvents);
-    };
-    hydrateEvents().catch(() => {});
 
-    // Subscribe to new events
-    const unsub = session.onEvent((event) => {
-      setEvents((prev) => [...prev, event]);
-    });
-    eventUnsubRef.current = unsub;
-  }, [getClient]);
+      activeSessionRef.current = session;
+      const cachedEvents = sessionEventsCacheRef.current.get(session.id);
+      if (cachedEvents && isCurrentSubscription()) {
+        setEvents(cachedEvents);
+        setHistoryLoadingSessionId((current) => (current === session.id ? null : current));
+      } else if (isCurrentSubscription()) {
+        setHistoryLoadingSessionId(session.id);
+      }
+
+      // Hydrate existing events from persistence
+      const hydrateEvents = async () => {
+        const allEvents: SessionEvent[] = [];
+        let cursor: string | undefined;
+        while (true) {
+          const page = await getClient().getEvents({
+            sessionId: session.id,
+            cursor,
+            limit: 250,
+          });
+          allEvents.push(...page.items);
+          if (!page.nextCursor) break;
+          cursor = page.nextCursor;
+        }
+        sessionEventsCacheRef.current.set(session.id, allEvents);
+        if (!isCurrentSubscription()) return;
+        setEvents((prev) => (areEventsEqualById(prev, allEvents) ? prev : allEvents));
+        setHistoryLoadingSessionId((current) => (current === session.id ? null : current));
+      };
+      hydrateEvents().catch((error) => {
+        console.error("Failed to hydrate events:", error);
+        if (isCurrentSubscription()) {
+          setHistoryLoadingSessionId((current) => (current === session.id ? null : current));
+        }
+      });
+
+      // Subscribe to new events
+      const unsub = session.onEvent((event) => {
+        if (!isCurrentSubscription()) return;
+        setEvents((prev) => {
+          if (prev.some((existing) => existing.id === event.id)) {
+            return prev;
+          }
+          const next = [...prev, event];
+          sessionEventsCacheRef.current.set(session.id, next);
+          return next;
+        });
+      });
+      eventUnsubRef.current = unsub;
+
+      // Subscribe to permission requests
+      if (permissionUnsubRef.current) {
+        permissionUnsubRef.current();
+        permissionUnsubRef.current = null;
+      }
+      const permUnsub = session.onPermissionRequest((request: SessionPermissionRequest) => {
+        if (!isCurrentSubscription()) return;
+        pendingPermissionsRef.current.set(request.id, request);
+        if (request.toolCall?.toolCallId) {
+          permissionToolCallToIdRef.current.set(request.toolCall.toolCallId, request.id);
+        }
+        setPendingPermissionIds((prev) => new Set([...prev, request.id]));
+      });
+      permissionUnsubRef.current = permUnsub;
+    },
+    [getClient],
+  );
+
+  const handlePermissionReply = useCallback(
+    async (permissionId: string, reply: PermissionReply) => {
+      const session = activeSessionRef.current;
+      if (!session) return;
+      try {
+        await session.respondPermission(permissionId, reply);
+        const request = pendingPermissionsRef.current.get(permissionId);
+        const selectedOption = request?.options.find((o) =>
+          reply === "always" ? o.kind === "allow_always" : reply === "once" ? o.kind === "allow_once" : o.kind === "reject_once" || o.kind === "reject_always",
+        );
+        setResolvedPermissions((prev) => new Map([...prev, [permissionId, selectedOption?.optionId ?? reply]]));
+        setPendingPermissionIds((prev) => {
+          const next = new Set(prev);
+          next.delete(permissionId);
+          return next;
+        });
+      } catch (error) {
+        pushErrorToast(error, "Failed to respond to permission request");
+      }
+    },
+    [pushErrorToast],
+  );
 
   const connectToDaemon = async (reportError: boolean, overrideEndpoint?: string) => {
     setConnecting(true);
@@ -375,6 +593,27 @@ export default function App() {
       setConnectError(null);
     }
     try {
+      // Ensure reconnects do not keep stale session subscriptions/clients around.
+      if (eventUnsubRef.current) {
+        eventUnsubRef.current();
+        eventUnsubRef.current = null;
+      }
+      if (permissionUnsubRef.current) {
+        permissionUnsubRef.current();
+        permissionUnsubRef.current = null;
+      }
+      subscriptionGenerationRef.current += 1;
+      activeSessionRef.current = null;
+      if (clientRef.current) {
+        try {
+          await clientRef.current.dispose();
+        } catch (disposeError) {
+          console.warn("Failed to dispose previous client during reconnect:", disposeError);
+        } finally {
+          clientRef.current = null;
+        }
+      }
+
       const client = await createClient(overrideEndpoint);
       await client.getHealth();
       if (overrideEndpoint) {
@@ -383,6 +622,15 @@ export default function App() {
       setConnected(true);
       await refreshAgents();
       await fetchSessions();
+      if (sessionId) {
+        try {
+          const resumed = await client.resumeSession(sessionId);
+          subscribeToSession(resumed);
+        } catch (resumeError) {
+          console.warn("Failed to resume current session after reconnect:", resumeError);
+          setHistoryLoadingSessionId(null);
+        }
+      }
       if (reportError) {
         setConnectError(null);
       }
@@ -406,16 +654,25 @@ export default function App() {
       eventUnsubRef.current();
       eventUnsubRef.current = null;
     }
+    if (permissionUnsubRef.current) {
+      permissionUnsubRef.current();
+      permissionUnsubRef.current = null;
+    }
+    subscriptionGenerationRef.current += 1;
     activeSessionRef.current = null;
     if (clientRef.current) {
-      void clientRef.current.dispose();
+      void clientRef.current.dispose().catch((error) => {
+        console.warn("Failed to dispose client on disconnect:", error);
+      });
     }
     setConnected(false);
     clientRef.current = null;
     setSessionError(null);
     setEvents([]);
+    setHistoryLoadingSessionId(null);
     setAgents([]);
     setSessions([]);
+    sessionEventsCacheRef.current.clear();
     setAgentsLoading(false);
     setSessionsLoading(false);
     setAgentsError(null);
@@ -435,21 +692,26 @@ export default function App() {
     }
   };
 
-  const loadAgentConfig = useCallback(async (targetAgentId: string) => {
-    try {
-      const info = await getClient().getAgent(targetAgentId, { config: true });
-      setAgents((prev) =>
-        prev.map((a) => (a.id === targetAgentId ? { ...a, configOptions: info.configOptions, configError: info.configError } : a))
-      );
-    } catch {
-      // Config loading is best-effort; the menu still works without it.
-    }
-  }, [getClient]);
+  const loadAgentConfig = useCallback(
+    async (targetAgentId: string) => {
+      console.log("[loadAgentConfig] Loading config for agent:", targetAgentId);
+      try {
+        const info = await getClient().getAgent(targetAgentId, { config: true });
+        console.log("[loadAgentConfig] Got agent info:", info);
+        setAgents((prev) => prev.map((a) => (a.id === targetAgentId ? { ...a, configOptions: info.configOptions, configError: info.configError } : a)));
+      } catch (error) {
+        console.error("[loadAgentConfig] Failed to load config:", error);
+        // Config loading is best-effort; the menu still works without it.
+      }
+    },
+    [getClient],
+  );
 
   const fetchSessions = async () => {
     setSessionsLoading(true);
     setSessionsError(null);
     try {
+      const archivedSessionIds = getArchivedSessionIds();
       // TODO: This eagerly paginates all sessions so we can reverse-sort to
       // show newest first. Replace with a server-side descending sort or a
       // dedicated "recent sessions" query once the API supports it.
@@ -462,6 +724,7 @@ export default function App() {
             sessionId: s.id,
             agent: s.agent,
             ended: s.destroyedAt != null,
+            archived: archivedSessionIds.has(s.id),
           });
         }
         cursor = page.nextCursor;
@@ -475,6 +738,34 @@ export default function App() {
     }
   };
 
+  const archiveSession = async (targetSessionId: string) => {
+    archiveSessionId(targetSessionId);
+    try {
+      try {
+        await getClient().destroySession(targetSessionId);
+      } catch (error) {
+        // If the server already considers the session gone, still archive in local UI.
+        console.warn("Destroy session returned an error while archiving:", error);
+      }
+      setSessions((prev) => prev.map((session) => (session.sessionId === targetSessionId ? { ...session, archived: true, ended: true } : session)));
+      setSessionModelById((prev) => {
+        if (!(targetSessionId in prev)) return prev;
+        const next = { ...prev };
+        delete next[targetSessionId];
+        return next;
+      });
+      await fetchSessions();
+    } catch (error) {
+      console.error("Failed to archive session:", error);
+    }
+  };
+
+  const unarchiveSession = async (targetSessionId: string) => {
+    unarchiveSessionId(targetSessionId);
+    setSessions((prev) => prev.map((session) => (session.sessionId === targetSessionId ? { ...session, archived: false } : session)));
+    await fetchSessions();
+  };
+
   const installAgent = async (targetId: string, reinstall: boolean) => {
     try {
       await getClient().installAgent(targetId, { reinstall });
@@ -486,47 +777,57 @@ export default function App() {
 
   const sendMessage = async () => {
     const prompt = message.trim();
-    if (!prompt || !sessionId || sending) return;
+    if (!prompt || !sessionId || sendingSessionId) return;
+    const targetSessionId = sessionId;
     setSessionError(null);
     setMessage("");
-    setSending(true);
+    setSendingSessionId(targetSessionId);
 
     try {
       let session = activeSessionRef.current;
-      if (!session || session.id !== sessionId) {
-        session = await getClient().resumeSession(sessionId);
+      if (!session || session.id !== targetSessionId) {
+        session = await getClient().resumeSession(targetSessionId);
         subscribeToSession(session);
       }
       await session.prompt([{ type: "text", text: prompt }]);
     } catch (error) {
       setSessionError(getErrorMessage(error, "Unable to send message"));
     } finally {
-      setSending(false);
+      setSendingSessionId(null);
     }
   };
 
-  const selectSession = async (session: SessionListItem) => {
+  const selectSession = (session: SessionListItem) => {
     setSessionId(session.sessionId);
+    selectedSessionIdRef.current = session.sessionId;
     updateSessionPath(session.sessionId);
     setAgentId(session.agent);
-    setEvents([]);
-    setSessionError(null);
-
-    try {
-      const sdkSession = await getClient().resumeSession(session.sessionId);
-      subscribeToSession(sdkSession);
-    } catch (error) {
-      setSessionError(getErrorMessage(error, "Unable to load session"));
+    setSessionModelById((prev) => {
+      if (prev[session.sessionId]) return prev;
+      const fallbackModel = defaultModelByAgent[session.agent];
+      if (!fallbackModel) return prev;
+      return { ...prev, [session.sessionId]: fallbackModel };
+    });
+    const cachedEvents = sessionEventsCacheRef.current.get(session.sessionId);
+    if (cachedEvents) {
+      setEvents(cachedEvents);
+      setHistoryLoadingSessionId(null);
+    } else {
+      setEvents([]);
+      setHistoryLoadingSessionId(session.sessionId);
     }
+    setSessionError(null);
   };
 
   const createNewSession = async (nextAgentId: string, config: { agentMode: string; model: string }) => {
-    setAgentId(nextAgentId);
+    console.log("[createNewSession] Creating session for agent:", nextAgentId, "config:", config);
     setSessionError(null);
-    setEvents([]);
+    creatingSessionRef.current = true;
+    createNoiseIgnoreUntilRef.current = Date.now() + 10_000;
 
     try {
-      const session = await getClient().createSession({
+      console.log("[createNewSession] Calling createSession...");
+      const createSessionPromise = getClient().createSession({
         agent: nextAgentId,
         sessionInit: {
           cwd: "/",
@@ -534,14 +835,36 @@ export default function App() {
         },
       });
 
+      let slowWarningShown = false;
+      const slowWarningTimerId = window.setTimeout(() => {
+        slowWarningShown = true;
+        setSessionError("Session creation is taking longer than expected. Waiting for agent startup...");
+      }, CREATE_SESSION_SLOW_WARNING_MS);
+      let session: Awaited<ReturnType<SandboxAgent["createSession"]>>;
+      try {
+        session = await createSessionPromise;
+      } finally {
+        window.clearTimeout(slowWarningTimerId);
+      }
+      console.log("[createNewSession] Session created:", session.id);
+      if (slowWarningShown) {
+        setSessionError(null);
+      }
+
+      setAgentId(nextAgentId);
+      setEvents([]);
+      setHistoryLoadingSessionId(null);
       setSessionId(session.id);
+      selectedSessionIdRef.current = session.id;
       updateSessionPath(session.id);
+      sessionEventsCacheRef.current.set(session.id, []);
       subscribeToSession(session);
+      const skipPostCreateConfig = nextAgentId === "opencode";
 
       // Apply mode if selected
-      if (config.agentMode) {
+      if (!skipPostCreateConfig && config.agentMode) {
         try {
-          await session.send("session/set_mode", { modeId: config.agentMode });
+          await session.rawSend("session/set_mode", { modeId: config.agentMode });
         } catch {
           // Mode application is best-effort
         }
@@ -549,18 +872,49 @@ export default function App() {
 
       // Apply model if selected
       if (config.model) {
-        try {
-          await session.send("unstable/set_session_model", { modelId: config.model });
-        } catch {
-          // Model application is best-effort
+        setSessionModelById((prev) => ({ ...prev, [session.id]: config.model }));
+        if (!skipPostCreateConfig) {
+          try {
+            const agentInfo = agents.find((agent) => agent.id === nextAgentId);
+            const modelOption = ((agentInfo?.configOptions ?? []) as ConfigOption[]).find(
+              (opt) => opt.category === "model" && opt.type === "select" && typeof opt.id === "string",
+            );
+            if (modelOption && config.model !== modelOption.currentValue) {
+              await session.rawSend("session/set_config_option", {
+                optionId: modelOption.id,
+                value: config.model,
+              });
+            }
+          } catch {
+            // Model application is best-effort
+          }
         }
       }
 
-      await fetchSessions();
+      // Refresh session list in background; UI should not stay blocked on list pagination.
+      void fetchSessions();
     } catch (error) {
+      console.error("[createNewSession] Failed to create session:", error);
       const messageText = getErrorMessage(error, "Unable to create session");
+      console.error("[createNewSession] Error message:", messageText);
       setSessionError(messageText);
       pushErrorToast(error, messageText);
+      if (!reconnectingAfterCreateFailureRef.current) {
+        reconnectingAfterCreateFailureRef.current = true;
+        // Run recovery in background so failed creates do not block UI.
+        void connectToDaemon(false)
+          .catch((reconnectError) => {
+            console.error("[createNewSession] Soft reconnect failed:", reconnectError);
+          })
+          .finally(() => {
+            reconnectingAfterCreateFailureRef.current = false;
+          });
+      }
+      throw error;
+    } finally {
+      creatingSessionRef.current = false;
+      // Keep a short post-create window for delayed transport rejections.
+      createNoiseIgnoreUntilRef.current = Date.now() + 2_000;
     }
   };
 
@@ -572,6 +926,10 @@ export default function App() {
         eventUnsubRef.current();
         eventUnsubRef.current = null;
       }
+      if (permissionUnsubRef.current) {
+        permissionUnsubRef.current();
+        permissionUnsubRef.current = null;
+      }
       activeSessionRef.current = null;
       await fetchSessions();
     } catch (error) {
@@ -587,9 +945,12 @@ export default function App() {
     };
 
     if (navigator.clipboard && window.isSecureContext) {
-      navigator.clipboard.writeText(text).then(onSuccess).catch(() => {
-        fallbackCopy(text, onSuccess);
-      });
+      navigator.clipboard
+        .writeText(text)
+        .then(onSuccess)
+        .catch(() => {
+          fallbackCopy(text, onSuccess);
+        });
     } else {
       fallbackCopy(text, onSuccess);
     }
@@ -613,7 +974,7 @@ export default function App() {
 
   // Build transcript entries from raw SessionEvents
   const transcriptEntries = useMemo(() => {
-    const entries: TimelineEntry[] = [];
+    const entries: TranscriptEntry[] = [];
 
     // Accumulators for streaming chunks
     let assistantAccumId: string | null = null;
@@ -646,7 +1007,7 @@ export default function App() {
     };
 
     // Track tool calls by ID for updates
-    const toolEntryMap = new Map<string, TimelineEntry>();
+    const toolEntryMap = new Map<string, TranscriptEntry>();
 
     for (const event of events) {
       const payload = event.payload as Record<string, unknown>;
@@ -659,9 +1020,20 @@ export default function App() {
         flushThought(time);
         const params = payload.params as Record<string, unknown> | undefined;
         const promptArray = params?.prompt as Array<{ type: string; text?: string }> | undefined;
-        const text = promptArray?.[0]?.text ?? "";
+        const replayPrefix = "Previous session history is replayed below";
+        const text = (promptArray ?? [])
+          .filter((part) => part?.type === "text" && typeof part.text === "string")
+          .map((part) => part.text!.trim())
+          // SDK replay prompt is prepended to the real user prompt; drop only replay blocks.
+          .filter((partText) => partText.length > 0 && !partText.startsWith(replayPrefix))
+          .join("\n\n")
+          .trim();
+        if (!text) {
+          continue;
+        }
         entries.push({
           id: event.id,
+          eventId: event.id,
           kind: "message",
           time,
           role: "user",
@@ -684,6 +1056,7 @@ export default function App() {
                 assistantAccumText = "";
                 entries.push({
                   id: assistantAccumId,
+                  eventId: event.id,
                   kind: "message",
                   time,
                   role: "assistant",
@@ -707,6 +1080,7 @@ export default function App() {
                 thoughtAccumText = "";
                 entries.push({
                   id: thoughtAccumId,
+                  eventId: event.id,
                   kind: "reasoning",
                   time,
                   reasoning: { text: "", visibility: "public" },
@@ -726,6 +1100,7 @@ export default function App() {
             const text = content?.type === "text" ? (content.text ?? "") : JSON.stringify(content);
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "message",
               time,
               role: "user",
@@ -746,8 +1121,9 @@ export default function App() {
               if (update.title) existing.toolName = update.title as string;
               existing.time = time;
             } else {
-              const entry: TimelineEntry = {
+              const entry: TranscriptEntry = {
                 id: `tool-${toolCallId}`,
+                eventId: event.id,
                 kind: "tool",
                 time,
                 toolName: (update.title as string) ?? "tool",
@@ -776,6 +1152,7 @@ export default function App() {
             const detail = planEntries.map((e) => `[${e.status}] ${e.content}`).join("\n");
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "meta",
               time,
               meta: { title: "Plan", detail, severity: "info" },
@@ -786,6 +1163,7 @@ export default function App() {
             const title = update.title as string | undefined;
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "meta",
               time,
               meta: { title: "Session info update", detail: title ? `Title: ${title}` : undefined, severity: "info" },
@@ -793,24 +1171,13 @@ export default function App() {
             break;
           }
           case "usage_update": {
-            const size = update.size as number | undefined;
-            const used = update.used as number | undefined;
-            const cost = update.cost as { total?: number } | undefined;
-            const parts = [`${used ?? 0}/${size ?? 0} tokens`];
-            if (cost?.total != null) {
-              parts.push(`cost: $${cost.total.toFixed(4)}`);
-            }
-            entries.push({
-              id: event.id,
-              kind: "meta",
-              time,
-              meta: { title: "Usage update", detail: parts.join(" | "), severity: "info" },
-            });
+            // Token usage is displayed in the config bar, not in the transcript
             break;
           }
           case "current_mode_update": {
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "meta",
               time,
               meta: { title: "Mode changed", detail: update.currentModeId as string, severity: "info" },
@@ -820,6 +1187,7 @@ export default function App() {
           case "config_option_update": {
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "meta",
               time,
               meta: { title: "Config option update", severity: "info" },
@@ -829,6 +1197,7 @@ export default function App() {
           case "available_commands_update": {
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "meta",
               time,
               meta: { title: "Available commands update", severity: "info" },
@@ -838,6 +1207,7 @@ export default function App() {
           default: {
             entries.push({
               id: event.id,
+              eventId: event.id,
               kind: "meta",
               time,
               meta: { title: `session/update: ${update.sessionUpdate}`, severity: "info" },
@@ -848,10 +1218,45 @@ export default function App() {
         continue;
       }
 
+      if (event.sender === "agent" && method === "session/request_permission") {
+        const params = payload.params as
+          | {
+              options?: Array<{ optionId: string; name: string; kind: string }>;
+              toolCall?: { title?: string; toolCallId?: string; description?: string };
+            }
+          | undefined;
+        const toolCallId = params?.toolCall?.toolCallId;
+        const sdkPermissionId = toolCallId ? permissionToolCallToIdRef.current.get(toolCallId) : undefined;
+        const permissionId = sdkPermissionId ?? (typeof payload.id === "number" || typeof payload.id === "string" ? String(payload.id) : event.id);
+        const options = (params?.options ?? []).map((o) => ({
+          optionId: o.optionId,
+          name: o.name,
+          kind: o.kind,
+        }));
+        const title = params?.toolCall?.title ?? params?.toolCall?.toolCallId ?? "Permission request";
+        const resolved = resolvedPermissions.get(permissionId);
+        entries.push({
+          id: event.id,
+          eventId: event.id,
+          kind: "permission",
+          time,
+          permission: {
+            permissionId,
+            title,
+            description: params?.toolCall?.description,
+            options,
+            resolved: resolved != null || sdkPermissionId == null,
+            selectedOptionId: resolved,
+          },
+        });
+        continue;
+      }
+
       if (event.sender === "agent" && method === "_sandboxagent/agent/unparsed") {
         const params = payload.params as { error?: string; location?: string } | undefined;
         entries.push({
           id: event.id,
+          eventId: event.id,
           kind: "meta",
           time,
           meta: {
@@ -867,6 +1272,7 @@ export default function App() {
       if (method) {
         entries.push({
           id: event.id,
+          eventId: event.id,
           kind: "meta",
           time,
           meta: { title: method, detail: event.sender, severity: "info" },
@@ -875,7 +1281,7 @@ export default function App() {
     }
 
     return entries;
-  }, [events]);
+  }, [events, resolvedPermissions]);
 
   useEffect(() => {
     return () => {
@@ -883,14 +1289,35 @@ export default function App() {
         eventUnsubRef.current();
         eventUnsubRef.current = null;
       }
+      if (permissionUnsubRef.current) {
+        permissionUnsubRef.current();
+        permissionUnsubRef.current = null;
+      }
     };
   }, []);
 
   useEffect(() => {
+    const shouldIgnoreCreateNoise = (value: unknown): boolean => {
+      if (Date.now() > createNoiseIgnoreUntilRef.current) return false;
+      const message = getErrorMessage(value, "").trim().toLowerCase();
+      return message.length === 0 || message === "request failed" || message.includes("request failed") || message.includes("unhandled promise rejection");
+    };
+
     const handleWindowError = (event: ErrorEvent) => {
-      pushErrorToast(event.error ?? event.message, "Unexpected error");
+      const errorLike = event.error ?? event.message;
+      if (shouldIgnoreCreateNoise(errorLike)) return;
+      if (shouldIgnoreGlobalError(errorLike)) return;
+      pushErrorToast(errorLike, "Unexpected error");
     };
     const handleUnhandledRejection = (event: PromiseRejectionEvent) => {
+      if (shouldIgnoreCreateNoise(event.reason)) {
+        event.preventDefault();
+        return;
+      }
+      if (shouldIgnoreGlobalError(event.reason)) {
+        event.preventDefault();
+        return;
+      }
       pushErrorToast(event.reason, "Unhandled promise rejection");
     };
     const handleHttpError = (event: Event) => {
@@ -915,6 +1342,8 @@ export default function App() {
         window.clearTimeout(timeoutId);
       }
       toastTimeoutsRef.current.clear();
+      toastExpiryRef.current.clear();
+      toastRemainingMsRef.current.clear();
     };
   }, []);
 
@@ -966,22 +1395,94 @@ export default function App() {
   // Auto-load session when sessionId changes
   useEffect(() => {
     if (!connected || !sessionId) return;
-    const hasSession = sessions.some((s) => s.sessionId === sessionId);
-    if (!hasSession) return;
+    if (creatingSessionRef.current) return;
+    if (resumeInFlightSessionIdRef.current === sessionId) return;
+    const sessionInfo = sessions.find((s) => s.sessionId === sessionId);
+    if (!sessionInfo) return;
     if (activeSessionRef.current?.id === sessionId) return;
 
-    getClient().resumeSession(sessionId).then((session) => {
-      subscribeToSession(session);
-    }).catch(() => {});
-  }, [connected, sessionId, sessions, getClient, subscribeToSession]);
+    // Set the correct agent from the session
+    setAgentId(sessionInfo.agent);
+    const cachedEvents = sessionEventsCacheRef.current.get(sessionId);
+    if (cachedEvents) {
+      setEvents(cachedEvents);
+      setHistoryLoadingSessionId(null);
+    } else {
+      setEvents([]);
+      setHistoryLoadingSessionId(sessionId);
+    }
+    setSessionError(null);
 
-  useEffect(() => {
-    messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-  }, [transcriptEntries]);
+    const requestedSessionId = sessionId;
+    resumeInFlightSessionIdRef.current = requestedSessionId;
+
+    getClient()
+      .resumeSession(requestedSessionId)
+      .then((session) => {
+        if (selectedSessionIdRef.current !== requestedSessionId) return;
+        subscribeToSession(session);
+      })
+      .catch((error) => {
+        if (selectedSessionIdRef.current !== requestedSessionId) return;
+        setSessionError(getErrorMessage(error, "Unable to resume session"));
+        setHistoryLoadingSessionId((current) => (current === requestedSessionId ? null : current));
+      })
+      .finally(() => {
+        if (resumeInFlightSessionIdRef.current === requestedSessionId) {
+          resumeInFlightSessionIdRef.current = null;
+        }
+      });
+  }, [connected, sessionId, sessions, getClient, subscribeToSession]);
 
   const currentAgent = agents.find((agent) => agent.id === agentId);
   const agentLabel = agentDisplayNames[agentId] ?? agentId;
-  const sessionEnded = sessions.find((s) => s.sessionId === sessionId)?.ended ?? false;
+  const selectedSession = sessions.find((s) => s.sessionId === sessionId);
+  const sessionArchived = selectedSession?.archived ?? false;
+  // Archived sessions are treated as ended in UI so they can never be "ended again".
+  const sessionEnded = (selectedSession?.ended ?? false) || sessionArchived;
+
+  // Determine if agent is thinking (has in-progress tools or waiting for response)
+  const isThinking = useMemo(() => {
+    if (!sessionId || sessionEnded) return false;
+    // If actively sending a prompt, show thinking
+    if (sendingSessionId === sessionId) return true;
+    // Check for in-progress tool calls
+    const hasInProgressTool = transcriptEntries.some((e) => e.kind === "tool" && e.toolStatus === "in_progress");
+    if (hasInProgressTool) return true;
+    // Check if last message was from user with no subsequent agent activity
+    const lastUserMessageIndex = [...transcriptEntries].reverse().findIndex((e) => e.kind === "message" && e.role === "user");
+    if (lastUserMessageIndex === -1) return false;
+    // If user message is the very last entry, we're waiting for response
+    if (lastUserMessageIndex === 0) return true;
+    // Check if there's any agent response after the user message
+    const entriesAfterUser = transcriptEntries.slice(-lastUserMessageIndex);
+    const hasAgentResponse = entriesAfterUser.some((e) => e.kind === "message" && e.role === "assistant");
+    // If no assistant message after user, but there are completed tools, not thinking
+    const hasCompletedTools = entriesAfterUser.some((e) => e.kind === "tool" && (e.toolStatus === "completed" || e.toolStatus === "failed"));
+    if (!hasAgentResponse && !hasCompletedTools) return true;
+    return false;
+  }, [sessionId, sessionEnded, transcriptEntries, sendingSessionId]);
+
+  // Extract latest token usage from events
+  const tokenUsage = useMemo(() => {
+    let latest: { used: number; size: number; cost?: number } | null = null;
+    for (const event of events) {
+      const payload = event.payload as Record<string, unknown>;
+      const method = typeof payload.method === "string" ? payload.method : null;
+      if (event.sender === "agent" && method === "session/update") {
+        const params = payload.params as Record<string, unknown> | undefined;
+        const update = params?.update as Record<string, unknown> | undefined;
+        if (update?.sessionUpdate === "usage_update") {
+          latest = {
+            used: (update.used as number) ?? 0,
+            size: (update.size as number) ?? 0,
+            cost: (update.cost as { total?: number })?.total,
+          };
+        }
+      }
+    }
+    return latest;
+  }, [events]);
 
   // Extract modes and models from configOptions
   const modesByAgent = useMemo(() => {
@@ -1030,6 +1531,83 @@ export default function App() {
     return result;
   }, [agents]);
 
+  const currentSessionModelId = useMemo(() => {
+    let latestModelId: string | null = null;
+
+    for (const event of events) {
+      const payload = event.payload as Record<string, unknown>;
+      const method = typeof payload.method === "string" ? payload.method : null;
+      const params = payload.params as Record<string, unknown> | undefined;
+
+      if (event.sender === "agent" && method === "session/update") {
+        const update = params?.update as Record<string, unknown> | undefined;
+        if (update?.sessionUpdate !== "config_option_update") continue;
+
+        const category = (update.category as string | undefined) ?? ((update.option as Record<string, unknown> | undefined)?.category as string | undefined);
+        if (category && category !== "model") continue;
+
+        const optionId =
+          (update.optionId as string | undefined) ??
+          (update.configOptionId as string | undefined) ??
+          ((update.option as Record<string, unknown> | undefined)?.id as string | undefined);
+        const seemsModelOption = !optionId || optionId.toLowerCase().includes("model");
+        if (!seemsModelOption) continue;
+
+        const candidate =
+          (update.value as string | undefined) ??
+          (update.currentValue as string | undefined) ??
+          (update.selectedValue as string | undefined) ??
+          (update.modelId as string | undefined);
+        if (candidate) {
+          latestModelId = candidate;
+        }
+        continue;
+      }
+
+      // Capture explicit client-side model changes; these are persisted and survive refresh.
+      if (event.sender === "client" && method === "unstable/set_session_model") {
+        const candidate = params?.modelId as string | undefined;
+        if (candidate) {
+          latestModelId = candidate;
+        }
+        continue;
+      }
+
+      if (event.sender === "client" && method === "session/set_config_option") {
+        const category = params?.category as string | undefined;
+        const optionId = params?.optionId as string | undefined;
+        const seemsModelOption = category === "model" || (typeof optionId === "string" && optionId.toLowerCase().includes("model"));
+        if (!seemsModelOption) continue;
+        const candidate = (params?.value as string | undefined) ?? (params?.currentValue as string | undefined) ?? (params?.modelId as string | undefined);
+        if (candidate) {
+          latestModelId = candidate;
+        }
+      }
+    }
+
+    return latestModelId;
+  }, [events]);
+
+  const modelPillLabel = useMemo(() => {
+    const sessionModelId =
+      currentSessionModelId ?? (sessionId ? sessionModelById[sessionId] : undefined) ?? (sessionId ? defaultModelByAgent[agentId] : undefined);
+    if (!sessionModelId) return null;
+    return sessionModelId;
+  }, [agentId, currentSessionModelId, defaultModelByAgent, sessionId, sessionModelById]);
+
+  useEffect(() => {
+    if (!sessionId || !currentSessionModelId) return;
+    setSessionModelById((prev) => (prev[sessionId] === currentSessionModelId ? prev : { ...prev, [sessionId]: currentSessionModelId }));
+  }, [currentSessionModelId, sessionId]);
+
+  useEffect(() => {
+    try {
+      window.localStorage.setItem(SESSION_MODELS_KEY, JSON.stringify(sessionModelById));
+    } catch {
+      // Ignore storage write failures.
+    }
+  }, [sessionModelById]);
+
   const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (event.key === "Enter" && !event.shiftKey) {
       event.preventDefault();
@@ -1040,19 +1618,22 @@ export default function App() {
   const toastStack = (
     <div className="toast-stack" aria-live="assertive" aria-atomic="false">
       {errorToasts.map((toast) => (
-        <div key={toast.id} className="toast error" role="status">
+        <div
+          key={toast.id}
+          className="toast error"
+          role="status"
+          onMouseEnter={() => pauseErrorToastDismiss(toast.id)}
+          onMouseLeave={() => resumeErrorToastDismiss(toast.id)}
+          onFocus={() => pauseErrorToastDismiss(toast.id)}
+          onBlur={() => resumeErrorToastDismiss(toast.id)}
+        >
+          <button type="button" className="toast-close" aria-label="Dismiss error" onClick={() => dismissErrorToast(toast.id)}>
+            ×
+          </button>
           <div className="toast-content">
             <div className="toast-title">Request failed</div>
             <div className="toast-message">{toast.message}</div>
           </div>
-          <button
-            type="button"
-            className="toast-close"
-            aria-label="Dismiss error"
-            onClick={() => dismissErrorToast(toast.id)}
-          >
-            x
-          </button>
         </div>
       ))}
     </div>
@@ -1082,7 +1663,8 @@ export default function App() {
     <div className="app">
       <header className="header">
         <div className="header-left">
-          <img src={logoUrl} alt="Sandbox Agent" className="logo-text" style={{ height: '20px', width: 'auto' }} />
+          <img src={logoUrl} alt="Sandbox Agent" className="logo-text" style={{ height: "20px", width: "auto" }} />
+          <span className="header-endpoint">{endpoint}</span>
         </div>
         <div className="header-right">
           <a className="header-link" href={docsUrl} target="_blank" rel="noreferrer">
@@ -1090,21 +1672,24 @@ export default function App() {
             Docs
           </a>
           <a className="header-link" href={discordUrl} target="_blank" rel="noreferrer">
-            <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z"/></svg>
+            <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
+              <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z" />
+            </svg>
             Discord
           </a>
           <a className="header-link" href={issueTrackerUrl} target="_blank" rel="noreferrer">
-            <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
+            <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
+              <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
+            </svg>
             Issues
           </a>
-          <span className="header-endpoint">{endpoint}</span>
           <button className="button secondary small" onClick={disconnect}>
             Disconnect
           </button>
         </div>
       </header>
 
-      <main className="main-layout">
+      <main className={`main-layout ${debugPanelCollapsed ? "debug-collapsed" : ""}`}>
         <SessionSidebar
           sessions={sessions}
           selectedSessionId={sessionId}
@@ -1112,12 +1697,16 @@ export default function App() {
           onRefresh={fetchSessions}
           onCreateSession={createNewSession}
           onSelectAgent={loadAgentConfig}
-          agents={agents.length ? agents : defaultAgents.map((id) => ({
-            id,
-            installed: false,
-            credentialsAvailable: true,
-            capabilities: {} as AgentInfo["capabilities"],
-          }))}
+          agents={
+            agents.length
+              ? agents
+              : defaultAgents.map((id) => ({
+                  id,
+                  installed: false,
+                  credentialsAvailable: true,
+                  capabilities: {} as AgentInfo["capabilities"],
+                }))
+          }
           agentsLoading={agentsLoading}
           agentsError={agentsError}
           sessionsLoading={sessionsLoading}
@@ -1130,6 +1719,7 @@ export default function App() {
         <ChatPanel
           sessionId={sessionId}
           transcriptEntries={transcriptEntries}
+          isLoadingHistory={historyLoadingSessionId === sessionId}
           sessionError={sessionError}
           message={message}
           onMessageChange={setMessage}
@@ -1137,22 +1727,46 @@ export default function App() {
           onKeyDown={handleKeyDown}
           onCreateSession={createNewSession}
           onSelectAgent={loadAgentConfig}
-          agents={agents.length ? agents : defaultAgents.map((id) => ({
-            id,
-            installed: false,
-            credentialsAvailable: true,
-            capabilities: {} as AgentInfo["capabilities"],
-          }))}
+          agents={
+            agents.length
+              ? agents
+              : defaultAgents.map((id) => ({
+                  id,
+                  installed: false,
+                  credentialsAvailable: true,
+                  capabilities: {} as AgentInfo["capabilities"],
+                }))
+          }
           agentsLoading={agentsLoading}
           agentsError={agentsError}
-          messagesEndRef={messagesEndRef}
+          scrollRef={transcriptScrollRef}
           agentLabel={agentLabel}
+          modelLabel={modelPillLabel}
           currentAgentVersion={currentAgent?.version ?? null}
           sessionEnded={sessionEnded}
+          sessionArchived={sessionArchived}
           onEndSession={endSession}
+          onArchiveSession={() => {
+            if (sessionId) {
+              void archiveSession(sessionId);
+            }
+          }}
+          onUnarchiveSession={() => {
+            if (sessionId) {
+              void unarchiveSession(sessionId);
+            }
+          }}
           modesByAgent={modesByAgent}
           modelsByAgent={modelsByAgent}
           defaultModelByAgent={defaultModelByAgent}
+          onEventClick={(eventId) => {
+            setDebugTab("events");
+            setHighlightedEventId(eventId);
+          }}
+          isThinking={isThinking}
+          agentId={agentId}
+          tokenUsage={tokenUsage}
+          onPermissionReply={handlePermissionReply}
         />
 
         <DebugPanel
@@ -1160,6 +1774,8 @@ export default function App() {
           onDebugTabChange={setDebugTab}
           events={events}
           onResetEvents={() => setEvents([])}
+          highlightedEventId={highlightedEventId}
+          onClearHighlight={() => setHighlightedEventId(null)}
           requestLog={requestLog}
           copiedLogId={copiedLogId}
           onClearRequestLog={() => setRequestLog([])}
@@ -1172,6 +1788,8 @@ export default function App() {
           agentsLoading={agentsLoading}
           agentsError={agentsError}
           getClient={getClient}
+          collapsed={debugPanelCollapsed}
+          onToggleCollapse={() => setDebugPanelCollapsed(!debugPanelCollapsed)}
         />
       </main>
       {toastStack}
diff --git a/frontend/packages/inspector/src/components/ConnectScreen.tsx b/frontend/packages/inspector/src/components/ConnectScreen.tsx
index 1337b4b..08e69a7 100644
--- a/frontend/packages/inspector/src/components/ConnectScreen.tsx
+++ b/frontend/packages/inspector/src/components/ConnectScreen.tsx
@@ -30,7 +30,7 @@ const ConnectScreen = ({
     <div className="app">
       <header className="header">
         <div className="header-left">
-          <img src={logoUrl} alt="Sandbox Agent" className="logo-text" style={{ height: '20px', width: 'auto' }} />
+          <img src={logoUrl} alt="Sandbox Agent" className="logo-text" style={{ height: "20px", width: "auto" }} />
         </div>
         {(docsUrl || discordUrl || reportUrl) && (
           <div className="header-right">
@@ -42,13 +42,17 @@ const ConnectScreen = ({
             )}
             {discordUrl && (
               <a className="header-link" href={discordUrl} target="_blank" rel="noreferrer">
-                <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z"/></svg>
+                <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.095 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z" />
+                </svg>
                 Discord
               </a>
             )}
             {reportUrl && (
               <a className="header-link" href={reportUrl} target="_blank" rel="noreferrer">
-                <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
+                <svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
+                </svg>
                 Issues
               </a>
             )}
@@ -59,7 +63,7 @@ const ConnectScreen = ({
       <main className="landing">
         <div className="landing-container">
           <div className="landing-hero">
-            <img src={logoUrl} alt="Sandbox Agent" style={{ height: '32px', width: 'auto', marginBottom: '20px' }} />
+            <img src={logoUrl} alt="Sandbox Agent" style={{ height: "32px", width: "auto", marginBottom: "20px" }} />
           </div>
 
           <div className="connect-card">
@@ -67,17 +71,15 @@ const ConnectScreen = ({
 
             {connectError && <div className="banner error">{connectError}</div>}
 
-            {isHttpsToHttpConnection(window.location.href, endpoint) &&
-              isLocalNetworkTarget(endpoint) && (
-                <div className="banner warning">
-                  <AlertTriangle size={16} />
-                  <span>
-                    Connecting from HTTPS to a local HTTP server requires{" "}
-                    <strong>local network access</strong> permission. Your browser may prompt you to
-                    allow this connection.
-                  </span>
-                </div>
-              )}
+            {isHttpsToHttpConnection(window.location.href, endpoint) && isLocalNetworkTarget(endpoint) && (
+              <div className="banner warning">
+                <AlertTriangle size={16} />
+                <span>
+                  Connecting from HTTPS to a local HTTP server requires <strong>local network access</strong> permission. Your browser may prompt you to allow
+                  this connection.
+                </span>
+              </div>
+            )}
 
             <label className="field">
               <span className="label">Endpoint</span>
@@ -92,13 +94,7 @@ const ConnectScreen = ({
 
             <label className="field">
               <span className="label">Token (optional)</span>
-              <input
-                className="input"
-                type="password"
-                placeholder="Bearer token"
-                value={token}
-                onChange={(event) => onTokenChange(event.target.value)}
-              />
+              <input className="input" type="password" placeholder="Bearer token" value={token} onChange={(event) => onTokenChange(event.target.value)} />
             </label>
 
             <button className="button primary" onClick={onConnect} disabled={connecting}>
@@ -116,7 +112,11 @@ const ConnectScreen = ({
             </button>
 
             <p className="hint">
-              Having trouble connecting? See the <a href="https://sandboxagent.dev/docs/cors" target="_blank" rel="noreferrer">CORS documentation</a>.
+              Having trouble connecting? See the{" "}
+              <a href="https://sandboxagent.dev/docs/cors" target="_blank" rel="noreferrer">
+                CORS documentation
+              </a>
+              .
             </p>
           </div>
         </div>
diff --git a/frontend/packages/inspector/src/components/SessionCreateMenu.tsx b/frontend/packages/inspector/src/components/SessionCreateMenu.tsx
index b20b0af..221a42b 100644
--- a/frontend/packages/inspector/src/components/SessionCreateMenu.tsx
+++ b/frontend/packages/inspector/src/components/SessionCreateMenu.tsx
@@ -16,7 +16,17 @@ const agentLabels: Record<string, string> = {
   claude: "Claude Code",
   codex: "Codex",
   opencode: "OpenCode",
-  amp: "Amp"
+  amp: "Amp",
+  pi: "Pi",
+  cursor: "Cursor",
+};
+
+const agentLogos: Record<string, string> = {
+  claude: `${import.meta.env.BASE_URL}logos/claude.svg`,
+  codex: `${import.meta.env.BASE_URL}logos/openai.svg`,
+  opencode: `${import.meta.env.BASE_URL}logos/opencode.svg`,
+  amp: `${import.meta.env.BASE_URL}logos/amp.svg`,
+  pi: `${import.meta.env.BASE_URL}logos/pi.svg`,
 };
 
 const SessionCreateMenu = ({
@@ -29,7 +39,7 @@ const SessionCreateMenu = ({
   onCreateSession,
   onSelectAgent,
   open,
-  onClose
+  onClose,
 }: {
   agents: AgentInfo[];
   agentsLoading: boolean;
@@ -37,7 +47,7 @@ const SessionCreateMenu = ({
   modesByAgent: Record<string, AgentModeInfo[]>;
   modelsByAgent: Record<string, AgentModelInfo[]>;
   defaultModelByAgent: Record<string, string>;
-  onCreateSession: (agentId: string, config: SessionConfig) => void;
+  onCreateSession: (agentId: string, config: SessionConfig) => Promise<void>;
   onSelectAgent: (agentId: string) => Promise<void>;
   open: boolean;
   onClose: () => void;
@@ -48,7 +58,7 @@ const SessionCreateMenu = ({
   const [selectedModel, setSelectedModel] = useState("");
   const [customModel, setCustomModel] = useState("");
   const [isCustomModel, setIsCustomModel] = useState(false);
-  const [configLoadDone, setConfigLoadDone] = useState(false);
+  const [creating, setCreating] = useState(false);
 
   // Reset state when menu closes
   useEffect(() => {
@@ -59,18 +69,10 @@ const SessionCreateMenu = ({
       setSelectedModel("");
       setCustomModel("");
       setIsCustomModel(false);
-      setConfigLoadDone(false);
+      setCreating(false);
     }
   }, [open]);
 
-  // Transition to config phase after load completes — deferred via useEffect
-  // so parent props (modelsByAgent) have settled before we render the config form
-  useEffect(() => {
-    if (phase === "loading-config" && configLoadDone) {
-      setPhase("config");
-    }
-  }, [phase, configLoadDone]);
-
   // Auto-select first mode when modes load for selected agent
   useEffect(() => {
     if (!selectedAgent) return;
@@ -80,6 +82,14 @@ const SessionCreateMenu = ({
     }
   }, [modesByAgent, selectedAgent, agentMode]);
 
+  // Agent-specific config should not leak between agent selections.
+  useEffect(() => {
+    setAgentMode("");
+    setSelectedModel("");
+    setCustomModel("");
+    setIsCustomModel(false);
+  }, [selectedAgent]);
+
   // Auto-select default model when agent is selected
   useEffect(() => {
     if (!selectedAgent) return;
@@ -99,21 +109,21 @@ const SessionCreateMenu = ({
 
   const handleAgentClick = (agentId: string) => {
     setSelectedAgent(agentId);
-    setPhase("loading-config");
-    setConfigLoadDone(false);
-    onSelectAgent(agentId).finally(() => {
-      setConfigLoadDone(true);
+    setPhase("config");
+    // Load agent config in background; creation should not block on this call.
+    void onSelectAgent(agentId).catch((error) => {
+      console.error("[SessionCreateMenu] Failed to load agent config:", error);
     });
   };
 
   const handleBack = () => {
+    if (creating) return;
     setPhase("agent");
     setSelectedAgent("");
     setAgentMode("");
     setSelectedModel("");
     setCustomModel("");
     setIsCustomModel(false);
-    setConfigLoadDone(false);
   };
 
   const handleModelSelectChange = (value: string) => {
@@ -129,9 +139,17 @@ const SessionCreateMenu = ({
 
   const resolvedModel = isCustomModel ? customModel : selectedModel;
 
-  const handleCreate = () => {
-    onCreateSession(selectedAgent, { agentMode, model: resolvedModel });
-    onClose();
+  const handleCreate = async () => {
+    if (!selectedAgent) return;
+    setCreating(true);
+    try {
+      await onCreateSession(selectedAgent, { agentMode, model: resolvedModel });
+      onClose();
+    } catch (error) {
+      console.error("[SessionCreateMenu] Failed to create session:", error);
+    } finally {
+      setCreating(false);
+    }
   };
 
   if (phase === "agent") {
@@ -139,46 +157,51 @@ const SessionCreateMenu = ({
       <div className="session-create-menu">
         {agentsLoading && <div className="sidebar-add-status">Loading agents...</div>}
         {agentsError && <div className="sidebar-add-status error">{agentsError}</div>}
-        {!agentsLoading && !agentsError && agents.length === 0 && (
-          <div className="sidebar-add-status">No agents available.</div>
-        )}
-        {!agentsLoading && !agentsError &&
-          agents.map((agent) => (
-            <button
-              key={agent.id}
-              className="sidebar-add-option"
-              onClick={() => handleAgentClick(agent.id)}
-            >
-              <div className="agent-option-left">
-                <span className="agent-option-name">{agentLabels[agent.id] ?? agent.id}</span>
-                {agent.version && <span className="agent-option-version">{agent.version}</span>}
-              </div>
-              <div className="agent-option-badges">
-                {agent.installed && <span className="agent-badge installed">Installed</span>}
-                <ArrowRight size={12} className="agent-option-arrow" />
-              </div>
-            </button>
-          ))}
+        {!agentsLoading && !agentsError && agents.length === 0 && <div className="sidebar-add-status">No agents available.</div>}
+        {!agentsLoading &&
+          !agentsError &&
+          (() => {
+            const codingAgents = agents.filter((a) => a.id !== "mock");
+            const mockAgent = agents.find((a) => a.id === "mock");
+            return (
+              <>
+                {codingAgents.map((agent) => (
+                  <button key={agent.id} className="sidebar-add-option" onClick={() => handleAgentClick(agent.id)}>
+                    <div className="agent-option-left">
+                      {agentLogos[agent.id] && <img src={agentLogos[agent.id]} alt="" className="agent-option-logo" />}
+                      <span className="agent-option-name">{agentLabels[agent.id] ?? agent.id}</span>
+                      {agent.version && <span className="agent-option-version">{agent.version}</span>}
+                    </div>
+                    <div className="agent-option-badges">
+                      {agent.installed && <span className="agent-badge installed">Installed</span>}
+                      <ArrowRight size={12} className="agent-option-arrow" />
+                    </div>
+                  </button>
+                ))}
+                {mockAgent && (
+                  <>
+                    <div className="agent-divider" />
+                    <button className="sidebar-add-option" onClick={() => handleAgentClick(mockAgent.id)}>
+                      <div className="agent-option-left">
+                        <span className="agent-option-name">{agentLabels[mockAgent.id] ?? mockAgent.id}</span>
+                        {mockAgent.version && <span className="agent-option-version">{mockAgent.version}</span>}
+                      </div>
+                      <div className="agent-option-badges">
+                        {mockAgent.installed && <span className="agent-badge installed">Installed</span>}
+                        <ArrowRight size={12} className="agent-option-arrow" />
+                      </div>
+                    </button>
+                  </>
+                )}
+              </>
+            );
+          })()}
       </div>
     );
   }
 
   const agentLabel = agentLabels[selectedAgent] ?? selectedAgent;
 
-  if (phase === "loading-config") {
-    return (
-      <div className="session-create-menu">
-        <div className="session-create-header">
-          <button className="session-create-back" onClick={handleBack} title="Back to agents">
-            <ArrowLeft size={14} />
-          </button>
-          <span className="session-create-agent-name">{agentLabel}</span>
-        </div>
-        <div className="sidebar-add-status">Loading config...</div>
-      </div>
-    );
-  }
-
   // Phase 2: config form
   const activeModes = modesByAgent[selectedAgent] ?? [];
   const activeModels = modelsByAgent[selectedAgent] ?? [];
@@ -205,12 +228,7 @@ const SessionCreateMenu = ({
               autoFocus
             />
           ) : (
-            <select
-              className="setup-select"
-              value={selectedModel}
-              onChange={(e) => handleModelSelectChange(e.target.value)}
-              title="Model"
-            >
+            <select className="setup-select" value={selectedModel} onChange={(e) => handleModelSelectChange(e.target.value)} title="Model">
               {activeModels.map((m) => (
                 <option key={m.id} value={m.id}>
                   {m.name || m.id}
@@ -226,9 +244,7 @@ const SessionCreateMenu = ({
                 setIsCustomModel(false);
                 setCustomModel("");
                 const defaultModel = defaultModelByAgent[selectedAgent];
-                setSelectedModel(
-                  defaultModel || (activeModels.length > 0 ? activeModels[0].id : "")
-                );
+                setSelectedModel(defaultModel || (activeModels.length > 0 ? activeModels[0].id : ""));
               }}
               title="Back to model list"
               type="button"
@@ -240,12 +256,7 @@ const SessionCreateMenu = ({
         {activeModes.length > 0 && (
           <div className="setup-field">
             <span className="setup-label">Mode</span>
-            <select
-              className="setup-select"
-              value={agentMode}
-              onChange={(e) => setAgentMode(e.target.value)}
-              title="Mode"
-            >
+            <select className="setup-select" value={agentMode} onChange={(e) => setAgentMode(e.target.value)} title="Mode">
               {activeModes.map((m) => (
                 <option key={m.id} value={m.id}>
                   {m.name || m.id}
@@ -257,8 +268,8 @@ const SessionCreateMenu = ({
       </div>
 
       <div className="session-create-actions">
-        <button className="button primary" onClick={handleCreate}>
-          Create Session
+        <button className="button primary" onClick={() => void handleCreate()} disabled={creating}>
+          {creating ? "Creating..." : "Create Session"}
         </button>
       </div>
     </div>
diff --git a/frontend/packages/inspector/src/components/SessionSidebar.tsx b/frontend/packages/inspector/src/components/SessionSidebar.tsx
index d45df21..e79ef58 100644
--- a/frontend/packages/inspector/src/components/SessionSidebar.tsx
+++ b/frontend/packages/inspector/src/components/SessionSidebar.tsx
@@ -1,6 +1,7 @@
-import { Plus, RefreshCw } from "lucide-react";
+import { Archive, ArrowLeft, ArrowUpRight, Plus, RefreshCw } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import type { AgentInfo } from "sandbox-agent";
+import { formatShortId } from "../utils/format";
 
 type AgentModeInfo = { id: string; name: string; description: string };
 type AgentModelInfo = { id: string; name?: string };
@@ -10,6 +11,7 @@ type SessionListItem = {
   sessionId: string;
   agent: string;
   ended: boolean;
+  archived: boolean;
 };
 
 const agentLabels: Record<string, string> = {
@@ -18,9 +20,10 @@ const agentLabels: Record<string, string> = {
   opencode: "OpenCode",
   amp: "Amp",
   pi: "Pi",
-  cursor: "Cursor"
+  cursor: "Cursor",
 };
 const persistenceDocsUrl = "https://sandboxagent.dev/docs/session-persistence";
+const MIN_REFRESH_SPIN_MS = 350;
 
 const SessionSidebar = ({
   sessions,
@@ -42,7 +45,7 @@ const SessionSidebar = ({
   selectedSessionId: string;
   onSelectSession: (session: SessionListItem) => void;
   onRefresh: () => void;
-  onCreateSession: (agentId: string, config: SessionConfig) => void;
+  onCreateSession: (agentId: string, config: SessionConfig) => Promise<void>;
   onSelectAgent: (agentId: string) => Promise<void>;
   agents: AgentInfo[];
   agentsLoading: boolean;
@@ -54,7 +57,14 @@ const SessionSidebar = ({
   defaultModelByAgent: Record<string, string>;
 }) => {
   const [showMenu, setShowMenu] = useState(false);
+  const [showArchived, setShowArchived] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
   const menuRef = useRef<HTMLDivElement | null>(null);
+  const archivedCount = sessions.filter((session) => session.archived).length;
+  const activeSessions = sessions.filter((session) => !session.archived);
+  const archivedSessions = sessions.filter((session) => session.archived);
+  const visibleSessions = showArchived ? archivedSessions : activeSessions;
+  const orderedVisibleSessions = showArchived ? [...visibleSessions].sort((a, b) => Number(a.ended) - Number(b.ended)) : visibleSessions;
 
   useEffect(() => {
     if (!showMenu) return;
@@ -68,20 +78,48 @@ const SessionSidebar = ({
     return () => document.removeEventListener("mousedown", handler);
   }, [showMenu]);
 
+  useEffect(() => {
+    // Prevent getting stuck in archived view when there are no archived sessions.
+    if (!showArchived) return;
+    if (archivedSessions.length === 0) {
+      setShowArchived(false);
+    }
+  }, [showArchived, archivedSessions.length]);
+
+  const handleRefresh = async () => {
+    if (refreshing) return;
+    const startedAt = Date.now();
+    setRefreshing(true);
+    try {
+      await Promise.resolve(onRefresh());
+    } finally {
+      const elapsedMs = Date.now() - startedAt;
+      if (elapsedMs < MIN_REFRESH_SPIN_MS) {
+        await new Promise((resolve) => window.setTimeout(resolve, MIN_REFRESH_SPIN_MS - elapsedMs));
+      }
+      setRefreshing(false);
+    }
+  };
+
   return (
     <div className="session-sidebar">
       <div className="sidebar-header">
         <span className="sidebar-title">Sessions</span>
         <div className="sidebar-header-actions">
-          <button className="sidebar-icon-btn" onClick={onRefresh} title="Refresh sessions">
-            <RefreshCw size={14} />
+          {archivedCount > 0 && (
+            <button
+              className={`button secondary small ${showArchived ? "active" : ""}`}
+              onClick={() => setShowArchived((value) => !value)}
+              title={showArchived ? "Hide archived sessions" : `Show archived sessions (${archivedCount})`}
+            >
+              {showArchived ? <ArrowLeft size={12} className="button-icon" /> : <Archive size={12} className="button-icon" />}
+            </button>
+          )}
+          <button className="button secondary small" onClick={() => void handleRefresh()} title="Refresh sessions" disabled={sessionsLoading || refreshing}>
+            <RefreshCw size={12} className={`button-icon ${sessionsLoading || refreshing ? "spinner-icon" : ""}`} />
           </button>
           <div className="sidebar-add-menu-wrapper" ref={menuRef}>
-            <button
-              className="sidebar-add-btn"
-              onClick={() => setShowMenu((value) => !value)}
-              title="New session"
-            >
+            <button className="sidebar-add-btn" onClick={() => setShowMenu((value) => !value)} title="New session">
               <Plus size={14} />
             </button>
             <SessionCreateMenu
@@ -105,30 +143,37 @@ const SessionSidebar = ({
           <div className="sidebar-empty">Loading sessions...</div>
         ) : sessionsError ? (
           <div className="sidebar-empty error">{sessionsError}</div>
-        ) : sessions.length === 0 ? (
-          <div className="sidebar-empty">No sessions yet.</div>
+        ) : visibleSessions.length === 0 ? (
+          <div className="sidebar-empty">{showArchived ? "No archived sessions." : "No sessions yet."}</div>
         ) : (
-          sessions.map((session) => (
-            <button
-              key={session.sessionId}
-              className={`session-item ${session.sessionId === selectedSessionId ? "active" : ""}`}
-              onClick={() => onSelectSession(session)}
-            >
-              <div className="session-item-id">{session.sessionId}</div>
-              <div className="session-item-meta">
-                <span className="session-item-agent">{agentLabels[session.agent] ?? session.agent}</span>
-                {session.ended && <span className="session-item-ended">ended</span>}
+          <>
+            {showArchived && <div className="sidebar-empty">Archived Sessions</div>}
+            {orderedVisibleSessions.map((session) => (
+              <div
+                key={session.sessionId}
+                className={`session-item ${session.sessionId === selectedSessionId ? "active" : ""} ${session.ended ? "ended" : ""} ${session.archived ? "ended" : ""}`}
+              >
+                <button className="session-item-content" onClick={() => onSelectSession(session)}>
+                  <div className="session-item-id" title={session.sessionId}>
+                    {formatShortId(session.sessionId)}
+                  </div>
+                  <div className="session-item-meta">
+                    <span className="session-item-agent">{agentLabels[session.agent] ?? session.agent}</span>
+                    {(session.archived || session.ended) && <span className="session-item-ended">ended</span>}
+                  </div>
+                </button>
               </div>
-            </button>
-          ))
+            ))}
+          </>
         )}
       </div>
       <div className="session-persistence-note">
-        Sessions are persisted in your browser using IndexedDB.{" "}
-        <a href={persistenceDocsUrl} target="_blank" rel="noreferrer">
+        Sessions are persisted in your browser using IndexedDB. These sessions are only from your browser; your SDK sessions are separate. Adding inspector
+        support for SDK soon.{" "}
+        <a href={persistenceDocsUrl} target="_blank" rel="noreferrer" style={{ display: "inline-flex", alignItems: "center", gap: 2 }}>
           Configure persistence
+          <ArrowUpRight size={10} />
         </a>
-        .
       </div>
     </div>
   );
diff --git a/frontend/packages/inspector/src/components/agents/FeatureCoverageBadges.tsx b/frontend/packages/inspector/src/components/agents/FeatureCoverageBadges.tsx
index 3d4e42d..c057b37 100644
--- a/frontend/packages/inspector/src/components/agents/FeatureCoverageBadges.tsx
+++ b/frontend/packages/inspector/src/components/agents/FeatureCoverageBadges.tsx
@@ -17,7 +17,7 @@ import {
   Plug,
   Shield,
   Terminal,
-  Wrench
+  Wrench,
 } from "lucide-react";
 import type { FeatureCoverageView } from "../../types/agents";
 
@@ -39,7 +39,7 @@ const badges = [
   { key: "mcpTools", label: "MCP", icon: Plug },
   { key: "streamingDeltas", label: "Deltas", icon: Activity },
   { key: "itemStarted", label: "Item Start", icon: CircleDot },
-  { key: "variants", label: "Variants", icon: Layers }
+  { key: "variants", label: "Variants", icon: Layers },
 ] as const;
 
 type BadgeItem = (typeof badges)[number];
diff --git a/frontend/packages/inspector/src/components/chat/ChatInput.tsx b/frontend/packages/inspector/src/components/chat/ChatInput.tsx
deleted file mode 100644
index 6f8b2a7..0000000
--- a/frontend/packages/inspector/src/components/chat/ChatInput.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Send } from "lucide-react";
-
-const ChatInput = ({
-  message,
-  onMessageChange,
-  onSendMessage,
-  onKeyDown,
-  placeholder,
-  disabled
-}: {
-  message: string;
-  onMessageChange: (value: string) => void;
-  onSendMessage: () => void;
-  onKeyDown: (event: React.KeyboardEvent<HTMLTextAreaElement>) => void;
-  placeholder: string;
-  disabled: boolean;
-}) => {
-  return (
-    <div className="input-container">
-      <div className="input-wrapper">
-        <textarea
-          value={message}
-          onChange={(event) => onMessageChange(event.target.value)}
-          onKeyDown={onKeyDown}
-          placeholder={placeholder}
-          rows={1}
-          disabled={disabled}
-        />
-        <button className="send-button" onClick={onSendMessage} disabled={disabled || !message.trim()}>
-          <Send />
-        </button>
-      </div>
-    </div>
-  );
-};
-
-export default ChatInput;
diff --git a/frontend/packages/inspector/src/components/chat/ChatMessages.tsx b/frontend/packages/inspector/src/components/chat/ChatMessages.tsx
deleted file mode 100644
index 3c7c2cc..0000000
--- a/frontend/packages/inspector/src/components/chat/ChatMessages.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { getAvatarLabel, getMessageClass } from "./messageUtils";
-import type { TimelineEntry } from "./types";
-import { formatJson } from "../../utils/format";
-
-const ChatMessages = ({
-  entries,
-  sessionError,
-  messagesEndRef
-}: {
-  entries: TimelineEntry[];
-  sessionError: string | null;
-  messagesEndRef: React.RefObject<HTMLDivElement>;
-}) => {
-  return (
-    <div className="messages">
-      {entries.map((entry) => {
-        const messageClass = getMessageClass(entry);
-
-        if (entry.kind === "meta") {
-          return (
-            <div key={entry.id} className={`message ${messageClass}`}>
-              <div className="avatar">{getAvatarLabel(messageClass)}</div>
-              <div className="message-content">
-                <div className="message-meta">
-                  <span>{entry.meta?.title ?? "Status"}</span>
-                </div>
-                {entry.meta?.detail && <div className="part-body">{entry.meta.detail}</div>}
-              </div>
-            </div>
-          );
-        }
-
-        if (entry.kind === "reasoning") {
-          return (
-            <div key={entry.id} className="message assistant">
-              <div className="avatar">AI</div>
-              <div className="message-content">
-                <div className="message-meta">
-                  <span>reasoning - {entry.reasoning?.visibility ?? "public"}</span>
-                </div>
-                <div className="part-body muted">{entry.reasoning?.text ?? ""}</div>
-              </div>
-            </div>
-          );
-        }
-
-        if (entry.kind === "tool") {
-          const isComplete = entry.toolStatus === "completed" || entry.toolStatus === "failed";
-          const isFailed = entry.toolStatus === "failed";
-          return (
-            <div key={entry.id} className={`message tool ${isFailed ? "error" : ""}`}>
-              <div className="avatar">{getAvatarLabel(isFailed ? "error" : "tool")}</div>
-              <div className="message-content">
-                <div className="message-meta">
-                  <span>tool call - {entry.toolName}</span>
-                  {entry.toolStatus && entry.toolStatus !== "completed" && (
-                    <span className={`pill ${isFailed ? "danger" : "accent"}`}>
-                      {entry.toolStatus.replace("_", " ")}
-                    </span>
-                  )}
-                </div>
-                {entry.toolInput && <pre className="code-block">{entry.toolInput}</pre>}
-                {isComplete && entry.toolOutput && (
-                  <div className="part">
-                    <div className="part-title">result</div>
-                    <pre className="code-block">{entry.toolOutput}</pre>
-                  </div>
-                )}
-                {!isComplete && !entry.toolInput && (
-                  <span className="thinking-indicator">
-                    <span className="thinking-dot" />
-                    <span className="thinking-dot" />
-                    <span className="thinking-dot" />
-                  </span>
-                )}
-              </div>
-            </div>
-          );
-        }
-
-        // Message (user or assistant)
-        return (
-          <div key={entry.id} className={`message ${messageClass}`}>
-            <div className="avatar">{getAvatarLabel(messageClass)}</div>
-            <div className="message-content">
-              {entry.text ? (
-                <div className="part-body">{entry.text}</div>
-              ) : (
-                <span className="thinking-indicator">
-                  <span className="thinking-dot" />
-                  <span className="thinking-dot" />
-                  <span className="thinking-dot" />
-                </span>
-              )}
-            </div>
-          </div>
-        );
-      })}
-      {sessionError && <div className="message-error">{sessionError}</div>}
-      <div ref={messagesEndRef} />
-    </div>
-  );
-};
-
-export default ChatMessages;
diff --git a/frontend/packages/inspector/src/components/chat/ChatPanel.tsx b/frontend/packages/inspector/src/components/chat/ChatPanel.tsx
index 9c64889..9203105 100644
--- a/frontend/packages/inspector/src/components/chat/ChatPanel.tsx
+++ b/frontend/packages/inspector/src/components/chat/ChatPanel.tsx
@@ -1,17 +1,35 @@
-import { CheckSquare, MessageSquare, Plus, Square, Terminal } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
+import type { TranscriptEntry } from "@sandbox-agent/react";
+import { AlertTriangle, Archive, CheckSquare, MessageSquare, Plus, Square, Terminal } from "lucide-react";
+import { useEffect, useRef, useState, type RefObject } from "react";
 import type { AgentInfo } from "sandbox-agent";
+import { formatShortId } from "../../utils/format";
 
 type AgentModeInfo = { id: string; name: string; description: string };
 type AgentModelInfo = { id: string; name?: string };
 import SessionCreateMenu, { type SessionConfig } from "../SessionCreateMenu";
-import ChatInput from "./ChatInput";
-import ChatMessages from "./ChatMessages";
-import type { TimelineEntry } from "./types";
+import InspectorConversation from "./InspectorConversation";
+
+const HistoryLoadingSkeleton = () => (
+  <div className="chat-loading-skeleton" aria-hidden>
+    <div className="chat-skeleton-row assistant">
+      <div className="chat-skeleton-bubble w-lg" />
+    </div>
+    <div className="chat-skeleton-row user">
+      <div className="chat-skeleton-bubble w-md" />
+    </div>
+    <div className="chat-skeleton-row assistant">
+      <div className="chat-skeleton-bubble w-xl" />
+    </div>
+    <div className="chat-skeleton-row assistant">
+      <div className="chat-skeleton-bubble w-sm" />
+    </div>
+  </div>
+);
 
 const ChatPanel = ({
   sessionId,
   transcriptEntries,
+  isLoadingHistory,
   sessionError,
   message,
   onMessageChange,
@@ -22,37 +40,57 @@ const ChatPanel = ({
   agents,
   agentsLoading,
   agentsError,
-  messagesEndRef,
+  scrollRef,
   agentLabel,
+  modelLabel,
   currentAgentVersion,
   sessionEnded,
+  sessionArchived,
   onEndSession,
+  onArchiveSession,
+  onUnarchiveSession,
   modesByAgent,
   modelsByAgent,
   defaultModelByAgent,
+  onEventClick,
+  isThinking,
+  agentId,
+  tokenUsage,
+  onPermissionReply,
 }: {
   sessionId: string;
-  transcriptEntries: TimelineEntry[];
+  transcriptEntries: TranscriptEntry[];
+  isLoadingHistory?: boolean;
   sessionError: string | null;
   message: string;
   onMessageChange: (value: string) => void;
   onSendMessage: () => void;
   onKeyDown: (event: React.KeyboardEvent<HTMLTextAreaElement>) => void;
-  onCreateSession: (agentId: string, config: SessionConfig) => void;
+  onCreateSession: (agentId: string, config: SessionConfig) => Promise<void>;
   onSelectAgent: (agentId: string) => Promise<void>;
   agents: AgentInfo[];
   agentsLoading: boolean;
   agentsError: string | null;
-  messagesEndRef: React.RefObject<HTMLDivElement>;
+  scrollRef: RefObject<HTMLDivElement | null>;
   agentLabel: string;
+  modelLabel?: string | null;
   currentAgentVersion?: string | null;
   sessionEnded: boolean;
+  sessionArchived: boolean;
   onEndSession: () => void;
+  onArchiveSession: () => void;
+  onUnarchiveSession: () => void;
   modesByAgent: Record<string, AgentModeInfo[]>;
   modelsByAgent: Record<string, AgentModelInfo[]>;
   defaultModelByAgent: Record<string, string>;
+  onEventClick?: (eventId: string) => void;
+  isThinking?: boolean;
+  agentId?: string;
+  tokenUsage?: { used: number; size: number; cost?: number } | null;
+  onPermissionReply?: (permissionId: string, reply: "once" | "always" | "reject") => void;
 }) => {
   const [showAgentMenu, setShowAgentMenu] = useState(false);
+  const [copiedSessionId, setCopiedSessionId] = useState(false);
   const menuRef = useRef<HTMLDivElement | null>(null);
 
   useEffect(() => {
@@ -67,47 +105,111 @@ const ChatPanel = ({
     return () => document.removeEventListener("mousedown", handler);
   }, [showAgentMenu]);
 
+  const copySessionId = async () => {
+    if (!sessionId) return;
+    const onSuccess = () => {
+      setCopiedSessionId(true);
+      window.setTimeout(() => setCopiedSessionId(false), 1200);
+    };
+    try {
+      if (navigator.clipboard && window.isSecureContext) {
+        await navigator.clipboard.writeText(sessionId);
+        onSuccess();
+        return;
+      }
+    } catch {
+      // Fallback below for older/insecure contexts.
+    }
+
+    const textarea = document.createElement("textarea");
+    textarea.value = sessionId;
+    textarea.style.position = "fixed";
+    textarea.style.opacity = "0";
+    document.body.appendChild(textarea);
+    textarea.select();
+    try {
+      document.execCommand("copy");
+      onSuccess();
+    } finally {
+      document.body.removeChild(textarea);
+    }
+  };
+
+  const handleArchiveSession = () => {
+    if (!sessionId) return;
+    onArchiveSession();
+  };
+
+  const handleUnarchiveSession = () => {
+    if (!sessionId) return;
+    onUnarchiveSession();
+  };
+
   return (
     <div className="chat-panel">
       <div className="panel-header">
         <div className="panel-header-left">
           <MessageSquare className="button-icon" />
-          <span className="panel-title">{sessionId ? "Session" : "No Session"}</span>
-          {sessionId && <span className="session-id-display">{sessionId}</span>}
+          <span className="panel-title">{sessionId ? agentLabel : "No Session"}</span>
+          {sessionId && modelLabel && (
+            <span className="header-meta-pill" title={modelLabel}>
+              {modelLabel}
+            </span>
+          )}
+          {sessionId && currentAgentVersion && <span className="header-meta-pill">v{currentAgentVersion}</span>}
+          {sessionId && (
+            <button
+              type="button"
+              className="session-id-display"
+              title={copiedSessionId ? "Copied" : `${sessionId} (click to copy)`}
+              onClick={() => void copySessionId()}
+            >
+              {copiedSessionId ? "Copied" : formatShortId(sessionId)}
+            </button>
+          )}
         </div>
         <div className="panel-header-right">
-          {sessionId && (
-            sessionEnded ? (
-              <span className="button ghost small" style={{ opacity: 0.5, cursor: "default" }} title="Session ended">
-                <CheckSquare size={12} />
-                Ended
-              </span>
+          {sessionId && tokenUsage && <span className="token-pill">{tokenUsage.used.toLocaleString()} tokens</span>}
+          {sessionId &&
+            (sessionEnded ? (
+              <>
+                <span className="button ghost small session-ended-status" title="Session ended">
+                  <CheckSquare size={12} />
+                  Ended
+                </span>
+                <button
+                  type="button"
+                  className="button ghost small"
+                  onClick={sessionArchived ? handleUnarchiveSession : handleArchiveSession}
+                  title={sessionArchived ? "Unarchive session" : "Archive session"}
+                >
+                  <Archive size={12} />
+                  {sessionArchived ? "Unarchive" : "Archive"}
+                </button>
+              </>
             ) : (
-              <button
-                type="button"
-                className="button ghost small"
-                onClick={onEndSession}
-                title="End session"
-              >
+              <button type="button" className="button ghost small" onClick={onEndSession} title="End session">
                 <Square size={12} />
                 End
               </button>
-            )
-          )}
+            ))}
         </div>
       </div>
 
-      <div className="messages-container">
-        {!sessionId ? (
+      {sessionError && (
+        <div className="error-banner">
+          <AlertTriangle size={14} />
+          <span>{sessionError}</span>
+        </div>
+      )}
+
+      {!sessionId ? (
+        <div className="messages-container">
           <div className="empty-state">
-            <MessageSquare className="empty-state-icon" />
             <div className="empty-state-title">No Session Selected</div>
-            <p className="empty-state-text">Create a new session to start chatting with an agent.</p>
+            <p className="empty-state-text no-session-subtext">Create a new session to start chatting with an agent.</p>
             <div className="empty-state-menu-wrapper" ref={menuRef}>
-              <button
-                className="button primary"
-                onClick={() => setShowAgentMenu((value) => !value)}
-              >
+              <button className="button primary" onClick={() => setShowAgentMenu((value) => !value)}>
                 <Plus className="button-icon" />
                 Create Session
               </button>
@@ -125,43 +227,35 @@ const ChatPanel = ({
               />
             </div>
           </div>
-        ) : transcriptEntries.length === 0 && !sessionError ? (
-          <div className="empty-state">
-            <Terminal className="empty-state-icon" />
-            <div className="empty-state-title">Ready to Chat</div>
-            <p className="empty-state-text">Send a message to start a conversation with the agent.</p>
-          </div>
-        ) : (
-          <ChatMessages
-            entries={transcriptEntries}
-            sessionError={sessionError}
-            messagesEndRef={messagesEndRef}
-          />
-        )}
-      </div>
-
-      <ChatInput
-        message={message}
-        onMessageChange={onMessageChange}
-        onSendMessage={onSendMessage}
-        onKeyDown={onKeyDown}
-        placeholder={sessionId ? "Send a message..." : "Select or create a session first"}
-        disabled={!sessionId}
-      />
-
-      {sessionId && (
-        <div className="session-config-bar">
-          <div className="session-config-field">
-            <span className="session-config-label">Agent</span>
-            <span className="session-config-value">{agentLabel}</span>
-          </div>
-          {currentAgentVersion && (
-            <div className="session-config-field">
-              <span className="session-config-label">Version</span>
-              <span className="session-config-value">{currentAgentVersion}</span>
-            </div>
-          )}
         </div>
+      ) : (
+        <InspectorConversation
+          entries={transcriptEntries}
+          sessionError={sessionError}
+          eventError={null}
+          scrollRef={scrollRef}
+          onEventClick={onEventClick}
+          isThinking={isThinking}
+          agentId={agentId}
+          emptyState={
+            isLoadingHistory ? (
+              <HistoryLoadingSkeleton />
+            ) : (
+              <div className="empty-state">
+                <Terminal className="empty-state-icon" />
+                <div className="empty-state-title">Ready to Chat</div>
+                <p className="empty-state-text">Send a message to start a conversation with the agent.</p>
+              </div>
+            )
+          }
+          message={message}
+          onMessageChange={onMessageChange}
+          onSendMessage={onSendMessage}
+          onKeyDown={onKeyDown}
+          placeholder={sessionEnded ? "Session ended" : "Send a message..."}
+          disabled={sessionEnded}
+          onPermissionReply={onPermissionReply}
+        />
       )}
     </div>
   );
diff --git a/frontend/packages/inspector/src/components/chat/InspectorConversation.tsx b/frontend/packages/inspector/src/components/chat/InspectorConversation.tsx
new file mode 100644
index 0000000..f14e39e
--- /dev/null
+++ b/frontend/packages/inspector/src/components/chat/InspectorConversation.tsx
@@ -0,0 +1,185 @@
+import {
+  AgentConversation,
+  type AgentConversationClassNames,
+  type AgentTranscriptClassNames,
+  type ChatComposerClassNames,
+  type PermissionReply,
+  type TranscriptEntry,
+} from "@sandbox-agent/react";
+import { AlertTriangle, Brain, Check, ChevronDown, ChevronRight, ExternalLink, Info, PlayCircle, Send, Shield, Wrench, X } from "lucide-react";
+import type { ReactNode, RefObject } from "react";
+import MarkdownText from "./MarkdownText";
+
+const agentLogos: Record<string, string> = {
+  claude: `${import.meta.env.BASE_URL}logos/claude.svg`,
+  codex: `${import.meta.env.BASE_URL}logos/openai.svg`,
+  opencode: `${import.meta.env.BASE_URL}logos/opencode.svg`,
+  amp: `${import.meta.env.BASE_URL}logos/amp.svg`,
+  pi: `${import.meta.env.BASE_URL}logos/pi.svg`,
+};
+
+const transcriptClassNames: Partial<AgentTranscriptClassNames> = {
+  root: "messages",
+  divider: "status-divider",
+  dividerLine: "status-divider-line",
+  dividerText: "status-divider-text",
+  message: "message",
+  messageContent: "message-content",
+  error: "message-error",
+  toolGroupSingle: "tool-group-single",
+  toolGroupContainer: "tool-group-container",
+  toolGroupHeader: "tool-group-header",
+  toolGroupIcon: "tool-group-icon",
+  toolGroupLabel: "tool-group-label",
+  toolGroupChevron: "tool-group-chevron",
+  toolGroupBody: "tool-group",
+  toolItem: "tool-item",
+  toolItemConnector: "tool-item-connector",
+  toolItemDot: "tool-item-dot",
+  toolItemLine: "tool-item-line",
+  toolItemContent: "tool-item-content",
+  toolItemHeader: "tool-item-header",
+  toolItemIcon: "tool-item-icon",
+  toolItemLabel: "tool-item-label",
+  toolItemSpinner: "tool-item-spinner",
+  toolItemLink: "tool-item-link",
+  toolItemChevron: "tool-item-chevron",
+  toolItemBody: "tool-item-body",
+  toolSection: "tool-section",
+  toolSectionTitle: "tool-section-title",
+  toolCode: "tool-code",
+  toolCodeMuted: "muted",
+  permissionPrompt: "permission-prompt",
+  permissionHeader: "permission-header",
+  permissionIcon: "permission-icon",
+  permissionTitle: "permission-title",
+  permissionDescription: "permission-description",
+  permissionActions: "permission-actions",
+  permissionButton: "permission-btn",
+  permissionAutoResolved: "permission-auto-resolved",
+  thinkingRow: "thinking-row",
+  thinkingIndicator: "thinking-indicator",
+};
+
+const conversationClassNames: Partial<AgentConversationClassNames> = {
+  root: "chat-conversation",
+  transcript: "messages-container",
+};
+
+const composerClassNames: Partial<ChatComposerClassNames> = {
+  root: "input-container",
+  form: "input-wrapper",
+  submit: "send-button",
+};
+
+const ThinkingDots = () => (
+  <>
+    <span className="thinking-dot" />
+    <span className="thinking-dot" />
+    <span className="thinking-dot" />
+  </>
+);
+
+export interface InspectorConversationProps {
+  entries: TranscriptEntry[];
+  sessionError: string | null;
+  eventError?: string | null;
+  scrollRef: RefObject<HTMLDivElement | null>;
+  onEventClick?: (eventId: string) => void;
+  isThinking?: boolean;
+  agentId?: string;
+  emptyState?: ReactNode;
+  message: string;
+  onMessageChange: (value: string) => void;
+  onSendMessage: () => void;
+  onKeyDown: (event: React.KeyboardEvent<HTMLTextAreaElement>) => void;
+  placeholder: string;
+  disabled: boolean;
+  onPermissionReply?: (permissionId: string, reply: PermissionReply) => void;
+}
+
+const InspectorConversation = ({
+  entries,
+  sessionError,
+  eventError,
+  scrollRef,
+  onEventClick,
+  isThinking,
+  agentId,
+  emptyState,
+  message,
+  onMessageChange,
+  onSendMessage,
+  onKeyDown,
+  placeholder,
+  disabled,
+  onPermissionReply,
+}: InspectorConversationProps) => {
+  return (
+    <AgentConversation
+      entries={entries}
+      classNames={conversationClassNames}
+      scrollRef={scrollRef}
+      emptyState={emptyState}
+      transcriptClassNames={transcriptClassNames}
+      transcriptProps={{
+        sessionError,
+        eventError,
+        virtualize: true,
+        onEventClick,
+        isThinking,
+        agentId,
+        canOpenEvent: (entry) => !(entry.kind === "meta" && entry.meta?.title === "Available commands update"),
+        renderMessageText: (entry) => <MarkdownText text={entry.text ?? ""} />,
+        renderInlinePendingIndicator: () => <ThinkingDots />,
+        renderToolItemIcon: (entry) => {
+          if (entry.kind === "tool") {
+            return <Wrench size={12} />;
+          }
+          if (entry.kind === "reasoning") {
+            return <Brain size={12} />;
+          }
+          return entry.meta?.severity === "error" ? <AlertTriangle size={12} /> : <Info size={12} />;
+        },
+        renderToolGroupIcon: () => <PlayCircle size={14} />,
+        renderChevron: (expanded) => (expanded ? <ChevronDown size={12} /> : <ChevronRight size={12} />),
+        renderEventLinkContent: () => <ExternalLink size={10} />,
+        onPermissionReply,
+        renderPermissionIcon: () => <Shield size={14} />,
+        renderPermissionOptionContent: ({ option, label, selected }) => (
+          <>
+            {selected ? option.kind.startsWith("allow") ? <Check size={12} /> : <X size={12} /> : null}
+            {label}
+          </>
+        ),
+        renderThinkingState: ({ agentId: activeAgentId }) => (
+          <div className="thinking-row">
+            <div className="thinking-avatar">
+              {activeAgentId && agentLogos[activeAgentId] ? (
+                <img src={agentLogos[activeAgentId]} alt="" className="thinking-avatar-img" />
+              ) : (
+                <span className="ai-label">AI</span>
+              )}
+            </div>
+            <span className="thinking-indicator">
+              <ThinkingDots />
+            </span>
+          </div>
+        ),
+      }}
+      composerClassNames={composerClassNames}
+      composerProps={{
+        message,
+        onMessageChange,
+        onSubmit: onSendMessage,
+        onKeyDown,
+        placeholder,
+        disabled,
+        submitLabel: "Send",
+        renderSubmitContent: () => <Send />,
+      }}
+    />
+  );
+};
+
+export default InspectorConversation;
diff --git a/frontend/packages/inspector/src/components/chat/MarkdownText.tsx b/frontend/packages/inspector/src/components/chat/MarkdownText.tsx
new file mode 100644
index 0000000..d850fe2
--- /dev/null
+++ b/frontend/packages/inspector/src/components/chat/MarkdownText.tsx
@@ -0,0 +1,206 @@
+import type { ReactNode } from "react";
+
+const SAFE_URL_RE = /^(https?:\/\/|mailto:)/i;
+
+const isSafeUrl = (url: string): boolean => SAFE_URL_RE.test(url.trim());
+
+const inlineTokenRe = /(`[^`\n]+`|\[[^\]\n]+\]\(([^)\s]+)(?:\s+"[^"]*")?\)|\*\*[^*\n]+\*\*|__[^_\n]+__|\*[^*\n]+\*|_[^_\n]+_|~~[^~\n]+~~)/g;
+
+const parseInline = (text: string, keyPrefix: string): ReactNode[] => {
+  const out: ReactNode[] = [];
+  let lastIndex = 0;
+  let tokenIndex = 0;
+
+  for (const match of text.matchAll(inlineTokenRe)) {
+    const token = match[0];
+    const idx = match.index ?? 0;
+
+    if (idx > lastIndex) {
+      out.push(text.slice(lastIndex, idx));
+    }
+
+    const key = `${keyPrefix}-t-${tokenIndex++}`;
+
+    if (token.startsWith("`") && token.endsWith("`")) {
+      out.push(<code key={key}>{token.slice(1, -1)}</code>);
+    } else if (token.startsWith("**") && token.endsWith("**")) {
+      out.push(<strong key={key}>{token.slice(2, -2)}</strong>);
+    } else if (token.startsWith("__") && token.endsWith("__")) {
+      out.push(<strong key={key}>{token.slice(2, -2)}</strong>);
+    } else if (token.startsWith("*") && token.endsWith("*")) {
+      out.push(<em key={key}>{token.slice(1, -1)}</em>);
+    } else if (token.startsWith("_") && token.endsWith("_")) {
+      out.push(<em key={key}>{token.slice(1, -1)}</em>);
+    } else if (token.startsWith("~~") && token.endsWith("~~")) {
+      out.push(<del key={key}>{token.slice(2, -2)}</del>);
+    } else if (token.startsWith("[") && token.includes("](") && token.endsWith(")")) {
+      const linkMatch = token.match(/^\[([^\]]+)\]\(([^)\s]+)(?:\s+"[^"]*")?\)$/);
+      if (!linkMatch) {
+        out.push(token);
+      } else {
+        const label = linkMatch[1];
+        const href = linkMatch[2];
+        if (isSafeUrl(href)) {
+          out.push(
+            <a key={key} href={href} target="_blank" rel="noreferrer">
+              {label}
+            </a>,
+          );
+        } else {
+          out.push(label);
+        }
+      }
+    } else {
+      out.push(token);
+    }
+
+    lastIndex = idx + token.length;
+  }
+
+  if (lastIndex < text.length) {
+    out.push(text.slice(lastIndex));
+  }
+
+  return out;
+};
+
+const renderInlineLines = (text: string, keyPrefix: string): ReactNode[] => {
+  const lines = text.split("\n");
+  const out: ReactNode[] = [];
+  lines.forEach((line, idx) => {
+    if (idx > 0) out.push(<br key={`${keyPrefix}-br-${idx}`} />);
+    out.push(...parseInline(line, `${keyPrefix}-l-${idx}`));
+  });
+  return out;
+};
+
+const isUnorderedListItem = (line: string): boolean => /^\s*[-*+]\s+/.test(line);
+const isOrderedListItem = (line: string): boolean => /^\s*\d+\.\s+/.test(line);
+
+const MarkdownText = ({ text }: { text: string }) => {
+  const source = text.replace(/\r\n?/g, "\n");
+  const lines = source.split("\n");
+  const nodes: ReactNode[] = [];
+
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    const trimmed = line.trim();
+
+    if (!trimmed) {
+      i += 1;
+      continue;
+    }
+
+    if (trimmed.startsWith("```")) {
+      const lang = trimmed.slice(3).trim();
+      const codeLines: string[] = [];
+      i += 1;
+      while (i < lines.length && !lines[i].trim().startsWith("```")) {
+        codeLines.push(lines[i]);
+        i += 1;
+      }
+      if (i < lines.length && lines[i].trim().startsWith("```")) i += 1;
+      nodes.push(
+        <pre key={`code-${nodes.length}`} className="md-pre">
+          <code className={lang ? `language-${lang}` : undefined}>{codeLines.join("\n")}</code>
+        </pre>,
+      );
+      continue;
+    }
+
+    const headingMatch = trimmed.match(/^(#{1,6})\s+(.+)$/);
+    if (headingMatch) {
+      const level = headingMatch[1].length;
+      const content = headingMatch[2];
+      const key = `h-${nodes.length}`;
+      if (level === 1) nodes.push(<h1 key={key}>{renderInlineLines(content, key)}</h1>);
+      else if (level === 2) nodes.push(<h2 key={key}>{renderInlineLines(content, key)}</h2>);
+      else if (level === 3) nodes.push(<h3 key={key}>{renderInlineLines(content, key)}</h3>);
+      else if (level === 4) nodes.push(<h4 key={key}>{renderInlineLines(content, key)}</h4>);
+      else if (level === 5) nodes.push(<h5 key={key}>{renderInlineLines(content, key)}</h5>);
+      else nodes.push(<h6 key={key}>{renderInlineLines(content, key)}</h6>);
+      i += 1;
+      continue;
+    }
+
+    if (trimmed.startsWith(">")) {
+      const quoteLines: string[] = [];
+      while (i < lines.length && lines[i].trim().startsWith(">")) {
+        quoteLines.push(lines[i].trim().replace(/^>\s?/, ""));
+        i += 1;
+      }
+      const content = quoteLines.join("\n");
+      const key = `q-${nodes.length}`;
+      nodes.push(<blockquote key={key}>{renderInlineLines(content, key)}</blockquote>);
+      continue;
+    }
+
+    if (isUnorderedListItem(line) || isOrderedListItem(line)) {
+      const ordered = isOrderedListItem(line);
+      const items: string[] = [];
+      while (i < lines.length) {
+        const candidate = lines[i];
+        if (ordered && isOrderedListItem(candidate)) {
+          items.push(candidate.replace(/^\s*\d+\.\s+/, ""));
+          i += 1;
+          continue;
+        }
+        if (!ordered && isUnorderedListItem(candidate)) {
+          items.push(candidate.replace(/^\s*[-*+]\s+/, ""));
+          i += 1;
+          continue;
+        }
+        if (!candidate.trim()) {
+          i += 1;
+          break;
+        }
+        break;
+      }
+      const key = `list-${nodes.length}`;
+      if (ordered) {
+        nodes.push(
+          <ol key={key}>
+            {items.map((item, idx) => (
+              <li key={`${key}-i-${idx}`}>{renderInlineLines(item, `${key}-i-${idx}`)}</li>
+            ))}
+          </ol>,
+        );
+      } else {
+        nodes.push(
+          <ul key={key}>
+            {items.map((item, idx) => (
+              <li key={`${key}-i-${idx}`}>{renderInlineLines(item, `${key}-i-${idx}`)}</li>
+            ))}
+          </ul>,
+        );
+      }
+      continue;
+    }
+
+    const paragraphLines: string[] = [];
+    while (i < lines.length) {
+      const current = lines[i];
+      const currentTrimmed = current.trim();
+      if (!currentTrimmed) break;
+      if (
+        currentTrimmed.startsWith("```") ||
+        currentTrimmed.startsWith(">") ||
+        /^(#{1,6})\s+/.test(currentTrimmed) ||
+        isUnorderedListItem(current) ||
+        isOrderedListItem(current)
+      ) {
+        break;
+      }
+      paragraphLines.push(current);
+      i += 1;
+    }
+    const content = paragraphLines.join("\n");
+    const key = `p-${nodes.length}`;
+    nodes.push(<p key={key}>{renderInlineLines(content, key)}</p>);
+  }
+
+  return <div className="markdown-body">{nodes}</div>;
+};
+
+export default MarkdownText;
diff --git a/frontend/packages/inspector/src/components/chat/messageUtils.ts b/frontend/packages/inspector/src/components/chat/messageUtils.ts
deleted file mode 100644
index 6abdb7a..0000000
--- a/frontend/packages/inspector/src/components/chat/messageUtils.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { TimelineEntry } from "./types";
-
-export const getMessageClass = (entry: TimelineEntry) => {
-  if (entry.kind === "tool") return "tool";
-  if (entry.kind === "meta") return entry.meta?.severity === "error" ? "error" : "system";
-  if (entry.kind === "reasoning") return "assistant";
-  if (entry.role === "user") return "user";
-  return "assistant";
-};
-
-export const getAvatarLabel = (messageClass: string) => {
-  if (messageClass === "user") return "U";
-  if (messageClass === "tool") return "T";
-  if (messageClass === "system") return "S";
-  if (messageClass === "error") return "!";
-  return "AI";
-};
diff --git a/frontend/packages/inspector/src/components/chat/types.ts b/frontend/packages/inspector/src/components/chat/types.ts
deleted file mode 100644
index bd41778..0000000
--- a/frontend/packages/inspector/src/components/chat/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export type TimelineEntry = {
-  id: string;
-  kind: "message" | "tool" | "meta" | "reasoning";
-  time: string;
-  // For messages:
-  role?: "user" | "assistant";
-  text?: string;
-  // For tool calls:
-  toolName?: string;
-  toolInput?: string;
-  toolOutput?: string;
-  toolStatus?: string;
-  // For reasoning:
-  reasoning?: { text: string; visibility?: string };
-  // For meta:
-  meta?: { title: string; detail?: string; severity?: "info" | "error" };
-};
diff --git a/frontend/packages/inspector/src/components/debug/AgentsTab.tsx b/frontend/packages/inspector/src/components/debug/AgentsTab.tsx
index 0f23702..755119f 100644
--- a/frontend/packages/inspector/src/components/debug/AgentsTab.tsx
+++ b/frontend/packages/inspector/src/components/debug/AgentsTab.tsx
@@ -5,6 +5,7 @@ import type { AgentInfo } from "sandbox-agent";
 type AgentModeInfo = { id: string; name: string; description: string };
 import FeatureCoverageBadges from "../agents/FeatureCoverageBadges";
 import { emptyFeatureCoverage } from "../../types/agents";
+const MIN_REFRESH_SPIN_MS = 350;
 
 const AgentsTab = ({
   agents,
@@ -13,7 +14,7 @@ const AgentsTab = ({
   onRefresh,
   onInstall,
   loading,
-  error
+  error,
 }: {
   agents: AgentInfo[];
   defaultAgents: string[];
@@ -24,6 +25,7 @@ const AgentsTab = ({
   error: string | null;
 }) => {
   const [installingAgent, setInstallingAgent] = useState<string | null>(null);
+  const [refreshing, setRefreshing] = useState(false);
 
   const handleInstall = async (agentId: string, reinstall: boolean) => {
     setInstallingAgent(agentId);
@@ -34,19 +36,31 @@ const AgentsTab = ({
     }
   };
 
+  const handleRefresh = async () => {
+    if (refreshing) return;
+    const startedAt = Date.now();
+    setRefreshing(true);
+    try {
+      await Promise.resolve(onRefresh());
+    } finally {
+      const elapsedMs = Date.now() - startedAt;
+      if (elapsedMs < MIN_REFRESH_SPIN_MS) {
+        await new Promise((resolve) => window.setTimeout(resolve, MIN_REFRESH_SPIN_MS - elapsedMs));
+      }
+      setRefreshing(false);
+    }
+  };
+
   return (
     <>
       <div className="inline-row" style={{ marginBottom: 16 }}>
-        <button className="button secondary small" onClick={onRefresh} disabled={loading}>
-          <RefreshCw className="button-icon" /> Refresh
+        <button className="button secondary small" onClick={() => void handleRefresh()} disabled={loading || refreshing}>
+          <RefreshCw className={`button-icon ${loading || refreshing ? "spinner-icon" : ""}`} /> Refresh
         </button>
       </div>
 
       {error && <div className="banner error">{error}</div>}
-      {loading && <div className="card-meta">Loading agents...</div>}
-      {!loading && agents.length === 0 && (
-        <div className="card-meta">No agents reported. Click refresh to check.</div>
-      )}
+      {!loading && agents.length === 0 && <div className="card-meta">No agents reported. Click refresh to check.</div>}
 
       {(agents.length
         ? agents
@@ -57,16 +71,15 @@ const AgentsTab = ({
             version: undefined as string | undefined,
             path: undefined as string | undefined,
             capabilities: emptyFeatureCoverage as AgentInfo["capabilities"],
-          }))).map((agent) => {
+          }))
+      ).map((agent) => {
         const isInstalling = installingAgent === agent.id;
         return (
           <div key={agent.id} className="card">
             <div className="card-header">
               <span className="card-title">{agent.id}</span>
               <div className="card-header-pills">
-                <span className={`pill ${agent.installed ? "success" : "danger"}`}>
-                  {agent.installed ? "Installed" : "Missing"}
-                </span>
+                <span className={`pill ${agent.installed ? "success" : "danger"}`}>{agent.installed ? "Installed" : "Missing"}</span>
                 <span className={`pill ${agent.credentialsAvailable ? "success" : "warning"}`}>
                   {agent.credentialsAvailable ? "Authenticated" : "No Credentials"}
                 </span>
@@ -74,7 +87,11 @@ const AgentsTab = ({
             </div>
             <div className="card-meta">
               {agent.version ?? "Version unknown"}
-              {agent.path && <span className="mono muted" style={{ marginLeft: 8 }}>{agent.path}</span>}
+              {agent.path && (
+                <span className="mono muted" style={{ marginLeft: 8 }}>
+                  {agent.path}
+                </span>
+              )}
             </div>
             <div className="card-meta" style={{ marginTop: 8 }}>
               Feature coverage
@@ -88,16 +105,8 @@ const AgentsTab = ({
               </div>
             )}
             <div className="card-actions">
-              <button
-                className="button secondary small"
-                onClick={() => handleInstall(agent.id, agent.installed)}
-                disabled={isInstalling}
-              >
-                {isInstalling ? (
-                  <Loader2 className="button-icon spinner-icon" />
-                ) : (
-                  <Download className="button-icon" />
-                )}
+              <button className="button secondary small" onClick={() => handleInstall(agent.id, agent.installed)} disabled={isInstalling}>
+                {isInstalling ? <Loader2 className="button-icon spinner-icon" /> : <Download className="button-icon" />}
                 {isInstalling ? "Installing..." : agent.installed ? "Reinstall" : "Install"}
               </button>
             </div>
diff --git a/frontend/packages/inspector/src/components/debug/DebugPanel.tsx b/frontend/packages/inspector/src/components/debug/DebugPanel.tsx
index f945355..9855d38 100644
--- a/frontend/packages/inspector/src/components/debug/DebugPanel.tsx
+++ b/frontend/packages/inspector/src/components/debug/DebugPanel.tsx
@@ -1,21 +1,26 @@
-import { Cloud, PlayCircle, Server, Terminal, Wrench } from "lucide-react";
+import { ChevronLeft, ChevronRight, Cloud, Monitor, Play, PlayCircle, Server, Terminal, Wrench } from "lucide-react";
 import type { AgentInfo, SandboxAgent, SessionEvent } from "sandbox-agent";
 
 type AgentModeInfo = { id: string; name: string; description: string };
 import AgentsTab from "./AgentsTab";
 import EventsTab from "./EventsTab";
 import McpTab from "./McpTab";
+import ProcessesTab from "./ProcessesTab";
+import ProcessRunTab from "./ProcessRunTab";
 import SkillsTab from "./SkillsTab";
 import RequestLogTab from "./RequestLogTab";
+import DesktopTab from "./DesktopTab";
 import type { RequestLog } from "../../types/requestLog";
 
-export type DebugTab = "log" | "events" | "agents" | "mcp" | "skills";
+export type DebugTab = "log" | "events" | "agents" | "desktop" | "mcp" | "skills" | "processes" | "run-process";
 
 const DebugPanel = ({
   debugTab,
   onDebugTabChange,
   events,
   onResetEvents,
+  highlightedEventId,
+  onClearHighlight,
   requestLog,
   copiedLogId,
   onClearRequestLog,
@@ -28,11 +33,15 @@ const DebugPanel = ({
   agentsLoading,
   agentsError,
   getClient,
+  collapsed,
+  onToggleCollapse,
 }: {
   debugTab: DebugTab;
   onDebugTabChange: (tab: DebugTab) => void;
   events: SessionEvent[];
   onResetEvents: () => void;
+  highlightedEventId?: string | null;
+  onClearHighlight?: () => void;
   requestLog: RequestLog[];
   copiedLogId: number | null;
   onClearRequestLog: () => void;
@@ -45,10 +54,15 @@ const DebugPanel = ({
   agentsLoading: boolean;
   agentsError: string | null;
   getClient: () => SandboxAgent;
+  collapsed?: boolean;
+  onToggleCollapse?: () => void;
 }) => {
   return (
-    <div className="debug-panel">
+    <div className={`debug-panel ${collapsed ? "collapsed" : ""}`}>
       <div className="debug-tabs">
+        <button className="debug-collapse-btn" onClick={onToggleCollapse} title={collapsed ? "Expand panel" : "Collapse panel"}>
+          {collapsed ? <ChevronLeft size={14} /> : <ChevronRight size={14} />}
+        </button>
         <button className={`debug-tab ${debugTab === "events" ? "active" : ""}`} onClick={() => onDebugTabChange("events")}>
           <PlayCircle className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
           Events
@@ -62,10 +76,22 @@ const DebugPanel = ({
           <Cloud className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
           Agents
         </button>
+        <button className={`debug-tab ${debugTab === "desktop" ? "active" : ""}`} onClick={() => onDebugTabChange("desktop")}>
+          <Monitor className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
+          Desktop
+        </button>
         <button className={`debug-tab ${debugTab === "mcp" ? "active" : ""}`} onClick={() => onDebugTabChange("mcp")}>
           <Server className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
           MCP
         </button>
+        <button className={`debug-tab ${debugTab === "processes" ? "active" : ""}`} onClick={() => onDebugTabChange("processes")}>
+          <Terminal className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
+          Processes
+        </button>
+        <button className={`debug-tab ${debugTab === "run-process" ? "active" : ""}`} onClick={() => onDebugTabChange("run-process")}>
+          <Play className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
+          Run Once
+        </button>
         <button className={`debug-tab ${debugTab === "skills" ? "active" : ""}`} onClick={() => onDebugTabChange("skills")}>
           <Wrench className="button-icon" style={{ marginRight: 4, width: 12, height: 12 }} />
           Skills
@@ -73,20 +99,10 @@ const DebugPanel = ({
       </div>
 
       <div className="debug-content">
-        {debugTab === "log" && (
-          <RequestLogTab
-            requestLog={requestLog}
-            copiedLogId={copiedLogId}
-            onClear={onClearRequestLog}
-            onCopy={onCopyRequestLog}
-          />
-        )}
+        {debugTab === "log" && <RequestLogTab requestLog={requestLog} copiedLogId={copiedLogId} onClear={onClearRequestLog} onCopy={onCopyRequestLog} />}
 
         {debugTab === "events" && (
-          <EventsTab
-            events={events}
-            onClear={onResetEvents}
-          />
+          <EventsTab events={events} onClear={onResetEvents} highlightedEventId={highlightedEventId} onClearHighlight={onClearHighlight} />
         )}
 
         {debugTab === "agents" && (
@@ -101,13 +117,15 @@ const DebugPanel = ({
           />
         )}
 
-        {debugTab === "mcp" && (
-          <McpTab getClient={getClient} />
-        )}
+        {debugTab === "desktop" && <DesktopTab getClient={getClient} />}
 
-        {debugTab === "skills" && (
-          <SkillsTab getClient={getClient} />
-        )}
+        {debugTab === "mcp" && <McpTab getClient={getClient} />}
+
+        {debugTab === "processes" && <ProcessesTab getClient={getClient} />}
+
+        {debugTab === "run-process" && <ProcessRunTab getClient={getClient} />}
+
+        {debugTab === "skills" && <SkillsTab getClient={getClient} />}
       </div>
     </div>
   );
diff --git a/frontend/packages/inspector/src/components/debug/DesktopTab.test.tsx b/frontend/packages/inspector/src/components/debug/DesktopTab.test.tsx
new file mode 100644
index 0000000..e3ce255
--- /dev/null
+++ b/frontend/packages/inspector/src/components/debug/DesktopTab.test.tsx
@@ -0,0 +1,142 @@
+// @vitest-environment jsdom
+
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { SandboxAgent } from "sandbox-agent";
+import {
+  createDockerTestLayout,
+  disposeDockerTestLayout,
+  startDockerSandboxAgent,
+  type DockerSandboxAgentHandle,
+} from "../../../../../../sdks/typescript/tests/helpers/docker.ts";
+import DesktopTab from "./DesktopTab";
+
+type DockerTestLayout = ReturnType<typeof createDockerTestLayout>;
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitFor<T>(fn: () => T | undefined | null, timeoutMs = 20_000, stepMs = 50): Promise<T> {
+  const started = Date.now();
+  while (Date.now() - started < timeoutMs) {
+    const value = fn();
+    if (value !== undefined && value !== null) {
+      return value;
+    }
+    await sleep(stepMs);
+  }
+  throw new Error("timed out waiting for condition");
+}
+
+function findButton(container: HTMLElement, label: string): HTMLButtonElement | undefined {
+  return Array.from(container.querySelectorAll("button")).find((button) => button.textContent?.includes(label)) as HTMLButtonElement | undefined;
+}
+
+describe.sequential("DesktopTab", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+  let layout: DockerTestLayout | undefined;
+  let handle: DockerSandboxAgentHandle | undefined;
+  let client: SandboxAgent | undefined;
+
+  beforeEach(() => {
+    (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => {
+      root.unmount();
+    });
+    if (client) {
+      await client.stopDesktop().catch(() => {});
+      await client.dispose().catch(() => {});
+    }
+    if (handle) {
+      await handle.dispose();
+    }
+    if (layout) {
+      disposeDockerTestLayout(layout);
+    }
+    container.remove();
+    delete (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT;
+    client = undefined;
+    handle = undefined;
+    layout = undefined;
+  });
+
+  async function connectDesktopClient(options?: { pathMode?: "merge" | "replace" }): Promise<SandboxAgent> {
+    layout = createDockerTestLayout();
+    handle = await startDockerSandboxAgent(layout, {
+      timeoutMs: 30_000,
+      pathMode: options?.pathMode,
+      env: options?.pathMode === "replace" ? { PATH: layout.rootDir } : undefined,
+    });
+    client = await SandboxAgent.connect({
+      baseUrl: handle.baseUrl,
+      token: handle.token,
+    });
+    return client;
+  }
+
+  it("renders install remediation when desktop deps are missing", async () => {
+    const connectedClient = await connectDesktopClient({ pathMode: "replace" });
+
+    await act(async () => {
+      root.render(<DesktopTab getClient={() => connectedClient} />);
+    });
+
+    await waitFor(() => {
+      const text = container.textContent ?? "";
+      return text.includes("install_required") ? text : undefined;
+    });
+
+    expect(container.textContent).toContain("install_required");
+    expect(container.textContent).toContain("sandbox-agent install desktop --yes");
+    expect(container.textContent).toContain("Xvfb");
+  });
+
+  it("starts desktop, refreshes screenshot, and stops desktop", async () => {
+    const connectedClient = await connectDesktopClient();
+
+    await act(async () => {
+      root.render(<DesktopTab getClient={() => connectedClient} />);
+    });
+
+    await waitFor(() => {
+      const text = container.textContent ?? "";
+      return text.includes("inactive") ? true : undefined;
+    });
+
+    const startButton = await waitFor(() => findButton(container, "Start Desktop"));
+    await act(async () => {
+      startButton.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    });
+
+    await waitFor(() => {
+      const screenshot = container.querySelector("img[alt='Desktop screenshot']") as HTMLImageElement | null;
+      return screenshot?.src ? screenshot : undefined;
+    });
+
+    const screenshot = container.querySelector("img[alt='Desktop screenshot']") as HTMLImageElement | null;
+    expect(screenshot).toBeTruthy();
+    expect(screenshot?.src.startsWith("blob:") || screenshot?.src.startsWith("data:image/png")).toBe(true);
+    expect(container.textContent).toContain("active");
+
+    const stopButton = await waitFor(() => findButton(container, "Stop Desktop"));
+    await act(async () => {
+      stopButton.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+    });
+
+    await waitFor(() => {
+      const text = container.textContent ?? "";
+      return text.includes("inactive") ? true : undefined;
+    });
+
+    expect(container.textContent).toContain("inactive");
+  });
+});
diff --git a/frontend/packages/inspector/src/components/debug/DesktopTab.tsx b/frontend/packages/inspector/src/components/debug/DesktopTab.tsx
new file mode 100644
index 0000000..dbc2e06
--- /dev/null
+++ b/frontend/packages/inspector/src/components/debug/DesktopTab.tsx
@@ -0,0 +1,1235 @@
+import {
+  AppWindow,
+  Camera,
+  Circle,
+  Clipboard,
+  Download,
+  ExternalLink,
+  Loader2,
+  Monitor,
+  MousePointer,
+  Play,
+  RefreshCw,
+  Square,
+  Trash2,
+  Video,
+} from "lucide-react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { SandboxAgentError } from "sandbox-agent";
+import type { DesktopRecordingInfo, DesktopStatusResponse, DesktopWindowInfo, SandboxAgent } from "sandbox-agent";
+import { DesktopViewer } from "@sandbox-agent/react";
+import type { DesktopViewerClient } from "@sandbox-agent/react";
+const MIN_SPIN_MS = 350;
+type DesktopScreenshotRequest = Parameters<SandboxAgent["takeDesktopScreenshot"]>[0] & {
+  showCursor?: boolean;
+};
+type DesktopStartRequestWithAdvanced = Parameters<SandboxAgent["startDesktop"]>[0] & {
+  streamVideoCodec?: string;
+  streamAudioCodec?: string;
+  streamFrameRate?: number;
+  webrtcPortRange?: string;
+  recordingFps?: number;
+};
+const extractErrorMessage = (error: unknown, fallback: string): string => {
+  if (error instanceof SandboxAgentError && error.problem?.detail) return error.problem.detail;
+  if (error instanceof Error) return error.message;
+  return fallback;
+};
+const formatStartedAt = (value: string | null | undefined): string => {
+  if (!value) return "Not started";
+  const parsed = new Date(value);
+  return Number.isNaN(parsed.getTime()) ? value : parsed.toLocaleString();
+};
+const formatBytes = (bytes: number): string => {
+  if (bytes === 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB"];
+  const i = Math.floor(Math.log(bytes) / Math.log(1024));
+  return `${(bytes / 1024 ** i).toFixed(i > 0 ? 1 : 0)} ${units[i]}`;
+};
+const formatDuration = (start: string, end?: string | null): string => {
+  const startMs = new Date(start).getTime();
+  const endMs = end ? new Date(end).getTime() : Date.now();
+  if (Number.isNaN(startMs) || Number.isNaN(endMs)) return "Unknown";
+  const seconds = Math.round((endMs - startMs) / 1000);
+  if (seconds < 60) return `${seconds}s`;
+  const mins = Math.floor(seconds / 60);
+  const secs = seconds % 60;
+  return `${mins}m ${secs}s`;
+};
+const createScreenshotUrl = async (bytes: Uint8Array, mimeType = "image/png"): Promise<string> => {
+  const payload = new Uint8Array(bytes.byteLength);
+  payload.set(bytes);
+  const blob = new Blob([payload.buffer], { type: mimeType });
+  if (typeof URL.createObjectURL === "function") {
+    return URL.createObjectURL(blob);
+  }
+  return await new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onerror = () => reject(reader.error ?? new Error("Unable to read screenshot blob."));
+    reader.onload = () => {
+      if (typeof reader.result === "string") {
+        resolve(reader.result);
+      } else {
+        reject(new Error("Unable to read screenshot blob."));
+      }
+    };
+    reader.readAsDataURL(blob);
+  });
+};
+const DesktopTab = ({ getClient }: { getClient: () => SandboxAgent }) => {
+  const [status, setStatus] = useState<DesktopStatusResponse | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [acting, setActing] = useState<"start" | "stop" | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [width, setWidth] = useState("1440");
+  const [height, setHeight] = useState("900");
+  const [dpi, setDpi] = useState("96");
+  // Screenshot fallback
+  const [screenshotUrl, setScreenshotUrl] = useState<string | null>(null);
+  const [screenshotLoading, setScreenshotLoading] = useState(false);
+  const [screenshotError, setScreenshotError] = useState<string | null>(null);
+  const [screenshotFormat, setScreenshotFormat] = useState<"png" | "jpeg" | "webp">("png");
+  const [screenshotQuality, setScreenshotQuality] = useState("85");
+  const [screenshotScale, setScreenshotScale] = useState("1.0");
+  const [showCursor, setShowCursor] = useState(false);
+  // Live view
+  const [liveViewActive, setLiveViewActive] = useState(false);
+  const [liveViewError, setLiveViewError] = useState<string | null>(null);
+  const [mousePos, setMousePos] = useState<{ x: number; y: number } | null>(null);
+  const [mousePosLoading, setMousePosLoading] = useState(false);
+  // Memoize the client as a DesktopViewerClient so the reference is stable
+  // across renders and doesn't cause the DesktopViewer effect to re-fire.
+  const viewerClient = useMemo<DesktopViewerClient>(() => {
+    const c = getClient();
+    return {
+      startDesktopStream: () => c.startDesktopStream(),
+      stopDesktopStream: () => c.stopDesktopStream(),
+      connectDesktopStream: (opts?: Parameters<SandboxAgent["connectDesktopStream"]>[0]) => c.connectDesktopStream(opts),
+    };
+  }, [getClient]);
+  // Recording
+  const [recordings, setRecordings] = useState<DesktopRecordingInfo[]>([]);
+  const [recordingLoading, setRecordingLoading] = useState(false);
+  const [recordingActing, setRecordingActing] = useState<"start" | "stop" | null>(null);
+  const [recordingError, setRecordingError] = useState<string | null>(null);
+  const [recordingFps, setRecordingFps] = useState("30");
+  const [deletingRecordingId, setDeletingRecordingId] = useState<string | null>(null);
+  const [downloadingRecordingId, setDownloadingRecordingId] = useState<string | null>(null);
+  const [showAdvancedStart, setShowAdvancedStart] = useState(false);
+  const [streamVideoCodec, setStreamVideoCodec] = useState("vp8");
+  const [streamAudioCodec, setStreamAudioCodec] = useState("opus");
+  const [streamFrameRate, setStreamFrameRate] = useState("30");
+  const [webrtcPortRange, setWebrtcPortRange] = useState("59050-59070");
+  const [defaultRecordingFps, setDefaultRecordingFps] = useState("30");
+  const [clipboardText, setClipboardText] = useState("");
+  const [clipboardSelection, setClipboardSelection] = useState<"clipboard" | "primary">("clipboard");
+  const [clipboardLoading, setClipboardLoading] = useState(false);
+  const [clipboardError, setClipboardError] = useState<string | null>(null);
+  const [clipboardWriteText, setClipboardWriteText] = useState("");
+  const [clipboardWriting, setClipboardWriting] = useState(false);
+  const [windows, setWindows] = useState<DesktopWindowInfo[]>([]);
+  const [windowsLoading, setWindowsLoading] = useState(false);
+  const [windowsError, setWindowsError] = useState<string | null>(null);
+  const [windowActing, setWindowActing] = useState<string | null>(null);
+  const [editingWindow, setEditingWindow] = useState<{ id: string; action: "move" | "resize" } | null>(null);
+  const [editX, setEditX] = useState("");
+  const [editY, setEditY] = useState("");
+  const [editW, setEditW] = useState("");
+  const [editH, setEditH] = useState("");
+  const [launchApp, setLaunchApp] = useState("firefox");
+  const [launchArgs, setLaunchArgs] = useState("");
+  const [launchWait, setLaunchWait] = useState(true);
+  const [launching, setLaunching] = useState(false);
+  const [launchResult, setLaunchResult] = useState<string | null>(null);
+  const [launchError, setLaunchError] = useState<string | null>(null);
+  const [openTarget, setOpenTarget] = useState("");
+  const [opening, setOpening] = useState(false);
+  const [openResult, setOpenResult] = useState<string | null>(null);
+  const [openError, setOpenError] = useState<string | null>(null);
+  // Active recording tracking
+  const activeRecording = useMemo(() => recordings.find((r) => r.status === "recording"), [recordings]);
+  const visibleWindows = useMemo(() => {
+    return windows.filter((win) => {
+      const title = win.title.trim();
+      if (win.isActive) return true;
+      if (!title || title === "Openbox") return false;
+      return win.width >= 120 && win.height >= 80;
+    });
+  }, [windows]);
+  const revokeScreenshotUrl = useCallback(() => {
+    setScreenshotUrl((current) => {
+      if (current?.startsWith("blob:") && typeof URL.revokeObjectURL === "function") {
+        URL.revokeObjectURL(current);
+      }
+      return null;
+    });
+  }, []);
+  const loadStatus = useCallback(
+    async (mode: "initial" | "refresh" = "initial") => {
+      if (mode === "initial") setLoading(true);
+      else setRefreshing(true);
+      setError(null);
+      try {
+        const next = await getClient().getDesktopStatus();
+        setStatus(next);
+        // Status response now includes windows; sync them so we get window
+        // updates for free every time status is polled.
+        if (next.state === "active" && next.windows?.length) {
+          setWindows(next.windows);
+        }
+        return next;
+      } catch (loadError) {
+        setError(extractErrorMessage(loadError, "Unable to load desktop status."));
+        return null;
+      } finally {
+        setLoading(false);
+        setRefreshing(false);
+      }
+    },
+    [getClient],
+  );
+  const refreshScreenshot = useCallback(async () => {
+    setScreenshotLoading(true);
+    setScreenshotError(null);
+    try {
+      const quality = Number.parseInt(screenshotQuality, 10);
+      const scale = Number.parseFloat(screenshotScale);
+      const request: DesktopScreenshotRequest = {
+        format: screenshotFormat !== "png" ? screenshotFormat : undefined,
+        quality: screenshotFormat !== "png" && Number.isFinite(quality) ? quality : undefined,
+        scale: Number.isFinite(scale) && scale !== 1.0 ? scale : undefined,
+        showCursor: showCursor || undefined,
+      };
+      const bytes = await getClient().takeDesktopScreenshot(request);
+      revokeScreenshotUrl();
+      const mimeType = screenshotFormat === "jpeg" ? "image/jpeg" : screenshotFormat === "webp" ? "image/webp" : "image/png";
+      setScreenshotUrl(await createScreenshotUrl(bytes, mimeType));
+    } catch (captureError) {
+      revokeScreenshotUrl();
+      setScreenshotError(extractErrorMessage(captureError, "Unable to capture desktop screenshot."));
+    } finally {
+      setScreenshotLoading(false);
+    }
+  }, [getClient, revokeScreenshotUrl, screenshotFormat, screenshotQuality, screenshotScale, showCursor]);
+  const loadMousePosition = useCallback(async () => {
+    setMousePosLoading(true);
+    try {
+      const pos = await getClient().getDesktopMousePosition();
+      setMousePos({ x: pos.x, y: pos.y });
+    } catch {
+      setMousePos(null);
+    } finally {
+      setMousePosLoading(false);
+    }
+  }, [getClient]);
+  const loadRecordings = useCallback(async () => {
+    setRecordingLoading(true);
+    setRecordingError(null);
+    try {
+      const result = await getClient().listDesktopRecordings();
+      setRecordings(result.recordings);
+    } catch (loadError) {
+      setRecordingError(extractErrorMessage(loadError, "Unable to load recordings."));
+    } finally {
+      setRecordingLoading(false);
+    }
+  }, [getClient]);
+  const loadClipboard = useCallback(async () => {
+    setClipboardLoading(true);
+    setClipboardError(null);
+    try {
+      const result = await getClient().getDesktopClipboard({ selection: clipboardSelection });
+      setClipboardText(result.text);
+    } catch (err) {
+      setClipboardError(extractErrorMessage(err, "Unable to read clipboard."));
+    } finally {
+      setClipboardLoading(false);
+    }
+  }, [clipboardSelection, getClient]);
+  const loadWindows = useCallback(async () => {
+    setWindowsLoading(true);
+    setWindowsError(null);
+    try {
+      const result = await getClient().listDesktopWindows();
+      setWindows(result.windows);
+    } catch (err) {
+      setWindowsError(extractErrorMessage(err, "Unable to list windows."));
+    } finally {
+      setWindowsLoading(false);
+    }
+  }, [getClient]);
+  const handleFocusWindow = async (windowId: string) => {
+    setWindowActing(windowId);
+    try {
+      await getClient().focusDesktopWindow(windowId);
+      await loadWindows();
+    } catch (err) {
+      setWindowsError(extractErrorMessage(err, "Unable to focus window."));
+    } finally {
+      setWindowActing(null);
+    }
+  };
+  const handleMoveWindow = async (windowId: string) => {
+    const x = Number.parseInt(editX, 10);
+    const y = Number.parseInt(editY, 10);
+    if (!Number.isFinite(x) || !Number.isFinite(y)) return;
+    setWindowActing(windowId);
+    try {
+      await getClient().moveDesktopWindow(windowId, { x, y });
+      setEditingWindow(null);
+      await loadWindows();
+    } catch (err) {
+      setWindowsError(extractErrorMessage(err, "Unable to move window."));
+    } finally {
+      setWindowActing(null);
+    }
+  };
+  const handleResizeWindow = async (windowId: string) => {
+    const nextWidth = Number.parseInt(editW, 10);
+    const nextHeight = Number.parseInt(editH, 10);
+    if (!Number.isFinite(nextWidth) || !Number.isFinite(nextHeight) || nextWidth <= 0 || nextHeight <= 0) return;
+    setWindowActing(windowId);
+    try {
+      await getClient().resizeDesktopWindow(windowId, { width: nextWidth, height: nextHeight });
+      setEditingWindow(null);
+      await loadWindows();
+    } catch (err) {
+      setWindowsError(extractErrorMessage(err, "Unable to resize window."));
+    } finally {
+      setWindowActing(null);
+    }
+  };
+  useEffect(() => {
+    void loadStatus();
+  }, [loadStatus]);
+  // Auto-refresh status (and windows via status) every 5 seconds when active
+  useEffect(() => {
+    if (status?.state !== "active") return;
+    const interval = setInterval(() => void loadStatus("refresh"), 5000);
+    return () => clearInterval(interval);
+  }, [status?.state, loadStatus]);
+  useEffect(() => {
+    if (status?.state === "active") {
+      void loadRecordings();
+    } else {
+      revokeScreenshotUrl();
+      setLiveViewActive(false);
+      setMousePos(null);
+      setEditingWindow(null);
+    }
+  }, [status?.state, loadRecordings, revokeScreenshotUrl]);
+  useEffect(() => {
+    return () => revokeScreenshotUrl();
+  }, [revokeScreenshotUrl]);
+  // Poll recording list while a recording is active
+  useEffect(() => {
+    if (!activeRecording) return;
+    const interval = setInterval(() => void loadRecordings(), 3000);
+    return () => clearInterval(interval);
+  }, [activeRecording, loadRecordings]);
+  useEffect(() => {
+    if (status?.state !== "active") {
+      setWindows([]);
+      return;
+    }
+    // Initial load; subsequent updates come from the status auto-refresh.
+    void loadWindows();
+  }, [status?.state, loadWindows]);
+  const handleStart = async () => {
+    const parsedWidth = Number.parseInt(width, 10);
+    const parsedHeight = Number.parseInt(height, 10);
+    const parsedDpi = Number.parseInt(dpi, 10);
+    const parsedFrameRate = Number.parseInt(streamFrameRate, 10);
+    const parsedRecordingFps = Number.parseInt(defaultRecordingFps, 10);
+    setActing("start");
+    setError(null);
+    const startedAt = Date.now();
+    try {
+      const request: DesktopStartRequestWithAdvanced = {
+        width: Number.isFinite(parsedWidth) ? parsedWidth : undefined,
+        height: Number.isFinite(parsedHeight) ? parsedHeight : undefined,
+        dpi: Number.isFinite(parsedDpi) ? parsedDpi : undefined,
+        streamVideoCodec: streamVideoCodec !== "vp8" ? streamVideoCodec : undefined,
+        streamAudioCodec: streamAudioCodec !== "opus" ? streamAudioCodec : undefined,
+        streamFrameRate: Number.isFinite(parsedFrameRate) && parsedFrameRate !== 30 ? parsedFrameRate : undefined,
+        webrtcPortRange: webrtcPortRange !== "59050-59070" ? webrtcPortRange : undefined,
+        recordingFps: Number.isFinite(parsedRecordingFps) && parsedRecordingFps !== 30 ? parsedRecordingFps : undefined,
+      };
+      const next = await getClient().startDesktop(request);
+      setStatus(next);
+    } catch (startError) {
+      setError(extractErrorMessage(startError, "Unable to start desktop runtime."));
+      await loadStatus("refresh");
+    } finally {
+      const elapsedMs = Date.now() - startedAt;
+      if (elapsedMs < MIN_SPIN_MS) {
+        await new Promise((resolve) => window.setTimeout(resolve, MIN_SPIN_MS - elapsedMs));
+      }
+      setActing(null);
+    }
+  };
+  const handleStop = async () => {
+    setActing("stop");
+    setError(null);
+    const startedAt = Date.now();
+    try {
+      const next = await getClient().stopDesktop();
+      setStatus(next);
+      revokeScreenshotUrl();
+      setLiveViewActive(false);
+    } catch (stopError) {
+      setError(extractErrorMessage(stopError, "Unable to stop desktop runtime."));
+      await loadStatus("refresh");
+    } finally {
+      const elapsedMs = Date.now() - startedAt;
+      if (elapsedMs < MIN_SPIN_MS) {
+        await new Promise((resolve) => window.setTimeout(resolve, MIN_SPIN_MS - elapsedMs));
+      }
+      setActing(null);
+    }
+  };
+  const handleWriteClipboard = async () => {
+    setClipboardWriting(true);
+    setClipboardError(null);
+    try {
+      await getClient().setDesktopClipboard({ text: clipboardWriteText, selection: clipboardSelection });
+      setClipboardText(clipboardWriteText);
+    } catch (err) {
+      setClipboardError(extractErrorMessage(err, "Unable to write clipboard."));
+    } finally {
+      setClipboardWriting(false);
+    }
+  };
+  const handleStartRecording = async () => {
+    const fps = Number.parseInt(recordingFps, 10);
+    setRecordingActing("start");
+    setRecordingError(null);
+    try {
+      await getClient().startDesktopRecording({
+        fps: Number.isFinite(fps) && fps > 0 ? fps : undefined,
+      });
+      await loadRecordings();
+    } catch (err) {
+      setRecordingError(extractErrorMessage(err, "Unable to start recording."));
+    } finally {
+      setRecordingActing(null);
+    }
+  };
+  const handleStopRecording = async () => {
+    setRecordingActing("stop");
+    setRecordingError(null);
+    try {
+      await getClient().stopDesktopRecording();
+      await loadRecordings();
+    } catch (err) {
+      setRecordingError(extractErrorMessage(err, "Unable to stop recording."));
+    } finally {
+      setRecordingActing(null);
+    }
+  };
+  const handleDeleteRecording = async (id: string) => {
+    setDeletingRecordingId(id);
+    try {
+      await getClient().deleteDesktopRecording(id);
+      setRecordings((prev) => prev.filter((r) => r.id !== id));
+    } catch (err) {
+      setRecordingError(extractErrorMessage(err, "Unable to delete recording."));
+    } finally {
+      setDeletingRecordingId(null);
+    }
+  };
+  const handleDownloadRecording = async (id: string, fileName: string) => {
+    setDownloadingRecordingId(id);
+    try {
+      const bytes = await getClient().downloadDesktopRecording(id);
+      const blob = new Blob([bytes as BlobPart], { type: "video/mp4" });
+      const url = URL.createObjectURL(blob);
+      const a = document.createElement("a");
+      a.href = url;
+      a.download = fileName;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
+    } catch (err) {
+      setRecordingError(extractErrorMessage(err, "Unable to download recording."));
+    } finally {
+      setDownloadingRecordingId(null);
+    }
+  };
+  const handleLaunchApp = async () => {
+    if (!launchApp.trim()) return;
+    setLaunching(true);
+    setLaunchError(null);
+    setLaunchResult(null);
+    try {
+      const args = launchArgs.trim() ? launchArgs.trim().split(/\s+/) : undefined;
+      const result = await getClient().launchDesktopApp({
+        app: launchApp.trim(),
+        args,
+        wait: launchWait || undefined,
+      });
+      setLaunchResult(`Started ${result.processId}${result.windowId ? ` (window: ${result.windowId})` : ""}`);
+      await loadWindows();
+    } catch (err) {
+      setLaunchError(extractErrorMessage(err, "Unable to launch app."));
+    } finally {
+      setLaunching(false);
+    }
+  };
+  const handleOpenTarget = async () => {
+    if (!openTarget.trim()) return;
+    setOpening(true);
+    setOpenError(null);
+    setOpenResult(null);
+    try {
+      const result = await getClient().openDesktopTarget({ target: openTarget.trim() });
+      setOpenResult(`Opened via ${result.processId}`);
+      await loadWindows();
+    } catch (err) {
+      setOpenError(extractErrorMessage(err, "Unable to open target."));
+    } finally {
+      setOpening(false);
+    }
+  };
+  const canRefreshScreenshot = status?.state === "active";
+  const isActive = status?.state === "active";
+  const resolutionLabel = useMemo(() => {
+    const resolution = status?.resolution;
+    if (!resolution) return "Unknown";
+    const dpiLabel = resolution.dpi ? ` @ ${resolution.dpi} DPI` : "";
+    return `${resolution.width} x ${resolution.height}${dpiLabel}`;
+  }, [status?.resolution]);
+  return (
+    <div className="desktop-panel">
+      <div className="inline-row" style={{ marginBottom: 16 }}>
+        <button className="button secondary small" onClick={() => void loadStatus("refresh")} disabled={loading || refreshing}>
+          <RefreshCw className={`button-icon ${loading || refreshing ? "spinner-icon" : ""}`} />
+          Refresh Status
+        </button>
+        {isActive && !liveViewActive && (
+          <button className="button secondary small" onClick={() => void refreshScreenshot()} disabled={!canRefreshScreenshot || screenshotLoading}>
+            {screenshotLoading ? <Loader2 className="button-icon spinner-icon" /> : <Camera className="button-icon" />}
+            Screenshot
+          </button>
+        )}
+      </div>
+      {isActive && !liveViewActive && (
+        <div className="desktop-screenshot-controls">
+          <div className="desktop-input-group">
+            <label className="label">Format</label>
+            <select
+              className="setup-input mono"
+              value={screenshotFormat}
+              onChange={(event) => setScreenshotFormat(event.target.value as "png" | "jpeg" | "webp")}
+            >
+              <option value="png">PNG</option>
+              <option value="jpeg">JPEG</option>
+              <option value="webp">WebP</option>
+            </select>
+          </div>
+          {screenshotFormat !== "png" && (
+            <div className="desktop-input-group">
+              <label className="label">Quality</label>
+              <input
+                className="setup-input mono"
+                value={screenshotQuality}
+                onChange={(event) => setScreenshotQuality(event.target.value)}
+                inputMode="numeric"
+                style={{ maxWidth: 60 }}
+              />
+            </div>
+          )}
+          <div className="desktop-input-group">
+            <label className="label">Scale</label>
+            <input
+              className="setup-input mono"
+              value={screenshotScale}
+              onChange={(event) => setScreenshotScale(event.target.value)}
+              inputMode="decimal"
+              style={{ maxWidth: 60 }}
+            />
+          </div>
+          <label className="desktop-checkbox-label">
+            <input type="checkbox" checked={showCursor} onChange={(event) => setShowCursor(event.target.checked)} />
+            Show cursor
+          </label>
+        </div>
+      )}
+      {error && <div className="banner error">{error}</div>}
+      {screenshotError && <div className="banner error">{screenshotError}</div>}
+      {/* ========== Runtime Section ========== */}
+      <div className="card">
+        <div className="card-header">
+          <span className="card-title">
+            <Monitor size={14} style={{ marginRight: 6 }} />
+            Desktop Runtime
+          </span>
+          <span
+            className={`pill ${
+              status?.state === "active" ? "success" : status?.state === "install_required" ? "warning" : status?.state === "failed" ? "danger" : ""
+            }`}
+          >
+            {status?.state ?? "unknown"}
+          </span>
+        </div>
+        <div className="desktop-state-grid">
+          <div>
+            <div className="card-meta">Display</div>
+            <div className="mono">{status?.display ?? "Not assigned"}</div>
+          </div>
+          <div>
+            <div className="card-meta">Resolution</div>
+            <div className="mono">{resolutionLabel}</div>
+          </div>
+          <div>
+            <div className="card-meta">Started</div>
+            <div>{formatStartedAt(status?.startedAt)}</div>
+          </div>
+        </div>
+        <div className="desktop-start-controls">
+          <div className="desktop-input-group">
+            <label className="label">Width</label>
+            <input className="setup-input mono" value={width} onChange={(event) => setWidth(event.target.value)} inputMode="numeric" />
+          </div>
+          <div className="desktop-input-group">
+            <label className="label">Height</label>
+            <input className="setup-input mono" value={height} onChange={(event) => setHeight(event.target.value)} inputMode="numeric" />
+          </div>
+          <div className="desktop-input-group">
+            <label className="label">DPI</label>
+            <input className="setup-input mono" value={dpi} onChange={(event) => setDpi(event.target.value)} inputMode="numeric" />
+          </div>
+        </div>
+        <button
+          className="button ghost small"
+          onClick={() => setShowAdvancedStart((value) => !value)}
+          style={{ marginTop: 8, fontSize: 11, padding: "4px 8px" }}
+        >
+          {showAdvancedStart ? "v Advanced" : "> Advanced"}
+        </button>
+        {showAdvancedStart && (
+          <div className="desktop-advanced-grid">
+            <div className="desktop-input-group">
+              <label className="label">Video Codec</label>
+              <select className="setup-input mono" value={streamVideoCodec} onChange={(event) => setStreamVideoCodec(event.target.value)} disabled={isActive}>
+                <option value="vp8">vp8</option>
+                <option value="vp9">vp9</option>
+                <option value="h264">h264</option>
+              </select>
+            </div>
+            <div className="desktop-input-group">
+              <label className="label">Audio Codec</label>
+              <select className="setup-input mono" value={streamAudioCodec} onChange={(event) => setStreamAudioCodec(event.target.value)} disabled={isActive}>
+                <option value="opus">opus</option>
+                <option value="g722">g722</option>
+              </select>
+            </div>
+            <div className="desktop-input-group">
+              <label className="label">Frame Rate</label>
+              <input
+                className="setup-input mono"
+                value={streamFrameRate}
+                onChange={(event) => setStreamFrameRate(event.target.value)}
+                inputMode="numeric"
+                disabled={isActive}
+              />
+            </div>
+            <div className="desktop-input-group">
+              <label className="label">WebRTC Ports</label>
+              <input className="setup-input mono" value={webrtcPortRange} onChange={(event) => setWebrtcPortRange(event.target.value)} disabled={isActive} />
+            </div>
+            <div className="desktop-input-group">
+              <label className="label">Recording FPS</label>
+              <input
+                className="setup-input mono"
+                value={defaultRecordingFps}
+                onChange={(event) => setDefaultRecordingFps(event.target.value)}
+                inputMode="numeric"
+                disabled={isActive}
+              />
+            </div>
+          </div>
+        )}
+        <div className="card-actions">
+          {isActive ? (
+            <button className="button danger small" onClick={() => void handleStop()} disabled={acting === "stop"}>
+              {acting === "stop" ? <Loader2 className="button-icon spinner-icon" /> : <Square className="button-icon" />}
+              Stop Desktop
+            </button>
+          ) : (
+            <button className="button success small" onClick={() => void handleStart()} disabled={acting === "start"}>
+              {acting === "start" ? <Loader2 className="button-icon spinner-icon" /> : <Play className="button-icon" />}
+              Start Desktop
+            </button>
+          )}
+        </div>
+      </div>
+      {/* ========== Missing Dependencies ========== */}
+      {status?.missingDependencies && status.missingDependencies.length > 0 && (
+        <div className="card">
+          <div className="card-header">
+            <span className="card-title">Missing Dependencies</span>
+          </div>
+          <div className="desktop-chip-list">
+            {status.missingDependencies.map((dependency) => (
+              <span key={dependency} className="pill warning">
+                {dependency}
+              </span>
+            ))}
+          </div>
+          {status.installCommand && (
+            <>
+              <div className="card-meta" style={{ marginTop: 12 }}>
+                Install command
+              </div>
+              <div className="mono desktop-command">{status.installCommand}</div>
+            </>
+          )}
+        </div>
+      )}
+      {/* ========== Live View Section ========== */}
+      <div className="card">
+        <div className="card-header">
+          <span className="card-title">
+            <Video size={14} style={{ marginRight: 6 }} />
+            Live View
+          </span>
+          {isActive && (
+            <button
+              className={`button small ${liveViewActive ? "danger" : "success"}`}
+              onClick={(e) => {
+                e.stopPropagation();
+                if (liveViewActive) {
+                  // Stop: close viewer then stop the stream process
+                  setLiveViewActive(false);
+                  void getClient()
+                    .stopDesktopStream()
+                    .catch(() => undefined);
+                } else {
+                  // Start stream first, then show viewer
+                  void getClient()
+                    .startDesktopStream()
+                    .then(() => {
+                      setLiveViewActive(true);
+                    })
+                    .catch(() => undefined);
+                }
+              }}
+              style={{ padding: "4px 10px", fontSize: 11 }}
+            >
+              {liveViewActive ? (
+                <>
+                  <Square size={12} style={{ marginRight: 4 }} />
+                  Stop Stream
+                </>
+              ) : (
+                <>
+                  <Play size={12} style={{ marginRight: 4 }} />
+                  Start Stream
+                </>
+              )}
+            </button>
+          )}
+        </div>
+        {liveViewError && (
+          <div className="banner error" style={{ marginBottom: 8 }}>
+            {liveViewError}
+          </div>
+        )}
+        {!isActive && <div className="desktop-screenshot-empty">Start the desktop runtime to enable live view.</div>}
+        {isActive && liveViewActive && (
+          <>
+            <div className="desktop-stream-hint">
+              <span>Right click to open window</span>
+              {status?.resolution && (
+                <span className="mono" style={{ color: "var(--muted)" }}>
+                  {status.resolution.width}x{status.resolution.height}
+                </span>
+              )}
+            </div>
+            <DesktopViewer
+              client={viewerClient}
+              height={360}
+              showStatusBar={false}
+              style={{
+                border: "1px solid var(--border)",
+                borderRadius: 10,
+                background: "linear-gradient(180deg, rgba(15, 23, 42, 0.92) 0%, rgba(17, 24, 39, 0.98) 100%)",
+                boxShadow: "none",
+              }}
+            />
+          </>
+        )}
+        {isActive && !liveViewActive && (
+          <>
+            {screenshotUrl ? (
+              <div className="desktop-screenshot-frame">
+                <img src={screenshotUrl} alt="Desktop screenshot" className="desktop-screenshot-image" />
+              </div>
+            ) : (
+              <div className="desktop-screenshot-empty">Click "Start Stream" for live desktop view, or use the Screenshot button above.</div>
+            )}
+          </>
+        )}
+        {isActive && (
+          <div className="desktop-mouse-pos">
+            <button
+              className="button ghost small"
+              onClick={() => void loadMousePosition()}
+              disabled={mousePosLoading}
+              style={{ padding: "4px 8px", fontSize: 11 }}
+            >
+              {mousePosLoading ? <Loader2 size={12} className="spinner-icon" /> : <MousePointer size={12} style={{ marginRight: 4 }} />}
+              Position
+            </button>
+            {mousePos && (
+              <span className="mono" style={{ fontSize: 11, color: "var(--muted)" }}>
+                ({mousePos.x}, {mousePos.y})
+              </span>
+            )}
+          </div>
+        )}
+      </div>
+      {isActive && (
+        <div className="card">
+          <div className="card-header">
+            <span className="card-title">
+              <Clipboard size={14} style={{ marginRight: 6 }} />
+              Clipboard
+            </span>
+            <div style={{ display: "flex", gap: 6, alignItems: "center" }}>
+              <select
+                className="setup-input mono"
+                value={clipboardSelection}
+                onChange={(event) => setClipboardSelection(event.target.value as "clipboard" | "primary")}
+                style={{ fontSize: 11, padding: "2px 6px", width: "auto" }}
+              >
+                <option value="clipboard">clipboard</option>
+                <option value="primary">primary</option>
+              </select>
+              <button
+                className="button secondary small"
+                onClick={() => void loadClipboard()}
+                disabled={clipboardLoading}
+                style={{ padding: "4px 8px", fontSize: 11 }}
+              >
+                {clipboardLoading ? <Loader2 size={12} className="spinner-icon" /> : <RefreshCw size={12} />}
+              </button>
+            </div>
+          </div>
+          {clipboardError && (
+            <div className="banner error" style={{ marginBottom: 8 }}>
+              {clipboardError}
+            </div>
+          )}
+          <div className="desktop-clipboard-content">
+            <div className="card-meta">Current contents</div>
+            <pre className="desktop-clipboard-text">
+              {clipboardText ? clipboardText : <span style={{ color: "var(--muted)", fontStyle: "italic" }}>(empty)</span>}
+            </pre>
+          </div>
+          <div style={{ marginTop: 10 }}>
+            <div className="card-meta">Write to clipboard</div>
+            <textarea
+              className="setup-input mono"
+              value={clipboardWriteText}
+              onChange={(event) => setClipboardWriteText(event.target.value)}
+              rows={2}
+              style={{ width: "100%", resize: "vertical", marginTop: 4 }}
+              placeholder="Text to copy..."
+            />
+            <button className="button secondary small" onClick={() => void handleWriteClipboard()} disabled={clipboardWriting} style={{ marginTop: 6 }}>
+              {clipboardWriting ? <Loader2 className="button-icon spinner-icon" /> : null}
+              Update Clipboard
+            </button>
+          </div>
+        </div>
+      )}
+      {isActive && (
+        <div className="card">
+          <div className="card-header">
+            <span className="card-title">
+              <AppWindow size={14} style={{ marginRight: 6 }} />
+              Windows
+            </span>
+            <button
+              className="button secondary small"
+              onClick={() => void loadWindows()}
+              disabled={windowsLoading}
+              style={{ padding: "4px 8px", fontSize: 11 }}
+            >
+              {windowsLoading ? <Loader2 size={12} className="spinner-icon" /> : <RefreshCw size={12} />}
+            </button>
+          </div>
+          {windowsError && (
+            <div className="banner error" style={{ marginBottom: 8 }}>
+              {windowsError}
+            </div>
+          )}
+          {visibleWindows.length > 0 ? (
+            <div className="desktop-process-list">
+              {windows.length !== visibleWindows.length && (
+                <div className="card-meta">
+                  Showing {visibleWindows.length} top-level windows ({windows.length - visibleWindows.length} helper entries hidden)
+                </div>
+              )}
+              {visibleWindows.map((win) => (
+                <div key={win.id} className={`desktop-window-item ${win.isActive ? "desktop-window-focused" : ""}`}>
+                  <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
+                    <div style={{ minWidth: 0 }}>
+                      <strong style={{ fontSize: 12 }}>{win.title || "(untitled)"}</strong>
+                      {win.isActive && (
+                        <span className="pill success" style={{ marginLeft: 8 }}>
+                          focused
+                        </span>
+                      )}
+                      <div className="mono" style={{ fontSize: 11, color: "var(--muted)", marginTop: 2 }}>
+                        id: {win.id}
+                        {" \u00b7 "}
+                        {win.x},{win.y}
+                        {" \u00b7 "}
+                        {win.width}x{win.height}
+                      </div>
+                    </div>
+                    <div style={{ display: "flex", gap: 4, flexShrink: 0 }}>
+                      <button
+                        className="button ghost small"
+                        title="Focus"
+                        onClick={() => void handleFocusWindow(win.id)}
+                        disabled={windowActing === win.id}
+                        style={{ padding: "4px 6px", fontSize: 10 }}
+                      >
+                        Focus
+                      </button>
+                      <button
+                        className="button ghost small"
+                        title="Move"
+                        onClick={() => {
+                          setEditingWindow({ id: win.id, action: "move" });
+                          setEditX(String(win.x));
+                          setEditY(String(win.y));
+                        }}
+                        style={{ padding: "4px 6px", fontSize: 10 }}
+                      >
+                        Move
+                      </button>
+                      <button
+                        className="button ghost small"
+                        title="Resize"
+                        onClick={() => {
+                          setEditingWindow({ id: win.id, action: "resize" });
+                          setEditW(String(win.width));
+                          setEditH(String(win.height));
+                        }}
+                        style={{ padding: "4px 6px", fontSize: 10 }}
+                      >
+                        Resize
+                      </button>
+                    </div>
+                  </div>
+                  {editingWindow?.id === win.id && editingWindow.action === "move" && (
+                    <div className="desktop-window-editor">
+                      <input
+                        className="setup-input mono"
+                        placeholder="x"
+                        value={editX}
+                        onChange={(event) => setEditX(event.target.value)}
+                        style={{ width: 60 }}
+                        inputMode="numeric"
+                      />
+                      <input
+                        className="setup-input mono"
+                        placeholder="y"
+                        value={editY}
+                        onChange={(event) => setEditY(event.target.value)}
+                        style={{ width: 60 }}
+                        inputMode="numeric"
+                      />
+                      <button
+                        className="button success small"
+                        onClick={() => void handleMoveWindow(win.id)}
+                        disabled={windowActing === win.id}
+                        style={{ padding: "4px 8px", fontSize: 10 }}
+                      >
+                        Apply
+                      </button>
+                      <button className="button ghost small" onClick={() => setEditingWindow(null)} style={{ padding: "4px 8px", fontSize: 10 }}>
+                        Cancel
+                      </button>
+                    </div>
+                  )}
+                  {editingWindow?.id === win.id && editingWindow.action === "resize" && (
+                    <div className="desktop-window-editor">
+                      <input
+                        className="setup-input mono"
+                        placeholder="width"
+                        value={editW}
+                        onChange={(event) => setEditW(event.target.value)}
+                        style={{ width: 60 }}
+                        inputMode="numeric"
+                      />
+                      <input
+                        className="setup-input mono"
+                        placeholder="height"
+                        value={editH}
+                        onChange={(event) => setEditH(event.target.value)}
+                        style={{ width: 60 }}
+                        inputMode="numeric"
+                      />
+                      <button
+                        className="button success small"
+                        onClick={() => void handleResizeWindow(win.id)}
+                        disabled={windowActing === win.id}
+                        style={{ padding: "4px 8px", fontSize: 10 }}
+                      >
+                        Apply
+                      </button>
+                      <button className="button ghost small" onClick={() => setEditingWindow(null)} style={{ padding: "4px 8px", fontSize: 10 }}>
+                        Cancel
+                      </button>
+                    </div>
+                  )}
+                </div>
+              ))}
+            </div>
+          ) : (
+            <div className="desktop-screenshot-empty">{windowsLoading ? "Loading..." : "No windows detected. Click refresh to update."}</div>
+          )}
+        </div>
+      )}
+      {isActive && (
+        <div className="card">
+          <div className="card-header">
+            <span className="card-title">
+              <ExternalLink size={14} style={{ marginRight: 6 }} />
+              Launch / Open
+            </span>
+          </div>
+          <div className="card-meta">Launch application</div>
+          <div className="desktop-launch-row">
+            <input
+              className="setup-input mono"
+              placeholder="binary name (e.g. firefox)"
+              value={launchApp}
+              onChange={(event) => setLaunchApp(event.target.value)}
+              style={{ flex: 1 }}
+            />
+            <input
+              className="setup-input mono"
+              placeholder="args (optional)"
+              value={launchArgs}
+              onChange={(event) => setLaunchArgs(event.target.value)}
+              style={{ flex: 1 }}
+            />
+            <label className="desktop-checkbox-label">
+              <input type="checkbox" checked={launchWait} onChange={(event) => setLaunchWait(event.target.checked)} />
+              Wait
+            </label>
+            <button
+              className="button success small"
+              onClick={() => void handleLaunchApp()}
+              disabled={launching || !launchApp.trim()}
+              style={{ padding: "4px 10px", fontSize: 11 }}
+            >
+              {launching ? <Loader2 size={12} className="spinner-icon" /> : <Play size={12} style={{ marginRight: 4 }} />}
+              Launch
+            </button>
+          </div>
+          {launchError && (
+            <div className="banner error" style={{ marginTop: 6 }}>
+              {launchError}
+            </div>
+          )}
+          {launchResult && (
+            <div className="mono" style={{ fontSize: 11, color: "var(--success)", marginTop: 4 }}>
+              {launchResult}
+            </div>
+          )}
+          <div className="card-meta" style={{ marginTop: 14 }}>
+            Open file or URL
+          </div>
+          <div className="desktop-launch-row">
+            <input
+              className="setup-input mono"
+              placeholder="https://example.com or /path/to/file"
+              value={openTarget}
+              onChange={(event) => setOpenTarget(event.target.value)}
+              style={{ flex: 1 }}
+            />
+            <button
+              className="button success small"
+              onClick={() => void handleOpenTarget()}
+              disabled={opening || !openTarget.trim()}
+              style={{ padding: "4px 10px", fontSize: 11 }}
+            >
+              {opening ? <Loader2 size={12} className="spinner-icon" /> : <ExternalLink size={12} style={{ marginRight: 4 }} />}
+              Open
+            </button>
+          </div>
+          {openError && (
+            <div className="banner error" style={{ marginTop: 6 }}>
+              {openError}
+            </div>
+          )}
+          {openResult && (
+            <div className="mono" style={{ fontSize: 11, color: "var(--success)", marginTop: 4 }}>
+              {openResult}
+            </div>
+          )}
+        </div>
+      )}
+      {/* ========== Recording Section ========== */}
+      <div className="card">
+        <div className="card-header">
+          <span className="card-title">
+            <Circle size={14} style={{ marginRight: 6, fill: activeRecording ? "#ff3b30" : "none" }} />
+            Recording
+          </span>
+          {activeRecording && <span className="pill danger">Recording</span>}
+        </div>
+        {recordingError && (
+          <div className="banner error" style={{ marginBottom: 8 }}>
+            {recordingError}
+          </div>
+        )}
+        {!isActive && <div className="desktop-screenshot-empty">Start the desktop runtime to enable recording.</div>}
+        {isActive && (
+          <>
+            <div className="desktop-start-controls" style={{ gridTemplateColumns: "1fr" }}>
+              <div className="desktop-input-group">
+                <label className="label">FPS</label>
+                <input
+                  className="setup-input mono"
+                  value={recordingFps}
+                  onChange={(e) => setRecordingFps(e.target.value)}
+                  inputMode="numeric"
+                  style={{ maxWidth: 80 }}
+                  disabled={!!activeRecording}
+                />
+              </div>
+            </div>
+            <div className="card-actions">
+              {!activeRecording ? (
+                <button className="button danger small" onClick={() => void handleStartRecording()} disabled={recordingActing === "start"}>
+                  {recordingActing === "start" ? (
+                    <Loader2 className="button-icon spinner-icon" />
+                  ) : (
+                    <Circle size={14} className="button-icon" style={{ fill: "#ff3b30" }} />
+                  )}
+                  Start Recording
+                </button>
+              ) : (
+                <button className="button secondary small" onClick={() => void handleStopRecording()} disabled={recordingActing === "stop"}>
+                  {recordingActing === "stop" ? <Loader2 className="button-icon spinner-icon" /> : <Square className="button-icon" />}
+                  Stop Recording
+                </button>
+              )}
+              <button className="button secondary small" onClick={() => void loadRecordings()} disabled={recordingLoading}>
+                <RefreshCw className={`button-icon ${recordingLoading ? "spinner-icon" : ""}`} />
+                Refresh
+              </button>
+            </div>
+            {recordings.length > 0 && (
+              <div className="desktop-process-list" style={{ marginTop: 12 }}>
+                {recordings.map((rec) => (
+                  <div key={rec.id} className="desktop-process-item">
+                    <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
+                      <div>
+                        <strong className="mono" style={{ fontSize: 12 }}>
+                          {rec.fileName}
+                        </strong>
+                        <span
+                          className={`pill ${rec.status === "recording" ? "danger" : rec.status === "completed" ? "success" : "warning"}`}
+                          style={{ marginLeft: 8 }}
+                        >
+                          {rec.status}
+                        </span>
+                      </div>
+                      {rec.status === "completed" && (
+                        <div style={{ display: "flex", gap: 4 }}>
+                          <button
+                            className="button ghost small"
+                            title="Download"
+                            onClick={() => void handleDownloadRecording(rec.id, rec.fileName)}
+                            disabled={downloadingRecordingId === rec.id}
+                            style={{ padding: "4px 6px" }}
+                          >
+                            {downloadingRecordingId === rec.id ? <Loader2 size={14} className="spinner-icon" /> : <Download size={14} />}
+                          </button>
+                          <button
+                            className="button ghost small"
+                            title="Delete"
+                            onClick={() => void handleDeleteRecording(rec.id)}
+                            disabled={deletingRecordingId === rec.id}
+                            style={{ padding: "4px 6px", color: "var(--danger)" }}
+                          >
+                            {deletingRecordingId === rec.id ? <Loader2 size={14} className="spinner-icon" /> : <Trash2 size={14} />}
+                          </button>
+                        </div>
+                      )}
+                    </div>
+                    <div className="mono" style={{ fontSize: 11, color: "var(--muted)", marginTop: 4 }}>
+                      {formatBytes(rec.bytes)}
+                      {" \u00b7 "}
+                      {formatDuration(rec.startedAt, rec.endedAt)}
+                      {" \u00b7 "}
+                      {formatStartedAt(rec.startedAt)}
+                    </div>
+                  </div>
+                ))}
+              </div>
+            )}
+            {recordings.length === 0 && !recordingLoading && (
+              <div className="desktop-screenshot-empty" style={{ marginTop: 8 }}>
+                No recordings yet. Click "Start Recording" to begin.
+              </div>
+            )}
+          </>
+        )}
+      </div>
+      {/* ========== Diagnostics Section ========== */}
+      {(status?.lastError || status?.runtimeLogPath || (status?.processes?.length ?? 0) > 0) && (
+        <div className="card">
+          <div className="card-header">
+            <span className="card-title">Diagnostics</span>
+          </div>
+          {status?.lastError && (
+            <div className="desktop-diagnostic-block">
+              <div className="card-meta">Last error</div>
+              <div className="mono">{status.lastError.code}</div>
+              <div>{status.lastError.message}</div>
+            </div>
+          )}
+          {status?.runtimeLogPath && (
+            <div className="desktop-diagnostic-block">
+              <div className="card-meta">Runtime log</div>
+              <div className="mono">{status.runtimeLogPath}</div>
+            </div>
+          )}
+          {status?.processes && status.processes.length > 0 && (
+            <div className="desktop-diagnostic-block">
+              <div className="card-meta">Processes</div>
+              <div className="desktop-process-list">
+                {status.processes.map((process) => (
+                  <div key={`${process.name}-${process.pid ?? "none"}`} className="desktop-process-item">
+                    <div>
+                      <strong>{process.name}</strong>
+                      <span className={`pill ${process.running ? "success" : "danger"}`} style={{ marginLeft: 8 }}>
+                        {process.running ? "running" : "stopped"}
+                      </span>
+                    </div>
+                    <div className="mono">{process.pid ? `pid ${process.pid}` : "no pid"}</div>
+                    {process.logPath && <div className="mono">{process.logPath}</div>}
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
+export default DesktopTab;
diff --git a/frontend/packages/inspector/src/components/debug/EventsTab.tsx b/frontend/packages/inspector/src/components/debug/EventsTab.tsx
index 1568717..6ba99fc 100644
--- a/frontend/packages/inspector/src/components/debug/EventsTab.tsx
+++ b/frontend/packages/inspector/src/components/debug/EventsTab.tsx
@@ -28,9 +28,9 @@ import {
   Wrench,
   type LucideIcon,
 } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import type { SessionEvent } from "sandbox-agent";
-import { formatJson, formatTime } from "../../utils/format";
+import { formatJson, formatShortId, formatTime } from "../../utils/format";
 
 type EventIconInfo = { Icon: LucideIcon; category: string };
 
@@ -111,9 +111,13 @@ function getEventIcon(method: string, payload: Record<string, unknown>): EventIc
 const EventsTab = ({
   events,
   onClear,
+  highlightedEventId,
+  onClearHighlight,
 }: {
   events: SessionEvent[];
   onClear: () => void;
+  highlightedEventId?: string | null;
+  onClearHighlight?: () => void;
 }) => {
   const [collapsedEvents, setCollapsedEvents] = useState<Record<string, boolean>>({});
   const [copied, setCopied] = useState(false);
@@ -121,12 +125,15 @@ const EventsTab = ({
   const handleCopy = () => {
     const text = JSON.stringify(events, null, 2);
     if (navigator.clipboard && window.isSecureContext) {
-      navigator.clipboard.writeText(text).then(() => {
-        setCopied(true);
-        setTimeout(() => setCopied(false), 2000);
-      }).catch(() => {
-        fallbackCopy(text);
-      });
+      navigator.clipboard
+        .writeText(text)
+        .then(() => {
+          setCopied(true);
+          setTimeout(() => setCopied(false), 2000);
+        })
+        .catch(() => {
+          fallbackCopy(text);
+        });
     } else {
       fallbackCopy(text);
     }
@@ -155,6 +162,25 @@ const EventsTab = ({
     }
   }, [events.length]);
 
+  // Scroll to highlighted event (with delay to ensure DOM is ready after tab switch)
+  useEffect(() => {
+    if (highlightedEventId) {
+      const scrollToEvent = () => {
+        const el = document.getElementById(`event-${highlightedEventId}`);
+        if (el) {
+          el.scrollIntoView({ behavior: "smooth", block: "center" });
+          // Clear highlight after animation
+          setTimeout(() => {
+            onClearHighlight?.();
+          }, 2000);
+        }
+      };
+      // Small delay to ensure tab switch and DOM render completes
+      const timer = setTimeout(scrollToEvent, 100);
+      return () => clearTimeout(timer);
+    }
+  }, [highlightedEventId, onClearHighlight]);
+
   const getMethod = (event: SessionEvent): string => {
     const payload = event.payload as Record<string, unknown>;
     return typeof payload.method === "string" ? payload.method : "(response)";
@@ -165,13 +191,7 @@ const EventsTab = ({
       <div className="inline-row" style={{ marginBottom: 12, justifyContent: "space-between" }}>
         <span className="card-meta">{events.length} events</span>
         <div className="inline-row">
-          <button
-            type="button"
-            className="button ghost small"
-            onClick={handleCopy}
-            disabled={events.length === 0}
-            title="Copy all events as JSON"
-          >
+          <button type="button" className="button ghost small" onClick={handleCopy} disabled={events.length === 0} title="Copy all events as JSON">
             {copied ? "Copied" : "Copy JSON"}
           </button>
           <button className="button ghost small" onClick={onClear}>
@@ -181,9 +201,7 @@ const EventsTab = ({
       </div>
 
       {events.length === 0 ? (
-        <div className="card-meta">
-          No events yet. Create a session and send a message.
-        </div>
+        <div className="card-meta">No events yet. Create a session and send a message.</div>
       ) : (
         <div className="event-list">
           {[...events].reverse().map((event) => {
@@ -192,7 +210,7 @@ const EventsTab = ({
             const toggleCollapsed = () =>
               setCollapsedEvents((prev) => ({
                 ...prev,
-                [eventKey]: !(prev[eventKey] ?? true)
+                [eventKey]: !(prev[eventKey] ?? true),
               }));
             const method = getMethod(event);
             const payload = event.payload as Record<string, unknown>;
@@ -200,32 +218,29 @@ const EventsTab = ({
             const time = formatTime(new Date(event.createdAt).toISOString());
             const senderClass = event.sender === "client" ? "client" : "agent";
 
+            const isHighlighted = highlightedEventId === event.id;
+
             return (
-              <div key={eventKey} className={`event-item ${isCollapsed ? "collapsed" : "expanded"}`}>
-                <button
-                  className="event-summary"
-                  type="button"
-                  onClick={toggleCollapsed}
-                  title={isCollapsed ? "Expand payload" : "Collapse payload"}
-                >
+              <div
+                key={eventKey}
+                id={`event-${event.id}`}
+                className={`event-item ${isCollapsed ? "collapsed" : "expanded"} ${isHighlighted ? "highlighted" : ""}`}
+              >
+                <button className="event-summary" type="button" onClick={toggleCollapsed} title={isCollapsed ? "Expand payload" : "Collapse payload"}>
                   <span className={`event-icon ${category}`}>
                     <Icon size={14} />
                   </span>
                   <div className="event-summary-main">
                     <div className="event-title-row">
                       <span className={`event-type ${category}`}>{method}</span>
-                      <span className={`pill ${senderClass === "client" ? "accent" : "success"}`}>
-                        {event.sender}
-                      </span>
+                      <span className={`pill ${senderClass === "client" ? "accent" : "success"}`}>{event.sender}</span>
                       <span className="event-time">{time}</span>
                     </div>
-                    <div className="event-id">
-                      {event.id}
+                    <div className="event-id" title={event.id}>
+                      {formatShortId(event.id)}
                     </div>
                   </div>
-                  <span className="event-chevron">
-                    {isCollapsed ? <ChevronRight size={16} /> : <ChevronDown size={16} />}
-                  </span>
+                  <span className="event-chevron">{isCollapsed ? <ChevronRight size={16} /> : <ChevronDown size={16} />}</span>
                 </button>
                 {!isCollapsed && <pre className="code-block event-payload">{formatJson(event.payload)}</pre>}
               </div>
diff --git a/frontend/packages/inspector/src/components/debug/McpTab.tsx b/frontend/packages/inspector/src/components/debug/McpTab.tsx
index c6f259c..c6a3c06 100644
--- a/frontend/packages/inspector/src/components/debug/McpTab.tsx
+++ b/frontend/packages/inspector/src/components/debug/McpTab.tsx
@@ -1,4 +1,4 @@
-import { FolderOpen, Loader2, Plus, Trash2 } from "lucide-react";
+import { ChevronDown, ChevronRight, FolderOpen, Loader2, Plus, Trash2 } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
 import type { SandboxAgent } from "sandbox-agent";
 import { formatJson } from "../../utils/format";
@@ -8,15 +8,21 @@ type McpEntry = {
   config: Record<string, unknown>;
 };
 
-const McpTab = ({
-  getClient,
-}: {
-  getClient: () => SandboxAgent;
-}) => {
-  const [directory, setDirectory] = useState("/");
+const MCP_DIRECTORY_STORAGE_KEY = "sandbox-agent-inspector-mcp-directory";
+
+const McpTab = ({ getClient }: { getClient: () => SandboxAgent }) => {
+  const [directory, setDirectory] = useState(() => {
+    if (typeof window === "undefined") return "/";
+    try {
+      return window.localStorage.getItem(MCP_DIRECTORY_STORAGE_KEY) ?? "/";
+    } catch {
+      return "/";
+    }
+  });
   const [entries, setEntries] = useState<McpEntry[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const [collapsedServers, setCollapsedServers] = useState<Record<string, boolean>>({});
 
   // Add/edit form state
   const [editing, setEditing] = useState(false);
@@ -25,33 +31,42 @@ const McpTab = ({
   const [editError, setEditError] = useState<string | null>(null);
   const [saving, setSaving] = useState(false);
 
-  const loadAll = useCallback(async (dir: string) => {
-    setLoading(true);
-    setError(null);
-    try {
-      const configPath = `${dir === "/" ? "" : dir}/.sandbox-agent/config/mcp.json`;
-      const bytes = await getClient().readFsFile({ path: configPath });
-      const text = new TextDecoder().decode(bytes);
-      if (!text.trim()) {
+  const loadAll = useCallback(
+    async (dir: string) => {
+      setLoading(true);
+      setError(null);
+      try {
+        const configPath = `${dir === "/" ? "" : dir}/.sandbox-agent/config/mcp.json`;
+        const bytes = await getClient().readFsFile({ path: configPath });
+        const text = new TextDecoder().decode(bytes);
+        if (!text.trim()) {
+          setEntries([]);
+          return;
+        }
+        const map = JSON.parse(text) as Record<string, Record<string, unknown>>;
+        setEntries(Object.entries(map).map(([name, config]) => ({ name, config })));
+      } catch {
+        // File doesn't exist yet or is empty — that's fine
         setEntries([]);
-        return;
+      } finally {
+        setLoading(false);
       }
-      const map = JSON.parse(text) as Record<string, Record<string, unknown>>;
-      setEntries(
-        Object.entries(map).map(([name, config]) => ({ name, config })),
-      );
-    } catch {
-      // File doesn't exist yet or is empty — that's fine
-      setEntries([]);
-    } finally {
-      setLoading(false);
-    }
-  }, [getClient]);
+    },
+    [getClient],
+  );
 
   useEffect(() => {
     loadAll(directory);
   }, [directory, loadAll]);
 
+  useEffect(() => {
+    try {
+      window.localStorage.setItem(MCP_DIRECTORY_STORAGE_KEY, directory);
+    } catch {
+      // Ignore storage failures.
+    }
+  }, [directory]);
+
   const startAdd = () => {
     setEditing(true);
     setEditName("");
@@ -88,10 +103,7 @@ const McpTab = ({
     setSaving(true);
     setEditError(null);
     try {
-      await getClient().setMcpConfig(
-        { directory, mcpName: name },
-        parsed as Parameters<SandboxAgent["setMcpConfig"]>[1],
-      );
+      await getClient().setMcpConfig({ directory, mcpName: name }, parsed as Parameters<SandboxAgent["setMcpConfig"]>[1]);
       cancelEdit();
       await loadAll(directory);
     } catch (err) {
@@ -141,26 +153,34 @@ const McpTab = ({
       {editing && (
         <div className="card" style={{ marginBottom: 12 }}>
           <div className="card-header">
-            <span className="card-title">
-              {editName ? `Edit: ${editName}` : "Add MCP Server"}
-            </span>
+            <span className="card-title">{editName ? `Edit: ${editName}` : "Add MCP Server"}</span>
           </div>
           <div style={{ marginTop: 8 }}>
             <input
               className="setup-input"
               value={editName}
-              onChange={(e) => { setEditName(e.target.value); setEditError(null); }}
+              onChange={(e) => {
+                setEditName(e.target.value);
+                setEditError(null);
+              }}
               placeholder="server-name"
               style={{ marginBottom: 8, width: "100%", boxSizing: "border-box" }}
             />
             <textarea
               className="setup-input mono"
               value={editJson}
-              onChange={(e) => { setEditJson(e.target.value); setEditError(null); }}
+              onChange={(e) => {
+                setEditJson(e.target.value);
+                setEditError(null);
+              }}
               rows={6}
-              style={{ width: "100%", boxSizing: "border-box", fontFamily: "monospace", fontSize: 11 }}
+              style={{ width: "100%", boxSizing: "border-box", fontFamily: "monospace", fontSize: 11, resize: "vertical" }}
             />
-            {editError && <div className="banner error" style={{ marginTop: 4 }}>{editError}</div>}
+            {editError && (
+              <div className="banner error" style={{ marginTop: 4 }}>
+                {editError}
+              </div>
+            )}
           </div>
           <div className="card-actions">
             <button className="button primary small" onClick={save} disabled={saving}>
@@ -174,35 +194,39 @@ const McpTab = ({
         </div>
       )}
 
-      {entries.length === 0 && !editing && !loading && (
-        <div className="card-meta">
-          No MCP servers configured in this directory.
-        </div>
-      )}
+      {entries.length === 0 && !editing && !loading && <div className="card-meta">No MCP servers configured in this directory.</div>}
 
-      {entries.map((entry) => (
-        <div key={entry.name} className="card" style={{ marginBottom: 8 }}>
-          <div className="card-header">
-            <span className="card-title">{entry.name}</span>
-            <div className="card-header-pills">
-              <span className="pill accent">
-                {(entry.config as { type?: string }).type ?? "unknown"}
-              </span>
-              <button
-                className="button ghost small"
-                onClick={() => remove(entry.name)}
-                title="Remove"
-                style={{ padding: "2px 4px" }}
-              >
-                <Trash2 size={12} />
-              </button>
+      {entries.map((entry) => {
+        const isCollapsed = collapsedServers[entry.name] ?? true;
+        return (
+          <div key={entry.name} className="card" style={{ marginBottom: 8 }}>
+            <div className="card-header">
+              <div className="inline-row" style={{ gap: 6 }}>
+                <button
+                  className="button ghost small"
+                  onClick={() => setCollapsedServers((prev) => ({ ...prev, [entry.name]: !(prev[entry.name] ?? true) }))}
+                  title={isCollapsed ? "Expand" : "Collapse"}
+                  style={{ padding: "2px 4px" }}
+                >
+                  {isCollapsed ? <ChevronRight size={12} /> : <ChevronDown size={12} />}
+                </button>
+                <span className="card-title">{entry.name}</span>
+              </div>
+              <div className="card-header-pills">
+                <span className="pill accent">{(entry.config as { type?: string }).type ?? "unknown"}</span>
+                <button className="button ghost small" onClick={() => remove(entry.name)} title="Remove" style={{ padding: "2px 4px" }}>
+                  <Trash2 size={12} />
+                </button>
+              </div>
             </div>
+            {!isCollapsed && (
+              <pre className="code-block" style={{ marginTop: 4, fontSize: 10 }}>
+                {formatJson(entry.config)}
+              </pre>
+            )}
           </div>
-          <pre className="code-block" style={{ marginTop: 4, fontSize: 10 }}>
-            {formatJson(entry.config)}
-          </pre>
-        </div>
-      ))}
+        );
+      })}
     </>
   );
 };
diff --git a/frontend/packages/inspector/src/components/debug/ProcessRunTab.tsx b/frontend/packages/inspector/src/components/debug/ProcessRunTab.tsx
new file mode 100644
index 0000000..3d1b2a6
--- /dev/null
+++ b/frontend/packages/inspector/src/components/debug/ProcessRunTab.tsx
@@ -0,0 +1,161 @@
+import { ChevronDown, ChevronRight, Loader2, Play } from "lucide-react";
+import { useState } from "react";
+import { SandboxAgentError } from "sandbox-agent";
+import type { ProcessRunResponse, SandboxAgent } from "sandbox-agent";
+
+const parseArgs = (value: string): string[] =>
+  value
+    .split("\n")
+    .map((part) => part.trim())
+    .filter(Boolean);
+
+const ProcessRunTab = ({ getClient }: { getClient: () => SandboxAgent }) => {
+  const [command, setCommand] = useState("");
+  const [argsText, setArgsText] = useState("");
+  const [cwd, setCwd] = useState("");
+  const [timeoutMs, setTimeoutMs] = useState("30000");
+  const [maxOutputBytes, setMaxOutputBytes] = useState("");
+  const [showAdvanced, setShowAdvanced] = useState(false);
+  const [running, setRunning] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [result, setResult] = useState<ProcessRunResponse | null>(null);
+
+  const handleRun = async () => {
+    const trimmedCommand = command.trim();
+    if (!trimmedCommand) {
+      setError("Command is required.");
+      return;
+    }
+
+    setRunning(true);
+    setError(null);
+    try {
+      const response = await getClient().runProcess({
+        command: trimmedCommand,
+        args: parseArgs(argsText),
+        cwd: cwd.trim() || undefined,
+        timeoutMs: timeoutMs.trim() ? Number(timeoutMs) : undefined,
+        maxOutputBytes: maxOutputBytes.trim() ? Number(maxOutputBytes) : undefined,
+      });
+      setResult(response);
+    } catch (runError) {
+      const detail = runError instanceof SandboxAgentError ? runError.problem?.detail : undefined;
+      setError(detail || (runError instanceof Error ? runError.message : "Unable to run process."));
+      setResult(null);
+    } finally {
+      setRunning(false);
+    }
+  };
+
+  return (
+    <div className="process-run-container">
+      <div className="process-run-form">
+        <div className="process-run-row">
+          <div className="process-run-field process-run-field-grow">
+            <label className="label">Command</label>
+            <input
+              className="setup-input mono"
+              value={command}
+              onChange={(event) => {
+                setCommand(event.target.value);
+                setError(null);
+              }}
+              placeholder="ls"
+            />
+          </div>
+          <div className="process-run-field process-run-field-grow">
+            <label className="label">Working Directory</label>
+            <input
+              className="setup-input mono"
+              value={cwd}
+              onChange={(event) => {
+                setCwd(event.target.value);
+                setError(null);
+              }}
+              placeholder="/workspace"
+            />
+          </div>
+        </div>
+
+        <div className="process-run-field">
+          <label className="label">Arguments</label>
+          <textarea
+            className="setup-input mono"
+            rows={2}
+            value={argsText}
+            onChange={(event) => {
+              setArgsText(event.target.value);
+              setError(null);
+            }}
+            placeholder={"One argument per line, e.g.\n-lc"}
+          />
+        </div>
+
+        <button className="process-advanced-toggle" onClick={() => setShowAdvanced((prev) => !prev)} type="button">
+          {showAdvanced ? <ChevronDown size={12} /> : <ChevronRight size={12} />}
+          Advanced
+        </button>
+
+        {showAdvanced && (
+          <div className="process-run-row">
+            <div className="process-run-field process-run-field-grow">
+              <label className="label">Timeout (ms)</label>
+              <input
+                className="setup-input mono"
+                value={timeoutMs}
+                onChange={(event) => {
+                  setTimeoutMs(event.target.value);
+                  setError(null);
+                }}
+                placeholder="30000"
+              />
+            </div>
+            <div className="process-run-field process-run-field-grow">
+              <label className="label">Max Output Bytes</label>
+              <input
+                className="setup-input mono"
+                value={maxOutputBytes}
+                onChange={(event) => {
+                  setMaxOutputBytes(event.target.value);
+                  setError(null);
+                }}
+                placeholder="Default"
+              />
+            </div>
+          </div>
+        )}
+
+        {error ? <div className="banner error">{error}</div> : null}
+
+        <button className="button primary small" onClick={() => void handleRun()} disabled={running} style={{ alignSelf: "flex-start" }}>
+          {running ? <Loader2 className="button-icon spinner-icon" /> : <Play className="button-icon" />}
+          {running ? "Running..." : "Run"}
+        </button>
+      </div>
+
+      {result ? (
+        <div className="process-run-result">
+          <div className="process-run-result-header">
+            <span className={`pill ${result.timedOut ? "warning" : result.exitCode === 0 ? "success" : "danger"}`}>
+              {result.timedOut ? "Timed Out" : `exit ${result.exitCode ?? "?"}`}
+            </span>
+            <span className="card-meta">{result.durationMs}ms</span>
+          </div>
+
+          <div className="process-run-output">
+            <div className="process-run-output-section">
+              <div className="process-run-output-label">stdout{result.stdoutTruncated ? " (truncated)" : ""}</div>
+              <pre className="process-log-block">{result.stdout || "(empty)"}</pre>
+            </div>
+            <div className="process-run-output-section">
+              <div className="process-run-output-label">stderr{result.stderrTruncated ? " (truncated)" : ""}</div>
+              <pre className="process-log-block">{result.stderr || "(empty)"}</pre>
+            </div>
+          </div>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default ProcessRunTab;
diff --git a/frontend/packages/inspector/src/components/debug/ProcessesTab.tsx b/frontend/packages/inspector/src/components/debug/ProcessesTab.tsx
new file mode 100644
index 0000000..55ddf7a
--- /dev/null
+++ b/frontend/packages/inspector/src/components/debug/ProcessesTab.tsx
@@ -0,0 +1,432 @@
+import { ChevronDown, ChevronRight, Loader2, Play, RefreshCw, Skull, SquareTerminal, Trash2 } from "lucide-react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { ProcessTerminal } from "@sandbox-agent/react";
+import { SandboxAgentError } from "sandbox-agent";
+import type { ProcessInfo, SandboxAgent } from "sandbox-agent";
+
+const extractErrorMessage = (error: unknown, fallback: string): string => {
+  if (error instanceof SandboxAgentError && error.problem?.detail) return error.problem.detail;
+  if (error instanceof Error) return error.message;
+  return fallback;
+};
+
+const decodeBase64Utf8 = (value: string): string => {
+  try {
+    const bytes = Uint8Array.from(window.atob(value), (char) => char.charCodeAt(0));
+    return new TextDecoder().decode(bytes);
+  } catch {
+    return value;
+  }
+};
+
+const formatDateTime = (value: number | null | undefined): string => {
+  if (!value) {
+    return "Unknown";
+  }
+  return new Date(value).toLocaleString();
+};
+
+const parseArgs = (value: string): string[] =>
+  value
+    .split("\n")
+    .map((part) => part.trim())
+    .filter(Boolean);
+
+const formatCommandSummary = (process: Pick<ProcessInfo, "command" | "args">): string => {
+  return [process.command, ...process.args].join(" ").trim();
+};
+
+const canOpenTerminal = (process: ProcessInfo | null | undefined): boolean => {
+  return Boolean(process && process.status === "running" && process.interactive && process.tty);
+};
+
+const ProcessesTab = ({ getClient }: { getClient: () => SandboxAgent }) => {
+  const [processes, setProcesses] = useState<ProcessInfo[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const [command, setCommand] = useState("");
+  const [argsText, setArgsText] = useState("");
+  const [cwd, setCwd] = useState("");
+  const [interactive, setInteractive] = useState(true);
+  const [tty, setTty] = useState(true);
+  const [creating, setCreating] = useState(false);
+  const [createError, setCreateError] = useState<string | null>(null);
+  const [showCreateForm, setShowCreateForm] = useState(true);
+
+  const [selectedProcessId, setSelectedProcessId] = useState<string | null>(null);
+  const [logsText, setLogsText] = useState("");
+  const [logsLoading, setLogsLoading] = useState(false);
+  const [logsError, setLogsError] = useState<string | null>(null);
+  const [terminalOpen, setTerminalOpen] = useState(false);
+  const [actingProcessId, setActingProcessId] = useState<string | null>(null);
+
+  const loadProcesses = useCallback(
+    async (mode: "initial" | "refresh" = "initial") => {
+      if (mode === "initial") {
+        setLoading(true);
+      } else {
+        setRefreshing(true);
+      }
+      setError(null);
+      try {
+        const response = await getClient().listProcesses();
+        setProcesses(response.processes);
+        setSelectedProcessId((current) => {
+          if (!current) {
+            return response.processes[0]?.id ?? null;
+          }
+          return response.processes.some((listedProcess) => listedProcess.id === current) ? current : (response.processes[0]?.id ?? null);
+        });
+      } catch (loadError) {
+        setError(extractErrorMessage(loadError, "Unable to load processes."));
+      } finally {
+        setLoading(false);
+        setRefreshing(false);
+      }
+    },
+    [getClient],
+  );
+
+  const loadSelectedLogs = useCallback(
+    async (process: ProcessInfo | null) => {
+      if (!process) {
+        setLogsText("");
+        setLogsError(null);
+        return;
+      }
+      setLogsLoading(true);
+      setLogsError(null);
+      try {
+        const response = await getClient().getProcessLogs(process.id, {
+          stream: process.tty ? "pty" : "combined",
+          tail: 200,
+        });
+        const text = response.entries.map((logEntry) => decodeBase64Utf8(logEntry.data)).join("");
+        setLogsText(text);
+      } catch (loadError) {
+        setLogsError(extractErrorMessage(loadError, "Unable to load process logs."));
+        setLogsText("");
+      } finally {
+        setLogsLoading(false);
+      }
+    },
+    [getClient],
+  );
+
+  useEffect(() => {
+    void loadProcesses();
+  }, [loadProcesses]);
+
+  const selectedProcess = useMemo(() => processes.find((process) => process.id === selectedProcessId) ?? null, [processes, selectedProcessId]);
+
+  useEffect(() => {
+    void loadSelectedLogs(selectedProcess);
+    if (!canOpenTerminal(selectedProcess)) {
+      setTerminalOpen(false);
+    }
+  }, [loadSelectedLogs, selectedProcess]);
+
+  const handleCreateProcess = async () => {
+    const trimmedCommand = command.trim();
+    if (!trimmedCommand) {
+      setCreateError("Command is required.");
+      return;
+    }
+
+    setCreating(true);
+    setCreateError(null);
+    try {
+      const created = await getClient().createProcess({
+        command: trimmedCommand,
+        args: parseArgs(argsText),
+        cwd: cwd.trim() || undefined,
+        interactive,
+        tty,
+      });
+      await loadProcesses("refresh");
+      setSelectedProcessId(created.id);
+      setTerminalOpen(created.interactive && created.tty);
+      setCommand("");
+      setArgsText("");
+      setCwd("");
+      setInteractive(true);
+      setTty(true);
+    } catch (createFailure) {
+      setCreateError(extractErrorMessage(createFailure, "Unable to create process."));
+    } finally {
+      setCreating(false);
+    }
+  };
+
+  const handleAction = async (processId: string, action: "stop" | "kill" | "delete") => {
+    setActingProcessId(`${action}:${processId}`);
+    setError(null);
+    try {
+      const client = getClient();
+      if (action === "stop") {
+        await client.stopProcess(processId, { waitMs: 2_000 });
+      } else if (action === "kill") {
+        await client.killProcess(processId, { waitMs: 2_000 });
+      } else {
+        await client.deleteProcess(processId);
+      }
+      await loadProcesses("refresh");
+    } catch (actionError) {
+      setError(extractErrorMessage(actionError, `Unable to ${action} process.`));
+    } finally {
+      setActingProcessId(null);
+    }
+  };
+
+  const handleTerminalExit = useCallback(() => {
+    void loadProcesses("refresh");
+  }, [loadProcesses]);
+
+  return (
+    <div className="processes-container">
+      {/* Create form */}
+      <div className="processes-section">
+        <button className="processes-section-toggle" onClick={() => setShowCreateForm((prev) => !prev)} type="button">
+          {showCreateForm ? <ChevronDown size={12} /> : <ChevronRight size={12} />}
+          <span>Create Process</span>
+        </button>
+
+        {showCreateForm && (
+          <div className="process-create-form">
+            <div className="process-run-row">
+              <div className="process-run-field process-run-field-grow">
+                <label className="label">Command</label>
+                <input
+                  className="setup-input mono"
+                  value={command}
+                  onChange={(event) => {
+                    setCommand(event.target.value);
+                    setCreateError(null);
+                  }}
+                  placeholder="bash"
+                />
+              </div>
+              <div className="process-run-field process-run-field-grow">
+                <label className="label">Working Directory</label>
+                <input
+                  className="setup-input mono"
+                  value={cwd}
+                  onChange={(event) => {
+                    setCwd(event.target.value);
+                    setCreateError(null);
+                  }}
+                  placeholder="/workspace"
+                />
+              </div>
+            </div>
+
+            <div className="process-run-field">
+              <label className="label">Arguments</label>
+              <textarea
+                className="setup-input mono"
+                rows={2}
+                value={argsText}
+                onChange={(event) => {
+                  setArgsText(event.target.value);
+                  setCreateError(null);
+                }}
+                placeholder={"One argument per line"}
+              />
+            </div>
+
+            <div className="process-checkbox-row">
+              <label className="process-checkbox">
+                <input
+                  type="checkbox"
+                  checked={interactive}
+                  onChange={(event) => {
+                    setInteractive(event.target.checked);
+                    if (!event.target.checked) {
+                      setTty(false);
+                    }
+                  }}
+                />
+                <span>interactive</span>
+              </label>
+              <label className="process-checkbox">
+                <input
+                  type="checkbox"
+                  checked={tty}
+                  onChange={(event) => {
+                    setTty(event.target.checked);
+                    if (event.target.checked) {
+                      setInteractive(true);
+                    }
+                  }}
+                />
+                <span>tty</span>
+              </label>
+            </div>
+
+            {createError ? <div className="banner error">{createError}</div> : null}
+
+            <button className="button primary small" onClick={() => void handleCreateProcess()} disabled={creating} style={{ alignSelf: "flex-start" }}>
+              {creating ? <Loader2 className="button-icon spinner-icon" /> : <Play className="button-icon" />}
+              {creating ? "Creating..." : "Create"}
+            </button>
+          </div>
+        )}
+      </div>
+
+      {/* Process list */}
+      <div className="processes-section">
+        <div className="processes-list-header">
+          <span className="processes-section-label">Processes</span>
+          <button className="button secondary small" onClick={() => void loadProcesses("refresh")} disabled={loading || refreshing}>
+            <RefreshCw className={`button-icon ${loading || refreshing ? "spinner-icon" : ""}`} size={12} />
+            Refresh
+          </button>
+        </div>
+
+        {error ? <div className="banner error">{error}</div> : null}
+        {loading ? <div className="card-meta">Loading...</div> : null}
+        {!loading && processes.length === 0 ? <div className="card-meta">No processes yet.</div> : null}
+
+        <div className="process-list">
+          {processes.map((process) => {
+            const isSelected = selectedProcessId === process.id;
+            const isStopping = actingProcessId === `stop:${process.id}`;
+            const isKilling = actingProcessId === `kill:${process.id}`;
+            const isDeleting = actingProcessId === `delete:${process.id}`;
+            return (
+              <div
+                key={process.id}
+                className={`process-list-item ${isSelected ? "selected" : ""}`}
+                onClick={() => {
+                  setSelectedProcessId(process.id);
+                  setTerminalOpen(false);
+                }}
+              >
+                <div className="process-list-item-main">
+                  <span className={`process-status-dot ${process.status}`} />
+                  <span className="process-list-item-cmd mono">{formatCommandSummary(process)}</span>
+                  {process.interactive && process.tty && (
+                    <span className="pill neutral" style={{ fontSize: 9 }}>
+                      tty
+                    </span>
+                  )}
+                </div>
+                <div className="process-list-item-meta">
+                  <span>PID {process.pid ?? "?"}</span>
+                  <span className="process-list-item-id">{process.id.slice(0, 8)}</span>
+                </div>
+                <div className="process-list-item-actions">
+                  {canOpenTerminal(process) ? (
+                    <button
+                      className="button secondary small"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        setSelectedProcessId(process.id);
+                        setTerminalOpen(true);
+                      }}
+                    >
+                      <SquareTerminal className="button-icon" size={12} />
+                      Terminal
+                    </button>
+                  ) : null}
+                  {process.status === "running" ? (
+                    <>
+                      <button
+                        className="button secondary small"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          void handleAction(process.id, "stop");
+                        }}
+                        disabled={Boolean(actingProcessId)}
+                      >
+                        {isStopping ? <Loader2 className="button-icon spinner-icon" size={12} /> : null}
+                        Stop
+                      </button>
+                      <button
+                        className="button secondary small"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          void handleAction(process.id, "kill");
+                        }}
+                        disabled={Boolean(actingProcessId)}
+                      >
+                        {isKilling ? <Loader2 className="button-icon spinner-icon" size={12} /> : <Skull className="button-icon" size={12} />}
+                        Kill
+                      </button>
+                    </>
+                  ) : null}
+                  {process.status === "exited" ? (
+                    <button
+                      className="button secondary small"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        void handleAction(process.id, "delete");
+                      }}
+                      disabled={Boolean(actingProcessId)}
+                    >
+                      {isDeleting ? <Loader2 className="button-icon spinner-icon" size={12} /> : <Trash2 className="button-icon" size={12} />}
+                      Delete
+                    </button>
+                  ) : null}
+                </div>
+              </div>
+            );
+          })}
+        </div>
+      </div>
+
+      {/* Selected process detail */}
+      {selectedProcess ? (
+        <div className="processes-section">
+          <div className="processes-section-label">Detail</div>
+
+          <div className="process-detail">
+            <div className="process-detail-header">
+              <span className="process-detail-cmd mono">{formatCommandSummary(selectedProcess)}</span>
+              <span className={`pill ${selectedProcess.status === "running" ? "success" : "neutral"}`}>{selectedProcess.status}</span>
+            </div>
+
+            <div className="process-detail-meta">
+              <span>PID: {selectedProcess.pid ?? "?"}</span>
+              <span>Created: {formatDateTime(selectedProcess.createdAtMs)}</span>
+              {selectedProcess.exitedAtMs ? <span>Exited: {formatDateTime(selectedProcess.exitedAtMs)}</span> : null}
+              {selectedProcess.exitCode != null ? <span>Exit code: {selectedProcess.exitCode}</span> : null}
+              <span className="mono" style={{ opacity: 0.6 }}>
+                {selectedProcess.id}
+              </span>
+            </div>
+
+            {/* Terminal */}
+            {terminalOpen && canOpenTerminal(selectedProcess) ? (
+              <ProcessTerminal client={getClient()} processId={selectedProcess.id} style={{ marginTop: 4 }} onExit={handleTerminalExit} />
+            ) : canOpenTerminal(selectedProcess) ? (
+              <button className="button secondary small" onClick={() => setTerminalOpen(true)} style={{ marginTop: 8 }}>
+                <SquareTerminal className="button-icon" size={12} />
+                Open Terminal
+              </button>
+            ) : selectedProcess.interactive && selectedProcess.tty ? (
+              <div className="process-terminal-empty">Terminal available while process is running.</div>
+            ) : null}
+
+            {/* Logs */}
+            <div className="process-detail-logs">
+              <div className="process-detail-logs-header">
+                <span className="label">Logs</span>
+                <button className="button secondary small" onClick={() => void loadSelectedLogs(selectedProcess)} disabled={logsLoading}>
+                  {logsLoading ? <Loader2 className="button-icon spinner-icon" size={12} /> : <RefreshCw className="button-icon" size={12} />}
+                  Refresh
+                </button>
+              </div>
+              {logsError ? <div className="banner error">{logsError}</div> : null}
+              <pre className="process-log-block">{logsText || (logsLoading ? "Loading..." : "(no output)")}</pre>
+            </div>
+          </div>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default ProcessesTab;
diff --git a/frontend/packages/inspector/src/components/debug/RequestLogTab.tsx b/frontend/packages/inspector/src/components/debug/RequestLogTab.tsx
index 7fa56ac..73c8cd3 100644
--- a/frontend/packages/inspector/src/components/debug/RequestLogTab.tsx
+++ b/frontend/packages/inspector/src/components/debug/RequestLogTab.tsx
@@ -8,7 +8,7 @@ const RequestLogTab = ({
   requestLog,
   copiedLogId,
   onClear,
-  onCopy
+  onCopy,
 }: {
   requestLog: RequestLog[];
   copiedLogId: number | null;
@@ -49,16 +49,16 @@ const RequestLogTab = ({
                   <div className="event-summary-main">
                     <div className="event-title-row">
                       <span className="log-method">{entry.method}</span>
-                      <span className="log-url text-truncate" style={{ flex: 1 }}>{entry.url}</span>
+                      <span className="log-url text-truncate" style={{ flex: 1 }}>
+                        {entry.url}
+                      </span>
                     </div>
                     <div className="event-id">
                       {entry.time}
                       {entry.error && ` - ${entry.error}`}
                     </div>
                   </div>
-                  <span className={`log-status ${entry.status && entry.status < 400 ? "ok" : "error"}`}>
-                    {entry.status || "ERR"}
-                  </span>
+                  <span className={`log-status ${entry.status && entry.status < 400 ? "ok" : "error"}`}>{entry.status || "ERR"}</span>
                   <span
                     className="copy-button"
                     onClick={(e) => {
@@ -77,18 +77,18 @@ const RequestLogTab = ({
                     <Clipboard size={14} />
                     {copiedLogId === entry.id ? "Copied" : "curl"}
                   </span>
-                  {hasDetails && (
-                    <span className="event-chevron">
-                      {isExpanded ? <ChevronDown size={16} /> : <ChevronRight size={16} />}
-                    </span>
-                  )}
+                  {hasDetails && <span className="event-chevron">{isExpanded ? <ChevronDown size={16} /> : <ChevronRight size={16} />}</span>}
                 </button>
                 {isExpanded && (
                   <div className="event-payload" style={{ padding: "8px 12px" }}>
                     {entry.headers && Object.keys(entry.headers).length > 0 && (
                       <div style={{ marginBottom: 8 }}>
                         <div className="part-title">Request Headers</div>
-                        <pre className="code-block">{Object.entries(entry.headers).map(([k, v]) => `${k}: ${v}`).join("\n")}</pre>
+                        <pre className="code-block">
+                          {Object.entries(entry.headers)
+                            .map(([k, v]) => `${k}: ${v}`)
+                            .join("\n")}
+                        </pre>
                       </div>
                     )}
                     {entry.body && (
diff --git a/frontend/packages/inspector/src/components/debug/SkillsTab.tsx b/frontend/packages/inspector/src/components/debug/SkillsTab.tsx
index cd2dd92..7a6ce9d 100644
--- a/frontend/packages/inspector/src/components/debug/SkillsTab.tsx
+++ b/frontend/packages/inspector/src/components/debug/SkillsTab.tsx
@@ -1,4 +1,4 @@
-import { FolderOpen, Loader2, Plus, Trash2 } from "lucide-react";
+import { ChevronDown, ChevronRight, FolderOpen, Loader2, Plus, Trash2 } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
 import type { SandboxAgent } from "sandbox-agent";
 import { formatJson } from "../../utils/format";
@@ -8,15 +8,39 @@ type SkillEntry = {
   config: { sources: Array<{ source: string; type: string; ref?: string | null; subpath?: string | null; skills?: string[] | null }> };
 };
 
-const SkillsTab = ({
-  getClient,
-}: {
-  getClient: () => SandboxAgent;
-}) => {
-  const [directory, setDirectory] = useState("/");
+const SKILLS_DIRECTORY_STORAGE_KEY = "sandbox-agent-inspector-skills-directory";
+
+const SkillsTab = ({ getClient }: { getClient: () => SandboxAgent }) => {
+  const officialSkills = [
+    {
+      name: "Sandbox Agent SDK",
+      skillId: "sandbox-agent",
+      source: "rivet-dev/skills",
+      summary: "Skills bundle for fast Sandbox Agent SDK setup and consistent workflows.",
+    },
+    {
+      name: "Rivet",
+      skillId: "rivet",
+      source: "rivet-dev/skills",
+      summary: "Open-source platform for building, deploying, and scaling AI agents.",
+      features: ["Session Persistence", "Resumable Sessions", "Multi-Agent Support", "Realtime Events", "Tool Call Visibility"],
+    },
+  ];
+
+  const [directory, setDirectory] = useState(() => {
+    if (typeof window === "undefined") return "/";
+    try {
+      return window.localStorage.getItem(SKILLS_DIRECTORY_STORAGE_KEY) ?? "/";
+    } catch {
+      return "/";
+    }
+  });
   const [entries, setEntries] = useState<SkillEntry[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const [copiedId, setCopiedId] = useState<string | null>(null);
+  const [showSdkSkills, setShowSdkSkills] = useState(false);
+  const [collapsedSkills, setCollapsedSkills] = useState<Record<string, boolean>>({});
 
   // Add form state
   const [editing, setEditing] = useState(false);
@@ -29,33 +53,42 @@ const SkillsTab = ({
   const [editError, setEditError] = useState<string | null>(null);
   const [saving, setSaving] = useState(false);
 
-  const loadAll = useCallback(async (dir: string) => {
-    setLoading(true);
-    setError(null);
-    try {
-      const configPath = `${dir === "/" ? "" : dir}/.sandbox-agent/config/skills.json`;
-      const bytes = await getClient().readFsFile({ path: configPath });
-      const text = new TextDecoder().decode(bytes);
-      if (!text.trim()) {
+  const loadAll = useCallback(
+    async (dir: string) => {
+      setLoading(true);
+      setError(null);
+      try {
+        const configPath = `${dir === "/" ? "" : dir}/.sandbox-agent/config/skills.json`;
+        const bytes = await getClient().readFsFile({ path: configPath });
+        const text = new TextDecoder().decode(bytes);
+        if (!text.trim()) {
+          setEntries([]);
+          return;
+        }
+        const map = JSON.parse(text) as Record<string, SkillEntry["config"]>;
+        setEntries(Object.entries(map).map(([name, config]) => ({ name, config })));
+      } catch {
+        // File doesn't exist yet or is empty — that's fine
         setEntries([]);
-        return;
+      } finally {
+        setLoading(false);
       }
-      const map = JSON.parse(text) as Record<string, SkillEntry["config"]>;
-      setEntries(
-        Object.entries(map).map(([name, config]) => ({ name, config })),
-      );
-    } catch {
-      // File doesn't exist yet or is empty — that's fine
-      setEntries([]);
-    } finally {
-      setLoading(false);
-    }
-  }, [getClient]);
+    },
+    [getClient],
+  );
 
   useEffect(() => {
     loadAll(directory);
   }, [directory, loadAll]);
 
+  useEffect(() => {
+    try {
+      window.localStorage.setItem(SKILLS_DIRECTORY_STORAGE_KEY, directory);
+    } catch {
+      // Ignore storage failures.
+    }
+  }, [directory]);
+
   const startAdd = () => {
     setEditing(true);
     setEditName("");
@@ -97,7 +130,10 @@ const SkillsTab = ({
     if (editRef.trim()) skillEntry.ref = editRef.trim();
     if (editSubpath.trim()) skillEntry.subpath = editSubpath.trim();
     const skillsList = editSkills.trim()
-      ? editSkills.split(",").map((s) => s.trim()).filter(Boolean)
+      ? editSkills
+          .split(",")
+          .map((s) => s.trim())
+          .filter(Boolean)
       : null;
     if (skillsList && skillsList.length > 0) skillEntry.skills = skillsList;
 
@@ -106,10 +142,7 @@ const SkillsTab = ({
     setSaving(true);
     setEditError(null);
     try {
-      await getClient().setSkillsConfig(
-        { directory, skillName: name },
-        config,
-      );
+      await getClient().setSkillsConfig({ directory, skillName: name }, config);
       cancelEdit();
       await loadAll(directory);
     } catch (err) {
@@ -128,11 +161,66 @@ const SkillsTab = ({
     }
   };
 
+  const fallbackCopy = (text: string) => {
+    const textarea = document.createElement("textarea");
+    textarea.value = text;
+    textarea.style.position = "fixed";
+    textarea.style.opacity = "0";
+    document.body.appendChild(textarea);
+    textarea.select();
+    document.execCommand("copy");
+    document.body.removeChild(textarea);
+  };
+
+  const copyText = async (id: string, text: string) => {
+    try {
+      if (navigator.clipboard && window.isSecureContext) {
+        await navigator.clipboard.writeText(text);
+      } else {
+        fallbackCopy(text);
+      }
+      setCopiedId(id);
+      window.setTimeout(() => {
+        setCopiedId((current) => (current === id ? null : current));
+      }, 1800);
+    } catch {
+      setError("Failed to copy snippet");
+    }
+  };
+
+  const applySkillPreset = (skill: (typeof officialSkills)[0]) => {
+    setEditing(true);
+    setEditName(skill.skillId);
+    setEditSource(skill.source);
+    setEditType("github");
+    setEditRef("");
+    setEditSubpath("");
+    setEditSkills(skill.skillId);
+    setEditError(null);
+    setShowSdkSkills(false);
+  };
+
+  const copySkillToInput = async (skillId: string) => {
+    const skill = officialSkills.find((s) => s.skillId === skillId);
+    if (skill) {
+      applySkillPreset(skill);
+      await copyText(`skill-input-${skillId}`, skillId);
+    }
+  };
+
   return (
     <>
       <div className="inline-row" style={{ marginBottom: 12, justifyContent: "space-between" }}>
         <span className="card-meta">Skills Configuration</span>
-        <div className="inline-row">
+        <div className="inline-row" style={{ gap: 6 }}>
+          <button className="button secondary small" onClick={() => setShowSdkSkills((prev) => !prev)} title="Toggle official skills list">
+            {showSdkSkills ? (
+              <ChevronDown className="button-icon" style={{ width: 12, height: 12 }} />
+            ) : (
+              <ChevronRight className="button-icon" style={{ width: 12, height: 12 }} />
+            )}
+            Official Skills
+          </button>
           {!editing && (
             <button className="button secondary small" onClick={startAdd}>
               <Plus className="button-icon" style={{ width: 12, height: 12 }} />
@@ -142,6 +230,45 @@ const SkillsTab = ({
         </div>
       </div>
 
+      {showSdkSkills && (
+        <div className="card" style={{ marginBottom: 12 }}>
+          <div className="card-meta" style={{ marginBottom: 8 }}>
+            Pick a skill to auto-fill the form.
+          </div>
+          {officialSkills.map((skill) => (
+            <div
+              key={skill.name}
+              style={{
+                border: "1px solid var(--border)",
+                borderRadius: 6,
+                padding: "8px 10px",
+                background: "var(--surface-2)",
+                marginBottom: 6,
+              }}
+            >
+              <div className="inline-row" style={{ justifyContent: "space-between", gap: 8, marginBottom: 4 }}>
+                <div style={{ fontWeight: 500, fontSize: 12 }}>{skill.name}</div>
+                <button className="button ghost small" onClick={() => void copySkillToInput(skill.skillId)}>
+                  {copiedId === `skill-input-${skill.skillId}` ? "Filled" : "Use"}
+                </button>
+              </div>
+              <div className="card-meta" style={{ fontSize: 10, marginBottom: skill.features ? 6 : 0 }}>
+                {skill.summary}
+              </div>
+              {skill.features && (
+                <div style={{ display: "flex", flexWrap: "wrap", gap: 4 }}>
+                  {skill.features.map((feature) => (
+                    <span key={feature} className="pill accent" style={{ fontSize: 9 }}>
+                      {feature}
+                    </span>
+                  ))}
+                </div>
+              )}
+            </div>
+          ))}
+        </div>
+      )}
+
       <div className="inline-row" style={{ marginBottom: 12, gap: 6 }}>
         <FolderOpen size={14} className="muted" style={{ flexShrink: 0 }} />
         <input
@@ -165,17 +292,15 @@ const SkillsTab = ({
             <input
               className="setup-input"
               value={editName}
-              onChange={(e) => { setEditName(e.target.value); setEditError(null); }}
+              onChange={(e) => {
+                setEditName(e.target.value);
+                setEditError(null);
+              }}
               placeholder="skill-name"
               style={{ marginBottom: 6, width: "100%", boxSizing: "border-box" }}
             />
             <div className="inline-row" style={{ marginBottom: 6, gap: 4 }}>
-              <select
-                className="setup-select"
-                value={editType}
-                onChange={(e) => setEditType(e.target.value)}
-                style={{ width: 90 }}
-              >
+              <select className="setup-select" value={editType} onChange={(e) => setEditType(e.target.value)} style={{ width: 90 }}>
                 <option value="github">github</option>
                 <option value="local">local</option>
                 <option value="git">git</option>
@@ -183,7 +308,10 @@ const SkillsTab = ({
               <input
                 className="setup-input mono"
                 value={editSource}
-                onChange={(e) => { setEditSource(e.target.value); setEditError(null); }}
+                onChange={(e) => {
+                  setEditSource(e.target.value);
+                  setEditError(null);
+                }}
                 placeholder={editType === "github" ? "owner/repo" : editType === "local" ? "/path/to/skill" : "https://..."}
                 style={{ flex: 1 }}
               />
@@ -213,7 +341,11 @@ const SkillsTab = ({
                 />
               </div>
             )}
-            {editError && <div className="banner error" style={{ marginTop: 4 }}>{editError}</div>}
+            {editError && (
+              <div className="banner error" style={{ marginTop: 4 }}>
+                {editError}
+              </div>
+            )}
           </div>
           <div className="card-actions">
             <button className="button primary small" onClick={save} disabled={saving}>
@@ -227,35 +359,41 @@ const SkillsTab = ({
         </div>
       )}
 
-      {entries.length === 0 && !editing && !loading && (
-        <div className="card-meta">
-          No skills configured in this directory.
-        </div>
-      )}
+      {entries.length === 0 && !editing && !loading && <div className="card-meta">No skills configured in this directory.</div>}
 
-      {entries.map((entry) => (
-        <div key={entry.name} className="card" style={{ marginBottom: 8 }}>
-          <div className="card-header">
-            <span className="card-title">{entry.name}</span>
-            <div className="card-header-pills">
-              <span className="pill accent">
-                {entry.config.sources.length} source{entry.config.sources.length !== 1 ? "s" : ""}
-              </span>
-              <button
-                className="button ghost small"
-                onClick={() => remove(entry.name)}
-                title="Remove"
-                style={{ padding: "2px 4px" }}
-              >
-                <Trash2 size={12} />
-              </button>
+      {entries.map((entry) => {
+        const isCollapsed = collapsedSkills[entry.name] ?? true;
+        return (
+          <div key={entry.name} className="card" style={{ marginBottom: 8 }}>
+            <div className="card-header">
+              <div className="inline-row" style={{ gap: 6 }}>
+                <button
+                  className="button ghost small"
+                  onClick={() => setCollapsedSkills((prev) => ({ ...prev, [entry.name]: !(prev[entry.name] ?? true) }))}
+                  title={isCollapsed ? "Expand" : "Collapse"}
+                  style={{ padding: "2px 4px" }}
+                >
+                  {isCollapsed ? <ChevronRight size={12} /> : <ChevronDown size={12} />}
+                </button>
+                <span className="card-title">{entry.name}</span>
+              </div>
+              <div className="card-header-pills">
+                <span className="pill accent">
+                  {entry.config.sources.length} source{entry.config.sources.length !== 1 ? "s" : ""}
+                </span>
+                <button className="button ghost small" onClick={() => remove(entry.name)} title="Remove" style={{ padding: "2px 4px" }}>
+                  <Trash2 size={12} />
+                </button>
+              </div>
             </div>
+            {!isCollapsed && (
+              <pre className="code-block" style={{ marginTop: 4, fontSize: 10 }}>
+                {formatJson(entry.config)}
+              </pre>
+            )}
           </div>
-          <pre className="code-block" style={{ marginTop: 4, fontSize: 10 }}>
-            {formatJson(entry.config)}
-          </pre>
-        </div>
-      ))}
+        );
+      })}
     </>
   );
 };
diff --git a/frontend/packages/inspector/src/lib/permissions.ts b/frontend/packages/inspector/src/lib/permissions.ts
index 02f75af..6b0009a 100644
--- a/frontend/packages/inspector/src/lib/permissions.ts
+++ b/frontend/packages/inspector/src/lib/permissions.ts
@@ -2,7 +2,7 @@ export const askForLocalNetworkAccess = async (): Promise<boolean> => {
   try {
     const status = await navigator.permissions.query({
       // @ts-expect-error - local-network-access is not in standard types
-      name: "local-network-access"
+      name: "local-network-access",
     });
     if (status.state === "granted") {
       return true;
diff --git a/frontend/packages/inspector/src/main.tsx b/frontend/packages/inspector/src/main.tsx
index f46c379..3854929 100644
--- a/frontend/packages/inspector/src/main.tsx
+++ b/frontend/packages/inspector/src/main.tsx
@@ -5,5 +5,5 @@ import App from "./App";
 ReactDOM.createRoot(document.getElementById("root")!).render(
   <React.StrictMode>
     <App />
-  </React.StrictMode>
+  </React.StrictMode>,
 );
diff --git a/frontend/packages/inspector/src/persist-indexeddb.ts b/frontend/packages/inspector/src/persist-indexeddb.ts
new file mode 100644
index 0000000..23475cb
--- /dev/null
+++ b/frontend/packages/inspector/src/persist-indexeddb.ts
@@ -0,0 +1,320 @@
+import type { ListEventsRequest, ListPage, ListPageRequest, SessionEvent, SessionPersistDriver, SessionRecord } from "sandbox-agent";
+
+const DEFAULT_DB_NAME = "sandbox-agent-session-store";
+const DEFAULT_DB_VERSION = 2;
+const SESSIONS_STORE = "sessions";
+const EVENTS_STORE = "events";
+const EVENTS_BY_SESSION_INDEX = "by_session_index";
+const DEFAULT_LIST_LIMIT = 100;
+
+export interface IndexedDbSessionPersistDriverOptions {
+  databaseName?: string;
+  databaseVersion?: number;
+  indexedDb?: IDBFactory;
+}
+
+export class IndexedDbSessionPersistDriver implements SessionPersistDriver {
+  private readonly indexedDb: IDBFactory;
+  private readonly dbName: string;
+  private readonly dbVersion: number;
+  private readonly dbPromise: Promise<IDBDatabase>;
+
+  constructor(options: IndexedDbSessionPersistDriverOptions = {}) {
+    const indexedDb = options.indexedDb ?? globalThis.indexedDB;
+    if (!indexedDb) {
+      throw new Error("IndexedDB is not available in this runtime.");
+    }
+
+    this.indexedDb = indexedDb;
+    this.dbName = options.databaseName ?? DEFAULT_DB_NAME;
+    this.dbVersion = options.databaseVersion ?? DEFAULT_DB_VERSION;
+    this.dbPromise = this.openDatabase();
+  }
+
+  async getSession(id: string): Promise<SessionRecord | undefined> {
+    const db = await this.dbPromise;
+    const row = await requestToPromise<IDBValidKey | SessionRow | undefined>(db.transaction(SESSIONS_STORE, "readonly").objectStore(SESSIONS_STORE).get(id));
+    if (!row || typeof row !== "object") {
+      return undefined;
+    }
+    return decodeSessionRow(row as SessionRow);
+  }
+
+  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
+    const db = await this.dbPromise;
+    const rows = await getAllRows<SessionRow>(db, SESSIONS_STORE);
+
+    rows.sort((a, b) => {
+      if (a.createdAt !== b.createdAt) {
+        return a.createdAt - b.createdAt;
+      }
+      return a.id.localeCompare(b.id);
+    });
+
+    const offset = parseCursor(request.cursor);
+    const limit = normalizeLimit(request.limit);
+    const slice = rows.slice(offset, offset + limit).map(decodeSessionRow);
+    const nextOffset = offset + slice.length;
+
+    return {
+      items: slice,
+      nextCursor: nextOffset < rows.length ? String(nextOffset) : undefined,
+    };
+  }
+
+  async updateSession(session: SessionRecord): Promise<void> {
+    const db = await this.dbPromise;
+    await transactionPromise(db, [SESSIONS_STORE], "readwrite", (tx) => {
+      tx.objectStore(SESSIONS_STORE).put(encodeSessionRow(session));
+    });
+  }
+
+  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
+    const db = await this.dbPromise;
+    const rows = (await getAllRows<EventRow>(db, EVENTS_STORE)).filter((row) => row.sessionId === request.sessionId).sort(compareEventRowsByOrder);
+
+    const offset = parseCursor(request.cursor);
+    const limit = normalizeLimit(request.limit);
+    const slice = rows.slice(offset, offset + limit).map(decodeEventRow);
+    const nextOffset = offset + slice.length;
+
+    return {
+      items: slice,
+      nextCursor: nextOffset < rows.length ? String(nextOffset) : undefined,
+    };
+  }
+
+  async insertEvent(_sessionId: string, event: SessionEvent): Promise<void> {
+    const db = await this.dbPromise;
+    await transactionPromise(db, [EVENTS_STORE], "readwrite", (tx) => {
+      tx.objectStore(EVENTS_STORE).put(encodeEventRow(event));
+    });
+  }
+
+  async close(): Promise<void> {
+    const db = await this.dbPromise;
+    db.close();
+  }
+
+  private openDatabase(): Promise<IDBDatabase> {
+    return new Promise((resolve, reject) => {
+      const request = this.indexedDb.open(this.dbName, this.dbVersion);
+
+      request.onupgradeneeded = () => {
+        const db = request.result;
+
+        if (!db.objectStoreNames.contains(SESSIONS_STORE)) {
+          db.createObjectStore(SESSIONS_STORE, { keyPath: "id" });
+        }
+
+        if (!db.objectStoreNames.contains(EVENTS_STORE)) {
+          const events = db.createObjectStore(EVENTS_STORE, { keyPath: "id" });
+          events.createIndex(EVENTS_BY_SESSION_INDEX, ["sessionId", "eventIndex", "id"], {
+            unique: false,
+          });
+        } else {
+          const tx = request.transaction;
+          if (!tx) {
+            return;
+          }
+          const events = tx.objectStore(EVENTS_STORE);
+          if (!events.indexNames.contains(EVENTS_BY_SESSION_INDEX)) {
+            events.createIndex(EVENTS_BY_SESSION_INDEX, ["sessionId", "eventIndex", "id"], {
+              unique: false,
+            });
+          }
+        }
+      };
+
+      request.onsuccess = () => resolve(request.result);
+      request.onerror = () => reject(request.error ?? new Error("Unable to open IndexedDB"));
+    });
+  }
+}
+
+type SessionRow = {
+  id: string;
+  agent: string;
+  agentSessionId: string;
+  lastConnectionId: string;
+  createdAt: number;
+  destroyedAt?: number;
+  sandboxId?: string;
+  sessionInit?: SessionRecord["sessionInit"];
+  configOptions?: SessionRecord["configOptions"];
+  modes?: SessionRecord["modes"];
+};
+
+type EventRow = {
+  id: number | string;
+  eventIndex?: number;
+  sessionId: string;
+  createdAt: number;
+  connectionId: string;
+  sender: "client" | "agent";
+  payload: unknown;
+};
+
+function encodeSessionRow(session: SessionRecord): SessionRow {
+  return {
+    id: session.id,
+    agent: session.agent,
+    agentSessionId: session.agentSessionId,
+    lastConnectionId: session.lastConnectionId,
+    createdAt: session.createdAt,
+    destroyedAt: session.destroyedAt,
+    sandboxId: session.sandboxId,
+    sessionInit: session.sessionInit,
+    configOptions: session.configOptions,
+    modes: session.modes,
+  };
+}
+
+function decodeSessionRow(row: SessionRow): SessionRecord {
+  return {
+    id: row.id,
+    agent: row.agent,
+    agentSessionId: row.agentSessionId,
+    lastConnectionId: row.lastConnectionId,
+    createdAt: row.createdAt,
+    destroyedAt: row.destroyedAt,
+    sandboxId: row.sandboxId,
+    sessionInit: row.sessionInit,
+    configOptions: row.configOptions,
+    modes: row.modes,
+  };
+}
+
+function encodeEventRow(event: SessionEvent): EventRow {
+  return {
+    id: event.id,
+    eventIndex: event.eventIndex,
+    sessionId: event.sessionId,
+    createdAt: event.createdAt,
+    connectionId: event.connectionId,
+    sender: event.sender,
+    payload: event.payload,
+  };
+}
+
+function decodeEventRow(row: EventRow): SessionEvent {
+  return {
+    id: String(row.id),
+    eventIndex: parseEventIndex(row.eventIndex, row.id),
+    sessionId: row.sessionId,
+    createdAt: row.createdAt,
+    connectionId: row.connectionId,
+    sender: row.sender,
+    payload: row.payload as SessionEvent["payload"],
+  };
+}
+
+async function getAllRows<T>(db: IDBDatabase, storeName: string): Promise<T[]> {
+  return await transactionPromise<T[]>(db, [storeName], "readonly", async (tx) => {
+    const request = tx.objectStore(storeName).getAll();
+    return (await requestToPromise(request)) as T[];
+  });
+}
+
+function normalizeLimit(limit: number | undefined): number {
+  if (!Number.isFinite(limit) || (limit ?? 0) < 1) {
+    return DEFAULT_LIST_LIMIT;
+  }
+  return Math.floor(limit as number);
+}
+
+function parseCursor(cursor: string | undefined): number {
+  if (!cursor) {
+    return 0;
+  }
+  const parsed = Number.parseInt(cursor, 10);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    return 0;
+  }
+  return parsed;
+}
+
+function compareEventRowsByOrder(a: EventRow, b: EventRow): number {
+  const indexA = parseEventIndex(a.eventIndex, a.id);
+  const indexB = parseEventIndex(b.eventIndex, b.id);
+  if (indexA !== indexB) {
+    return indexA - indexB;
+  }
+  return String(a.id).localeCompare(String(b.id));
+}
+
+function parseEventIndex(value: number | undefined, fallback: number | string): number {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return Math.max(0, Math.floor(value));
+  }
+
+  const parsed = Number.parseInt(String(fallback), 10);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    return 0;
+  }
+  return parsed;
+}
+
+function requestToPromise<T>(request: IDBRequest<T>): Promise<T> {
+  return new Promise((resolve, reject) => {
+    request.onsuccess = () => resolve(request.result);
+    request.onerror = () => reject(request.error ?? new Error("IndexedDB request failed"));
+  });
+}
+
+function transactionPromise<T>(db: IDBDatabase, stores: string[], mode: IDBTransactionMode, run: (tx: IDBTransaction) => T | Promise<T>): Promise<T> {
+  return new Promise((resolve, reject) => {
+    const tx = db.transaction(stores, mode);
+    let settled = false;
+    let resultValue: T | undefined;
+    let runCompleted = false;
+    let txCompleted = false;
+
+    function tryResolve() {
+      if (settled || !runCompleted || !txCompleted) {
+        return;
+      }
+      settled = true;
+      resolve(resultValue as T);
+    }
+
+    tx.oncomplete = () => {
+      txCompleted = true;
+      tryResolve();
+    };
+
+    tx.onerror = () => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      reject(tx.error ?? new Error("IndexedDB transaction failed"));
+    };
+
+    tx.onabort = () => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      reject(tx.error ?? new Error("IndexedDB transaction aborted"));
+    };
+
+    Promise.resolve(run(tx))
+      .then((value) => {
+        resultValue = value;
+        runCompleted = true;
+        tryResolve();
+      })
+      .catch((error) => {
+        if (!settled) {
+          settled = true;
+          reject(error);
+        }
+        try {
+          tx.abort();
+        } catch {
+          // no-op
+        }
+      });
+  });
+}
diff --git a/frontend/packages/inspector/src/types/agents.ts b/frontend/packages/inspector/src/types/agents.ts
index e3c1285..21fdcee 100644
--- a/frontend/packages/inspector/src/types/agents.ts
+++ b/frontend/packages/inspector/src/types/agents.ts
@@ -41,5 +41,5 @@ export const emptyFeatureCoverage: FeatureCoverageView = {
   streamingDeltas: false,
   itemStarted: false,
   variants: false,
-  sharedProcess: false
+  sharedProcess: false,
 };
diff --git a/frontend/packages/inspector/src/utils/format.ts b/frontend/packages/inspector/src/utils/format.ts
index fca69c7..cce1665 100644
--- a/frontend/packages/inspector/src/utils/format.ts
+++ b/frontend/packages/inspector/src/utils/format.ts
@@ -16,3 +16,9 @@ export const formatTime = (value: string) => {
 };
 
 export const escapeSingleQuotes = (value: string) => value.replace(/'/g, `'\\''`);
+
+export const formatShortId = (value: string, head = 8, tail = 4) => {
+  if (!value) return "";
+  if (value.length <= head + tail + 1) return value;
+  return `${value.slice(0, head)}...${value.slice(-tail)}`;
+};
diff --git a/frontend/packages/inspector/src/utils/http.ts b/frontend/packages/inspector/src/utils/http.ts
index 20d535a..33108e7 100644
--- a/frontend/packages/inspector/src/utils/http.ts
+++ b/frontend/packages/inspector/src/utils/http.ts
@@ -9,7 +9,5 @@ export const buildCurl = (method: string, url: string, body?: string, token?: st
     headers.push(`-H 'Content-Type: application/json'`);
   }
   const data = body ? `-d '${escapeSingleQuotes(body)}'` : "";
-  return `curl -X ${method} ${headers.join(" ")} ${data} '${escapeSingleQuotes(url)}'`
-    .replace(/\s+/g, " ")
-    .trim();
+  return `curl -X ${method} ${headers.join(" ")} ${data} '${escapeSingleQuotes(url)}'`.replace(/\s+/g, " ").trim();
 };
diff --git a/frontend/packages/inspector/vite.config.ts b/frontend/packages/inspector/vite.config.ts
index 076e709..d398b20 100644
--- a/frontend/packages/inspector/vite.config.ts
+++ b/frontend/packages/inspector/vite.config.ts
@@ -8,12 +8,9 @@ export default defineConfig(({ command }) => ({
     port: 5173,
     proxy: {
       "/v1": {
-        target: "http://localhost:2468",
-        changeOrigin: true,
-      },
-      "/v1": {
-        target: "http://localhost:2468",
+        target: process.env.SANDBOX_AGENT_URL || "http://localhost:2468",
         changeOrigin: true,
+        ws: true,
       },
     },
   },
diff --git a/frontend/packages/website/astro.config.mjs b/frontend/packages/website/astro.config.mjs
index 41e24e0..c68ae09 100644
--- a/frontend/packages/website/astro.config.mjs
+++ b/frontend/packages/website/astro.config.mjs
@@ -1,11 +1,10 @@
-import { defineConfig } from 'astro/config';
-import react from '@astrojs/react';
-import tailwind from '@astrojs/tailwind';
+import { defineConfig } from "astro/config";
+import react from "@astrojs/react";
+import tailwind from "@astrojs/tailwind";
+import sitemap from "@astrojs/sitemap";
 
 export default defineConfig({
-  output: 'static',
-  integrations: [
-    react(),
-    tailwind()
-  ]
+  site: "https://sandbox-agent.dev",
+  output: "static",
+  integrations: [react(), tailwind(), sitemap()],
 });
diff --git a/frontend/packages/website/package.json b/frontend/packages/website/package.json
index aef9c0b..ced76f7 100644
--- a/frontend/packages/website/package.json
+++ b/frontend/packages/website/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@astrojs/react": "^4.2.0",
+    "@astrojs/sitemap": "^3.2.0",
     "@astrojs/tailwind": "^6.0.0",
     "astro": "^5.1.0",
     "framer-motion": "^12.0.0",
diff --git a/frontend/packages/website/public/images/inspector.png b/frontend/packages/website/public/images/inspector.png
index 1c16ed2..02e588e 100644
Binary files a/frontend/packages/website/public/images/inspector.png and b/frontend/packages/website/public/images/inspector.png differ
diff --git a/frontend/packages/website/public/logos/cloudflare.svg b/frontend/packages/website/public/logos/cloudflare.svg
new file mode 100644
index 0000000..76a2e80
--- /dev/null
+++ b/frontend/packages/website/public/logos/cloudflare.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+  <path d="M16.5088 16.8447c.1475-.5068.0908-.9707-.1553-1.3154-.2246-.3164-.6045-.499-1.0615-.5205l-8.6592-.1123a.1559.1559 0 0 1-.1333-.0713c-.0283-.042-.0351-.0986-.021-.1553.0278-.084.1123-.1484.2036-.1562l8.7359-.1123c1.0351-.0489 2.1601-.8868 2.5537-1.9136l.499-1.3013c.0215-.0561.0293-.1128.0147-.168-.5625-2.5463-2.835-4.4453-5.5499-4.4453-2.5039 0-4.6284 1.6177-5.3876 3.8614-.4927-.3658-1.1187-.5625-1.794-.499-1.2026.119-2.1665 1.083-2.2861 2.2856-.0283.31-.0069.6128.0635.894C1.5683 13.171 0 14.7754 0 16.752c0 .1748.0142.3515.0352.5273.0141.083.0844.1475.1689.1475h15.9814c.0909 0 .1758-.0645.2032-.1553l.12-.4268zm2.7568-5.5634c-.0771 0-.1611 0-.2383.0112-.0566 0-.1054.0415-.127.0976l-.3378 1.1744c-.1475.5068-.0918.9707.1543 1.3164.2256.3164.6055.498 1.0625.5195l1.8437.1133c.0557 0 .1055.0263.1329.0703.0283.043.0351.1074.0214.1562-.0283.084-.1132.1485-.204.1553l-1.921.1123c-1.041.0488-2.1582.8867-2.5527 1.914l-.1406.3585c-.0283.0713.0215.1416.0986.1416h6.5977c.0771 0 .1474-.0489.169-.126.1122-.4082.1757-.837.1757-1.2803 0-2.6025-2.125-4.727-4.7344-4.727"/>
+</svg>
diff --git a/frontend/packages/website/public/logos/computesdk.svg b/frontend/packages/website/public/logos/computesdk.svg
new file mode 100644
index 0000000..45c6271
--- /dev/null
+++ b/frontend/packages/website/public/logos/computesdk.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 1711 1711" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+  <path d="M1036.26 1002.28H1274.13L1273.2 1021.37C1264.82 1131.69 1223.39 1219.67 1149.38 1283.44C1076.29 1346.75 978.54 1378.87 858.9 1378.87C728.09 1378.87 623.35 1334.18 547.47 1245.27C472.99 1157.29 434.82 1035.79 434.82 884.04V823.53C434.82 726.7 452.52 640.12 486.5 566.1C521.41 491.15 571.69 432.49 636.39 392.47C701.09 352.43 776.51 331.95 861.69 331.95C979.46 331.95 1075.82 364.07 1147.98 427.85C1220.6 491.15 1262.96 581.46 1274.13 695.52L1275.99 714.6H1037.65L1036.72 698.77C1032.07 639.66 1015.77 596.83 988.77 571.69C961.77 546.09 918.94 533.52 861.69 533.52C799.78 533.52 754.63 554.47 724.36 598.69C692.71 643.84 676.42 716.46 675.49 814.22V888.7C675.49 991.11 690.85 1066.53 721.11 1112.61C749.97 1156.83 795.12 1178.24 858.9 1178.24C917.09 1178.24 960.38 1165.67 987.85 1140.07C1014.84 1114.93 1031.14 1073.97 1035.33 1018.57L1036.26 1002.27V1002.28Z"/>
+</svg>
diff --git a/frontend/packages/website/public/logos/docker.svg b/frontend/packages/website/public/logos/docker.svg
new file mode 100644
index 0000000..33582ef
--- /dev/null
+++ b/frontend/packages/website/public/logos/docker.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+  <path d="M13.983 11.078h2.119a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.119a.185.185 0 00-.185.185v1.888c0 .102.083.185.185.185m-2.954-5.43h2.118a.186.186 0 00.186-.186V3.574a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m0 2.716h2.118a.187.187 0 00.186-.186V6.29a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.887c0 .102.082.185.185.186m-2.93 0h2.12a.186.186 0 00.184-.186V6.29a.185.185 0 00-.185-.185H8.1a.185.185 0 00-.185.185v1.887c0 .102.083.185.185.186m-2.964 0h2.119a.186.186 0 00.185-.186V6.29a.185.185 0 00-.185-.185H5.136a.186.186 0 00-.186.185v1.887c0 .102.084.185.186.186m5.893 2.715h2.118a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m-2.93 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.083.185.185.185m-2.964 0h2.119a.185.185 0 00.185-.185V9.006a.185.185 0 00-.184-.186h-2.12a.186.186 0 00-.186.186v1.887c0 .102.084.185.186.185m-2.92 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.082.185.185.185M23.763 9.89c-.065-.051-.672-.51-1.954-.51-.338.001-.676.03-1.01.087-.248-1.7-1.653-2.53-1.716-2.566l-.344-.199-.226.327c-.284.438-.49.922-.612 1.43-.23.97-.09 1.882.403 2.661-.595.332-1.55.413-1.744.42H.751a.751.751 0 00-.75.748 11.376 11.376 0 00.692 4.062c.545 1.428 1.355 2.48 2.41 3.124 1.18.723 3.1 1.137 5.275 1.137.983.003 1.963-.086 2.93-.266a12.248 12.248 0 003.823-1.389c.98-.567 1.86-1.288 2.61-2.136 1.252-1.418 1.998-2.997 2.553-4.4h.221c1.372 0 2.215-.549 2.68-1.009.309-.293.55-.65.707-1.046l.098-.288Z"/>
+</svg>
diff --git a/frontend/packages/website/public/logos/modal.svg b/frontend/packages/website/public/logos/modal.svg
new file mode 100644
index 0000000..990b5bd
--- /dev/null
+++ b/frontend/packages/website/public/logos/modal.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+  <path d="M4.89 5.57 0 14.002l2.521 4.4h5.05l4.396-7.718 4.512 7.709 4.996.037L24 14.057l-4.857-8.452-5.073-.015-2.076 3.598L9.94 5.57Zm.837.729h3.787l1.845 3.252H7.572Zm9.189.021 3.803.012 4.228 7.355-3.736-.027zm-9.82.346L6.94 9.914l-4.209 7.389-1.892-3.3Zm9.187.014 4.297 7.343-1.892 3.282-4.3-7.344zm-6.713 3.6h3.79l-4.212 7.394H3.361Zm11.64 4.109 3.74.027-1.893 3.281-3.74-.027z"/>
+</svg>
diff --git a/frontend/packages/website/src/components/CTASection.tsx b/frontend/packages/website/src/components/CTASection.tsx
deleted file mode 100644
index f47f14e..0000000
--- a/frontend/packages/website/src/components/CTASection.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-'use client';
-
-import { useState, useEffect } from 'react';
-import { motion, AnimatePresence } from 'framer-motion';
-import { ArrowRight, Terminal, Check } from 'lucide-react';
-
-const CTA_TITLES = [
-  'Run coding agents in sandboxes. Control them over HTTP.',
-  'A server inside your sandbox. An API for your app.',
-  'Claude Code, Codex, OpenCode, Amp, Pi — one HTTP API.',
-  'Your app connects remotely. The coding agent runs isolated.',
-  'Streaming events. Handling permissions. Managing sessions.',
-  'Install with curl. Connect over HTTP. Control any coding agent.',
-  'The bridge between your app and sandboxed coding agents.',
-];
-
-function AnimatedCTATitle() {
-  const [currentIndex, setCurrentIndex] = useState(0);
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      setCurrentIndex(prev => (prev + 1) % CTA_TITLES.length);
-    }, 3000);
-
-    return () => clearInterval(interval);
-  }, []);
-
-  return (
-    <h2 className='min-h-[1.2em] text-4xl font-medium tracking-tight text-white md:text-5xl'>
-      <AnimatePresence mode='wait'>
-        <motion.span
-          key={currentIndex}
-          initial={{ opacity: 0, y: 5 }}
-          animate={{ opacity: 1, y: 0 }}
-          exit={{ opacity: 0, y: -5 }}
-          transition={{ duration: 0.1 }}
-          style={{ display: 'block' }}
-        >
-          {CTA_TITLES[currentIndex]}
-        </motion.span>
-      </AnimatePresence>
-    </h2>
-  );
-}
-
-const CopyInstallButton = () => {
-  const [copied, setCopied] = useState(false);
-  const installCommand = 'curl -sSL https://sandboxagent.dev/install | sh';
-
-  const handleCopy = async () => {
-    try {
-      await navigator.clipboard.writeText(installCommand);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    } catch (err) {
-      console.error('Failed to copy:', err);
-    }
-  };
-
-  return (
-    <button
-      onClick={handleCopy}
-      className='inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md border border-white/10 bg-white/5 px-4 py-2 text-sm text-white subpixel-antialiased shadow-sm transition-colors hover:border-white/20'
-    >
-      {copied ? <Check className='h-4 w-4' /> : <Terminal className='h-4 w-4' />}
-      {installCommand}
-    </button>
-  );
-};
-
-export function CTASection() {
-  return (
-    <section className='relative overflow-hidden border-t border-white/10 px-6 py-32 text-center'>
-      <motion.div
-        animate={{ opacity: [0.3, 0.5, 0.3] }}
-        transition={{ duration: 4, repeat: Infinity }}
-        className='pointer-events-none absolute inset-0 bg-[radial-gradient(ellipse_at_center,_var(--tw-gradient-stops))] from-zinc-500/10 via-transparent to-transparent opacity-50'
-      />
-      <div className='relative z-10 mx-auto max-w-3xl'>
-        <div className='mb-8'>
-          <AnimatedCTATitle />
-        </div>
-        <motion.p
-          initial={{ opacity: 0, y: 20 }}
-          whileInView={{ opacity: 1, y: 0 }}
-          viewport={{ once: true }}
-          transition={{ duration: 0.5, delay: 0.1 }}
-          className='mb-10 text-lg leading-relaxed text-zinc-400'
-        >
-          A server that runs inside isolated environments. <br className='hidden md:block' />
-          Your app connects remotely to control any coding agent.
-        </motion.p>
-        <motion.div
-          initial={{ opacity: 0, y: 20 }}
-          whileInView={{ opacity: 1, y: 0 }}
-          viewport={{ once: true }}
-          transition={{ duration: 0.5, delay: 0.2 }}
-          className='flex flex-col items-center justify-center gap-4 sm:flex-row'
-        >
-          <a
-            href='/docs'
-            className='inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md border border-white/10 bg-white px-4 py-2 text-sm text-black subpixel-antialiased shadow-sm transition-colors hover:bg-zinc-200'
-          >
-            Read the Docs
-            <ArrowRight className='h-4 w-4' />
-          </a>
-          <CopyInstallButton />
-        </motion.div>
-      </div>
-    </section>
-  );
-}
diff --git a/frontend/packages/website/src/components/FAQ.tsx b/frontend/packages/website/src/components/FAQ.tsx
index 4000c22..555bf9b 100644
--- a/frontend/packages/website/src/components/FAQ.tsx
+++ b/frontend/packages/website/src/components/FAQ.tsx
@@ -1,42 +1,40 @@
-'use client';
+"use client";
 
-import { useState } from 'react';
-import { ChevronDown } from 'lucide-react';
-import { motion, AnimatePresence } from 'framer-motion';
+import { useState } from "react";
+import { ChevronDown } from "lucide-react";
+import { motion, AnimatePresence } from "framer-motion";
 
 const faqs = [
   {
-    question: 'Does this replace the Vercel AI SDK?',
+    question: "Does this replace the Vercel AI SDK?",
     answer:
       "No, they're complementary. AI SDK is for building chat interfaces and calling LLMs. This SDK is for controlling autonomous coding agents that write code and run commands. Use AI SDK for your UI, use this when you need a coding agent to actually code.",
   },
   {
-    question: 'Which coding agents are supported?',
-    answer:
-      'Claude Code, Codex, OpenCode, Amp, and Pi. The SDK normalizes their APIs so you can swap between them without changing your code.',
+    question: "Which coding agents are supported?",
+    answer: "Claude Code, Codex, OpenCode, Amp, and Pi. The SDK normalizes their APIs so you can swap between them without changing your code.",
   },
   {
-    question: 'How is session data persisted?',
+    question: "How is session data persisted?",
     answer:
       "This SDK does not handle persisting session data. Events stream in a universal JSON schema that you can persist anywhere. Consider using Postgres or <a href='https://rivet.gg' target='_blank' rel='noopener noreferrer' class='text-orange-400 hover:underline'>Rivet Actors</a> for data persistence.",
   },
   {
-    question: 'Can I run this locally or does it require a sandbox provider?',
-    answer:
-      'Both. Run locally for development, deploy to E2B, Daytona, or Vercel Sandboxes for production.',
+    question: "Can I run this locally or does it require a sandbox provider?",
+    answer: "Both. Run locally for development, deploy to E2B, Daytona, or Vercel Sandboxes for production.",
   },
   {
-    question: 'Does it support [platform]?',
+    question: "Does it support [platform]?",
     answer:
       "The server is a single Rust binary that runs anywhere with a curl install. If your platform can run Linux binaries (Docker, VMs, etc.), it works. See the deployment guides for E2B, Daytona, and Vercel Sandboxes.",
   },
   {
-    question: 'Can I use this with my personal API keys?',
+    question: "Can I use this with my personal API keys?",
     answer:
       "Yes. Use <code>sandbox-agent credentials extract-env</code> to extract API keys from your local agent configs (Claude Code, Codex, OpenCode, Amp, Pi) and pass them to the sandbox environment.",
   },
   {
-    question: 'Why Rust and not [language]?',
+    question: "Why Rust and not [language]?",
     answer:
       "Rust gives us a single static binary, fast startup, and predictable memory usage. That makes it easy to run inside sandboxes or in CI without shipping a large runtime, such as Node.js.",
   },
@@ -51,7 +49,7 @@ const faqs = [
       "Official SDKs assume local execution. They spawn processes and expect interactive terminals. This SDK runs a server inside a sandbox that you connect to over HTTP — designed for remote control from the start.",
   },
   {
-    question: 'Why not just SSH into the sandbox?',
+    question: "Why not just SSH into the sandbox?",
     answer:
       "Coding agents expect interactive terminals with proper TTY handling. SSH with piped commands breaks tool confirmations, streaming output, and human-in-the-loop flows. The SDK handles all of this over a clean HTTP API.",
   },
@@ -61,28 +59,21 @@ function FAQItem({ question, answer }: { question: string; answer: string }) {
   const [isOpen, setIsOpen] = useState(false);
 
   return (
-    <div className="border-b border-white/5">
-      <button
-        onClick={() => setIsOpen(!isOpen)}
-        className="flex w-full items-center justify-between py-5 text-left"
-      >
-        <span className="text-base font-medium text-white pr-4">{question}</span>
-        <ChevronDown
-          className={`h-5 w-5 shrink-0 text-zinc-500 transition-transform duration-200 ${
-            isOpen ? 'rotate-180' : ''
-          }`}
-        />
+    <div className="border-t border-white/10 first:border-t-0">
+      <button onClick={() => setIsOpen(!isOpen)} className="group flex w-full items-center justify-between py-5 text-left">
+        <span className="text-base font-normal text-white pr-4 group-hover:text-zinc-300 transition-colors">{question}</span>
+        <ChevronDown className={`h-4 w-4 shrink-0 text-zinc-500 transition-transform duration-200 ${isOpen ? "rotate-180" : ""}`} />
       </button>
       <AnimatePresence>
         {isOpen && (
           <motion.div
             initial={{ height: 0, opacity: 0 }}
-            animate={{ height: 'auto', opacity: 1 }}
+            animate={{ height: "auto", opacity: 1 }}
             exit={{ height: 0, opacity: 0 }}
             transition={{ duration: 0.2 }}
             className="overflow-hidden"
           >
-            <p className="pb-5 text-sm leading-relaxed text-zinc-400" dangerouslySetInnerHTML={{ __html: answer }} />
+            <p className="pb-5 text-sm leading-relaxed text-zinc-500" dangerouslySetInnerHTML={{ __html: answer }} />
           </motion.div>
         )}
       </AnimatePresence>
@@ -92,22 +83,40 @@ function FAQItem({ question, answer }: { question: string; answer: string }) {
 
 export function FAQ() {
   return (
-    <section className="relative overflow-hidden border-t border-white/5 py-24">
-      <div className="mx-auto max-w-3xl px-6">
+    <section className="border-t border-white/10 py-48">
+      <div className="mx-auto max-w-7xl px-6">
         <div className="mb-12 text-center">
-          <h2 className="mb-4 text-3xl font-medium tracking-tight text-white">
+          <motion.h2
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5 }}
+            className="mb-2 text-2xl font-normal tracking-tight text-white md:text-4xl"
+          >
             Frequently Asked Questions
-          </h2>
-          <p className="text-zinc-400">
+          </motion.h2>
+          <motion.p
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5, delay: 0.1 }}
+            className="mx-auto max-w-xl text-base leading-relaxed text-zinc-500"
+          >
             Common questions about running agents in sandboxes.
-          </p>
+          </motion.p>
         </div>
 
-        <div className="divide-y divide-white/5 rounded-2xl border border-white/5 bg-zinc-900/30 px-6">
+        <motion.div
+          initial={{ opacity: 0, y: 20 }}
+          whileInView={{ opacity: 1, y: 0 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.5, delay: 0.2 }}
+          className="mx-auto max-w-3xl"
+        >
           {faqs.map((faq, index) => (
             <FAQItem key={index} question={faq.question} answer={faq.answer} />
           ))}
-        </div>
+        </motion.div>
       </div>
     </section>
   );
diff --git a/frontend/packages/website/src/components/FeatureGrid.tsx b/frontend/packages/website/src/components/FeatureGrid.tsx
index 47c2d4a..93cbd5d 100644
--- a/frontend/packages/website/src/components/FeatureGrid.tsx
+++ b/frontend/packages/website/src/components/FeatureGrid.tsx
@@ -1,169 +1,119 @@
-'use client';
+"use client";
 
-import { Workflow, Server, Database, Download, Globe, Plug } from 'lucide-react';
-import { FeatureIcon } from './ui/FeatureIcon';
+import { motion } from "framer-motion";
+import { Workflow, Server, Database, Download, Globe, Plug } from "lucide-react";
 
 export function FeatureGrid() {
   return (
-    <section id="features" className="relative overflow-hidden border-t border-white/5 py-32">
-      <div className="relative z-10 mx-auto max-w-7xl px-6">
-        <div className="mb-16">
-          <h2 className="mb-4 text-3xl font-medium tracking-tight text-white md:text-5xl">
+    <section id="features" className="border-t border-white/10 py-48">
+      <div className="mx-auto max-w-7xl px-6">
+        <div className="mb-12">
+          <motion.h2
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5 }}
+            className="mb-2 text-2xl font-normal tracking-tight text-white md:text-4xl"
+          >
             How it works.
-          </h2>
-          <p className="text-lg leading-relaxed text-zinc-400">
+          </motion.h2>
+          <motion.p
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5, delay: 0.1 }}
+            className="max-w-xl text-base leading-relaxed text-zinc-500"
+          >
             A server runs inside your sandbox. Your app connects over HTTP to control any coding agent.
-          </p>
+          </motion.p>
         </div>
 
-        <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
+        <motion.div
+          initial={{ opacity: 0, y: 20 }}
+          whileInView={{ opacity: 1, y: 0 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.5 }}
+          className="grid gap-4 md:grid-cols-2 lg:grid-cols-4"
+        >
           {/* Universal Agent API - Span full width */}
-          <div className="col-span-full group relative flex flex-col gap-4 overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            {/* Top Shine Highlight */}
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {/* Top Left Reflection/Glow */}
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(255,79,0,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            {/* Sharp Edge Highlight */}
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-orange-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 flex flex-col gap-4">
-              <div className="relative z-10 mb-2 flex items-center gap-3">
-                <FeatureIcon
-                  icon={Workflow}
-                  color="text-orange-400"
-                  bgColor="bg-orange-500/10"
-                  hoverBgColor="group-hover:bg-orange-500/20"
-                  glowShadow="group-hover:shadow-[0_0_15px_rgba(255,79,0,0.5)]"
-                />
-                <h4 className="text-sm font-medium uppercase tracking-wider text-white">Universal Agent API</h4>
+          <div className="group col-span-full flex flex-col gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="flex items-center gap-3">
+              <div className="text-zinc-500 transition-colors group-hover:text-orange-400">
+                <Workflow className="h-4 w-4" />
               </div>
-              <p className="text-zinc-400 leading-relaxed text-lg max-w-2xl">
-                Claude Code, Codex, OpenCode, Amp, and Pi each have different APIs. We provide a single,
-                unified interface to control them all.
-              </p>
+              <h4 className="text-base font-normal text-white">Universal Agent API</h4>
             </div>
+            <p className="text-zinc-500 leading-relaxed text-base max-w-2xl">
+              Claude Code, Codex, OpenCode, and Amp each have different APIs. We provide a single, unified interface to control them all.
+            </p>
           </div>
-          {/* Streaming Events */}
-          <div className="group relative flex flex-col gap-4 overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            {/* Top Shine Highlight */}
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {/* Top Left Reflection/Glow */}
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(34,197,94,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            {/* Sharp Edge Highlight */}
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-green-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
 
-            <div className="relative z-10 mb-2 flex items-center gap-3">
-              <FeatureIcon
-                icon={Server}
-                color="text-green-400"
-                bgColor="bg-green-500/10"
-                hoverBgColor="group-hover:bg-green-500/20"
-                glowShadow="group-hover:shadow-[0_0_15px_rgba(34,197,94,0.5)]"
-              />
-              <h4 className="text-sm font-medium uppercase tracking-wider text-white">Streaming Events</h4>
+          {/* Streaming Events */}
+          <div className="group flex flex-col gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="flex items-center gap-3">
+              <div className="text-zinc-500 transition-colors group-hover:text-green-400">
+                <Server className="h-4 w-4" />
+              </div>
+              <h4 className="text-base font-normal text-white">Streaming Events</h4>
             </div>
-            <p className="text-zinc-400 text-sm leading-relaxed">
+            <p className="text-zinc-500 text-sm leading-relaxed">
               Real-time SSE stream of everything the agent does. Persist to your storage, replay sessions, audit everything.
             </p>
           </div>
 
-          {/* Handling Permissions */}
-          <div className="group relative flex flex-col gap-4 overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            {/* Top Shine Highlight */}
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {/* Top Left Reflection/Glow */}
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(168,85,247,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            {/* Sharp Edge Highlight */}
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-purple-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-2 flex items-center gap-3">
-              <FeatureIcon
-                icon={Database}
-                color="text-purple-400"
-                bgColor="bg-purple-500/10"
-                hoverBgColor="group-hover:bg-purple-500/20"
-                glowShadow="group-hover:shadow-[0_0_15px_rgba(168,85,247,0.5)]"
-              />
-              <h4 className="text-sm font-medium uppercase tracking-wider text-white">Universal Schema</h4>
+          {/* Universal Schema */}
+          <div className="group flex flex-col gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="flex items-center gap-3">
+              <div className="text-zinc-500 transition-colors group-hover:text-purple-400">
+                <Database className="h-4 w-4" />
+              </div>
+              <h4 className="text-base font-normal text-white">Universal Schema</h4>
             </div>
-            <p className="text-zinc-400 text-sm leading-relaxed">
-              Standardized session schema that covers all features of all agents. Includes tool calls, permission requests, file edits, etc. Approve or deny tool executions remotely over HTTP.
+            <p className="text-zinc-500 text-sm leading-relaxed">
+              Standardized session schema that covers all features of all agents. Includes tool calls, permission requests, file edits, etc.
             </p>
           </div>
 
           {/* Runs Inside Any Sandbox */}
-          <div className="lg:col-span-2 group relative flex flex-col gap-4 overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            {/* Top Shine Highlight */}
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {/* Top Left Reflection/Glow */}
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(59,130,246,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            {/* Sharp Edge Highlight */}
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-blue-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-2 flex items-center gap-3">
-              <FeatureIcon
-                icon={Globe}
-                color="text-blue-400"
-                bgColor="bg-blue-500/10"
-                hoverBgColor="group-hover:bg-blue-500/20"
-                glowShadow="group-hover:shadow-[0_0_15px_rgba(59,130,246,0.5)]"
-              />
-              <h4 className="text-sm font-medium uppercase tracking-wider text-white">Runs Inside Any Sandbox</h4>
+          <div className="group lg:col-span-2 flex flex-col gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="flex items-center gap-3">
+              <div className="text-zinc-500 transition-colors group-hover:text-blue-400">
+                <Globe className="h-4 w-4" />
+              </div>
+              <h4 className="text-base font-normal text-white">Runs Inside Any Sandbox</h4>
             </div>
-            <p className="text-zinc-400 text-sm leading-relaxed">
+            <p className="text-zinc-500 text-sm leading-relaxed">
               Lightweight static binary. One curl command to install inside E2B, Daytona, Vercel Sandboxes, or Docker.
             </p>
           </div>
 
-          {/* Automatic Agent Installation */}
-          <div className="lg:col-span-2 group relative flex flex-col gap-4 overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            {/* Top Shine Highlight */}
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {/* Top Left Reflection/Glow */}
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(245,158,11,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            {/* Sharp Edge Highlight */}
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-amber-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-2 flex items-center gap-3">
-              <FeatureIcon
-                icon={Download}
-                color="text-amber-400"
-                bgColor="bg-amber-500/10"
-                hoverBgColor="group-hover:bg-amber-500/20"
-                glowShadow="group-hover:shadow-[0_0_15px_rgba(245,158,11,0.5)]"
-              />
-              <h4 className="text-sm font-medium uppercase tracking-wider text-white">Automatic Agent Installation</h4>
+          {/* Session Management */}
+          <div className="group lg:col-span-2 flex flex-col gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="flex items-center gap-3">
+              <div className="text-zinc-500 transition-colors group-hover:text-amber-400">
+                <Download className="h-4 w-4" />
+              </div>
+              <h4 className="text-base font-normal text-white">Session Management</h4>
             </div>
-            <p className="text-zinc-400 text-sm leading-relaxed">
+            <p className="text-zinc-500 text-sm leading-relaxed">
               Create sessions, send messages, persist transcripts. Full session lifecycle management over HTTP.
             </p>
           </div>
 
           {/* OpenCode SDK & UI Support */}
-          <div className="lg:col-span-2 group relative flex flex-col gap-4 overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            {/* Top Shine Highlight */}
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            {/* Top Left Reflection/Glow */}
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(236,72,153,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            {/* Sharp Edge Highlight */}
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-pink-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-2 flex items-center gap-3">
-              <FeatureIcon
-                icon={Plug}
-                color="text-pink-400"
-                bgColor="bg-pink-500/10"
-                hoverBgColor="group-hover:bg-pink-500/20"
-                glowShadow="group-hover:shadow-[0_0_15px_rgba(236,72,153,0.5)]"
-              />
-              <h4 className="text-sm font-medium uppercase tracking-wider text-white">OpenCode SDK & UI Support</h4>
-              <span className="rounded-full bg-pink-500/20 px-2 py-0.5 text-xs font-medium text-pink-300">Experimental</span>
+          <div className="group lg:col-span-2 flex flex-col gap-4 rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="flex items-center gap-3">
+              <div className="text-zinc-500 transition-colors group-hover:text-pink-400">
+                <Plug className="h-4 w-4" />
+              </div>
+              <h4 className="text-base font-normal text-white">OpenCode Support</h4>
+              <span className="rounded-full border border-white/10 px-2 py-0.5 text-[10px] font-medium text-zinc-500 transition-colors group-hover:text-pink-400 group-hover:border-pink-400/30">
+                Experimental
+              </span>
             </div>
-            <p className="text-zinc-400 text-sm leading-relaxed">
-              Connect OpenCode CLI, SDK, or web UI to control agents through familiar OpenCode tooling.
-            </p>
+            <p className="text-zinc-500 text-sm leading-relaxed">Connect OpenCode CLI, SDK, or web UI to control agents through familiar OpenCode tooling.</p>
           </div>
-        </div>
+        </motion.div>
       </div>
     </section>
   );
diff --git a/frontend/packages/website/src/components/Footer.tsx b/frontend/packages/website/src/components/Footer.tsx
index 1daebc4..b8557d8 100644
--- a/frontend/packages/website/src/components/Footer.tsx
+++ b/frontend/packages/website/src/components/Footer.tsx
@@ -1,24 +1,26 @@
-'use client';
+"use client";
+
+import { motion } from "framer-motion";
 
 const footer = {
   products: [
-    { name: 'Actors', href: 'https://rivet.dev/docs/actors' },
-    { name: 'Sandbox Agent SDK', href: '/docs' },
+    { name: "Actors", href: "https://rivet.dev/docs/actors" },
+    { name: "Sandbox Agent SDK", href: "/docs" },
   ],
   developers: [
-    { name: 'Documentation', href: '/docs' },
-    { name: 'Changelog', href: 'https://github.com/rivet-dev/sandbox-agent/releases' },
-    { name: 'Blog', href: 'https://www.rivet.dev/blog/' },
+    { name: "Documentation", href: "/docs" },
+    { name: "Changelog", href: "https://github.com/rivet-dev/sandbox-agent/releases" },
+    { name: "Blog", href: "https://www.rivet.dev/blog/" },
   ],
   legal: [
-    { name: 'Terms', href: 'https://rivet.dev/terms' },
-    { name: 'Privacy Policy', href: 'https://rivet.dev/privacy' },
-    { name: 'Acceptable Use', href: 'https://rivet.dev/acceptable-use' },
+    { name: "Terms", href: "https://rivet.dev/terms" },
+    { name: "Privacy Policy", href: "https://rivet.dev/privacy" },
+    { name: "Acceptable Use", href: "https://rivet.dev/acceptable-use" },
   ],
   social: [
     {
-      name: 'Discord',
-      href: 'https://discord.gg/auCecybynK',
+      name: "Discord",
+      href: "https://discord.gg/auCecybynK",
       icon: (
         <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z" />
@@ -26,8 +28,8 @@ const footer = {
       ),
     },
     {
-      name: 'GitHub',
-      href: 'https://github.com/rivet-dev/sandbox-agent',
+      name: "GitHub",
+      href: "https://github.com/rivet-dev/sandbox-agent",
       icon: (
         <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
@@ -35,8 +37,8 @@ const footer = {
       ),
     },
     {
-      name: 'Twitter',
-      href: 'https://x.com/rivet_dev',
+      name: "Twitter",
+      href: "https://x.com/rivet_dev",
       icon: (
         <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           <path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z" />
@@ -48,89 +50,89 @@ const footer = {
 
 export function Footer() {
   return (
-    <footer className="border-t border-white/10 bg-zinc-950">
-      <div className="mx-auto max-w-7xl px-6 py-12 lg:py-16">
+    <footer className="border-t border-white/10 bg-[#09090b]">
+      <div className="mx-auto max-w-6xl px-6 py-16 lg:py-20">
         <div className="xl:grid xl:grid-cols-12 xl:gap-16">
           {/* Logo & Social */}
-          <div className="space-y-6 xl:col-span-4">
-            <a href="https://rivet.dev">
-              <img src="/rivet-logo-text-white.svg" alt="Rivet" className="h-6 w-auto" />
+          <motion.div
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5 }}
+            className="space-y-6 xl:col-span-4"
+          >
+            <a href="https://rivet.dev" className="inline-block">
+              <img src="/rivet-logo-text-white.svg" alt="Rivet" className="h-6 w-auto opacity-90 hover:opacity-100 transition-opacity" />
             </a>
-            <p className="text-sm leading-6 text-zinc-400">
-              Build and scale stateful workloads
-            </p>
+            <p className="text-sm leading-6 text-zinc-500">Infrastructure for software that thinks</p>
             <div className="flex space-x-4">
               {footer.social.map((item) => (
-                <a
-                  key={item.name}
-                  href={item.href}
-                  className="text-zinc-500 hover:text-white transition-colors"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
+                <a key={item.name} href={item.href} className="text-zinc-500 hover:text-white transition-colors" target="_blank" rel="noopener noreferrer">
                   <span className="sr-only">{item.name}</span>
                   {item.icon}
                 </a>
               ))}
             </div>
-          </div>
+          </motion.div>
 
           {/* Links */}
           <div className="mt-12 grid grid-cols-2 gap-8 md:grid-cols-3 xl:col-span-8 xl:mt-0">
-            <div>
+            <motion.div initial={{ opacity: 0, y: 20 }} whileInView={{ opacity: 1, y: 0 }} viewport={{ once: true }} transition={{ duration: 0.5, delay: 0.1 }}>
               <h3 className="text-sm font-semibold leading-6 text-white">Products</h3>
               <ul role="list" className="mt-4 space-y-3">
                 {footer.products.map((item) => (
                   <li key={item.name}>
-                    <a
-                      href={item.href}
-                      className="text-sm leading-6 text-zinc-400 hover:text-white transition-colors"
-                    >
+                    <a href={item.href} className="text-sm leading-6 text-zinc-500 hover:text-white transition-colors">
                       {item.name}
                     </a>
                   </li>
                 ))}
               </ul>
-            </div>
-            <div>
+            </motion.div>
+
+            <motion.div
+              initial={{ opacity: 0, y: 20 }}
+              whileInView={{ opacity: 1, y: 0 }}
+              viewport={{ once: true }}
+              transition={{ duration: 0.5, delay: 0.15 }}
+            >
               <h3 className="text-sm font-semibold leading-6 text-white">Developers</h3>
               <ul role="list" className="mt-4 space-y-3">
                 {footer.developers.map((item) => (
                   <li key={item.name}>
-                    <a
-                      href={item.href}
-                      className="text-sm leading-6 text-zinc-400 hover:text-white transition-colors"
-                    >
+                    <a href={item.href} className="text-sm leading-6 text-zinc-500 hover:text-white transition-colors">
                       {item.name}
                     </a>
                   </li>
                 ))}
               </ul>
-            </div>
-            <div>
+            </motion.div>
+
+            <motion.div initial={{ opacity: 0, y: 20 }} whileInView={{ opacity: 1, y: 0 }} viewport={{ once: true }} transition={{ duration: 0.5, delay: 0.2 }}>
               <h3 className="text-sm font-semibold leading-6 text-white">Legal</h3>
               <ul role="list" className="mt-4 space-y-3">
                 {footer.legal.map((item) => (
                   <li key={item.name}>
-                    <a
-                      href={item.href}
-                      className="text-sm leading-6 text-zinc-400 hover:text-white transition-colors"
-                    >
+                    <a href={item.href} className="text-sm leading-6 text-zinc-500 hover:text-white transition-colors">
                       {item.name}
                     </a>
                   </li>
                 ))}
               </ul>
-            </div>
+            </motion.div>
           </div>
         </div>
 
         {/* Bottom */}
-        <div className="mt-12 border-t border-white/10 pt-8">
-          <p className="text-xs text-zinc-500 text-center">
-            &copy; {new Date().getFullYear()} Rivet Gaming, Inc. All rights reserved.
-          </p>
-        </div>
+        <motion.div
+          initial={{ opacity: 0 }}
+          whileInView={{ opacity: 1 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.5, delay: 0.3 }}
+          className="mt-12 border-t border-white/10 pt-8"
+        >
+          <p className="text-xs text-zinc-600 text-center">&copy; {new Date().getFullYear()} Rivet Gaming, Inc. All rights reserved.</p>
+        </motion.div>
       </div>
     </footer>
   );
diff --git a/frontend/packages/website/src/components/GetStarted.tsx b/frontend/packages/website/src/components/GetStarted.tsx
index 923ac48..11f52b0 100644
--- a/frontend/packages/website/src/components/GetStarted.tsx
+++ b/frontend/packages/website/src/components/GetStarted.tsx
@@ -1,11 +1,15 @@
-'use client';
+"use client";
 
-import { Code, Server, GitBranch } from 'lucide-react';
-import { CopyButton } from './ui/CopyButton';
+import { motion } from "framer-motion";
+import { Code, Server, GitBranch } from "lucide-react";
+import { CopyButton } from "./ui/CopyButton";
 
 const sdkCodeRaw = `import { SandboxAgent } from "sandbox-agent";
+import { local } from "sandbox-agent/local";
 
-const client = await SandboxAgent.start();
+const client = await SandboxAgent.start({
+  sandbox: local(),
+});
 
 await client.createSession("my-session", {
   agent: "claude-code",
@@ -31,13 +35,26 @@ function SdkCodeHighlighted() {
         <span className="text-zinc-300"> </span>
         <span className="text-green-400">"sandbox-agent"</span>
         <span className="text-zinc-300">;</span>
+        {"\n"}
+        <span className="text-purple-400">import</span>
+        <span className="text-zinc-300">{" { "}</span>
+        <span className="text-white">local</span>
+        <span className="text-zinc-300">{" } "}</span>
+        <span className="text-purple-400">from</span>
+        <span className="text-zinc-300"> </span>
+        <span className="text-green-400">"sandbox-agent/local"</span>
+        <span className="text-zinc-300">;</span>
         {"\n\n"}
         <span className="text-purple-400">const</span>
         <span className="text-zinc-300"> client = </span>
         <span className="text-purple-400">await</span>
         <span className="text-zinc-300"> SandboxAgent.</span>
         <span className="text-blue-400">start</span>
-        <span className="text-zinc-300">();</span>
+        <span className="text-zinc-300">{"({"}</span>
+        {"\n"}
+        <span className="text-zinc-300">{"  sandbox: local(),"}</span>
+        {"\n"}
+        <span className="text-zinc-300">{"});"}</span>
         {"\n\n"}
         <span className="text-purple-400">await</span>
         <span className="text-zinc-300"> client.</span>
@@ -86,7 +103,7 @@ function SdkCodeHighlighted() {
   );
 }
 
-const sandboxCommand = `curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh`;
+const sandboxCommand = `curl -fsSL https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh | sh`;
 
 const sourceCommands = `git clone https://github.com/rivet-dev/sandbox-agent
 cd sandbox-agent
@@ -94,44 +111,55 @@ cargo run -p sandbox-agent --release`;
 
 export function GetStarted() {
   return (
-    <section id="get-started" className="relative overflow-hidden border-t border-white/5 py-32">
-      <div className="relative z-10 mx-auto max-w-7xl px-6">
-        <div className="mb-16 text-center">
-          <h2 className="mb-4 text-3xl font-medium tracking-tight text-white md:text-5xl">
+    <section id="get-started" className="border-t border-white/10 py-48">
+      <div className="mx-auto max-w-7xl px-6">
+        <div className="mb-12">
+          <motion.h2
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5 }}
+            className="mb-2 text-2xl font-normal tracking-tight text-white md:text-4xl"
+          >
             Get Started
-          </h2>
-          <p className="text-lg text-zinc-400">
+          </motion.h2>
+          <motion.p
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5, delay: 0.1 }}
+            className="max-w-xl text-base leading-relaxed text-zinc-500"
+          >
             Choose the installation method that works best for your use case.
-          </p>
-          <p className="mt-4 text-sm text-zinc-500">
-            Quick OpenCode attach: <span className="font-mono text-white">npx @sandbox-agent/gigacode</span>
-          </p>
+          </motion.p>
         </div>
 
-        <div className="grid grid-cols-1 gap-6 md:grid-cols-3">
+        <motion.div
+          initial={{ opacity: 0, y: 20 }}
+          whileInView={{ opacity: 1, y: 0 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.5 }}
+          className="grid grid-cols-1 gap-4 md:grid-cols-3"
+        >
           {/* Option 1: SDK */}
-          <div className="group relative flex flex-col overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(59,130,246,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-blue-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-4 flex items-center gap-3">
-              <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-blue-500/10 text-blue-400 transition-all duration-300 group-hover:bg-blue-500/20 group-hover:shadow-[0_0_15px_rgba(59,130,246,0.5)]">
-                <Code className="h-5 w-5" />
+          <div className="group flex flex-col rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="mb-4 flex items-center gap-3">
+              <div className="text-zinc-500">
+                <Code className="h-4 w-4" />
               </div>
               <div>
-                <h3 className="text-lg font-semibold text-white">TypeScript SDK</h3>
+                <h3 className="text-base font-normal text-white">TypeScript SDK</h3>
                 <p className="text-xs text-zinc-500">Embed in your application</p>
               </div>
             </div>
 
-            <p className="relative z-10 mb-4 text-sm leading-relaxed text-zinc-400 min-h-[4.5rem]">
+            <p className="mb-4 text-sm leading-relaxed text-zinc-500">
               Import the TypeScript SDK directly into your Node or browser application. Full type safety and streaming support.
             </p>
 
-            <div className="relative z-10 flex-1 flex flex-col">
-              <div className="overflow-hidden rounded-lg border border-white/5 bg-black/50 flex-1 flex flex-col">
-                <div className="flex items-center justify-between border-b border-white/5 bg-white/5 px-3 py-2">
+            <div className="flex-1 flex flex-col">
+              <div className="overflow-hidden rounded-lg border border-white/10 bg-[#0c0c0e] flex-1 flex flex-col">
+                <div className="flex items-center justify-between border-b border-white/10 bg-white/5 px-3 py-2">
                   <span className="text-[10px] font-medium text-zinc-500">example.ts</span>
                   <CopyButton text={sdkCodeRaw} />
                 </div>
@@ -140,29 +168,25 @@ export function GetStarted() {
             </div>
           </div>
 
-          {/* Option 2: Sandbox */}
-          <div className="group relative flex flex-col overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(34,197,94,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-green-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-4 flex items-center gap-3">
-              <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-green-500/10 text-green-400 transition-all duration-300 group-hover:bg-green-500/20 group-hover:shadow-[0_0_15px_rgba(34,197,94,0.5)]">
-                <Server className="h-5 w-5" />
+          {/* Option 2: HTTP API */}
+          <div className="group flex flex-col rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="mb-4 flex items-center gap-3">
+              <div className="text-zinc-500">
+                <Server className="h-4 w-4" />
               </div>
               <div>
-                <h3 className="text-lg font-semibold text-white">HTTP API</h3>
+                <h3 className="text-base font-normal text-white">HTTP API</h3>
                 <p className="text-xs text-zinc-500">Run as a server</p>
               </div>
             </div>
 
-            <p className="relative z-10 mb-4 text-sm leading-relaxed text-zinc-400 min-h-[4.5rem]">
+            <p className="mb-4 text-sm leading-relaxed text-zinc-500">
               Run as an HTTP server and connect from any language. Deploy to E2B, Daytona, Vercel, or your own infrastructure.
             </p>
 
-            <div className="relative z-10 flex-1 flex flex-col">
-              <div className="overflow-hidden rounded-lg border border-white/5 bg-black/50 flex-1 flex flex-col">
-                <div className="flex items-center justify-between border-b border-white/5 bg-white/5 px-3 py-2">
+            <div className="flex-1 flex flex-col">
+              <div className="overflow-hidden rounded-lg border border-white/10 bg-[#0c0c0e] flex-1 flex flex-col">
+                <div className="flex items-center justify-between border-b border-white/10 bg-white/5 px-3 py-2">
                   <span className="text-[10px] font-medium text-zinc-500">terminal</span>
                   <CopyButton text={sandboxCommand} />
                 </div>
@@ -172,7 +196,7 @@ export function GetStarted() {
                     <span className="text-zinc-300">curl -fsSL \</span>
                     {"\n"}
                     <span className="text-zinc-300">{"    "}</span>
-                    <span className="text-green-400">https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh</span>
+                    <span className="text-green-400">https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh</span>
                     <span className="text-zinc-300"> | </span>
                     <span className="text-blue-400">sh</span>
                   </code>
@@ -181,29 +205,25 @@ export function GetStarted() {
             </div>
           </div>
 
-          {/* Option 3: Build from Source */}
-          <div className="group relative flex flex-col overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50">
-            <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-            <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(245,158,11,0.15)_0%,transparent_50%)] opacity-0 transition-opacity duration-500 group-hover:opacity-100" />
-            <div className="pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t border-amber-500 opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100" />
-
-            <div className="relative z-10 mb-4 flex items-center gap-3">
-              <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-amber-500/10 text-amber-400 transition-all duration-300 group-hover:bg-amber-500/20 group-hover:shadow-[0_0_15px_rgba(245,158,11,0.5)]">
-                <GitBranch className="h-5 w-5" />
+          {/* Option 3: Open Source */}
+          <div className="group flex flex-col rounded-xl border border-white/10 bg-white/[0.02] p-6 transition-colors hover:border-white/20">
+            <div className="mb-4 flex items-center gap-3">
+              <div className="text-zinc-500">
+                <GitBranch className="h-4 w-4" />
               </div>
               <div>
-                <h3 className="text-lg font-semibold text-white">Open Source</h3>
+                <h3 className="text-base font-normal text-white">Open Source</h3>
                 <p className="text-xs text-zinc-500">Full control</p>
               </div>
             </div>
 
-            <p className="relative z-10 mb-4 text-sm leading-relaxed text-zinc-400 min-h-[4.5rem]">
+            <p className="mb-4 text-sm leading-relaxed text-zinc-500">
               Clone the repo and build with Cargo. Customize, contribute, or embed directly in your Rust project.
             </p>
 
-            <div className="relative z-10 flex-1 flex flex-col">
-              <div className="overflow-hidden rounded-lg border border-white/5 bg-black/50 flex-1 flex flex-col">
-                <div className="flex items-center justify-between border-b border-white/5 bg-white/5 px-3 py-2">
+            <div className="flex-1 flex flex-col">
+              <div className="overflow-hidden rounded-lg border border-white/10 bg-[#0c0c0e] flex-1 flex flex-col">
+                <div className="flex items-center justify-between border-b border-white/10 bg-white/5 px-3 py-2">
                   <span className="text-[10px] font-medium text-zinc-500">terminal</span>
                   <CopyButton text={sourceCommands} />
                 </div>
@@ -226,7 +246,7 @@ export function GetStarted() {
               </div>
             </div>
           </div>
-        </div>
+        </motion.div>
       </div>
     </section>
   );
diff --git a/frontend/packages/website/src/components/GitHubStars.tsx b/frontend/packages/website/src/components/GitHubStars.tsx
index 38799aa..2242f5a 100644
--- a/frontend/packages/website/src/components/GitHubStars.tsx
+++ b/frontend/packages/website/src/components/GitHubStars.tsx
@@ -1,6 +1,6 @@
-'use client';
+"use client";
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from "react";
 
 interface GitHubStarsProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
   repo?: string;
@@ -13,11 +13,7 @@ function formatNumber(num: number): string {
   return num.toString();
 }
 
-export function GitHubStars({
-  repo = 'rivet-dev/sandbox-agent',
-  className,
-  ...props
-}: GitHubStarsProps) {
+export function GitHubStars({ repo = "rivet-dev/sandbox-agent", className, ...props }: GitHubStarsProps) {
   const [stars, setStars] = useState<number | null>(null);
 
   useEffect(() => {
@@ -35,7 +31,7 @@ export function GitHubStars({
 
     fetch(`https://api.github.com/repos/${repo}`)
       .then((response) => {
-        if (!response.ok) throw new Error('Failed to fetch');
+        if (!response.ok) throw new Error("Failed to fetch");
         return response.json();
       })
       .then((data) => {
@@ -50,29 +46,16 @@ export function GitHubStars({
         );
       })
       .catch((err) => {
-        console.error('Failed to fetch stars', err);
+        console.error("Failed to fetch stars", err);
       });
   }, [repo]);
 
   return (
-    <a
-      href={`https://github.com/${repo}`}
-      target="_blank"
-      rel="noreferrer"
-      className={className}
-      {...props}
-    >
-      <svg
-        className="w-5 h-5"
-        fill="currentColor"
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
+    <a href={`https://github.com/${repo}`} target="_blank" rel="noreferrer" className={className} {...props}>
+      <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
         <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
       </svg>
-      <span className="hidden md:inline">
-        {stars ? `${formatNumber(stars)} Stars` : 'GitHub'}
-      </span>
+      <span className="hidden md:inline">{stars ? `${formatNumber(stars)} Stars` : "GitHub"}</span>
     </a>
   );
 }
diff --git a/frontend/packages/website/src/components/Hero.tsx b/frontend/packages/website/src/components/Hero.tsx
index 873c166..f09c668 100644
--- a/frontend/packages/website/src/components/Hero.tsx
+++ b/frontend/packages/website/src/components/Hero.tsx
@@ -1,13 +1,15 @@
-'use client';
+"use client";
 
-import { useState, useEffect } from 'react';
-import { Terminal, Check, ArrowRight } from 'lucide-react';
+import { useState, useEffect } from "react";
+import { motion } from "framer-motion";
+import { Terminal, Check, ArrowRight } from "lucide-react";
 
-const AGENT_PROCESSES = [
-  { label: 'Claude Code', color: '#D97757', x: 35, y: 70, logo: '/logos/claude.svg' },
-  { label: 'Codex', color: '#10A37F', x: 185, y: 70, logo: 'openai' },
-  { label: 'Amp', color: '#F59E0B', x: 35, y: 155, logo: '/logos/amp.svg' },
-  { label: 'OpenCode', color: '#8B5CF6', x: 185, y: 155, logo: 'opencode' },
+const ADAPTERS = [
+  { label: "Claude Code", color: "#D97757", x: 20, y: 70, logo: "/logos/claude.svg" },
+  { label: "Codex", color: "#10A37F", x: 132, y: 70, logo: "openai" },
+  { label: "Pi", color: "#06B6D4", x: 244, y: 70, logo: "pi" },
+  { label: "Amp", color: "#F59E0B", x: 76, y: 155, logo: "/logos/amp.svg" },
+  { label: "OpenCode", color: "#8B5CF6", x: 188, y: 155, logo: "opencode" },
 ];
 
 function UniversalAPIDiagram() {
@@ -15,29 +17,22 @@ function UniversalAPIDiagram() {
 
   useEffect(() => {
     const interval = setInterval(() => {
-      setActiveIndex((prev) => (prev + 1) % AGENT_PROCESSES.length);
+      setActiveIndex((prev) => (prev + 1) % ADAPTERS.length);
     }, 2000);
     return () => clearInterval(interval);
   }, []);
 
   return (
-    <div className="relative w-full aspect-[16/9] bg-[#050505] rounded-xl border border-white/10 overflow-hidden flex items-center justify-center">
-      {/* Background Grid */}
+    <div className="relative w-full aspect-[4/3] sm:aspect-[16/9] bg-[#0c0c0e] rounded-xl border border-white/10 overflow-hidden flex items-center justify-center shadow-2xl">
+      {/* Background Dots - color changes with active adapter */}
       <div
-        className="absolute inset-0 opacity-[0.03] pointer-events-none"
+        className="absolute inset-0 opacity-[0.15] pointer-events-none transition-all duration-1000"
         style={{
-          backgroundImage:
-            'linear-gradient(#fff 1px, transparent 1px), linear-gradient(90deg, #fff 1px, transparent 1px)',
-          backgroundSize: '40px 40px',
+          backgroundImage: `radial-gradient(circle, ${ADAPTERS[activeIndex].color} 1px, transparent 1px)`,
+          backgroundSize: "24px 24px",
         }}
       />
 
-      {/* Dynamic Background Glow */}
-      <div
-        className="absolute top-1/2 right-1/4 -translate-y-1/2 w-64 h-64 blur-[100px] rounded-full transition-colors duration-1000 opacity-20"
-        style={{ backgroundColor: AGENT_PROCESSES[activeIndex].color }}
-      />
-
       <svg viewBox="0 0 800 450" className="w-full h-full relative z-10">
         <defs>
           <filter id="glow" x="-20%" y="-20%" width="140%" height="140%">
@@ -49,13 +44,12 @@ function UniversalAPIDiagram() {
           </filter>
         </defs>
 
-        {/* YOUR APP NODE */}
-        <g transform="translate(60, 175)">
-          <rect width="180" height="100" rx="16" fill="#0A0A0A" stroke="#333" strokeWidth="2" />
-          <text x="90" y="55" fill="#FFFFFF" textAnchor="middle" fontSize="20" fontWeight="700">
-            Your App
-          </text>
-        </g>
+        {/* YOUR APP NODE - Glass dark effect with backdrop blur */}
+        <foreignObject x="60" y="175" width="180" height="100">
+          <div className="w-full h-full rounded-xl border border-white/10 bg-[#09090b]/60 backdrop-blur-md flex items-center justify-center">
+            <span className="text-white text-xl font-bold">Your App</span>
+          </div>
+        </foreignObject>
 
         {/* HTTP/SSE LINE */}
         <g>
@@ -73,78 +67,75 @@ function UniversalAPIDiagram() {
           </text>
         </g>
 
-        {/* SANDBOX BOUNDARY */}
-        <g transform="translate(360, 45)">
-          <rect width="380" height="360" rx="24" fill="#080808" stroke="#333" strokeWidth="1.5" />
-          <rect width="380" height="45" rx="12" fill="rgba(255,255,255,0.02)" />
-          <text x="190" y="28" fill="#FFFFFF" textAnchor="middle" fontSize="14" fontWeight="800" letterSpacing="0.2em">
-            SANDBOX
+        {/* SANDBOX BOUNDARY - Glass dark effect with backdrop blur */}
+        <foreignObject x="360" y="45" width="410" height="360">
+          <div className="w-full h-full rounded-xl border border-white/10 bg-[#09090b]/60 backdrop-blur-md">
+            <div className="text-white text-sm font-extrabold tracking-[0.2em] text-center pt-4">SANDBOX</div>
+          </div>
+        </foreignObject>
+
+        {/* SANDBOX AGENT SDK */}
+        <g transform="translate(385, 110)">
+          <rect width="360" height="270" rx="20" fill="rgba(0,0,0,0.4)" stroke="rgba(255,255,255,0.2)" strokeWidth="1" />
+          <text x="180" y="35" fill="#FFFFFF" textAnchor="middle" fontSize="18" fontWeight="800">
+            Sandbox Agent Server
           </text>
 
-          {/* SANDBOX AGENT SDK */}
-          <g transform="translate(25, 65)">
-            <rect width="330" height="270" rx="20" fill="#0D0D0F" stroke="#3B82F6" strokeWidth="2" />
-            <text x="165" y="35" fill="#FFFFFF" textAnchor="middle" fontSize="18" fontWeight="800">
-              Sandbox Agent Server
-            </text>
-            <line x1="40" y1="50" x2="290" y2="50" stroke="#333" strokeWidth="1" />
-
-            {/* PROVIDER AGENT PROCESSES */}
-            {AGENT_PROCESSES.map((p, i) => {
-              const isActive = i === activeIndex;
-              return (
-                <g key={i} transform={`translate(${p.x}, ${p.y})`}>
-                  <rect
-                    width="110"
-                    height="65"
-                    rx="12"
-                    fill={isActive ? '#1A1A1E' : '#111'}
-                    stroke={isActive ? p.color : '#333'}
-                    strokeWidth={isActive ? 2 : 1.5}
-                  />
-                  <g opacity={isActive ? 1 : 0.4}>
-                    {p.logo === 'openai' ? (
-                      <svg x="43" y="10" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                        <path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v 2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v 2.9994l-2.5974 1.4997-2.6067-1.4997Z" fill="#ffffff" />
-                      </svg>
-                    ) : p.logo === 'opencode' ? (
-                      <svg x="43" y="10" width="19" height="24" viewBox="0 0 32 40" fill="none">
-                        <path d="M24 32H8V16H24V32Z" fill="#4B4646"/>
-                        <path d="M24 8H8V32H24V8ZM32 40H0V0H32V40Z" fill="#F1ECEC"/>
-                      </svg>
-                    ) : (
-                      <image href={p.logo} x="43" y="10" width="24" height="24" filter="url(#invert-white)" />
-                    )}
-                  </g>
-                  <text
-                    x="55"
-                    y="52"
-                    fill="#FFFFFF"
-                    textAnchor="middle"
-                    fontSize="11"
-                    fontWeight="600"
-                    opacity={isActive ? 1 : 0.4}
-                  >
-                    {p.label}
-                  </text>
+          {/* PROVIDER ADAPTERS */}
+          {ADAPTERS.map((p, i) => {
+            const isActive = i === activeIndex;
+            return (
+              <g key={i} transform={`translate(${p.x}, ${p.y})`}>
+                <rect
+                  width="95"
+                  height="58"
+                  rx="10"
+                  fill={isActive ? "#1A1A1E" : "#111"}
+                  stroke={isActive ? p.color : "#333"}
+                  strokeWidth={isActive ? 2 : 1.5}
+                />
+                <g opacity={isActive ? 1 : 0.4}>
+                  {p.logo === "openai" ? (
+                    <svg x="36.75" y="8" width="22" height="22" viewBox="0 0 24 24" fill="none">
+                      <path
+                        d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"
+                        fill="#ffffff"
+                      />
+                    </svg>
+                  ) : p.logo === "opencode" ? (
+                    <svg x="38.5" y="8" width="17" height="22" viewBox="0 0 32 40" fill="none">
+                      <path d="M24 32H8V16H24V32Z" fill="#4B4646" />
+                      <path d="M24 8H8V32H24V8ZM32 40H0V0H32V40Z" fill="#F1ECEC" />
+                    </svg>
+                  ) : p.logo === "pi" ? (
+                    <svg x="36.75" y="8" width="22" height="22" viewBox="0 0 800 800" fill="none">
+                      <path fill="#fff" fillRule="evenodd" d="M165.29 165.29H517.36V400H400V517.36H282.65V634.72H165.29ZM282.65 282.65V400H400V282.65Z" />
+                      <path fill="#fff" d="M517.36 400H634.72V634.72H517.36Z" />
+                    </svg>
+                  ) : (
+                    <image href={p.logo} x="36.75" y="8" width="22" height="22" filter="url(#invert-white)" />
+                  )}
                 </g>
-              );
-            })}
+                <text x="47.5" y="46" fill="#FFFFFF" textAnchor="middle" fontSize="10" fontWeight="600" opacity={isActive ? 1 : 0.4}>
+                  {p.label}
+                </text>
+              </g>
+            );
+          })}
 
-            {/* Active Agent Label */}
-            <text
-              x="165"
-              y="250"
-              fill={AGENT_PROCESSES[activeIndex].color}
-              textAnchor="middle"
-              fontSize="10"
-              fontWeight="800"
-              fontFamily="monospace"
-              letterSpacing="0.1em"
-            >
-              CONNECTED TO {AGENT_PROCESSES[activeIndex].label.toUpperCase()}
-            </text>
-          </g>
+          {/* Active Agent Label */}
+          <text
+            x="180"
+            y="250"
+            fill={ADAPTERS[activeIndex].color}
+            textAnchor="middle"
+            fontSize="12"
+            fontWeight="800"
+            fontFamily="monospace"
+            letterSpacing="0.1em"
+          >
+            CONNECTED TO {ADAPTERS[activeIndex].label.toUpperCase()}
+          </text>
         </g>
       </svg>
     </div>
@@ -153,7 +144,8 @@ function UniversalAPIDiagram() {
 
 const CopyInstallButton = () => {
   const [copied, setCopied] = useState(false);
-  const installCommand = 'npx skills add rivet-dev/skills -s sandbox-agent';
+  const installCommand = "npx skills add rivet-dev/skills -s sandbox-agent";
+  const shortCommand = "npx skills add rivet-dev/skills";
 
   const handleCopy = async () => {
     try {
@@ -161,49 +153,124 @@ const CopyInstallButton = () => {
       setCopied(true);
       setTimeout(() => setCopied(false), 2000);
     } catch (err) {
-      console.error('Failed to copy:', err);
+      console.error("Failed to copy:", err);
     }
   };
 
   return (
-    <button
-      onClick={handleCopy}
-      className='inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md border border-white/10 bg-white/5 px-4 py-2 text-sm text-white subpixel-antialiased shadow-sm transition-colors hover:border-white/20'
-    >
-      {copied ? <Check className='h-4 w-4' /> : <Terminal className='h-4 w-4' />}
-      {installCommand}
-    </button>
+    <div className="relative group w-full sm:w-auto">
+      <button
+        onClick={handleCopy}
+        className="w-full sm:w-auto inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md border border-white/10 px-4 py-2 text-sm text-zinc-300 transition-colors hover:border-white/20 hover:text-white font-mono"
+      >
+        {copied ? <Check className="h-4 w-4 text-green-400" /> : <Terminal className="h-4 w-4 flex-shrink-0" />}
+        <span className="hidden sm:inline">{installCommand}</span>
+        <span className="sm:hidden">{shortCommand}</span>
+      </button>
+      <div className="absolute left-1/2 -translate-x-1/2 top-full mt-3 opacity-0 translate-y-2 group-hover:opacity-100 group-hover:translate-y-0 transition-all duration-200 ease-out text-xs text-zinc-500 whitespace-nowrap pointer-events-none font-mono">
+        Give this to your coding agent
+      </div>
+    </div>
   );
 };
 
 export function Hero() {
+  const [scrollOpacity, setScrollOpacity] = useState(1);
+  const [isMobile, setIsMobile] = useState(false);
+
+  useEffect(() => {
+    const updateViewportMode = () => {
+      const mobile = window.innerWidth < 1024;
+      setIsMobile(mobile);
+      if (mobile) {
+        setScrollOpacity(1);
+      }
+    };
+
+    const handleScroll = () => {
+      if (window.innerWidth < 1024) {
+        setScrollOpacity(1);
+        return;
+      }
+      const scrollY = window.scrollY;
+      const windowHeight = window.innerHeight;
+      const fadeStart = windowHeight * 0.15;
+      const fadeEnd = windowHeight * 0.5;
+      const opacity = 1 - Math.min(1, Math.max(0, (scrollY - fadeStart) / (fadeEnd - fadeStart)));
+      setScrollOpacity(opacity);
+    };
+
+    updateViewportMode();
+    handleScroll();
+    window.addEventListener("resize", updateViewportMode);
+    window.addEventListener("scroll", handleScroll);
+    return () => {
+      window.removeEventListener("resize", updateViewportMode);
+      window.removeEventListener("scroll", handleScroll);
+    };
+  }, []);
+
   return (
-    <section className="relative pt-44 pb-24 overflow-hidden">
-      <div className="max-w-7xl mx-auto px-6 relative z-10">
-        <div className="flex flex-col lg:flex-row items-center gap-16">
-          <div className="flex-1 text-center lg:text-left">
-            <h1 className="mb-6 text-3xl font-medium leading-[1.1] tracking-tight text-white sm:text-4xl md:text-5xl lg:text-6xl">
-              Run Coding Agents in Sandboxes.<br />
-              <span className="text-zinc-400">Control Them Over HTTP.</span>
-            </h1>
-            <p className="mt-6 text-lg text-zinc-500 leading-relaxed max-w-xl mx-auto lg:mx-0">
-              The Sandbox Agent SDK is a server that runs inside your sandbox. Your app connects remotely to control Claude Code, Codex, OpenCode, or Amp — streaming events, handling permissions, managing sessions.
-            </p>
+    <section className="relative flex min-h-screen flex-col overflow-hidden pb-24 lg:pb-0">
+      {/* Background gradient */}
+      <div className="absolute inset-0 bg-gradient-to-b from-zinc-900/20 via-transparent to-transparent pointer-events-none" />
 
-            <div className="mt-10 flex flex-col items-center gap-4 sm:flex-row sm:justify-center lg:justify-start">
-              <a
-                href="/docs"
-                className='inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md border border-white/10 bg-white px-4 py-2 text-sm text-black subpixel-antialiased shadow-sm transition-colors hover:bg-zinc-200'
+      {/* Main content */}
+      <div
+        className="flex flex-1 flex-col justify-start pt-32 lg:justify-center lg:pt-0 lg:pb-20 px-6"
+        style={isMobile ? undefined : { opacity: scrollOpacity, filter: `blur(${(1 - scrollOpacity) * 8}px)` }}
+      >
+        <div className="mx-auto w-full max-w-7xl">
+          <div className="flex flex-col gap-12 lg:flex-row lg:items-center lg:justify-between lg:gap-16 xl:gap-24">
+            {/* Left side - Text content */}
+            <div className="max-w-xl lg:max-w-2xl">
+              <motion.h1
+                initial={{ opacity: 0, y: 20 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ duration: 0.5 }}
+                className="mb-6 text-3xl font-semibold leading-[1.1] tracking-tight text-white md:text-5xl"
               >
-                Read the Docs
-                <ArrowRight className='h-4 w-4' />
-              </a>
-              <CopyInstallButton />
-            </div>
-          </div>
+                Run Coding Agents in Sandboxes.
+                <br />
+                <span className="text-zinc-400">Control Them Over HTTP.</span>
+              </motion.h1>
 
-          <div className="flex-1 w-full max-w-2xl">
-            <UniversalAPIDiagram />
+              <motion.p
+                initial={{ opacity: 0, y: 20 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ duration: 0.5, delay: 0.1 }}
+                className="mb-8 text-lg text-zinc-500 leading-relaxed"
+              >
+                The Sandbox Agent SDK is a server that runs inside your sandbox. Your app connects remotely to control Claude Code, Codex, OpenCode, Amp, or Pi
+                — streaming events, handling permissions, managing sessions.
+              </motion.p>
+
+              <motion.div
+                initial={{ opacity: 0, y: 20 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ duration: 0.5, delay: 0.2 }}
+                className="flex flex-col gap-3 sm:flex-row"
+              >
+                <a
+                  href="/docs"
+                  className="selection-dark inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md bg-white px-5 py-2.5 text-sm font-medium text-black transition-colors hover:bg-zinc-200"
+                >
+                  Read the Docs
+                  <ArrowRight className="h-4 w-4" />
+                </a>
+                <CopyInstallButton />
+              </motion.div>
+            </div>
+
+            {/* Right side - Diagram */}
+            <motion.div
+              initial={{ opacity: 0, x: 20 }}
+              animate={{ opacity: 1, x: 0 }}
+              transition={{ duration: 0.8, delay: 0.3 }}
+              className="flex-1 w-full max-w-2xl"
+            >
+              <UniversalAPIDiagram />
+            </motion.div>
           </div>
         </div>
       </div>
diff --git a/frontend/packages/website/src/components/Inspector.tsx b/frontend/packages/website/src/components/Inspector.tsx
index 7e29185..d336814 100644
--- a/frontend/packages/website/src/components/Inspector.tsx
+++ b/frontend/packages/website/src/components/Inspector.tsx
@@ -1,23 +1,41 @@
-'use client';
+"use client";
+
+import { motion } from "framer-motion";
 
 export function Inspector() {
   return (
-    <section className="relative overflow-hidden border-t border-white/5 py-24">
-      <div className="mx-auto max-w-4xl px-6 text-center">
-        <h2 className="mb-4 text-3xl font-medium tracking-tight text-white md:text-5xl">
-          Built-in Debugger
-        </h2>
-        <p className="mb-12 text-lg text-zinc-400">
-          Inspect sessions, view event payloads, and troubleshoot without writing code.
-        </p>
-
-        <div className="overflow-hidden rounded-2xl border border-white/10 shadow-2xl">
-          <img
-            src="/images/inspector.png"
-            alt="Sandbox Agent Inspector"
-            className="w-full"
-          />
+    <section className="border-t border-white/10 py-48">
+      <div className="mx-auto max-w-7xl px-6">
+        <div className="mb-12 text-center">
+          <motion.h2
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5 }}
+            className="mb-2 text-2xl font-normal tracking-tight text-white md:text-4xl"
+          >
+            Built-in Debugger
+          </motion.h2>
+          <motion.p
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5, delay: 0.1 }}
+            className="mx-auto max-w-xl text-base leading-relaxed text-zinc-500"
+          >
+            Inspect sessions, view event payloads, and troubleshoot without writing&nbsp;code.
+          </motion.p>
         </div>
+
+        <motion.div
+          initial={{ opacity: 0, y: 20 }}
+          whileInView={{ opacity: 1, y: 0 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.5, delay: 0.2 }}
+          className="overflow-hidden rounded-xl border border-white/10"
+        >
+          <img src="/images/inspector.png" alt="Sandbox Agent Inspector" className="w-full" />
+        </motion.div>
       </div>
     </section>
   );
diff --git a/frontend/packages/website/src/components/Integrations.tsx b/frontend/packages/website/src/components/Integrations.tsx
index 71bb915..38f59ff 100644
--- a/frontend/packages/website/src/components/Integrations.tsx
+++ b/frontend/packages/website/src/components/Integrations.tsx
@@ -1,29 +1,17 @@
-'use client';
+"use client";
 
-const integrations = [
-  'Daytona',
-  'E2B',
-  'AI SDK',
-  'Anthropic',
-  'OpenAI',
-  'Docker',
-  'Fly.io',
-  'AWS Nitro',
-  'Postgres',
-  'ClickHouse',
-  'Rivet',
-];
+const integrations = ["Daytona", "E2B", "AI SDK", "Anthropic", "OpenAI", "Docker", "Fly.io", "AWS Nitro", "Postgres", "ClickHouse", "Rivet"];
 
 export function Integrations() {
   return (
-    <section id="integrations" className="py-24 bg-zinc-900/20 border-t border-white/5 relative overflow-hidden">
+    <section id="integrations" className="py-24 bg-[#0f0f11]/50 border-t border-white/5 relative overflow-hidden">
       <div className="max-w-4xl mx-auto px-6 text-center">
-        <h2 className="text-3xl font-bold text-white mb-6">Works with your stack</h2>
+        <h2 className="text-3xl font-semibold text-white mb-6">Works with your stack</h2>
         <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
           {integrations.map((item) => (
             <div
               key={item}
-              className="h-16 flex items-center justify-center rounded-xl border border-white/5 bg-zinc-900/50 text-zinc-300 font-mono text-sm hover:border-accent/40 hover:text-accent transition-all cursor-default"
+              className="h-16 flex items-center justify-center rounded-xl border border-white/5 bg-white/[0.02] text-zinc-300 font-mono text-sm hover:border-accent/40 hover:text-accent transition-all cursor-default"
             >
               {item}
             </div>
diff --git a/frontend/packages/website/src/components/Navigation.tsx b/frontend/packages/website/src/components/Navigation.tsx
index cc970a4..3cc7b03 100644
--- a/frontend/packages/website/src/components/Navigation.tsx
+++ b/frontend/packages/website/src/components/Navigation.tsx
@@ -1,16 +1,14 @@
-'use client';
+"use client";
 
-import { useState, useEffect } from 'react';
-import { Menu, X } from 'lucide-react';
-import { GitHubStars } from './GitHubStars';
+import { useState, useEffect } from "react";
+import { Menu, X } from "lucide-react";
+import { GitHubStars } from "./GitHubStars";
 
 function NavItem({ href, children }: { href: string; children: React.ReactNode }) {
   return (
-    <div className="px-2.5 py-2 opacity-60 hover:opacity-100 transition-all duration-200">
-      <a href={href} className="text-white text-sm">
-        {children}
-      </a>
-    </div>
+    <a href={href} className="px-3 py-2 text-sm font-normal text-zinc-400 transition-colors duration-200 hover:text-white">
+      {children}
+    </a>
   );
 }
 
@@ -30,19 +28,19 @@ export function Navigation() {
   return (
     <div className="fixed top-0 z-50 w-full max-w-[1200px] md:left-1/2 md:top-4 md:-translate-x-1/2 md:px-8">
       <div
-        className={`relative before:pointer-events-none before:absolute before:inset-[-1px] before:z-20 before:hidden before:rounded-2xl before:border before:content-[''] before:transition-colors before:duration-300 before:ease-in-out md:before:block ${
+        className={`relative before:pointer-events-none before:absolute before:inset-[-1px] before:z-20 before:hidden before:rounded-xl before:border before:content-[''] before:transition-colors before:duration-300 before:ease-in-out md:before:block ${
           isScrolled ? "before:border-white/10" : "before:border-transparent"
         }`}
       >
+        {/* Background with blur */}
         <div
-          className={`absolute inset-0 -z-[1] hidden overflow-hidden rounded-2xl transition-all duration-300 ease-in-out md:block ${
-            isScrolled
-              ? "bg-black/80 backdrop-blur-lg"
-              : "bg-black backdrop-blur-none"
+          className={`absolute inset-0 -z-[1] hidden overflow-hidden rounded-xl transition-all duration-300 ease-in-out md:block ${
+            isScrolled ? "bg-[#09090b]/80 backdrop-blur-lg" : "bg-transparent backdrop-blur-none"
           }`}
         />
+
         <header
-          className={`bg-black/60 border-b-transparent sticky top-0 z-10 flex flex-col items-center border-b backdrop-blur pt-2 pb-2 md:static md:bg-transparent md:rounded-2xl md:max-w-[1200px] md:border-transparent md:backdrop-none md:backdrop-blur-none transition-all hover:opacity-100 ${
+          className={`bg-[#09090b]/60 border-b-transparent sticky top-0 z-10 flex flex-col items-center border-b backdrop-blur-md pt-2 pb-2 md:static md:bg-transparent md:rounded-xl md:max-w-[1200px] md:border-transparent md:backdrop-blur-none transition-all hover:opacity-100 ${
             isScrolled ? "opacity-100" : "opacity-80"
           }`}
         >
@@ -53,32 +51,27 @@ export function Navigation() {
                 <a href="https://rivet.dev" className="flex items-center">
                   <img src="/rivet-icon.svg" alt="Rivet" className="size-8" />
                 </a>
-                <span className="text-white/30">|</span>
+                <span className="text-white/20">|</span>
                 <a href="/" className="flex items-center">
                   <img src="/logos/sandboxagent.svg" alt="Sandbox Agent SDK" className="h-6 w-auto" />
                 </a>
               </div>
 
               {/* Desktop Nav */}
-              <div className="hidden md:flex items-center">
+              <div className="hidden md:flex items-center ml-2">
                 <NavItem href="/docs">Docs</NavItem>
                 <NavItem href="https://github.com/rivet-dev/sandbox-agent/releases">Changelog</NavItem>
               </div>
             </div>
 
             {/* Right side */}
-            <div className="hidden md:flex flex-row items-center">
+            <div className="hidden md:flex flex-row items-center gap-2">
               <a
                 href="https://discord.gg/auCecybynK"
-                className="inline-flex items-center justify-center whitespace-nowrap rounded-md border border-white/10 px-4 py-2 h-10 text-sm mr-2 hover:border-white/20 text-white/90 hover:text-white transition-colors"
+                className="inline-flex items-center justify-center whitespace-nowrap rounded-md border border-white/10 px-4 py-2 h-10 text-sm hover:border-white/20 text-white/90 hover:text-white transition-colors"
                 aria-label="Discord"
               >
-                <svg
-                  className="w-5 h-5"
-                  fill="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
+                <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                   <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z" />
                 </svg>
               </a>
@@ -89,10 +82,7 @@ export function Navigation() {
             </div>
 
             {/* Mobile menu button */}
-            <button
-              className="md:hidden text-zinc-400 hover:text-white p-2"
-              onClick={() => setMobileMenuOpen(!mobileMenuOpen)}
-            >
+            <button className="md:hidden text-zinc-400 hover:text-white p-2 transition-colors" onClick={() => setMobileMenuOpen(!mobileMenuOpen)}>
               {mobileMenuOpen ? <X className="w-6 h-6" /> : <Menu className="w-6 h-6" />}
             </button>
           </div>
@@ -101,42 +91,37 @@ export function Navigation() {
 
       {/* Mobile menu */}
       {mobileMenuOpen && (
-        <div className="md:hidden border border-white/10 bg-black/95 backdrop-blur-lg rounded-2xl mt-2 mx-2">
-          <div className="px-4 py-4 space-y-2">
+        <div className="md:hidden border border-white/10 bg-[#09090b]/95 backdrop-blur-lg rounded-xl mt-2 mx-2 shadow-xl">
+          <div className="px-4 py-4 space-y-1">
             <a
               href="/docs"
-              className="block py-2 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors"
+              className="block py-2.5 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors font-medium"
               onClick={() => setMobileMenuOpen(false)}
             >
               Docs
             </a>
             <a
               href="https://github.com/rivet-dev/sandbox-agent/releases"
-              className="block py-2 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors"
+              className="block py-2.5 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors font-medium"
               onClick={() => setMobileMenuOpen(false)}
             >
               Changelog
             </a>
-            <div className="border-t border-white/10 pt-2 mt-2 space-y-2">
+            <div className="border-t border-white/10 pt-3 mt-3 space-y-1">
               <a
                 href="https://discord.gg/auCecybynK"
-                className="flex items-center gap-2 py-2 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors"
+                className="flex items-center gap-3 py-2.5 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors"
                 onClick={() => setMobileMenuOpen(false)}
                 aria-label="Discord"
               >
-                <svg
-                  className="w-5 h-5"
-                  fill="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
+                <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                   <path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z" />
                 </svg>
-                <span>Discord</span>
+                <span className="font-medium">Discord</span>
               </a>
               <GitHubStars
                 repo="rivet-dev/sandbox-agent"
-                className="flex items-center gap-2 py-2 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors"
+                className="flex items-center gap-3 py-2.5 px-3 text-white/80 hover:text-white hover:bg-white/5 rounded-lg transition-colors w-full"
                 onClick={() => setMobileMenuOpen(false)}
               />
             </div>
diff --git a/frontend/packages/website/src/components/PainPoints.tsx b/frontend/packages/website/src/components/PainPoints.tsx
index 654286b..180eacf 100644
--- a/frontend/packages/website/src/components/PainPoints.tsx
+++ b/frontend/packages/website/src/components/PainPoints.tsx
@@ -1,133 +1,87 @@
-'use client';
+"use client";
 
-import { motion } from 'framer-motion';
-import { X, Check } from 'lucide-react';
+import { motion } from "framer-motion";
+import { Shield, Layers, Database, X, Check } from "lucide-react";
 
 const frictions = [
   {
-    number: '01',
-    title: 'Coding Agents Need Sandboxes',
+    icon: Shield,
+    title: "Coding Agents Need Sandboxes",
     problem:
       "You can't let AI execute arbitrary code on your production servers. Coding agents need isolated environments, but existing SDKs assume local execution.",
-    solution: 'A server that runs inside the sandbox and exposes HTTP/SSE.',
-    accentColor: 'orange',
+    solution: "A server that runs inside the sandbox and exposes HTTP/SSE.",
   },
   {
-    number: '02',
-    title: 'Every Coding Agent is Different',
+    icon: Layers,
+    title: "Every Coding Agent is Different",
     problem:
-      'Claude Code, Codex, OpenCode, Amp, and Pi each have proprietary APIs, event formats, and behaviors. Swapping coding agents means rewriting your entire integration.',
-    solution: 'One HTTP API. Write your code once, swap coding agents with a config change.',
-    accentColor: 'purple',
+      "Claude Code, Codex, OpenCode, Amp, and Pi each have proprietary APIs, event formats, and behaviors. Swapping coding agents means rewriting your entire integration.",
+    solution: "One HTTP API. Write your code once, swap coding agents with a config change.",
   },
   {
-    number: '03',
-    title: 'Sessions Are Ephemeral',
-    problem:
-      'Coding agent transcripts live in the sandbox. When the process ends, you lose everything. Debugging and replay become impossible.',
-    solution: 'Universal event schema streams to your storage. Persist to Postgres or Rivet, replay later, audit everything.',
-    accentColor: 'blue',
+    icon: Database,
+    title: "Sessions Are Ephemeral",
+    problem: "Coding agent transcripts live in the sandbox. When the process ends, you lose everything. Debugging and replay become impossible.",
+    solution: "Universal event schema streams to your storage. Persist to Postgres or Rivet, replay later, audit everything.",
   },
 ];
 
-const accentStyles = {
-  orange: {
-    gradient: 'from-orange-500/20',
-    border: 'border-orange-500/30',
-    glow: 'rgba(255,79,0,0.15)',
-    number: 'text-orange-500',
-  },
-  purple: {
-    gradient: 'from-purple-500/20',
-    border: 'border-purple-500/30',
-    glow: 'rgba(168,85,247,0.15)',
-    number: 'text-purple-500',
-  },
-  blue: {
-    gradient: 'from-blue-500/20',
-    border: 'border-blue-500/30',
-    glow: 'rgba(59,130,246,0.15)',
-    number: 'text-blue-500',
-  },
-};
-
 export function PainPoints() {
   return (
-    <section className="relative overflow-hidden border-t border-white/5 py-32">
+    <section className="border-t border-white/10 py-48">
       <div className="mx-auto max-w-7xl px-6">
+        <div className="mb-12">
+          <motion.h2
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5 }}
+            className="mb-2 text-2xl font-normal tracking-tight text-white md:text-4xl"
+          >
+            Running coding agents remotely is hard.
+          </motion.h2>
+          <motion.p
+            initial={{ opacity: 0, y: 20 }}
+            whileInView={{ opacity: 1, y: 0 }}
+            viewport={{ once: true }}
+            transition={{ duration: 0.5, delay: 0.1 }}
+            className="max-w-2xl text-base leading-relaxed text-zinc-500"
+          >
+            The Sandbox Agent SDK is a server that runs inside your sandbox. Your app connects remotely to control Claude Code, Codex, OpenCode, Amp, or Pi —
+            streaming events, handling permissions, managing sessions.
+          </motion.p>
+        </div>
+
         <motion.div
           initial={{ opacity: 0, y: 20 }}
           whileInView={{ opacity: 1, y: 0 }}
           viewport={{ once: true }}
           transition={{ duration: 0.5 }}
-          className="mb-16"
+          className="grid grid-cols-1 gap-8 md:grid-cols-3"
         >
-          <h2 className="mb-6 text-3xl font-medium tracking-tight text-white md:text-5xl">
-            Running coding agents remotely is hard.
-          </h2>
-          <p className="max-w-2xl text-lg leading-relaxed text-zinc-400">
-            Coding agents need sandboxes, but existing SDKs assume local execution. SSH breaks, CLI wrappers are fragile, and building from scratch means reimplementing everything for each coding agent.
-          </p>
-        </motion.div>
-
-        <div className="grid gap-6 md:grid-cols-3">
-          {frictions.map((friction, index) => {
-            const styles = accentStyles[friction.accentColor as keyof typeof accentStyles];
-            return (
-              <motion.div
-                key={friction.number}
-                initial={{ opacity: 0, y: 20 }}
-                whileInView={{ opacity: 1, y: 0 }}
-                viewport={{ once: true }}
-                transition={{ duration: 0.5, delay: index * 0.1 }}
-                className="group relative flex flex-col overflow-hidden rounded-2xl border border-white/5 bg-zinc-900/30 p-6 backdrop-blur-sm transition-colors duration-500 hover:bg-zinc-900/50"
-              >
-                {/* Top shine */}
-                <div className="absolute left-0 right-0 top-0 z-10 h-[1px] bg-gradient-to-r from-transparent via-white/20 to-transparent" />
-
-                {/* Hover glow */}
-                <div
-                  className="pointer-events-none absolute inset-0 opacity-0 transition-opacity duration-500 group-hover:opacity-100"
-                  style={{
-                    background: `radial-gradient(circle at top left, ${styles.glow} 0%, transparent 50%)`,
-                  }}
-                />
-
-                {/* Corner highlight */}
-                <div
-                  className={`pointer-events-none absolute left-0 top-0 z-20 h-24 w-24 rounded-tl-2xl border-l border-t ${styles.border} opacity-0 transition-opacity duration-500 [mask-image:linear-gradient(135deg,black_0%,transparent_50%)] group-hover:opacity-100`}
-                />
-
-                <div className="relative z-10 flex flex-col h-full">
-                  {/* Title */}
-                  <h3 className="mb-4 text-xl font-medium text-white">{friction.title}</h3>
-
-                  {/* Problem */}
-                  <div className="mb-4">
-                    <div className="flex items-center gap-2 mb-2">
-                      <div className="flex items-center justify-center w-5 h-5 rounded-full bg-red-500/20">
-                        <X className="w-3 h-3 text-red-400" />
-                      </div>
-                      <span className="text-xs font-semibold uppercase tracking-wider text-red-400">Problem</span>
-                    </div>
-                    <p className="text-sm leading-relaxed text-zinc-500">{friction.problem}</p>
-                  </div>
-
-                  {/* Solution */}
-                  <div className="mt-auto pt-4 border-t border-white/5">
-                    <div className="flex items-center gap-2 mb-2">
-                      <div className="flex items-center justify-center w-5 h-5 rounded-full bg-green-500/20">
-                        <Check className="w-3 h-3 text-green-400" />
-                      </div>
-                      <span className="text-xs font-semibold uppercase tracking-wider text-green-400">Solution</span>
-                    </div>
-                    <p className="text-sm font-medium leading-relaxed text-zinc-300">{friction.solution}</p>
-                  </div>
+          {frictions.map((friction) => (
+            <div key={friction.title} className="flex flex-col border-t border-white/10 pt-6">
+              <div className="mb-3 text-zinc-500">
+                <friction.icon className="h-4 w-4" />
+              </div>
+              <h3 className="mb-4 text-base font-normal text-white">{friction.title}</h3>
+              <div className="mb-4">
+                <div className="flex items-center gap-2 mb-2">
+                  <X className="h-3 w-3 text-zinc-600" />
+                  <span className="text-[10px] font-medium uppercase tracking-wider text-zinc-600">Problem</span>
                 </div>
-              </motion.div>
-            );
-          })}
-        </div>
+                <p className="text-sm leading-relaxed text-zinc-500">{friction.problem}</p>
+              </div>
+              <div className="mt-auto border-t border-white/5 pt-4">
+                <div className="flex items-center gap-2 mb-2">
+                  <Check className="h-3 w-3 text-green-400" />
+                  <span className="text-[10px] font-medium uppercase tracking-wider text-zinc-400">Solution</span>
+                </div>
+                <p className="text-sm leading-relaxed text-zinc-300">{friction.solution}</p>
+              </div>
+            </div>
+          ))}
+        </motion.div>
       </div>
     </section>
   );
diff --git a/frontend/packages/website/src/components/ProblemsSolved.tsx b/frontend/packages/website/src/components/ProblemsSolved.tsx
index 6ebcfbb..42525d3 100644
--- a/frontend/packages/website/src/components/ProblemsSolved.tsx
+++ b/frontend/packages/website/src/components/ProblemsSolved.tsx
@@ -1,48 +1,43 @@
-'use client';
+"use client";
 
-import { Workflow, Database, Server } from 'lucide-react';
-import { FeatureIcon } from './ui/FeatureIcon';
+import { Workflow, Database, Server } from "lucide-react";
+import { FeatureIcon } from "./ui/FeatureIcon";
 
 const problems = [
   {
-    title: 'Universal Agent API',
-    desc: 'Claude Code, Codex, OpenCode, Amp, and Pi each have different APIs. We provide a single interface to control them all.',
+    title: "Universal Agent API",
+    desc: "Claude Code, Codex, OpenCode, Amp, and Pi each have different APIs. We provide a single interface to control them all.",
     icon: Workflow,
-    color: 'text-accent',
+    color: "text-accent",
   },
   {
-    title: 'Universal Transcripts',
-    desc: 'Every agent has its own event format. Our universal schema normalizes them all — stream, store, and replay with ease.',
+    title: "Universal Transcripts",
+    desc: "Every agent has its own event format. Our universal schema normalizes them all — stream, store, and replay with ease.",
     icon: Database,
-    color: 'text-purple-400',
+    color: "text-purple-400",
   },
   {
-    title: 'Run Anywhere',
-    desc: 'Lightweight Rust daemon runs locally or in any environment. One command to bridge coding agents to your system.',
+    title: "Run Anywhere",
+    desc: "Lightweight Rust daemon runs locally or in any environment. One command to bridge coding agents to your system.",
     icon: Server,
-    color: 'text-green-400',
+    color: "text-green-400",
   },
 ];
 
 export function ProblemsSolved() {
   return (
-    <section id="features" className="py-24 bg-zinc-950 border-y border-white/5">
+    <section id="features" className="py-24 bg-[#0f0f11] border-y border-white/5">
       <div className="max-w-7xl mx-auto px-6">
         <div className="text-center mb-16">
-          <h2 className="text-3xl font-bold text-white mb-4">Why Coding Agent SDK?</h2>
-          <p className="text-zinc-400 max-w-xl mx-auto">
-            Solving the three fundamental friction points of agentic software development.
-          </p>
+          <h2 className="text-3xl font-semibold text-white mb-4">Why Coding Agent SDK?</h2>
+          <p className="text-zinc-400 max-w-xl mx-auto">Solving the three fundamental friction points of agentic software development.</p>
         </div>
 
         <div className="grid md:grid-cols-3 gap-8">
           {problems.map((item, idx) => (
-            <div
-              key={idx}
-              className="group p-8 rounded-2xl bg-zinc-900/40 border border-white/5 hover:border-accent/30 transition-all duration-300"
-            >
+            <div key={idx} className="group p-8 rounded-xl bg-white/[0.02] border border-white/5 hover:border-accent/30 transition-all duration-300">
               <FeatureIcon icon={item.icon} color={item.color} />
-              <h3 className="text-xl font-bold text-white mb-3">{item.title}</h3>
+              <h3 className="text-xl font-semibold text-white mb-3">{item.title}</h3>
               <p className="text-zinc-400 text-sm leading-relaxed">{item.desc}</p>
             </div>
           ))}
diff --git a/frontend/packages/website/src/components/ui/Badge.tsx b/frontend/packages/website/src/components/ui/Badge.tsx
index 9023b7f..847d2fe 100644
--- a/frontend/packages/website/src/components/ui/Badge.tsx
+++ b/frontend/packages/website/src/components/ui/Badge.tsx
@@ -3,9 +3,5 @@ interface BadgeProps {
 }
 
 export function Badge({ children }: BadgeProps) {
-  return (
-    <span className="inline-flex px-3 py-1 rounded-full bg-accent/10 border border-accent/20 text-accent text-xs font-mono font-medium">
-      {children}
-    </span>
-  );
+  return <span className="inline-flex px-3 py-1 rounded-full bg-accent/10 border border-accent/20 text-accent text-xs font-mono font-medium">{children}</span>;
 }
diff --git a/frontend/packages/website/src/components/ui/Button.tsx b/frontend/packages/website/src/components/ui/Button.tsx
index 4706fdf..1b762cc 100644
--- a/frontend/packages/website/src/components/ui/Button.tsx
+++ b/frontend/packages/website/src/components/ui/Button.tsx
@@ -1,34 +1,27 @@
-import type { ReactNode } from 'react';
+import type { ReactNode } from "react";
 
 interface ButtonProps {
   children: ReactNode;
-  variant?: 'primary' | 'secondary' | 'ghost';
-  size?: 'sm' | 'md' | 'lg';
+  variant?: "primary" | "secondary" | "ghost";
+  size?: "sm" | "md" | "lg";
   href?: string;
   onClick?: () => void;
   className?: string;
 }
 
-export function Button({
-  children,
-  variant = 'primary',
-  size = 'md',
-  href,
-  onClick,
-  className = ''
-}: ButtonProps) {
-  const baseStyles = 'inline-flex items-center justify-center font-bold rounded-lg transition-all';
+export function Button({ children, variant = "primary", size = "md", href, onClick, className = "" }: ButtonProps) {
+  const baseStyles = "inline-flex items-center justify-center font-medium rounded-lg transition-all";
 
   const variants = {
-    primary: 'bg-white text-black hover:bg-zinc-200',
-    secondary: 'bg-zinc-900 border border-white/10 text-white hover:bg-zinc-800',
-    ghost: 'text-zinc-400 hover:text-white',
+    primary: "bg-white text-black hover:bg-zinc-200",
+    secondary: "bg-[#0f0f11] border border-white/10 text-white hover:bg-white/[0.06]",
+    ghost: "text-zinc-400 hover:text-white",
   };
 
   const sizes = {
-    sm: 'h-9 px-4 text-sm',
-    md: 'h-12 px-8 text-sm',
-    lg: 'h-14 px-10 text-base',
+    sm: "h-9 px-4 text-sm",
+    md: "h-12 px-8 text-sm",
+    lg: "h-14 px-10 text-base",
   };
 
   const classes = `${baseStyles} ${variants[variant]} ${sizes[size]} ${className}`;
diff --git a/frontend/packages/website/src/components/ui/CopyButton.tsx b/frontend/packages/website/src/components/ui/CopyButton.tsx
index a6e5b6a..0fe31b3 100644
--- a/frontend/packages/website/src/components/ui/CopyButton.tsx
+++ b/frontend/packages/website/src/components/ui/CopyButton.tsx
@@ -1,7 +1,7 @@
-'use client';
+"use client";
 
-import { useState } from 'react';
-import { Copy, CheckCircle2 } from 'lucide-react';
+import { useState } from "react";
+import { Copy, CheckCircle2 } from "lucide-react";
 
 interface CopyButtonProps {
   text: string;
@@ -17,16 +17,8 @@ export function CopyButton({ text }: CopyButtonProps) {
   };
 
   return (
-    <button
-      onClick={handleCopy}
-      className="p-2 hover:bg-white/10 rounded-md transition-colors text-zinc-500 hover:text-white"
-      aria-label="Copy to clipboard"
-    >
-      {copied ? (
-        <CheckCircle2 className="w-4 h-4 text-green-400" />
-      ) : (
-        <Copy className="w-4 h-4" />
-      )}
+    <button onClick={handleCopy} className="p-2 hover:bg-white/10 rounded-md transition-colors text-zinc-500 hover:text-white" aria-label="Copy to clipboard">
+      {copied ? <CheckCircle2 className="w-4 h-4 text-green-400" /> : <Copy className="w-4 h-4" />}
     </button>
   );
 }
diff --git a/frontend/packages/website/src/components/ui/FeatureIcon.tsx b/frontend/packages/website/src/components/ui/FeatureIcon.tsx
index e6ed276..b5a6ae0 100644
--- a/frontend/packages/website/src/components/ui/FeatureIcon.tsx
+++ b/frontend/packages/website/src/components/ui/FeatureIcon.tsx
@@ -1,4 +1,4 @@
-import type { LucideIcon } from 'lucide-react';
+import type { LucideIcon } from "lucide-react";
 
 interface FeatureIconProps {
   icon: LucideIcon;
@@ -8,12 +8,12 @@ interface FeatureIconProps {
   glowShadow?: string;
 }
 
-export function FeatureIcon({ 
-  icon: Icon, 
-  color = 'text-accent',
-  bgColor = 'bg-accent/10',
-  hoverBgColor = 'group-hover:bg-accent/20',
-  glowShadow = 'group-hover:shadow-[0_0_15px_rgba(59,130,246,0.5)]'
+export function FeatureIcon({
+  icon: Icon,
+  color = "text-accent",
+  bgColor = "bg-accent/10",
+  hoverBgColor = "group-hover:bg-accent/20",
+  glowShadow = "group-hover:shadow-[0_0_15px_rgba(59,130,246,0.5)]",
 }: FeatureIconProps) {
   return (
     <div className={`rounded ${bgColor} p-2 ${color} transition-all duration-500 ${hoverBgColor} ${glowShadow}`}>
diff --git a/frontend/packages/website/src/layouts/Layout.astro b/frontend/packages/website/src/layouts/Layout.astro
index 8e7f8e6..069cccc 100644
--- a/frontend/packages/website/src/layouts/Layout.astro
+++ b/frontend/packages/website/src/layouts/Layout.astro
@@ -4,32 +4,78 @@ interface Props {
   description?: string;
 }
 
-const { title, description = "Universal SDK for coding agents. Control Claude Code, Codex, OpenCode, and Amp with unified events and sessions." } = Astro.props;
+const { title, description = "Universal SDK for coding agents. Control Claude Code, Codex, OpenCode, Amp, and Pi with unified events and sessions." } =
+  Astro.props;
+const canonicalURL = new URL(Astro.url.pathname, "https://sandbox-agent.dev");
+const ogImageURL = new URL("/og.png", "https://sandbox-agent.dev");
+
+const structuredData = {
+  "@context": "https://schema.org",
+  "@type": "SoftwareApplication",
+  name: "Sandbox Agent SDK",
+  applicationCategory: "DeveloperApplication",
+  operatingSystem: "Linux, macOS, Windows",
+  description: description,
+  url: "https://sandbox-agent.dev",
+  author: {
+    "@type": "Organization",
+    name: "Rivet",
+    url: "https://rivet.dev",
+  },
+  offers: {
+    "@type": "Offer",
+    price: "0",
+    priceCurrency: "USD",
+  },
+  keywords: "coding agents, AI SDK, Claude Code, Codex, OpenCode, Amp, sandbox, remote code execution, developer tools",
+};
 ---
 
 <!doctype html>
-<html lang="en">
+<html lang="en" class="dark">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content={description} />
+    <meta name="keywords" content="coding agents, AI SDK, Claude Code, Codex, OpenCode, Amp, Pi, sandbox, remote code execution, developer tools, AI coding assistant, code automation" />
+    <meta name="author" content="Rivet" />
+    <meta name="robots" content="index, follow" />
+    <meta name="theme-color" content="#09090b" />
+    <link rel="canonical" href={canonicalURL} />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+
+    <!-- Preconnect to font providers -->
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&family=Open+Sans:wght@400;500;600;700&display=swap" rel="stylesheet" />
+
+    <!-- IBM Plex Sans + IBM Plex Mono (from Google Fonts) -->
+    <link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap" rel="stylesheet" />
+
     <title>{title}</title>
 
+    <!-- Open Graph -->
     <meta property="og:title" content={title} />
     <meta property="og:description" content={description} />
     <meta property="og:type" content="website" />
-    <meta property="og:image" content="/og.png" />
+    <meta property="og:url" content={canonicalURL} />
+    <meta property="og:site_name" content="Sandbox Agent SDK" />
+    <meta property="og:image" content={ogImageURL} />
     <meta property="og:image:width" content="2400" />
     <meta property="og:image:height" content="1260" />
     <meta property="og:image:alt" content="Sandbox Agent SDK - Run Coding Agents in Sandboxes. Control Them Over HTTP." />
+
+    <!-- Twitter -->
     <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:image" content="/og.png" />
+    <meta name="twitter:site" content="@rivet_dev" />
+    <meta name="twitter:creator" content="@rivet_dev" />
+    <meta name="twitter:title" content={title} />
+    <meta name="twitter:description" content={description} />
+    <meta name="twitter:image" content={ogImageURL} />
+
+    <!-- Structured Data -->
+    <script type="application/ld+json" set:html={JSON.stringify(structuredData)} />
   </head>
-  <body class="min-h-screen">
+  <body class="min-h-screen bg-background text-foreground antialiased">
     <slot />
   </body>
 </html>
diff --git a/frontend/packages/website/src/pages/index.astro b/frontend/packages/website/src/pages/index.astro
index da607db..476485c 100644
--- a/frontend/packages/website/src/pages/index.astro
+++ b/frontend/packages/website/src/pages/index.astro
@@ -1,26 +1,26 @@
 ---
-import Layout from '../layouts/Layout.astro';
-import { Navigation } from '../components/Navigation';
-import { Hero } from '../components/Hero';
-import { PainPoints } from '../components/PainPoints';
-import { FeatureGrid } from '../components/FeatureGrid';
-import { GetStarted } from '../components/GetStarted';
-import { Inspector } from '../components/Inspector';
-import { FAQ } from '../components/FAQ';
-import { Footer } from '../components/Footer';
+import Layout from "../layouts/Layout.astro";
+import { Navigation } from "../components/Navigation";
+import { Hero } from "../components/Hero";
+import { PainPoints } from "../components/PainPoints";
+import { FeatureGrid } from "../components/FeatureGrid";
+import { GetStarted } from "../components/GetStarted";
+
+import { Inspector } from "../components/Inspector";
+import { FAQ } from "../components/FAQ";
+import { Footer } from "../components/Footer";
 ---
 
 <Layout title="Sandbox Agent SDK - Run Coding Agents in Sandboxes. Control Them Over HTTP.">
-  <div class="min-h-screen bg-black text-white selection:bg-accent/30">
-    <Navigation client:load />
+  <Navigation client:load />
     <main>
       <Hero client:load />
       <PainPoints client:visible />
       <FeatureGrid client:visible />
       <GetStarted client:visible />
+
       <Inspector client:visible />
       <FAQ client:visible />
     </main>
-    <Footer client:visible />
-  </div>
+  <Footer client:visible />
 </Layout>
diff --git a/frontend/packages/website/src/styles/global.css b/frontend/packages/website/src/styles/global.css
index 8dbb6f8..31f8b45 100644
--- a/frontend/packages/website/src/styles/global.css
+++ b/frontend/packages/website/src/styles/global.css
@@ -3,13 +3,62 @@
 @tailwind utilities;
 
 @layer base {
-  body {
-    @apply bg-black text-white antialiased;
-    font-family: 'Open Sans', system-ui, sans-serif;
+  :root {
+    --header-height: 3.5rem;
+
+    /* Theme colors (HSL for flexibility) */
+    --background: 240 10% 3.9%;
+    --foreground: 0 0% 100%;
+    --primary: 18 100% 50%;
+    --primary-foreground: 0 0% 100%;
+    --muted: 240 5% 7%;
+    --muted-foreground: 240 4% 66%;
+    --border: 0 0% 100% / 0.10;
+    --card: 240 6% 4%;
+
+    /* Shiki syntax highlighting */
+    --shiki-color-text: theme('colors.white');
+    --shiki-foreground: hsl(var(--foreground));
+    --shiki-token-constant: theme('colors.violet.300');
+    --shiki-token-string: theme('colors.violet.300');
+    --shiki-token-comment: theme('colors.zinc.500');
+    --shiki-token-keyword: theme('colors.sky.300');
+    --shiki-token-parameter: theme('colors.pink.300');
+    --shiki-token-function: theme('colors.violet.300');
+    --shiki-token-string-expression: theme('colors.violet.300');
+    --shiki-token-punctuation: theme('colors.zinc.200');
   }
 
+  * {
+    @apply border-white/10;
+  }
+
+  body {
+    @apply bg-[#09090b] text-white antialiased;
+    font-family: 'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif;
+    font-weight: 400;
+  }
+
+  /* Text selection - matches rivet.dev */
   ::selection {
-    @apply bg-accent/30 text-white;
+    background-color: rgba(255, 79, 0, 0.3);
+    color: #fed7aa;
+  }
+
+  ::-moz-selection {
+    background-color: rgba(255, 79, 0, 0.3);
+    color: #fed7aa;
+  }
+
+  /* Selection style for white/light backgrounds */
+  .selection-dark::selection {
+    background-color: #18181b;
+    color: white;
+  }
+
+  .selection-dark::-moz-selection {
+    background-color: #18181b;
+    color: white;
   }
 
   /* Firefox scrollbar */
@@ -65,6 +114,7 @@
 }
 
 @layer components {
+  /* Glass morphism effects */
   .glass {
     @apply bg-white/[0.02] backdrop-blur-md border border-white/10;
   }
@@ -72,4 +122,123 @@
   .glass-hover {
     @apply hover:bg-white/[0.04] hover:border-white/20 transition-all;
   }
+
+  .glass-strong {
+    @apply bg-[#09090b]/95 backdrop-blur-lg border border-white/10;
+  }
+
+  /* Bento box card effects */
+  .bento-box {
+    transition: border-color 0.3s ease;
+  }
+
+  .bento-box:hover {
+    border-color: rgba(255, 255, 255, 0.2);
+  }
+
+  /* Scroll-triggered animations */
+  .animate-on-scroll {
+    opacity: 0;
+    transition: opacity 0.8s ease-out, transform 0.8s cubic-bezier(0.19, 1, 0.22, 1);
+    transition-delay: var(--scroll-delay, 0s);
+    will-change: opacity, transform;
+  }
+
+  .animate-fade-up {
+    transform: translateY(30px);
+  }
+
+  .animate-on-scroll.is-visible {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  /* Delay utilities for staggered animations */
+  .delay-100 { --scroll-delay: 100ms; }
+  .delay-200 { --scroll-delay: 200ms; }
+  .delay-300 { --scroll-delay: 300ms; }
+  .delay-400 { --scroll-delay: 400ms; }
+  .delay-500 { --scroll-delay: 500ms; }
+  .delay-600 { --scroll-delay: 600ms; }
+
+  /* Top shine highlight for cards */
+  .shine-top {
+    position: relative;
+  }
+
+  .shine-top::after {
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    height: 1px;
+    background: linear-gradient(to right, transparent, rgba(255, 255, 255, 0.2), transparent);
+    pointer-events: none;
+  }
+
+  /* Glow effect for buttons and interactive elements */
+  .glow-accent {
+    box-shadow: 0 0 20px rgba(255, 79, 0, 0.3);
+  }
+
+  .glow-accent-hover:hover {
+    box-shadow: 0 0 30px rgba(255, 79, 0, 0.5);
+  }
+
+  /* Code highlight styling */
+  .code-highlight-ref {
+    position: relative;
+    transition: background-color 0.3s ease-out;
+    display: block;
+    margin: 0 -1.5rem;
+    padding: 0 1.5rem;
+  }
+
+  .code-highlight-ref.is-active {
+    background-color: rgba(255, 79, 0, 0.1);
+  }
+
+  .code-highlight-ref.is-active::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 2px;
+    background-color: #ff4f00;
+  }
+
+  /* Hide scrollbar */
+  .scrollbar-hide::-webkit-scrollbar {
+    display: none;
+  }
+
+  .scrollbar-hide {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+  }
+}
+
+@layer utilities {
+  /* Gradient text */
+  .text-gradient-accent {
+    @apply bg-gradient-to-r from-orange-400 to-orange-600 bg-clip-text text-transparent;
+  }
+
+  /* Backdrop with blur */
+  .backdrop-glow {
+    @apply backdrop-blur-lg bg-[#09090b]/80;
+  }
+
+  /* Better focus ring */
+  .focus-ring {
+    @apply focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-[#09090b];
+  }
+}
+
+/* View transition disable (for smooth prefetching) */
+::view-transition-old(root),
+::view-transition-new(root) {
+  animation: none;
 }
diff --git a/frontend/packages/website/tailwind.config.mjs b/frontend/packages/website/tailwind.config.mjs
index 142adbc..ab26430 100644
--- a/frontend/packages/website/tailwind.config.mjs
+++ b/frontend/packages/website/tailwind.config.mjs
@@ -1,24 +1,65 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
+  content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
   theme: {
     extend: {
       colors: {
-        accent: '#FF4500',
+        // Primary accent (Foundry orange)
+        accent: "#ff4f00",
+        // Extended color palette
+        background: "#09090b",
+        "bg-secondary": "#0f0f11",
+        "bg-tertiary": "#0c0c0e",
+        "text-primary": "#ffffff",
+        "text-secondary": "#a1a1aa",
+        "text-tertiary": "#71717a",
+        border: "rgba(255, 255, 255, 0.10)",
+        // Code syntax highlighting
+        "code-keyword": "#c084fc",
+        "code-function": "#60a5fa",
+        "code-string": "#4ade80",
+        "code-comment": "#71717a",
       },
       fontFamily: {
-        sans: ['Open Sans', 'system-ui', 'sans-serif'],
-        mono: ['JetBrains Mono', 'monospace'],
+        sans: ["IBM Plex Sans", "Segoe UI", "system-ui", "sans-serif"],
+        heading: ["IBM Plex Sans", "Segoe UI", "system-ui", "sans-serif"],
+        mono: ["IBM Plex Mono", "SFMono-Regular", "monospace"],
       },
       animation: {
-        'fade-in-up': 'fade-in-up 0.6s ease-out forwards',
-        'pulse-slow': 'pulse 3s ease-in-out infinite',
+        "fade-in-up": "fade-in-up 0.8s ease-out forwards",
+        "hero-line": "hero-line 1s cubic-bezier(0.19, 1, 0.22, 1) forwards",
+        "hero-p": "hero-p 0.8s ease-out 0.6s forwards",
+        "hero-cta": "hero-p 0.8s ease-out 0.8s forwards",
+        "hero-visual": "hero-p 0.8s ease-out 1s forwards",
+        "infinite-scroll": "infinite-scroll 25s linear infinite",
+        "pulse-slow": "pulse-slow 3s cubic-bezier(0.4, 0, 0.6, 1) infinite",
       },
       keyframes: {
-        'fade-in-up': {
-          '0%': { opacity: '0', transform: 'translateY(20px)' },
-          '100%': { opacity: '1', transform: 'translateY(0)' },
+        "fade-in-up": {
+          from: { opacity: "0", transform: "translateY(24px)" },
+          to: { opacity: "1", transform: "translateY(0)" },
         },
+        "hero-line": {
+          "0%": { opacity: "0", transform: "translateY(100%) skewY(6deg)" },
+          "100%": { opacity: "1", transform: "translateY(0) skewY(0deg)" },
+        },
+        "hero-p": {
+          from: { opacity: "0", transform: "translateY(20px)" },
+          to: { opacity: "1", transform: "translateY(0)" },
+        },
+        "infinite-scroll": {
+          from: { transform: "translateX(0)" },
+          to: { transform: "translateX(-50%)" },
+        },
+        "pulse-slow": {
+          "50%": { opacity: ".5" },
+        },
+      },
+      spacing: {
+        header: "var(--header-height, 3.5rem)",
+      },
+      borderRadius: {
+        "4xl": "2rem",
       },
     },
   },
diff --git a/frontend/packages/website/vite.config.ts b/frontend/packages/website/vite.config.ts
index f6e80c9..313c736 100644
--- a/frontend/packages/website/vite.config.ts
+++ b/frontend/packages/website/vite.config.ts
@@ -2,6 +2,6 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
   server: {
-    port: 3000
-  }
+    port: 3000,
+  },
 });
diff --git a/gigacode/src/main.rs b/gigacode/src/main.rs
index 6710c17..f5e1775 100644
--- a/gigacode/src/main.rs
+++ b/gigacode/src/main.rs
@@ -11,6 +11,7 @@ fn main() {
 }
 
 fn run() -> Result<(), CliError> {
+    let started = std::time::Instant::now();
     let cli = GigacodeCli::parse();
     let config = CliConfig {
         token: cli.token,
@@ -34,5 +35,18 @@ fn run() -> Result<(), CliError> {
         eprintln!("failed to init logging: {err}");
         return Err(err);
     }
-    run_command(&command, &config)
+    tracing::info!(
+        command = ?command,
+        startup_ms = started.elapsed().as_millis() as u64,
+        "gigacode.run: command starting"
+    );
+    let command_started = std::time::Instant::now();
+    let result = run_command(&command, &config);
+    tracing::info!(
+        command = ?command,
+        command_ms = command_started.elapsed().as_millis() as u64,
+        total_ms = started.elapsed().as_millis() as u64,
+        "gigacode.run: command exited"
+    );
+    result
 }
diff --git a/justfile b/justfile
index cca4f55..4ec95bc 100644
--- a/justfile
+++ b/justfile
@@ -91,3 +91,98 @@ install-release:
     pnpm build --filter @sandbox-agent/inspector...
     cargo install --path server/packages/sandbox-agent
     cargo install --path gigacode
+
+# =============================================================================
+# Foundry
+# =============================================================================
+
+[group('foundry')]
+foundry-deps:
+	pnpm install
+
+[group('foundry')]
+foundry-install:
+	pnpm install
+	pnpm -w build
+
+[group('foundry')]
+foundry-typecheck:
+	pnpm -w typecheck
+
+[group('foundry')]
+foundry-build:
+	pnpm -w build
+
+[group('foundry')]
+foundry-test:
+	pnpm -w test
+
+[group('foundry')]
+foundry-check:
+	pnpm -w typecheck
+	pnpm -w build
+	pnpm -w test
+
+[group('foundry')]
+foundry-dev:
+	pnpm install
+	mkdir -p foundry/.foundry/logs
+	HF_DOCKER_UID="$(id -u)" HF_DOCKER_GID="$(id -g)" docker compose --env-file .env -f foundry/compose.dev.yaml up --build --force-recreate -d
+
+[group('foundry')]
+foundry-preview:
+	pnpm install
+	mkdir -p foundry/.foundry/logs
+	HF_DOCKER_UID="$(id -u)" HF_DOCKER_GID="$(id -g)" docker compose --env-file .env -f foundry/compose.preview.yaml up --build --force-recreate -d
+
+[group('foundry')]
+foundry-frontend-dev host='127.0.0.1' port='4173' backend='http://127.0.0.1:7741/api/rivet':
+	pnpm install
+	VITE_HF_BACKEND_ENDPOINT="{{backend}}" pnpm --filter @sandbox-agent/foundry-frontend dev -- --host {{host}} --port {{port}}
+
+[group('foundry')]
+foundry-dev-mock host='127.0.0.1' port='4174':
+	pnpm install
+	FOUNDRY_FRONTEND_CLIENT_MODE=mock pnpm --filter @sandbox-agent/foundry-frontend dev -- --host {{host}} --port {{port}}
+
+[group('foundry')]
+foundry-mock:
+	pnpm install
+	mkdir -p foundry/.foundry/logs
+	docker compose -f foundry/compose.mock.yaml up --build --force-recreate -d
+
+[group('foundry')]
+foundry-mock-down:
+	docker compose -f foundry/compose.mock.yaml down
+
+[group('foundry')]
+foundry-mock-logs:
+	docker compose -f foundry/compose.mock.yaml logs -f --tail=200
+
+[group('foundry')]
+foundry-dev-turbo:
+	pnpm exec turbo run dev --parallel --filter=@sandbox-agent/foundry-*
+
+[group('foundry')]
+foundry-dev-down:
+	docker compose --env-file .env -f foundry/compose.dev.yaml down
+
+[group('foundry')]
+foundry-dev-logs:
+	docker compose --env-file .env -f foundry/compose.dev.yaml logs -f --tail=200
+
+[group('foundry')]
+foundry-preview-down:
+	docker compose --env-file .env -f foundry/compose.preview.yaml down
+
+[group('foundry')]
+foundry-preview-logs:
+	docker compose --env-file .env -f foundry/compose.preview.yaml logs -f --tail=200
+
+[group('foundry')]
+foundry-format:
+	prettier --write foundry
+
+[group('foundry')]
+foundry-docker-build tag='foundry:local':
+	docker build -f foundry/docker/backend.Dockerfile -t {{tag}} .
diff --git a/lefthook.yml b/lefthook.yml
new file mode 100644
index 0000000..27b685f
--- /dev/null
+++ b/lefthook.yml
@@ -0,0 +1,11 @@
+pre-commit:
+  parallel: true
+  jobs:
+    - name: biome
+      glob: "*.{cjs,cts,js,jsx,json,jsonc,mjs,mts,ts,tsx}"
+      run: pnpm exec biome format --write --no-errors-on-unmatched {staged_files}
+      stage_fixed: true
+    - name: rustfmt
+      glob: "*.rs"
+      run: rustfmt --edition 2021 {staged_files}
+      stage_fixed: true
diff --git a/package.json b/package.json
index f86cc47..c10fd76 100644
--- a/package.json
+++ b/package.json
@@ -7,16 +7,21 @@
     "build": "turbo run build",
     "dev": "turbo run dev --parallel",
     "generate": "turbo run generate",
+    "prepare": "git rev-parse --git-dir >/dev/null 2>&1 && lefthook install || true",
     "typecheck": "turbo run typecheck"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.4.6",
+    "@types/node": "^24.5.2",
+    "lefthook": "^2.1.3",
     "turbo": "^2.4.0",
+    "typescript": "^5.9.2",
     "vitest": "^3.0.0"
   },
   "pnpm": {
     "overrides": {
-      "@types/react": "^18.3.3",
-      "@types/react-dom": "^18.3.0"
+      "@types/react": "^19.1.12",
+      "@types/react-dom": "^19.1.6"
     }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 70ed795..4d2cde6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,29 +1,66 @@
 lockfileVersion: '9.0'
 
 settings:
-  autoInstallPeers: true
+  autoInstallPeers: false
   excludeLinksFromLockfile: false
 
 overrides:
-  '@types/react': ^18.3.3
-  '@types/react-dom': ^18.3.0
+  '@types/react': ^19.1.12
+  '@types/react-dom': ^19.1.6
 
 importers:
 
   .:
     devDependencies:
+      '@biomejs/biome':
+        specifier: ^2.4.6
+        version: 2.4.6
+      '@types/node':
+        specifier: ^24.5.2
+        version: 24.10.9
+      lefthook:
+        specifier: ^2.1.3
+        version: 2.1.3
       turbo:
         specifier: ^2.4.0
         version: 2.7.6
+      typescript:
+        specifier: ^5.9.2
+        version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@24.10.9)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
+
+  examples/boxlite:
+    dependencies:
+      '@boxlite-ai/boxlite':
+        specifier: latest
+        version: 0.4.3
+      '@sandbox-agent/example-shared':
+        specifier: workspace:*
+        version: link:../shared
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
+      typescript:
+        specifier: latest
+        version: 5.9.3
 
   examples/cloudflare:
     dependencies:
       '@cloudflare/sandbox':
         specifier: latest
-        version: 0.7.0
+        version: 0.7.18(@opencode-ai/sdk@1.2.24)
+      hono:
+        specifier: ^4.12.2
+        version: 4.12.2
       react:
         specifier: ^19.1.0
         version: 19.2.4
@@ -36,31 +73,31 @@ importers:
     devDependencies:
       '@cloudflare/workers-types':
         specifier: latest
-        version: 4.20260207.0
+        version: 4.20260317.1
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       '@types/react':
-        specifier: ^18.3.3
-        version: 18.3.27
+        specifier: ^19.1.12
+        version: 19.2.14
       '@types/react-dom':
-        specifier: ^18.3.0
-        version: 18.3.7(@types/react@18.3.27)
+        specifier: ^19.1.6
+        version: 19.2.3(@types/react@19.2.14)
       '@vitejs/plugin-react':
         specifier: ^4.5.0
-        version: 4.7.0(vite@6.4.1(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
+        version: 4.7.0(vite@6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
       typescript:
         specifier: latest
         version: 5.9.3
       vite:
         specifier: ^6.2.0
-        version: 6.4.1(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
       wrangler:
         specifier: latest
-        version: 4.63.0(@cloudflare/workers-types@4.20260207.0)
+        version: 4.74.0(@cloudflare/workers-types@4.20260317.1)
 
   examples/computesdk:
     dependencies:
@@ -69,14 +106,14 @@ importers:
         version: link:../shared
       computesdk:
         specifier: latest
-        version: 2.2.0
+        version: 2.5.1
       sandbox-agent:
         specifier: workspace:*
         version: link:../../sdks/typescript
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.3
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -85,13 +122,13 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   examples/daytona:
     dependencies:
       '@daytonaio/sdk':
         specifier: latest
-        version: 0.139.0(ws@8.19.0)
+        version: 0.151.0(ws@8.19.0)
       '@sandbox-agent/example-shared':
         specifier: workspace:*
         version: link:../shared
@@ -101,7 +138,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -117,16 +154,16 @@ importers:
       dockerode:
         specifier: latest
         version: 4.0.9
+      get-port:
+        specifier: latest
+        version: 7.1.0
       sandbox-agent:
         specifier: workspace:*
         version: link:../../sdks/typescript
     devDependencies:
-      '@types/dockerode':
-        specifier: latest
-        version: 4.0.1
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -135,7 +172,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   examples/e2b:
     dependencies:
@@ -151,7 +188,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -160,7 +197,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   examples/file-system:
     dependencies:
@@ -176,7 +213,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -195,7 +232,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -207,7 +244,7 @@ importers:
     dependencies:
       '@modelcontextprotocol/sdk':
         specifier: latest
-        version: 1.26.0(zod@4.3.6)
+        version: 1.27.1(zod@4.3.6)
       '@sandbox-agent/example-shared':
         specifier: workspace:*
         version: link:../shared
@@ -220,10 +257,10 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       esbuild:
         specifier: latest
-        version: 0.27.3
+        version: 0.27.4
       tsx:
         specifier: latest
         version: 4.21.0
@@ -235,7 +272,120 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.3
+        version: 25.5.0
+      typescript:
+        specifier: latest
+        version: 5.9.3
+
+  examples/modal:
+    dependencies:
+      '@sandbox-agent/example-shared':
+        specifier: workspace:*
+        version: link:../shared
+      modal:
+        specifier: latest
+        version: 0.7.3
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
+      typescript:
+        specifier: latest
+        version: 5.9.3
+      vitest:
+        specifier: ^3.0.0
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
+
+  examples/permissions:
+    dependencies:
+      commander:
+        specifier: ^12.1.0
+        version: 12.1.0
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
+      typescript:
+        specifier: latest
+        version: 5.9.3
+
+  examples/persist-memory:
+    dependencies:
+      '@sandbox-agent/example-shared':
+        specifier: workspace:*
+        version: link:../shared
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
+      typescript:
+        specifier: latest
+        version: 5.9.3
+
+  examples/persist-postgres:
+    dependencies:
+      '@sandbox-agent/example-shared':
+        specifier: workspace:*
+        version: link:../shared
+      pg:
+        specifier: latest
+        version: 8.20.0
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      '@types/pg':
+        specifier: latest
+        version: 8.18.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
+      typescript:
+        specifier: latest
+        version: 5.9.3
+
+  examples/persist-sqlite:
+    dependencies:
+      '@sandbox-agent/example-shared':
+        specifier: workspace:*
+        version: link:../shared
+      better-sqlite3:
+        specifier: ^11.0.0
+        version: 11.10.0
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/better-sqlite3':
+        specifier: ^7.0.0
+        version: 7.6.13
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
       typescript:
         specifier: latest
         version: 5.9.3
@@ -254,7 +404,7 @@ importers:
         version: 4.0.1
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       typescript:
         specifier: latest
         version: 5.9.3
@@ -270,7 +420,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -289,10 +439,10 @@ importers:
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       esbuild:
         specifier: latest
-        version: 0.27.3
+        version: 0.27.4
       tsx:
         specifier: latest
         version: 4.21.0
@@ -300,6 +450,31 @@ importers:
         specifier: latest
         version: 5.9.3
 
+  examples/sprites:
+    dependencies:
+      '@fly/sprites':
+        specifier: latest
+        version: 0.0.1
+      '@sandbox-agent/example-shared':
+        specifier: workspace:*
+        version: link:../shared
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../sdks/typescript
+    devDependencies:
+      '@types/node':
+        specifier: latest
+        version: 25.5.0
+      tsx:
+        specifier: latest
+        version: 4.21.0
+      typescript:
+        specifier: latest
+        version: 6.0.2
+      vitest:
+        specifier: ^3.0.0
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
+
   examples/vercel:
     dependencies:
       '@sandbox-agent/example-shared':
@@ -307,14 +482,14 @@ importers:
         version: link:../shared
       '@vercel/sandbox':
         specifier: latest
-        version: 1.4.1
+        version: 1.8.1
       sandbox-agent:
         specifier: workspace:*
         version: link:../../sdks/typescript
     devDependencies:
       '@types/node':
         specifier: latest
-        version: 25.2.2
+        version: 25.5.0
       tsx:
         specifier: latest
         version: 4.21.0
@@ -323,13 +498,170 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
+
+  foundry/packages/backend:
+    dependencies:
+      '@e2b/code-interpreter':
+        specifier: ^2.3.3
+        version: 2.3.3
+      '@hono/node-server':
+        specifier: ^1.19.7
+        version: 1.19.9(hono@4.12.2)
+      '@hono/node-ws':
+        specifier: ^1.3.0
+        version: 1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2)
+      '@iarna/toml':
+        specifier: ^2.2.5
+        version: 2.2.5
+      '@sandbox-agent/foundry-shared':
+        specifier: workspace:*
+        version: link:../shared
+      better-auth:
+        specifier: ^1.5.5
+        version: 1.5.5(@cloudflare/workers-types@4.20260317.1)(drizzle-kit@0.31.9)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(solid-js@1.9.11)(vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2))
+      dockerode:
+        specifier: ^4.0.9
+        version: 4.0.9
+      drizzle-kit:
+        specifier: ^0.31.8
+        version: 0.31.9
+      drizzle-orm:
+        specifier: ^0.44.5
+        version: 0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0)
+      hono:
+        specifier: ^4.11.9
+        version: 4.12.2
+      pino:
+        specifier: ^10.3.1
+        version: 10.3.1
+      rivetkit:
+        specifier: https://pkg.pr.new/rivet-dev/rivet/rivetkit@791500a
+        version: https://pkg.pr.new/rivet-dev/rivet/rivetkit@791500a(@e2b/code-interpreter@2.3.3)(@hono/node-server@1.19.9(hono@4.12.2))(@hono/node-ws@1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2))(@standard-schema/spec@1.1.0)(dockerode@4.0.9)(drizzle-kit@0.31.9)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))(ws@8.19.0)
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../../sdks/typescript
+      uuid:
+        specifier: ^13.0.0
+        version: 13.0.0
+      ws:
+        specifier: ^8.19.0
+        version: 8.19.0
+      zod:
+        specifier: ^4.1.5
+        version: 4.3.6
+    devDependencies:
+      '@types/bun':
+        specifier: ^1.3.9
+        version: 1.3.10
+      tsup:
+        specifier: ^8.5.0
+        version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
+
+  foundry/packages/client:
+    dependencies:
+      '@sandbox-agent/foundry-shared':
+        specifier: workspace:*
+        version: link:../shared
+      react:
+        specifier: ^19.1.1
+        version: 19.2.4
+      rivetkit:
+        specifier: 2.1.6
+        version: 2.1.6(@hono/node-server@1.19.9(hono@4.12.2))(@hono/node-ws@1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2))(@standard-schema/spec@1.1.0)(drizzle-kit@0.31.9)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))(ws@8.19.0)
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../../sdks/typescript
+    devDependencies:
+      '@types/react':
+        specifier: ^19.1.12
+        version: 19.2.14
+      tsup:
+        specifier: ^8.5.0
+        version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
+
+  foundry/packages/frontend:
+    dependencies:
+      '@sandbox-agent/foundry-client':
+        specifier: workspace:*
+        version: link:../client
+      '@sandbox-agent/foundry-shared':
+        specifier: workspace:*
+        version: link:../shared
+      '@sandbox-agent/react':
+        specifier: workspace:*
+        version: link:../../../sdks/react
+      '@tanstack/react-query':
+        specifier: ^5.85.5
+        version: 5.90.21(react@19.2.4)
+      '@tanstack/react-router':
+        specifier: ^1.132.23
+        version: 1.166.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@tanstack/react-virtual':
+        specifier: ^3.13.22
+        version: 3.13.22(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      baseui:
+        specifier: ^16.1.1
+        version: 16.1.1(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(styletron-react@6.1.1(react@19.2.4))
+      lucide-react:
+        specifier: ^0.542.0
+        version: 0.542.0(react@19.2.4)
+      react:
+        specifier: ^19.1.1
+        version: 19.2.4
+      react-dom:
+        specifier: ^19.1.1
+        version: 19.2.4(react@19.2.4)
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../../sdks/typescript
+      styletron-engine-atomic:
+        specifier: ^1.6.2
+        version: 1.6.2
+      styletron-react:
+        specifier: ^6.1.1
+        version: 6.1.1(react@19.2.4)
+    devDependencies:
+      '@react-grab/mcp':
+        specifier: ^0.1.13
+        version: 0.1.27(@types/react@19.2.14)(react@19.2.4)
+      '@types/react':
+        specifier: ^19.1.12
+        version: 19.2.14
+      '@types/react-dom':
+        specifier: ^19.1.6
+        version: 19.2.3(@types/react@19.2.14)
+      '@vitejs/plugin-react':
+        specifier: ^5.0.3
+        version: 5.1.4(vite@7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
+      react-grab:
+        specifier: ^0.1.13
+        version: 0.1.27(@types/react@19.2.14)(react@19.2.4)
+      tsup:
+        specifier: ^8.5.0
+        version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
+      vite:
+        specifier: ^7.1.3
+        version: 7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+
+  foundry/packages/shared:
+    dependencies:
+      pino:
+        specifier: ^10.3.1
+        version: 10.3.1
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../../../sdks/typescript
+      zod:
+        specifier: ^4.1.5
+        version: 4.3.6
+    devDependencies:
+      tsup:
+        specifier: ^8.5.0
+        version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
 
   frontend/packages/inspector:
     dependencies:
-      '@sandbox-agent/persist-indexeddb':
-        specifier: workspace:*
-        version: link:../../../sdks/persist-indexeddb
       lucide-react:
         specifier: ^0.469.0
         version: 0.469.0(react@18.3.1)
@@ -340,18 +672,24 @@ importers:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
     devDependencies:
+      '@sandbox-agent/react':
+        specifier: workspace:*
+        version: link:../../../sdks/react
       '@types/react':
-        specifier: ^18.3.3
-        version: 18.3.27
+        specifier: ^19.1.12
+        version: 19.2.14
       '@types/react-dom':
-        specifier: ^18.3.0
-        version: 18.3.7(@types/react@18.3.27)
+        specifier: ^19.1.6
+        version: 19.2.3(@types/react@19.2.14)
       '@vitejs/plugin-react':
         specifier: ^4.3.1
-        version: 4.7.0(vite@5.4.21(@types/node@25.2.3))
+        version: 4.7.0(vite@5.4.21(@types/node@25.5.0))
       fake-indexeddb:
         specifier: ^6.2.4
         version: 6.2.5
+      jsdom:
+        specifier: ^26.1.0
+        version: 26.1.0
       sandbox-agent:
         specifier: workspace:*
         version: link:../../../sdks/typescript
@@ -360,22 +698,25 @@ importers:
         version: 5.9.3
       vite:
         specifier: ^5.4.7
-        version: 5.4.21(@types/node@25.2.3)
+        version: 5.4.21(@types/node@25.5.0)
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   frontend/packages/website:
     dependencies:
       '@astrojs/react':
         specifier: ^4.2.0
-        version: 4.4.2(@types/node@25.2.3)(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(jiti@1.21.7)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tsx@4.21.0)(yaml@2.8.2)
+        version: 4.4.2(@types/node@25.5.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(jiti@1.21.7)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tsx@4.21.0)(yaml@2.8.2)
+      '@astrojs/sitemap':
+        specifier: ^3.2.0
+        version: 3.7.0
       '@astrojs/tailwind':
         specifier: ^6.0.0
-        version: 6.0.2(astro@5.16.15(@types/node@25.2.3)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))
+        version: 6.0.2(astro@5.16.15(@types/node@25.5.0)(aws4fetch@1.0.20)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))
       astro:
         specifier: ^5.1.0
-        version: 5.16.15(@types/node@25.2.3)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+        version: 5.16.15(@types/node@25.5.0)(aws4fetch@1.0.20)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
       framer-motion:
         specifier: ^12.0.0
         version: 12.29.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -393,11 +734,11 @@ importers:
         version: 3.4.19(tsx@4.21.0)(yaml@2.8.2)
     devDependencies:
       '@types/react':
-        specifier: ^18.3.3
-        version: 18.3.27
+        specifier: ^19.1.12
+        version: 19.2.14
       '@types/react-dom':
-        specifier: ^18.3.0
-        version: 18.3.7(@types/react@18.3.27)
+        specifier: ^19.1.6
+        version: 19.2.3(@types/react@19.2.14)
       typescript:
         specifier: ^5.7.0
         version: 5.9.3
@@ -451,31 +792,15 @@ importers:
       '@types/semver':
         specifier: ^7.5.8
         version: 7.7.1
-
-  scripts/sandbox-testing:
-    dependencies:
-      '@daytonaio/sdk':
-        specifier: latest
-        version: 0.139.0(ws@8.19.0)
-      '@e2b/code-interpreter':
-        specifier: latest
-        version: 2.3.3
-    devDependencies:
-      '@types/node':
-        specifier: latest
-        version: 25.2.2
-      tsx:
-        specifier: latest
-        version: 4.21.0
       typescript:
-        specifier: latest
+        specifier: ^5.7.0
         version: 5.9.3
 
   sdks/acp-http-client:
     dependencies:
       '@agentclientprotocol/sdk':
-        specifier: ^0.14.1
-        version: 0.14.1(zod@4.3.6)
+        specifier: ^0.16.1
+        version: 0.16.1(zod@4.3.6)
     devDependencies:
       '@types/node':
         specifier: ^22.0.0
@@ -488,7 +813,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   sdks/cli:
     dependencies:
@@ -514,7 +839,7 @@ importers:
     devDependencies:
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   sdks/cli-shared:
     devDependencies:
@@ -562,7 +887,7 @@ importers:
     devDependencies:
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
   sdks/gigacode/platforms/darwin-arm64: {}
 
@@ -575,60 +900,30 @@ importers:
   sdks/gigacode/platforms/win32-x64: {}
 
   sdks/persist-indexeddb:
-    dependencies:
-      sandbox-agent:
-        specifier: workspace:*
-        version: link:../typescript
     devDependencies:
       '@types/node':
         specifier: ^22.0.0
         version: 22.19.7
-      fake-indexeddb:
-        specifier: ^6.2.4
-        version: 6.2.5
       tsup:
         specifier: ^8.0.0
         version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
       typescript:
         specifier: ^5.7.0
         version: 5.9.3
-      vitest:
-        specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
 
   sdks/persist-postgres:
-    dependencies:
-      pg:
-        specifier: ^8.16.3
-        version: 8.18.0
-      sandbox-agent:
-        specifier: workspace:*
-        version: link:../typescript
     devDependencies:
       '@types/node':
         specifier: ^22.0.0
         version: 22.19.7
-      '@types/pg':
-        specifier: ^8.15.6
-        version: 8.16.0
       tsup:
         specifier: ^8.0.0
         version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
       typescript:
         specifier: ^5.7.0
         version: 5.9.3
-      vitest:
-        specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
 
   sdks/persist-rivet:
-    dependencies:
-      rivetkit:
-        specifier: '>=0.5.0'
-        version: 2.0.42(@hono/node-server@1.19.9(hono@4.11.8))(@standard-schema/spec@1.0.0)(ws@8.19.0)
-      sandbox-agent:
-        specifier: workspace:*
-        version: link:../typescript
     devDependencies:
       '@types/node':
         specifier: ^22.0.0
@@ -639,15 +934,8 @@ importers:
       typescript:
         specifier: ^5.7.0
         version: 5.9.3
-      vitest:
-        specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
 
   sdks/persist-sqlite:
-    dependencies:
-      sandbox-agent:
-        specifier: workspace:*
-        version: link:../typescript
     devDependencies:
       '@types/node':
         specifier: ^22.0.0
@@ -658,9 +946,31 @@ importers:
       typescript:
         specifier: ^5.7.0
         version: 5.9.3
-      vitest:
-        specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+
+  sdks/react:
+    dependencies:
+      '@tanstack/react-virtual':
+        specifier: ^3.13.22
+        version: 3.13.22(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      ghostty-web:
+        specifier: ^0.4.0
+        version: 0.4.0
+    devDependencies:
+      '@types/react':
+        specifier: ^19.1.12
+        version: 19.2.14
+      react:
+        specifier: ^19.1.1
+        version: 19.2.4
+      sandbox-agent:
+        specifier: workspace:*
+        version: link:../typescript
+      tsup:
+        specifier: ^8.0.0
+        version: 8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+      typescript:
+        specifier: ^5.7.0
+        version: 5.9.3
 
   sdks/typescript:
     dependencies:
@@ -675,9 +985,42 @@ importers:
         specifier: workspace:*
         version: link:../cli
     devDependencies:
+      '@cloudflare/sandbox':
+        specifier: '>=0.1.0'
+        version: 0.7.18(@opencode-ai/sdk@1.2.24)
+      '@daytonaio/sdk':
+        specifier: '>=0.12.0'
+        version: 0.151.0(ws@8.19.0)
+      '@e2b/code-interpreter':
+        specifier: '>=1.0.0'
+        version: 2.3.3
+      '@fly/sprites':
+        specifier: '>=0.0.1'
+        version: 0.0.1
+      '@types/dockerode':
+        specifier: ^4.0.0
+        version: 4.0.1
       '@types/node':
         specifier: ^22.0.0
         version: 22.19.7
+      '@types/ws':
+        specifier: ^8.18.1
+        version: 8.18.1
+      '@vercel/sandbox':
+        specifier: '>=0.1.0'
+        version: 1.8.1
+      computesdk:
+        specifier: '>=0.1.0'
+        version: 2.5.1
+      dockerode:
+        specifier: '>=4.0.0'
+        version: 4.0.9
+      get-port:
+        specifier: '>=7.0.0'
+        version: 7.1.0
+      modal:
+        specifier: '>=0.1.0'
+        version: 0.7.3
       openapi-typescript:
         specifier: ^6.7.0
         version: 6.7.6
@@ -689,7 +1032,26 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
+      ws:
+        specifier: ^8.19.0
+        version: 8.19.0
+
+  server/packages/sandbox-agent/tests/opencode-compat:
+    dependencies:
+      '@opencode-ai/sdk':
+        specifier: ^1.1.21
+        version: 1.2.24
+    devDependencies:
+      '@types/node':
+        specifier: ^22.0.0
+        version: 22.19.7
+      typescript:
+        specifier: ^5.7.0
+        version: 5.9.3
+      vitest:
+        specifier: ^3.0.0
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
 
 packages:
 
@@ -698,12 +1060,24 @@ packages:
     peerDependencies:
       zod: ^3.25.0 || ^4.0.0
 
+  '@agentclientprotocol/sdk@0.16.1':
+    resolution: {integrity: sha512-1ad+Sc/0sCtZGHthxxvgEUo5Wsbw16I+aF+YwdiLnPwkZG8KAGUEAPK6LM6Pf69lCyJPt1Aomk1d+8oE3C4ZEw==}
+    peerDependencies:
+      zod: ^3.25.0 || ^4.0.0
+
   '@alloc/quick-lru@5.2.0':
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
     engines: {node: '>=10'}
 
-  '@asteasolutions/zod-to-openapi@8.4.0':
-    resolution: {integrity: sha512-Ckp971tmTw4pnv+o7iK85ldBHBKk6gxMaoNyLn3c2Th/fKoTG8G3jdYuOanpdGqwlDB0z01FOjry2d32lfTqrA==}
+  '@antfu/ni@0.23.2':
+    resolution: {integrity: sha512-FSEVWXvwroExDXUu8qV6Wqp2X3D1nJ0Li4LFymCyvCVrm7I3lNfG0zZWSWvGU1RE7891eTnFTyh31L3igOwNKQ==}
+    hasBin: true
+
+  '@asamuzakjp/css-color@3.2.0':
+    resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==}
+
+  '@asteasolutions/zod-to-openapi@8.4.3':
+    resolution: {integrity: sha512-lwfMTN7kDbFDwMniYZUebiGGHxVGBw9ZSI4IBYjm6Ey22Kd5z/fsQb2k+Okr8WMbCCC553vi/ZM9utl5/XcvuQ==}
     peerDependencies:
       zod: ^4.0.0
 
@@ -724,11 +1098,14 @@ packages:
     resolution: {integrity: sha512-1tl95bpGfuaDMDn8O3x/5Dxii1HPvzjvpL2YTuqOOrQehs60I2DKiDgh1jrKc7G8lv+LQT5H15V6QONQ+9waeQ==}
     engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0}
     peerDependencies:
-      '@types/react': ^18.3.3
-      '@types/react-dom': ^18.3.0
+      '@types/react': ^19.1.12
+      '@types/react-dom': ^19.1.6
       react: ^17.0.2 || ^18.0.0 || ^19.0.0
       react-dom: ^17.0.2 || ^18.0.0 || ^19.0.0
 
+  '@astrojs/sitemap@3.7.0':
+    resolution: {integrity: sha512-+qxjUrz6Jcgh+D5VE1gKUJTA3pSthuPHe6Ao5JCxok794Lewx8hBFaWHtOnN0ntb2lfOf7gvOi9TefUswQ/ZVA==}
+
   '@astrojs/tailwind@6.0.2':
     resolution: {integrity: sha512-j3mhLNeugZq6A8dMNXVarUa8K6X9AW+QHU9u3lKNrPLMHhOQ0S7VeWhHwEeJFpEK1BTKEUY1U78VQv2gN6hNGg==}
     peerDependencies:
@@ -932,6 +1309,10 @@ packages:
     resolution: {integrity: sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.29.0':
+    resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.28.6':
     resolution: {integrity: sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==}
     engines: {node: '>=6.9.0'}
@@ -940,10 +1321,18 @@ packages:
     resolution: {integrity: sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/core@7.29.0':
+    resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/generator@7.28.6':
     resolution: {integrity: sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.29.1':
+    resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-compilation-targets@7.28.6':
     resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
     engines: {node: '>=6.9.0'}
@@ -987,6 +1376,11 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.29.0':
+    resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   '@babel/plugin-transform-react-jsx-self@7.27.1':
     resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
     engines: {node: '>=6.9.0'}
@@ -999,6 +1393,10 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/runtime@7.28.6':
+    resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
@@ -1007,13 +1405,163 @@ packages:
     resolution: {integrity: sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.29.0':
+    resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.28.6':
     resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.29.0':
+    resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
+    engines: {node: '>=6.9.0'}
+
   '@balena/dockerignore@1.0.2':
     resolution: {integrity: sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==}
 
+  '@better-auth/core@1.5.5':
+    resolution: {integrity: sha512-1oR/2jAp821Dcf67kQYHUoyNcdc1TcShfw4QMK0YTVntuRES5mUOyvEJql5T6eIuLfaqaN4LOF78l0FtF66HXA==}
+    peerDependencies:
+      '@better-auth/utils': 0.3.1
+      '@better-fetch/fetch': 1.1.21
+      '@cloudflare/workers-types': '>=4'
+      better-call: 1.3.2
+      jose: ^6.1.0
+      kysely: ^0.28.5
+      nanostores: ^1.0.1
+    peerDependenciesMeta:
+      '@cloudflare/workers-types':
+        optional: true
+
+  '@better-auth/drizzle-adapter@1.5.5':
+    resolution: {integrity: sha512-HAi9xAP40oDt48QZeYBFTcmg3vt1Jik90GwoRIfangd7VGbxesIIDBJSnvwMbZ52GBIc6+V4FRw9lasNiNrPfw==}
+    peerDependencies:
+      '@better-auth/core': 1.5.5
+      '@better-auth/utils': ^0.3.0
+      drizzle-orm: '>=0.41.0'
+    peerDependenciesMeta:
+      drizzle-orm:
+        optional: true
+
+  '@better-auth/kysely-adapter@1.5.5':
+    resolution: {integrity: sha512-LmHffIVnqbfsxcxckMOoE8MwibWrbVFch+kwPKJ5OFDFv6lin75ufN7ZZ7twH0IMPLT/FcgzaRjP8jRrXRef9g==}
+    peerDependencies:
+      '@better-auth/core': 1.5.5
+      '@better-auth/utils': ^0.3.0
+      kysely: ^0.27.0 || ^0.28.0
+
+  '@better-auth/memory-adapter@1.5.5':
+    resolution: {integrity: sha512-4X0j1/2L+nsgmObjmy9xEGUFWUv38Qjthp558fwS3DAp6ueWWyCaxaD6VJZ7m5qPNMrsBStO5WGP8CmJTEWm7g==}
+    peerDependencies:
+      '@better-auth/core': 1.5.5
+      '@better-auth/utils': ^0.3.0
+
+  '@better-auth/mongo-adapter@1.5.5':
+    resolution: {integrity: sha512-P1J9ljL5X5k740I8Rx1esPWNgWYPdJR5hf2CY7BwDSrQFPUHuzeCg0YhtEEP55niNateTXhBqGAcy0fVOeamZg==}
+    peerDependencies:
+      '@better-auth/core': 1.5.5
+      '@better-auth/utils': ^0.3.0
+      mongodb: ^6.0.0 || ^7.0.0
+
+  '@better-auth/prisma-adapter@1.5.5':
+    resolution: {integrity: sha512-CliDd78CXHzzwQIXhCdwGr5Ml53i6JdCHWV7PYwTIJz9EAm6qb2RVBdpP3nqEfNjINGM22A6gfleCgCdZkTIZg==}
+    peerDependencies:
+      '@better-auth/core': 1.5.5
+      '@better-auth/utils': ^0.3.0
+      '@prisma/client': ^5.0.0 || ^6.0.0 || ^7.0.0
+      prisma: ^5.0.0 || ^6.0.0 || ^7.0.0
+    peerDependenciesMeta:
+      '@prisma/client':
+        optional: true
+      prisma:
+        optional: true
+
+  '@better-auth/telemetry@1.5.5':
+    resolution: {integrity: sha512-1+lklxArn4IMHuU503RcPdXrSG2tlXt4jnGG3omolmspQ7tktg/Y9XO/yAkYDurtvMn1xJ8X1Ov01Ji/r5s9BQ==}
+    peerDependencies:
+      '@better-auth/core': 1.5.5
+
+  '@better-auth/utils@0.3.1':
+    resolution: {integrity: sha512-+CGp4UmZSUrHHnpHhLPYu6cV+wSUSvVbZbNykxhUDocpVNTo9uFFxw/NqJlh1iC4wQ9HKKWGCKuZ5wUgS0v6Kg==}
+
+  '@better-fetch/fetch@1.1.21':
+    resolution: {integrity: sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A==}
+
+  '@biomejs/biome@2.4.6':
+    resolution: {integrity: sha512-QnHe81PMslpy3mnpL8DnO2M4S4ZnYPkjlGCLWBZT/3R9M6b5daArWMMtEfP52/n174RKnwRIf3oT8+wc9ihSfQ==}
+    engines: {node: '>=14.21.3'}
+    hasBin: true
+
+  '@biomejs/cli-darwin-arm64@2.4.6':
+    resolution: {integrity: sha512-NW18GSyxr+8sJIqgoGwVp5Zqm4SALH4b4gftIA0n62PTuBs6G2tHlwNAOj0Vq0KKSs7Sf88VjjmHh0O36EnzrQ==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@biomejs/cli-darwin-x64@2.4.6':
+    resolution: {integrity: sha512-4uiE/9tuI7cnjtY9b07RgS7gGyYOAfIAGeVJWEfeCnAarOAS7qVmuRyX6d7JTKw28/mt+rUzMasYeZ+0R/U1Mw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@biomejs/cli-linux-arm64-musl@2.4.6':
+    resolution: {integrity: sha512-F/JdB7eN22txiTqHM5KhIVt0jVkzZwVYrdTR1O3Y4auBOQcXxHK4dxULf4z43QyZI5tsnQJrRBHZy7wwtL+B3A==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-arm64@2.4.6':
+    resolution: {integrity: sha512-kMLaI7OF5GN1Q8Doymjro1P8rVEoy7BKQALNz6fiR8IC1WKduoNyteBtJlHT7ASIL0Cx2jR6VUOBIbcB1B8pew==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64-musl@2.4.6':
+    resolution: {integrity: sha512-C9s98IPDu7DYarjlZNuzJKTjVHN03RUnmHV5htvqsx6vEUXCDSJ59DNwjKVD5XYoSS4N+BYhq3RTBAL8X6svEg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64@2.4.6':
+    resolution: {integrity: sha512-oHXmUFEoH8Lql1xfc3QkFLiC1hGR7qedv5eKNlC185or+o4/4HiaU7vYODAH3peRCfsuLr1g6v2fK9dFFOYdyw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-win32-arm64@2.4.6':
+    resolution: {integrity: sha512-xzThn87Pf3YrOGTEODFGONmqXpTwUNxovQb72iaUOdcw8sBSY3+3WD8Hm9IhMYLnPi0n32s3L3NWU6+eSjfqFg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@biomejs/cli-win32-x64@2.4.6':
+    resolution: {integrity: sha512-7++XhnsPlr1HDbor5amovPjOH6vsrFOCdp93iKXhFn6bcMUI6soodj3WWKfgEO6JosKU1W5n3uky3WW9RlRjTg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [win32]
+
+  '@boxlite-ai/boxlite-darwin-arm64@0.4.3':
+    resolution: {integrity: sha512-1t9bNSPz8ql55lneojWe66vi4VbAJ6lYsVu8A1Hd3T3uug0HnXpQSvuEhGWrp2Ibavtxtr8MZ/KaW3EMPbyjXg==}
+    engines: {node: '>=18.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@boxlite-ai/boxlite-linux-x64-gnu@0.4.3':
+    resolution: {integrity: sha512-e5Ukl2pyqFe046cA+VcDUL9iso1OseHS13BEDnr/ADKsG+P//bYZHnE0JZPJL1ai4+fHg6d6BOe113rOxba1eQ==}
+    engines: {node: '>=18.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@boxlite-ai/boxlite@0.4.3':
+    resolution: {integrity: sha512-bCYSrJH8mAlz+JoyVkCUSfYuCp2IwqaLrvOu4m1vstq6LNwkLcpmJzs9gLXrHnYb+YitYko3pQiK8uTieG4BJw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      playwright-core: '>=1.58.0'
+    peerDependenciesMeta:
+      playwright-core:
+        optional: true
+
   '@bufbuild/protobuf@2.11.0':
     resolution: {integrity: sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==}
 
@@ -1021,95 +1569,98 @@ packages:
     resolution: {integrity: sha512-VERIM64vtTP1C4mxQ5thVT9fK0apjPFobqybMtA1UdUujWka24ERHbRHFGmpbbhp73MhV+KSsHQH9C6uOTdEQA==}
     engines: {node: '>=18'}
 
-  '@cbor-extract/cbor-extract-darwin-arm64@2.2.0':
-    resolution: {integrity: sha512-P7swiOAdF7aSi0H+tHtHtr6zrpF3aAq/W9FXx5HektRvLTM2O89xCyXF3pk7pLc7QpaY7AoaE8UowVf9QBdh3w==}
+  '@cbor-extract/cbor-extract-darwin-arm64@2.2.1':
+    resolution: {integrity: sha512-ubDPxTvFufYt2wYpBIbp9AP4uKKm55AVrXJyGkLbpKyk8+01KCKDGeB66JTZCGflSsAPRIluLHWI1P8ntEZShQ==}
     cpu: [arm64]
     os: [darwin]
 
-  '@cbor-extract/cbor-extract-darwin-x64@2.2.0':
-    resolution: {integrity: sha512-1liF6fgowph0JxBbYnAS7ZlqNYLf000Qnj4KjqPNW4GViKrEql2MgZnAsExhY9LSy8dnvA4C0qHEBgPrll0z0w==}
+  '@cbor-extract/cbor-extract-darwin-x64@2.2.1':
+    resolution: {integrity: sha512-lzJAun76gwY4rgeklyNuPROeo7kYLh0lK+Jji9J7OX3UfSV7EpjDNGKT7wotzGpF0Qm36bOtlCNvE+VsUin1gQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@cbor-extract/cbor-extract-linux-arm64@2.2.0':
-    resolution: {integrity: sha512-rQvhNmDuhjTVXSPFLolmQ47/ydGOFXtbR7+wgkSY0bdOxCFept1hvg59uiLPT2fVDuJFuEy16EImo5tE2x3RsQ==}
+  '@cbor-extract/cbor-extract-linux-arm64@2.2.1':
+    resolution: {integrity: sha512-OFdIWOrSCSE8IRVAzHX5Js1TSvmQCcZbsB+wpXlZLFhIFbXlvF8VmXSHtBkK8pLfs9nvfsg3zz3ZIG10EKazHQ==}
     cpu: [arm64]
     os: [linux]
 
-  '@cbor-extract/cbor-extract-linux-arm@2.2.0':
-    resolution: {integrity: sha512-QeBcBXk964zOytiedMPQNZr7sg0TNavZeuUCD6ON4vEOU/25+pLhNN6EDIKJ9VLTKaZ7K7EaAriyYQ1NQ05s/Q==}
+  '@cbor-extract/cbor-extract-linux-arm@2.2.1':
+    resolution: {integrity: sha512-J5MjNKc4ecV56jOYDDMp0CfGyqQgoOgTwsEjra7YJdJic1YzGEyPedZStcpS0E1bdEyPOOJOfbFLRpgtFosZ/Q==}
     cpu: [arm]
     os: [linux]
 
-  '@cbor-extract/cbor-extract-linux-x64@2.2.0':
-    resolution: {integrity: sha512-cWLAWtT3kNLHSvP4RKDzSTX9o0wvQEEAj4SKvhWuOVZxiDAeQazr9A+PSiRILK1VYMLeDml89ohxCnUNQNQNCw==}
+  '@cbor-extract/cbor-extract-linux-x64@2.2.1':
+    resolution: {integrity: sha512-f7gB4h/CaR66hTAmooJ6uIuCNl4SmBGJAQx+ED9eIJIZtOhkyeeRrBw383cIdHiLbvr/wBVZ31RnyqFLRCmu1g==}
     cpu: [x64]
     os: [linux]
 
-  '@cbor-extract/cbor-extract-win32-x64@2.2.0':
-    resolution: {integrity: sha512-l2M+Z8DO2vbvADOBNLbbh9y5ST1RY5sqkWOg/58GkUPBYou/cuNZ68SGQ644f1CvZ8kcOxyZtw06+dxWHIoN/w==}
+  '@cbor-extract/cbor-extract-win32-x64@2.2.1':
+    resolution: {integrity: sha512-diYmdTuTTNjTfmb9A+Xq5ZOtLP6JW2SuGXqV25ZbnXjuhdEO/Vn8tX3QPmKqnPOf7SyFQVpAVwU5w9B53y3P4g==}
     cpu: [x64]
     os: [win32]
 
-  '@cloudflare/containers@0.0.30':
-    resolution: {integrity: sha512-i148xBgmyn/pje82ZIyuTr/Ae0BT/YWwa1/GTJcw6DxEjUHAzZLaBCiX446U9OeuJ2rBh/L/9FIzxX5iYNt1AQ==}
+  '@cloudflare/containers@0.1.1':
+    resolution: {integrity: sha512-YTdobRTnTlUOUPMFemufH367A9Z8pDfZ+UboYMLbGpO0VlvEXZDiioSmXPQMHld2vRtkL31mcRii3bcbQU6fdw==}
 
   '@cloudflare/kv-asset-handler@0.4.2':
     resolution: {integrity: sha512-SIOD2DxrRRwQ+jgzlXCqoEFiKOFqaPjhnNTGKXSRLvp1HiOvapLaFG2kEr9dYQTYe8rKrd9uvDUzmAITeNyaHQ==}
     engines: {node: '>=18.0.0'}
 
-  '@cloudflare/sandbox@0.7.0':
-    resolution: {integrity: sha512-U9e/fqc2R/epygMRoRFZxjM6z8ZSyJqQSFFykWTLWl2j+c9+kK9reBjp1G/RcvTAGtv8pH3Dac21jmvh4ZbGXg==}
+  '@cloudflare/sandbox@0.7.18':
+    resolution: {integrity: sha512-v9hNXik88TfhLu83RRf1I8t98L86bt2RJVJB+EPIyZB7vBVwsx8w/veQ1BoJfbf/MSETtc/zLpQROgtbe5RYRw==}
     peerDependencies:
       '@openai/agents': ^0.3.3
-      '@opencode-ai/sdk': ^1.0.137
+      '@opencode-ai/sdk': ^1.1.40
+      '@xterm/xterm': '>=5.0.0'
     peerDependenciesMeta:
       '@openai/agents':
         optional: true
       '@opencode-ai/sdk':
         optional: true
+      '@xterm/xterm':
+        optional: true
 
-  '@cloudflare/unenv-preset@2.12.0':
-    resolution: {integrity: sha512-NK4vN+2Z/GbfGS4BamtbbVk1rcu5RmqaYGiyHJQrA09AoxdZPHDF3W/EhgI0YSK8p3vRo/VNCtbSJFPON7FWMQ==}
+  '@cloudflare/unenv-preset@2.15.0':
+    resolution: {integrity: sha512-EGYmJaGZKWl+X8tXxcnx4v2bOZSjQeNI5dWFeXivgX9+YCT69AkzHHwlNbVpqtEUTbew8eQurpyOpeN8fg00nw==}
     peerDependencies:
       unenv: 2.0.0-rc.24
-      workerd: ^1.20260115.0
+      workerd: 1.20260301.1 || ~1.20260302.1 || ~1.20260303.1 || ~1.20260304.1 || >1.20260305.0 <2.0.0-0
     peerDependenciesMeta:
       workerd:
         optional: true
 
-  '@cloudflare/workerd-darwin-64@1.20260205.0':
-    resolution: {integrity: sha512-ToOItqcirmWPwR+PtT+Q4bdjTn/63ZxhJKEfW4FNn7FxMTS1Tw5dml0T0mieOZbCpcvY8BdvPKFCSlJuI8IVHQ==}
+  '@cloudflare/workerd-darwin-64@1.20260312.1':
+    resolution: {integrity: sha512-HUAtDWaqUduS6yasV6+NgsK7qBpP1qGU49ow/Wb117IHjYp+PZPUGReDYocpB4GOMRoQlvdd4L487iFxzdARpw==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [darwin]
 
-  '@cloudflare/workerd-darwin-arm64@1.20260205.0':
-    resolution: {integrity: sha512-402ZqLz+LrG0NDXp7Hn7IZbI0DyhjNfjAlVenb0K3yod9KCuux0u3NksNBvqJx0mIGHvVR4K05h+jfT5BTHqGA==}
+  '@cloudflare/workerd-darwin-arm64@1.20260312.1':
+    resolution: {integrity: sha512-DOn7TPTHSxJYfi4m4NYga/j32wOTqvJf/pY4Txz5SDKWIZHSTXFyGz2K4B+thoPWLop/KZxGoyTv7db0mk/qyw==}
     engines: {node: '>=16'}
     cpu: [arm64]
     os: [darwin]
 
-  '@cloudflare/workerd-linux-64@1.20260205.0':
-    resolution: {integrity: sha512-rz9jBzazIA18RHY+osa19hvsPfr0LZI1AJzIjC6UqkKKphcTpHBEQ25Xt8cIA34ivMIqeENpYnnmpDFesLkfcQ==}
+  '@cloudflare/workerd-linux-64@1.20260312.1':
+    resolution: {integrity: sha512-TdkIh3WzPXYHuvz7phAtFEEvAxvFd30tHrm4gsgpw0R0F5b8PtoM3hfL2uY7EcBBWVYUBtkY2ahDYFfufnXw/g==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [linux]
 
-  '@cloudflare/workerd-linux-arm64@1.20260205.0':
-    resolution: {integrity: sha512-jr6cKpMM/DBEbL+ATJ9rYue758CKp0SfA/nXt5vR32iINVJrb396ye9iat2y9Moa/PgPKnTrFgmT6urUmG3IUg==}
+  '@cloudflare/workerd-linux-arm64@1.20260312.1':
+    resolution: {integrity: sha512-kNauZhL569Iy94t844OMwa1zP6zKFiL3xiJ4tGLS+TFTEfZ3pZsRH6lWWOtkXkjTyCmBEOog0HSEKjIV4oAffw==}
     engines: {node: '>=16'}
     cpu: [arm64]
     os: [linux]
 
-  '@cloudflare/workerd-windows-64@1.20260205.0':
-    resolution: {integrity: sha512-SMPW5jCZYOG7XFIglSlsgN8ivcl0pCrSAYxCwxtWvZ88whhcDB/aISNtiQiDZujPH8tIo2hE5dEkxW7tGEwc3A==}
+  '@cloudflare/workerd-windows-64@1.20260312.1':
+    resolution: {integrity: sha512-5dBrlSK+nMsZy5bYQpj8t9iiQNvCRlkm9GGvswJa9vVU/1BNO4BhJMlqOLWT24EmFyApZ+kaBiPJMV8847NDTg==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [win32]
 
-  '@cloudflare/workers-types@4.20260207.0':
-    resolution: {integrity: sha512-PSxgnAOK0EtTytlY7/+gJcsQJYg0Qo7KlOMSC/wiBE+pBqKjuKdd1ZgM+NvpPNqZAjWV5jqAMTTNYEmgk27gYw==}
+  '@cloudflare/workers-types@4.20260317.1':
+    resolution: {integrity: sha512-+G4eVwyCpm8Au1ex8vQBCuA9wnwqetz4tPNRoB/53qvktERWBRMQnrtvC1k584yRE3emMThtuY0gWshvSJ++PQ==}
 
   '@computesdk/cmd@0.4.1':
     resolution: {integrity: sha512-hhcYrwMnOpRSwWma3gkUeAVsDFG56nURwSaQx8vCepv0IuUv39bK4mMkgszolnUQrVjBDdW7b3lV+l5B2S8fRA==}
@@ -1129,14 +1680,64 @@ packages:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
 
-  '@daytonaio/api-client@0.139.0':
-    resolution: {integrity: sha512-Xmjrkq7MW/DaZLQEf0HfT7Y38N8SesXvWqAKSEjdf3ifGVQVx37aOB8El1jOvfrndqzTcSbumSxro2nhKK5K5A==}
+  '@csstools/color-helpers@5.1.0':
+    resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==}
+    engines: {node: '>=18'}
 
-  '@daytonaio/sdk@0.139.0':
-    resolution: {integrity: sha512-67NSkhnl9NiUgBfheN5AtkH0/T5U+WTZmGlY2k+ujAAl/ntpyA/T/q+Pznk44oCJyM1O39OEWt/ugmAEyqRWLg==}
+  '@csstools/css-calc@2.1.4':
+    resolution: {integrity: sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
 
-  '@daytonaio/toolbox-api-client@0.139.0':
-    resolution: {integrity: sha512-zLonkWHsdmrwT2qCZ/zBt4dpWNJ7N08eGYjCk30Bihzk4JY0afNBPDqd+pdGdXKtuJ44yCxR4iJyjfWR11J9PA==}
+  '@csstools/css-color-parser@3.1.0':
+    resolution: {integrity: sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-parser-algorithms@3.0.5':
+    resolution: {integrity: sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^3.0.4
+
+  '@csstools/css-tokenizer@3.0.4':
+    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
+    engines: {node: '>=18'}
+
+  '@date-io/core@2.17.0':
+    resolution: {integrity: sha512-+EQE8xZhRM/hsY0CDTVyayMDDY5ihc4MqXCrPxooKw19yAzUIC6uUqsZeaOFNL9YKTNxYKrJP5DFgE8o5xRCOw==}
+
+  '@date-io/date-fns@2.17.0':
+    resolution: {integrity: sha512-L0hWZ/mTpy3Gx/xXJ5tq5CzHo0L7ry6KEO9/w/JWiFWFLZgiNVo3ex92gOl3zmzjHqY/3Ev+5sehAr8UnGLEng==}
+    peerDependencies:
+      date-fns: ^2.0.0
+    peerDependenciesMeta:
+      date-fns:
+        optional: true
+
+  '@date-io/moment@2.17.0':
+    resolution: {integrity: sha512-e4nb4CDZU4k0WRVhz1Wvl7d+hFsedObSauDHKtZwU9kt7gdYEAzKgnrSCTHsEaXrDumdrkCYTeZ0Tmyk7uV4tw==}
+    peerDependencies:
+      moment: ^2.24.0
+    peerDependenciesMeta:
+      moment:
+        optional: true
+
+  '@daytonaio/api-client@0.151.0':
+    resolution: {integrity: sha512-Ahu7bjunHbJEEAEkcEFjjdazN+1hML/lLZwOyul2WFaCTh9q5dmufhr0qKAKCIs3ccTY+Is0fO5UtPpo/fig+A==}
+
+  '@daytonaio/sdk@0.151.0':
+    resolution: {integrity: sha512-wd4x9Bipt1KmTD+0GXTVEQtgXBmyy/gAmCjdOJllwo5Ya5RbGu/CZeitBCIEKhDM8TnkxefVxdpxBCfi/Wg9xA==}
+
+  '@daytonaio/toolbox-api-client@0.151.0':
+    resolution: {integrity: sha512-63n/wBNnZh1r8dUypzwNeenoA4okWNEWzsE6kZ8b047y5zBYT0cI63cGRn25nSrepLlGKpX4MJnVjjz50+bVqA==}
+
+  '@drizzle-team/brocli@0.10.2':
+    resolution: {integrity: sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==}
 
   '@e2b/code-interpreter@2.3.3':
     resolution: {integrity: sha512-WOpSwc1WpvxyOijf6WMbR76BUuvd2O9ddXgCHHi65lkuy6YgQGq7oyd8PNsT331O9Tqbccjy6uF4xanSdLX1UA==}
@@ -1145,6 +1746,14 @@ packages:
   '@emnapi/runtime@1.8.1':
     resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==}
 
+  '@esbuild-kit/core-utils@3.3.2':
+    resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==}
+    deprecated: 'Merged into tsx: https://tsx.is'
+
+  '@esbuild-kit/esm-loader@2.6.5':
+    resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
+    deprecated: 'Merged into tsx: https://tsx.is'
+
   '@esbuild/aix-ppc64@0.21.5':
     resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
     engines: {node: '>=12'}
@@ -1157,24 +1766,24 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.27.0':
-    resolution: {integrity: sha512-KuZrd2hRjz01y5JK9mEBSD3Vj3mbCvemhT466rSuJYeE/hjuBrHfjjcjMdTm/sz7au+++sdbJZJmuBwQLuw68A==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/aix-ppc64@0.27.2':
-    resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
   '@esbuild/aix-ppc64@0.27.3':
     resolution: {integrity: sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.27.4':
+    resolution: {integrity: sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.18.20':
+    resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm64@0.21.5':
     resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
     engines: {node: '>=12'}
@@ -1187,24 +1796,24 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.27.0':
-    resolution: {integrity: sha512-CC3vt4+1xZrs97/PKDkl0yN7w8edvU2vZvAFGD16n9F0Cvniy5qvzRXjfO1l94efczkkQE6g1x0i73Qf5uthOQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm64@0.27.2':
-    resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
   '@esbuild/android-arm64@0.27.3':
     resolution: {integrity: sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.27.4':
+    resolution: {integrity: sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.18.20':
+    resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-arm@0.21.5':
     resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
@@ -1217,24 +1826,24 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.27.0':
-    resolution: {integrity: sha512-j67aezrPNYWJEOHUNLPj9maeJte7uSMM6gMoxfPC9hOg8N02JuQi/T7ewumf4tNvJadFkvLZMlAq73b9uwdMyQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-arm@0.27.2':
-    resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-arm@0.27.3':
     resolution: {integrity: sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.27.4':
+    resolution: {integrity: sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.18.20':
+    resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/android-x64@0.21.5':
     resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
@@ -1247,24 +1856,24 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.27.0':
-    resolution: {integrity: sha512-wurMkF1nmQajBO1+0CJmcN17U4BP6GqNSROP8t0X/Jiw2ltYGLHpEksp9MpoBqkrFR3kv2/te6Sha26k3+yZ9Q==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/android-x64@0.27.2':
-    resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/android-x64@0.27.3':
     resolution: {integrity: sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.27.4':
+    resolution: {integrity: sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.18.20':
+    resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-arm64@0.21.5':
     resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
@@ -1277,24 +1886,24 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.27.0':
-    resolution: {integrity: sha512-uJOQKYCcHhg07DL7i8MzjvS2LaP7W7Pn/7uA0B5S1EnqAirJtbyw4yC5jQ5qcFjHK9l6o/MX9QisBg12kNkdHg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-arm64@0.27.2':
-    resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
   '@esbuild/darwin-arm64@0.27.3':
     resolution: {integrity: sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.27.4':
+    resolution: {integrity: sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.18.20':
+    resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.21.5':
     resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
@@ -1307,24 +1916,24 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.27.0':
-    resolution: {integrity: sha512-8mG6arH3yB/4ZXiEnXof5MK72dE6zM9cDvUcPtxhUZsDjESl9JipZYW60C3JGreKCEP+p8P/72r69m4AZGJd5g==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.27.2':
-    resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.27.3':
     resolution: {integrity: sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.27.4':
+    resolution: {integrity: sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.18.20':
+    resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-arm64@0.21.5':
     resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
@@ -1337,24 +1946,24 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.27.0':
-    resolution: {integrity: sha512-9FHtyO988CwNMMOE3YIeci+UV+x5Zy8fI2qHNpsEtSF83YPBmE8UWmfYAQg6Ux7Gsmd4FejZqnEUZCMGaNQHQw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-arm64@0.27.2':
-    resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@esbuild/freebsd-arm64@0.27.3':
     resolution: {integrity: sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.27.4':
+    resolution: {integrity: sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.18.20':
+    resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.21.5':
     resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
     engines: {node: '>=12'}
@@ -1367,24 +1976,24 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.27.0':
-    resolution: {integrity: sha512-zCMeMXI4HS/tXvJz8vWGexpZj2YVtRAihHLk1imZj4efx1BQzN76YFeKqlDr3bUWI26wHwLWPd3rwh6pe4EV7g==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.27.2':
-    resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
   '@esbuild/freebsd-x64@0.27.3':
     resolution: {integrity: sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.27.4':
+    resolution: {integrity: sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.18.20':
+    resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm64@0.21.5':
     resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
@@ -1397,24 +2006,24 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.27.0':
-    resolution: {integrity: sha512-AS18v0V+vZiLJyi/4LphvBE+OIX682Pu7ZYNsdUHyUKSoRwdnOsMf6FDekwoAFKej14WAkOef3zAORJgAtXnlQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm64@0.27.2':
-    resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
   '@esbuild/linux-arm64@0.27.3':
     resolution: {integrity: sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.27.4':
+    resolution: {integrity: sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.18.20':
+    resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-arm@0.21.5':
     resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
@@ -1427,24 +2036,24 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.27.0':
-    resolution: {integrity: sha512-t76XLQDpxgmq2cNXKTVEB7O7YMb42atj2Re2Haf45HkaUpjM2J0UuJZDuaGbPbamzZ7bawyGFUkodL+zcE+jvQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.27.2':
-    resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-arm@0.27.3':
     resolution: {integrity: sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.27.4':
+    resolution: {integrity: sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.18.20':
+    resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
@@ -1457,24 +2066,24 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.27.0':
-    resolution: {integrity: sha512-Mz1jxqm/kfgKkc/KLHC5qIujMvnnarD9ra1cEcrs7qshTUSksPihGrWHVG5+osAIQ68577Zpww7SGapmzSt4Nw==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.27.2':
-    resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.27.3':
     resolution: {integrity: sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.27.4':
+    resolution: {integrity: sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.18.20':
+    resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.21.5':
     resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
@@ -1487,24 +2096,24 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.27.0':
-    resolution: {integrity: sha512-QbEREjdJeIreIAbdG2hLU1yXm1uu+LTdzoq1KCo4G4pFOLlvIspBm36QrQOar9LFduavoWX2msNFAAAY9j4BDg==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.27.2':
-    resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
   '@esbuild/linux-loong64@0.27.3':
     resolution: {integrity: sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.27.4':
+    resolution: {integrity: sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.18.20':
+    resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.21.5':
     resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
@@ -1517,24 +2126,24 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.27.0':
-    resolution: {integrity: sha512-sJz3zRNe4tO2wxvDpH/HYJilb6+2YJxo/ZNbVdtFiKDufzWq4JmKAiHy9iGoLjAV7r/W32VgaHGkk35cUXlNOg==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.27.2':
-    resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
   '@esbuild/linux-mips64el@0.27.3':
     resolution: {integrity: sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.27.4':
+    resolution: {integrity: sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.18.20':
+    resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.21.5':
     resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
     engines: {node: '>=12'}
@@ -1547,24 +2156,24 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.27.0':
-    resolution: {integrity: sha512-z9N10FBD0DCS2dmSABDBb5TLAyF1/ydVb+N4pi88T45efQ/w4ohr/F/QYCkxDPnkhkp6AIpIcQKQ8F0ANoA2JA==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.27.2':
-    resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.27.3':
     resolution: {integrity: sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.27.4':
+    resolution: {integrity: sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.18.20':
+    resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.21.5':
     resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
@@ -1577,24 +2186,24 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.27.0':
-    resolution: {integrity: sha512-pQdyAIZ0BWIC5GyvVFn5awDiO14TkT/19FTmFcPdDec94KJ1uZcmFs21Fo8auMXzD4Tt+diXu1LW1gHus9fhFQ==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.27.2':
-    resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.27.3':
     resolution: {integrity: sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.27.4':
+    resolution: {integrity: sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.18.20':
+    resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.21.5':
     resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
@@ -1607,24 +2216,24 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.27.0':
-    resolution: {integrity: sha512-hPlRWR4eIDDEci953RI1BLZitgi5uqcsjKMxwYfmi4LcwyWo2IcRP+lThVnKjNtk90pLS8nKdroXYOqW+QQH+w==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.27.2':
-    resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
   '@esbuild/linux-s390x@0.27.3':
     resolution: {integrity: sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.27.4':
+    resolution: {integrity: sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.18.20':
+    resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/linux-x64@0.21.5':
     resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
@@ -1637,48 +2246,42 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.27.0':
-    resolution: {integrity: sha512-1hBWx4OUJE2cab++aVZ7pObD6s+DK4mPGpemtnAORBvb5l/g5xFGk0vc0PjSkrDs0XaXj9yyob3d14XqvnQ4gw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.27.2':
-    resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/linux-x64@0.27.3':
     resolution: {integrity: sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.27.4':
+    resolution: {integrity: sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/netbsd-arm64@0.25.12':
     resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-arm64@0.27.0':
-    resolution: {integrity: sha512-6m0sfQfxfQfy1qRuecMkJlf1cIzTOgyaeXaiVaaki8/v+WB+U4hc6ik15ZW6TAllRlg/WuQXxWj1jx6C+dfy3w==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-arm64@0.27.2':
-    resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-
   '@esbuild/netbsd-arm64@0.27.3':
     resolution: {integrity: sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
+  '@esbuild/netbsd-arm64@0.27.4':
+    resolution: {integrity: sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.18.20':
+    resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.21.5':
     resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
@@ -1691,48 +2294,42 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.27.0':
-    resolution: {integrity: sha512-xbbOdfn06FtcJ9d0ShxxvSn2iUsGd/lgPIO2V3VZIPDbEaIj1/3nBBe1AwuEZKXVXkMmpr6LUAgMkLD/4D2PPA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.27.2':
-    resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
   '@esbuild/netbsd-x64@0.27.3':
     resolution: {integrity: sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.27.4':
+    resolution: {integrity: sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/openbsd-arm64@0.25.12':
     resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-arm64@0.27.0':
-    resolution: {integrity: sha512-fWgqR8uNbCQ/GGv0yhzttj6sU/9Z5/Sv/VGU3F5OuXK6J6SlriONKrQ7tNlwBrJZXRYk5jUhuWvF7GYzGguBZQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-arm64@0.27.2':
-    resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
   '@esbuild/openbsd-arm64@0.27.3':
     resolution: {integrity: sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-arm64@0.27.4':
+    resolution: {integrity: sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.18.20':
+    resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.21.5':
     resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
@@ -1745,48 +2342,42 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.27.0':
-    resolution: {integrity: sha512-aCwlRdSNMNxkGGqQajMUza6uXzR/U0dIl1QmLjPtRbLOx3Gy3otfFu/VjATy4yQzo9yFDGTxYDo1FfAD9oRD2A==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.27.2':
-    resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
   '@esbuild/openbsd-x64@0.27.3':
     resolution: {integrity: sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.27.4':
+    resolution: {integrity: sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openharmony-arm64@0.25.12':
     resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/openharmony-arm64@0.27.0':
-    resolution: {integrity: sha512-nyvsBccxNAsNYz2jVFYwEGuRRomqZ149A39SHWk4hV0jWxKM0hjBPm3AmdxcbHiFLbBSwG6SbpIcUbXjgyECfA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-
-  '@esbuild/openharmony-arm64@0.27.2':
-    resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@esbuild/openharmony-arm64@0.27.3':
     resolution: {integrity: sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
+  '@esbuild/openharmony-arm64@0.27.4':
+    resolution: {integrity: sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@esbuild/sunos-x64@0.18.20':
+    resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/sunos-x64@0.21.5':
     resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
@@ -1799,24 +2390,24 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.27.0':
-    resolution: {integrity: sha512-Q1KY1iJafM+UX6CFEL+F4HRTgygmEW568YMqDA5UV97AuZSm21b7SXIrRJDwXWPzr8MGr75fUZPV67FdtMHlHA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/sunos-x64@0.27.2':
-    resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/sunos-x64@0.27.3':
     resolution: {integrity: sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.27.4':
+    resolution: {integrity: sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.18.20':
+    resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-arm64@0.21.5':
     resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
@@ -1829,24 +2420,24 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.27.0':
-    resolution: {integrity: sha512-W1eyGNi6d+8kOmZIwi/EDjrL9nxQIQ0MiGqe/AWc6+IaHloxHSGoeRgDRKHFISThLmsewZ5nHFvGFWdBYlgKPg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-arm64@0.27.2':
-    resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
   '@esbuild/win32-arm64@0.27.3':
     resolution: {integrity: sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.27.4':
+    resolution: {integrity: sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.18.20':
+    resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.21.5':
     resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
@@ -1859,24 +2450,24 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.27.0':
-    resolution: {integrity: sha512-30z1aKL9h22kQhilnYkORFYt+3wp7yZsHWus+wSKAJR8JtdfI76LJ4SBdMsCopTR3z/ORqVu5L1vtnHZWVj4cQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.27.2':
-    resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
   '@esbuild/win32-ia32@0.27.3':
     resolution: {integrity: sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.27.4':
+    resolution: {integrity: sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.18.20':
+    resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
   '@esbuild/win32-x64@0.21.5':
     resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
@@ -1889,28 +2480,26 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.27.0':
-    resolution: {integrity: sha512-aIitBcjQeyOhMTImhLZmtxfdOcuNRpwlPNmlFKPcHQYPhEssw75Cl1TSXJXpMkzaua9FUetx/4OQKq7eJul5Cg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.27.2':
-    resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
   '@esbuild/win32-x64@0.27.3':
     resolution: {integrity: sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.27.4':
+    resolution: {integrity: sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@fastify/busboy@2.1.1':
     resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
     engines: {node: '>=14'}
 
+  '@fly/sprites@0.0.1':
+    resolution: {integrity: sha512-1s+dIVi/pTMP4Aj4Mkg+4LoZ/+a0Kp6l9piPRxvpgEKm11b/eRiZgJwVytwAHeI/vtg2fuwcFExjtXOEfny/TA==}
+    engines: {node: '>=24.0.0'}
+
   '@grpc/grpc-js@1.14.3':
     resolution: {integrity: sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==}
     engines: {node: '>=12.10.0'}
@@ -1931,14 +2520,21 @@ packages:
     peerDependencies:
       hono: ^4
 
+  '@hono/node-ws@1.3.0':
+    resolution: {integrity: sha512-ju25YbbvLuXdqBCmLZLqnNYu1nbHIQjoyUqA8ApZOeL1k4skuiTcw5SW77/5SUYo2Xi2NVBJoVlfQurnKEp03Q==}
+    engines: {node: '>=18.14.1'}
+    peerDependencies:
+      '@hono/node-server': ^1.19.2
+      hono: ^4.6.0
+
   '@hono/standard-validator@0.1.5':
     resolution: {integrity: sha512-EIyZPPwkyLn6XKwFj5NBEWHXhXbgmnVh2ceIFo5GO7gKI9WmzTjPDKnppQB0KrqKeAkq3kpoW4SIbu5X1dgx3w==}
     peerDependencies:
       '@standard-schema/spec': 1.0.0
       hono: '>=3.9.0'
 
-  '@hono/zod-openapi@1.2.1':
-    resolution: {integrity: sha512-aZza4V8wkqpdHBWFNPiCeWd0cGOXbYuQW9AyezHs/jwQm5p67GkUyXwfthAooAwnG7thTpvOJkThZpCoY6us8w==}
+  '@hono/zod-openapi@1.2.2':
+    resolution: {integrity: sha512-va6vsL23wCJ1d0Vd+vGL1XOt+wPwItxirYafuhlW9iC2MstYr2FvsI7mctb45eBTjZfkqB/3LYDJEppPjOEiHw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       hono: '>=4.3.6'
@@ -2128,8 +2724,46 @@ packages:
   '@js-sdsl/ordered-map@4.4.2':
     resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
 
-  '@modelcontextprotocol/sdk@1.26.0':
-    resolution: {integrity: sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==}
+  '@mapbox/geojson-rewind@0.5.2':
+    resolution: {integrity: sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==}
+    hasBin: true
+
+  '@mapbox/geojson-types@1.0.2':
+    resolution: {integrity: sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==}
+
+  '@mapbox/jsonlint-lines-primitives@2.0.2':
+    resolution: {integrity: sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==}
+    engines: {node: '>= 0.6'}
+
+  '@mapbox/mapbox-gl-supported@1.5.0':
+    resolution: {integrity: sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==}
+    peerDependencies:
+      mapbox-gl: '>=0.32.1 <2.0.0'
+
+  '@mapbox/point-geometry@0.1.0':
+    resolution: {integrity: sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==}
+
+  '@mapbox/tiny-sdf@1.2.5':
+    resolution: {integrity: sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==}
+
+  '@mapbox/unitbezier@0.0.0':
+    resolution: {integrity: sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==}
+
+  '@mapbox/vector-tile@1.3.1':
+    resolution: {integrity: sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==}
+
+  '@mapbox/whoots-js@3.1.0':
+    resolution: {integrity: sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==}
+    engines: {node: '>=6.0.0'}
+
+  '@math.gl/web-mercator@3.6.3':
+    resolution: {integrity: sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw==}
+
+  '@medv/finder@4.0.2':
+    resolution: {integrity: sha512-RraNY9SCcx4KZV0Dh6BEW6XEW2swkqYca74pkFFRw6hHItSHiy+O/xMnpbofjYbzXj0tSpBGthUF1hHTsr3vIQ==}
+
+  '@modelcontextprotocol/sdk@1.27.1':
+    resolution: {integrity: sha512-sr6GbP+4edBwFndLbM60gf07z0FQ79gaExpnsjMGePXqFcSSb7t6iscpjk9DhFhwd+mTEQrzNafGP8/iGGFYaA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@cfworker/json-schema': ^4.1.1
@@ -2138,6 +2772,14 @@ packages:
       '@cfworker/json-schema':
         optional: true
 
+  '@noble/ciphers@2.1.1':
+    resolution: {integrity: sha512-bysYuiVfhxNJuldNXlFEitTVdNnYUc+XNJZd7Qm2a5j1vZHgY+fazadNFWFaMK/2vye0JVlxV3gHmC0WDfAOQw==}
+    engines: {node: '>= 20.19.0'}
+
+  '@noble/hashes@2.0.1':
+    resolution: {integrity: sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw==}
+    engines: {node: '>= 20.19.0'}
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -2150,6 +2792,195 @@ packages:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
 
+  '@opencode-ai/sdk@1.2.24':
+    resolution: {integrity: sha512-MQamFkRl4B/3d6oIRLNpkYR2fcwet1V/ffKyOKJXWjtP/CT9PDJMtLpu6olVHjXKQi8zMNltwuMhv1QsNtRlZg==}
+
+  '@opentelemetry/api-logs@0.207.0':
+    resolution: {integrity: sha512-lAb0jQRVyleQQGiuuvCOTDVspc14nx6XJjP4FspJ1sNARo3Regq4ZZbrc3rN4b1TYSuUCvgH+UXUPug4SLOqEQ==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/api@1.9.0':
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/context-async-hooks@2.2.0':
+    resolution: {integrity: sha512-qRkLWiUEZNAmYapZ7KGS5C4OmBLcP/H2foXeOEaowYCR0wi89fHejrfYfbuLVCMLp/dWZXKvQusdbUEZjERfwQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@2.2.0':
+    resolution: {integrity: sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@2.5.0':
+    resolution: {integrity: sha512-ka4H8OM6+DlUhSAZpONu0cPBtPPTQKxbxVzC4CzVx5+K4JnroJVBtDzLAMx4/3CDTJXRvVFhpFjtl4SaiTNoyQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/exporter-logs-otlp-grpc@0.207.0':
+    resolution: {integrity: sha512-K92RN+kQGTMzFDsCzsYNGqOsXRUnko/Ckk+t/yPJao72MewOLgBUTWVHhebgkNfRCYqDz1v3K0aPT9OJkemvgg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-logs-otlp-http@0.207.0':
+    resolution: {integrity: sha512-JpOh7MguEUls8eRfkVVW3yRhClo5b9LqwWTOg8+i4gjr/+8eiCtquJnC7whvpTIGyff06cLZ2NsEj+CVP3Mjeg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-logs-otlp-proto@0.207.0':
+    resolution: {integrity: sha512-RQJEV/K6KPbQrIUbsrRkEe0ufks1o5OGLHy6jbDD8tRjeCsbFHWfg99lYBRqBV33PYZJXsigqMaAbjWGTFYzLw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.207.0':
+    resolution: {integrity: sha512-6flX89W54gkwmqYShdcTBR1AEF5C1Ob0O8pDgmLPikTKyEv27lByr9yBmO5WrP0+5qJuNPHrLfgFQFYi6npDGA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-metrics-otlp-http@0.207.0':
+    resolution: {integrity: sha512-fG8FAJmvXOrKXGIRN8+y41U41IfVXxPRVwyB05LoMqYSjugx/FSBkMZUZXUT/wclTdmBKtS5MKoi0bEKkmRhSw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-metrics-otlp-proto@0.207.0':
+    resolution: {integrity: sha512-kDBxiTeQjaRlUQzS1COT9ic+et174toZH6jxaVuVAvGqmxOkgjpLOjrI5ff8SMMQE69r03L3Ll3nPKekLopLwg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-prometheus@0.207.0':
+    resolution: {integrity: sha512-Y5p1s39FvIRmU+F1++j7ly8/KSqhMmn6cMfpQqiDCqDjdDHwUtSq0XI0WwL3HYGnZeaR/VV4BNmsYQJ7GAPrhw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-grpc@0.207.0':
+    resolution: {integrity: sha512-7u2ZmcIx6D4KG/+5np4X2qA0o+O0K8cnUDhR4WI/vr5ZZ0la9J9RG+tkSjC7Yz+2XgL6760gSIM7/nyd3yaBLA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-http@0.207.0':
+    resolution: {integrity: sha512-HSRBzXHIC7C8UfPQdu15zEEoBGv0yWkhEwxqgPCHVUKUQ9NLHVGXkVrf65Uaj7UwmAkC1gQfkuVYvLlD//AnUQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-proto@0.207.0':
+    resolution: {integrity: sha512-ruUQB4FkWtxHjNmSXjrhmJZFvyMm+tBzHyMm7YPQshApy4wvZUTcrpPyP/A/rCl/8M4BwoVIZdiwijMdbZaq4w==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-zipkin@2.2.0':
+    resolution: {integrity: sha512-VV4QzhGCT7cWrGasBWxelBjqbNBbyHicWWS/66KoZoe9BzYwFB72SH2/kkc4uAviQlO8iwv2okIJy+/jqqEHTg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+
+  '@opentelemetry/instrumentation-http@0.207.0':
+    resolution: {integrity: sha512-FC4i5hVixTzuhg4SV2ycTEAYx+0E2hm+GwbdoVPSA6kna0pPVI4etzaA9UkpJ9ussumQheFXP6rkGIaFJjMxsw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.207.0':
+    resolution: {integrity: sha512-y6eeli9+TLKnznrR8AZlQMSJT7wILpXH+6EYq5Vf/4Ao+huI7EedxQHwRgVUOMLFbe7VFDvHJrX9/f4lcwnJsA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-exporter-base@0.207.0':
+    resolution: {integrity: sha512-4RQluMVVGMrHok/3SVeSJ6EnRNkA2MINcX88sh+d/7DjGUrewW/WT88IsMEci0wUM+5ykTpPPNbEOoW+jwHnbw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-grpc-exporter-base@0.207.0':
+    resolution: {integrity: sha512-eKFjKNdsPed4q9yYqeI5gBTLjXxDM/8jwhiC0icw3zKxHVGBySoDsed5J5q/PGY/3quzenTr3FiTxA3NiNT+nw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-transformer@0.207.0':
+    resolution: {integrity: sha512-+6DRZLqM02uTIY5GASMZWUwr52sLfNiEe20+OEaZKhztCs3+2LxoTjb6JxFRd9q1qNqckXKYlUKjbH/AhG8/ZA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/propagator-b3@2.2.0':
+    resolution: {integrity: sha512-9CrbTLFi5Ee4uepxg2qlpQIozoJuoAZU5sKMx0Mn7Oh+p7UrgCiEV6C02FOxxdYVRRFQVCinYR8Kf6eMSQsIsw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/propagator-jaeger@2.2.0':
+    resolution: {integrity: sha512-FfeOHOrdhiNzecoB1jZKp2fybqmqMPJUXe2ZOydP7QzmTPYcfPeuaclTLYVhK3HyJf71kt8sTl92nV4YIaLaKA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/resources@2.2.0':
+    resolution: {integrity: sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/resources@2.5.0':
+    resolution: {integrity: sha512-F8W52ApePshpoSrfsSk1H2yJn9aKjCrbpQF1M9Qii0GHzbfVeFUB+rc3X4aggyZD8x9Gu3Slua+s6krmq6Dt8g==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-logs@0.207.0':
+    resolution: {integrity: sha512-4MEQmn04y+WFe6cyzdrXf58hZxilvY59lzZj2AccuHW/+BxLn/rGVN/Irsi/F0qfBOpMOrrCLKTExoSL2zoQmg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+
+  '@opentelemetry/sdk-metrics@2.2.0':
+    resolution: {integrity: sha512-G5KYP6+VJMZzpGipQw7Giif48h6SGQ2PFKEYCybeXJsOCB4fp8azqMAAzE5lnnHK3ZVwYQrgmFbsUJO/zOnwGw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.9.0 <1.10.0'
+
+  '@opentelemetry/sdk-node@0.207.0':
+    resolution: {integrity: sha512-hnRsX/M8uj0WaXOBvFenQ8XsE8FLVh2uSnn1rkWu4mx+qu7EKGUZvZng6y/95cyzsqOfiaDDr08Ek4jppkIDNg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@2.2.0':
+    resolution: {integrity: sha512-xWQgL0Bmctsalg6PaXExmzdedSp3gyKV8mQBwK/j9VGdCDu2fmXIb2gAehBKbkXCpJ4HPkgv3QfoJWRT4dHWbw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@2.5.0':
+    resolution: {integrity: sha512-VzRf8LzotASEyNDUxTdaJ9IRJ1/h692WyArDBInf5puLCjxbICD6XkHgpuudis56EndyS7LYFmtTMny6UABNdQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-node@2.2.0':
+    resolution: {integrity: sha512-+OaRja3f0IqGG2kptVeYsrZQK9nKRSpfFrKtRBq4uh6nIB8bTBgaGvYQrQoRrQWQMA5dK5yLhDMDc0dvYvCOIQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/semantic-conventions@1.39.0':
+    resolution: {integrity: sha512-R5R9tb2AXs2IRLNKLBJDynhkfmx7mX0vi8NkhZb3gUkPWHn6HXk5J8iQ/dql0U3ApfWym4kXXmBDRGO+oeOfjg==}
+    engines: {node: '>=14'}
+
   '@oslojs/encoding@1.1.0':
     resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
 
@@ -2199,15 +3030,31 @@ packages:
   '@protobufjs/utf8@1.1.0':
     resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
 
+  '@react-grab/cli@0.1.27':
+    resolution: {integrity: sha512-NaW5Jb5LtL35nuO33FFxKohvJCfoIgE/1nbzMVK1R0xhznlMtej0NodjlHGRJyKL3EU8FgVnigd9/Jt20Jjx+g==}
+    hasBin: true
+
+  '@react-grab/mcp@0.1.27':
+    resolution: {integrity: sha512-imK/Bh/rxeWRhnKV5rpm6kYyT0+O+9uX8njiyG1LE8hvJFboAY+3fHuOMC816+Gm5de/Asrf8R3uzNYPmgUUzg==}
+    hasBin: true
+
   '@rivetkit/bare-ts@0.6.2':
     resolution: {integrity: sha512-3qndQUQXLdwafMEqfhz24hUtDPcsf1Bu3q52Kb8MqeH8JUh3h6R4HYW3ZJXiQsLcyYyFM68PuIwlLRlg1xDEpg==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
-  '@rivetkit/engine-runner-protocol@2.0.42':
-    resolution: {integrity: sha512-gzo3J5NWS3sTIxPKTPTM8IIZuTfkHaMaAe9WI/WGO1/kYhh5y4oZ6WcyMicQlK5W6XmtYC3q0IqbNmxMYfHA1w==}
+  '@rivetkit/engine-runner-protocol@2.1.6':
+    resolution: {integrity: sha512-QwaWvAJN2KGae+UHKZbLiEWaWj9ycmwtrRtUq728CU+lidkaGv5yHxXb4gkXSD7rhGQcR98+XWZLb0F0BM/vAg==}
 
-  '@rivetkit/engine-runner@2.0.42':
-    resolution: {integrity: sha512-diHBqZoE97F7Pd1yqY/qWpMCzHH0ddJt8YRUf7qwjjwqUdPF21wPsVOwcmvRArpd2JqEtUw+8CFKFB+pnqmX+A==}
+  '@rivetkit/engine-runner-protocol@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd}
+    version: 2.1.6
+
+  '@rivetkit/engine-runner@2.1.6':
+    resolution: {integrity: sha512-WpiEmi/SxAVED0N/M0kvPZwq/MxMuuz/Y89ut1sTP7syPzpCauGxafOdqkTqiX1ef+N1ZlrtX+v/LwDF/jIgFw==}
+
+  '@rivetkit/engine-runner@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd}
+    version: 2.1.6
 
   '@rivetkit/fast-json-patch@3.1.2':
     resolution: {integrity: sha512-CtA50xgsSSzICQduF/NDShPRzvucnNvsW/lQO0WgMTT1XAj9Lfae4pm7r3llFwilgG+9iq76Hv1LUqNy72v6yw==}
@@ -2216,12 +3063,49 @@ packages:
     resolution: {integrity: sha512-5RC9Ze/wTKqSlJvopdCgr+EfyV93+iiH8Thog0QXrl8PT1unuBNw/jadXNMtwgAxrIaCJL+JLaHQH9w7rqpMDw==}
     engines: {node: '>=20'}
 
+  '@rivetkit/sqlite-vfs@2.1.6':
+    resolution: {integrity: sha512-jbCrigzqoygZTYdZu7izaQjr77Q4BFX1HwhW4Mf0UFIaKT72AteH/w4PcktzrKcw4Utmo0zX0C6zNBRKo0IpOA==}
+    engines: {node: '>=20.0.0'}
+
+  '@rivetkit/sqlite-vfs@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/sqlite-vfs@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/@rivetkit/sqlite-vfs@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd}
+    version: 2.1.6
+    engines: {node: '>=20.0.0'}
+
+  '@rivetkit/sqlite@0.1.1':
+    resolution: {integrity: sha512-NE7ZBy/hQhOrWzMZFjkHX9SoXxf+ILcDvVV+mNbUYPgiy/fsDzlXdK0+JDTGnko5f4Xl6/KVCoCozz9gkwkq8A==}
+
+  '@rivetkit/traces@2.1.6':
+    resolution: {integrity: sha512-wuuGWoWWdUPbqs5u+31YodSUOsYMydaa+/cxZ7I5KaUe26fK0i1E+0ytqC1JGQm6utWeuYp8cLUX3WSEfVKJhQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@rivetkit/traces@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/traces@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/@rivetkit/traces@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd}
+    version: 2.1.6
+    engines: {node: '>=18.0.0'}
+
   '@rivetkit/virtual-websocket@2.0.33':
     resolution: {integrity: sha512-sMoHZgBy9WDW76pv+ML3LPgf7TWk5vXdu3ZpPO20j6n+rB3fLacnnmzjt5xD6tZcJ/x5qINyEywGgcxA7MTMuQ==}
 
+  '@rivetkit/virtual-websocket@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/virtual-websocket@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/@rivetkit/virtual-websocket@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd}
+    version: 2.0.33
+
+  '@rivetkit/workflow-engine@2.1.6':
+    resolution: {integrity: sha512-eLVFBbhOlBQKzO5lu032tOo0OEAFFp7uNcGwvB1mBFmYsm7aKBgnJl214IV39a6fRtCL2meVxiMU1GKb006zYw==}
+    engines: {node: '>=18.0.0'}
+
+  '@rivetkit/workflow-engine@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/workflow-engine@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/@rivetkit/workflow-engine@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd}
+    version: 2.1.6
+    engines: {node: '>=18.0.0'}
+
   '@rolldown/pluginutils@1.0.0-beta.27':
     resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}
 
+  '@rolldown/pluginutils@1.0.0-rc.3':
+    resolution: {integrity: sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==}
+
   '@rollup/pluginutils@5.3.0':
     resolution: {integrity: sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==}
     engines: {node: '>=14.0.0'}
@@ -2356,6 +3240,41 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@rtsao/csstype@2.6.5-forked.0':
+    resolution: {integrity: sha512-0HwnY8uPWcCloTgdbbaJG3MbDUfNf6yKWZfCKxFv9yj2Sbp4mSKaIjC7Cr/5L4hMxvrrk85CU3wlAg7EtBBJ1Q==}
+
+  '@sandbox-agent/cli-darwin-arm64@0.3.2':
+    resolution: {integrity: sha512-w4aAr7vPj4m6Lwr25bIoXRVTJDoybP/tcGhB+unzsRUSQqCtrZpRCg7opJqds5vIOQzVxFlmVwquKWcPlDjYRA==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@sandbox-agent/cli-darwin-x64@0.3.2':
+    resolution: {integrity: sha512-OJkaeNGjvPNWHVnNgUXxN4H5nv75nWwRnxOVRf1UP8VvLhd3xoL6uWGgmVoRSF+Wwg3dMHbkrmMwAdcXyaSV9w==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@sandbox-agent/cli-linux-arm64@0.3.2':
+    resolution: {integrity: sha512-WTreRie8wrvGijuqBaK7/78sfizCcex1CNBZjws7a6/tn4Ar+thQ0jbY8alrpdtBLuwzk/pBIQ2oRU9vidHtvQ==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@sandbox-agent/cli-linux-x64@0.3.2':
+    resolution: {integrity: sha512-aas9+UdW0+j2aWOCp+EV5GA8JkmwsIg0lSRkrRijzrnewsNxlSFQ4dIsSpTkqyMWO18STqjqFtmkZI/dIASEyQ==}
+    cpu: [x64]
+    os: [linux]
+
+  '@sandbox-agent/cli-shared@0.3.2':
+    resolution: {integrity: sha512-4UQKczwfY+Bf83kQ9rdXv3U5Z9PqfWm2wp6EK2rzKh6iuMAtuNI8PSUWodi1LBUjch8mJv4rx7Gs/XCO92dRRw==}
+
+  '@sandbox-agent/cli-win32-x64@0.3.2':
+    resolution: {integrity: sha512-mJejOEp9czrMzbpN0VzC/y6UfKU/RyAJjTWHBNcCVfHP2zDuIOwT8y3gErM+q4CHt0lHR616wQYIqNpY8QqyDA==}
+    cpu: [x64]
+    os: [win32]
+
+  '@sandbox-agent/cli@0.3.2':
+    resolution: {integrity: sha512-nQ3bxbrr0QMdm0eK/MvBNd6Npvt1VCxQrrkpf747dVCHmKxCmcRc3t/jeeye1Lof6sP8l01mHgvSFNiez/KNHQ==}
+    hasBin: true
+
   '@shikijs/core@3.21.0':
     resolution: {integrity: sha512-AXSQu/2n1UIQekY8euBJlvFYZIw0PHY63jUzGbrOma4wPxzznJXTXkri+QcHeBNaFxiiOljKxxJkVSoB3PjbyA==}
 
@@ -2600,8 +3519,49 @@ packages:
   '@speed-highlight/core@1.2.14':
     resolution: {integrity: sha512-G4ewlBNhUtlLvrJTb88d2mdy2KRijzs4UhnlrOSRT4bmjh/IqNElZa3zkrZ+TC47TwtlDWzVLFADljF1Ijp5hA==}
 
-  '@standard-schema/spec@1.0.0':
-    resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
+  '@tanstack/history@1.161.4':
+    resolution: {integrity: sha512-Kp/WSt411ZWYvgXy6uiv5RmhHrz9cAml05AQPrtdAp7eUqvIDbMGPnML25OKbzR3RJ1q4wgENxDTvlGPa9+Mww==}
+    engines: {node: '>=20.19'}
+
+  '@tanstack/query-core@5.90.20':
+    resolution: {integrity: sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==}
+
+  '@tanstack/react-query@5.90.21':
+    resolution: {integrity: sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==}
+    peerDependencies:
+      react: ^18 || ^19
+
+  '@tanstack/react-router@1.166.4':
+    resolution: {integrity: sha512-kqTLQMW+tnomKYrdC4fGRu2RdU0pAiHgRL72T1O9gigdLbrYzM60LK2w+aRlwV2WC2CdieFluPxBtaWPUDxepQ==}
+    engines: {node: '>=20.19'}
+    peerDependencies:
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
+
+  '@tanstack/react-store@0.9.2':
+    resolution: {integrity: sha512-Vt5usJE5sHG/cMechQfmwvwne6ktGCELe89Lmvoxe3LKRoFrhPa8OCKWs0NliG8HTJElEIj7PLtaBQIcux5pAQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@tanstack/react-virtual@3.13.22':
+    resolution: {integrity: sha512-EaOrBBJLi3M0bTMQRjGkxLXRw7Gizwntoy5E2Q2UnSbML7Mo2a1P/Hfkw5tw9FLzK62bj34Jl6VNbQfRV6eJcA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@tanstack/router-core@1.166.4':
+    resolution: {integrity: sha512-T/RrsAvznqNJqfT7nrj3S+/RiQmW4U/i4Vii8KdOQdhahPzAQnmRzZB+SUwR4quqRYql5o2zmCA6Brg1961hHg==}
+    engines: {node: '>=20.19'}
+
+  '@tanstack/store@0.9.2':
+    resolution: {integrity: sha512-K013lUJEFJK2ofFQ/hZKJUmCnpcV00ebLyOyFOWQvyQHUOZp/iYO84BM6aOGiV81JzwbX0APTVmW8YI7yiG5oA==}
+
+  '@tanstack/virtual-core@3.13.22':
+    resolution: {integrity: sha512-isuUGKsc5TAPDoHSbWTbl1SCil54zOS2MiWz/9GCWHPUQOvNTQx8qJEWC7UWR0lShhbK0Lmkcf0SZYxvch7G3g==}
 
   '@types/babel__core@7.20.5':
     resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
@@ -2615,6 +3575,12 @@ packages:
   '@types/babel__traverse@7.28.0':
     resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
 
+  '@types/better-sqlite3@7.6.13':
+    resolution: {integrity: sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==}
+
+  '@types/bun@1.3.10':
+    resolution: {integrity: sha512-0+rlrUrOrTSskibryHbvQkDOWRJwJZqZlxrUs1u4oOoTln8+WIXBPmAuCF35SWB2z4Zl3E84Nl/D0P7803nigQ==}
+
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
 
@@ -2633,6 +3599,9 @@ packages:
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
+  '@types/hammerjs@2.0.46':
+    resolution: {integrity: sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw==}
+
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
@@ -2648,6 +3617,9 @@ packages:
   '@types/nlcst@2.0.3':
     resolution: {integrity: sha512-vSYNSDe6Ix3q+6Z7ri9lyWqgGhJTmzRjZRqyq15N0Z/1/UnVsno9G/N40NBijoYx2seFDIl0+B2mgAb9mezUCA==}
 
+  '@types/node@17.0.45':
+    resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
+
   '@types/node@18.19.130':
     resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==}
 
@@ -2657,29 +3629,31 @@ packages:
   '@types/node@24.10.9':
     resolution: {integrity: sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==}
 
-  '@types/node@25.2.2':
-    resolution: {integrity: sha512-BkmoP5/FhRYek5izySdkOneRyXYN35I860MFAGupTdebyE66uZaR+bXLHq8k4DirE5DwQi3NuhvRU1jqTVwUrQ==}
+  '@types/node@25.5.0':
+    resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==}
 
-  '@types/node@25.2.3':
-    resolution: {integrity: sha512-m0jEgYlYz+mDJZ2+F4v8D1AyQb+QzsNqRuI7xg1VQX/KlKS0qT9r1Mo16yo5F/MtifXFgaofIFsdFMox2SxIbQ==}
+  '@types/pg@8.18.0':
+    resolution: {integrity: sha512-gT+oueVQkqnj6ajGJXblFR4iavIXWsGAFCk3dP4Kki5+a9R4NMt0JARdk6s8cUKcfUoqP5dAtDSLU8xYUTFV+Q==}
 
-  '@types/pg@8.16.0':
-    resolution: {integrity: sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ==}
-
-  '@types/prop-types@15.7.15':
-    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
-
-  '@types/react-dom@18.3.7':
-    resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
+  '@types/react-dom@19.2.3':
+    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
     peerDependencies:
-      '@types/react': ^18.3.3
+      '@types/react': ^19.1.12
 
-  '@types/react@18.3.27':
-    resolution: {integrity: sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==}
+  '@types/react-reconciler@0.28.9':
+    resolution: {integrity: sha512-HHM3nxyUZ3zAylX8ZEyrDNd2XZOnQ0D5XfunJF5FLQnZbHHYq4UWvW1QfelQNXv1ICNkwYhfxjwfnqivYB6bFg==}
+    peerDependencies:
+      '@types/react': ^19.1.12
+
+  '@types/react@19.2.14':
+    resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
 
   '@types/retry@0.12.2':
     resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==}
 
+  '@types/sax@1.2.7':
+    resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==}
+
   '@types/semver@7.7.1':
     resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==}
 
@@ -2689,15 +3663,18 @@ packages:
   '@types/unist@3.0.3':
     resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
 
+  '@types/ws@8.18.1':
+    resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
+
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
 
-  '@vercel/oidc@3.1.0':
-    resolution: {integrity: sha512-Fw28YZpRnA3cAHHDlkt7xQHiJ0fcL+NRcIqsocZQUSmbzeIKRpwttJjik5ZGanXP+vlA4SbTg+AbA3bP363l+w==}
+  '@vercel/oidc@3.2.0':
+    resolution: {integrity: sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug==}
     engines: {node: '>= 20'}
 
-  '@vercel/sandbox@1.4.1':
-    resolution: {integrity: sha512-5jaNLv6QJ0112ZFhCv9hQDCV3IYogpbEn5LzMcY5E8TZsf5tF0avat2tBe7McOJvgVs0SDkuzjvGjUMKtTkjrA==}
+  '@vercel/sandbox@1.8.1':
+    resolution: {integrity: sha512-txohjI20aMxZiAzBL/KJi5EqTYsesBdOyIOtpTIyebPLTqYtDYfNhQ4OeYiUcPMUo0XBt8gSet/rIdLQEjj3/A==}
 
   '@vitejs/plugin-react@4.7.0':
     resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==}
@@ -2705,6 +3682,12 @@ packages:
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
+  '@vitejs/plugin-react@5.1.4':
+    resolution: {integrity: sha512-VIcFLdRi/VYRU8OL/puL7QXMYafHmqOnwTZY50U1JPlCNj30PxCMx65c494b1K9be9hX83KVt0+gTEwTWLqToA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    peerDependencies:
+      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+
   '@vitest/expect@3.2.4':
     resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
 
@@ -2734,22 +3717,36 @@ packages:
   '@vitest/utils@3.2.4':
     resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
 
+  abort-controller-x@0.4.3:
+    resolution: {integrity: sha512-VtUwTNU8fpMwvWGn4xE93ywbogTYsuT+AUxAXOeelbXuQVIwNmC5YLeho9sH4vZ4ITW8414TTAOG1nW6uIVHCA==}
+
   accepts@2.0.0:
     resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
     engines: {node: '>= 0.6'}
 
+  acorn-import-attributes@1.9.5:
+    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
+    peerDependencies:
+      acorn: ^8
+
   acorn@8.15.0:
     resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acp-http-client@0.3.2:
+    resolution: {integrity: sha512-btRUDXAA9BlcTQURsJogdWthoXsKOnMeFhtYlEYQxgt0vq7H6xMfMrewlIgFjRXgRTbru4Fre2T6wS/amTTyjQ==}
+
+  agent-base@7.1.4:
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
+    engines: {node: '>= 14'}
+
+  aggregate-error@5.0.0:
+    resolution: {integrity: sha512-gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw==}
+    engines: {node: '>=18'}
+
   ajv-formats@3.0.1:
     resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
 
   ajv@8.17.1:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
@@ -2819,6 +3816,10 @@ packages:
     resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
     engines: {node: '>=8.0.0'}
 
+  attr-accept@1.1.3:
+    resolution: {integrity: sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==}
+    engines: {node: '>=4'}
+
   autoprefixer@10.4.23:
     resolution: {integrity: sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==}
     engines: {node: ^10 || ^12 || >=14}
@@ -2826,8 +3827,15 @@ packages:
     peerDependencies:
       postcss: ^8.1.0
 
-  axios@1.13.4:
-    resolution: {integrity: sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==}
+  aws4fetch@1.0.20:
+    resolution: {integrity: sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g==}
+
+  axe-core@4.11.1:
+    resolution: {integrity: sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==}
+    engines: {node: '>=4'}
+
+  axios@1.13.5:
+    resolution: {integrity: sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==}
 
   axobject-query@4.1.0:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
@@ -2865,13 +3873,102 @@ packages:
     resolution: {integrity: sha512-e23vBV1ZLfjb9apvfPk4rHVu2ry6RIr2Wfs+O324okSidrX7pTAnEJPCh/O5BtRlr7QtZI7ktOP3vsqr7Z5XoA==}
     hasBin: true
 
+  baseui@16.1.1:
+    resolution: {integrity: sha512-pux441GCtmYrI8NE1SYqwsDnBad47msc7T/6p9JhHYrqYKo2y52YAO+7oSoFqIdaJxoY9r443U14hDkF68p56w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+      styletron-react: '>=6'
+
   bcrypt-pbkdf@1.0.2:
     resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
 
+  better-auth@1.5.5:
+    resolution: {integrity: sha512-GpVPaV1eqr3mOovKfghJXXk6QvlcVeFbS3z+n+FPDid5rK/2PchnDtiaVCzWyXA9jH2KkirOfl+JhAUvnja0Eg==}
+    peerDependencies:
+      '@lynx-js/react': '*'
+      '@prisma/client': ^5.0.0 || ^6.0.0 || ^7.0.0
+      '@sveltejs/kit': ^2.0.0
+      '@tanstack/react-start': ^1.0.0
+      '@tanstack/solid-start': ^1.0.0
+      better-sqlite3: ^12.0.0
+      drizzle-kit: '>=0.31.4'
+      drizzle-orm: '>=0.41.0'
+      mongodb: ^6.0.0 || ^7.0.0
+      mysql2: ^3.0.0
+      next: ^14.0.0 || ^15.0.0 || ^16.0.0
+      pg: ^8.0.0
+      prisma: ^5.0.0 || ^6.0.0 || ^7.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+      solid-js: ^1.0.0
+      svelte: ^4.0.0 || ^5.0.0
+      vitest: ^2.0.0 || ^3.0.0 || ^4.0.0
+      vue: ^3.0.0
+    peerDependenciesMeta:
+      '@lynx-js/react':
+        optional: true
+      '@prisma/client':
+        optional: true
+      '@sveltejs/kit':
+        optional: true
+      '@tanstack/react-start':
+        optional: true
+      '@tanstack/solid-start':
+        optional: true
+      better-sqlite3:
+        optional: true
+      drizzle-kit:
+        optional: true
+      drizzle-orm:
+        optional: true
+      mongodb:
+        optional: true
+      mysql2:
+        optional: true
+      next:
+        optional: true
+      pg:
+        optional: true
+      prisma:
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+      solid-js:
+        optional: true
+      svelte:
+        optional: true
+      vitest:
+        optional: true
+      vue:
+        optional: true
+
+  better-call@1.3.2:
+    resolution: {integrity: sha512-4cZIfrerDsNTn3cm+MhLbUePN0gdwkhSXEuG7r/zuQ8c/H7iU0/jSK5TD3FW7U0MgKHce/8jGpPYNO4Ve+4NBw==}
+    peerDependencies:
+      zod: ^4.0.0
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  better-sqlite3@11.10.0:
+    resolution: {integrity: sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==}
+
   binary-extensions@2.3.0:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
+  bindings@1.5.0:
+    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+
+  bippy@0.5.32:
+    resolution: {integrity: sha512-yt1mC8eReTxjfg41YBZdN4PvsDwHFWxltoiQX0Q+Htlbf41aSniopb7ECZits01HwNAvXEh69RGk/ImlswDTEw==}
+    peerDependencies:
+      react: '>=17.0.1'
+
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
@@ -2904,6 +4001,9 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
   buffer@5.6.0:
     resolution: {integrity: sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==}
 
@@ -2914,6 +4014,9 @@ packages:
     resolution: {integrity: sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==}
     engines: {node: '>=10.0.0'}
 
+  bun-types@1.3.10:
+    resolution: {integrity: sha512-tcpfCCl6XWo6nCVnpcVrxQ+9AYN1iqMIzgrSKYMB/fjLtV2eyAVEg7AxQJuCq/26R6HpKWykQXuSOq/21RYcbg==}
+
   bundle-require@5.1.0:
     resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -2951,12 +4054,15 @@ packages:
   caniuse-lite@1.0.30001766:
     resolution: {integrity: sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==}
 
-  cbor-extract@2.2.0:
-    resolution: {integrity: sha512-Ig1zM66BjLfTXpNgKpvBePq271BPOvu8MR0Jl080yG7Jsl+wAZunfrwiwA+9ruzm/WEdIV5QF/bjDZTqyAIVHA==}
+  card-validator@6.2.0:
+    resolution: {integrity: sha512-1vYv45JaE9NmixZr4dl6ykzbFKv7imI9L7MQDs235b/a7EGbG8rrEsipeHtVvscLSUbl3RX6UP5gyOe0Y2FlHA==}
+
+  cbor-extract@2.2.1:
+    resolution: {integrity: sha512-Vp8PLcLCC3tgOYIrgAjCa5GpPR2jUciJqNDklUbXRjsl9BlFzQyHoaZc2MjDb6AE47xQ1mID7rGuRD1ZAuE+sQ==}
     hasBin: true
 
-  cbor-x@1.6.0:
-    resolution: {integrity: sha512-0kareyRwHSkL6ws5VXHEf8uY1liitysCVJjlmhaLG+IXLqhSaOO+t63coaso7yjwEzWZzLy8fJo06gZDVQM9Qg==}
+  cbor-x@1.6.3:
+    resolution: {integrity: sha512-P/LrTqDtSLAj6j6MntQlLheHGGnh1tzZrbei6chGVqWJC8tvB7cZWou013zY4iPnsLMNailBrq9ajU0IKEPXyg==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -3005,14 +4111,33 @@ packages:
     resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==}
     engines: {node: '>=8'}
 
+  cjs-module-lexer@2.2.0:
+    resolution: {integrity: sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==}
+
+  clean-stack@5.3.0:
+    resolution: {integrity: sha512-9ngPTOhYGQqNVSfeJkYXHmF7AGWp4/nN5D/QqNQs3Dvxd1Kk/WpjHfNujKHYUQ/5CoGyOyFNoWSPk5afzP0QVg==}
+    engines: {node: '>=14.16'}
+
   cli-boxes@3.0.0:
     resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==}
     engines: {node: '>=10'}
 
+  cli-cursor@5.0.0:
+    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
+    engines: {node: '>=18'}
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
 
+  clsx@1.2.1:
+    resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
+    engines: {node: '>=6'}
+
   clsx@2.1.1:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
@@ -3047,14 +4172,18 @@ packages:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
 
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
   common-ancestor-path@1.0.1:
     resolution: {integrity: sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==}
 
   compare-versions@6.1.1:
     resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
 
-  computesdk@2.2.0:
-    resolution: {integrity: sha512-gAAL8vMLkYUFH138OwbebTG9AYMh4RudhRvYboJvRdc9NQAafVHfvZtPwg4YVKPB3VpsfK5m9pkgv60Xr2cE1g==}
+  computesdk@2.5.1:
+    resolution: {integrity: sha512-zDzgdztvloTEm7cfVxSYX+kaQXlg+2UQBzmsisH61LTVcEPaZA7CCI/T8eC/eCxGzOjUjs5n68xo/ymK3w7Ebg==}
 
   confbox@0.1.8:
     resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
@@ -3077,6 +4206,9 @@ packages:
   cookie-es@1.2.2:
     resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==}
 
+  cookie-es@2.0.0:
+    resolution: {integrity: sha512-RAj4E421UYRgqokKUmotqAwuplYw15qtdXfY+hGzgCJ/MBjCVZcSoHK/kH9kocfjRjcDME7IiDWR/1WX1TM2Pg==}
+
   cookie-signature@1.2.2:
     resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
     engines: {node: '>=6.6.0'}
@@ -3089,6 +4221,10 @@ packages:
     resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==}
     engines: {node: '>=18'}
 
+  core-js@2.6.12:
+    resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==}
+    deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
+
   cors@2.8.6:
     resolution: {integrity: sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==}
     engines: {node: '>= 0.10'}
@@ -3097,6 +4233,9 @@ packages:
     resolution: {integrity: sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==}
     engines: {node: '>=10.0.0'}
 
+  credit-card-type@8.3.0:
+    resolution: {integrity: sha512-czfZUpQ7W9CDxZL4yFLb1kFtM/q2lTOY975hL2aO+DC8+GRNDVSXVCHXhVFZPxiUKmQCZbFP8vIhxx5TBQaThw==}
+
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
@@ -3104,6 +4243,9 @@ packages:
   crossws@0.3.5:
     resolution: {integrity: sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==}
 
+  css-in-js-utils@2.0.1:
+    resolution: {integrity: sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==}
+
   css-select@5.2.2:
     resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==}
 
@@ -3119,6 +4261,9 @@ packages:
     resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==}
     engines: {node: '>= 6'}
 
+  csscolorparser@1.0.3:
+    resolution: {integrity: sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==}
+
   cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
     engines: {node: '>=4'}
@@ -3128,9 +4273,156 @@ packages:
     resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
 
+  cssstyle@4.6.0:
+    resolution: {integrity: sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==}
+    engines: {node: '>=18'}
+
+  csstype@2.6.11:
+    resolution: {integrity: sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==}
+
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
+  d3-array@3.2.4:
+    resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
+    engines: {node: '>=12'}
+
+  d3-axis@3.0.0:
+    resolution: {integrity: sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==}
+    engines: {node: '>=12'}
+
+  d3-brush@3.0.0:
+    resolution: {integrity: sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==}
+    engines: {node: '>=12'}
+
+  d3-chord@3.0.1:
+    resolution: {integrity: sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==}
+    engines: {node: '>=12'}
+
+  d3-color@3.1.0:
+    resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
+    engines: {node: '>=12'}
+
+  d3-contour@4.0.2:
+    resolution: {integrity: sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==}
+    engines: {node: '>=12'}
+
+  d3-delaunay@6.0.4:
+    resolution: {integrity: sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==}
+    engines: {node: '>=12'}
+
+  d3-dispatch@3.0.1:
+    resolution: {integrity: sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==}
+    engines: {node: '>=12'}
+
+  d3-drag@3.0.0:
+    resolution: {integrity: sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==}
+    engines: {node: '>=12'}
+
+  d3-dsv@3.0.1:
+    resolution: {integrity: sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  d3-ease@3.0.1:
+    resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
+    engines: {node: '>=12'}
+
+  d3-fetch@3.0.1:
+    resolution: {integrity: sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==}
+    engines: {node: '>=12'}
+
+  d3-force@3.0.0:
+    resolution: {integrity: sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==}
+    engines: {node: '>=12'}
+
+  d3-format@3.1.2:
+    resolution: {integrity: sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==}
+    engines: {node: '>=12'}
+
+  d3-geo@3.1.1:
+    resolution: {integrity: sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==}
+    engines: {node: '>=12'}
+
+  d3-hierarchy@3.1.2:
+    resolution: {integrity: sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==}
+    engines: {node: '>=12'}
+
+  d3-interpolate@3.0.1:
+    resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
+    engines: {node: '>=12'}
+
+  d3-path@3.1.0:
+    resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
+    engines: {node: '>=12'}
+
+  d3-polygon@3.0.1:
+    resolution: {integrity: sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==}
+    engines: {node: '>=12'}
+
+  d3-quadtree@3.0.1:
+    resolution: {integrity: sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==}
+    engines: {node: '>=12'}
+
+  d3-random@3.0.1:
+    resolution: {integrity: sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==}
+    engines: {node: '>=12'}
+
+  d3-scale-chromatic@3.1.0:
+    resolution: {integrity: sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==}
+    engines: {node: '>=12'}
+
+  d3-scale@4.0.2:
+    resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
+    engines: {node: '>=12'}
+
+  d3-selection@3.0.0:
+    resolution: {integrity: sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==}
+    engines: {node: '>=12'}
+
+  d3-shape@3.2.0:
+    resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
+    engines: {node: '>=12'}
+
+  d3-time-format@4.1.0:
+    resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==}
+    engines: {node: '>=12'}
+
+  d3-time@3.1.0:
+    resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
+    engines: {node: '>=12'}
+
+  d3-timer@3.0.1:
+    resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
+    engines: {node: '>=12'}
+
+  d3-transition@3.0.1:
+    resolution: {integrity: sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      d3-selection: 2 - 3
+
+  d3-zoom@3.0.0:
+    resolution: {integrity: sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==}
+    engines: {node: '>=12'}
+
+  d3@7.9.0:
+    resolution: {integrity: sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==}
+    engines: {node: '>=12'}
+
+  data-urls@5.0.0:
+    resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
+    engines: {node: '>=18'}
+
+  date-fns-tz@1.3.8:
+    resolution: {integrity: sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==}
+    peerDependencies:
+      date-fns: '>=2.0.0'
+
+  date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
+
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
     engines: {node: '>=6.0'}
@@ -3140,16 +4432,30 @@ packages:
       supports-color:
         optional: true
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   decode-named-character-reference@1.3.0:
     resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
 
+  decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
+
   deep-eql@5.0.2:
     resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
     engines: {node: '>=6'}
 
+  deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+
   defu@6.1.4:
     resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
 
+  delaunator@5.0.1:
+    resolution: {integrity: sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==}
+
   delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
@@ -3169,6 +4475,9 @@ packages:
     resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
+  detect-node-es@1.1.0:
+    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
+
   deterministic-object-hash@2.0.2:
     resolution: {integrity: sha512-KxektNH63SrbfUyDiwXqRb1rLwKt33AmMv+5Nhsw1kqZ13SJBRTgZHtGbE+hH3a1mVW1cz+4pqSWVPAtLVXTzQ==}
     engines: {node: '>=18'}
@@ -3200,6 +4509,9 @@ packages:
     resolution: {integrity: sha512-iND4mcOWhPaCNh54WmK/KoSb35AFqPAUWFMffTQcp52uQt36b5uNwEJTSXntJZBbeGad72Crbi/hvDIv6us/6Q==}
     engines: {node: '>= 8.0'}
 
+  dom-helpers@5.2.1:
+    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
+
   dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
 
@@ -3217,6 +4529,102 @@ packages:
     resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
     engines: {node: '>=12'}
 
+  drizzle-kit@0.31.9:
+    resolution: {integrity: sha512-GViD3IgsXn7trFyBUUHyTFBpH/FsHTxYJ66qdbVggxef4UBPHRYxQaRzYLTuekYnk9i5FIEL9pbBIwMqX/Uwrg==}
+    hasBin: true
+
+  drizzle-orm@0.44.7:
+    resolution: {integrity: sha512-quIpnYznjU9lHshEOAYLoZ9s3jweleHlZIAWR/jX9gAWNg/JhQ1wj0KGRf7/Zm+obRrYd9GjPVJg790QY9N5AQ==}
+    peerDependencies:
+      '@aws-sdk/client-rds-data': '>=3'
+      '@cloudflare/workers-types': '>=4'
+      '@electric-sql/pglite': '>=0.2.0'
+      '@libsql/client': '>=0.10.0'
+      '@libsql/client-wasm': '>=0.10.0'
+      '@neondatabase/serverless': '>=0.10.0'
+      '@op-engineering/op-sqlite': '>=2'
+      '@opentelemetry/api': ^1.4.1
+      '@planetscale/database': '>=1.13'
+      '@prisma/client': '*'
+      '@tidbcloud/serverless': '*'
+      '@types/better-sqlite3': '*'
+      '@types/pg': '*'
+      '@types/sql.js': '*'
+      '@upstash/redis': '>=1.34.7'
+      '@vercel/postgres': '>=0.8.0'
+      '@xata.io/client': '*'
+      better-sqlite3: '>=7'
+      bun-types: '*'
+      expo-sqlite: '>=14.0.0'
+      gel: '>=2'
+      knex: '*'
+      kysely: '*'
+      mysql2: '>=2'
+      pg: '>=8'
+      postgres: '>=3'
+      prisma: '*'
+      sql.js: '>=1'
+      sqlite3: '>=5'
+    peerDependenciesMeta:
+      '@aws-sdk/client-rds-data':
+        optional: true
+      '@cloudflare/workers-types':
+        optional: true
+      '@electric-sql/pglite':
+        optional: true
+      '@libsql/client':
+        optional: true
+      '@libsql/client-wasm':
+        optional: true
+      '@neondatabase/serverless':
+        optional: true
+      '@op-engineering/op-sqlite':
+        optional: true
+      '@opentelemetry/api':
+        optional: true
+      '@planetscale/database':
+        optional: true
+      '@prisma/client':
+        optional: true
+      '@tidbcloud/serverless':
+        optional: true
+      '@types/better-sqlite3':
+        optional: true
+      '@types/pg':
+        optional: true
+      '@types/sql.js':
+        optional: true
+      '@upstash/redis':
+        optional: true
+      '@vercel/postgres':
+        optional: true
+      '@xata.io/client':
+        optional: true
+      better-sqlite3:
+        optional: true
+      bun-types:
+        optional: true
+      expo-sqlite:
+        optional: true
+      gel:
+        optional: true
+      knex:
+        optional: true
+      kysely:
+        optional: true
+      mysql2:
+        optional: true
+      pg:
+        optional: true
+      postgres:
+        optional: true
+      prisma:
+        optional: true
+      sql.js:
+        optional: true
+      sqlite3:
+        optional: true
+
   dset@3.1.4:
     resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==}
     engines: {node: '>=4'}
@@ -3229,6 +4637,9 @@ packages:
     resolution: {integrity: sha512-gztSeMGCzati+NNY/eILb+GAPmq97e8h6KNytNFaFFJFtLkhqkxYGX+y2Jcr53CGMf8VUlXG8PEyn7HFkFMWTg==}
     engines: {node: '>=20'}
 
+  earcut@2.2.4:
+    resolution: {integrity: sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==}
+
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
@@ -3284,6 +4695,16 @@ packages:
     resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
     engines: {node: '>= 0.4'}
 
+  esbuild-register@3.6.0:
+    resolution: {integrity: sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==}
+    peerDependencies:
+      esbuild: '>=0.12 <1'
+
+  esbuild@0.18.20:
+    resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
+    engines: {node: '>=12'}
+    hasBin: true
+
   esbuild@0.21.5:
     resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
     engines: {node: '>=12'}
@@ -3294,21 +4715,16 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  esbuild@0.27.0:
-    resolution: {integrity: sha512-jd0f4NHbD6cALCyGElNpGAOtWxSq46l9X/sWB0Nzd5er4Kz2YTm+Vl0qKFT9KUJvD8+fiO8AvoHhFvEatfVixA==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  esbuild@0.27.2:
-    resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   esbuild@0.27.3:
     resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.27.4:
+    resolution: {integrity: sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -3348,10 +4764,18 @@ packages:
     resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}
     engines: {node: '>=18.0.0'}
 
+  execa@6.1.0:
+    resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   execa@8.0.1:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
     engines: {node: '>=16.17'}
 
+  expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+
   expand-tilde@2.0.2:
     resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
     engines: {node: '>=0.10.0'}
@@ -3397,6 +4821,9 @@ packages:
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
+  fdb-tuple@1.0.0:
+    resolution: {integrity: sha512-8jSvKPCYCgTpi9Pt87qlfTk6griyMx4Gk3Xv31Dp72Qp8b6XgIyFsMm8KzPmFJ9iJ8K4pGvRxvOS8D0XGnrkjw==}
+
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
     engines: {node: '>=12.0.0'}
@@ -3406,6 +4833,13 @@ packages:
       picomatch:
         optional: true
 
+  file-selector@0.1.19:
+    resolution: {integrity: sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==}
+    engines: {node: '>= 10'}
+
+  file-uri-to-path@1.0.0:
+    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+
   fill-range@7.1.1:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
@@ -3417,10 +4851,18 @@ packages:
   fix-dts-default-cjs-exports@1.0.1:
     resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==}
 
+  fkill@9.0.0:
+    resolution: {integrity: sha512-MdYSsbdCaIRjzo5edthZtWmEZVMfr1qrtYZUHIdO3swCE+CoZA8S5l0s4jDsYlTa9ZiXv0pTgpzE7s4N8NeUOA==}
+    engines: {node: '>=18'}
+
   flattie@1.1.1:
     resolution: {integrity: sha512-9UbaD6XdAL97+k/n+N7JwX46K/M6Zc6KcFYskrYL8wbBV/Uyk0CTAMY0VT+qiK5PM7AIc9aTWYtq65U7T+aCNQ==}
     engines: {node: '>=8'}
 
+  focus-lock@1.3.6:
+    resolution: {integrity: sha512-Ik/6OCk9RQQ0T5Xw+hKNLWrjSMtv51dD4GRmJjbD5a58TIEpI5a5iXagKVl3Z5UuyslMCA8Xwnu76jQob62Yhg==}
+    engines: {node: '>=10'}
+
   follow-redirects@1.15.11:
     resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
     engines: {node: '>=4.0'}
@@ -3445,6 +4887,9 @@ packages:
     resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
     engines: {node: '>= 6'}
 
+  forwarded-parse@2.1.2:
+    resolution: {integrity: sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==}
+
   forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -3485,6 +4930,9 @@ packages:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
 
+  geojson-vt@3.2.1:
+    resolution: {integrity: sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==}
+
   get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
@@ -3505,6 +4953,10 @@ packages:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
 
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
   get-stream@8.0.1:
     resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
     engines: {node: '>=16'}
@@ -3512,9 +4964,18 @@ packages:
   get-tsconfig@4.13.0:
     resolution: {integrity: sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==}
 
+  ghostty-web@0.4.0:
+    resolution: {integrity: sha512-0puDBik2qapbD/QQBW9o5ZHfXnZBqZWx/ctBiVtKZ6ZLds4NYb+wZuw1cRLXZk9zYovIQ908z3rvFhexAvc5Hg==}
+
+  github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+
   github-slugger@2.0.0:
     resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
 
+  gl-matrix@3.4.4:
+    resolution: {integrity: sha512-latSnyDNt/8zYUB6VIJ6PCh2jBjJX6gnDsoCZ7LyW7GkqrD51EWwa9qCoGixj8YqBtETQK/xY7OmpTF8xz1DdQ==}
+
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -3538,9 +4999,16 @@ packages:
     resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
     engines: {node: '>= 0.4'}
 
+  grid-index@1.1.0:
+    resolution: {integrity: sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==}
+
   h3@1.15.5:
     resolution: {integrity: sha512-xEyq3rSl+dhGX2Lm0+eFQIAzlDN6Fs0EcC4f7BNUmzaRX/PTzeuM+Tr2lHB8FoXggsQIeXLj8EDVgs5ywxyxmg==}
 
+  hammerjs@2.0.8:
+    resolution: {integrity: sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==}
+    engines: {node: '>=0.8.0'}
+
   has-symbols@1.1.0:
     resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
     engines: {node: '>= 0.4'}
@@ -3591,6 +5059,14 @@ packages:
     resolution: {integrity: sha512-eVkB/CYCCei7K2WElZW9yYQFWssG0DhaDhVvr7wy5jJ22K+ck8fWW0EsLpB0sITUTvPnc97+rrbQqIr5iqiy9Q==}
     engines: {node: '>=16.9.0'}
 
+  hono@4.12.2:
+    resolution: {integrity: sha512-gJnaDHXKDayjt8ue0n8Gs0A007yKXj4Xzb8+cNjZeYsSzzwKc0Lr+OZgYwVfB0pHfUs17EPoLvrOsEaJ9mj+Tg==}
+    engines: {node: '>=16.9.0'}
+
+  html-encoding-sniffer@4.0.0:
+    resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
+    engines: {node: '>=18'}
+
   html-escaper@3.0.3:
     resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==}
 
@@ -3604,10 +5080,29 @@ packages:
     resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
     engines: {node: '>= 0.8'}
 
+  http-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
+    engines: {node: '>= 14'}
+
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
+    engines: {node: '>= 14'}
+
+  human-signals@3.0.1:
+    resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
+    engines: {node: '>=12.20.0'}
+
   human-signals@5.0.0:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
 
+  hyphenate-style-name@1.1.0:
+    resolution: {integrity: sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==}
+
+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
   iconv-lite@0.7.2:
     resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
     engines: {node: '>=0.10.0'}
@@ -3615,12 +5110,33 @@ packages:
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
+
+  import-in-the-middle@2.0.6:
+    resolution: {integrity: sha512-3vZV3jX0XRFW3EJDTwzWoZa+RH1b8eTTx6YOCjglrLyPuepwoBti1k3L2dKwdCUrnVEfc5CuRuGstaC/uQJJaw==}
+
   import-meta-resolve@4.2.0:
     resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==}
 
+  indent-string@5.0.0:
+    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
+    engines: {node: '>=12'}
+
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  inline-style-prefixer@5.1.2:
+    resolution: {integrity: sha512-PYUF+94gDfhy+LsQxM0g3d6Hge4l1pAqOSOiZuHWzMvQEGsbRQ/ck2WioLqrY2ZkHyPgVUXxn+hrkF7D6QUGbA==}
+
+  internmap@2.0.3:
+    resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
+    engines: {node: '>=12'}
+
   invariant@2.2.4:
     resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
 
@@ -3665,8 +5181,12 @@ packages:
     engines: {node: '>=14.16'}
     hasBin: true
 
-  is-network-error@1.3.0:
-    resolution: {integrity: sha512-6oIwpsgRfnDiyEDLMay/GqCl3HoAtH5+RUKW29gYkL0QA+ipzpDLA16yQs7/RHCSu+BwgbJaOUqa4A99qNVQVw==}
+  is-interactive@2.0.0:
+    resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
+    engines: {node: '>=12'}
+
+  is-network-error@1.3.1:
+    resolution: {integrity: sha512-6QCxa49rQbmUWLfk0nuGqzql9U8uaV2H6279bRErPBHe/109hCzsLUBUHfbEtvLIHBd6hyXbgedBSHevm43Edw==}
     engines: {node: '>=16'}
 
   is-number@7.0.0:
@@ -3677,6 +5197,9 @@ packages:
     resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
     engines: {node: '>=12'}
 
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   is-promise@4.0.0:
     resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
 
@@ -3684,13 +5207,29 @@ packages:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  is-unicode-supported@1.3.0:
+    resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}
+    engines: {node: '>=12'}
+
+  is-unicode-supported@2.1.0:
+    resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
+    engines: {node: '>=18'}
+
   is-wsl@3.1.0:
     resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
     engines: {node: '>=16'}
 
+  isbot@5.1.35:
+    resolution: {integrity: sha512-waFfC72ZNfwLLuJ2iLaoVaqcNo+CAaLR7xCpAn0Y5WfGzkNHv7ZN39Vbi1y+kb+Zs46XHOX3tZNExroFUPX+Kg==}
+    engines: {node: '>=18'}
+
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
+  isobject@3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
+
   isomorphic-ws@5.0.0:
     resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
     peerDependencies:
@@ -3724,6 +5263,15 @@ packages:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
+  jsdom@26.1.0:
+    resolution: {integrity: sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      canvas: ^3.0.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   jsesc@3.1.0:
     resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
     engines: {node: '>=6'}
@@ -3740,9 +5288,18 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  jsonc-parser@3.3.1:
+    resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
+
   jsonlines@0.1.1:
     resolution: {integrity: sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==}
 
+  just-extend@4.1.1:
+    resolution: {integrity: sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==}
+
+  kdbush@3.0.0:
+    resolution: {integrity: sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==}
+
   kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
@@ -3751,6 +5308,64 @@ packages:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
 
+  kysely@0.28.11:
+    resolution: {integrity: sha512-zpGIFg0HuoC893rIjYX1BETkVWdDnzTzF5e0kWXJFg5lE0k1/LfNWBejrcnOFu8Q2Rfq/hTDTU7XLUM8QOrpzg==}
+    engines: {node: '>=20.0.0'}
+
+  lefthook-darwin-arm64@2.1.3:
+    resolution: {integrity: sha512-VMSQK5ZUh66mKrEpHt5U81BxOg5xAXLoLZIK6e++4uc28tj8zGBqV9+tZqSRElXXzlnHbfdDVCMaKlTuqUy0Rg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  lefthook-darwin-x64@2.1.3:
+    resolution: {integrity: sha512-4QhepF4cf+fa7sDow29IEuCfm/6LuV+oVyQGpnr5it1DEZIEEoa6vdH/x4tutYhAg/HH7I2jHq6FGz96HRiJEQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  lefthook-freebsd-arm64@2.1.3:
+    resolution: {integrity: sha512-kysx/9pjifOgcTZOj1bR0i74FAbMv3BDfrpZDKniBOo4Dp0hXhyOtUmRn4nWKL0bN+cqc4ZePAq4Qdm4fxWafA==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  lefthook-freebsd-x64@2.1.3:
+    resolution: {integrity: sha512-TLuPHQNg6iihShchrh5DrHvoCZO8FajZBMAEwLIKWlm6bkCcXbYNxy4dBaVK8lzHtS/Kv1bnH0D3BcK65iZFVQ==}
+    cpu: [x64]
+    os: [freebsd]
+
+  lefthook-linux-arm64@2.1.3:
+    resolution: {integrity: sha512-e5x4pq1aZAXc0C642V4HaUoKtcHVmGW1HBIDNfWUhtsThBKjhZBXPspecaAHIRA/8VtsXS3RnJ4VhQpgfrCbww==}
+    cpu: [arm64]
+    os: [linux]
+
+  lefthook-linux-x64@2.1.3:
+    resolution: {integrity: sha512-yeVAiV5hoE6Qq8dQDB4XC14x4N9mhn+FetxzqDu5LVci0/sOPqyPq2b0YUtNwJ1ZUKawTz4I/oqnUsHkQrGH0w==}
+    cpu: [x64]
+    os: [linux]
+
+  lefthook-openbsd-arm64@2.1.3:
+    resolution: {integrity: sha512-8QVvRxIosV6NL2XrbifOPGVhMFE43h02BUNEHYhZhyad7BredfAakg9dA9J/NO0I3eMdvCYU50ubFyDGIqUJog==}
+    cpu: [arm64]
+    os: [openbsd]
+
+  lefthook-openbsd-x64@2.1.3:
+    resolution: {integrity: sha512-YTS9qeW9PzzKg9Rk55mQprLIl1OdAIIjeOH8DF+MPWoAPkRqeUyq8Q2Bdlf3+Swy+kJOjoiU1pKvpjjc8upv9Q==}
+    cpu: [x64]
+    os: [openbsd]
+
+  lefthook-windows-arm64@2.1.3:
+    resolution: {integrity: sha512-Nlp80pWyF67GmxgM5NQmL7JTTccbJAvCNtS5QwHmKq3pJ9Xi0UegP9pGME520n06Rhp+gX7H4boXhm2D5hAghg==}
+    cpu: [arm64]
+    os: [win32]
+
+  lefthook-windows-x64@2.1.3:
+    resolution: {integrity: sha512-KByBhvqgUNhjO/03Mr0y66D9B1ZnII7AB0x17cumwHMOYoDaPJh/AlgmEduqUpatqli3lnFzWD0DUkAY6pq/SA==}
+    cpu: [x64]
+    os: [win32]
+
+  lefthook@2.1.3:
+    resolution: {integrity: sha512-2W8PP/EGCvyS/x+Xza0Lgvn/EM3FKnr6m6xkfzpl6RKHl8TwPvs9iYZFQL99CnWTTvO+1mtQvIxGE/bD05038Q==}
+    hasBin: true
+
   lilconfig@3.1.3:
     resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
     engines: {node: '>=14'}
@@ -3765,6 +5380,10 @@ packages:
   lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
 
+  log-symbols@6.0.0:
+    resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
+    engines: {node: '>=18'}
+
   long@5.3.2:
     resolution: {integrity: sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==}
 
@@ -3793,12 +5412,21 @@ packages:
     peerDependencies:
       react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
+  lucide-react@0.542.0:
+    resolution: {integrity: sha512-w3hD8/SQB7+lzU2r4VdFyzzOzKnUjTZIF/MQJGSSvni7Llewni4vuViRppfRAa2guOsY5k4jZyxw/i9DQHv+dw==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
   magicast@0.5.1:
     resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==}
 
+  mapbox-gl@1.13.3:
+    resolution: {integrity: sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==}
+    engines: {node: '>=6.4.0'}
+
   markdown-table@3.0.4:
     resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
 
@@ -3855,6 +5483,9 @@ packages:
     resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
     engines: {node: '>= 0.8'}
 
+  memoize-one@5.0.0:
+    resolution: {integrity: sha512-7g0+ejkOaI9w5x6LvQwmj68kUj6rxROywPSCqmclG/HBacmFnZqhVscQ8kovkn9FBCNJmOz6SY42+jnvZzDWdw==}
+
   merge-descriptors@2.0.0:
     resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
     engines: {node: '>=18'}
@@ -3974,8 +5605,16 @@ packages:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
 
-  miniflare@4.20260205.0:
-    resolution: {integrity: sha512-jG1TknEDeFqcq/z5gsOm1rKeg4cNG7ruWxEuiPxl3pnQumavxo8kFpeQC6XKVpAhh2PI9ODGyIYlgd77sTHl5g==}
+  mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
+
+  mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
+
+  miniflare@4.20260312.1:
+    resolution: {integrity: sha512-YSWxec9ssisqkQgaCgcIQxZlB41E9hMiq1nxUgxXHRrE9NsfyC6ptSt8yfgBobsKIseAVKLTB/iEDpMumBv8oA==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -3987,6 +5626,9 @@ packages:
     resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
     engines: {node: '>=16 || 14 >=14.17'}
 
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
   minipass@7.1.2:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -3995,12 +5637,28 @@ packages:
     resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
     engines: {node: '>= 18'}
 
+  mjolnir.js@2.7.3:
+    resolution: {integrity: sha512-Z5z/+FzZqOSO3juSVKV3zcm4R2eAlWwlKMcqHmyFEJAaLILNcDKnIbnb4/kbcGyIuhtdWrzu8WOIR7uM6I34aw==}
+    engines: {node: '>= 4', npm: '>= 3'}
+
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
   mlly@1.8.0:
     resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==}
 
+  mockdate@2.0.5:
+    resolution: {integrity: sha512-ST0PnThzWKcgSLyc+ugLVql45PvESt3Ul/wrdV/OPc/6Pr8dbLAIJsN1cIp41FLzbN+srVTNIRn+5Cju0nyV6A==}
+
+  modal@0.7.3:
+    resolution: {integrity: sha512-4CliqNF15sZPBGpSoCj5Y9fd8fTp1ONrBLIJiC4amm/Qzc1rn8CH45SVzSu+1DokHCIRiZqQ1xMhRKpDvDCkBw==}
+
+  module-details-from-path@1.0.4:
+    resolution: {integrity: sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==}
+
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+
   motion-dom@12.29.2:
     resolution: {integrity: sha512-/k+NuycVV8pykxyiTCoFzIVLA95Nb1BFIVvfSu9L50/6K6qNeAYtkxXILy/LRutt7AzaYDc2myj0wkCVVYAPPA==}
 
@@ -4014,6 +5672,9 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
+  murmurhash-js@1.0.0:
+    resolution: {integrity: sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==}
+
   mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
@@ -4029,6 +5690,13 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanostores@1.1.1:
+    resolution: {integrity: sha512-EYJqS25r2iBeTtGQCHidXl1VfZ1jXM7Q04zXJOrMlxVVmD0ptxJaNux92n1mJ7c5lN3zTq12MhH/8x59nP+qmg==}
+    engines: {node: ^20.0.0 || >=22.0.0}
+
+  napi-build-utils@2.0.0:
+    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+
   negotiator@1.0.0:
     resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
     engines: {node: '>= 0.6'}
@@ -4037,9 +5705,19 @@ packages:
     resolution: {integrity: sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==}
     engines: {node: '>= 10'}
 
+  nice-grpc-common@2.0.2:
+    resolution: {integrity: sha512-7RNWbls5kAL1QVUOXvBsv1uO0wPQK3lHv+cY1gwkTzirnG1Nop4cBJZubpgziNbaVc/bl9QJcyvsf/NQxa3rjQ==}
+
+  nice-grpc@2.1.14:
+    resolution: {integrity: sha512-GK9pKNxlvnU5FAdaw7i2FFuR9CqBspcE+if2tqnKXBcE0R8525wj4BZvfcwj7FjvqbssqKxRHt2nwedalbJlww==}
+
   nlcst-to-string@4.0.0:
     resolution: {integrity: sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA==}
 
+  node-abi@3.87.0:
+    resolution: {integrity: sha512-+CGM1L1CgmtheLcBuleyYOn7NWPVu0s0EJH2C4puxgEZb9h8QpR9G2dBfZJOAUhi7VQxuBPMd0hiISWcTyiYyQ==}
+    engines: {node: '>=10'}
+
   node-fetch-native@1.6.7:
     resolution: {integrity: sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==}
 
@@ -4064,6 +5742,9 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
+  nwsapi@2.2.23:
+    resolution: {integrity: sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==}
+
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -4097,6 +5778,10 @@ packages:
     resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
     engines: {node: '>=12'}
 
+  onetime@7.0.0:
+    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
+    engines: {node: '>=18'}
+
   oniguruma-parser@0.12.1:
     resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==}
 
@@ -4116,6 +5801,10 @@ packages:
   openapi3-ts@4.5.0:
     resolution: {integrity: sha512-jaL+HgTq2Gj5jRcfdutgRGLosCy/hT8sQf6VOy+P+g36cZOjI1iukdPnijC+4CmeRzg/jEllJUboEic2FhxhtQ==}
 
+  ora@8.2.0:
+    resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==}
+    engines: {node: '>=18'}
+
   os-paths@4.4.0:
     resolution: {integrity: sha512-wrAwOeXp1RRMFfQY8Sy7VaGVmPocaLwSFOYCGKSyo8qmJ+/yaafCl5BCA1IQZWqFSRBrKDYFeR9d/VyQzfH/jg==}
     engines: {node: '>= 6.0'}
@@ -4188,30 +5877,37 @@ packages:
     resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==}
     engines: {node: '>= 14.16'}
 
+  pbf@3.3.0:
+    resolution: {integrity: sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==}
+    hasBin: true
+
   pg-cloudflare@1.3.0:
     resolution: {integrity: sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==}
 
-  pg-connection-string@2.11.0:
-    resolution: {integrity: sha512-kecgoJwhOpxYU21rZjULrmrBJ698U2RxXofKVzOn5UDj61BPj/qMb7diYUR1nLScCDbrztQFl1TaQZT0t1EtzQ==}
+  pg-connection-string@2.12.0:
+    resolution: {integrity: sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==}
 
   pg-int8@1.0.1:
     resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
     engines: {node: '>=4.0.0'}
 
-  pg-pool@3.11.0:
-    resolution: {integrity: sha512-MJYfvHwtGp870aeusDh+hg9apvOe2zmpZJpyt+BMtzUWlVqbhFmMK6bOBXLBUPd7iRtIF9fZplDc7KrPN3PN7w==}
+  pg-pool@3.13.0:
+    resolution: {integrity: sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==}
     peerDependencies:
       pg: '>=8.0'
 
   pg-protocol@1.11.0:
     resolution: {integrity: sha512-pfsxk2M9M3BuGgDOfuy37VNRRX3jmKgMjcvAcWqNDpZSf4cUmv8HSOl5ViRQFsfARFn0KuUQTgLxVMbNq5NW3g==}
 
+  pg-protocol@1.13.0:
+    resolution: {integrity: sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==}
+
   pg-types@2.2.0:
     resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
     engines: {node: '>=4'}
 
-  pg@8.18.0:
-    resolution: {integrity: sha512-xqrUDL1b9MbkydY/s+VZ6v+xiMUmOUk7SS9d/1kpyQxoJ6U9AO1oIJyUWVZojbfe5Cc/oluutcgFG4L9RDP1iQ==}
+  pg@8.20.0:
+    resolution: {integrity: sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==}
     engines: {node: '>= 16.0.0'}
     peerDependencies:
       pg-native: '>=3.0.1'
@@ -4236,6 +5932,10 @@ packages:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
+  pid-port@1.0.2:
+    resolution: {integrity: sha512-Khqp07zX8IJpmIg56bHrLxS3M0iSL4cq6wnMq8YE7r/hSw3Kn4QxYS6QJg8Bs22Z7CSVj7eSsxFuigYVIFWmjg==}
+    engines: {node: '>=18'}
+
   pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
@@ -4243,9 +5943,16 @@ packages:
   pino-abstract-transport@2.0.0:
     resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==}
 
+  pino-abstract-transport@3.0.0:
+    resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==}
+
   pino-std-serializers@7.1.0:
     resolution: {integrity: sha512-BndPH67/JxGExRgiX1dX0w1FvZck5Wa4aal9198SrRhZjH3GxKQUKIBnYJTdj2HDN3UQAS06HlfcSbQj2OHmaw==}
 
+  pino@10.3.1:
+    resolution: {integrity: sha512-r34yH/GlQpKZbU1BvFFqOjhISRo1MNx1tWYsYvmj6KIRHSPMT2+yHOEb1SG6NMvRoHRF0a07kCOox/9yakl1vg==}
+    hasBin: true
+
   pino@9.14.0:
     resolution: {integrity: sha512-8OEwKp5juEvb/MjpIc4hjqfgCNysrS94RIOMXYvpYCdm/jglrKEiAYmiumbmGhCvs+IcInsphYDFwqrjr7398w==}
     hasBin: true
@@ -4264,6 +5971,14 @@ packages:
   platform@1.3.6:
     resolution: {integrity: sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==}
 
+  polished@4.3.1:
+    resolution: {integrity: sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==}
+    engines: {node: '>=10'}
+
+  popper.js@1.16.1:
+    resolution: {integrity: sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==}
+    deprecated: You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1
+
   postcss-import@15.1.0:
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
     engines: {node: '>=14.0.0'}
@@ -4339,10 +6054,23 @@ packages:
     resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
     engines: {node: '>=0.10.0'}
 
+  potpack@1.0.2:
+    resolution: {integrity: sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==}
+
+  prebuild-install@7.1.3:
+    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
+    engines: {node: '>=10'}
+    deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available.
+    hasBin: true
+
   prismjs@1.30.0:
     resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==}
     engines: {node: '>=6'}
 
+  process-exists@5.0.0:
+    resolution: {integrity: sha512-6QPRh5fyHD8MaXr4GYML8K/YY0Sq5dKHGIOrAKS3cYpHQdmygFCcijIu1dVoNKAZ0TWAMoeh8KDK9dF8auBkJA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   process-warning@5.0.0:
     resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
 
@@ -4350,6 +6078,14 @@ packages:
     resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
     engines: {node: '>= 6'}
 
+  prop-types-extra@1.1.1:
+    resolution: {integrity: sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==}
+    peerDependencies:
+      react: '>=0.14.0'
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
   property-information@7.1.0:
     resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
 
@@ -4357,6 +6093,9 @@ packages:
     resolution: {integrity: sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==}
     engines: {node: '>=12.0.0'}
 
+  protocol-buffers-schema@3.6.0:
+    resolution: {integrity: sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==}
+
   proxy-addr@2.0.7:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
@@ -4364,9 +6103,17 @@ packages:
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
+  ps-list@8.1.1:
+    resolution: {integrity: sha512-OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   pump@3.0.3:
     resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
 
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
   qs@6.14.1:
     resolution: {integrity: sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==}
     engines: {node: '>=0.6'}
@@ -4377,6 +6124,9 @@ packages:
   quick-format-unescaped@4.0.4:
     resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
 
+  quickselect@2.0.0:
+    resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==}
+
   radix3@1.1.2:
     resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==}
 
@@ -4388,6 +6138,15 @@ packages:
     resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
     engines: {node: '>= 0.10'}
 
+  rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+
+  react-clientside-effect@1.2.8:
+    resolution: {integrity: sha512-ma2FePH0z3px2+WOu6h+YycZcEvFmmxIlAb62cF52bG86eMySciO/EQZeQMXd07kPCYB0a1dWDT5J+KE9mCDUw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+
   react-dom@18.3.1:
     resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
     peerDependencies:
@@ -4398,10 +6157,110 @@ packages:
     peerDependencies:
       react: ^19.2.4
 
+  react-dropzone@9.0.0:
+    resolution: {integrity: sha512-wZ2o9B2qkdE3RumWhfyZT9swgJYJPeU5qHEcMU8weYpmLex1eeWX0CC32/Y0VutB+BBi2D+iePV/YZIiB4kZGw==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      react: '>=0.14.0'
+
+  react-focus-lock@2.13.7:
+    resolution: {integrity: sha512-20lpZHEQrXPb+pp1tzd4ULL6DyO5D2KnR0G69tTDdydrmNhU7pdFmbQUYVyHUgp+xN29IuFR0PVuhOmvaZL9Og==}
+    peerDependencies:
+      '@types/react': ^19.1.12
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-grab@0.1.27:
+    resolution: {integrity: sha512-PgWd52U1WNkipjfa4uxzipTbs1VQnIt7u1Ps13TGU3Kjfs+gYiTUuSof4317ayH7uO9FwnZRnp5z8yNTEOA58Q==}
+    hasBin: true
+    peerDependencies:
+      react: '>=17.0.0'
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+  react-hook-form@7.71.2:
+    resolution: {integrity: sha512-1CHvcDYzuRUNOflt4MOq3ZM46AronNJtQ1S7tnX6YN4y72qhgiUItpacZUAQ0TyWYci3yz1X+rXaSxiuEm86PA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^16.8.0 || ^17 || ^18 || ^19
+
+  react-input-mask@2.0.4:
+    resolution: {integrity: sha512-1hwzMr/aO9tXfiroiVCx5EtKohKwLk/NT8QlJXHQ4N+yJJFyUuMT+zfTpLBwX/lK3PkuMlievIffncpMZ3HGRQ==}
+    peerDependencies:
+      react: '>=0.14.0'
+      react-dom: '>=0.14.0'
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
+  react-lifecycles-compat@3.0.4:
+    resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==}
+
+  react-map-gl@5.2.13:
+    resolution: {integrity: sha512-yYqpZJADB7o5epiYpkcUED5MWevFnOsVn9mgKfizxjsenLMpVNgNgb/x0e9DS4VZtpOLWW2ZXYBB4BJZJlZmTQ==}
+    engines: {node: '>= 4', npm: '>= 3'}
+    peerDependencies:
+      react: '>=16.3.0'
+
+  react-movable@3.4.1:
+    resolution: {integrity: sha512-VTrBKjRWV4yVUDGj5dIZIhf07fyoFDXzIV6xs3KNNHpgPbkPT7FNu/Vbe11ZjHmT48uOykCmRMpS66DrzRbZZg==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+
+  react-multi-ref@1.0.2:
+    resolution: {integrity: sha512-6oS5yzrZ4UrdMHbF6QAnnaoIe9h8R+Xv4m8uJWVK8/Q4RCc6RTT0XJ/LZ7llVgFcVbnDHeUAcVIhtRgFyzjJpA==}
+
+  react-range@1.10.0:
+    resolution: {integrity: sha512-kDo0LiBUHIQIP8menx0UoxTnHr7UXBYpIYl/DR9jCaO1o29VwvCLpkP/qOTNQz5hkJadPg1uEM07XJcJ1XGoKw==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+
   react-refresh@0.17.0:
     resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
     engines: {node: '>=0.10.0'}
 
+  react-refresh@0.18.0:
+    resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
+    engines: {node: '>=0.10.0'}
+
+  react-uid@2.3.0:
+    resolution: {integrity: sha512-tsPZ77GR0pISGYmpCLHAbZTabKXZ7zBniKPVqVMMfnXFyo39zq5g/psIlD5vLTKkjQEhWOO8JhqcHnxkwNu6eA==}
+    engines: {node: '>=8.5.0'}
+    peerDependencies:
+      '@types/react': ^19.1.12
+      react: ^16.8.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-virtualized-auto-sizer@1.0.2:
+    resolution: {integrity: sha512-MYXhTY1BZpdJFjUovvYHVBmkq79szK/k7V3MO+36gJkWGkrXKtyr4vCPtpphaTLRAdDNoYEYFZWE8LjN+PIHNg==}
+    engines: {node: '>8.0.0'}
+    peerDependencies:
+      react: ^15.3.0 || ^16.0.0-alpha
+      react-dom: ^15.3.0 || ^16.0.0-alpha
+
+  react-virtualized@9.22.6:
+    resolution: {integrity: sha512-U5j7KuUQt3AaMatlMJ0UJddqSiX+Km0YJxSqbAzIiGw5EmNz0khMyqP2hzgu4+QUtm+QPIrxzUX4raJxmVJnHg==}
+    peerDependencies:
+      react: ^16.3.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  react-window@1.8.5:
+    resolution: {integrity: sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q==}
+    engines: {node: '>8.0.0'}
+    peerDependencies:
+      react: ^15.0.0 || ^16.0.0
+      react-dom: ^15.0.0 || ^16.0.0
+
   react@18.3.1:
     resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
     engines: {node: '>=0.10.0'}
@@ -4478,6 +6337,13 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  require-in-the-middle@8.0.1:
+    resolution: {integrity: sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==}
+    engines: {node: '>=9.3.0 || >=8.10.0 <9.0.0'}
+
+  resize-observer-polyfill@1.5.1:
+    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
+
   resolve-from@5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
@@ -4485,11 +6351,18 @@ packages:
   resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
+  resolve-protobuf-schema@2.1.0:
+    resolution: {integrity: sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==}
+
   resolve@1.22.11:
     resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==}
     engines: {node: '>= 0.4'}
     hasBin: true
 
+  restore-cursor@5.1.0:
+    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
+    engines: {node: '>=18'}
+
   retext-latin@4.0.0:
     resolution: {integrity: sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA==}
 
@@ -4510,12 +6383,14 @@ packages:
     resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rivetkit@2.0.42:
-    resolution: {integrity: sha512-b78t9RT8fb5e2f16Wl6z4CX6St8gJ5s5C3FfS1zEFtivAtPrhdAt/0yMqXaW76r62AWMrZqEi/tHzJlVd94yHQ==}
+  rivetkit@2.1.6:
+    resolution: {integrity: sha512-AFe06CTZoAYWwCltxPp1XNilfOgK53Itvbc/lv0uF+aEwFEAPIZFQPBTrVgt7NGZSuiM2l6/hjMv7yuBZQ71sw==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
       '@hono/node-server': ^1.14.0
       '@hono/node-ws': ^1.1.1
+      drizzle-kit: ^0.31.2
+      drizzle-orm: ^0.44.2
       eventsource: ^4.0.0
       ws: ^8.0.0
     peerDependenciesMeta:
@@ -4523,23 +6398,73 @@ packages:
         optional: true
       '@hono/node-ws':
         optional: true
+      drizzle-kit:
+        optional: true
+      drizzle-orm:
+        optional: true
       eventsource:
         optional: true
       ws:
         optional: true
 
+  rivetkit@https://pkg.pr.new/rivet-dev/rivet/rivetkit@791500a:
+    resolution: {tarball: https://pkg.pr.new/rivet-dev/rivet/rivetkit@791500a}
+    version: 2.1.6
+    engines: {node: '>=22.0.0'}
+    peerDependencies:
+      '@daytonaio/sdk': ^0.150.0
+      '@e2b/code-interpreter': ^2.3.3
+      '@hono/node-server': ^1.14.0
+      '@hono/node-ws': ^1.1.1
+      dockerode: ^4.0.9
+      drizzle-kit: ^0.31.2
+      drizzle-orm: ^0.44.2
+      eventsource: ^4.0.0
+      ws: ^8.0.0
+    peerDependenciesMeta:
+      '@daytonaio/sdk':
+        optional: true
+      '@e2b/code-interpreter':
+        optional: true
+      '@hono/node-server':
+        optional: true
+      '@hono/node-ws':
+        optional: true
+      dockerode:
+        optional: true
+      drizzle-kit:
+        optional: true
+      drizzle-orm:
+        optional: true
+      eventsource:
+        optional: true
+      ws:
+        optional: true
+
+  robust-predicates@3.0.2:
+    resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}
+
   rollup@4.56.0:
     resolution: {integrity: sha512-9FwVqlgUHzbXtDg9RCMgodF3Ua4Na6Gau+Sdt9vyCN4RhHfVKX2DCHy3BjMLTDd47ITDhYAnTwGulWTblJSDLg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  rou3@0.7.12:
+    resolution: {integrity: sha512-iFE4hLDuloSWcD7mjdCDhx2bKcIsYbtOTpfH5MHHLSKMOUyjqQXTeZVa289uuwEGEKFoE/BAPbhaU4B774nceg==}
+
   router@2.2.0:
     resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
     engines: {node: '>= 18'}
 
+  rrweb-cssom@0.8.0:
+    resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==}
+
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
+  rw@1.3.3:
+    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
+
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
@@ -4550,10 +6475,17 @@ packages:
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
+  sandbox-agent@0.3.2:
+    resolution: {integrity: sha512-ic1UPLMKExjXIw4ViL0Wo07YsSqGtS25g6b6BechOX5CBC4d130tCR1xrhJ8Fuy6jlzx6I+f7gIxDedTnRUWSA==}
+
   sax@1.4.4:
     resolution: {integrity: sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==}
     engines: {node: '>=11.0.0'}
 
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
   scheduler@0.23.2:
     resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
 
@@ -4573,10 +6505,23 @@ packages:
     resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==}
     engines: {node: '>= 18'}
 
+  seroval-plugins@1.5.1:
+    resolution: {integrity: sha512-4FbuZ/TMl02sqv0RTFexu0SP6V+ywaIe5bAWCCEik0fk17BhALgwvUDVF7e3Uvf9pxmwCEJsRPmlkUE6HdzLAw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      seroval: ^1.0
+
+  seroval@1.5.1:
+    resolution: {integrity: sha512-OwrZRZAfhHww0WEnKHDY8OM0U/Qs8OTfIDWhUD4BLpNJUfXK4cGmjiagGze086m+mhI+V2nD0gfbHEnJjb9STA==}
+    engines: {node: '>=10'}
+
   serve-static@2.2.1:
     resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==}
     engines: {node: '>= 18'}
 
+  set-cookie-parser@3.0.1:
+    resolution: {integrity: sha512-n7Z7dXZhJbwuAHhNzkTti6Aw9QDDjZtm3JTpTGATIdNzdQz5GuFs22w90BcvF4INfnrL5xrX3oGsuqO5Dx3A1Q==}
+
   setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
@@ -4618,17 +6563,34 @@ packages:
   siginfo@2.0.0:
     resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
 
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
   signal-exit@4.1.0:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
+  simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+  simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
   sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
 
+  sitemap@8.0.2:
+    resolution: {integrity: sha512-LwktpJcyZDoa0IL6KT++lQ53pbSrx2c9ge41/SeLTyqy2XUNA6uR4+P9u5IVo5lPeL2arAcOKn1aZAxoYbCKlQ==}
+    engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+    hasBin: true
+
   smol-toml@1.6.0:
     resolution: {integrity: sha512-4zemZi0HvTnYwLfrpk/CF9LOd9Lt87kAt50GnqhMpyF9U3poDAP2+iukq2bZsO/ufegbYehBkqINbsWxj4l4cw==}
     engines: {node: '>= 18'}
 
+  solid-js@1.9.11:
+    resolution: {integrity: sha512-WEJtcc5mkh/BnHA6Yrg4whlF8g6QwpmXXRg4P2ztPmcKeHHlH4+djYecBLhSpecZY2RRECXYUwIc/C2r3yzQ4Q==}
+
   sonic-boom@4.2.1:
     resolution: {integrity: sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q==}
 
@@ -4636,6 +6598,13 @@ packages:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
 
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
   source-map@0.7.6:
     resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
     engines: {node: '>= 12'}
@@ -4664,9 +6633,16 @@ packages:
   std-env@3.10.0:
     resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
 
+  stdin-discarder@0.2.2:
+    resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
+    engines: {node: '>=18'}
+
   stream-browserify@3.0.0:
     resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
 
+  stream-replace-string@2.0.0:
+    resolution: {integrity: sha512-TlnjJ1C0QrmxRNrON00JvaFFlNh5TTG00APw23j74ET7gkQpTASi6/L2fuiav8pzK715HXtUeClpBTw2NPSn6w==}
+
   streamsearch@1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
@@ -4704,17 +6680,35 @@ packages:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
 
+  strip-json-comments@2.0.1:
+    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+    engines: {node: '>=0.10.0'}
+
   strip-literal@3.1.0:
     resolution: {integrity: sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==}
 
   strnum@2.1.2:
     resolution: {integrity: sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==}
 
+  styletron-engine-atomic@1.6.2:
+    resolution: {integrity: sha512-vWSIxpCkYbVD3xhnxYwnJDJePD8p8pJCu7g1zFxdQIM4z34Eo1zj3LgXJI6yeNMrJ7PkE56SYK6ZOo3hpTOBzA==}
+
+  styletron-react@6.1.1:
+    resolution: {integrity: sha512-K04BwKZTrdRG/wR5BaFG8z0bFu1jkT2HAp0UP5ZeMAKW6Ix8J3yuROWLoLUMZafaRRQ9LjiLpIl65u75L7YZow==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  styletron-standard@3.1.0:
+    resolution: {integrity: sha512-Cr2q0IFsag6OaIeD/LBNRuCxNTPa/WtTbKP1X3o50mDudN8FGwmD5h1sMJ/Bu5+mO/2NfrNAv9V9zUXn6lXXMA==}
+
   sucrase@3.35.1:
     resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==}
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
+  supercluster@7.1.5:
+    resolution: {integrity: sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==}
+
   supports-color@10.2.2:
     resolution: {integrity: sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==}
     engines: {node: '>=18'}
@@ -4732,6 +6726,9 @@ packages:
     engines: {node: '>=16'}
     hasBin: true
 
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
   tailwindcss@3.4.19:
     resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==}
     engines: {node: '>=14.0.0'}
@@ -4752,6 +6749,15 @@ packages:
     engines: {node: '>=18'}
     deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
+  tar@7.5.7:
+    resolution: {integrity: sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==}
+    engines: {node: '>=18'}
+    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+
+  taskkill@5.0.0:
+    resolution: {integrity: sha512-+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ==}
+    engines: {node: '>=14.16'}
+
   text-decoder@1.2.3:
     resolution: {integrity: sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==}
 
@@ -4765,9 +6771,19 @@ packages:
   thread-stream@3.1.0:
     resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==}
 
+  thread-stream@4.0.0:
+    resolution: {integrity: sha512-4iMVL6HAINXWf1ZKZjIPcz5wYaOdPhtO8ATvZ+Xqp3BTdaqtAwQkNmKORqcIo5YkQqGXq5cwfswDwMqqQNrpJA==}
+    engines: {node: '>=20'}
+
   tiny-inflate@1.0.3:
     resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==}
 
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+
+  tiny-warning@1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
@@ -4786,6 +6802,9 @@ packages:
     resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
     engines: {node: ^18.0.0 || >=20.0.0}
 
+  tinyqueue@2.0.3:
+    resolution: {integrity: sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==}
+
   tinyrainbow@2.0.0:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
@@ -4794,6 +6813,13 @@ packages:
     resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
 
+  tldts-core@6.1.86:
+    resolution: {integrity: sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==}
+
+  tldts@6.1.86:
+    resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==}
+    hasBin: true
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -4802,6 +6828,14 @@ packages:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
 
+  tough-cookie@5.1.2:
+    resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
+    engines: {node: '>=16'}
+
+  tr46@5.1.1:
+    resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
+    engines: {node: '>=18'}
+
   tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
@@ -4812,6 +6846,9 @@ packages:
   trough@2.2.0:
     resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==}
 
+  ts-error@1.0.6:
+    resolution: {integrity: sha512-tLJxacIQUM82IR7JO1UUkKlYuUTmoY9HBJAmNWFzheSlDS5SPMcNIepejHJa4BpPQLAcbRhRf3GDJzyj6rbKvA==}
+
   ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
@@ -4830,6 +6867,9 @@ packages:
       typescript:
         optional: true
 
+  tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -4857,6 +6897,9 @@ packages:
     engines: {node: '>=18.0.0'}
     hasBin: true
 
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
   turbo-darwin-64@2.7.6:
     resolution: {integrity: sha512-bYu0qnWju2Ha3EbIkPCk1SMLT3sltKh1P/Jy5FER6BmH++H5z+T5MHh3W1Xoers9rk4N1VdKvog9FO1pxQyjhw==}
     cpu: [x64]
@@ -4907,6 +6950,11 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  typescript@6.0.2:
+    resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   ufo@1.6.3:
     resolution: {integrity: sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==}
 
@@ -4925,6 +6973,9 @@ packages:
   undici-types@7.16.0:
     resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
 
+  undici-types@7.18.2:
+    resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==}
+
   undici@5.29.0:
     resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==}
     engines: {node: '>=14.0'}
@@ -5045,6 +7096,31 @@ packages:
     peerDependencies:
       browserslist: '>= 4.21.0'
 
+  use-callback-ref@1.3.3:
+    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^19.1.12
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-sidecar@1.1.3:
+    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^19.1.12
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
@@ -5052,10 +7128,18 @@ packages:
     resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
     hasBin: true
 
+  uuid@11.1.0:
+    resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
+    hasBin: true
+
   uuid@12.0.0:
     resolution: {integrity: sha512-USe1zesMYh4fjCA8ZH5+X5WIVD0J4V1Jksm1bFTVBX2F/cwSXt0RO5w/3UXbdLKmZX65MiWV+hwhSS8p6oBTGA==}
     hasBin: true
 
+  uuid@13.0.0:
+    resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
+    hasBin: true
+
   vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
@@ -5073,6 +7157,10 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
+  viewport-mercator-project@7.0.4:
+    resolution: {integrity: sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
+
   vite-node@3.2.4:
     resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -5149,6 +7237,46 @@ packages:
       yaml:
         optional: true
 
+  vite@7.3.1:
+    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      lightningcss: ^1.21.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
   vitefu@1.1.1:
     resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==}
     peerDependencies:
@@ -5191,9 +7319,36 @@ packages:
   vscode-languageserver-types@3.17.5:
     resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==}
 
+  vt-pbf@3.1.3:
+    resolution: {integrity: sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==}
+
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
+  warning@4.0.3:
+    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
+
   web-namespaces@2.0.1:
     resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==}
 
+  webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+
+  whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
+
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
+  whatwg-url@14.2.0:
+    resolution: {integrity: sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==}
+    engines: {node: '>=18'}
+
   which-pm-runs@1.1.0:
     resolution: {integrity: sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==}
     engines: {node: '>=4'}
@@ -5212,17 +7367,17 @@ packages:
     resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==}
     engines: {node: '>=18'}
 
-  workerd@1.20260205.0:
-    resolution: {integrity: sha512-CcMH5clHwrH8VlY7yWS9C/G/C8g9czIz1yU3akMSP9Z3CkEMFSoC3GGdj5G7Alw/PHEeez1+1IrlYger4pwu+w==}
+  workerd@1.20260312.1:
+    resolution: {integrity: sha512-nNpPkw9jaqo79B+iBCOiksx+N62xC+ETIfyzofUEdY3cSOHJg6oNnVSHm7vHevzVblfV76c8Gr0cXHEapYMBEg==}
     engines: {node: '>=16'}
     hasBin: true
 
-  wrangler@4.63.0:
-    resolution: {integrity: sha512-+R04jF7Eb8K3KRMSgoXpcIdLb8GC62eoSGusYh1pyrSMm/10E0hbKkd7phMJO4HxXc6R7mOHC5SSoX9eof30Uw==}
+  wrangler@4.74.0:
+    resolution: {integrity: sha512-3qprbhgdUyqYGHZ+Y1k0gsyHLMOlLrKL/HU0LDqLlCkbsKPprUA0/ThE4IZsxD84xAAXY6pv5JUuxS2+OnMa3A==}
     engines: {node: '>=20.0.0'}
     hasBin: true
     peerDependencies:
-      '@cloudflare/workers-types': ^4.20260205.0
+      '@cloudflare/workers-types': ^4.20260312.1
     peerDependenciesMeta:
       '@cloudflare/workers-types':
         optional: true
@@ -5274,6 +7429,13 @@ packages:
     resolution: {integrity: sha512-sqMMuL1rc0FmMBOzCpd0yuy9trqF2yTTVe+E9ogwCSWQCdDEtQUwrZPT6AxqtsFGRNxycgncbP/xmOOSPw5ZUw==}
     engines: {node: '>= 6.0'}
 
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
@@ -5352,9 +7514,23 @@ snapshots:
     dependencies:
       zod: 4.3.6
 
+  '@agentclientprotocol/sdk@0.16.1(zod@4.3.6)':
+    dependencies:
+      zod: 4.3.6
+
   '@alloc/quick-lru@5.2.0': {}
 
-  '@asteasolutions/zod-to-openapi@8.4.0(zod@4.3.6)':
+  '@antfu/ni@0.23.2': {}
+
+  '@asamuzakjp/css-color@3.2.0':
+    dependencies:
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+      lru-cache: 10.4.3
+
+  '@asteasolutions/zod-to-openapi@8.4.3(zod@4.3.6)':
     dependencies:
       openapi3-ts: 4.5.0
       zod: 4.3.6
@@ -5393,15 +7569,15 @@ snapshots:
     dependencies:
       prismjs: 1.30.0
 
-  '@astrojs/react@4.4.2(@types/node@25.2.3)(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(jiti@1.21.7)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tsx@4.21.0)(yaml@2.8.2)':
+  '@astrojs/react@4.4.2(@types/node@25.5.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(jiti@1.21.7)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(tsx@4.21.0)(yaml@2.8.2)':
     dependencies:
-      '@types/react': 18.3.27
-      '@types/react-dom': 18.3.7(@types/react@18.3.27)
-      '@vitejs/plugin-react': 4.7.0(vite@6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+      '@vitejs/plugin-react': 4.7.0(vite@6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
       ultrahtml: 1.6.0
-      vite: 6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -5416,9 +7592,15 @@ snapshots:
       - tsx
       - yaml
 
-  '@astrojs/tailwind@6.0.2(astro@5.16.15(@types/node@25.2.3)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))':
+  '@astrojs/sitemap@3.7.0':
     dependencies:
-      astro: 5.16.15(@types/node@25.2.3)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+      sitemap: 8.0.2
+      stream-replace-string: 2.0.0
+      zod: 3.25.76
+
+  '@astrojs/tailwind@6.0.2(astro@5.16.15(@types/node@25.5.0)(aws4fetch@1.0.20)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))':
+    dependencies:
+      astro: 5.16.15(@types/node@25.5.0)(aws4fetch@1.0.20)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
       autoprefixer: 10.4.23(postcss@8.5.6)
       postcss: 8.5.6
       postcss-load-config: 4.0.2(postcss@8.5.6)
@@ -5988,6 +8170,12 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
+  '@babel/code-frame@7.29.0':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.28.5
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
   '@babel/compat-data@7.28.6': {}
 
   '@babel/core@7.28.6':
@@ -6010,6 +8198,26 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/core@7.29.0':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helpers': 7.28.6
+      '@babel/parser': 7.29.0
+      '@babel/template': 7.28.6
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/generator@7.28.6':
     dependencies:
       '@babel/parser': 7.28.6
@@ -6018,6 +8226,14 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
+  '@babel/generator@7.29.1':
+    dependencies:
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
   '@babel/helper-compilation-targets@7.28.6':
     dependencies:
       '@babel/compat-data': 7.28.6
@@ -6044,6 +8260,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-validator-identifier': 7.28.5
+      '@babel/traverse': 7.28.6
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-plugin-utils@7.28.6': {}
 
   '@babel/helper-string-parser@7.27.1': {}
@@ -6061,16 +8286,32 @@ snapshots:
     dependencies:
       '@babel/types': 7.28.6
 
+  '@babel/parser@7.29.0':
+    dependencies:
+      '@babel/types': 7.29.0
+
   '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.28.6)':
     dependencies:
       '@babel/core': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
 
+  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+
   '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.28.6)':
     dependencies:
       '@babel/core': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
 
+  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+
+  '@babel/runtime@7.28.6': {}
+
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.28.6
@@ -6089,67 +8330,184 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/traverse@7.29.0':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/helper-globals': 7.28.0
+      '@babel/parser': 7.29.0
+      '@babel/template': 7.28.6
+      '@babel/types': 7.29.0
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/types@7.28.6':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
+  '@babel/types@7.29.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.28.5
+
   '@balena/dockerignore@1.0.2': {}
 
+  '@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)':
+    dependencies:
+      '@better-auth/utils': 0.3.1
+      '@better-fetch/fetch': 1.1.21
+      '@standard-schema/spec': 1.1.0
+      better-call: 1.3.2(zod@4.3.6)
+      jose: 6.1.3
+      kysely: 0.28.11
+      nanostores: 1.1.1
+      zod: 4.3.6
+    optionalDependencies:
+      '@cloudflare/workers-types': 4.20260317.1
+
+  '@better-auth/drizzle-adapter@1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))':
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/utils': 0.3.1
+    optionalDependencies:
+      drizzle-orm: 0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0)
+
+  '@better-auth/kysely-adapter@1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)(kysely@0.28.11)':
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/utils': 0.3.1
+      kysely: 0.28.11
+
+  '@better-auth/memory-adapter@1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)':
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/utils': 0.3.1
+
+  '@better-auth/mongo-adapter@1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)':
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/utils': 0.3.1
+
+  '@better-auth/prisma-adapter@1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)':
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/utils': 0.3.1
+
+  '@better-auth/telemetry@1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))':
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/utils': 0.3.1
+      '@better-fetch/fetch': 1.1.21
+
+  '@better-auth/utils@0.3.1': {}
+
+  '@better-fetch/fetch@1.1.21': {}
+
+  '@biomejs/biome@2.4.6':
+    optionalDependencies:
+      '@biomejs/cli-darwin-arm64': 2.4.6
+      '@biomejs/cli-darwin-x64': 2.4.6
+      '@biomejs/cli-linux-arm64': 2.4.6
+      '@biomejs/cli-linux-arm64-musl': 2.4.6
+      '@biomejs/cli-linux-x64': 2.4.6
+      '@biomejs/cli-linux-x64-musl': 2.4.6
+      '@biomejs/cli-win32-arm64': 2.4.6
+      '@biomejs/cli-win32-x64': 2.4.6
+
+  '@biomejs/cli-darwin-arm64@2.4.6':
+    optional: true
+
+  '@biomejs/cli-darwin-x64@2.4.6':
+    optional: true
+
+  '@biomejs/cli-linux-arm64-musl@2.4.6':
+    optional: true
+
+  '@biomejs/cli-linux-arm64@2.4.6':
+    optional: true
+
+  '@biomejs/cli-linux-x64-musl@2.4.6':
+    optional: true
+
+  '@biomejs/cli-linux-x64@2.4.6':
+    optional: true
+
+  '@biomejs/cli-win32-arm64@2.4.6':
+    optional: true
+
+  '@biomejs/cli-win32-x64@2.4.6':
+    optional: true
+
+  '@boxlite-ai/boxlite-darwin-arm64@0.4.3':
+    optional: true
+
+  '@boxlite-ai/boxlite-linux-x64-gnu@0.4.3':
+    optional: true
+
+  '@boxlite-ai/boxlite@0.4.3':
+    optionalDependencies:
+      '@boxlite-ai/boxlite-darwin-arm64': 0.4.3
+      '@boxlite-ai/boxlite-linux-x64-gnu': 0.4.3
+
   '@bufbuild/protobuf@2.11.0': {}
 
   '@capsizecss/unpack@4.0.0':
     dependencies:
       fontkitten: 1.0.2
 
-  '@cbor-extract/cbor-extract-darwin-arm64@2.2.0':
+  '@cbor-extract/cbor-extract-darwin-arm64@2.2.1':
     optional: true
 
-  '@cbor-extract/cbor-extract-darwin-x64@2.2.0':
+  '@cbor-extract/cbor-extract-darwin-x64@2.2.1':
     optional: true
 
-  '@cbor-extract/cbor-extract-linux-arm64@2.2.0':
+  '@cbor-extract/cbor-extract-linux-arm64@2.2.1':
     optional: true
 
-  '@cbor-extract/cbor-extract-linux-arm@2.2.0':
+  '@cbor-extract/cbor-extract-linux-arm@2.2.1':
     optional: true
 
-  '@cbor-extract/cbor-extract-linux-x64@2.2.0':
+  '@cbor-extract/cbor-extract-linux-x64@2.2.1':
     optional: true
 
-  '@cbor-extract/cbor-extract-win32-x64@2.2.0':
+  '@cbor-extract/cbor-extract-win32-x64@2.2.1':
     optional: true
 
-  '@cloudflare/containers@0.0.30': {}
+  '@cloudflare/containers@0.1.1': {}
 
   '@cloudflare/kv-asset-handler@0.4.2': {}
 
-  '@cloudflare/sandbox@0.7.0':
+  '@cloudflare/sandbox@0.7.18(@opencode-ai/sdk@1.2.24)':
     dependencies:
-      '@cloudflare/containers': 0.0.30
+      '@cloudflare/containers': 0.1.1
+      aws4fetch: 1.0.20
+    optionalDependencies:
+      '@opencode-ai/sdk': 1.2.24
 
-  '@cloudflare/unenv-preset@2.12.0(unenv@2.0.0-rc.24)(workerd@1.20260205.0)':
+  '@cloudflare/unenv-preset@2.15.0(unenv@2.0.0-rc.24)(workerd@1.20260312.1)':
     dependencies:
       unenv: 2.0.0-rc.24
     optionalDependencies:
-      workerd: 1.20260205.0
+      workerd: 1.20260312.1
 
-  '@cloudflare/workerd-darwin-64@1.20260205.0':
+  '@cloudflare/workerd-darwin-64@1.20260312.1':
     optional: true
 
-  '@cloudflare/workerd-darwin-arm64@1.20260205.0':
+  '@cloudflare/workerd-darwin-arm64@1.20260312.1':
     optional: true
 
-  '@cloudflare/workerd-linux-64@1.20260205.0':
+  '@cloudflare/workerd-linux-64@1.20260312.1':
     optional: true
 
-  '@cloudflare/workerd-linux-arm64@1.20260205.0':
+  '@cloudflare/workerd-linux-arm64@1.20260312.1':
     optional: true
 
-  '@cloudflare/workerd-windows-64@1.20260205.0':
+  '@cloudflare/workerd-windows-64@1.20260312.1':
     optional: true
 
-  '@cloudflare/workers-types@4.20260207.0': {}
+  '@cloudflare/workers-types@4.20260317.1': {}
 
   '@computesdk/cmd@0.4.1': {}
 
@@ -6166,20 +8524,62 @@ snapshots:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  '@daytonaio/api-client@0.139.0':
+  '@csstools/color-helpers@5.1.0': {}
+
+  '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
     dependencies:
-      axios: 1.13.4
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-color-parser@3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/color-helpers': 5.1.0
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4)':
+    dependencies:
+      '@csstools/css-tokenizer': 3.0.4
+
+  '@csstools/css-tokenizer@3.0.4': {}
+
+  '@date-io/core@2.17.0': {}
+
+  '@date-io/date-fns@2.17.0(date-fns@2.30.0)':
+    dependencies:
+      '@date-io/core': 2.17.0
+    optionalDependencies:
+      date-fns: 2.30.0
+
+  '@date-io/moment@2.17.0(moment@2.30.1)':
+    dependencies:
+      '@date-io/core': 2.17.0
+    optionalDependencies:
+      moment: 2.30.1
+
+  '@daytonaio/api-client@0.151.0':
+    dependencies:
+      axios: 1.13.5
     transitivePeerDependencies:
       - debug
 
-  '@daytonaio/sdk@0.139.0(ws@8.19.0)':
+  '@daytonaio/sdk@0.151.0(ws@8.19.0)':
     dependencies:
       '@aws-sdk/client-s3': 3.975.0
       '@aws-sdk/lib-storage': 3.975.0(@aws-sdk/client-s3@3.975.0)
-      '@daytonaio/api-client': 0.139.0
-      '@daytonaio/toolbox-api-client': 0.139.0
+      '@daytonaio/api-client': 0.151.0
+      '@daytonaio/toolbox-api-client': 0.151.0
       '@iarna/toml': 2.2.5
-      axios: 1.13.4
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/exporter-trace-otlp-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-node': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+      axios: 1.13.5
       busboy: 1.6.0
       dotenv: 17.2.3
       expand-tilde: 2.0.2
@@ -6188,18 +8588,21 @@ snapshots:
       isomorphic-ws: 5.0.0(ws@8.19.0)
       pathe: 2.0.3
       shell-quote: 1.8.3
-      tar: 7.5.6
+      tar: 7.5.7
     transitivePeerDependencies:
       - aws-crt
       - debug
+      - supports-color
       - ws
 
-  '@daytonaio/toolbox-api-client@0.139.0':
+  '@daytonaio/toolbox-api-client@0.151.0':
     dependencies:
-      axios: 1.13.4
+      axios: 1.13.5
     transitivePeerDependencies:
       - debug
 
+  '@drizzle-team/brocli@0.10.2': {}
+
   '@e2b/code-interpreter@2.3.3':
     dependencies:
       e2b: 2.11.1
@@ -6209,389 +8612,389 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@esbuild-kit/core-utils@3.3.2':
+    dependencies:
+      esbuild: 0.18.20
+      source-map-support: 0.5.21
+
+  '@esbuild-kit/esm-loader@2.6.5':
+    dependencies:
+      '@esbuild-kit/core-utils': 3.3.2
+      get-tsconfig: 4.13.0
+
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
   '@esbuild/aix-ppc64@0.25.12':
     optional: true
 
-  '@esbuild/aix-ppc64@0.27.0':
-    optional: true
-
-  '@esbuild/aix-ppc64@0.27.2':
-    optional: true
-
   '@esbuild/aix-ppc64@0.27.3':
     optional: true
 
+  '@esbuild/aix-ppc64@0.27.4':
+    optional: true
+
+  '@esbuild/android-arm64@0.18.20':
+    optional: true
+
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
   '@esbuild/android-arm64@0.25.12':
     optional: true
 
-  '@esbuild/android-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/android-arm64@0.27.2':
-    optional: true
-
   '@esbuild/android-arm64@0.27.3':
     optional: true
 
+  '@esbuild/android-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/android-arm@0.18.20':
+    optional: true
+
   '@esbuild/android-arm@0.21.5':
     optional: true
 
   '@esbuild/android-arm@0.25.12':
     optional: true
 
-  '@esbuild/android-arm@0.27.0':
-    optional: true
-
-  '@esbuild/android-arm@0.27.2':
-    optional: true
-
   '@esbuild/android-arm@0.27.3':
     optional: true
 
+  '@esbuild/android-arm@0.27.4':
+    optional: true
+
+  '@esbuild/android-x64@0.18.20':
+    optional: true
+
   '@esbuild/android-x64@0.21.5':
     optional: true
 
   '@esbuild/android-x64@0.25.12':
     optional: true
 
-  '@esbuild/android-x64@0.27.0':
-    optional: true
-
-  '@esbuild/android-x64@0.27.2':
-    optional: true
-
   '@esbuild/android-x64@0.27.3':
     optional: true
 
+  '@esbuild/android-x64@0.27.4':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.18.20':
+    optional: true
+
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
-  '@esbuild/darwin-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.27.2':
-    optional: true
-
   '@esbuild/darwin-arm64@0.27.3':
     optional: true
 
+  '@esbuild/darwin-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/darwin-x64@0.18.20':
+    optional: true
+
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
   '@esbuild/darwin-x64@0.25.12':
     optional: true
 
-  '@esbuild/darwin-x64@0.27.0':
-    optional: true
-
-  '@esbuild/darwin-x64@0.27.2':
-    optional: true
-
   '@esbuild/darwin-x64@0.27.3':
     optional: true
 
+  '@esbuild/darwin-x64@0.27.4':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.18.20':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.27.2':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.27.3':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.18.20':
+    optional: true
+
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/freebsd-x64@0.27.0':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.27.2':
-    optional: true
-
   '@esbuild/freebsd-x64@0.27.3':
     optional: true
 
+  '@esbuild/freebsd-x64@0.27.4':
+    optional: true
+
+  '@esbuild/linux-arm64@0.18.20':
+    optional: true
+
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
   '@esbuild/linux-arm64@0.25.12':
     optional: true
 
-  '@esbuild/linux-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/linux-arm64@0.27.2':
-    optional: true
-
   '@esbuild/linux-arm64@0.27.3':
     optional: true
 
+  '@esbuild/linux-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/linux-arm@0.18.20':
+    optional: true
+
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
   '@esbuild/linux-arm@0.25.12':
     optional: true
 
-  '@esbuild/linux-arm@0.27.0':
-    optional: true
-
-  '@esbuild/linux-arm@0.27.2':
-    optional: true
-
   '@esbuild/linux-arm@0.27.3':
     optional: true
 
+  '@esbuild/linux-arm@0.27.4':
+    optional: true
+
+  '@esbuild/linux-ia32@0.18.20':
+    optional: true
+
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
   '@esbuild/linux-ia32@0.25.12':
     optional: true
 
-  '@esbuild/linux-ia32@0.27.0':
-    optional: true
-
-  '@esbuild/linux-ia32@0.27.2':
-    optional: true
-
   '@esbuild/linux-ia32@0.27.3':
     optional: true
 
+  '@esbuild/linux-ia32@0.27.4':
+    optional: true
+
+  '@esbuild/linux-loong64@0.18.20':
+    optional: true
+
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
   '@esbuild/linux-loong64@0.25.12':
     optional: true
 
-  '@esbuild/linux-loong64@0.27.0':
-    optional: true
-
-  '@esbuild/linux-loong64@0.27.2':
-    optional: true
-
   '@esbuild/linux-loong64@0.27.3':
     optional: true
 
+  '@esbuild/linux-loong64@0.27.4':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.18.20':
+    optional: true
+
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
-  '@esbuild/linux-mips64el@0.27.0':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.27.2':
-    optional: true
-
   '@esbuild/linux-mips64el@0.27.3':
     optional: true
 
+  '@esbuild/linux-mips64el@0.27.4':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.18.20':
+    optional: true
+
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
-  '@esbuild/linux-ppc64@0.27.0':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.27.2':
-    optional: true
-
   '@esbuild/linux-ppc64@0.27.3':
     optional: true
 
+  '@esbuild/linux-ppc64@0.27.4':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.18.20':
+    optional: true
+
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
-  '@esbuild/linux-riscv64@0.27.0':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.27.2':
-    optional: true
-
   '@esbuild/linux-riscv64@0.27.3':
     optional: true
 
+  '@esbuild/linux-riscv64@0.27.4':
+    optional: true
+
+  '@esbuild/linux-s390x@0.18.20':
+    optional: true
+
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
   '@esbuild/linux-s390x@0.25.12':
     optional: true
 
-  '@esbuild/linux-s390x@0.27.0':
-    optional: true
-
-  '@esbuild/linux-s390x@0.27.2':
-    optional: true
-
   '@esbuild/linux-s390x@0.27.3':
     optional: true
 
+  '@esbuild/linux-s390x@0.27.4':
+    optional: true
+
+  '@esbuild/linux-x64@0.18.20':
+    optional: true
+
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
   '@esbuild/linux-x64@0.25.12':
     optional: true
 
-  '@esbuild/linux-x64@0.27.0':
-    optional: true
-
-  '@esbuild/linux-x64@0.27.2':
-    optional: true
-
   '@esbuild/linux-x64@0.27.3':
     optional: true
 
+  '@esbuild/linux-x64@0.27.4':
+    optional: true
+
   '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/netbsd-arm64@0.27.2':
-    optional: true
-
   '@esbuild/netbsd-arm64@0.27.3':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.18.20':
+    optional: true
+
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/netbsd-x64@0.27.0':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.27.2':
-    optional: true
-
   '@esbuild/netbsd-x64@0.27.3':
     optional: true
 
+  '@esbuild/netbsd-x64@0.27.4':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/openbsd-arm64@0.27.2':
-    optional: true
-
   '@esbuild/openbsd-arm64@0.27.3':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.18.20':
+    optional: true
+
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/openbsd-x64@0.27.0':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.27.2':
-    optional: true
-
   '@esbuild/openbsd-x64@0.27.3':
     optional: true
 
+  '@esbuild/openbsd-x64@0.27.4':
+    optional: true
+
   '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/openharmony-arm64@0.27.2':
-    optional: true
-
   '@esbuild/openharmony-arm64@0.27.3':
     optional: true
 
+  '@esbuild/openharmony-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/sunos-x64@0.18.20':
+    optional: true
+
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
   '@esbuild/sunos-x64@0.25.12':
     optional: true
 
-  '@esbuild/sunos-x64@0.27.0':
-    optional: true
-
-  '@esbuild/sunos-x64@0.27.2':
-    optional: true
-
   '@esbuild/sunos-x64@0.27.3':
     optional: true
 
+  '@esbuild/sunos-x64@0.27.4':
+    optional: true
+
+  '@esbuild/win32-arm64@0.18.20':
+    optional: true
+
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
   '@esbuild/win32-arm64@0.25.12':
     optional: true
 
-  '@esbuild/win32-arm64@0.27.0':
-    optional: true
-
-  '@esbuild/win32-arm64@0.27.2':
-    optional: true
-
   '@esbuild/win32-arm64@0.27.3':
     optional: true
 
+  '@esbuild/win32-arm64@0.27.4':
+    optional: true
+
+  '@esbuild/win32-ia32@0.18.20':
+    optional: true
+
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
   '@esbuild/win32-ia32@0.25.12':
     optional: true
 
-  '@esbuild/win32-ia32@0.27.0':
-    optional: true
-
-  '@esbuild/win32-ia32@0.27.2':
-    optional: true
-
   '@esbuild/win32-ia32@0.27.3':
     optional: true
 
+  '@esbuild/win32-ia32@0.27.4':
+    optional: true
+
+  '@esbuild/win32-x64@0.18.20':
+    optional: true
+
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
   '@esbuild/win32-x64@0.25.12':
     optional: true
 
-  '@esbuild/win32-x64@0.27.0':
-    optional: true
-
-  '@esbuild/win32-x64@0.27.2':
-    optional: true
-
   '@esbuild/win32-x64@0.27.3':
     optional: true
 
+  '@esbuild/win32-x64@0.27.4':
+    optional: true
+
   '@fastify/busboy@2.1.1': {}
 
+  '@fly/sprites@0.0.1': {}
+
   '@grpc/grpc-js@1.14.3':
     dependencies:
       '@grpc/proto-loader': 0.8.0
@@ -6615,22 +9018,35 @@ snapshots:
     dependencies:
       hono: 4.11.8
 
-  '@hono/standard-validator@0.1.5(@standard-schema/spec@1.0.0)(hono@4.11.8)':
+  '@hono/node-server@1.19.9(hono@4.12.2)':
     dependencies:
-      '@standard-schema/spec': 1.0.0
-      hono: 4.11.8
+      hono: 4.12.2
 
-  '@hono/zod-openapi@1.2.1(hono@4.11.8)(zod@4.3.6)':
+  '@hono/node-ws@1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2)':
     dependencies:
-      '@asteasolutions/zod-to-openapi': 8.4.0(zod@4.3.6)
-      '@hono/zod-validator': 0.7.6(hono@4.11.8)(zod@4.3.6)
-      hono: 4.11.8
+      '@hono/node-server': 1.19.9(hono@4.12.2)
+      hono: 4.12.2
+      ws: 8.19.0
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  '@hono/standard-validator@0.1.5(@standard-schema/spec@1.1.0)(hono@4.12.2)':
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      hono: 4.12.2
+
+  '@hono/zod-openapi@1.2.2(hono@4.12.2)(zod@4.3.6)':
+    dependencies:
+      '@asteasolutions/zod-to-openapi': 8.4.3(zod@4.3.6)
+      '@hono/zod-validator': 0.7.6(hono@4.12.2)(zod@4.3.6)
+      hono: 4.12.2
       openapi3-ts: 4.5.0
       zod: 4.3.6
 
-  '@hono/zod-validator@0.7.6(hono@4.11.8)(zod@4.3.6)':
+  '@hono/zod-validator@0.7.6(hono@4.12.2)(zod@4.3.6)':
     dependencies:
-      hono: 4.11.8
+      hono: 4.12.2
       zod: 4.3.6
 
   '@iarna/toml@2.2.5': {}
@@ -6776,11 +9192,65 @@ snapshots:
 
   '@js-sdsl/ordered-map@4.4.2': {}
 
-  '@modelcontextprotocol/sdk@1.26.0(zod@4.3.6)':
+  '@mapbox/geojson-rewind@0.5.2':
+    dependencies:
+      get-stream: 6.0.1
+      minimist: 1.2.8
+
+  '@mapbox/geojson-types@1.0.2': {}
+
+  '@mapbox/jsonlint-lines-primitives@2.0.2': {}
+
+  '@mapbox/mapbox-gl-supported@1.5.0(mapbox-gl@1.13.3)':
+    dependencies:
+      mapbox-gl: 1.13.3
+
+  '@mapbox/point-geometry@0.1.0': {}
+
+  '@mapbox/tiny-sdf@1.2.5': {}
+
+  '@mapbox/unitbezier@0.0.0': {}
+
+  '@mapbox/vector-tile@1.3.1':
+    dependencies:
+      '@mapbox/point-geometry': 0.1.0
+
+  '@mapbox/whoots-js@3.1.0': {}
+
+  '@math.gl/web-mercator@3.6.3':
+    dependencies:
+      '@babel/runtime': 7.28.6
+      gl-matrix: 3.4.4
+
+  '@medv/finder@4.0.2': {}
+
+  '@modelcontextprotocol/sdk@1.27.1(zod@3.25.76)':
     dependencies:
       '@hono/node-server': 1.19.9(hono@4.11.8)
       ajv: 8.17.1
-      ajv-formats: 3.0.1(ajv@8.17.1)
+      ajv-formats: 3.0.1
+      content-type: 1.0.5
+      cors: 2.8.6
+      cross-spawn: 7.0.6
+      eventsource: 3.0.7
+      eventsource-parser: 3.0.6
+      express: 5.2.1
+      express-rate-limit: 8.2.1(express@5.2.1)
+      hono: 4.11.8
+      jose: 6.1.3
+      json-schema-typed: 8.0.2
+      pkce-challenge: 5.0.1
+      raw-body: 3.0.2
+      zod: 3.25.76
+      zod-to-json-schema: 3.25.1(zod@3.25.76)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@modelcontextprotocol/sdk@1.27.1(zod@4.3.6)':
+    dependencies:
+      '@hono/node-server': 1.19.9(hono@4.11.8)
+      ajv: 8.17.1
+      ajv-formats: 3.0.1
       content-type: 1.0.5
       cors: 2.8.6
       cross-spawn: 7.0.6
@@ -6798,6 +9268,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@noble/ciphers@2.1.1': {}
+
+  '@noble/hashes@2.0.1': {}
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -6810,6 +9284,263 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.20.1
 
+  '@opencode-ai/sdk@1.2.24': {}
+
+  '@opentelemetry/api-logs@0.207.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/api@1.9.0': {}
+
+  '@opentelemetry/context-async-hooks@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/core@2.5.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/exporter-logs-otlp-grpc@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@grpc/grpc-js': 1.14.3
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.207.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-logs-otlp-http@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.207.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.207.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-logs-otlp-proto@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.207.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@grpc/grpc-js': 1.14.3
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-metrics-otlp-http@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-metrics-otlp-proto@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-prometheus@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-grpc@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@grpc/grpc-js': 1.14.3
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-http@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-proto@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-zipkin@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/instrumentation-http@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+      forwarded-parse: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.207.0
+      import-in-the-middle: 2.0.6
+      require-in-the-middle: 8.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/otlp-exporter-base@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/otlp-grpc-exporter-base@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@grpc/grpc-js': 1.14.3
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.207.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/otlp-transformer@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.207.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+      protobufjs: 7.5.4
+
+  '@opentelemetry/propagator-b3@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/propagator-jaeger@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/resources@2.5.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/sdk-logs@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.207.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/sdk-metrics@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/sdk-node@0.207.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.207.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-grpc': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-proto': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-grpc': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-proto': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-prometheus': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-grpc': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-http': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-proto': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-zipkin': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/propagator-b3': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/propagator-jaeger': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.207.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-node': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/sdk-trace-base@2.5.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.5.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.39.0
+
+  '@opentelemetry/sdk-trace-node@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/semantic-conventions@1.39.0': {}
+
   '@oslojs/encoding@1.1.0': {}
 
   '@pinojs/redact@0.4.0': {}
@@ -6852,15 +9583,42 @@ snapshots:
 
   '@protobufjs/utf8@1.1.0': {}
 
+  '@react-grab/cli@0.1.27':
+    dependencies:
+      '@antfu/ni': 0.23.2
+      commander: 14.0.3
+      ignore: 7.0.5
+      jsonc-parser: 3.3.1
+      ora: 8.2.0
+      picocolors: 1.1.1
+      prompts: 2.4.2
+      smol-toml: 1.6.0
+
+  '@react-grab/mcp@0.1.27(@types/react@19.2.14)(react@19.2.4)':
+    dependencies:
+      '@modelcontextprotocol/sdk': 1.27.1(zod@3.25.76)
+      fkill: 9.0.0
+      react-grab: 0.1.27(@types/react@19.2.14)(react@19.2.4)
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - '@cfworker/json-schema'
+      - '@types/react'
+      - react
+      - supports-color
+
   '@rivetkit/bare-ts@0.6.2': {}
 
-  '@rivetkit/engine-runner-protocol@2.0.42':
+  '@rivetkit/engine-runner-protocol@2.1.6':
     dependencies:
       '@rivetkit/bare-ts': 0.6.2
 
-  '@rivetkit/engine-runner@2.0.42':
+  '@rivetkit/engine-runner-protocol@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
     dependencies:
-      '@rivetkit/engine-runner-protocol': 2.0.42
+      '@rivetkit/bare-ts': 0.6.2
+
+  '@rivetkit/engine-runner@2.1.6':
+    dependencies:
+      '@rivetkit/engine-runner-protocol': 2.1.6
       '@rivetkit/virtual-websocket': 2.0.33
       pino: 9.14.0
       uuid: 12.0.0
@@ -6869,14 +9627,73 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
+  '@rivetkit/engine-runner@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    dependencies:
+      '@rivetkit/engine-runner-protocol': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      '@rivetkit/virtual-websocket': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/virtual-websocket@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      pino: 9.14.0
+      uuid: 12.0.0
+      ws: 8.19.0
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
   '@rivetkit/fast-json-patch@3.1.2': {}
 
   '@rivetkit/on-change@6.0.2-rc.1': {}
 
+  '@rivetkit/sqlite-vfs@2.1.6':
+    dependencies:
+      '@rivetkit/bare-ts': 0.6.2
+      '@rivetkit/sqlite': 0.1.1
+      vbare: 0.0.4
+
+  '@rivetkit/sqlite-vfs@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/sqlite-vfs@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    dependencies:
+      '@rivetkit/bare-ts': 0.6.2
+      '@rivetkit/sqlite': 0.1.1
+      vbare: 0.0.4
+
+  '@rivetkit/sqlite@0.1.1': {}
+
+  '@rivetkit/traces@2.1.6':
+    dependencies:
+      '@rivetkit/bare-ts': 0.6.2
+      cbor-x: 1.6.3
+      fdb-tuple: 1.0.0
+      vbare: 0.0.4
+
+  '@rivetkit/traces@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/traces@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    dependencies:
+      '@rivetkit/bare-ts': 0.6.2
+      cbor-x: 1.6.3
+      fdb-tuple: 1.0.0
+      vbare: 0.0.4
+
   '@rivetkit/virtual-websocket@2.0.33': {}
 
+  '@rivetkit/virtual-websocket@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/virtual-websocket@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd': {}
+
+  '@rivetkit/workflow-engine@2.1.6':
+    dependencies:
+      '@rivetkit/bare-ts': 0.6.2
+      cbor-x: 1.6.3
+      fdb-tuple: 1.0.0
+      pino: 9.14.0
+      vbare: 0.0.4
+
+  '@rivetkit/workflow-engine@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/workflow-engine@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd':
+    dependencies:
+      '@rivetkit/bare-ts': 0.6.2
+      cbor-x: 1.6.3
+      fdb-tuple: 1.0.0
+      pino: 9.14.0
+      vbare: 0.0.4
+
   '@rolldown/pluginutils@1.0.0-beta.27': {}
 
+  '@rolldown/pluginutils@1.0.0-rc.3': {}
+
   '@rollup/pluginutils@5.3.0(rollup@4.56.0)':
     dependencies:
       '@types/estree': 1.0.8
@@ -6960,6 +9777,36 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.56.0':
     optional: true
 
+  '@rtsao/csstype@2.6.5-forked.0': {}
+
+  '@sandbox-agent/cli-darwin-arm64@0.3.2':
+    optional: true
+
+  '@sandbox-agent/cli-darwin-x64@0.3.2':
+    optional: true
+
+  '@sandbox-agent/cli-linux-arm64@0.3.2':
+    optional: true
+
+  '@sandbox-agent/cli-linux-x64@0.3.2':
+    optional: true
+
+  '@sandbox-agent/cli-shared@0.3.2': {}
+
+  '@sandbox-agent/cli-win32-x64@0.3.2':
+    optional: true
+
+  '@sandbox-agent/cli@0.3.2':
+    dependencies:
+      '@sandbox-agent/cli-shared': 0.3.2
+    optionalDependencies:
+      '@sandbox-agent/cli-darwin-arm64': 0.3.2
+      '@sandbox-agent/cli-darwin-x64': 0.3.2
+      '@sandbox-agent/cli-linux-arm64': 0.3.2
+      '@sandbox-agent/cli-linux-x64': 0.3.2
+      '@sandbox-agent/cli-win32-x64': 0.3.2
+    optional: true
+
   '@shikijs/core@3.21.0':
     dependencies:
       '@shikijs/types': 3.21.0
@@ -7335,7 +10182,54 @@ snapshots:
 
   '@speed-highlight/core@1.2.14': {}
 
-  '@standard-schema/spec@1.0.0': {}
+  '@standard-schema/spec@1.1.0': {}
+
+  '@tanstack/history@1.161.4': {}
+
+  '@tanstack/query-core@5.90.20': {}
+
+  '@tanstack/react-query@5.90.21(react@19.2.4)':
+    dependencies:
+      '@tanstack/query-core': 5.90.20
+      react: 19.2.4
+
+  '@tanstack/react-router@1.166.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/history': 1.161.4
+      '@tanstack/react-store': 0.9.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@tanstack/router-core': 1.166.4
+      isbot: 5.1.35
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  '@tanstack/react-store@0.9.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/store': 0.9.2
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      use-sync-external-store: 1.6.0(react@19.2.4)
+
+  '@tanstack/react-virtual@3.13.22(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@tanstack/virtual-core': 3.13.22
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
+  '@tanstack/router-core@1.166.4':
+    dependencies:
+      '@tanstack/history': 1.161.4
+      '@tanstack/store': 0.9.2
+      cookie-es: 2.0.0
+      seroval: 1.5.1
+      seroval-plugins: 1.5.1(seroval@1.5.1)
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  '@tanstack/store@0.9.2': {}
+
+  '@tanstack/virtual-core@3.13.22': {}
 
   '@types/babel__core@7.20.5':
     dependencies:
@@ -7358,6 +10252,14 @@ snapshots:
     dependencies:
       '@babel/types': 7.28.6
 
+  '@types/better-sqlite3@7.6.13':
+    dependencies:
+      '@types/node': 24.10.9
+
+  '@types/bun@1.3.10':
+    dependencies:
+      bun-types: 1.3.10
+
   '@types/chai@5.2.3':
     dependencies:
       '@types/deep-eql': 4.0.2
@@ -7371,17 +10273,19 @@ snapshots:
 
   '@types/docker-modem@3.0.6':
     dependencies:
-      '@types/node': 25.2.3
+      '@types/node': 24.10.9
       '@types/ssh2': 1.15.5
 
   '@types/dockerode@4.0.1':
     dependencies:
       '@types/docker-modem': 3.0.6
-      '@types/node': 25.2.3
+      '@types/node': 24.10.9
       '@types/ssh2': 1.15.5
 
   '@types/estree@1.0.8': {}
 
+  '@types/hammerjs@2.0.46': {}
+
   '@types/hast@3.0.4':
     dependencies:
       '@types/unist': 3.0.3
@@ -7398,6 +10302,8 @@ snapshots:
     dependencies:
       '@types/unist': 3.0.3
 
+  '@types/node@17.0.45': {}
+
   '@types/node@18.19.130':
     dependencies:
       undici-types: 5.26.5
@@ -7410,33 +10316,34 @@ snapshots:
     dependencies:
       undici-types: 7.16.0
 
-  '@types/node@25.2.2':
+  '@types/node@25.5.0':
     dependencies:
-      undici-types: 7.16.0
+      undici-types: 7.18.2
 
-  '@types/node@25.2.3':
+  '@types/pg@8.18.0':
     dependencies:
-      undici-types: 7.16.0
-
-  '@types/pg@8.16.0':
-    dependencies:
-      '@types/node': 25.2.3
+      '@types/node': 24.10.9
       pg-protocol: 1.11.0
       pg-types: 2.2.0
 
-  '@types/prop-types@15.7.15': {}
-
-  '@types/react-dom@18.3.7(@types/react@18.3.27)':
+  '@types/react-dom@19.2.3(@types/react@19.2.14)':
     dependencies:
-      '@types/react': 18.3.27
+      '@types/react': 19.2.14
 
-  '@types/react@18.3.27':
+  '@types/react-reconciler@0.28.9(@types/react@19.2.14)':
+    dependencies:
+      '@types/react': 19.2.14
+
+  '@types/react@19.2.14':
     dependencies:
-      '@types/prop-types': 15.7.15
       csstype: 3.2.3
 
   '@types/retry@0.12.2': {}
 
+  '@types/sax@1.2.7':
+    dependencies:
+      '@types/node': 24.10.9
+
   '@types/semver@7.7.1': {}
 
   '@types/ssh2@1.15.5':
@@ -7445,13 +10352,17 @@ snapshots:
 
   '@types/unist@3.0.3': {}
 
+  '@types/ws@8.18.1':
+    dependencies:
+      '@types/node': 24.10.9
+
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vercel/oidc@3.1.0': {}
+  '@vercel/oidc@3.2.0': {}
 
-  '@vercel/sandbox@1.4.1':
+  '@vercel/sandbox@1.8.1':
     dependencies:
-      '@vercel/oidc': 3.1.0
+      '@vercel/oidc': 3.2.0
       async-retry: 1.3.3
       jsonlines: 0.1.1
       ms: 2.1.3
@@ -7464,7 +10375,7 @@ snapshots:
       - bare-abort-controller
       - react-native-b4a
 
-  '@vitejs/plugin-react@4.7.0(vite@5.4.21(@types/node@25.2.3))':
+  '@vitejs/plugin-react@4.7.0(vite@5.4.21(@types/node@25.5.0))':
     dependencies:
       '@babel/core': 7.28.6
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.6)
@@ -7472,11 +10383,11 @@ snapshots:
       '@rolldown/pluginutils': 1.0.0-beta.27
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 5.4.21(@types/node@25.2.3)
+      vite: 5.4.21(@types/node@25.5.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-react@4.7.0(vite@6.4.1(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitejs/plugin-react@4.7.0(vite@6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@babel/core': 7.28.6
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.6)
@@ -7484,19 +10395,19 @@ snapshots:
       '@rolldown/pluginutils': 1.0.0-beta.27
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 6.4.1(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-react@4.7.0(vite@6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitejs/plugin-react@5.1.4(vite@7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
-      '@babel/core': 7.28.6
-      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.6)
-      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.6)
-      '@rolldown/pluginutils': 1.0.0-beta.27
+      '@babel/core': 7.29.0
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.0)
+      '@rolldown/pluginutils': 1.0.0-rc.3
       '@types/babel__core': 7.20.5
-      react-refresh: 0.17.0
-      vite: 6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      react-refresh: 0.18.0
+      vite: 7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -7508,13 +10419,29 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@5.4.21(@types/node@25.2.3))':
+  '@vitest/mocker@3.2.4(vite@7.3.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 5.4.21(@types/node@25.2.3)
+      vite: 7.3.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+
+  '@vitest/mocker@3.2.4(vite@7.3.1(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
+    dependencies:
+      '@vitest/spy': 3.2.4
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 7.3.1(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+
+  '@vitest/mocker@3.2.4(vite@7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))':
+    dependencies:
+      '@vitest/spy': 3.2.4
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -7542,15 +10469,34 @@ snapshots:
       loupe: 3.2.1
       tinyrainbow: 2.0.0
 
+  abort-controller-x@0.4.3: {}
+
   accepts@2.0.0:
     dependencies:
       mime-types: 3.0.2
       negotiator: 1.0.0
 
+  acorn-import-attributes@1.9.5(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
   acorn@8.15.0: {}
 
-  ajv-formats@3.0.1(ajv@8.17.1):
-    optionalDependencies:
+  acp-http-client@0.3.2(zod@4.3.6):
+    dependencies:
+      '@agentclientprotocol/sdk': 0.14.1(zod@4.3.6)
+    transitivePeerDependencies:
+      - zod
+
+  agent-base@7.1.4: {}
+
+  aggregate-error@5.0.0:
+    dependencies:
+      clean-stack: 5.3.0
+      indent-string: 5.0.0
+
+  ajv-formats@3.0.1:
+    dependencies:
       ajv: 8.17.1
 
   ajv@8.17.1:
@@ -7597,7 +10543,7 @@ snapshots:
 
   assertion-error@2.0.1: {}
 
-  astro@5.16.15(@types/node@25.2.3)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2):
+  astro@5.16.15(@types/node@25.5.0)(aws4fetch@1.0.20)(jiti@1.21.7)(rollup@4.56.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2):
     dependencies:
       '@astrojs/compiler': 2.13.0
       '@astrojs/internal-helpers': 0.7.5
@@ -7652,10 +10598,10 @@ snapshots:
       ultrahtml: 1.6.0
       unifont: 0.7.3
       unist-util-visit: 5.1.0
-      unstorage: 1.17.4
+      unstorage: 1.17.4(aws4fetch@1.0.20)
       vfile: 6.0.3
-      vite: 6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
-      vitefu: 1.1.1(vite@6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
+      vite: 6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vitefu: 1.1.1(vite@6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
       xxhash-wasm: 1.1.0
       yargs-parser: 21.1.1
       yocto-spinner: 0.2.3
@@ -7707,6 +10653,10 @@ snapshots:
 
   atomic-sleep@1.0.0: {}
 
+  attr-accept@1.1.3:
+    dependencies:
+      core-js: 2.6.12
+
   autoprefixer@10.4.23(postcss@8.5.6):
     dependencies:
       browserslist: 4.28.1
@@ -7716,7 +10666,11 @@ snapshots:
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
-  axios@1.13.4:
+  aws4fetch@1.0.20: {}
+
+  axe-core@4.11.1: {}
+
+  axios@1.13.5:
     dependencies:
       follow-redirects: 1.15.11
       form-data: 4.0.5
@@ -7740,12 +10694,105 @@ snapshots:
 
   baseline-browser-mapping@2.9.18: {}
 
+  baseui@16.1.1(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(styletron-react@6.1.1(react@19.2.4)):
+    dependencies:
+      '@date-io/date-fns': 2.17.0(date-fns@2.30.0)
+      '@date-io/moment': 2.17.0(moment@2.30.1)
+      axe-core: 4.11.1
+      card-validator: 6.2.0
+      csstype: 2.6.11
+      d3: 7.9.0
+      date-fns: 2.30.0
+      date-fns-tz: 1.3.8(date-fns@2.30.0)
+      just-extend: 4.1.1
+      memoize-one: 5.0.0
+      mockdate: 2.0.5
+      moment: 2.30.1
+      polished: 4.3.1
+      popper.js: 1.16.1
+      prop-types: 15.8.1
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      react-dropzone: 9.0.0(react@19.2.4)
+      react-focus-lock: 2.13.7(@types/react@19.2.14)(react@19.2.4)
+      react-hook-form: 7.71.2(react@19.2.4)
+      react-input-mask: 2.0.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react-is: 17.0.2
+      react-map-gl: 5.2.13(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react-movable: 3.4.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react-multi-ref: 1.0.2
+      react-range: 1.10.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react-uid: 2.3.0(@types/react@19.2.14)(react@19.2.4)
+      react-virtualized: 9.22.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react-virtualized-auto-sizer: 1.0.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      react-window: 1.8.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      resize-observer-polyfill: 1.5.1
+      styletron-react: 6.1.1(react@19.2.4)
+      styletron-standard: 3.1.0
+    transitivePeerDependencies:
+      - '@types/react'
+
   bcrypt-pbkdf@1.0.2:
     dependencies:
       tweetnacl: 0.14.5
 
+  better-auth@1.5.5(@cloudflare/workers-types@4.20260317.1)(drizzle-kit@0.31.9)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(solid-js@1.9.11)(vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)):
+    dependencies:
+      '@better-auth/core': 1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1)
+      '@better-auth/drizzle-adapter': 1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))
+      '@better-auth/kysely-adapter': 1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)(kysely@0.28.11)
+      '@better-auth/memory-adapter': 1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)
+      '@better-auth/mongo-adapter': 1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)
+      '@better-auth/prisma-adapter': 1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))(@better-auth/utils@0.3.1)
+      '@better-auth/telemetry': 1.5.5(@better-auth/core@1.5.5(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@cloudflare/workers-types@4.20260317.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.11)(nanostores@1.1.1))
+      '@better-auth/utils': 0.3.1
+      '@better-fetch/fetch': 1.1.21
+      '@noble/ciphers': 2.1.1
+      '@noble/hashes': 2.0.1
+      better-call: 1.3.2(zod@4.3.6)
+      defu: 6.1.4
+      jose: 6.1.3
+      kysely: 0.28.11
+      nanostores: 1.1.1
+      zod: 4.3.6
+    optionalDependencies:
+      drizzle-kit: 0.31.9
+      drizzle-orm: 0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0)
+      pg: 8.20.0
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      solid-js: 1.9.11
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2)
+    transitivePeerDependencies:
+      - '@cloudflare/workers-types'
+
+  better-call@1.3.2(zod@4.3.6):
+    dependencies:
+      '@better-auth/utils': 0.3.1
+      '@better-fetch/fetch': 1.1.21
+      rou3: 0.7.12
+      set-cookie-parser: 3.0.1
+    optionalDependencies:
+      zod: 4.3.6
+
+  better-sqlite3@11.10.0:
+    dependencies:
+      bindings: 1.5.0
+      prebuild-install: 7.1.3
+
   binary-extensions@2.3.0: {}
 
+  bindings@1.5.0:
+    dependencies:
+      file-uri-to-path: 1.0.0
+
+  bippy@0.5.32(@types/react@19.2.14)(react@19.2.4):
+    dependencies:
+      '@types/react-reconciler': 0.28.9(@types/react@19.2.14)
+      react: 19.2.4
+    transitivePeerDependencies:
+      - '@types/react'
+
   bl@4.1.0:
     dependencies:
       buffer: 5.7.1
@@ -7799,6 +10846,8 @@ snapshots:
       node-releases: 2.0.27
       update-browserslist-db: 1.2.3(browserslist@4.28.1)
 
+  buffer-from@1.1.2: {}
+
   buffer@5.6.0:
     dependencies:
       base64-js: 1.5.1
@@ -7812,6 +10861,10 @@ snapshots:
   buildcheck@0.0.7:
     optional: true
 
+  bun-types@1.3.10:
+    dependencies:
+      '@types/node': 24.10.9
+
   bundle-require@5.1.0(esbuild@0.27.3):
     dependencies:
       esbuild: 0.27.3
@@ -7841,21 +10894,25 @@ snapshots:
 
   caniuse-lite@1.0.30001766: {}
 
-  cbor-extract@2.2.0:
+  card-validator@6.2.0:
+    dependencies:
+      credit-card-type: 8.3.0
+
+  cbor-extract@2.2.1:
     dependencies:
       node-gyp-build-optional-packages: 5.1.1
     optionalDependencies:
-      '@cbor-extract/cbor-extract-darwin-arm64': 2.2.0
-      '@cbor-extract/cbor-extract-darwin-x64': 2.2.0
-      '@cbor-extract/cbor-extract-linux-arm': 2.2.0
-      '@cbor-extract/cbor-extract-linux-arm64': 2.2.0
-      '@cbor-extract/cbor-extract-linux-x64': 2.2.0
-      '@cbor-extract/cbor-extract-win32-x64': 2.2.0
+      '@cbor-extract/cbor-extract-darwin-arm64': 2.2.1
+      '@cbor-extract/cbor-extract-darwin-x64': 2.2.1
+      '@cbor-extract/cbor-extract-linux-arm': 2.2.1
+      '@cbor-extract/cbor-extract-linux-arm64': 2.2.1
+      '@cbor-extract/cbor-extract-linux-x64': 2.2.1
+      '@cbor-extract/cbor-extract-win32-x64': 2.2.1
     optional: true
 
-  cbor-x@1.6.0:
+  cbor-x@1.6.3:
     optionalDependencies:
-      cbor-extract: 2.2.0
+      cbor-extract: 2.2.1
 
   ccount@2.0.1: {}
 
@@ -7903,14 +10960,28 @@ snapshots:
 
   ci-info@4.3.1: {}
 
+  cjs-module-lexer@2.2.0: {}
+
+  clean-stack@5.3.0:
+    dependencies:
+      escape-string-regexp: 5.0.0
+
   cli-boxes@3.0.0: {}
 
+  cli-cursor@5.0.0:
+    dependencies:
+      restore-cursor: 5.1.0
+
+  cli-spinners@2.9.2: {}
+
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
+  clsx@1.2.1: {}
+
   clsx@2.1.1: {}
 
   color-convert@2.0.1:
@@ -7933,11 +11004,13 @@ snapshots:
 
   commander@4.1.1: {}
 
+  commander@7.2.0: {}
+
   common-ancestor-path@1.0.1: {}
 
   compare-versions@6.1.1: {}
 
-  computesdk@2.2.0:
+  computesdk@2.5.1:
     dependencies:
       '@computesdk/cmd': 0.4.1
 
@@ -7953,12 +11026,16 @@ snapshots:
 
   cookie-es@1.2.2: {}
 
+  cookie-es@2.0.0: {}
+
   cookie-signature@1.2.2: {}
 
   cookie@0.7.2: {}
 
   cookie@1.1.1: {}
 
+  core-js@2.6.12: {}
+
   cors@2.8.6:
     dependencies:
       object-assign: 4.1.1
@@ -7970,6 +11047,8 @@ snapshots:
       nan: 2.25.0
     optional: true
 
+  credit-card-type@8.3.0: {}
+
   cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
@@ -7980,6 +11059,11 @@ snapshots:
     dependencies:
       uncrypto: 0.1.3
 
+  css-in-js-utils@2.0.1:
+    dependencies:
+      hyphenate-style-name: 1.1.0
+      isobject: 3.0.1
+
   css-select@5.2.2:
     dependencies:
       boolbase: 1.0.0
@@ -8000,26 +11084,212 @@ snapshots:
 
   css-what@6.2.2: {}
 
+  csscolorparser@1.0.3: {}
+
   cssesc@3.0.0: {}
 
   csso@5.0.5:
     dependencies:
       css-tree: 2.2.1
 
+  cssstyle@4.6.0:
+    dependencies:
+      '@asamuzakjp/css-color': 3.2.0
+      rrweb-cssom: 0.8.0
+
+  csstype@2.6.11: {}
+
   csstype@3.2.3: {}
 
+  d3-array@3.2.4:
+    dependencies:
+      internmap: 2.0.3
+
+  d3-axis@3.0.0: {}
+
+  d3-brush@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+
+  d3-chord@3.0.1:
+    dependencies:
+      d3-path: 3.1.0
+
+  d3-color@3.1.0: {}
+
+  d3-contour@4.0.2:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-delaunay@6.0.4:
+    dependencies:
+      delaunator: 5.0.1
+
+  d3-dispatch@3.0.1: {}
+
+  d3-drag@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-selection: 3.0.0
+
+  d3-dsv@3.0.1:
+    dependencies:
+      commander: 7.2.0
+      iconv-lite: 0.6.3
+      rw: 1.3.3
+
+  d3-ease@3.0.1: {}
+
+  d3-fetch@3.0.1:
+    dependencies:
+      d3-dsv: 3.0.1
+
+  d3-force@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-quadtree: 3.0.1
+      d3-timer: 3.0.1
+
+  d3-format@3.1.2: {}
+
+  d3-geo@3.1.1:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-hierarchy@3.1.2: {}
+
+  d3-interpolate@3.0.1:
+    dependencies:
+      d3-color: 3.1.0
+
+  d3-path@3.1.0: {}
+
+  d3-polygon@3.0.1: {}
+
+  d3-quadtree@3.0.1: {}
+
+  d3-random@3.0.1: {}
+
+  d3-scale-chromatic@3.1.0:
+    dependencies:
+      d3-color: 3.1.0
+      d3-interpolate: 3.0.1
+
+  d3-scale@4.0.2:
+    dependencies:
+      d3-array: 3.2.4
+      d3-format: 3.1.2
+      d3-interpolate: 3.0.1
+      d3-time: 3.1.0
+      d3-time-format: 4.1.0
+
+  d3-selection@3.0.0: {}
+
+  d3-shape@3.2.0:
+    dependencies:
+      d3-path: 3.1.0
+
+  d3-time-format@4.1.0:
+    dependencies:
+      d3-time: 3.1.0
+
+  d3-time@3.1.0:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-timer@3.0.1: {}
+
+  d3-transition@3.0.1(d3-selection@3.0.0):
+    dependencies:
+      d3-color: 3.1.0
+      d3-dispatch: 3.0.1
+      d3-ease: 3.0.1
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-timer: 3.0.1
+
+  d3-zoom@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+
+  d3@7.9.0:
+    dependencies:
+      d3-array: 3.2.4
+      d3-axis: 3.0.0
+      d3-brush: 3.0.0
+      d3-chord: 3.0.1
+      d3-color: 3.1.0
+      d3-contour: 4.0.2
+      d3-delaunay: 6.0.4
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-dsv: 3.0.1
+      d3-ease: 3.0.1
+      d3-fetch: 3.0.1
+      d3-force: 3.0.0
+      d3-format: 3.1.2
+      d3-geo: 3.1.1
+      d3-hierarchy: 3.1.2
+      d3-interpolate: 3.0.1
+      d3-path: 3.1.0
+      d3-polygon: 3.0.1
+      d3-quadtree: 3.0.1
+      d3-random: 3.0.1
+      d3-scale: 4.0.2
+      d3-scale-chromatic: 3.1.0
+      d3-selection: 3.0.0
+      d3-shape: 3.2.0
+      d3-time: 3.1.0
+      d3-time-format: 4.1.0
+      d3-timer: 3.0.1
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+      d3-zoom: 3.0.0
+
+  data-urls@5.0.0:
+    dependencies:
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.2.0
+
+  date-fns-tz@1.3.8(date-fns@2.30.0):
+    dependencies:
+      date-fns: 2.30.0
+
+  date-fns@2.30.0:
+    dependencies:
+      '@babel/runtime': 7.28.6
+
   debug@4.4.3:
     dependencies:
       ms: 2.1.3
 
+  decimal.js@10.6.0: {}
+
   decode-named-character-reference@1.3.0:
     dependencies:
       character-entities: 2.0.2
 
+  decompress-response@6.0.0:
+    dependencies:
+      mimic-response: 3.1.0
+
   deep-eql@5.0.2: {}
 
+  deep-extend@0.6.0: {}
+
   defu@6.1.4: {}
 
+  delaunator@5.0.1:
+    dependencies:
+      robust-predicates: 3.0.2
+
   delayed-stream@1.0.0: {}
 
   depd@2.0.0: {}
@@ -8030,6 +11300,8 @@ snapshots:
 
   detect-libc@2.1.2: {}
 
+  detect-node-es@1.1.0: {}
+
   deterministic-object-hash@2.0.2:
     dependencies:
       base-64: 1.0.0
@@ -8072,6 +11344,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  dom-helpers@5.2.1:
+    dependencies:
+      '@babel/runtime': 7.28.6
+      csstype: 3.2.3
+
   dom-serializer@2.0.0:
     dependencies:
       domelementtype: 2.3.0
@@ -8092,6 +11369,26 @@ snapshots:
 
   dotenv@17.2.3: {}
 
+  drizzle-kit@0.31.9:
+    dependencies:
+      '@drizzle-team/brocli': 0.10.2
+      '@esbuild-kit/esm-loader': 2.6.5
+      esbuild: 0.25.12
+      esbuild-register: 3.6.0(esbuild@0.25.12)
+    transitivePeerDependencies:
+      - supports-color
+
+  drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0):
+    optionalDependencies:
+      '@cloudflare/workers-types': 4.20260317.1
+      '@opentelemetry/api': 1.9.0
+      '@types/better-sqlite3': 7.6.13
+      '@types/pg': 8.18.0
+      better-sqlite3: 11.10.0
+      bun-types: 1.3.10
+      kysely: 0.28.11
+      pg: 8.20.0
+
   dset@3.1.4: {}
 
   dunder-proto@1.0.1:
@@ -8111,7 +11408,9 @@ snapshots:
       glob: 11.1.0
       openapi-fetch: 0.14.1
       platform: 1.3.6
-      tar: 7.5.6
+      tar: 7.5.7
+
+  earcut@2.2.4: {}
 
   eastasianwidth@0.2.0: {}
 
@@ -8154,6 +11453,38 @@ snapshots:
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
+  esbuild-register@3.6.0(esbuild@0.25.12):
+    dependencies:
+      debug: 4.4.3
+      esbuild: 0.25.12
+    transitivePeerDependencies:
+      - supports-color
+
+  esbuild@0.18.20:
+    optionalDependencies:
+      '@esbuild/android-arm': 0.18.20
+      '@esbuild/android-arm64': 0.18.20
+      '@esbuild/android-x64': 0.18.20
+      '@esbuild/darwin-arm64': 0.18.20
+      '@esbuild/darwin-x64': 0.18.20
+      '@esbuild/freebsd-arm64': 0.18.20
+      '@esbuild/freebsd-x64': 0.18.20
+      '@esbuild/linux-arm': 0.18.20
+      '@esbuild/linux-arm64': 0.18.20
+      '@esbuild/linux-ia32': 0.18.20
+      '@esbuild/linux-loong64': 0.18.20
+      '@esbuild/linux-mips64el': 0.18.20
+      '@esbuild/linux-ppc64': 0.18.20
+      '@esbuild/linux-riscv64': 0.18.20
+      '@esbuild/linux-s390x': 0.18.20
+      '@esbuild/linux-x64': 0.18.20
+      '@esbuild/netbsd-x64': 0.18.20
+      '@esbuild/openbsd-x64': 0.18.20
+      '@esbuild/sunos-x64': 0.18.20
+      '@esbuild/win32-arm64': 0.18.20
+      '@esbuild/win32-ia32': 0.18.20
+      '@esbuild/win32-x64': 0.18.20
+
   esbuild@0.21.5:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.21.5
@@ -8209,64 +11540,6 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.12
       '@esbuild/win32-x64': 0.25.12
 
-  esbuild@0.27.0:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.0
-      '@esbuild/android-arm': 0.27.0
-      '@esbuild/android-arm64': 0.27.0
-      '@esbuild/android-x64': 0.27.0
-      '@esbuild/darwin-arm64': 0.27.0
-      '@esbuild/darwin-x64': 0.27.0
-      '@esbuild/freebsd-arm64': 0.27.0
-      '@esbuild/freebsd-x64': 0.27.0
-      '@esbuild/linux-arm': 0.27.0
-      '@esbuild/linux-arm64': 0.27.0
-      '@esbuild/linux-ia32': 0.27.0
-      '@esbuild/linux-loong64': 0.27.0
-      '@esbuild/linux-mips64el': 0.27.0
-      '@esbuild/linux-ppc64': 0.27.0
-      '@esbuild/linux-riscv64': 0.27.0
-      '@esbuild/linux-s390x': 0.27.0
-      '@esbuild/linux-x64': 0.27.0
-      '@esbuild/netbsd-arm64': 0.27.0
-      '@esbuild/netbsd-x64': 0.27.0
-      '@esbuild/openbsd-arm64': 0.27.0
-      '@esbuild/openbsd-x64': 0.27.0
-      '@esbuild/openharmony-arm64': 0.27.0
-      '@esbuild/sunos-x64': 0.27.0
-      '@esbuild/win32-arm64': 0.27.0
-      '@esbuild/win32-ia32': 0.27.0
-      '@esbuild/win32-x64': 0.27.0
-
-  esbuild@0.27.2:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.2
-      '@esbuild/android-arm': 0.27.2
-      '@esbuild/android-arm64': 0.27.2
-      '@esbuild/android-x64': 0.27.2
-      '@esbuild/darwin-arm64': 0.27.2
-      '@esbuild/darwin-x64': 0.27.2
-      '@esbuild/freebsd-arm64': 0.27.2
-      '@esbuild/freebsd-x64': 0.27.2
-      '@esbuild/linux-arm': 0.27.2
-      '@esbuild/linux-arm64': 0.27.2
-      '@esbuild/linux-ia32': 0.27.2
-      '@esbuild/linux-loong64': 0.27.2
-      '@esbuild/linux-mips64el': 0.27.2
-      '@esbuild/linux-ppc64': 0.27.2
-      '@esbuild/linux-riscv64': 0.27.2
-      '@esbuild/linux-s390x': 0.27.2
-      '@esbuild/linux-x64': 0.27.2
-      '@esbuild/netbsd-arm64': 0.27.2
-      '@esbuild/netbsd-x64': 0.27.2
-      '@esbuild/openbsd-arm64': 0.27.2
-      '@esbuild/openbsd-x64': 0.27.2
-      '@esbuild/openharmony-arm64': 0.27.2
-      '@esbuild/sunos-x64': 0.27.2
-      '@esbuild/win32-arm64': 0.27.2
-      '@esbuild/win32-ia32': 0.27.2
-      '@esbuild/win32-x64': 0.27.2
-
   esbuild@0.27.3:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.27.3
@@ -8296,6 +11569,35 @@ snapshots:
       '@esbuild/win32-ia32': 0.27.3
       '@esbuild/win32-x64': 0.27.3
 
+  esbuild@0.27.4:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.27.4
+      '@esbuild/android-arm': 0.27.4
+      '@esbuild/android-arm64': 0.27.4
+      '@esbuild/android-x64': 0.27.4
+      '@esbuild/darwin-arm64': 0.27.4
+      '@esbuild/darwin-x64': 0.27.4
+      '@esbuild/freebsd-arm64': 0.27.4
+      '@esbuild/freebsd-x64': 0.27.4
+      '@esbuild/linux-arm': 0.27.4
+      '@esbuild/linux-arm64': 0.27.4
+      '@esbuild/linux-ia32': 0.27.4
+      '@esbuild/linux-loong64': 0.27.4
+      '@esbuild/linux-mips64el': 0.27.4
+      '@esbuild/linux-ppc64': 0.27.4
+      '@esbuild/linux-riscv64': 0.27.4
+      '@esbuild/linux-s390x': 0.27.4
+      '@esbuild/linux-x64': 0.27.4
+      '@esbuild/netbsd-arm64': 0.27.4
+      '@esbuild/netbsd-x64': 0.27.4
+      '@esbuild/openbsd-arm64': 0.27.4
+      '@esbuild/openbsd-x64': 0.27.4
+      '@esbuild/openharmony-arm64': 0.27.4
+      '@esbuild/sunos-x64': 0.27.4
+      '@esbuild/win32-arm64': 0.27.4
+      '@esbuild/win32-ia32': 0.27.4
+      '@esbuild/win32-x64': 0.27.4
+
   escalade@3.2.0: {}
 
   escape-html@1.0.3: {}
@@ -8326,6 +11628,18 @@ snapshots:
     dependencies:
       eventsource-parser: 3.0.6
 
+  execa@6.1.0:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 6.0.1
+      human-signals: 3.0.1
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.3.0
+      onetime: 6.0.0
+      signal-exit: 3.0.7
+      strip-final-newline: 3.0.0
+
   execa@8.0.1:
     dependencies:
       cross-spawn: 7.0.6
@@ -8338,6 +11652,8 @@ snapshots:
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
 
+  expand-template@2.0.3: {}
+
   expand-tilde@2.0.2:
     dependencies:
       homedir-polyfill: 1.0.3
@@ -8408,10 +11724,18 @@ snapshots:
     dependencies:
       reusify: 1.1.0
 
+  fdb-tuple@1.0.0: {}
+
   fdir@6.5.0(picomatch@4.0.3):
     optionalDependencies:
       picomatch: 4.0.3
 
+  file-selector@0.1.19:
+    dependencies:
+      tslib: 2.8.1
+
+  file-uri-to-path@1.0.0: {}
+
   fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
@@ -8433,8 +11757,21 @@ snapshots:
       mlly: 1.8.0
       rollup: 4.56.0
 
+  fkill@9.0.0:
+    dependencies:
+      aggregate-error: 5.0.0
+      execa: 8.0.1
+      pid-port: 1.0.2
+      process-exists: 5.0.0
+      ps-list: 8.1.1
+      taskkill: 5.0.0
+
   flattie@1.1.1: {}
 
+  focus-lock@1.3.6:
+    dependencies:
+      tslib: 2.8.1
+
   follow-redirects@1.15.11: {}
 
   fontace@0.4.0:
@@ -8458,6 +11795,8 @@ snapshots:
       hasown: 2.0.2
       mime-types: 2.1.35
 
+  forwarded-parse@2.1.2: {}
+
   forwarded@0.2.0: {}
 
   fraction.js@5.3.4: {}
@@ -8482,6 +11821,8 @@ snapshots:
 
   gensync@1.0.0-beta.2: {}
 
+  geojson-vt@3.2.1: {}
+
   get-caller-file@2.0.5: {}
 
   get-east-asian-width@1.4.0: {}
@@ -8506,14 +11847,22 @@ snapshots:
       dunder-proto: 1.0.1
       es-object-atoms: 1.1.1
 
+  get-stream@6.0.1: {}
+
   get-stream@8.0.1: {}
 
   get-tsconfig@4.13.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
+  ghostty-web@0.4.0: {}
+
+  github-from-package@0.0.0: {}
+
   github-slugger@2.0.0: {}
 
+  gl-matrix@3.4.4: {}
+
   glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
@@ -8542,6 +11891,8 @@ snapshots:
 
   gopd@1.2.0: {}
 
+  grid-index@1.1.0: {}
+
   h3@1.15.5:
     dependencies:
       cookie-es: 1.2.2
@@ -8554,6 +11905,8 @@ snapshots:
       ufo: 1.6.3
       uncrypto: 0.1.3
 
+  hammerjs@2.0.8: {}
+
   has-symbols@1.1.0: {}
 
   has-tostringtag@1.0.2:
@@ -8657,6 +12010,12 @@ snapshots:
 
   hono@4.11.8: {}
 
+  hono@4.12.2: {}
+
+  html-encoding-sniffer@4.0.0:
+    dependencies:
+      whatwg-encoding: 3.1.1
+
   html-escaper@3.0.3: {}
 
   html-void-elements@3.0.0: {}
@@ -8671,18 +12030,59 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
+  http-proxy-agent@7.0.2:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  https-proxy-agent@7.0.6:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  human-signals@3.0.1: {}
+
   human-signals@5.0.0: {}
 
+  hyphenate-style-name@1.1.0: {}
+
+  iconv-lite@0.6.3:
+    dependencies:
+      safer-buffer: 2.1.2
+
   iconv-lite@0.7.2:
     dependencies:
       safer-buffer: 2.1.2
 
   ieee754@1.2.1: {}
 
+  ignore@7.0.5: {}
+
+  import-in-the-middle@2.0.6:
+    dependencies:
+      acorn: 8.15.0
+      acorn-import-attributes: 1.9.5(acorn@8.15.0)
+      cjs-module-lexer: 2.2.0
+      module-details-from-path: 1.0.4
+
   import-meta-resolve@4.2.0: {}
 
+  indent-string@5.0.0: {}
+
   inherits@2.0.4: {}
 
+  ini@1.3.8: {}
+
+  inline-style-prefixer@5.1.2:
+    dependencies:
+      css-in-js-utils: 2.0.1
+
+  internmap@2.0.3: {}
+
   invariant@2.2.4:
     dependencies:
       loose-envify: 1.4.0
@@ -8715,22 +12115,34 @@ snapshots:
     dependencies:
       is-docker: 3.0.0
 
-  is-network-error@1.3.0: {}
+  is-interactive@2.0.0: {}
+
+  is-network-error@1.3.1: {}
 
   is-number@7.0.0: {}
 
   is-plain-obj@4.1.0: {}
 
+  is-potential-custom-element-name@1.0.1: {}
+
   is-promise@4.0.0: {}
 
   is-stream@3.0.0: {}
 
+  is-unicode-supported@1.3.0: {}
+
+  is-unicode-supported@2.1.0: {}
+
   is-wsl@3.1.0:
     dependencies:
       is-inside-container: 1.0.0
 
+  isbot@5.1.35: {}
+
   isexe@2.0.0: {}
 
+  isobject@3.0.1: {}
+
   isomorphic-ws@5.0.0(ws@8.19.0):
     dependencies:
       ws: 8.19.0
@@ -8759,6 +12171,33 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  jsdom@26.1.0:
+    dependencies:
+      cssstyle: 4.6.0
+      data-urls: 5.0.0
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 4.0.0
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.6
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.23
+      parse5: 7.3.0
+      rrweb-cssom: 0.8.0
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 5.1.2
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 3.1.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.2.0
+      ws: 8.19.0
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
   jsesc@3.1.0: {}
 
   json-schema-traverse@1.0.0: {}
@@ -8767,12 +12206,63 @@ snapshots:
 
   json5@2.2.3: {}
 
+  jsonc-parser@3.3.1: {}
+
   jsonlines@0.1.1: {}
 
+  just-extend@4.1.1: {}
+
+  kdbush@3.0.0: {}
+
   kleur@3.0.3: {}
 
   kleur@4.1.5: {}
 
+  kysely@0.28.11: {}
+
+  lefthook-darwin-arm64@2.1.3:
+    optional: true
+
+  lefthook-darwin-x64@2.1.3:
+    optional: true
+
+  lefthook-freebsd-arm64@2.1.3:
+    optional: true
+
+  lefthook-freebsd-x64@2.1.3:
+    optional: true
+
+  lefthook-linux-arm64@2.1.3:
+    optional: true
+
+  lefthook-linux-x64@2.1.3:
+    optional: true
+
+  lefthook-openbsd-arm64@2.1.3:
+    optional: true
+
+  lefthook-openbsd-x64@2.1.3:
+    optional: true
+
+  lefthook-windows-arm64@2.1.3:
+    optional: true
+
+  lefthook-windows-x64@2.1.3:
+    optional: true
+
+  lefthook@2.1.3:
+    optionalDependencies:
+      lefthook-darwin-arm64: 2.1.3
+      lefthook-darwin-x64: 2.1.3
+      lefthook-freebsd-arm64: 2.1.3
+      lefthook-freebsd-x64: 2.1.3
+      lefthook-linux-arm64: 2.1.3
+      lefthook-linux-x64: 2.1.3
+      lefthook-openbsd-arm64: 2.1.3
+      lefthook-openbsd-x64: 2.1.3
+      lefthook-windows-arm64: 2.1.3
+      lefthook-windows-x64: 2.1.3
+
   lilconfig@3.1.3: {}
 
   lines-and-columns@1.2.4: {}
@@ -8781,6 +12271,11 @@ snapshots:
 
   lodash.camelcase@4.3.0: {}
 
+  log-symbols@6.0.0:
+    dependencies:
+      chalk: 5.6.2
+      is-unicode-supported: 1.3.0
+
   long@5.3.2: {}
 
   longest-streak@3.1.0: {}
@@ -8807,6 +12302,10 @@ snapshots:
     dependencies:
       react: 19.2.4
 
+  lucide-react@0.542.0(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+
   magic-string@0.30.21:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -8817,6 +12316,31 @@ snapshots:
       '@babel/types': 7.28.6
       source-map-js: 1.2.1
 
+  mapbox-gl@1.13.3:
+    dependencies:
+      '@mapbox/geojson-rewind': 0.5.2
+      '@mapbox/geojson-types': 1.0.2
+      '@mapbox/jsonlint-lines-primitives': 2.0.2
+      '@mapbox/mapbox-gl-supported': 1.5.0(mapbox-gl@1.13.3)
+      '@mapbox/point-geometry': 0.1.0
+      '@mapbox/tiny-sdf': 1.2.5
+      '@mapbox/unitbezier': 0.0.0
+      '@mapbox/vector-tile': 1.3.1
+      '@mapbox/whoots-js': 3.1.0
+      csscolorparser: 1.0.3
+      earcut: 2.2.4
+      geojson-vt: 3.2.1
+      gl-matrix: 3.4.4
+      grid-index: 1.1.0
+      murmurhash-js: 1.0.0
+      pbf: 3.3.0
+      potpack: 1.0.2
+      quickselect: 2.0.0
+      rw: 1.3.3
+      supercluster: 7.1.5
+      tinyqueue: 2.0.3
+      vt-pbf: 3.1.3
+
   markdown-table@3.0.4: {}
 
   math-intrinsics@1.1.0: {}
@@ -8947,6 +12471,8 @@ snapshots:
 
   media-typer@1.1.0: {}
 
+  memoize-one@5.0.0: {}
+
   merge-descriptors@2.0.0: {}
 
   merge-stream@2.0.0: {}
@@ -9163,12 +12689,16 @@ snapshots:
 
   mimic-fn@4.0.0: {}
 
-  miniflare@4.20260205.0:
+  mimic-function@5.0.1: {}
+
+  mimic-response@3.1.0: {}
+
+  miniflare@4.20260312.1:
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       sharp: 0.34.5
       undici: 7.18.2
-      workerd: 1.20260205.0
+      workerd: 1.20260312.1
       ws: 8.18.0
       youch: 4.1.0-beta.10
     transitivePeerDependencies:
@@ -9183,12 +12713,19 @@ snapshots:
     dependencies:
       brace-expansion: 2.0.2
 
+  minimist@1.2.8: {}
+
   minipass@7.1.2: {}
 
   minizlib@3.1.0:
     dependencies:
       minipass: 7.1.2
 
+  mjolnir.js@2.7.3:
+    dependencies:
+      '@types/hammerjs': 2.0.46
+      hammerjs: 2.0.8
+
   mkdirp-classic@0.5.3: {}
 
   mlly@1.8.0:
@@ -9198,6 +12735,21 @@ snapshots:
       pkg-types: 1.3.1
       ufo: 1.6.3
 
+  mockdate@2.0.5: {}
+
+  modal@0.7.3:
+    dependencies:
+      cbor-x: 1.6.3
+      long: 5.3.2
+      nice-grpc: 2.1.14
+      protobufjs: 7.5.4
+      smol-toml: 1.6.0
+      uuid: 11.1.0
+
+  module-details-from-path@1.0.4: {}
+
+  moment@2.30.1: {}
+
   motion-dom@12.29.2:
     dependencies:
       motion-utils: 12.29.2
@@ -9208,6 +12760,8 @@ snapshots:
 
   ms@2.1.3: {}
 
+  murmurhash-js@1.0.0: {}
+
   mz@2.7.0:
     dependencies:
       any-promise: 1.3.0
@@ -9221,14 +12775,32 @@ snapshots:
 
   nanoid@3.3.11: {}
 
+  nanostores@1.1.1: {}
+
+  napi-build-utils@2.0.0: {}
+
   negotiator@1.0.0: {}
 
   neotraverse@0.6.18: {}
 
+  nice-grpc-common@2.0.2:
+    dependencies:
+      ts-error: 1.0.6
+
+  nice-grpc@2.1.14:
+    dependencies:
+      '@grpc/grpc-js': 1.14.3
+      abort-controller-x: 0.4.3
+      nice-grpc-common: 2.0.2
+
   nlcst-to-string@4.0.0:
     dependencies:
       '@types/nlcst': 2.0.3
 
+  node-abi@3.87.0:
+    dependencies:
+      semver: 7.7.3
+
   node-fetch-native@1.6.7: {}
 
   node-gyp-build-optional-packages@5.1.1:
@@ -9250,6 +12822,8 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
+  nwsapi@2.2.23: {}
+
   object-assign@4.1.1: {}
 
   object-hash@3.0.0: {}
@@ -9278,6 +12852,10 @@ snapshots:
     dependencies:
       mimic-fn: 4.0.0
 
+  onetime@7.0.0:
+    dependencies:
+      mimic-function: 5.0.1
+
   oniguruma-parser@0.12.1: {}
 
   oniguruma-to-es@4.3.4:
@@ -9305,6 +12883,18 @@ snapshots:
     dependencies:
       yaml: 2.8.2
 
+  ora@8.2.0:
+    dependencies:
+      chalk: 5.6.2
+      cli-cursor: 5.0.0
+      cli-spinners: 2.9.2
+      is-interactive: 2.0.0
+      is-unicode-supported: 2.1.0
+      log-symbols: 6.0.0
+      stdin-discarder: 0.2.2
+      string-width: 7.2.0
+      strip-ansi: 7.1.2
+
   os-paths@4.4.0: {}
 
   p-limit@6.2.0:
@@ -9319,7 +12909,7 @@ snapshots:
   p-retry@6.2.1:
     dependencies:
       '@types/retry': 0.12.2
-      is-network-error: 1.3.0
+      is-network-error: 1.3.1
       retry: 0.13.1
 
   p-timeout@6.1.4: {}
@@ -9369,19 +12959,26 @@ snapshots:
 
   pathval@2.0.1: {}
 
+  pbf@3.3.0:
+    dependencies:
+      ieee754: 1.2.1
+      resolve-protobuf-schema: 2.1.0
+
   pg-cloudflare@1.3.0:
     optional: true
 
-  pg-connection-string@2.11.0: {}
+  pg-connection-string@2.12.0: {}
 
   pg-int8@1.0.1: {}
 
-  pg-pool@3.11.0(pg@8.18.0):
+  pg-pool@3.13.0(pg@8.20.0):
     dependencies:
-      pg: 8.18.0
+      pg: 8.20.0
 
   pg-protocol@1.11.0: {}
 
+  pg-protocol@1.13.0: {}
+
   pg-types@2.2.0:
     dependencies:
       pg-int8: 1.0.1
@@ -9390,11 +12987,11 @@ snapshots:
       postgres-date: 1.0.7
       postgres-interval: 1.2.0
 
-  pg@8.18.0:
+  pg@8.20.0:
     dependencies:
-      pg-connection-string: 2.11.0
-      pg-pool: 3.11.0(pg@8.18.0)
-      pg-protocol: 1.11.0
+      pg-connection-string: 2.12.0
+      pg-pool: 3.13.0(pg@8.20.0)
+      pg-protocol: 1.13.0
       pg-types: 2.2.0
       pgpass: 1.0.5
     optionalDependencies:
@@ -9412,14 +13009,36 @@ snapshots:
 
   picomatch@4.0.3: {}
 
+  pid-port@1.0.2:
+    dependencies:
+      execa: 8.0.1
+
   pify@2.3.0: {}
 
   pino-abstract-transport@2.0.0:
     dependencies:
       split2: 4.2.0
 
+  pino-abstract-transport@3.0.0:
+    dependencies:
+      split2: 4.2.0
+
   pino-std-serializers@7.1.0: {}
 
+  pino@10.3.1:
+    dependencies:
+      '@pinojs/redact': 0.4.0
+      atomic-sleep: 1.0.0
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 3.0.0
+      pino-std-serializers: 7.1.0
+      process-warning: 5.0.0
+      quick-format-unescaped: 4.0.4
+      real-require: 0.2.0
+      safe-stable-stringify: 2.5.0
+      sonic-boom: 4.2.1
+      thread-stream: 4.0.0
+
   pino@9.14.0:
     dependencies:
       '@pinojs/redact': 0.4.0
@@ -9446,6 +13065,12 @@ snapshots:
 
   platform@1.3.6: {}
 
+  polished@4.3.1:
+    dependencies:
+      '@babel/runtime': 7.28.6
+
+  popper.js@1.16.1: {}
+
   postcss-import@15.1.0(postcss@8.5.6):
     dependencies:
       postcss: 8.5.6
@@ -9502,8 +13127,29 @@ snapshots:
     dependencies:
       xtend: 4.0.2
 
+  potpack@1.0.2: {}
+
+  prebuild-install@7.1.3:
+    dependencies:
+      detect-libc: 2.1.2
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.8
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 2.0.0
+      node-abi: 3.87.0
+      pump: 3.0.3
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.4
+      tunnel-agent: 0.6.0
+
   prismjs@1.30.0: {}
 
+  process-exists@5.0.0:
+    dependencies:
+      ps-list: 8.1.1
+
   process-warning@5.0.0: {}
 
   prompts@2.4.2:
@@ -9511,6 +13157,18 @@ snapshots:
       kleur: 3.0.3
       sisteransi: 1.0.5
 
+  prop-types-extra@1.1.1(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      react-is: 16.13.1
+      warning: 4.0.3
+
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
   property-information@7.1.0: {}
 
   protobufjs@7.5.4:
@@ -9525,9 +13183,11 @@ snapshots:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 25.2.3
+      '@types/node': 24.10.9
       long: 5.3.2
 
+  protocol-buffers-schema@3.6.0: {}
+
   proxy-addr@2.0.7:
     dependencies:
       forwarded: 0.2.0
@@ -9535,11 +13195,15 @@ snapshots:
 
   proxy-from-env@1.1.0: {}
 
+  ps-list@8.1.1: {}
+
   pump@3.0.3:
     dependencies:
       end-of-stream: 1.4.5
       once: 1.4.0
 
+  punycode@2.3.1: {}
+
   qs@6.14.1:
     dependencies:
       side-channel: 1.1.0
@@ -9548,6 +13212,8 @@ snapshots:
 
   quick-format-unescaped@4.0.4: {}
 
+  quickselect@2.0.0: {}
+
   radix3@1.1.2: {}
 
   range-parser@1.2.1: {}
@@ -9559,6 +13225,18 @@ snapshots:
       iconv-lite: 0.7.2
       unpipe: 1.0.0
 
+  rc@1.2.8:
+    dependencies:
+      deep-extend: 0.6.0
+      ini: 1.3.8
+      minimist: 1.2.8
+      strip-json-comments: 2.0.1
+
+  react-clientside-effect@1.2.8(react@19.2.4):
+    dependencies:
+      '@babel/runtime': 7.28.6
+      react: 19.2.4
+
   react-dom@18.3.1(react@18.3.1):
     dependencies:
       loose-envify: 1.4.0
@@ -9570,8 +13248,114 @@ snapshots:
       react: 19.2.4
       scheduler: 0.27.0
 
+  react-dropzone@9.0.0(react@19.2.4):
+    dependencies:
+      attr-accept: 1.1.3
+      file-selector: 0.1.19
+      prop-types: 15.8.1
+      prop-types-extra: 1.1.1(react@19.2.4)
+      react: 19.2.4
+
+  react-focus-lock@2.13.7(@types/react@19.2.14)(react@19.2.4):
+    dependencies:
+      '@babel/runtime': 7.28.6
+      focus-lock: 1.3.6
+      prop-types: 15.8.1
+      react: 19.2.4
+      react-clientside-effect: 1.2.8(react@19.2.4)
+      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.4)
+      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.4)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  react-grab@0.1.27(@types/react@19.2.14)(react@19.2.4):
+    dependencies:
+      '@medv/finder': 4.0.2
+      '@react-grab/cli': 0.1.27
+      bippy: 0.5.32(@types/react@19.2.14)(react@19.2.4)
+      solid-js: 1.9.11
+    optionalDependencies:
+      react: 19.2.4
+    transitivePeerDependencies:
+      - '@types/react'
+
+  react-hook-form@7.71.2(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+
+  react-input-mask@2.0.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      invariant: 2.2.4
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      warning: 4.0.3
+
+  react-is@16.13.1: {}
+
+  react-is@17.0.2: {}
+
+  react-lifecycles-compat@3.0.4: {}
+
+  react-map-gl@5.2.13(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      '@babel/runtime': 7.28.6
+      mapbox-gl: 1.13.3
+      mjolnir.js: 2.7.3
+      prop-types: 15.8.1
+      react: 19.2.4
+      react-virtualized-auto-sizer: 1.0.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      viewport-mercator-project: 7.0.4
+    transitivePeerDependencies:
+      - react-dom
+
+  react-movable@3.4.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
+  react-multi-ref@1.0.2:
+    dependencies:
+      '@babel/runtime': 7.28.6
+
+  react-range@1.10.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
   react-refresh@0.17.0: {}
 
+  react-refresh@0.18.0: {}
+
+  react-uid@2.3.0(@types/react@19.2.14)(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      tslib: 1.14.1
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  react-virtualized-auto-sizer@1.0.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
+  react-virtualized@9.22.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      '@babel/runtime': 7.28.6
+      clsx: 1.2.1
+      dom-helpers: 5.2.1
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      react-lifecycles-compat: 3.0.4
+
+  react-window@1.8.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+    dependencies:
+      '@babel/runtime': 7.28.6
+      memoize-one: 5.0.0
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+
   react@18.3.1:
     dependencies:
       loose-envify: 1.4.0
@@ -9678,16 +13462,34 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  require-in-the-middle@8.0.1:
+    dependencies:
+      debug: 4.4.3
+      module-details-from-path: 1.0.4
+    transitivePeerDependencies:
+      - supports-color
+
+  resize-observer-polyfill@1.5.1: {}
+
   resolve-from@5.0.0: {}
 
   resolve-pkg-maps@1.0.0: {}
 
+  resolve-protobuf-schema@2.1.0:
+    dependencies:
+      protocol-buffers-schema: 3.6.0
+
   resolve@1.22.11:
     dependencies:
       is-core-module: 2.16.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  restore-cursor@5.1.0:
+    dependencies:
+      onetime: 7.0.0
+      signal-exit: 4.1.0
+
   retext-latin@4.0.0:
     dependencies:
       '@types/nlcst': 2.0.3
@@ -9717,33 +13519,81 @@ snapshots:
 
   reusify@1.1.0: {}
 
-  rivetkit@2.0.42(@hono/node-server@1.19.9(hono@4.11.8))(@standard-schema/spec@1.0.0)(ws@8.19.0):
+  rivetkit@2.1.6(@hono/node-server@1.19.9(hono@4.12.2))(@hono/node-ws@1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2))(@standard-schema/spec@1.1.0)(drizzle-kit@0.31.9)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))(ws@8.19.0):
     dependencies:
-      '@hono/standard-validator': 0.1.5(@standard-schema/spec@1.0.0)(hono@4.11.8)
-      '@hono/zod-openapi': 1.2.1(hono@4.11.8)(zod@4.3.6)
+      '@hono/standard-validator': 0.1.5(@standard-schema/spec@1.1.0)(hono@4.12.2)
+      '@hono/zod-openapi': 1.2.2(hono@4.12.2)(zod@4.3.6)
       '@rivetkit/bare-ts': 0.6.2
-      '@rivetkit/engine-runner': 2.0.42
+      '@rivetkit/engine-runner': 2.1.6
       '@rivetkit/fast-json-patch': 3.1.2
       '@rivetkit/on-change': 6.0.2-rc.1
+      '@rivetkit/sqlite': 0.1.1
+      '@rivetkit/sqlite-vfs': 2.1.6
+      '@rivetkit/traces': 2.1.6
       '@rivetkit/virtual-websocket': 2.0.33
-      cbor-x: 1.6.0
+      '@rivetkit/workflow-engine': 2.1.6
+      cbor-x: 1.6.3
       get-port: 7.1.0
-      hono: 4.11.8
+      hono: 4.12.2
       invariant: 2.2.4
       nanoevents: 9.1.0
       p-retry: 6.2.1
       pino: 9.14.0
+      tar: 7.5.7
       uuid: 12.0.0
       vbare: 0.0.4
       zod: 4.3.6
     optionalDependencies:
-      '@hono/node-server': 1.19.9(hono@4.11.8)
+      '@hono/node-server': 1.19.9(hono@4.12.2)
+      '@hono/node-ws': 1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2)
+      drizzle-kit: 0.31.9
+      drizzle-orm: 0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0)
       ws: 8.19.0
     transitivePeerDependencies:
       - '@standard-schema/spec'
       - bufferutil
       - utf-8-validate
 
+  rivetkit@https://pkg.pr.new/rivet-dev/rivet/rivetkit@791500a(@e2b/code-interpreter@2.3.3)(@hono/node-server@1.19.9(hono@4.12.2))(@hono/node-ws@1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2))(@standard-schema/spec@1.1.0)(dockerode@4.0.9)(drizzle-kit@0.31.9)(drizzle-orm@0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0))(ws@8.19.0):
+    dependencies:
+      '@hono/standard-validator': 0.1.5(@standard-schema/spec@1.1.0)(hono@4.12.2)
+      '@hono/zod-openapi': 1.2.2(hono@4.12.2)(zod@4.3.6)
+      '@rivetkit/bare-ts': 0.6.2
+      '@rivetkit/engine-runner': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      '@rivetkit/fast-json-patch': 3.1.2
+      '@rivetkit/on-change': 6.0.2-rc.1
+      '@rivetkit/sqlite': 0.1.1
+      '@rivetkit/sqlite-vfs': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/sqlite-vfs@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      '@rivetkit/traces': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/traces@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      '@rivetkit/virtual-websocket': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/virtual-websocket@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      '@rivetkit/workflow-engine': https://pkg.pr.new/rivet-dev/rivet/@rivetkit/workflow-engine@791500a6eb11c29133c3cbe14511f3b6ebf9d5bd
+      cbor-x: 1.6.3
+      get-port: 7.1.0
+      hono: 4.12.2
+      invariant: 2.2.4
+      nanoevents: 9.1.0
+      p-retry: 6.2.1
+      pino: 9.14.0
+      sandbox-agent: 0.3.2(zod@4.3.6)
+      tar: 7.5.7
+      uuid: 12.0.0
+      vbare: 0.0.4
+      zod: 4.3.6
+    optionalDependencies:
+      '@e2b/code-interpreter': 2.3.3
+      '@hono/node-server': 1.19.9(hono@4.12.2)
+      '@hono/node-ws': 1.3.0(@hono/node-server@1.19.9(hono@4.12.2))(hono@4.12.2)
+      dockerode: 4.0.9
+      drizzle-kit: 0.31.9
+      drizzle-orm: 0.44.7(@cloudflare/workers-types@4.20260317.1)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.18.0)(better-sqlite3@11.10.0)(bun-types@1.3.10)(kysely@0.28.11)(pg@8.20.0)
+      ws: 8.19.0
+    transitivePeerDependencies:
+      - '@standard-schema/spec'
+      - bufferutil
+      - utf-8-validate
+
+  robust-predicates@3.0.2: {}
+
   rollup@4.56.0:
     dependencies:
       '@types/estree': 1.0.8
@@ -9775,6 +13625,8 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.56.0
       fsevents: 2.3.3
 
+  rou3@0.7.12: {}
+
   router@2.2.0:
     dependencies:
       debug: 4.4.3
@@ -9785,18 +13637,35 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  rrweb-cssom@0.8.0: {}
+
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
 
+  rw@1.3.3: {}
+
   safe-buffer@5.2.1: {}
 
   safe-stable-stringify@2.5.0: {}
 
   safer-buffer@2.1.2: {}
 
+  sandbox-agent@0.3.2(zod@4.3.6):
+    dependencies:
+      '@sandbox-agent/cli-shared': 0.3.2
+      acp-http-client: 0.3.2(zod@4.3.6)
+    optionalDependencies:
+      '@sandbox-agent/cli': 0.3.2
+    transitivePeerDependencies:
+      - zod
+
   sax@1.4.4: {}
 
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+
   scheduler@0.23.2:
     dependencies:
       loose-envify: 1.4.0
@@ -9823,6 +13692,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  seroval-plugins@1.5.1(seroval@1.5.1):
+    dependencies:
+      seroval: 1.5.1
+
+  seroval@1.5.1: {}
+
   serve-static@2.2.1:
     dependencies:
       encodeurl: 2.0.0
@@ -9832,6 +13707,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  set-cookie-parser@3.0.1: {}
+
   setprototypeof@1.2.0: {}
 
   sharp@0.34.5:
@@ -9914,18 +13791,48 @@ snapshots:
 
   siginfo@2.0.0: {}
 
+  signal-exit@3.0.7: {}
+
   signal-exit@4.1.0: {}
 
+  simple-concat@1.0.1: {}
+
+  simple-get@4.0.1:
+    dependencies:
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+
   sisteransi@1.0.5: {}
 
+  sitemap@8.0.2:
+    dependencies:
+      '@types/node': 17.0.45
+      '@types/sax': 1.2.7
+      arg: 5.0.2
+      sax: 1.4.4
+
   smol-toml@1.6.0: {}
 
+  solid-js@1.9.11:
+    dependencies:
+      csstype: 3.2.3
+      seroval: 1.5.1
+      seroval-plugins: 1.5.1(seroval@1.5.1)
+
   sonic-boom@4.2.1:
     dependencies:
       atomic-sleep: 1.0.0
 
   source-map-js@1.2.1: {}
 
+  source-map-support@0.5.21:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map@0.6.1: {}
+
   source-map@0.7.6: {}
 
   space-separated-tokens@2.0.2: {}
@@ -9948,11 +13855,15 @@ snapshots:
 
   std-env@3.10.0: {}
 
+  stdin-discarder@0.2.2: {}
+
   stream-browserify@3.0.0:
     dependencies:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  stream-replace-string@2.0.0: {}
+
   streamsearch@1.1.0: {}
 
   streamx@2.23.0:
@@ -10001,12 +13912,31 @@ snapshots:
 
   strip-final-newline@3.0.0: {}
 
+  strip-json-comments@2.0.1: {}
+
   strip-literal@3.1.0:
     dependencies:
       js-tokens: 9.0.1
 
   strnum@2.1.2: {}
 
+  styletron-engine-atomic@1.6.2:
+    dependencies:
+      inline-style-prefixer: 5.1.2
+      styletron-standard: 3.1.0
+
+  styletron-react@6.1.1(react@19.2.4):
+    dependencies:
+      prop-types: 15.8.1
+      react: 19.2.4
+      styletron-standard: 3.1.0
+
+  styletron-standard@3.1.0:
+    dependencies:
+      '@rtsao/csstype': 2.6.5-forked.0
+      csstype: 3.2.3
+      inline-style-prefixer: 5.1.2
+
   sucrase@3.35.1:
     dependencies:
       '@jridgewell/gen-mapping': 0.3.13
@@ -10017,6 +13947,10 @@ snapshots:
       tinyglobby: 0.2.15
       ts-interface-checker: 0.1.13
 
+  supercluster@7.1.5:
+    dependencies:
+      kdbush: 3.0.0
+
   supports-color@10.2.2: {}
 
   supports-color@9.4.0: {}
@@ -10033,6 +13967,8 @@ snapshots:
       picocolors: 1.1.1
       sax: 1.4.4
 
+  symbol-tree@3.2.4: {}
+
   tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@alloc/quick-lru': 5.2.0
@@ -10093,6 +14029,18 @@ snapshots:
       minizlib: 3.1.0
       yallist: 5.0.0
 
+  tar@7.5.7:
+    dependencies:
+      '@isaacs/fs-minipass': 4.0.1
+      chownr: 3.0.0
+      minipass: 7.1.2
+      minizlib: 3.1.0
+      yallist: 5.0.0
+
+  taskkill@5.0.0:
+    dependencies:
+      execa: 6.1.0
+
   text-decoder@1.2.3:
     dependencies:
       b4a: 1.7.3
@@ -10111,8 +14059,16 @@ snapshots:
     dependencies:
       real-require: 0.2.0
 
+  thread-stream@4.0.0:
+    dependencies:
+      real-require: 0.2.0
+
   tiny-inflate@1.0.3: {}
 
+  tiny-invariant@1.3.3: {}
+
+  tiny-warning@1.0.3: {}
+
   tinybench@2.9.0: {}
 
   tinyexec@0.3.2: {}
@@ -10126,22 +14082,40 @@ snapshots:
 
   tinypool@1.1.1: {}
 
+  tinyqueue@2.0.3: {}
+
   tinyrainbow@2.0.0: {}
 
   tinyspy@4.0.4: {}
 
+  tldts-core@6.1.86: {}
+
+  tldts@6.1.86:
+    dependencies:
+      tldts-core: 6.1.86
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
 
   toidentifier@1.0.1: {}
 
+  tough-cookie@5.1.2:
+    dependencies:
+      tldts: 6.1.86
+
+  tr46@5.1.1:
+    dependencies:
+      punycode: 2.3.1
+
   tree-kill@1.2.2: {}
 
   trim-lines@3.0.1: {}
 
   trough@2.2.0: {}
 
+  ts-error@1.0.6: {}
+
   ts-interface-checker@0.1.13: {}
 
   ts-json-schema-generator@2.5.0:
@@ -10158,6 +14132,8 @@ snapshots:
     optionalDependencies:
       typescript: 5.9.3
 
+  tslib@1.14.1: {}
+
   tslib@2.8.1: {}
 
   tsup@8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2):
@@ -10188,13 +14164,45 @@ snapshots:
       - tsx
       - yaml
 
+  tsup@8.5.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2):
+    dependencies:
+      bundle-require: 5.1.0(esbuild@0.27.3)
+      cac: 6.7.14
+      chokidar: 4.0.3
+      consola: 3.4.2
+      debug: 4.4.3
+      esbuild: 0.27.3
+      fix-dts-default-cjs-exports: 1.0.1
+      joycon: 3.1.1
+      picocolors: 1.1.1
+      postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(yaml@2.8.2)
+      resolve-from: 5.0.0
+      rollup: 4.56.0
+      source-map: 0.7.6
+      sucrase: 3.35.1
+      tinyexec: 0.3.2
+      tinyglobby: 0.2.15
+      tree-kill: 1.2.2
+    optionalDependencies:
+      postcss: 8.5.6
+      typescript: 6.0.2
+    transitivePeerDependencies:
+      - jiti
+      - supports-color
+      - tsx
+      - yaml
+
   tsx@4.21.0:
     dependencies:
-      esbuild: 0.27.2
+      esbuild: 0.27.3
       get-tsconfig: 4.13.0
     optionalDependencies:
       fsevents: 2.3.3
 
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
   turbo-darwin-64@2.7.6:
     optional: true
 
@@ -10234,6 +14242,8 @@ snapshots:
 
   typescript@5.9.3: {}
 
+  typescript@6.0.2: {}
+
   ufo@1.6.3: {}
 
   ultrahtml@1.6.0: {}
@@ -10246,6 +14256,8 @@ snapshots:
 
   undici-types@7.16.0: {}
 
+  undici-types@7.18.2: {}
+
   undici@5.29.0:
     dependencies:
       '@fastify/busboy': 2.1.1
@@ -10318,7 +14330,7 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unstorage@1.17.4:
+  unstorage@1.17.4(aws4fetch@1.0.20):
     dependencies:
       anymatch: 3.1.3
       chokidar: 5.0.0
@@ -10328,6 +14340,8 @@ snapshots:
       node-fetch-native: 1.6.7
       ofetch: 1.5.1
       ufo: 1.6.3
+    optionalDependencies:
+      aws4fetch: 1.0.20
 
   update-browserslist-db@1.2.3(browserslist@4.28.1):
     dependencies:
@@ -10335,12 +14349,35 @@ snapshots:
       escalade: 3.2.0
       picocolors: 1.1.1
 
+  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+      tslib: 2.8.1
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.4):
+    dependencies:
+      detect-node-es: 1.1.0
+      react: 19.2.4
+      tslib: 2.8.1
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  use-sync-external-store@1.6.0(react@19.2.4):
+    dependencies:
+      react: 19.2.4
+
   util-deprecate@1.0.2: {}
 
   uuid@10.0.0: {}
 
+  uuid@11.1.0: {}
+
   uuid@12.0.0: {}
 
+  uuid@13.0.0: {}
+
   vary@1.1.2: {}
 
   vbare@0.0.4: {}
@@ -10360,13 +14397,17 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
+  viewport-mercator-project@7.0.4:
+    dependencies:
+      '@math.gl/web-mercator': 3.6.3
+
   vite-node@3.2.4(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.4.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -10381,13 +14422,13 @@ snapshots:
       - tsx
       - yaml
 
-  vite-node@3.2.4(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vite-node@3.2.4(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.4.1(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -10402,13 +14443,13 @@ snapshots:
       - tsx
       - yaml
 
-  vite-node@3.2.4(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vite-node@3.2.4(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -10423,34 +14464,16 @@ snapshots:
       - tsx
       - yaml
 
-  vite@5.4.21(@types/node@22.19.7):
+  vite@5.4.21(@types/node@25.5.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.6
       rollup: 4.56.0
     optionalDependencies:
-      '@types/node': 22.19.7
+      '@types/node': 25.5.0
       fsevents: 2.3.3
 
-  vite@5.4.21(@types/node@25.2.2):
-    dependencies:
-      esbuild: 0.21.5
-      postcss: 8.5.6
-      rollup: 4.56.0
-    optionalDependencies:
-      '@types/node': 25.2.2
-      fsevents: 2.3.3
-
-  vite@5.4.21(@types/node@25.2.3):
-    dependencies:
-      esbuild: 0.21.5
-      postcss: 8.5.6
-      rollup: 4.56.0
-    optionalDependencies:
-      '@types/node': 25.2.3
-      fsevents: 2.3.3
-
-  vite@6.4.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vite@6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.3)
@@ -10458,6 +14481,21 @@ snapshots:
       postcss: 8.5.6
       rollup: 4.56.0
       tinyglobby: 0.2.15
+    optionalDependencies:
+      '@types/node': 25.5.0
+      fsevents: 2.3.3
+      jiti: 1.21.7
+      tsx: 4.21.0
+      yaml: 2.8.2
+
+  vite@7.3.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+    dependencies:
+      esbuild: 0.27.3
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
+      postcss: 8.5.6
+      rollup: 4.56.0
+      tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 22.19.7
       fsevents: 2.3.3
@@ -10465,45 +14503,45 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.2
 
-  vite@6.4.1(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vite@7.3.1(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
-      esbuild: 0.25.12
+      esbuild: 0.27.3
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
       rollup: 4.56.0
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 25.2.2
+      '@types/node': 24.10.9
       fsevents: 2.3.3
       jiti: 1.21.7
       tsx: 4.21.0
       yaml: 2.8.2
 
-  vite@6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vite@7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
-      esbuild: 0.25.12
+      esbuild: 0.27.3
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
       rollup: 4.56.0
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 25.2.3
+      '@types/node': 25.5.0
       fsevents: 2.3.3
       jiti: 1.21.7
       tsx: 4.21.0
       yaml: 2.8.2
 
-  vitefu@1.1.1(vite@6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)):
+  vitefu@1.1.1(vite@6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)):
     optionalDependencies:
-      vite: 6.4.1(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 6.4.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.7)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@types/chai': 5.2.3
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@5.4.21(@types/node@25.2.3))
+      '@vitest/mocker': 3.2.4(vite@7.3.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -10521,12 +14559,13 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 5.4.21(@types/node@22.19.7)
+      vite: 7.3.1(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
       vite-node: 3.2.4(@types/node@22.19.7)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
       '@types/node': 22.19.7
+      jsdom: 26.1.0
     transitivePeerDependencies:
       - jiti
       - less
@@ -10541,11 +14580,11 @@ snapshots:
       - tsx
       - yaml
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.10.9)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@types/chai': 5.2.3
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@5.4.21(@types/node@25.2.3))
+      '@vitest/mocker': 3.2.4(vite@7.3.1(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -10563,12 +14602,13 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 5.4.21(@types/node@25.2.2)
-      vite-node: 3.2.4(@types/node@25.2.2)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite-node: 3.2.4(@types/node@24.10.9)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 25.2.2
+      '@types/node': 24.10.9
+      jsdom: 26.1.0
     transitivePeerDependencies:
       - jiti
       - less
@@ -10583,11 +14623,11 @@ snapshots:
       - tsx
       - yaml
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.5.0)(jiti@1.21.7)(jsdom@26.1.0)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@types/chai': 5.2.3
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@5.4.21(@types/node@25.2.3))
+      '@vitest/mocker': 3.2.4(vite@7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -10605,12 +14645,13 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 5.4.21(@types/node@25.2.3)
-      vite-node: 3.2.4(@types/node@25.2.3)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.1(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
+      vite-node: 3.2.4(@types/node@25.5.0)(jiti@1.21.7)(tsx@4.21.0)(yaml@2.8.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 25.2.3
+      '@types/node': 25.5.0
+      jsdom: 26.1.0
     transitivePeerDependencies:
       - jiti
       - less
@@ -10629,8 +14670,35 @@ snapshots:
 
   vscode-languageserver-types@3.17.5: {}
 
+  vt-pbf@3.1.3:
+    dependencies:
+      '@mapbox/point-geometry': 0.1.0
+      '@mapbox/vector-tile': 1.3.1
+      pbf: 3.3.0
+
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+
+  warning@4.0.3:
+    dependencies:
+      loose-envify: 1.4.0
+
   web-namespaces@2.0.1: {}
 
+  webidl-conversions@7.0.0: {}
+
+  whatwg-encoding@3.1.1:
+    dependencies:
+      iconv-lite: 0.6.3
+
+  whatwg-mimetype@4.0.0: {}
+
+  whatwg-url@14.2.0:
+    dependencies:
+      tr46: 5.1.1
+      webidl-conversions: 7.0.0
+
   which-pm-runs@1.1.0: {}
 
   which@2.0.2:
@@ -10646,26 +14714,26 @@ snapshots:
     dependencies:
       string-width: 7.2.0
 
-  workerd@1.20260205.0:
+  workerd@1.20260312.1:
     optionalDependencies:
-      '@cloudflare/workerd-darwin-64': 1.20260205.0
-      '@cloudflare/workerd-darwin-arm64': 1.20260205.0
-      '@cloudflare/workerd-linux-64': 1.20260205.0
-      '@cloudflare/workerd-linux-arm64': 1.20260205.0
-      '@cloudflare/workerd-windows-64': 1.20260205.0
+      '@cloudflare/workerd-darwin-64': 1.20260312.1
+      '@cloudflare/workerd-darwin-arm64': 1.20260312.1
+      '@cloudflare/workerd-linux-64': 1.20260312.1
+      '@cloudflare/workerd-linux-arm64': 1.20260312.1
+      '@cloudflare/workerd-windows-64': 1.20260312.1
 
-  wrangler@4.63.0(@cloudflare/workers-types@4.20260207.0):
+  wrangler@4.74.0(@cloudflare/workers-types@4.20260317.1):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.4.2
-      '@cloudflare/unenv-preset': 2.12.0(unenv@2.0.0-rc.24)(workerd@1.20260205.0)
+      '@cloudflare/unenv-preset': 2.15.0(unenv@2.0.0-rc.24)(workerd@1.20260312.1)
       blake3-wasm: 2.1.5
-      esbuild: 0.27.0
-      miniflare: 4.20260205.0
+      esbuild: 0.27.3
+      miniflare: 4.20260312.1
       path-to-regexp: 6.3.0
       unenv: 2.0.0-rc.24
-      workerd: 1.20260205.0
+      workerd: 1.20260312.1
     optionalDependencies:
-      '@cloudflare/workers-types': 4.20260207.0
+      '@cloudflare/workers-types': 4.20260317.1
       fsevents: 2.3.3
     transitivePeerDependencies:
       - bufferutil
@@ -10703,6 +14771,10 @@ snapshots:
     dependencies:
       os-paths: 4.4.0
 
+  xml-name-validator@5.0.0: {}
+
+  xmlchars@2.2.0: {}
+
   xtend@4.0.2: {}
 
   xxhash-wasm@1.1.0: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 2bf70c6..93fd2df 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,8 @@
 packages:
   - "frontend/packages/*"
+  - "foundry/packages/*"
+  - "!foundry/packages/cli"
+  - "!foundry/packages/desktop"
   - "sdks/*"
   - "sdks/cli"
   - "sdks/cli/platforms/*"
@@ -7,5 +10,5 @@ packages:
   - "sdks/gigacode/platforms/*"
   - "resources/vercel-ai-sdk-schemas"
   - "scripts/release"
-  - "scripts/sandbox-testing"
   - "examples/*"
+  - "server/packages/sandbox-agent/tests/opencode-compat"
diff --git a/railway/foundry-frontend/railway.toml b/railway/foundry-frontend/railway.toml
new file mode 100644
index 0000000..ee38547
--- /dev/null
+++ b/railway/foundry-frontend/railway.toml
@@ -0,0 +1,7 @@
+[build]
+builder = "DOCKERFILE"
+dockerfilePath = "../../foundry/docker/frontend.Dockerfile"
+
+[deploy]
+restartPolicyType = "ON_FAILURE"
+restartPolicyMaxRetries = 10
diff --git a/railway/foundry-mock/railway.toml b/railway/foundry-mock/railway.toml
new file mode 100644
index 0000000..45380cc
--- /dev/null
+++ b/railway/foundry-mock/railway.toml
@@ -0,0 +1,7 @@
+[build]
+builder = "DOCKERFILE"
+dockerfilePath = "../../foundry/docker/frontend.mock.Dockerfile"
+
+[deploy]
+restartPolicyType = "ON_FAILURE"
+restartPolicyMaxRetries = 10
diff --git a/railway/foundry/railway.toml b/railway/foundry/railway.toml
new file mode 100644
index 0000000..ac60bbe
--- /dev/null
+++ b/railway/foundry/railway.toml
@@ -0,0 +1,7 @@
+[build]
+builder = "DOCKERFILE"
+dockerfilePath = "../../foundry/docker/backend.Dockerfile"
+
+[deploy]
+restartPolicyType = "ON_FAILURE"
+restartPolicyMaxRetries = 10
diff --git a/research/acp/friction.md b/research/acp/friction.md
index 023b4f6..fc2e4bd 100644
--- a/research/acp/friction.md
+++ b/research/acp/friction.md
@@ -81,7 +81,7 @@ Update this file continuously during the migration.
 - Date: 2026-02-10
 - Area: Session lifecycle surface
 - Issue: ACP stable does not include v1-equivalent methods for session listing, explicit session termination/delete, or event-log polling.
-- Impact: Direct lift-and-shift of `/v1/sessions`, `/terminate`, and `/events` polling is not possible with ACP core only.
+- Impact: Direct lift-and-shift of the legacy session REST list, terminate, and event-polling behavior is not possible with ACP core only.
 - Proposed direction: Define `_sandboxagent/session/*` extension methods for these control operations, while keeping core prompt flow on standard ACP methods.
 - Decision: Open.
 - Owner: Unassigned.
@@ -218,6 +218,26 @@ Update this file continuously during the migration.
 - Status: resolved
 - Links: `server/packages/sandbox-agent/src/router.rs`, `server/packages/sandbox-agent/src/acp_runtime/mod.rs`, `server/packages/sandbox-agent/tests/v1_api/acp_transport.rs`, `docs/advanced/acp-http-client.mdx`
 
+- Date: 2026-03-13
+- Area: Actor runtime shutdown and draining
+- Issue: Actors can continue receiving or finishing action work after shutdown has started, while actor cleanup clears runtime resources such as the database handle. In RivetKit this can surface as `Database not enabled` from `c.db` even when the actor definition correctly includes `db`.
+- Impact: User requests can fail with misleading internal errors during runner eviction or shutdown, and long-lived request paths can bubble up as HTTP 502/timeout failures instead of a clear retryable stopping/draining signal.
+- Proposed direction: Add a real runner draining state so actors stop receiving traffic before shutdown, and ensure actor cleanup does not clear `#db` until in-flight actions are fully quiesced or aborted. App-side request paths should also avoid waiting inline on long actor workflows when possible.
+- Decision: Open.
+- Owner: Unassigned.
+- Status: open
+- Links: `foundry/packages/backend/src/actors/workspace/app-shell.ts`, `/Users/nathan/rivet/rivetkit-typescript/packages/rivetkit/src/actor/instance/mod.ts`, `/Users/nathan/rivet/rivetkit-typescript/packages/rivetkit/src/drivers/engine/actor-driver.ts`
+
+- Date: 2026-03-12
+- Area: Foundry RivetKit serverless routing on Railway
+- Issue: Moving Foundry from `/api/rivet` to `/v1/rivet` exposed three RivetKit deployment couplings: `serverless.basePath` had to be updated explicitly for metadata/start routes, `configureRunnerPool` could not be used in production because the current Rivet token lacked permission to list datacenters, and wrapping `registry.handler(c.req.raw)` inside Hono route handlers produced unstable serverless runner startup under Railway until `/v1/rivet` was dispatched directly from `Bun.serve`.
+- Impact: `GET /v1/rivet/metadata` initially returned 404, app-shell actor creation failed during OAuth/session bootstrap, and Foundry sign-in blocked on `500` from `/v1/app/snapshot` and `/v1/auth/github/start`.
+- Proposed direction: Treat RivetKit serverless base path as an explicit deployment config when versioning routes, avoid relying on runner-pool auto-configuration unless the production token has the required Rivet control-plane permissions, and prefer direct top-level dispatch for RivetKit serverless routes instead of routing them through higher-level Hono middleware.
+- Decision: Accepted and implemented for Foundry. The backend now sets `serverless.basePath` to `/v1/rivet`, leaves runner-pool config to infrastructure, and serves RivetKit directly from the Bun server for `/v1/rivet`.
+- Owner: Unassigned.
+- Status: resolved
+- Links: `foundry/packages/backend/src/actors/index.ts`, `foundry/packages/backend/src/index.ts`
+
 - Date: 2026-02-10
 - Area: Agent selection contract for ACP bootstrap/session creation
 - Issue: `x-acp-agent` bound agent selection to transport bootstrap, which conflicted with Sandbox Agent meta-session goals where one client can manage sessions across multiple agents.
@@ -247,3 +267,23 @@ Update this file continuously during the migration.
 - Owner: Unassigned.
 - Status: in_progress
 - Links: `research/acp/simplify-server.md`, `docs/mcp-config.mdx`, `docs/skills-config.mdx`
+
+- Date: 2026-03-10
+- Area: ACP HTTP client transport reentrancy for human-in-the-loop requests
+- Issue: The TypeScript `acp-http-client` serialized the full lifetime of each POST on a single write queue. A long-running `session/prompt` request therefore blocked the client from POSTing a response to an agent-initiated `session/request_permission`, deadlocking permission approval flows.
+- Impact: Permission requests arrived over SSE, but replying to them never resumed the original prompt turn. This blocked Claude and any other ACP agent using `session/request_permission`.
+- Proposed direction: Make the HTTP transport fire POSTs asynchronously after preserving outbound ordering at enqueue time, rather than waiting for the entire HTTP response before the next write can begin. Keep response bodies routed back into the readable stream so request promises still resolve normally.
+- Decision: Accepted and implemented in `acp-http-client`.
+- Owner: Unassigned.
+- Status: resolved
+- Links: `sdks/acp-http-client/src/index.ts`, `sdks/acp-http-client/tests/smoke.test.ts`, `sdks/typescript/tests/integration.test.ts`
+
+- Date: 2026-03-07
+- Area: Desktop host/runtime API boundary
+- Issue: Desktop automation needed screenshot/input/file-transfer-like host capabilities, but routing it through ACP would have mixed agent protocol semantics with host-owned runtime control and binary payloads.
+- Impact: A desktop feature built as ACP methods would blur the division between agent/session behavior and Sandbox Agent host/runtime APIs, and would complicate binary screenshot transport.
+- Proposed direction: Ship desktop as first-party HTTP endpoints under `/v1/desktop/*`, keep health/install/remediation in the server runtime, and expose the feature through the SDK and inspector without ACP extension methods.
+- Decision: Accepted and implemented for phase one.
+- Owner: Unassigned.
+- Status: resolved
+- Links: `server/packages/sandbox-agent/src/router.rs`, `server/packages/sandbox-agent/src/desktop_runtime.rs`, `sdks/typescript/src/client.ts`, `frontend/packages/inspector/src/components/debug/DesktopTab.tsx`
diff --git a/research/acp/inspector-unimplemented.md b/research/acp/inspector-unimplemented.md
index 2935342..3eb0a2f 100644
--- a/research/acp/inspector-unimplemented.md
+++ b/research/acp/inspector-unimplemented.md
@@ -11,4 +11,4 @@ This tracks legacy inspector behaviors that do not yet have full parity on ACP v
 5. TDOO: Agent mode discovery before creating a session is not implemented (inspector currently returns cached-or-empty mode lists).
 6. TDOO: Agent model discovery before creating a session is not implemented (inspector currently returns cached-or-empty model lists).
 7. TDOO: Session listing only reflects sessions created by this inspector client instance (not full server/global session inventory).
-8. TDOO: Event history shown in inspector is synthesized from ACP traffic handled by the inspector compatibility layer, not the old canonical `/v1/sessions/*/events` backend history.
+8. TDOO: Event history shown in inspector is synthesized from ACP traffic handled by the inspector compatibility layer, not the old canonical session-events backend history.
diff --git a/research/acp/merge-acp.md b/research/acp/merge-acp.md
index b5f0cce..b51d1cd 100644
--- a/research/acp/merge-acp.md
+++ b/research/acp/merge-acp.md
@@ -20,8 +20,8 @@ Static v1 endpoints today:
 
 - `GET /v1/agents`
 - `POST /v1/agents/:agent/install`
-- `GET /v1/sessions`
-- `GET /v1/sessions/:session_id`
+- legacy session list endpoint
+- legacy session detail endpoint
 - `GET /v1/fs/entries`
 - `GET /v1/fs/file`
 - `PUT /v1/fs/file`
@@ -76,8 +76,8 @@ Interpretation for clients: all agent/session operations and non-binary filesyst
 | --- | --- | --- |
 | `GET /v1/agents` | `_sandboxagent/agent/list` | Response keeps current `AgentListResponse` shape for low migration risk. |
 | `POST /v1/agents/:agent/install` | `_sandboxagent/agent/install` | Params include `agent`, `reinstall`, `agentVersion`, `agentProcessVersion`. |
-| `GET /v1/sessions` | `_sandboxagent/session/list` | Return current `SessionListResponse` shape (not ACP unstable list shape). |
-| `GET /v1/sessions/:session_id` | `_sandboxagent/session/get` | Return current `SessionInfo` shape; error on missing session. |
+| legacy session list endpoint | `_sandboxagent/session/list` | Return current `SessionListResponse` shape (not ACP unstable list shape). |
+| legacy session detail endpoint | `_sandboxagent/session/get` | Return current `SessionInfo` shape; error on missing session. |
 | `GET /v1/fs/entries` | `_sandboxagent/fs/list_entries` | Preserve path + optional `sessionId` resolution semantics. |
 | `GET /v1/fs/file` | keep HTTP + `_sandboxagent/fs/read_file` | HTTP is primary because responses may require large streaming reads; ACP variant exists for compatibility/smaller payloads. |
 | `PUT /v1/fs/file` | keep HTTP + `_sandboxagent/fs/write_file` | HTTP is primary for large binary writes; ACP variant exists for compatibility/smaller payloads. |
@@ -143,7 +143,7 @@ Package boundary after migration:
 
 - `acp-http-client` remains protocol-pure ACP transport and generic `extMethod`/`extNotification`.
 - `sandbox-agent` remains the typed wrapper that maps convenience methods to `_sandboxagent/...` extension methods.
-- No direct `/v1/agents*`, `/v1/sessions*`, or non-binary `/v1/fs/*` fetches in SDK runtime code.
+- No direct legacy agents/session REST fetches or non-binary `/v1/fs/*` fetches in SDK runtime code.
 - Binary file transfer keeps direct HTTP fetches on the three endpoints listed above.
 - SDK policy: prefer HTTP for `readFsFile`/`writeFsFile`/`uploadFsBatch` even if ACP extension variants exist.
 
@@ -184,17 +184,17 @@ Alternative (optional): introduce a runtime-only control connection mode that do
 - TypeScript SDK (`sdks/typescript/src/client.ts`):
   - Repoint `listAgents`, `installAgent`, `listSessions`, `getSession`, `listFsEntries`, `deleteFsEntry`, `mkdirFs`, `moveFs`, and `statFs` to ACP extension calls.
   - Keep `readFsFile`, `writeFsFile`, and `uploadFsBatch` on HTTP endpoints.
-  - Remove direct runtime fetch usage for `/v1/agents*`, `/v1/sessions*`, and non-binary `/v1/fs/*`.
+  - Remove direct runtime fetch usage for legacy agents/session REST endpoints and non-binary `/v1/fs/*`.
   - Keep method names stable for callers.
   - Move these methods to connected-only semantics (`NotConnectedError` when disconnected).
 - CLI (`server/packages/sandbox-agent/src/cli.rs`):
-  - Make `api agents list/install` call ACP extension methods (via ACP post flow), not direct `/v1/agents*` HTTP calls.
+  - Make `api agents list/install` call ACP extension methods (via ACP post flow), not direct legacy agent HTTP calls.
 - Inspector flow/docs:
   - Stop depending on `GET /v1/agents` in startup path; use ACP extension instead.
 
 ### Phase 3: Remove Static Endpoints (Except Health + Binary FS Transfer)
 
-- Remove route registrations for `/v1/agents*`, `/v1/sessions*`, `/v1/fs/entries`, `/v1/fs/entry`, `/v1/fs/mkdir`, `/v1/fs/move`, `/v1/fs/stat` from `router.rs`.
+- Remove route registrations for legacy agent/session REST endpoints and `/v1/fs/entries`, `/v1/fs/entry`, `/v1/fs/mkdir`, `/v1/fs/move`, `/v1/fs/stat` from `router.rs`.
 - Keep `/v1/health`, `/v1/rpc`, `GET /v1/fs/file`, `PUT /v1/fs/file`, and `POST /v1/fs/upload-batch`.
 - Optional short deprecation period: convert removed routes to `410 Gone` with explicit extension method in `detail`.
 
@@ -237,6 +237,6 @@ Inspector:
 
 ## Open Decisions
 
-1. Should removed `/v1/agents*`, `/v1/sessions*`, and non-binary `/v1/fs/*` return `410` for one release or be dropped immediately?
+1. Should removed legacy agent/session REST endpoints and non-binary `/v1/fs/*` return `410` for one release or be dropped immediately?
 2. Do we keep a strict response-shape parity layer for session/file methods, or normalize to ACP-native shapes?
 3. Should `/` service-root remain as informational HTTP, or be treated as out-of-scope for this “only health static + binary fs transfer” policy?
diff --git a/research/acp/missing-features-spec/01-questions.md b/research/acp/missing-features-spec/01-questions.md
index e49ad4d..3600161 100644
--- a/research/acp/missing-features-spec/01-questions.md
+++ b/research/acp/missing-features-spec/01-questions.md
@@ -59,11 +59,11 @@ struct PendingQuestion {
 }
 ```
 
-## v1 HTTP Endpoints (from `router.rs`)
+## Legacy Session REST Endpoints (from `router.rs`)
 
 ```
-POST /v1/sessions/{session_id}/questions/{question_id}/reply   -> 204 No Content
-POST /v1/sessions/{session_id}/questions/{question_id}/reject   -> 204 No Content
+session question reply endpoint   -> 204 No Content
+session question reject endpoint  -> 204 No Content
 ```
 
 ### `reply_question` handler
@@ -122,7 +122,7 @@ Key flow:
 
 1. Agent emits `question.requested` event with `QuestionEventData { status: Requested, question_id, prompt, options }`
 2. Client renders question UI
-3. Client calls `POST /v1/sessions/{id}/questions/{qid}/reply` with `{ answers: [["selected"]] }` or `POST .../reject`
+3. Client calls the legacy session question reply or reject endpoint with `{ answers: [["selected"]] }`
 4. System emits `question.resolved` event with `QuestionEventData { status: Answered, response: Some("...") }` or `{ status: Rejected }`
 
 ## v1 Agent Capability
diff --git a/research/acp/missing-features-spec/07-session-termination.md b/research/acp/missing-features-spec/07-session-termination.md
index 08e4f85..4d01fb6 100644
--- a/research/acp/missing-features-spec/07-session-termination.md
+++ b/research/acp/missing-features-spec/07-session-termination.md
@@ -4,7 +4,7 @@
 
 ## Summary
 
-v1 had explicit session termination (`POST /v1/sessions/{id}/terminate`). v1 only has `session/cancel` (turn cancellation, not session kill) and `DELETE /v1/rpc` (connection close, not session termination). Need explicit session destroy/terminate semantics.
+The legacy session REST API had an explicit terminate endpoint. ACP only has `session/cancel` (turn cancellation, not session kill) and `DELETE /v1/rpc` (connection close, not session termination). Need explicit session destroy/terminate semantics.
 
 ## Current v1 State
 
@@ -20,7 +20,7 @@ v1 had explicit session termination (`POST /v1/sessions/{id}/terminate`). v1 onl
 ### HTTP Endpoint
 
 ```
-POST /v1/sessions/{id}/terminate
+legacy session terminate endpoint
 ```
 
 ### Handler (from `router.rs`)
diff --git a/research/acp/missing-features-spec/08-model-variants.md b/research/acp/missing-features-spec/08-model-variants.md
index aa58304..ae2cdbb 100644
--- a/research/acp/missing-features-spec/08-model-variants.md
+++ b/research/acp/missing-features-spec/08-model-variants.md
@@ -49,7 +49,7 @@ Returned `AgentModelsResponse` with full model list including variants.
 ### Session Creation with Variant
 
 ```
-POST /v1/sessions
+legacy session create endpoint
 ```
 
 Body included `variant: Option<String>` to select a specific model variant at session creation time.
diff --git a/research/acp/missing-features-spec/10-include-raw.md b/research/acp/missing-features-spec/10-include-raw.md
index 8197a5c..6d5b693 100644
--- a/research/acp/missing-features-spec/10-include-raw.md
+++ b/research/acp/missing-features-spec/10-include-raw.md
@@ -34,7 +34,7 @@ pub struct UniversalEvent {
 ### v1 Usage
 
 ```
-GET /v1/sessions/{id}/events?include_raw=true
+legacy event polling endpoint with `include_raw=true`
 ```
 
 When `include_raw=true`, each `UniversalEvent` included the verbatim JSON the agent process emitted before normalization into the universal schema.
diff --git a/research/acp/missing-features-spec/16-session-info.md b/research/acp/missing-features-spec/16-session-info.md
index 39729b8..157e918 100644
--- a/research/acp/missing-features-spec/16-session-info.md
+++ b/research/acp/missing-features-spec/16-session-info.md
@@ -1,10 +1,10 @@
 # Feature 16: Session Info
 
-**Implementation approach:** New HTTP endpoints (`GET /v1/sessions`, `GET /v1/sessions/{id}`)
+**Implementation approach:** New session-info HTTP endpoints
 
 ## Summary
 
-v1 `SessionInfo` tracked `event_count`, `created_at`, `updated_at`, and full `mcp` config. v1 has session data in the ACP runtime's `MetaSession` struct but no HTTP endpoints to query it. Add REST endpoints for session listing and detail.
+v1 `SessionInfo` tracked `event_count`, `created_at`, `updated_at`, and full `mcp` config. v1 has session data in the ACP runtime's `MetaSession` struct but no HTTP endpoints to query it. Add HTTP endpoints for session listing and detail.
 
 ## Current v1 State
 
@@ -117,8 +117,8 @@ fn build_session_info(state: &SessionState) -> SessionInfo {
 ### New HTTP Endpoints
 
 ```
-GET /v1/sessions              -> SessionListResponse
-GET /v1/sessions/{id}         -> SessionInfo
+session list endpoint         -> SessionListResponse
+session detail endpoint       -> SessionInfo
 ```
 
 These are control-plane HTTP endpoints (not ACP), providing session visibility without requiring an active ACP connection.
@@ -156,7 +156,7 @@ Need to add:
 
 | File | Change |
 |------|--------|
-| `server/packages/sandbox-agent/src/router.rs` | Add `GET /v1/sessions` and `GET /v1/sessions/{id}` handlers; add response types |
+| `server/packages/sandbox-agent/src/router.rs` | Add session list and session detail handlers; add response types |
 | `server/packages/sandbox-agent/src/acp_runtime/mod.rs` | Add `created_at` to `MetaSession`; add `ended` tracking; expose `list_sessions()` and `get_session()` public methods |
 | `sdks/typescript/src/client.ts` | Add `listSessions()` and `getSession(id)` methods |
 | `server/packages/sandbox-agent/tests/v1_api.rs` | Add session listing and detail tests |
@@ -165,6 +165,6 @@ Need to add:
 
 | Doc | Change |
 |-----|--------|
-| `docs/openapi.json` | Add `/v1/sessions` and `/v1/sessions/{id}` endpoint specs |
+| `docs/openapi.json` | Add session list and session detail endpoint specs |
 | `docs/cli.mdx` | Add CLI `sessions list` and `sessions info` commands |
 | `docs/sdks/typescript.mdx` | Document session listing SDK methods |
diff --git a/research/acp/missing-features-spec/17-error-termination-metadata.md b/research/acp/missing-features-spec/17-error-termination-metadata.md
index f50159b..3ba153f 100644
--- a/research/acp/missing-features-spec/17-error-termination-metadata.md
+++ b/research/acp/missing-features-spec/17-error-termination-metadata.md
@@ -171,7 +171,7 @@ When an agent process terminates with an error:
 ### Session Info Integration
 
 Termination metadata should be accessible via:
-- `GET /v1/sessions/{id}` (Feature #16) — include `terminationInfo` in response when session has ended
+- the session info endpoint (Feature #16) — include `terminationInfo` in response when session has ended
 - `session/list` ACP response — include termination status in session entries
 
 ### Files to Modify
diff --git a/research/acp/missing-features-spec/plan.md b/research/acp/missing-features-spec/plan.md
index cc7bcc8..a024655 100644
--- a/research/acp/missing-features-spec/plan.md
+++ b/research/acp/missing-features-spec/plan.md
@@ -36,7 +36,7 @@ Session-level features that build on Phase A runtime tracking.
 
 | Order | Feature                                                      | Spec | Approach                                             | Effort |
 |:-----:|--------------------------------------------------------------|:----:|------------------------------------------------------|:------:|
-| B1    | [Session Info](./16-session-info.md)                         | #16  | New `GET /v1/sessions` and `GET /v1/sessions/{id}`  | Medium |
+| B1    | [Session Info](./16-session-info.md)                         | #16  | New session info HTTP endpoints                     | Medium |
 | B2    | [Session Termination](./07-session-termination.md)           | #7   | Idempotent `_sandboxagent/session/terminate`         | Medium |
 | B3    | [Error Termination Metadata](./17-error-termination-metadata.md) | #17  | Stderr capture + `_sandboxagent/session/ended` event | Medium |
 
diff --git a/research/acp/old-rest-openapi-list.md b/research/acp/old-rest-openapi-list.md
index 923a65b..5ac15c8 100644
--- a/research/acp/old-rest-openapi-list.md
+++ b/research/acp/old-rest-openapi-list.md
@@ -17,16 +17,16 @@
 | /v1/fs/stat | UNIMPLEMENTED |
 | /v1/fs/upload-batch | UNIMPLEMENTED |
 | /v1/health | UNIMPLEMENTED |
-| /v1/sessions | session/list (UNSTABLE) |
-| /v1/sessions/{session_id} | session/new \| session/load \| session/resume (UNSTABLE) |
-| /v1/sessions/{session_id}/events | UNIMPLEMENTED |
-| /v1/sessions/{session_id}/events/sse | session/update (notification stream) |
-| /v1/sessions/{session_id}/messages | session/prompt |
-| /v1/sessions/{session_id}/messages/stream | session/prompt + session/update notifications |
-| /v1/sessions/{session_id}/permissions/{permission_id}/reply | session/request_permission response |
-| /v1/sessions/{session_id}/questions/{question_id}/reject | UNIMPLEMENTED |
-| /v1/sessions/{session_id}/questions/{question_id}/reply | UNIMPLEMENTED |
-| /v1/sessions/{session_id}/terminate | session/cancel (turn cancellation only) |
+| legacy session list route | session/list (UNSTABLE) |
+| legacy session create/load/resume route | session/new \| session/load \| session/resume (UNSTABLE) |
+| legacy session events polling route | UNIMPLEMENTED |
+| legacy session events SSE route | session/update (notification stream) |
+| legacy session prompt route | session/prompt |
+| legacy session prompt + stream route | session/prompt + session/update notifications |
+| legacy permission reply route | session/request_permission response |
+| legacy question reject route | UNIMPLEMENTED |
+| legacy question reply route | UNIMPLEMENTED |
+| legacy session terminate route | session/cancel (turn cancellation only) |
 | AgentCapabilities | initialize.result.agentCapabilities |
 | AgentCapabilities.commandExecution | UNIMPLEMENTED |
 | AgentCapabilities.errorEvents | UNIMPLEMENTED |
@@ -427,7 +427,7 @@
 
 - `UNIMPLEMENTED` means there is no ACP-standard field/method with equivalent semantics in `schema.unstable.json`; implementation would require ACP extension methods (`_...`) and/or `_meta` payloads.
 - Rows mapped to `_meta[...]` are ACP-compatible extensions, not standard interoperable ACP fields; both sides must agree on names and semantics.
-- Legacy event polling (`/v1/sessions/{session_id}/events`) has no ACP equivalent; ACP is stream-first via `session/update` notifications over streamable HTTP.
+- Legacy event polling has no ACP equivalent; ACP is stream-first via `session/update` notifications over streamable HTTP.
 - Session lifecycle differs: ACP has `session/new`, `session/load`, `session/resume` (UNSTABLE), and `session/fork` (UNSTABLE), but no standard explicit "close session" method.
 - Permission handling is request/response (`session/request_permission`) tied to JSON-RPC request IDs; it does not use standalone REST reply endpoints.
 - Question/answer HITL flow in the old schema has no standard ACP equivalent today (separate from permission prompts).
diff --git a/research/acp/spec.md b/research/acp/spec.md
index 3923d29..f7130fe 100644
--- a/research/acp/spec.md
+++ b/research/acp/spec.md
@@ -233,8 +233,6 @@ Non-ACP endpoints retained in v1:
 - `GET /v1/health`
 - `GET /v1/agents` (capabilities + install status)
 - `POST /v1/agents/{agent}/install`
-- `GET /v1/sessions`
-- `GET /v1/sessions/{id}`
 - `GET /v1/fs/file`
 - `PUT /v1/fs/file`
 - `POST /v1/fs/upload-batch`
diff --git a/research/acp/v1-schema-to-acp-mapping.md b/research/acp/v1-schema-to-acp-mapping.md
index d6f2e68..ea7740b 100644
--- a/research/acp/v1-schema-to-acp-mapping.md
+++ b/research/acp/v1-schema-to-acp-mapping.md
@@ -54,16 +54,16 @@ Extension namespace used in this spec:
 | `POST /v1/fs/move` | `POST /v1/fs/move` | HTTP platform API | Port v1 behavior. |
 | `GET /v1/fs/stat` | `GET /v1/fs/stat` | HTTP platform API | Port v1 behavior. |
 | `POST /v1/fs/upload-batch` | `POST /v1/fs/upload-batch` | HTTP platform API | Tar upload/extract behavior from v1. |
-| `GET /v1/sessions` | `GET /v1/sessions` | HTTP control-plane | Session inventory without ACP connection requirement. |
-| `POST /v1/sessions/{session_id}` | `session/new` | Standard | Path `session_id` becomes alias in `_meta["sandboxagent.dev"].requestedSessionId`. |
-| `POST /v1/sessions/{session_id}/messages` | `session/prompt` | Standard | Asynchronous behavior comes from transport (request + stream). |
-| `POST /v1/sessions/{session_id}/messages/stream` | `session/prompt` + consume `session/update` on SSE | Standard | Streaming is transport-level, not a distinct ACP method. |
-| `POST /v1/sessions/{session_id}/terminate` | `_sandboxagent/session/terminate` | Extension | Idempotent termination semantics distinct from `DELETE /v1/rpc`. |
-| `GET /v1/sessions/{session_id}/events` | `_sandboxagent/session/events` (poll view over ACP stream) | Extension | Optional compatibility helper; canonical v1 is stream consumption. |
-| `GET /v1/sessions/{session_id}/events/sse` | `GET /v1/rpc` SSE stream | Standard transport | Filter by sessionId client-side or via connection/session binding. |
-| `POST /v1/sessions/{session_id}/permissions/{permission_id}/reply` | JSON-RPC response to pending `session/request_permission` request id | Standard | Bridge `permission_id` to request `id` in transport state. |
-| `POST /v1/sessions/{session_id}/questions/{question_id}/reply` | JSON-RPC response to pending `_sandboxagent/session/request_question` | Extension | ACP stable has no generic question/HITL request method. |
-| `POST /v1/sessions/{session_id}/questions/{question_id}/reject` | JSON-RPC response to pending `_sandboxagent/session/request_question` | Extension | Encode rejection in response outcome. |
+| legacy session list route | session/list | HTTP control-plane | Session inventory without ACP connection requirement. |
+| legacy session create route | `session/new` | Standard | Path `session_id` becomes alias in `_meta["sandboxagent.dev"].requestedSessionId`. |
+| legacy session prompt route | `session/prompt` | Standard | Asynchronous behavior comes from transport (request + stream). |
+| legacy session prompt + stream route | `session/prompt` + consume `session/update` on SSE | Standard | Streaming is transport-level, not a distinct ACP method. |
+| legacy session terminate route | `_sandboxagent/session/terminate` | Extension | Idempotent termination semantics distinct from `DELETE /v1/rpc`. |
+| legacy event polling route | `_sandboxagent/session/events` (poll view over ACP stream) | Extension | Optional compatibility helper; canonical v1 is stream consumption. |
+| legacy event SSE route | `GET /v1/rpc` SSE stream | Standard transport | Filter by sessionId client-side or via connection/session binding. |
+| legacy permission reply route | JSON-RPC response to pending `session/request_permission` request id | Standard | Bridge `permission_id` to request `id` in transport state. |
+| legacy question reply route | JSON-RPC response to pending `_sandboxagent/session/request_question` | Extension | ACP stable has no generic question/HITL request method. |
+| legacy question reject route | JSON-RPC response to pending `_sandboxagent/session/request_question` | Extension | Encode rejection in response outcome. |
 
 ### 3.1 `CreateSessionRequest` field mapping
 
diff --git a/research/agents/amp.md b/research/agents/amp.md
index c9bced7..d05a4b7 100644
--- a/research/agents/amp.md
+++ b/research/agents/amp.md
@@ -251,7 +251,7 @@ Amp also uses additional models for specific subtasks:
 | Librarian subagent | Claude Sonnet 4.5 | External code research |
 | Image/PDF analysis | Gemini 3 Flash | Multimodal input processing |
 | Content generation | Gemini 3 Pro Image (Painter) | Image generation |
-| Handoff (context) | Gemini 2.5 Flash | Context management |
+| Task (context) | Gemini 2.5 Flash | Context management |
 | Thread categorization | Gemini 2.5 Flash-Lite | Thread organization |
 | Title generation | Claude Haiku 4.5 | Thread title generation |
 
diff --git a/research/desktop-streaming-architecture.md b/research/desktop-streaming-architecture.md
new file mode 100644
index 0000000..f2c58fb
--- /dev/null
+++ b/research/desktop-streaming-architecture.md
@@ -0,0 +1,103 @@
+# Desktop Streaming Architecture
+
+## Decision: neko over GStreamer (direct) and VNC
+
+We evaluated three approaches for streaming the virtual desktop to browser clients:
+
+1. **VNC (noVNC/websockify)** - traditional remote desktop
+2. **GStreamer WebRTC (direct)** - custom GStreamer pipeline in the sandbox agent process
+3. **neko** - standalone WebRTC streaming server with its own GStreamer pipeline
+
+We chose **neko**.
+
+## Approach comparison
+
+### VNC (noVNC)
+
+- Uses RFB protocol, not WebRTC. Relies on pixel-diff framebuffer updates over WebSocket.
+- Higher latency than WebRTC (no hardware-accelerated codec, no adaptive bitrate).
+- Requires a VNC server (x11vnc or similar) plus websockify for browser access.
+- Input handling is mature but tied to the RFB protocol.
+- No audio support without additional plumbing.
+
+**Rejected because:** Latency is noticeably worse than WebRTC-based approaches. The pixel-diff approach doesn't scale well at higher resolutions or frame rates. No native audio path.
+
+### GStreamer WebRTC (direct)
+
+- Custom pipeline: `ximagesrc -> videoconvert -> vp8enc -> rtpvp8pay -> webrtcbin`.
+- Runs inside the sandbox agent Rust process using `gstreamer-rs` bindings.
+- Requires feature-gating (`desktop-gstreamer` Cargo feature) and linking GStreamer at compile time.
+- ICE candidate handling is complex: Docker-internal IPs (172.17.x.x) must be rewritten to 127.0.0.1 for host browser connectivity.
+- UDP port range must be constrained via libnice NiceAgent properties to stay within Docker-forwarded ports.
+- Input must be implemented separately (xdotool or custom X11 input injection).
+- No built-in session management, authentication, or multi-client support.
+
+**Rejected because:** Too much complexity for the sandbox agent to own directly. ICE/NAT traversal bugs are hard to debug. The GStreamer Rust bindings add significant compile-time dependencies. Input handling requires a separate implementation. We built and tested this approach (branch `desktop-computer-use`, PR #226) and found:
+- Black screen issues due to GStreamer pipeline negotiation failures
+- ICE candidate rewriting fragility across Docker networking modes
+- libnice port range configuration requires accessing internal NiceAgent properties that vary across GStreamer versions
+- No data channel for low-latency input (had to fall back to WebSocket-based input which adds a round trip)
+
+### neko (chosen)
+
+- Standalone Go binary extracted from `ghcr.io/m1k1o/neko/base`.
+- Has its own GStreamer pipeline internally (same `ximagesrc -> vp8enc -> webrtcbin` approach, but battle-tested).
+- Provides WebSocket signaling, WebRTC media, and a binary data channel for input, all out of the box.
+- Input via data channel is low-latency (sub-frame, no HTTP round trip). Uses X11 XTEST extension.
+- Multi-session support with `noauth` provider (each browser tab gets its own session).
+- ICE-lite mode with `--webrtc.nat1to1 127.0.0.1` eliminates NAT traversal issues for Docker-to-host.
+- EPR (ephemeral port range) flag constrains UDP ports cleanly.
+- Sandbox agent acts as a thin WebSocket proxy: browser WS connects to sandbox agent, which creates a per-connection neko login session and relays signaling messages bidirectionally.
+- Audio codec support (opus) included for free.
+
+**Chosen because:** Neko encapsulates all the hard WebRTC/GStreamer/input complexity into a single binary. The sandbox agent only needs to:
+1. Manage the neko process lifecycle (start/stop via the process runtime)
+2. Proxy WebSocket signaling (bidirectional relay, ~60 lines of code)
+3. Handle neko session creation (HTTP login to get a session cookie)
+
+This keeps the sandbox agent's desktop streaming code simple (~300 lines for the manager, ~120 lines for the WS proxy) while delivering production-quality WebRTC streaming with data channel input.
+
+## Architecture
+
+```
+Browser                    Sandbox Agent              neko (internal)
+  |                            |                          |
+  |-- WS /stream/signaling --> |-- WS ws://127.0.0.1:18100/api/ws -->|
+  |                            |   (bidirectional relay)  |
+  |<-- neko signaling ---------|<-- neko signaling -------|
+  |                            |                          |
+  |<========= WebRTC (UDP 59000-59100) ==================>|
+  |   VP8 video, Opus audio, binary data channel          |
+  |                                                       |
+  |-- data channel input (mouse/keyboard) --------------->|
+  |   (binary protocol: opcode + payload, big-endian)     |
+```
+
+Key points:
+- neko listens on internal port 18100 (not exposed externally).
+- UDP ports 59000-59100 are forwarded through Docker for WebRTC media.
+- `--webrtc.icelite` + `--webrtc.nat1to1 127.0.0.1` means neko advertises 127.0.0.1 as its ICE candidate, so the browser connects to localhost UDP ports directly.
+- `--desktop.input.enabled=false` disables neko's custom xf86-input driver (not available outside neko's official Docker images). Input falls back to XTEST.
+- Each WebSocket proxy connection creates a fresh neko login session with a unique username to avoid session conflicts when multiple clients connect.
+
+## Trade-offs
+
+| Concern | neko | GStreamer direct |
+|---------|------|-----------------|
+| Binary size | ~30MB additional binary | ~0 (uses system GStreamer libs) |
+| Compile-time deps | None (external binary) | gstreamer-rs crate + GStreamer dev libs |
+| Input latency | Sub-frame (data channel) | WebSocket round trip |
+| ICE/NAT complexity | Handled by neko flags | Must implement in Rust |
+| Multi-client | Built-in session management | Must implement |
+| Maintenance | Upstream neko updates | Own all the code |
+| Audio | Built-in (opus) | Must add audio pipeline |
+
+The main trade-off is the additional ~30MB binary size from neko. This is acceptable for the Docker-based deployment model where image size is less critical than reliability and development velocity.
+
+## References
+
+- neko v3: https://github.com/m1k1o/neko
+- neko client reference: https://github.com/demodesk/neko-client
+- neko data channel protocol: https://github.com/m1k1o/neko/blob/master/server/internal/webrtc/payload/receive.go
+- GStreamer branch (closed): PR #226, branch `desktop-computer-use`
+- Image digest: `ghcr.io/m1k1o/neko/base@sha256:0c384afa56268aaa2d5570211d284763d0840dcdd1a7d9a24be3081d94d3dfce`
diff --git a/research/opencode-compat/capture-native.ts b/research/opencode-compat/capture-native.ts
index 07f3336..41c9940 100644
--- a/research/opencode-compat/capture-native.ts
+++ b/research/opencode-compat/capture-native.ts
@@ -94,10 +94,7 @@ async function main() {
     console.log("Native OpenCode server is healthy!");
 
     // 1. Capture initial metadata
-    const [agentRes, configRes] = await Promise.all([
-      fetch(`${baseUrl}/agent`).then((r) => r.json()),
-      fetch(`${baseUrl}/config`).then((r) => r.json()),
-    ]);
+    const [agentRes, configRes] = await Promise.all([fetch(`${baseUrl}/agent`).then((r) => r.json()), fetch(`${baseUrl}/config`).then((r) => r.json())]);
     saveJson("metadata-agent", agentRes);
     saveJson("metadata-config", configRes);
 
@@ -186,9 +183,7 @@ async function main() {
     await new Promise((r) => setTimeout(r, 1000));
 
     // 5. Get messages after first request
-    const messagesAfter1 = await fetch(`${baseUrl}/session/${sessionId}/message`).then((r) =>
-      r.json()
-    );
+    const messagesAfter1 = await fetch(`${baseUrl}/session/${sessionId}/message`).then((r) => r.json());
     saveJson("messages-after-1", messagesAfter1);
     console.log(`  Got ${messagesAfter1.length} messages after msg 1`);
 
@@ -218,9 +213,7 @@ async function main() {
     await new Promise((r) => setTimeout(r, 2000));
 
     // 7. Get messages after second request
-    const messagesAfter2 = await fetch(`${baseUrl}/session/${sessionId}/message`).then((r) =>
-      r.json()
-    );
+    const messagesAfter2 = await fetch(`${baseUrl}/session/${sessionId}/message`).then((r) => r.json());
     saveJson("messages-after-2", messagesAfter2);
     console.log(`  Got ${messagesAfter2.length} messages after msg 2`);
 
@@ -239,8 +232,7 @@ async function main() {
 
     // Filter events for this session
     const sessionEvents = allEvents.filter(
-      (e) => e.properties?.sessionID === sessionId ||
-             (e.type === "session.created" && e.properties?.info?.id === sessionId)
+      (e) => e.properties?.sessionID === sessionId || (e.type === "session.created" && e.properties?.info?.id === sessionId),
     );
     saveJson("session-events", sessionEvents);
 
diff --git a/research/opencode-compat/capture-sandbox-agent.ts b/research/opencode-compat/capture-sandbox-agent.ts
index 9d14ea7..1dd3f5c 100644
--- a/research/opencode-compat/capture-sandbox-agent.ts
+++ b/research/opencode-compat/capture-sandbox-agent.ts
@@ -58,17 +58,13 @@ async function main() {
 
   // Use the locally built binary, not the installed one
   const binaryPath = new URL("../../target/release/sandbox-agent", import.meta.url).pathname;
-  const child: ChildProcess = spawn(
-    binaryPath,
-    ["server", "--host", host, "--port", String(port), "--token", token],
-    {
-      stdio: "pipe",
-      env: {
-        ...process.env,
-        SANDBOX_AGENT_SKIP_INSPECTOR: "1",
-      },
-    }
-  );
+  const child: ChildProcess = spawn(binaryPath, ["server", "--host", host, "--port", String(port), "--token", token], {
+    stdio: "pipe",
+    env: {
+      ...process.env,
+      SANDBOX_AGENT_SKIP_INSPECTOR: "1",
+    },
+  });
 
   let stderr = "";
   child.stderr?.on("data", (chunk) => {
@@ -205,9 +201,7 @@ async function main() {
 
     // Filter session events
     const sessionEvents = allEvents.filter(
-      (e) =>
-        e.properties?.sessionID === sessionId ||
-        (e.type === "session.created" && e.properties?.info?.id === sessionId)
+      (e) => e.properties?.sessionID === sessionId || (e.type === "session.created" && e.properties?.info?.id === sessionId),
     );
     saveJson("session-events", sessionEvents);
 
@@ -221,12 +215,7 @@ async function main() {
   }
 }
 
-async function waitForIdle(
-  opencodeUrl: string,
-  sessionId: string,
-  headers: Record<string, string>,
-  timeoutMs: number
-): Promise<void> {
+async function waitForIdle(opencodeUrl: string, sessionId: string, headers: Record<string, string>, timeoutMs: number): Promise<void> {
   const start = Date.now();
   await new Promise((r) => setTimeout(r, 500));
   while (Date.now() - start < timeoutMs) {
diff --git a/research/opencode-compat/snapshots/native/all-events.json b/research/opencode-compat/snapshots/native/all-events.json
index 7156d8e..295114a 100644
--- a/research/opencode-compat/snapshots/native/all-events.json
+++ b/research/opencode-compat/snapshots/native/all-events.json
@@ -1278,4 +1278,4 @@
       "diff": []
     }
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/native/message-1-response.json b/research/opencode-compat/snapshots/native/message-1-response.json
index 2cfeb88..f8bdfaa 100644
--- a/research/opencode-compat/snapshots/native/message-1-response.json
+++ b/research/opencode-compat/snapshots/native/message-1-response.json
@@ -66,4 +66,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/native/message-2-response.json b/research/opencode-compat/snapshots/native/message-2-response.json
index 19c5b2c..331c703 100644
--- a/research/opencode-compat/snapshots/native/message-2-response.json
+++ b/research/opencode-compat/snapshots/native/message-2-response.json
@@ -49,4 +49,4 @@
     }
   },
   "parts": []
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/native/messages-after-1.json b/research/opencode-compat/snapshots/native/messages-after-1.json
index 0daa794..777e348 100644
--- a/research/opencode-compat/snapshots/native/messages-after-1.json
+++ b/research/opencode-compat/snapshots/native/messages-after-1.json
@@ -96,4 +96,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/native/messages-after-2.json b/research/opencode-compat/snapshots/native/messages-after-2.json
index 886ba3d..015b9e7 100644
--- a/research/opencode-compat/snapshots/native/messages-after-2.json
+++ b/research/opencode-compat/snapshots/native/messages-after-2.json
@@ -278,4 +278,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/native/metadata-agent.json b/research/opencode-compat/snapshots/native/metadata-agent.json
index fd13d2a..1ba0625 100644
--- a/research/opencode-compat/snapshots/native/metadata-agent.json
+++ b/research/opencode-compat/snapshots/native/metadata-agent.json
@@ -602,4 +602,4 @@
     ],
     "prompt": "Summarize what was done in this conversation. Write like a pull request description.\n\nRules:\n- 2-3 sentences max\n- Describe the changes made, not the process\n- Do not mention running tests, builds, or other validation steps\n- Do not explain what the user asked for\n- Write in first person (I added..., I fixed...)\n- Never ask questions or add new questions\n- If the conversation ends with an unanswered question to the user, preserve that exact question\n- If the conversation ends with an imperative statement or request to the user (e.g. \"Now please run the command and paste the console output\"), always include that exact request in the summary\n"
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/native/metadata-config.json b/research/opencode-compat/snapshots/native/metadata-config.json
index 2170fdb..26edaae 100644
--- a/research/opencode-compat/snapshots/native/metadata-config.json
+++ b/research/opencode-compat/snapshots/native/metadata-config.json
@@ -99,4 +99,4 @@
     "terminal_title_toggle": "none",
     "tips_toggle": "<leader>h"
   }
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/native/metadata-providers.json b/research/opencode-compat/snapshots/native/metadata-providers.json
index f7049ac..b3bf5e3 100644
--- a/research/opencode-compat/snapshots/native/metadata-providers.json
+++ b/research/opencode-compat/snapshots/native/metadata-providers.json
@@ -4,9 +4,7 @@
       "id": "opencode",
       "source": "api",
       "name": "OpenCode Zen",
-      "env": [
-        "OPENCODE_API_KEY"
-      ],
+      "env": ["OPENCODE_API_KEY"],
       "options": {},
       "models": {
         "glm-4.7": {
@@ -272,30 +270,22 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "xhigh": {
               "reasoningEffort": "xhigh",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -351,23 +341,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -853,23 +837,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -976,30 +954,22 @@
             "none": {
               "reasoningEffort": "none",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -1055,30 +1025,22 @@
             "minimal": {
               "reasoningEffort": "minimal",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -1134,23 +1096,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -1472,23 +1428,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -1714,30 +1664,22 @@
             "minimal": {
               "reasoningEffort": "minimal",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -1844,37 +1786,27 @@
             "none": {
               "reasoningEffort": "none",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "xhigh": {
               "reasoningEffort": "xhigh",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         }
@@ -1885,9 +1817,7 @@
       "id": "cerebras",
       "source": "api",
       "name": "Cerebras",
-      "env": [
-        "CEREBRAS_API_KEY"
-      ],
+      "env": ["CEREBRAS_API_KEY"],
       "options": {
         "headers": {
           "X-Cerebras-3rd-Party-Integration": "opencode"
@@ -2054,9 +1984,7 @@
       "id": "openai",
       "source": "custom",
       "name": "OpenAI",
-      "env": [
-        "OPENAI_API_KEY"
-      ],
+      "env": ["OPENAI_API_KEY"],
       "options": {
         "apiKey": "opencode-oauth-dummy-key"
       },
@@ -2112,30 +2040,22 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "xhigh": {
               "reasoningEffort": "xhigh",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -2190,23 +2110,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -2261,23 +2175,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -2332,23 +2240,17 @@
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         },
@@ -2403,37 +2305,27 @@
             "none": {
               "reasoningEffort": "none",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "low": {
               "reasoningEffort": "low",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "medium": {
               "reasoningEffort": "medium",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "high": {
               "reasoningEffort": "high",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             },
             "xhigh": {
               "reasoningEffort": "xhigh",
               "reasoningSummary": "auto",
-              "include": [
-                "reasoning.encrypted_content"
-              ]
+              "include": ["reasoning.encrypted_content"]
             }
           }
         }
@@ -2443,9 +2335,7 @@
       "id": "anthropic",
       "source": "custom",
       "name": "Anthropic",
-      "env": [
-        "ANTHROPIC_API_KEY"
-      ],
+      "env": ["ANTHROPIC_API_KEY"],
       "options": {
         "apiKey": "",
         "headers": {
@@ -3713,4 +3603,4 @@
     "openai": "gpt-5.2-codex",
     "anthropic": "claude-sonnet-4-5-20250929"
   }
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/native/session-create.json b/research/opencode-compat/snapshots/native/session-create.json
index eb38538..467b002 100644
--- a/research/opencode-compat/snapshots/native/session-create.json
+++ b/research/opencode-compat/snapshots/native/session-create.json
@@ -9,4 +9,4 @@
     "created": 1770361012806,
     "updated": 1770361012806
   }
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/native/session-details.json b/research/opencode-compat/snapshots/native/session-details.json
index f3e4a40..6f5c481 100644
--- a/research/opencode-compat/snapshots/native/session-details.json
+++ b/research/opencode-compat/snapshots/native/session-details.json
@@ -14,4 +14,4 @@
     "deletions": 0,
     "files": 0
   }
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/native/session-events.json b/research/opencode-compat/snapshots/native/session-events.json
index a6630cc..0f1d119 100644
--- a/research/opencode-compat/snapshots/native/session-events.json
+++ b/research/opencode-compat/snapshots/native/session-events.json
@@ -153,4 +153,4 @@
       "diff": []
     }
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/native/session-status.json b/research/opencode-compat/snapshots/native/session-status.json
index 9e26dfe..0967ef4 100644
--- a/research/opencode-compat/snapshots/native/session-status.json
+++ b/research/opencode-compat/snapshots/native/session-status.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/research/opencode-compat/snapshots/sandbox-agent/all-events.json b/research/opencode-compat/snapshots/sandbox-agent/all-events.json
index 1ff6540..a530998 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/all-events.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/all-events.json
@@ -679,4 +679,4 @@
     },
     "type": "message.part.updated"
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/sandbox-agent/messages-after-1.json b/research/opencode-compat/snapshots/sandbox-agent/messages-after-1.json
index 432dfe8..2a8d9e9 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/messages-after-1.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/messages-after-1.json
@@ -103,4 +103,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/sandbox-agent/messages-after-2.json b/research/opencode-compat/snapshots/sandbox-agent/messages-after-2.json
index 778c702..7d45915 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/messages-after-2.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/messages-after-2.json
@@ -266,4 +266,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/sandbox-agent/metadata-agent.json b/research/opencode-compat/snapshots/sandbox-agent/metadata-agent.json
index fc8b612..2546f95 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/metadata-agent.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/metadata-agent.json
@@ -8,4 +8,4 @@
     "options": {},
     "permission": []
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/sandbox-agent/metadata-config.json b/research/opencode-compat/snapshots/sandbox-agent/metadata-config.json
index 9e26dfe..0967ef4 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/metadata-config.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/metadata-config.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/research/opencode-compat/snapshots/sandbox-agent/session-create.json b/research/opencode-compat/snapshots/sandbox-agent/session-create.json
index 36e0784..2e2a5c2 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/session-create.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/session-create.json
@@ -9,4 +9,4 @@
   },
   "title": "Session ses_1",
   "version": "0"
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/sandbox-agent/session-details.json b/research/opencode-compat/snapshots/sandbox-agent/session-details.json
index 36e0784..2e2a5c2 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/session-details.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/session-details.json
@@ -9,4 +9,4 @@
   },
   "title": "Session ses_1",
   "version": "0"
-}
\ No newline at end of file
+}
diff --git a/research/opencode-compat/snapshots/sandbox-agent/session-events.json b/research/opencode-compat/snapshots/sandbox-agent/session-events.json
index 66b86ab..03a08fb 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/session-events.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/session-events.json
@@ -652,4 +652,4 @@
     },
     "type": "message.part.updated"
   }
-]
\ No newline at end of file
+]
diff --git a/research/opencode-compat/snapshots/sandbox-agent/session-status.json b/research/opencode-compat/snapshots/sandbox-agent/session-status.json
index 8afc386..f10db28 100644
--- a/research/opencode-compat/snapshots/sandbox-agent/session-status.json
+++ b/research/opencode-compat/snapshots/sandbox-agent/session-status.json
@@ -2,4 +2,4 @@
   "ses_1": {
     "type": "idle"
   }
-}
\ No newline at end of file
+}
diff --git a/resources/agent-schemas/artifacts/json-schema/pi.json b/resources/agent-schemas/artifacts/json-schema/pi.json
index 3c92cfc..6a195ed 100644
--- a/resources/agent-schemas/artifacts/json-schema/pi.json
+++ b/resources/agent-schemas/artifacts/json-schema/pi.json
@@ -37,9 +37,7 @@
         },
         "error": {}
       },
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     },
     "RpcMessage": {
       "type": "object",
@@ -96,9 +94,7 @@
         "data": {},
         "error": {}
       },
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     },
     "RpcCommand": {
       "type": "object",
@@ -115,10 +111,7 @@
         },
         "params": {}
       },
-      "required": [
-        "type",
-        "command"
-      ]
+      "required": ["type", "command"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/resources/agent-schemas/src/pi.ts b/resources/agent-schemas/src/pi.ts
index 5c72c75..a032cf1 100644
--- a/resources/agent-schemas/src/pi.ts
+++ b/resources/agent-schemas/src/pi.ts
@@ -66,18 +66,11 @@ function findRepoRoot(root: string): string {
 }
 
 function resolveTsconfig(root: string): string | undefined {
-  const candidates = [
-    join(root, "tsconfig.json"),
-    join(root, "tsconfig.base.json"),
-    join(root, "packages", "coding-agent", "tsconfig.json"),
-  ];
+  const candidates = [join(root, "tsconfig.json"), join(root, "tsconfig.base.json"), join(root, "packages", "coding-agent", "tsconfig.json")];
   return candidates.find((path) => existsSync(path));
 }
 
-function generateDefinitions(
-  rpcTypesPath: string,
-  tsconfigPath?: string
-): Record<string, JSONSchema7> {
+function generateDefinitions(rpcTypesPath: string, tsconfigPath?: string): Record<string, JSONSchema7> {
   const definitions: Record<string, JSONSchema7> = {};
 
   for (const typeName of TARGET_TYPES) {
@@ -96,11 +89,7 @@ function generateDefinitions(
   return definitions;
 }
 
-function mergeDefinitions(
-  target: Record<string, JSONSchema7>,
-  schema: JSONSchema7,
-  typeName: string
-): void {
+function mergeDefinitions(target: Record<string, JSONSchema7>, schema: JSONSchema7, typeName: string): void {
   if (schema.definitions) {
     for (const [name, def] of Object.entries(schema.definitions)) {
       target[name] = def as JSONSchema7;
diff --git a/resources/vercel-ai-sdk-schemas/artifacts/json-schema/ui-message.json b/resources/vercel-ai-sdk-schemas/artifacts/json-schema/ui-message.json
index 12bedd7..235366d 100644
--- a/resources/vercel-ai-sdk-schemas/artifacts/json-schema/ui-message.json
+++ b/resources/vercel-ai-sdk-schemas/artifacts/json-schema/ui-message.json
@@ -11,11 +11,7 @@
         },
         "role": {
           "type": "string",
-          "enum": [
-            "system",
-            "user",
-            "assistant"
-          ],
+          "enum": ["system", "user", "assistant"],
           "description": "The role of the message."
         },
         "metadata": {
@@ -38,10 +34,7 @@
                   },
                   "state": {
                     "type": "string",
-                    "enum": [
-                      "streaming",
-                      "done"
-                    ],
+                    "enum": ["streaming", "done"],
                     "description": "The state of the text part."
                   },
                   "providerMetadata": {
@@ -85,10 +78,7 @@
                     "description": "The provider metadata."
                   }
                 },
-                "required": [
-                  "type",
-                  "text"
-                ],
+                "required": ["type", "text"],
                 "additionalProperties": false,
                 "description": "A text part of a message."
               },
@@ -105,10 +95,7 @@
                   },
                   "state": {
                     "type": "string",
-                    "enum": [
-                      "streaming",
-                      "done"
-                    ],
+                    "enum": ["streaming", "done"],
                     "description": "The state of the reasoning part."
                   },
                   "providerMetadata": {
@@ -152,10 +139,7 @@
                     "description": "The provider metadata."
                   }
                 },
-                "required": [
-                  "type",
-                  "text"
-                ],
+                "required": ["type", "text"],
                 "additionalProperties": false,
                 "description": "A reasoning part of a message."
               },
@@ -232,12 +216,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -308,13 +287,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "input",
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["input", "state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -372,9 +345,7 @@
                         "type": "string"
                       }
                     },
-                    "required": [
-                      "id"
-                    ],
+                    "required": ["id"],
                     "additionalProperties": false
                   },
                   "type": {
@@ -397,14 +368,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "approval",
-                  "input",
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["approval", "input", "state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -468,10 +432,7 @@
                         "type": "string"
                       }
                     },
-                    "required": [
-                      "id",
-                      "approved"
-                    ],
+                    "required": ["id", "approved"],
                     "additionalProperties": false
                   },
                   "type": {
@@ -494,14 +455,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "approval",
-                  "input",
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["approval", "input", "state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -570,10 +524,7 @@
                         "type": "string"
                       }
                     },
-                    "required": [
-                      "id",
-                      "approved"
-                    ],
+                    "required": ["id", "approved"],
                     "additionalProperties": false
                   },
                   "type": {
@@ -596,14 +547,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "input",
-                  "output",
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["input", "output", "state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -671,10 +615,7 @@
                         "type": "string"
                       }
                     },
-                    "required": [
-                      "id",
-                      "approved"
-                    ],
+                    "required": ["id", "approved"],
                     "additionalProperties": false
                   },
                   "type": {
@@ -697,14 +638,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "errorText",
-                  "input",
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["errorText", "input", "state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -769,10 +703,7 @@
                         "type": "string"
                       }
                     },
-                    "required": [
-                      "id",
-                      "approved"
-                    ],
+                    "required": ["id", "approved"],
                     "additionalProperties": false
                   },
                   "type": {
@@ -795,14 +726,7 @@
                     "description": "Whether the tool call was executed by the provider."
                   }
                 },
-                "required": [
-                  "approval",
-                  "input",
-                  "state",
-                  "toolCallId",
-                  "toolName",
-                  "type"
-                ]
+                "required": ["approval", "input", "state", "toolCallId", "toolName", "type"]
               },
               {
                 "type": "object",
@@ -861,11 +785,7 @@
                     "description": "Additional provider-specific metadata that is returned from the provider.\n\nThis is needed to enable provider-specific functionality that can be fully encapsulated in the provider."
                   }
                 },
-                "required": [
-                  "type",
-                  "sourceId",
-                  "url"
-                ],
+                "required": ["type", "sourceId", "url"],
                 "additionalProperties": false,
                 "description": "A source part of a message."
               },
@@ -929,12 +849,7 @@
                     "description": "Additional provider-specific metadata that is returned from the provider.\n\nThis is needed to enable provider-specific functionality that can be fully encapsulated in the provider."
                   }
                 },
-                "required": [
-                  "type",
-                  "sourceId",
-                  "mediaType",
-                  "title"
-                ],
+                "required": ["type", "sourceId", "mediaType", "title"],
                 "additionalProperties": false,
                 "description": "A document source part of a message."
               },
@@ -998,11 +913,7 @@
                     "description": "The provider metadata."
                   }
                 },
-                "required": [
-                  "type",
-                  "mediaType",
-                  "url"
-                ],
+                "required": ["type", "mediaType", "url"],
                 "additionalProperties": false,
                 "description": "A file part of a message."
               },
@@ -1018,9 +929,7 @@
                     "const": "step-start"
                   }
                 },
-                "required": [
-                  "type"
-                ],
+                "required": ["type"],
                 "additionalProperties": false,
                 "description": "A step boundary part of a message."
               }
@@ -1029,11 +938,7 @@
           "description": "The parts of the message. Use this for rendering the message in the UI.\n\nSystem messages should be avoided (set the system prompt on the server instead). They can have text parts.\n\nUser messages can have text parts and file parts.\n\nAssistant messages can have text, reasoning, tool invocation, and file parts."
         }
       },
-      "required": [
-        "id",
-        "role",
-        "parts"
-      ],
+      "required": ["id", "role", "parts"],
       "additionalProperties": false,
       "description": "AI SDK UI Messages. They are used in the client and to communicate between the frontend and the API routes."
     },
@@ -1103,4 +1008,4 @@
   "$id": "https://sandbox-agent/schemas/vercel-ai-sdk/ui-message.json",
   "title": "UIMessage",
   "description": "Vercel AI SDK v6.0.50 UIMessage"
-}
\ No newline at end of file
+}
diff --git a/resources/vercel-ai-sdk-schemas/src/index.ts b/resources/vercel-ai-sdk-schemas/src/index.ts
index 839c3b6..945bd4f 100644
--- a/resources/vercel-ai-sdk-schemas/src/index.ts
+++ b/resources/vercel-ai-sdk-schemas/src/index.ts
@@ -1,13 +1,4 @@
-import {
-  mkdtempSync,
-  mkdirSync,
-  readFileSync,
-  rmSync,
-  writeFileSync,
-  existsSync,
-  appendFileSync,
-  statSync,
-} from "fs";
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync, existsSync, appendFileSync, statSync } from "fs";
 import { join } from "path";
 import { tmpdir } from "os";
 import { createGenerator, type Config } from "ts-json-schema-generator";
@@ -117,15 +108,8 @@ function packageDirFor(name: string, nodeModulesDir: string): string {
   return join(nodeModulesDir, ...parts);
 }
 
-async function installPackage(
-  name: string,
-  versionRange: string,
-  nodeModulesDir: string,
-  installed: Set<string>
-): Promise<void> {
-  const encodedName = name.startsWith("@")
-    ? `@${encodeURIComponent(name.slice(1))}`
-    : encodeURIComponent(name);
+async function installPackage(name: string, versionRange: string, nodeModulesDir: string, installed: Set<string>): Promise<void> {
+  const encodedName = name.startsWith("@") ? `@${encodeURIComponent(name.slice(1))}` : encodeURIComponent(name);
   const registryUrl = `https://registry.npmjs.org/${encodedName}`;
   const registry = await fetchRegistry(registryUrl);
   const version = resolveVersionFromRange(registry, versionRange);
@@ -208,10 +192,7 @@ function patchValueOfAlias(nodeModulesDir: string): void {
     log("  [warn] ValueOf alias declaration not found");
   }
 
-  let patched = contents.replace(
-    /ObjectType\\s*\\[\\s*ValueType\\s*\\]/,
-    "ObjectType[string]"
-  );
+  let patched = contents.replace(/ObjectType\\s*\\[\\s*ValueType\\s*\\]/, "ObjectType[string]");
 
   if (patched !== contents) {
     writeFileSync(aiTypesPath, patched);
@@ -220,8 +201,7 @@ function patchValueOfAlias(nodeModulesDir: string): void {
   }
 
   const valueOfIndex = contents.indexOf("ValueOf");
-  const preview =
-    valueOfIndex === -1 ? contents.slice(0, 200) : contents.slice(valueOfIndex, valueOfIndex + 200);
+  const preview = valueOfIndex === -1 ? contents.slice(0, 200) : contents.slice(valueOfIndex, valueOfIndex + 200);
   log("  [warn] ValueOf alias not found in ai types");
   log(`  [debug] ai types path: ${aiTypesPath}`);
   log(`  [debug] preview: ${preview.replace(/\\s+/g, " ").slice(0, 200)}`);
@@ -318,7 +298,7 @@ function patchUiMessageTypes(nodeModulesDir: string): void {
 
   const dataReplaced = replaceAlias(
     "DataUIPart",
-    "type DataUIPart<DATA_TYPES extends UIDataTypes> = {\\n    type: `data-${string}`;\\n    id?: string;\\n    data: unknown;\\n};"
+    "type DataUIPart<DATA_TYPES extends UIDataTypes> = {\\n    type: `data-${string}`;\\n    id?: string;\\n    data: unknown;\\n};",
   );
   if (dataReplaced) {
     log("  [patch] Simplified DataUIPart to avoid indexed access");
@@ -326,7 +306,7 @@ function patchUiMessageTypes(nodeModulesDir: string): void {
 
   const toolReplaced = replaceAlias(
     "ToolUIPart",
-    "type ToolUIPart<TOOLS extends UITools = UITools> = {\\n    type: `tool-${string}`;\\n} & UIToolInvocation<UITool>;"
+    "type ToolUIPart<TOOLS extends UITools = UITools> = {\\n    type: `tool-${string}`;\\n} & UIToolInvocation<UITool>;",
   );
   if (toolReplaced) {
     log("  [patch] Simplified ToolUIPart to avoid indexed access");
diff --git a/scripts/agent-configs/dump.ts b/scripts/agent-configs/dump.ts
index 9df4d05..2aa8dfb 100644
--- a/scripts/agent-configs/dump.ts
+++ b/scripts/agent-configs/dump.ts
@@ -1,5 +1,6 @@
 /**
- * Fetches model/mode lists from agent backends and writes them to resources/.
+ * Fetches model/mode/thought-level lists from agent backends and writes them
+ * to resources/.
  *
  * Usage:
  *   npx tsx dump.ts                      # Dump all agents
@@ -10,11 +11,24 @@
  *   Claude  — Anthropic API (GET /v1/models?beta=true). Extracts API key from
  *             ANTHROPIC_API_KEY env. Falls back to aliases (default, sonnet, opus, haiku)
  *             on 401/403 or missing credentials.
+ *             Modes are hardcoded (discovered by ACP session/set_mode probing).
+ *             Claude does not implement session/set_config_option at all.
  *   Codex   — Codex app-server JSON-RPC (model/list over stdio, paginated).
+ *             Modes and thought levels are hardcoded (discovered from Codex's
+ *             ACP session/new configOptions response).
  *   OpenCode — OpenCode HTTP server (GET {base_url}/config/providers, fallback /provider).
- *             Model IDs formatted as {provider_id}/{model_id}.
+ *             Model IDs formatted as {provider_id}/{model_id}. Modes hardcoded.
  *   Cursor  — `cursor-agent models` CLI command. Parses the text output.
  *
+ * Derivation of hardcoded values:
+ *   When agents don't expose modes/thought levels through their model listing
+ *   APIs, we discover them by ACP probing against a running sandbox-agent server:
+ *   1. Create an ACP session via session/new and inspect the configOptions and
+ *      modes fields in the response.
+ *   2. Test session/set_mode with candidate mode IDs.
+ *   3. Test session/set_config_option with candidate config IDs and values.
+ *   See /tmp/probe-agents.sh or /tmp/probe-agents.ts for example probe scripts.
+ *
  * Output goes to resources/ alongside this script. These JSON files are committed
  * to the repo and included in the sandbox-agent binary at compile time via include_str!.
  */
@@ -37,11 +51,19 @@ interface ModeEntry {
   description?: string;
 }
 
+interface ThoughtLevelEntry {
+  id: string;
+  name: string;
+  description?: string;
+}
+
 interface AgentModelList {
   defaultModel: string;
   models: ModelEntry[];
   defaultMode?: string;
   modes?: ModeEntry[];
+  defaultThoughtLevel?: string;
+  thoughtLevels?: ThoughtLevelEntry[];
 }
 
 // ─── CLI ──────────────────────────────────────────────────────────────────────
@@ -65,9 +87,7 @@ for (let i = 0; i < args.length; i++) {
 }
 
 const RESOURCES_DIR = path.join(__dirname, "resources");
-const agents = agentFilter.length
-  ? agentFilter
-  : ["claude", "codex", "opencode", "cursor"];
+const agents = agentFilter.length ? agentFilter : ["claude", "codex", "opencode", "cursor"];
 
 async function main() {
   fs.mkdirSync(RESOURCES_DIR, { recursive: true });
@@ -100,9 +120,9 @@ function writeList(agent: string, list: AgentModelList) {
   const filePath = path.join(RESOURCES_DIR, `${agent}.json`);
   fs.writeFileSync(filePath, JSON.stringify(list, null, 2) + "\n");
   const modeCount = list.modes?.length ?? 0;
-  console.log(
-    `  Wrote ${list.models.length} models${modeCount ? `, ${modeCount} modes` : ""} to ${filePath} (default: ${list.defaultModel})`
-  );
+  const thoughtCount = list.thoughtLevels?.length ?? 0;
+  const extras = [modeCount ? `${modeCount} modes` : null, thoughtCount ? `${thoughtCount} thought levels` : null].filter(Boolean).join(", ");
+  console.log(`  Wrote ${list.models.length} models${extras ? `, ${extras}` : ""} to ${filePath} (default: ${list.defaultModel})`);
 }
 
 // ─── Claude ───────────────────────────────────────────────────────────────────
@@ -110,14 +130,28 @@ function writeList(agent: string, list: AgentModelList) {
 const ANTHROPIC_API_URL = "https://api.anthropic.com/v1/models?beta=true";
 const ANTHROPIC_VERSION = "2023-06-01";
 
+// Claude v0.20.0 (@zed-industries/claude-agent-acp) returns configOptions and
+// modes from session/new. Models and modes below match the ACP adapter source.
+// Note: `opus` is gated by subscription — it may not appear in session/new for
+// all credentials, but exists in the SDK model list. Thought levels are supported
+// by the Claude SDK (effort levels: low/medium/high/max for opus-4-6 and
+// sonnet-4-6) but the ACP adapter does not expose them as configOptions yet.
 const CLAUDE_FALLBACK: AgentModelList = {
   defaultModel: "default",
   models: [
-    { id: "default", name: "Default (recommended)" },
-    { id: "opus", name: "Opus" },
+    { id: "default", name: "Default" },
     { id: "sonnet", name: "Sonnet" },
+    { id: "opus", name: "Opus" },
     { id: "haiku", name: "Haiku" },
   ],
+  defaultMode: "default",
+  modes: [
+    { id: "default", name: "Default" },
+    { id: "acceptEdits", name: "Accept Edits" },
+    { id: "plan", name: "Plan" },
+    { id: "dontAsk", name: "Don't Ask" },
+    { id: "bypassPermissions", name: "Bypass Permissions" },
+  ],
 };
 
 async function dumpClaude() {
@@ -136,16 +170,12 @@ async function dumpClaude() {
 
   const response = await fetch(ANTHROPIC_API_URL, { headers });
   if (response.status === 401 || response.status === 403) {
-    console.log(
-      `  API returned ${response.status}, using fallback aliases`
-    );
+    console.log(`  API returned ${response.status}, using fallback aliases`);
     writeList("claude", CLAUDE_FALLBACK);
     return;
   }
   if (!response.ok) {
-    throw new Error(
-      `Anthropic API returned ${response.status}: ${await response.text()}`
-    );
+    throw new Error(`Anthropic API returned ${response.status}: ${await response.text()}`);
   }
 
   const body = (await response.json()) as {
@@ -185,6 +215,9 @@ async function dumpClaude() {
   writeList("claude", {
     defaultModel: defaultModel ?? models[0]?.id ?? "default",
     models,
+    // Modes from Claude ACP adapter v0.20.0 session/new response.
+    defaultMode: "default",
+    modes: CLAUDE_FALLBACK.modes,
   });
 }
 
@@ -277,16 +310,43 @@ async function dumpCodex() {
 
   models.sort((a, b) => a.id.localeCompare(b.id));
 
+  // Codex modes and thought levels come from its ACP session/new configOptions
+  // response (category: "mode" and category: "thought_level"). The model/list
+  // RPC only returns models, so modes/thought levels are hardcoded here based
+  // on probing Codex's session/new response.
   writeList("codex", {
     defaultModel: defaultModel ?? models[0]?.id ?? "",
     models,
+    defaultMode: "read-only",
+    modes: [
+      {
+        id: "read-only",
+        name: "Read Only",
+        description: "Codex can read files in the current workspace. Approval is required to edit files or access the internet.",
+      },
+      {
+        id: "auto",
+        name: "Default",
+        description:
+          "Codex can read and edit files in the current workspace, and run commands. Approval is required to access the internet or edit other files.",
+      },
+      {
+        id: "full-access",
+        name: "Full Access",
+        description: "Codex can edit files outside this workspace and access the internet without asking for approval.",
+      },
+    ],
+    defaultThoughtLevel: "high",
+    thoughtLevels: [
+      { id: "low", name: "Low", description: "Fast responses with lighter reasoning" },
+      { id: "medium", name: "Medium", description: "Balances speed and reasoning depth for everyday tasks" },
+      { id: "high", name: "High", description: "Greater reasoning depth for complex problems" },
+      { id: "xhigh", name: "Xhigh", description: "Extra high reasoning depth for complex problems" },
+    ],
   });
 }
 
-function readLineWithTimeout(
-  rl: readline.Interface,
-  timeoutMs: number
-): Promise<string> {
+function readLineWithTimeout(rl: readline.Interface, timeoutMs: number): Promise<string> {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => {
       reject(new Error("readline timeout"));
@@ -307,17 +367,12 @@ function readLineWithTimeout(
 async function dumpOpencode() {
   const baseUrl = opencodeUrl ?? process.env.OPENCODE_URL;
   if (!baseUrl) {
-    console.log(
-      "  Skipped: --opencode-url not provided (set OPENCODE_URL or pass --opencode-url)"
-    );
+    console.log("  Skipped: --opencode-url not provided (set OPENCODE_URL or pass --opencode-url)");
     return;
   }
   console.log(`Fetching OpenCode models from ${baseUrl}...`);
 
-  const endpoints = [
-    `${baseUrl}/config/providers`,
-    `${baseUrl}/provider`,
-  ];
+  const endpoints = [`${baseUrl}/config/providers`, `${baseUrl}/provider`];
 
   for (const url of endpoints) {
     try {
@@ -341,16 +396,14 @@ async function dumpOpencode() {
   throw new Error("OpenCode model endpoints unavailable");
 }
 
-function parseOpencodeProviders(
-  value: Record<string, unknown>
-): AgentModelList | null {
-  const providers = (
-    (value.providers as unknown[]) ?? (value.all as unknown[])
-  ) as Array<{
-    id: string;
-    name?: string;
-    models?: Record<string, { id?: string; name?: string }>;
-  }> | undefined;
+function parseOpencodeProviders(value: Record<string, unknown>): AgentModelList | null {
+  const providers = ((value.providers as unknown[]) ?? (value.all as unknown[])) as
+    | Array<{
+        id: string;
+        name?: string;
+        models?: Record<string, { id?: string; name?: string }>;
+      }>
+    | undefined;
   if (!providers) return null;
 
   const defaultMap = (value.default as Record<string, string>) ?? {};
@@ -394,8 +447,7 @@ function parseOpencodeProviders(
       {
         id: "build",
         name: "Build",
-        description:
-          "The default agent. Executes tools based on configured permissions.",
+        description: "The default agent. Executes tools based on configured permissions.",
       },
       {
         id: "plan",
@@ -412,9 +464,7 @@ async function dumpCursor() {
   console.log("Fetching Cursor models...");
   const binary = cursorPath ?? findBinary("cursor-agent");
   if (!binary) {
-    throw new Error(
-      "cursor-agent binary not found (set --cursor-path or add to PATH)"
-    );
+    throw new Error("cursor-agent binary not found (set --cursor-path or add to PATH)");
   }
   console.log(`  Using binary: ${binary}`);
 
@@ -430,9 +480,7 @@ async function dumpCursor() {
   for (const rawLine of output.split("\n")) {
     // Strip ANSI escape codes
     const line = rawLine.replace(/\x1b\[[0-9;]*[A-Za-z]|\x1b\[?[0-9;]*[A-Za-z]/g, "").trim();
-    const match = line.match(
-      /^(\S+)\s+-\s+(.+?)(?:\s+\((current|default)\))?$/
-    );
+    const match = line.match(/^(\S+)\s+-\s+(.+?)(?:\s+\((current|default)\))?$/);
     if (!match) continue;
     const [, id, name, tag] = match;
     models.push({ id, name: name.trim() });
@@ -442,9 +490,7 @@ async function dumpCursor() {
   }
 
   if (models.length === 0) {
-    throw new Error(
-      "cursor-agent models returned no parseable models"
-    );
+    throw new Error("cursor-agent models returned no parseable models");
   }
 
   writeList("cursor", {
@@ -457,13 +503,7 @@ async function dumpCursor() {
 
 function findBinary(name: string): string | null {
   // Check sandbox-agent install dir
-  const installDir = path.join(
-    process.env.HOME ?? "",
-    ".local",
-    "share",
-    "sandbox-agent",
-    "bin"
-  );
+  const installDir = path.join(process.env.HOME ?? "", ".local", "share", "sandbox-agent", "bin");
   const installed = path.join(installDir, name);
   if (fs.existsSync(installed)) return installed;
 
diff --git a/scripts/agent-configs/package.json b/scripts/agent-configs/package.json
index 3973896..376be7b 100644
--- a/scripts/agent-configs/package.json
+++ b/scripts/agent-configs/package.json
@@ -1,19 +1,19 @@
 {
-	"name": "agent-configs",
-	"version": "1.0.0",
-	"description": "Fetches model/mode lists from agent backends and dumps them to JSON",
-	"scripts": {
-		"dump": "npx tsx dump.ts",
-		"dump:claude": "npx tsx dump.ts --agent claude",
-		"dump:codex": "npx tsx dump.ts --agent codex",
-		"dump:opencode": "npx tsx dump.ts --agent opencode",
-		"dump:cursor": "npx tsx dump.ts --agent cursor",
-		"check-types": "tsc --noEmit"
-	},
-	"packageManager": "pnpm@10.13.1",
-	"devDependencies": {
-		"@types/node": "^24.3.0",
-		"tsx": "^4.19.0",
-		"typescript": "^5.8.0"
-	}
+  "name": "agent-configs",
+  "version": "1.0.0",
+  "description": "Fetches model/mode lists from agent backends and dumps them to JSON",
+  "scripts": {
+    "dump": "npx tsx dump.ts",
+    "dump:claude": "npx tsx dump.ts --agent claude",
+    "dump:codex": "npx tsx dump.ts --agent codex",
+    "dump:opencode": "npx tsx dump.ts --agent opencode",
+    "dump:cursor": "npx tsx dump.ts --agent cursor",
+    "check-types": "tsc --noEmit"
+  },
+  "packageManager": "pnpm@10.13.1",
+  "devDependencies": {
+    "@types/node": "^24.3.0",
+    "tsx": "^4.19.0",
+    "typescript": "^5.8.0"
+  }
 }
diff --git a/scripts/agent-configs/resources/claude.json b/scripts/agent-configs/resources/claude.json
index a9130dc..73162a2 100644
--- a/scripts/agent-configs/resources/claude.json
+++ b/scripts/agent-configs/resources/claude.json
@@ -3,19 +3,42 @@
   "models": [
     {
       "id": "default",
-      "name": "Default (recommended)"
-    },
-    {
-      "id": "opus",
-      "name": "Opus"
+      "name": "Default"
     },
     {
       "id": "sonnet",
       "name": "Sonnet"
     },
+    {
+      "id": "opus",
+      "name": "Opus"
+    },
     {
       "id": "haiku",
       "name": "Haiku"
     }
+  ],
+  "defaultMode": "default",
+  "modes": [
+    {
+      "id": "default",
+      "name": "Default"
+    },
+    {
+      "id": "acceptEdits",
+      "name": "Accept Edits"
+    },
+    {
+      "id": "plan",
+      "name": "Plan"
+    },
+    {
+      "id": "dontAsk",
+      "name": "Don't Ask"
+    },
+    {
+      "id": "bypassPermissions",
+      "name": "Bypass Permissions"
+    }
   ]
 }
diff --git a/scripts/agent-configs/resources/codex.json b/scripts/agent-configs/resources/codex.json
index 289f00a..e3cfdd1 100644
--- a/scripts/agent-configs/resources/codex.json
+++ b/scripts/agent-configs/resources/codex.json
@@ -2,24 +2,62 @@
   "defaultModel": "gpt-5.3-codex",
   "models": [
     {
-      "id": "gpt-5.1-codex-max",
-      "name": "gpt-5.1-codex-max"
+      "id": "gpt-5.3-codex",
+      "name": "gpt-5.3-codex"
     },
     {
-      "id": "gpt-5.1-codex-mini",
-      "name": "gpt-5.1-codex-mini"
-    },
-    {
-      "id": "gpt-5.2",
-      "name": "gpt-5.2"
+      "id": "gpt-5.3-codex-spark",
+      "name": "GPT-5.3-Codex-Spark"
     },
     {
       "id": "gpt-5.2-codex",
       "name": "gpt-5.2-codex"
     },
     {
-      "id": "gpt-5.3-codex",
-      "name": "gpt-5.3-codex"
+      "id": "gpt-5.1-codex-max",
+      "name": "gpt-5.1-codex-max"
+    },
+    {
+      "id": "gpt-5.2",
+      "name": "gpt-5.2"
+    },
+    {
+      "id": "gpt-5.1-codex-mini",
+      "name": "gpt-5.1-codex-mini"
+    }
+  ],
+  "defaultMode": "read-only",
+  "modes": [
+    {
+      "id": "read-only",
+      "name": "Read Only"
+    },
+    {
+      "id": "auto",
+      "name": "Default"
+    },
+    {
+      "id": "full-access",
+      "name": "Full Access"
+    }
+  ],
+  "defaultThoughtLevel": "high",
+  "thoughtLevels": [
+    {
+      "id": "low",
+      "name": "Low"
+    },
+    {
+      "id": "medium",
+      "name": "Medium"
+    },
+    {
+      "id": "high",
+      "name": "High"
+    },
+    {
+      "id": "xhigh",
+      "name": "Xhigh"
     }
   ]
 }
diff --git a/scripts/agent-configs/tsconfig.json b/scripts/agent-configs/tsconfig.json
index 7b692e7..3cf4a4f 100644
--- a/scripts/agent-configs/tsconfig.json
+++ b/scripts/agent-configs/tsconfig.json
@@ -1,8 +1,8 @@
 {
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"types": ["node"]
-	},
-	"include": ["**/*.ts"],
-	"exclude": ["node_modules"]
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules"]
 }
diff --git a/scripts/audit-acp-deps/adapters.json b/scripts/audit-acp-deps/adapters.json
new file mode 100644
index 0000000..3f7b1f4
--- /dev/null
+++ b/scripts/audit-acp-deps/adapters.json
@@ -0,0 +1,32 @@
+{
+  "sdkDeps": {
+    "@agentclientprotocol/sdk": "^0.16.1"
+  },
+  "adapters": [
+    {
+      "agentId": "claude",
+      "npmPackage": "@zed-industries/claude-agent-acp",
+      "pinnedVersion": "0.20.0"
+    },
+    {
+      "agentId": "codex",
+      "npmPackage": "@zed-industries/codex-acp",
+      "pinnedVersion": "0.1.0"
+    },
+    {
+      "agentId": "amp",
+      "npmPackage": "amp-acp",
+      "pinnedVersion": "0.7.0"
+    },
+    {
+      "agentId": "pi",
+      "npmPackage": "pi-acp",
+      "pinnedVersion": "0.0.23"
+    },
+    {
+      "agentId": "cursor",
+      "npmPackage": "@blowmage/cursor-agent-acp",
+      "pinnedVersion": "0.1.0"
+    }
+  ]
+}
diff --git a/scripts/release/build-artifacts.ts b/scripts/release/build-artifacts.ts
index 736a9c5..fe298e3 100644
--- a/scripts/release/build-artifacts.ts
+++ b/scripts/release/build-artifacts.ts
@@ -4,33 +4,30 @@ import type { ReleaseOpts } from "./main";
 import { assertDirExists, PREFIX, uploadDirToReleases } from "./utils";
 
 export async function buildJsArtifacts(opts: ReleaseOpts) {
-	await buildAndUploadTypescriptSdk(opts);
+  await buildAndUploadTypescriptSdk(opts);
 }
 
 async function buildAndUploadTypescriptSdk(opts: ReleaseOpts) {
-	console.log(`==> Building TypeScript SDK`);
+  console.log(`==> Building TypeScript SDK`);
 
-	// Build TypeScript SDK
-	await $({
-		stdio: "inherit",
-		cwd: opts.root,
-	})`pnpm --filter sandbox-agent build`;
+  // Build TypeScript SDK
+  await $({
+    stdio: "inherit",
+    cwd: opts.root,
+  })`pnpm --filter sandbox-agent build`;
 
-	console.log(`✅ TypeScript SDK built successfully`);
+  console.log(`✅ TypeScript SDK built successfully`);
 
-	// Upload TypeScript SDK to R2
-	console.log(`==> Uploading TypeScript SDK Artifacts`);
+  // Upload TypeScript SDK to R2
+  console.log(`==> Uploading TypeScript SDK Artifacts`);
 
-	const sdkDistPath = path.resolve(
-		opts.root,
-		"sdks/typescript/dist",
-	);
+  const sdkDistPath = path.resolve(opts.root, "sdks/typescript/dist");
 
-	await assertDirExists(sdkDistPath);
+  await assertDirExists(sdkDistPath);
 
-	// Upload to commit directory
-	console.log(`Uploading TypeScript SDK to ${PREFIX}/${opts.commit}/typescript/`);
-	await uploadDirToReleases(sdkDistPath, `${PREFIX}/${opts.commit}/typescript/`);
+  // Upload to commit directory
+  console.log(`Uploading TypeScript SDK to ${PREFIX}/${opts.commit}/typescript/`);
+  await uploadDirToReleases(sdkDistPath, `${PREFIX}/${opts.commit}/typescript/`);
 
-	console.log(`✅ TypeScript SDK artifacts uploaded successfully`);
+  console.log(`✅ TypeScript SDK artifacts uploaded successfully`);
 }
diff --git a/scripts/release/docker.ts b/scripts/release/docker.ts
index 2c44d94..a8a52de 100644
--- a/scripts/release/docker.ts
+++ b/scripts/release/docker.ts
@@ -5,45 +5,57 @@ import { fetchGitRef, versionOrCommitToRef } from "./utils";
 const IMAGE = "rivetdev/sandbox-agent";
 
 export async function tagDocker(opts: ReleaseOpts) {
-	// Determine which commit to use for source images
-	let sourceCommit = opts.commit;
-	if (opts.reuseEngineVersion) {
-		console.log(`==> Reusing Docker images from ${opts.reuseEngineVersion}`);
-		const ref = versionOrCommitToRef(opts.reuseEngineVersion);
-		await fetchGitRef(ref);
-		const result = await $`git rev-parse ${ref}`;
-		sourceCommit = result.stdout.trim().slice(0, 7);
-		console.log(`==> Source commit: ${sourceCommit}`);
-	}
+  // Determine which commit to use for source images
+  let sourceCommit = opts.commit;
+  if (opts.reuseEngineVersion) {
+    console.log(`==> Reusing Docker images from ${opts.reuseEngineVersion}`);
+    const ref = versionOrCommitToRef(opts.reuseEngineVersion);
+    await fetchGitRef(ref);
+    const result = await $`git rev-parse ${ref}`;
+    sourceCommit = result.stdout.trim().slice(0, 7);
+    console.log(`==> Source commit: ${sourceCommit}`);
+  }
 
-	// Check both architecture images exist using manifest inspect
-	console.log(`==> Checking images exist: ${IMAGE}:${sourceCommit}-{amd64,arm64}`);
-	try {
-		console.log(`==> Inspecting ${IMAGE}:${sourceCommit}-amd64`);
-		await $({ stdio: "inherit" })`docker manifest inspect ${IMAGE}:${sourceCommit}-amd64`;
-		console.log(`==> Inspecting ${IMAGE}:${sourceCommit}-arm64`);
-		await $({ stdio: "inherit" })`docker manifest inspect ${IMAGE}:${sourceCommit}-arm64`;
-		console.log(`==> Both images exist`);
-	} catch (error) {
-		console.warn(`⚠️ Docker images ${IMAGE}:${sourceCommit}-{amd64,arm64} not found - skipping Docker tagging`);
-		console.warn(`   To enable Docker tagging, build and push images first, then retry the release.`);
-		return;
-	}
+  try {
+    await ensureArchImagesExist(sourceCommit, "");
+  } catch (error) {
+    console.warn(`⚠️ Docker images ${IMAGE}:${sourceCommit}-{amd64,arm64} not found - skipping Docker tagging`);
+    console.warn(`   To enable Docker tagging, build and push images first, then retry the release.`);
+    return;
+  }
 
-	// Create and push manifest with version
-	await createManifest(sourceCommit, opts.version);
+  await createManifest(sourceCommit, opts.version);
+  if (opts.latest) {
+    await createManifest(sourceCommit, "latest");
+    await createManifest(sourceCommit, opts.minorVersionChannel);
+  }
 
-	// Create and push manifest with latest
-	if (opts.latest) {
-		await createManifest(sourceCommit, "latest");
-		await createManifest(sourceCommit, opts.minorVersionChannel);
-	}
+  try {
+    await ensureArchImagesExist(sourceCommit, "-full");
+    await createManifest(sourceCommit, `${opts.version}-full`, "-full");
+    if (opts.latest) {
+      await createManifest(sourceCommit, `${opts.minorVersionChannel}-full`, "-full");
+      await createManifest(sourceCommit, "full", "-full");
+    }
+  } catch (error) {
+    console.warn(`⚠️ Full Docker images ${IMAGE}:${sourceCommit}-full-{amd64,arm64} not found - skipping full Docker tagging`);
+    console.warn(`   To enable full Docker tagging, build and push full images first, then retry the release.`);
+  }
 }
 
-async function createManifest(from: string, to: string) {
-	console.log(`==> Creating manifest: ${IMAGE}:${to} from ${IMAGE}:${from}-{amd64,arm64}`);
-
-	// Use buildx imagetools to create and push multi-arch manifest
-	// This works with manifest lists as inputs (unlike docker manifest create)
-	await $({ stdio: "inherit" })`docker buildx imagetools create --tag ${IMAGE}:${to} ${IMAGE}:${from}-amd64 ${IMAGE}:${from}-arm64`;
+async function ensureArchImagesExist(sourceCommit: string, variantSuffix: "" | "-full") {
+  console.log(`==> Checking images exist: ${IMAGE}:${sourceCommit}${variantSuffix}-{amd64,arm64}`);
+  console.log(`==> Inspecting ${IMAGE}:${sourceCommit}${variantSuffix}-amd64`);
+  await $({ stdio: "inherit" })`docker manifest inspect ${IMAGE}:${sourceCommit}${variantSuffix}-amd64`;
+  console.log(`==> Inspecting ${IMAGE}:${sourceCommit}${variantSuffix}-arm64`);
+  await $({ stdio: "inherit" })`docker manifest inspect ${IMAGE}:${sourceCommit}${variantSuffix}-arm64`;
+  console.log(`==> Both images exist`);
+}
+
+async function createManifest(from: string, to: string, variantSuffix: "" | "-full" = "") {
+  console.log(`==> Creating manifest: ${IMAGE}:${to} from ${IMAGE}:${from}${variantSuffix}-{amd64,arm64}`);
+
+  await $({
+    stdio: "inherit",
+  })`docker buildx imagetools create --tag ${IMAGE}:${to} ${IMAGE}:${from}${variantSuffix}-amd64 ${IMAGE}:${from}${variantSuffix}-arm64`;
 }
diff --git a/scripts/release/git.ts b/scripts/release/git.ts
index 6f7cf7b..a746ef3 100644
--- a/scripts/release/git.ts
+++ b/scripts/release/git.ts
@@ -2,83 +2,75 @@ import { $ } from "execa";
 import type { ReleaseOpts } from "./main";
 
 export async function validateGit(_opts: ReleaseOpts) {
-	// Validate there's no uncommitted changes
-	const result = await $`git status --porcelain`;
-	const status = result.stdout;
-	if (status.trim().length > 0) {
-		throw new Error(
-			"There are uncommitted changes. Please commit or stash them.",
-		);
-	}
+  // Validate there's no uncommitted changes
+  const result = await $`git status --porcelain`;
+  const status = result.stdout;
+  if (status.trim().length > 0) {
+    throw new Error("There are uncommitted changes. Please commit or stash them.");
+  }
 }
 
 export async function createAndPushTag(opts: ReleaseOpts) {
-	console.log(`Creating tag v${opts.version}...`);
-	try {
-		// Create tag and force update if it exists
-		await $({ stdio: "inherit", cwd: opts.root })`git tag -f v${opts.version}`;
+  console.log(`Creating tag v${opts.version}...`);
+  try {
+    // Create tag and force update if it exists
+    await $({ stdio: "inherit", cwd: opts.root })`git tag -f v${opts.version}`;
 
-		// Push tag with force to ensure it's updated
-		await $({ stdio: "inherit", cwd: opts.root })`git push origin v${opts.version} -f`;
+    // Push tag with force to ensure it's updated
+    await $({ stdio: "inherit", cwd: opts.root })`git push origin v${opts.version} -f`;
 
-		console.log(`✅ Tag v${opts.version} created and pushed`);
-	} catch (err) {
-		console.error("❌ Failed to create or push tag");
-		throw err;
-	}
+    console.log(`✅ Tag v${opts.version} created and pushed`);
+  } catch (err) {
+    console.error("❌ Failed to create or push tag");
+    throw err;
+  }
 }
 
 export async function createGitHubRelease(opts: ReleaseOpts) {
-	console.log("Creating GitHub release...");
+  console.log("Creating GitHub release...");
 
-	try {
-		// Get the current tag name (should be the tag created during the release process)
-		const { stdout: currentTag } = await $({
-			cwd: opts.root,
-		})`git describe --tags --exact-match`;
-		const tagName = currentTag.trim();
+  try {
+    // Get the current tag name (should be the tag created during the release process)
+    const { stdout: currentTag } = await $({
+      cwd: opts.root,
+    })`git describe --tags --exact-match`;
+    const tagName = currentTag.trim();
 
-		console.log(`Looking for existing release for ${opts.version}`);
+    console.log(`Looking for existing release for ${opts.version}`);
 
-		// Check if a release with this version name already exists
-		const { stdout: releaseJson } = await $({
-			cwd: opts.root,
-		})`gh release list --json name,tagName`;
-		const releases = JSON.parse(releaseJson);
-		const existingRelease = releases.find(
-			(r: any) => r.name === opts.version,
-		);
+    // Check if a release with this version name already exists
+    const { stdout: releaseJson } = await $({
+      cwd: opts.root,
+    })`gh release list --json name,tagName`;
+    const releases = JSON.parse(releaseJson);
+    const existingRelease = releases.find((r: any) => r.name === opts.version);
 
-		if (existingRelease) {
-			console.log(
-				`Updating release ${opts.version} to point to new tag ${tagName}`,
-			);
-			await $({
-				stdio: "inherit",
-				cwd: opts.root,
-			})`gh release edit ${existingRelease.tagName} --tag ${tagName}`;
-		} else {
-			console.log(
-				`Creating new release ${opts.version} pointing to tag ${tagName}`,
-			);
-			await $({
-				stdio: "inherit",
-				cwd: opts.root,
-			})`gh release create ${tagName} --title ${opts.version} --generate-notes`;
+    if (existingRelease) {
+      console.log(`Updating release ${opts.version} to point to new tag ${tagName}`);
+      await $({
+        stdio: "inherit",
+        cwd: opts.root,
+      })`gh release edit ${existingRelease.tagName} --tag ${tagName}`;
+    } else {
+      console.log(`Creating new release ${opts.version} pointing to tag ${tagName}`);
+      await $({
+        stdio: "inherit",
+        cwd: opts.root,
+      })`gh release create ${tagName} --title ${opts.version} --generate-notes`;
 
-			// Check if this is a pre-release (contains -rc. or similar)
-			if (opts.version.includes("-")) {
-				await $({
-					stdio: "inherit",
-					cwd: opts.root,
-				})`gh release edit ${tagName} --prerelease`;
-			}
-		}
+      // Check if this is a pre-release (contains -rc. or similar)
+      if (opts.version.includes("-")) {
+        await $({
+          stdio: "inherit",
+          cwd: opts.root,
+        })`gh release edit ${tagName} --prerelease`;
+      }
+    }
 
-		console.log("✅ GitHub release created/updated");
-	} catch (err) {
-		console.error("❌ Failed to create GitHub release");
-		console.warn("! You may need to create the release manually");
-		throw err;
-	}
+    console.log("✅ GitHub release created/updated");
+  } catch (err) {
+    console.error("❌ Failed to create GitHub release");
+    console.warn("! You may need to create the release manually");
+    throw err;
+  }
 }
diff --git a/scripts/release/main.ts b/scripts/release/main.ts
index 1a8c3a3..9723447 100755
--- a/scripts/release/main.ts
+++ b/scripts/release/main.ts
@@ -8,12 +8,8 @@ import * as semver from "semver";
 import { buildJsArtifacts } from "./build-artifacts";
 import { promoteArtifacts } from "./promote-artifacts";
 import { tagDocker } from "./docker";
-import {
-	createAndPushTag,
-	createGitHubRelease,
-	validateGit,
-} from "./git";
-import { publishCrates, publishNpmCli, publishNpmCliShared, publishNpmSdk } from "./sdk";
+import { createAndPushTag, createGitHubRelease, validateGit } from "./git";
+import { publishCrates, publishNpmCli, publishNpmLibraries } from "./sdk";
 import { updateVersion } from "./update_version";
 import { assert, assertEquals, fetchGitRef, versionOrCommitToRef } from "./utils";
 
@@ -21,628 +17,579 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 const ROOT_DIR = path.resolve(__dirname, "..", "..");
 
 export interface ReleaseOpts {
-	root: string;
-	version: string;
-	latest: boolean;
-	minorVersionChannel: string;
-	/** Commit to publish release for. */
-	commit: string;
-	/** Optional version to reuse artifacts and Docker images from instead of building. */
-	reuseEngineVersion?: string;
+  root: string;
+  version: string;
+  latest: boolean;
+  minorVersionChannel: string;
+  /** Commit to publish release for. */
+  commit: string;
+  /** Optional version to reuse artifacts and Docker images from instead of building. */
+  reuseEngineVersion?: string;
 }
 
 async function getAllGitVersions(): Promise<string[]> {
-	try {
-		// Fetch tags to ensure we have the latest
-		// Use --force to overwrite local tags that conflict with remote
-		try {
-			await $`git fetch --tags --force --quiet`;
-		} catch (fetchError) {
-			console.warn("Warning: Could not fetch remote tags, using local tags only");
-		}
+  try {
+    // Fetch tags to ensure we have the latest
+    // Use --force to overwrite local tags that conflict with remote
+    try {
+      await $`git fetch --tags --force --quiet`;
+    } catch (fetchError) {
+      console.warn("Warning: Could not fetch remote tags, using local tags only");
+    }
 
-		// Get all version tags
-		const result = await $`git tag -l v*`;
-		const tags = result.stdout.trim().split("\n").filter(Boolean);
+    // Get all version tags
+    const result = await $`git tag -l v*`;
+    const tags = result.stdout.trim().split("\n").filter(Boolean);
 
-		if (tags.length === 0) {
-			return [];
-		}
+    if (tags.length === 0) {
+      return [];
+    }
 
-		// Parse and sort all versions (newest first)
-		const versions = tags
-			.map(tag => tag.replace(/^v/, ""))
-			.filter(v => semver.valid(v))
-			.sort((a, b) => semver.rcompare(a, b));
+    // Parse and sort all versions (newest first)
+    const versions = tags
+      .map((tag) => tag.replace(/^v/, ""))
+      .filter((v) => semver.valid(v))
+      .sort((a, b) => semver.rcompare(a, b));
 
-		return versions;
-	} catch (error) {
-		console.warn("Warning: Could not get git tags:", error);
-		return [];
-	}
+    return versions;
+  } catch (error) {
+    console.warn("Warning: Could not get git tags:", error);
+    return [];
+  }
 }
 
 async function getLatestGitVersion(): Promise<string | null> {
-	const versions = await getAllGitVersions();
+  const versions = await getAllGitVersions();
 
-	if (versions.length === 0) {
-		return null;
-	}
+  if (versions.length === 0) {
+    return null;
+  }
 
-	// Find the latest version (excluding prereleases)
-	const stableVersions = versions.filter(v => {
-		const parsed = semver.parse(v);
-		return parsed && parsed.prerelease.length === 0;
-	});
+  // Find the latest version (excluding prereleases)
+  const stableVersions = versions.filter((v) => {
+    const parsed = semver.parse(v);
+    return parsed && parsed.prerelease.length === 0;
+  });
 
-	return stableVersions[0] || null;
+  return stableVersions[0] || null;
 }
 
 async function shouldTagAsLatest(newVersion: string): Promise<boolean> {
-	// Check if version has prerelease identifier
-	const parsedVersion = semver.parse(newVersion);
-	if (!parsedVersion) {
-		throw new Error(`Invalid semantic version: ${newVersion}`);
-	}
+  // Check if version has prerelease identifier
+  const parsedVersion = semver.parse(newVersion);
+  if (!parsedVersion) {
+    throw new Error(`Invalid semantic version: ${newVersion}`);
+  }
 
-	// If it has a prerelease identifier, it's not latest
-	if (parsedVersion.prerelease.length > 0) {
-		return false;
-	}
+  // If it has a prerelease identifier, it's not latest
+  if (parsedVersion.prerelease.length > 0) {
+    return false;
+  }
 
-	// Get the latest version from git tags
-	const latestGitVersion = await getLatestGitVersion();
+  // Get the latest version from git tags
+  const latestGitVersion = await getLatestGitVersion();
 
-	// If no previous versions exist, this is the latest
-	if (!latestGitVersion) {
-		return true;
-	}
+  // If no previous versions exist, this is the latest
+  if (!latestGitVersion) {
+    return true;
+  }
 
-	// Check if new version is greater than the latest git version
-	return semver.gt(newVersion, latestGitVersion);
+  // Check if new version is greater than the latest git version
+  return semver.gt(newVersion, latestGitVersion);
 }
 
 async function validateReuseVersion(version: string): Promise<void> {
-	console.log(`Validating that ${version} exists...`);
+  console.log(`Validating that ${version} exists...`);
 
-	const ref = versionOrCommitToRef(version);
-	await fetchGitRef(ref);
+  const ref = versionOrCommitToRef(version);
+  await fetchGitRef(ref);
 
-	// Get short commit from ref
-	let shortCommit: string;
-	try {
-		const result = await $`git rev-parse ${ref}`;
-		const fullCommit = result.stdout.trim();
-		shortCommit = fullCommit.slice(0, 7);
-		console.log(`✅ Found ${ref} (commit ${shortCommit})`);
-	} catch (error) {
-		throw new Error(
-			`${version} does not exist in git. Make sure ${ref} exists in the repository.`,
-		);
-	}
+  // Get short commit from ref
+  let shortCommit: string;
+  try {
+    const result = await $`git rev-parse ${ref}`;
+    const fullCommit = result.stdout.trim();
+    shortCommit = fullCommit.slice(0, 7);
+    console.log(`✅ Found ${ref} (commit ${shortCommit})`);
+  } catch (error) {
+    throw new Error(`${version} does not exist in git. Make sure ${ref} exists in the repository.`);
+  }
 
-	// Check Docker images exist (optional - warn if not found)
-	console.log(`Checking Docker images for ${shortCommit}...`);
-	try {
-		await $({ stdio: "inherit" })`docker manifest inspect rivetdev/sandbox-agent:${shortCommit}-amd64`;
-		await $({ stdio: "inherit" })`docker manifest inspect rivetdev/sandbox-agent:${shortCommit}-arm64`;
-		console.log("✅ Docker images exist");
-	} catch (error) {
-		console.log(`⚠️ Docker images for ${shortCommit} not found - skipping Docker validation`);
-		console.log("  (Docker images will need to be built before publishing)");
-	}
+  // Check Docker images exist (optional - warn if not found)
+  console.log(`Checking Docker images for ${shortCommit}...`);
+  try {
+    await $({ stdio: "inherit" })`docker manifest inspect rivetdev/sandbox-agent:${shortCommit}-amd64`;
+    await $({ stdio: "inherit" })`docker manifest inspect rivetdev/sandbox-agent:${shortCommit}-arm64`;
+    console.log("✅ Docker images exist");
+  } catch (error) {
+    console.log(`⚠️ Docker images for ${shortCommit} not found - skipping Docker validation`);
+    console.log("  (Docker images will need to be built before publishing)");
+  }
 
-	// Check S3 artifacts exist
-	console.log(`Checking S3 artifacts for ${shortCommit}...`);
-	const endpointUrl =
-		"https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com";
+  // Check S3 artifacts exist
+  console.log(`Checking S3 artifacts for ${shortCommit}...`);
+  const endpointUrl = "https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com";
 
-	// Get credentials
-	let awsAccessKeyId = process.env.R2_RELEASES_ACCESS_KEY_ID;
-	if (!awsAccessKeyId) {
-		const result =
-			await $`op read "op://Engineering/rivet-releases R2 Upload/username"`;
-		awsAccessKeyId = result.stdout.trim();
-	}
-	let awsSecretAccessKey = process.env.R2_RELEASES_SECRET_ACCESS_KEY;
-	if (!awsSecretAccessKey) {
-		const result =
-			await $`op read "op://Engineering/rivet-releases R2 Upload/password"`;
-		awsSecretAccessKey = result.stdout.trim();
-	}
+  // Get credentials
+  let awsAccessKeyId = process.env.R2_RELEASES_ACCESS_KEY_ID;
+  if (!awsAccessKeyId) {
+    const result = await $`op read "op://Engineering/rivet-releases R2 Upload/username"`;
+    awsAccessKeyId = result.stdout.trim();
+  }
+  let awsSecretAccessKey = process.env.R2_RELEASES_SECRET_ACCESS_KEY;
+  if (!awsSecretAccessKey) {
+    const result = await $`op read "op://Engineering/rivet-releases R2 Upload/password"`;
+    awsSecretAccessKey = result.stdout.trim();
+  }
 
-	const awsEnv = {
-		AWS_ACCESS_KEY_ID: awsAccessKeyId,
-		AWS_SECRET_ACCESS_KEY: awsSecretAccessKey,
-		AWS_DEFAULT_REGION: "auto",
-	};
+  const awsEnv = {
+    AWS_ACCESS_KEY_ID: awsAccessKeyId,
+    AWS_SECRET_ACCESS_KEY: awsSecretAccessKey,
+    AWS_DEFAULT_REGION: "auto",
+  };
 
-	const commitPrefix = `sandbox-agent/${shortCommit}/`;
-	const listResult = await $({
-		env: awsEnv,
-		shell: true,
-		stdio: ["pipe", "pipe", "inherit"],
-	})`aws s3api list-objects --bucket rivet-releases --prefix ${commitPrefix} --endpoint-url ${endpointUrl}`;
-	const files = JSON.parse(listResult.stdout);
+  const commitPrefix = `sandbox-agent/${shortCommit}/`;
+  const listResult = await $({
+    env: awsEnv,
+    shell: true,
+    stdio: ["pipe", "pipe", "inherit"],
+  })`aws s3api list-objects --bucket rivet-releases --prefix ${commitPrefix} --endpoint-url ${endpointUrl}`;
+  const files = JSON.parse(listResult.stdout);
 
-	if (!Array.isArray(files?.Contents) || files.Contents.length === 0) {
-		throw new Error(
-			`No S3 artifacts found for version ${version} (commit ${shortCommit}) under ${commitPrefix}`,
-		);
-	}
+  if (!Array.isArray(files?.Contents) || files.Contents.length === 0) {
+    throw new Error(`No S3 artifacts found for version ${version} (commit ${shortCommit}) under ${commitPrefix}`);
+  }
 
-	console.log(`✅ S3 artifacts exist (${files.Contents.length} files found)`);
+  console.log(`✅ S3 artifacts exist (${files.Contents.length} files found)`);
 }
 
 async function runLocalChecks(opts: ReleaseOpts) {
-	console.log("Running local checks...");
+  console.log("Running local checks...");
 
-	// Cargo check
-	console.log("Running cargo check...");
-	try {
-		await $({ stdio: "inherit", cwd: opts.root })`cargo check`;
-		console.log("✅ Cargo check passed");
-	} catch (err) {
-		console.error("❌ Cargo check failed");
-		throw err;
-	}
+  // Cargo check
+  console.log("Running cargo check...");
+  try {
+    await $({ stdio: "inherit", cwd: opts.root })`cargo check`;
+    console.log("✅ Cargo check passed");
+  } catch (err) {
+    console.error("❌ Cargo check failed");
+    throw err;
+  }
 
-	// Cargo fmt check
-	console.log("Running cargo fmt --check...");
-	try {
-		await $({ stdio: "inherit", cwd: opts.root })`cargo fmt --check`;
-		console.log("✅ Cargo fmt check passed");
-	} catch (err) {
-		console.error("❌ Cargo fmt check failed");
-		throw err;
-	}
+  // Cargo fmt check
+  console.log("Running cargo fmt --check...");
+  try {
+    await $({ stdio: "inherit", cwd: opts.root })`cargo fmt --check`;
+    console.log("✅ Cargo fmt check passed");
+  } catch (err) {
+    console.error("❌ Cargo fmt check failed");
+    throw err;
+  }
 
-	// TypeScript type check
-	console.log("Running TypeScript type check...");
-	try {
-		await $({ stdio: "inherit", cwd: opts.root })`pnpm typecheck`;
-		console.log("✅ TypeScript type check passed");
-	} catch (err) {
-		console.error("❌ TypeScript type check failed");
-		throw err;
-	}
+  // TypeScript type check
+  console.log("Running TypeScript type check...");
+  try {
+    await $({ stdio: "inherit", cwd: opts.root })`pnpm typecheck`;
+    console.log("✅ TypeScript type check passed");
+  } catch (err) {
+    console.error("❌ TypeScript type check failed");
+    throw err;
+  }
 
-	console.log("✅ All local checks passed");
+  console.log("✅ All local checks passed");
 }
 
 async function runCiChecks(opts: ReleaseOpts) {
-	console.log("Running CI checks...");
+  console.log("Running CI checks...");
 
-	// TypeScript type check
-	console.log("Running TypeScript type check...");
-	try {
-		await $({ stdio: "inherit", cwd: opts.root })`pnpm typecheck`;
-		console.log("✅ TypeScript type check passed");
-	} catch (err) {
-		console.error("❌ TypeScript type check failed");
-		throw err;
-	}
+  // TypeScript type check
+  console.log("Running TypeScript type check...");
+  try {
+    await $({ stdio: "inherit", cwd: opts.root })`pnpm typecheck`;
+    console.log("✅ TypeScript type check passed");
+  } catch (err) {
+    console.error("❌ TypeScript type check failed");
+    throw err;
+  }
 
-	console.log("✅ All CI checks passed");
+  console.log("✅ All CI checks passed");
 }
 
-async function getVersionFromArgs(opts: {
-	version?: string;
-	major?: boolean;
-	minor?: boolean;
-	patch?: boolean;
-}): Promise<string> {
-	// Check if explicit version is provided via --version flag
-	if (opts.version) {
-		return opts.version;
-	}
+async function getVersionFromArgs(opts: { version?: string; major?: boolean; minor?: boolean; patch?: boolean }): Promise<string> {
+  // Check if explicit version is provided via --version flag
+  if (opts.version) {
+    return opts.version;
+  }
 
-	// Check for version bump flags
-	if (!opts.major && !opts.minor && !opts.patch) {
-		throw new Error(
-			"Must provide either --version, --major, --minor, or --patch",
-		);
-	}
+  // Check for version bump flags
+  if (!opts.major && !opts.minor && !opts.patch) {
+    throw new Error("Must provide either --version, --major, --minor, or --patch");
+  }
 
-	// Get latest version from git tags and calculate new one
-	const latestVersion = await getLatestGitVersion();
-	if (!latestVersion) {
-		throw new Error(
-			"No existing version tags found. Use --version to set an explicit version.",
-		);
-	}
-	console.log(`Latest git version: ${latestVersion}`);
+  // Get latest version from git tags and calculate new one
+  const latestVersion = await getLatestGitVersion();
+  if (!latestVersion) {
+    throw new Error("No existing version tags found. Use --version to set an explicit version.");
+  }
+  console.log(`Latest git version: ${latestVersion}`);
 
-	let newVersion: string | null = null;
+  let newVersion: string | null = null;
 
-	if (opts.major) {
-		newVersion = semver.inc(latestVersion, "major");
-	} else if (opts.minor) {
-		newVersion = semver.inc(latestVersion, "minor");
-	} else if (opts.patch) {
-		newVersion = semver.inc(latestVersion, "patch");
-	}
+  if (opts.major) {
+    newVersion = semver.inc(latestVersion, "major");
+  } else if (opts.minor) {
+    newVersion = semver.inc(latestVersion, "minor");
+  } else if (opts.patch) {
+    newVersion = semver.inc(latestVersion, "patch");
+  }
 
-	if (!newVersion) {
-		throw new Error("Failed to calculate new version");
-	}
+  if (!newVersion) {
+    throw new Error("Failed to calculate new version");
+  }
 
-	return newVersion;
+  return newVersion;
 }
 
 // Available steps
 const STEPS = [
-	"confirm-release",
-	"update-version",
-	"run-local-checks",
-	"git-commit",
-	"git-push",
-	"trigger-workflow",
-	"validate-reuse-version",
-	"run-ci-checks",
-	"build-js-artifacts",
-	"publish-crates",
-	"publish-npm-cli-shared",
-	"publish-npm-sdk",
-	"publish-npm-cli",
-	"tag-docker",
-	"promote-artifacts",
-	"push-tag",
-	"create-github-release",
+  "confirm-release",
+  "update-version",
+  "run-local-checks",
+  "git-commit",
+  "git-push",
+  "trigger-workflow",
+  "validate-reuse-version",
+  "run-ci-checks",
+  "build-js-artifacts",
+  "publish-crates",
+  "publish-npm-libraries",
+  "publish-npm-cli",
+  "tag-docker",
+  "promote-artifacts",
+  "push-tag",
+  "create-github-release",
 ] as const;
 
-const PHASES = [
-	"setup-local",
-	"setup-ci",
-	"complete-ci",
-] as const;
+const PHASES = ["setup-local", "setup-ci", "complete-ci"] as const;
 
 type Step = (typeof STEPS)[number];
 type Phase = (typeof PHASES)[number];
 
 // Map phases to individual steps
 const PHASE_MAP: Record<Phase, Step[]> = {
-	// These steps modify the source code, so they need to be ran & committed
-	// locally. CI cannot push commits.
-	//
-	// run-local-checks runs cargo check, cargo fmt, and type checks to fail
-	// fast before committing/pushing.
-	"setup-local": [
-		"confirm-release",
-		"update-version",
-		"run-local-checks",
-		"git-commit",
-		"git-push",
-		"trigger-workflow",
-	],
-	// These steps validate the repository and build JS artifacts before
-	// triggering release.
-	"setup-ci": ["validate-reuse-version", "run-ci-checks", "build-js-artifacts"],
-	// These steps run after the required artifacts have been successfully built.
-	// Note: update-version is included here to ensure Cargo.toml versions are
-	// updated before publishing when using --reuse-engine-version.
-	"complete-ci": [
-		"update-version",
-		"publish-crates",
-		"publish-npm-cli-shared",
-		"publish-npm-sdk",
-		"publish-npm-cli",
-		"tag-docker",
-		"promote-artifacts",
-		"push-tag",
-		"create-github-release",
-	],
+  // These steps modify the source code, so they need to be ran & committed
+  // locally. CI cannot push commits.
+  //
+  // run-local-checks runs cargo check, cargo fmt, and type checks to fail
+  // fast before committing/pushing.
+  "setup-local": ["confirm-release", "update-version", "run-local-checks", "git-commit", "git-push", "trigger-workflow"],
+  // These steps validate the repository and build JS artifacts before
+  // triggering release.
+  "setup-ci": ["validate-reuse-version", "run-ci-checks", "build-js-artifacts"],
+  // These steps run after the required artifacts have been successfully built.
+  // Note: update-version is included here to ensure Cargo.toml versions are
+  // updated before publishing when using --reuse-engine-version.
+  "complete-ci": [
+    "update-version",
+    "publish-crates",
+    "publish-npm-libraries",
+    "publish-npm-cli",
+    "tag-docker",
+    "promote-artifacts",
+    "push-tag",
+    "create-github-release",
+  ],
 };
 
 async function main() {
-	// Setup commander
-	program
-		.name("release")
-		.description("Release a new version of sandbox-agent")
-		.option("--major", "Bump major version")
-		.option("--minor", "Bump minor version")
-		.option("--patch", "Bump patch version")
-		.option("--version <version>", "Set specific version")
-		.option(
-			"--override-commit <commit>",
-			"Override the commit to pull artifacts from (defaults to current commit)",
-		)
-		.option(
-			"--reuse-engine-version <version-or-commit>",
-			"Reuse artifacts and Docker images from a previous version (e.g., 0.1.0) or git revision (e.g., bb7f292)",
-		)
-		.option("--latest", "Tag version as the latest version", true)
-		.option("--no-latest", "Do not tag version as the latest version")
-		.option("--no-validate-git", "Skip git validation (for testing)")
-		.option(
-			"--only-steps <steps>",
-			`Run specific steps (comma-separated). Available: ${STEPS.join(", ")}`,
-		)
-		.option(
-			"--phase <phase>",
-			`Run a release phase (comma-separated). Available: ${PHASES.join(", ")}`,
-		)
-		.parse();
+  // Setup commander
+  program
+    .name("release")
+    .description("Release a new version of sandbox-agent")
+    .option("--major", "Bump major version")
+    .option("--minor", "Bump minor version")
+    .option("--patch", "Bump patch version")
+    .option("--version <version>", "Set specific version")
+    .option("--override-commit <commit>", "Override the commit to pull artifacts from (defaults to current commit)")
+    .option(
+      "--reuse-engine-version <version-or-commit>",
+      "Reuse artifacts and Docker images from a previous version (e.g., 0.1.0) or git revision (e.g., bb7f292)",
+    )
+    .option("--latest", "Tag version as the latest version", true)
+    .option("--no-latest", "Do not tag version as the latest version")
+    .option("--no-validate-git", "Skip git validation (for testing)")
+    .option("--only-steps <steps>", `Run specific steps (comma-separated). Available: ${STEPS.join(", ")}`)
+    .option("--phase <phase>", `Run a release phase (comma-separated). Available: ${PHASES.join(", ")}`)
+    .parse();
 
-	const opts = program.opts();
+  const opts = program.opts();
 
-	// Parse requested steps
-	if (!opts.phase && !opts.onlySteps) {
-		throw new Error(
-			"Must provide either --phase or --only-steps. Run with --help for more information.",
-		);
-	}
+  // Parse requested steps
+  if (!opts.phase && !opts.onlySteps) {
+    throw new Error("Must provide either --phase or --only-steps. Run with --help for more information.");
+  }
 
-	if (opts.phase && opts.onlySteps) {
-		throw new Error("Cannot use both --phase and --only-steps together");
-	}
+  if (opts.phase && opts.onlySteps) {
+    throw new Error("Cannot use both --phase and --only-steps together");
+  }
 
-	const requestedSteps = new Set<Step>();
-	if (opts.onlySteps) {
-		const steps = opts.onlySteps.split(",").map((s: string) => s.trim());
-		for (const step of steps) {
-			if (!STEPS.includes(step as Step)) {
-				throw new Error(
-					`Invalid step: ${step}. Available steps: ${STEPS.join(", ")}`,
-				);
-			}
-			requestedSteps.add(step as Step);
-		}
-	} else if (opts.phase) {
-		const phases = opts.phase.split(",").map((s: string) => s.trim());
-		for (const phase of phases) {
-			if (!PHASES.includes(phase as Phase)) {
-				throw new Error(
-					`Invalid phase: ${phase}. Available phases: ${PHASES.join(", ")}`,
-				);
-			}
-			const steps = PHASE_MAP[phase as Phase];
-			for (const step of steps) {
-				requestedSteps.add(step);
-			}
-		}
-	}
+  const requestedSteps = new Set<Step>();
+  if (opts.onlySteps) {
+    const steps = opts.onlySteps.split(",").map((s: string) => s.trim());
+    for (const step of steps) {
+      if (!STEPS.includes(step as Step)) {
+        throw new Error(`Invalid step: ${step}. Available steps: ${STEPS.join(", ")}`);
+      }
+      requestedSteps.add(step as Step);
+    }
+  } else if (opts.phase) {
+    const phases = opts.phase.split(",").map((s: string) => s.trim());
+    for (const phase of phases) {
+      if (!PHASES.includes(phase as Phase)) {
+        throw new Error(`Invalid phase: ${phase}. Available phases: ${PHASES.join(", ")}`);
+      }
+      const steps = PHASE_MAP[phase as Phase];
+      for (const step of steps) {
+        requestedSteps.add(step);
+      }
+    }
+  }
 
-	// Helper function to check if a step should run
-	const shouldRunStep = (step: Step): boolean => {
-		return requestedSteps.has(step);
-	};
+  // Helper function to check if a step should run
+  const shouldRunStep = (step: Step): boolean => {
+    return requestedSteps.has(step);
+  };
 
-	// Get version from arguments or calculate based on flags
-	const version = await getVersionFromArgs({
-		version: opts.version,
-		major: opts.major,
-		minor: opts.minor,
-		patch: opts.patch,
-	});
+  // Get version from arguments or calculate based on flags
+  const version = await getVersionFromArgs({
+    version: opts.version,
+    major: opts.major,
+    minor: opts.minor,
+    patch: opts.patch,
+  });
 
-	assert(
-		/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/.test(
-			version,
-		),
-		"version must be a valid semantic version",
-	);
+  assert(
+    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/.test(
+      version,
+    ),
+    "version must be a valid semantic version",
+  );
 
-	// Automatically determine if this should be tagged as latest
-	// Can be overridden by --latest or --no-latest flags
-	let isLatest: boolean;
-	if (opts.latest !== undefined) {
-		// User explicitly set the flag
-		isLatest = opts.latest;
-	} else {
-		// Auto-determine based on version
-		isLatest = await shouldTagAsLatest(version);
-		console.log(`Auto-determined latest flag: ${isLatest} (version: ${version})`);
-	}
+  // Automatically determine if this should be tagged as latest
+  // Can be overridden by --latest or --no-latest flags
+  let isLatest: boolean;
+  if (opts.latest !== undefined) {
+    // User explicitly set the flag
+    isLatest = opts.latest;
+  } else {
+    // Auto-determine based on version
+    isLatest = await shouldTagAsLatest(version);
+    console.log(`Auto-determined latest flag: ${isLatest} (version: ${version})`);
+  }
 
-	const parsedVersion = semver.parse(version);
-	assert(parsedVersion !== null, "version must be parseable");
-	const minorVersionChannel = `${parsedVersion.major}.${parsedVersion.minor}.x`;
+  const parsedVersion = semver.parse(version);
+  assert(parsedVersion !== null, "version must be parseable");
+  const minorVersionChannel = `${parsedVersion.major}.${parsedVersion.minor}.x`;
 
-	// Setup opts
-	let commit: string;
-	if (opts.overrideCommit) {
-		// Manually override commit
-		commit = opts.overrideCommit;
-	} else {
-		// Read commit
-		const result = await $`git rev-parse HEAD`;
-		commit = result.stdout.trim();
-	}
+  // Setup opts
+  let commit: string;
+  if (opts.overrideCommit) {
+    // Manually override commit
+    commit = opts.overrideCommit;
+  } else {
+    // Read commit
+    const result = await $`git rev-parse HEAD`;
+    commit = result.stdout.trim();
+  }
 
-	const releaseOpts: ReleaseOpts = {
-		root: ROOT_DIR,
-		version: version,
-		latest: isLatest,
-		minorVersionChannel,
-		commit,
-		reuseEngineVersion: opts.reuseEngineVersion,
-	};
+  const releaseOpts: ReleaseOpts = {
+    root: ROOT_DIR,
+    version: version,
+    latest: isLatest,
+    minorVersionChannel,
+    commit,
+    reuseEngineVersion: opts.reuseEngineVersion,
+  };
 
-	if (releaseOpts.commit.length == 40) {
-		releaseOpts.commit = releaseOpts.commit.slice(0, 7);
-	}
+  if (releaseOpts.commit.length == 40) {
+    releaseOpts.commit = releaseOpts.commit.slice(0, 7);
+  }
 
-	assertEquals(releaseOpts.commit.length, 7, "must use 7 char short commit");
+  assertEquals(releaseOpts.commit.length, 7, "must use 7 char short commit");
 
-	if (opts.validateGit && !shouldRunStep("run-ci-checks")) {
-		// HACK: Skip setup-ci because for some reason there's changes in the setup step but only in GitHub Actions
-		await validateGit(releaseOpts);
-	}
+  if (opts.validateGit && !shouldRunStep("run-ci-checks")) {
+    // HACK: Skip setup-ci because for some reason there's changes in the setup step but only in GitHub Actions
+    await validateGit(releaseOpts);
+  }
 
-	if (shouldRunStep("confirm-release")) {
-		console.log("==> Release Confirmation");
-		console.log(`\nRelease Details:`);
-		console.log(`  Version: ${releaseOpts.version}`);
-		console.log(`  Latest: ${releaseOpts.latest}`);
-		console.log(`  Minor channel: ${releaseOpts.minorVersionChannel}`);
-		console.log(`  Commit: ${releaseOpts.commit}`);
-		if (releaseOpts.reuseEngineVersion) {
-			console.log(`  Reusing engine version: ${releaseOpts.reuseEngineVersion}`);
-		}
+  if (shouldRunStep("confirm-release")) {
+    console.log("==> Release Confirmation");
+    console.log(`\nRelease Details:`);
+    console.log(`  Version: ${releaseOpts.version}`);
+    console.log(`  Latest: ${releaseOpts.latest}`);
+    console.log(`  Minor channel: ${releaseOpts.minorVersionChannel}`);
+    console.log(`  Commit: ${releaseOpts.commit}`);
+    if (releaseOpts.reuseEngineVersion) {
+      console.log(`  Reusing engine version: ${releaseOpts.reuseEngineVersion}`);
+    }
 
-		// Get current branch
-		const branchResult = await $`git rev-parse --abbrev-ref HEAD`;
-		const branch = branchResult.stdout.trim();
-		console.log(`  Branch: ${branch}`);
+    // Get current branch
+    const branchResult = await $`git rev-parse --abbrev-ref HEAD`;
+    const branch = branchResult.stdout.trim();
+    console.log(`  Branch: ${branch}`);
 
-		// Get and display recent versions
-		const allVersions = await getAllGitVersions();
+    // Get and display recent versions
+    const allVersions = await getAllGitVersions();
 
-		if (allVersions.length > 0) {
-			// Find the latest stable version (excluding prereleases)
-			const stableVersions = allVersions.filter(v => {
-				const parsed = semver.parse(v);
-				return parsed && parsed.prerelease.length === 0;
-			});
-			const latestStableVersion = stableVersions[0] || null;
+    if (allVersions.length > 0) {
+      // Find the latest stable version (excluding prereleases)
+      const stableVersions = allVersions.filter((v) => {
+        const parsed = semver.parse(v);
+        return parsed && parsed.prerelease.length === 0;
+      });
+      const latestStableVersion = stableVersions[0] || null;
 
-			console.log(`\nRecent versions:`);
-			const recentVersions = allVersions.slice(0, 10);
-			for (const version of recentVersions) {
-				const isLatest = version === latestStableVersion;
-				const marker = isLatest ? " (latest)" : "";
-				console.log(`  - ${version}${marker}`);
-			}
-		}
+      console.log(`\nRecent versions:`);
+      const recentVersions = allVersions.slice(0, 10);
+      for (const version of recentVersions) {
+        const isLatest = version === latestStableVersion;
+        const marker = isLatest ? " (latest)" : "";
+        console.log(`  - ${version}${marker}`);
+      }
+    }
 
-		// Prompt for confirmation
-		const readline = await import("node:readline");
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: process.stdout,
-		});
+    // Prompt for confirmation
+    const readline = await import("node:readline");
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
 
-		const answer = await new Promise<string>((resolve) => {
-			rl.question("\nProceed with release? (yes/no): ", resolve);
-		});
-		rl.close();
+    const answer = await new Promise<string>((resolve) => {
+      rl.question("\nProceed with release? (yes/no): ", resolve);
+    });
+    rl.close();
 
-		if (answer.toLowerCase() !== "yes" && answer.toLowerCase() !== "y") {
-			console.log("Release cancelled");
-			process.exit(0);
-		}
+    if (answer.toLowerCase() !== "yes" && answer.toLowerCase() !== "y") {
+      console.log("Release cancelled");
+      process.exit(0);
+    }
 
-		console.log("✅ Release confirmed");
-	}
+    console.log("✅ Release confirmed");
+  }
 
-	if (shouldRunStep("update-version")) {
-		console.log("==> Updating Version");
-		await updateVersion(releaseOpts);
-	}
+  if (shouldRunStep("update-version")) {
+    console.log("==> Updating Version");
+    await updateVersion(releaseOpts);
+  }
 
-	if (shouldRunStep("run-local-checks")) {
-		console.log("==> Running Local Checks");
-		await runLocalChecks(releaseOpts);
-	}
+  if (shouldRunStep("run-local-checks")) {
+    console.log("==> Running Local Checks");
+    await runLocalChecks(releaseOpts);
+  }
 
-	if (shouldRunStep("git-commit")) {
-		assert(opts.validateGit, "cannot commit without git validation");
-		console.log("==> Committing Changes");
-		await $({ stdio: "inherit" })`git add .`;
-		await $({
-			stdio: "inherit",
-			shell: true,
-		})`git commit --allow-empty -m "chore(release): update version to ${releaseOpts.version}"`;
-	}
+  if (shouldRunStep("git-commit")) {
+    assert(opts.validateGit, "cannot commit without git validation");
+    console.log("==> Committing Changes");
+    await $({ stdio: "inherit" })`git add .`;
+    await $({
+      stdio: "inherit",
+      shell: true,
+    })`git commit --allow-empty -m "chore(release): update version to ${releaseOpts.version}"`;
+  }
 
-	if (shouldRunStep("git-push")) {
-		assert(opts.validateGit, "cannot push without git validation");
-		console.log("==> Pushing Commits");
-		const branchResult = await $`git rev-parse --abbrev-ref HEAD`;
-		const branch = branchResult.stdout.trim();
-		if (branch === "main") {
-			// Push on main
-			await $({ stdio: "inherit" })`git push`;
-		} else {
-			// Modify current branch
-			await $({ stdio: "inherit" })`gt submit --force --no-edit --publish`;
-		}
-	}
+  if (shouldRunStep("git-push")) {
+    assert(opts.validateGit, "cannot push without git validation");
+    console.log("==> Pushing Commits");
+    const branchResult = await $`git rev-parse --abbrev-ref HEAD`;
+    const branch = branchResult.stdout.trim();
+    if (branch === "main") {
+      // Push on main
+      await $({ stdio: "inherit" })`git push`;
+    } else {
+      // Modify current branch
+      await $({ stdio: "inherit" })`gt submit --force --no-edit --publish`;
+    }
+  }
 
-	if (shouldRunStep("trigger-workflow")) {
-		console.log("==> Triggering Workflow");
-		const branchResult = await $`git rev-parse --abbrev-ref HEAD`;
-		const branch = branchResult.stdout.trim();
-		const latestFlag = releaseOpts.latest ? "true" : "false";
+  if (shouldRunStep("trigger-workflow")) {
+    console.log("==> Triggering Workflow");
+    const branchResult = await $`git rev-parse --abbrev-ref HEAD`;
+    const branch = branchResult.stdout.trim();
+    const latestFlag = releaseOpts.latest ? "true" : "false";
 
-		// Build workflow command
-		let workflowCmd = `gh workflow run .github/workflows/release.yaml -f version=${releaseOpts.version} -f latest=${latestFlag}`;
-		if (releaseOpts.reuseEngineVersion) {
-			workflowCmd += ` -f reuse_engine_version=${releaseOpts.reuseEngineVersion}`;
-		}
-		workflowCmd += ` --ref ${branch}`;
+    // Build workflow command
+    let workflowCmd = `gh workflow run .github/workflows/release.yaml -f version=${releaseOpts.version} -f latest=${latestFlag}`;
+    if (releaseOpts.reuseEngineVersion) {
+      workflowCmd += ` -f reuse_engine_version=${releaseOpts.reuseEngineVersion}`;
+    }
+    workflowCmd += ` --ref ${branch}`;
 
-		await $({ stdio: "inherit", shell: true })`${workflowCmd}`;
+    await $({ stdio: "inherit", shell: true })`${workflowCmd}`;
 
-		// Get repository info and print workflow link
-		const repoResult = await $`gh repo view --json nameWithOwner -q .nameWithOwner`;
-		const repo = repoResult.stdout.trim();
-		console.log(`\nWorkflow triggered: https://github.com/${repo}/actions/workflows/release.yaml`);
-		console.log(`View all runs: https://github.com/${repo}/actions`);
-	}
+    // Get repository info and print workflow link
+    const repoResult = await $`gh repo view --json nameWithOwner -q .nameWithOwner`;
+    const repo = repoResult.stdout.trim();
+    console.log(`\nWorkflow triggered: https://github.com/${repo}/actions/workflows/release.yaml`);
+    console.log(`View all runs: https://github.com/${repo}/actions`);
+  }
 
-	if (shouldRunStep("validate-reuse-version")) {
-		if (releaseOpts.reuseEngineVersion) {
-			console.log("==> Validating Reuse Version");
-			await validateReuseVersion(releaseOpts.reuseEngineVersion);
-		}
-	}
+  if (shouldRunStep("validate-reuse-version")) {
+    if (releaseOpts.reuseEngineVersion) {
+      console.log("==> Validating Reuse Version");
+      await validateReuseVersion(releaseOpts.reuseEngineVersion);
+    }
+  }
 
-	if (shouldRunStep("run-ci-checks")) {
-		console.log("==> Running CI Checks");
-		await runCiChecks(releaseOpts);
-	}
+  if (shouldRunStep("run-ci-checks")) {
+    console.log("==> Running CI Checks");
+    await runCiChecks(releaseOpts);
+  }
 
-	if (shouldRunStep("build-js-artifacts")) {
-		console.log("==> Building JS Artifacts");
-		await buildJsArtifacts(releaseOpts);
-	}
+  if (shouldRunStep("build-js-artifacts")) {
+    console.log("==> Building JS Artifacts");
+    await buildJsArtifacts(releaseOpts);
+  }
 
-	if (shouldRunStep("publish-crates")) {
-		console.log("==> Publishing Crates");
-		await publishCrates(releaseOpts);
-	}
+  if (shouldRunStep("publish-crates")) {
+    console.log("==> Publishing Crates");
+    await publishCrates(releaseOpts);
+  }
 
-	if (shouldRunStep("publish-npm-cli-shared")) {
-		console.log("==> Publishing NPM CLI Shared");
-		await publishNpmCliShared(releaseOpts);
-	}
+  if (shouldRunStep("publish-npm-libraries")) {
+    console.log("==> Publishing NPM Libraries");
+    await publishNpmLibraries(releaseOpts);
+  }
 
-	if (shouldRunStep("publish-npm-sdk")) {
-		console.log("==> Publishing NPM SDK");
-		await publishNpmSdk(releaseOpts);
-	}
+  if (shouldRunStep("publish-npm-cli")) {
+    console.log("==> Publishing NPM CLI");
+    await publishNpmCli(releaseOpts);
+  }
 
-	if (shouldRunStep("publish-npm-cli")) {
-		console.log("==> Publishing NPM CLI");
-		await publishNpmCli(releaseOpts);
-	}
+  if (shouldRunStep("tag-docker")) {
+    console.log("==> Tagging Docker");
+    await tagDocker(releaseOpts);
+  }
 
-	if (shouldRunStep("tag-docker")) {
-		console.log("==> Tagging Docker");
-		await tagDocker(releaseOpts);
-	}
+  if (shouldRunStep("promote-artifacts")) {
+    console.log("==> Promoting Artifacts");
+    await promoteArtifacts(releaseOpts);
+  }
 
-	if (shouldRunStep("promote-artifacts")) {
-		console.log("==> Promoting Artifacts");
-		await promoteArtifacts(releaseOpts);
-	}
+  if (shouldRunStep("push-tag")) {
+    console.log("==> Pushing Tag");
+    await createAndPushTag(releaseOpts);
+  }
 
-	if (shouldRunStep("push-tag")) {
-		console.log("==> Pushing Tag");
-		await createAndPushTag(releaseOpts);
-	}
+  if (shouldRunStep("create-github-release")) {
+    console.log("==> Creating GitHub Release");
+    await createGitHubRelease(releaseOpts);
+  }
 
-	if (shouldRunStep("create-github-release")) {
-		console.log("==> Creating GitHub Release");
-		await createGitHubRelease(releaseOpts);
-	}
-
-	console.log("==> Complete");
+  console.log("==> Complete");
 }
 
 main().catch((err) => {
-	console.error(err);
-	process.exit(1);
+  console.error(err);
+  process.exit(1);
 });
diff --git a/scripts/release/package.json b/scripts/release/package.json
index 445684d..8315e96 100644
--- a/scripts/release/package.json
+++ b/scripts/release/package.json
@@ -1,23 +1,25 @@
 {
-	"name": "release",
-	"version": "2.0.21",
-	"description": "",
-	"main": "index.js",
-	"scripts": {
-		"check-types": "tsc --noEmit"
-	},
-	"keywords": [],
-	"author": "",
-	"license": "ISC",
-	"packageManager": "pnpm@10.13.1",
-	"devDependencies": {
-		"@types/node": "^24.3.0",
-		"@types/semver": "^7.5.8"
-	},
-	"dependencies": {
-		"commander": "^12.1.0",
-		"execa": "^8.0.1",
-		"glob": "^10.3.10",
-		"semver": "^7.6.0"
-	}
+  "name": "release",
+  "version": "2.0.21",
+  "description": "",
+  "type": "module",
+  "main": "index.js",
+  "scripts": {
+    "check-types": "tsc --noEmit"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "packageManager": "pnpm@10.13.1",
+  "devDependencies": {
+    "@types/node": "^24.3.0",
+    "@types/semver": "^7.5.8",
+    "typescript": "^5.7.0"
+  },
+  "dependencies": {
+    "commander": "^12.1.0",
+    "execa": "^8.0.1",
+    "glob": "^10.3.10",
+    "semver": "^7.6.0"
+  }
 }
diff --git a/scripts/release/promote-artifacts.ts b/scripts/release/promote-artifacts.ts
index c989199..1721401 100644
--- a/scripts/release/promote-artifacts.ts
+++ b/scripts/release/promote-artifacts.ts
@@ -2,119 +2,101 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { $ } from "execa";
 import type { ReleaseOpts } from "./main";
-import {
-	copyReleasesPath,
-	deleteReleasesPath,
-	fetchGitRef,
-	listReleasesObjects,
-	PREFIX,
-	uploadContentToReleases,
-	versionOrCommitToRef,
-} from "./utils";
+import { copyReleasesPath, deleteReleasesPath, fetchGitRef, listReleasesObjects, PREFIX, uploadContentToReleases, versionOrCommitToRef } from "./utils";
 
 export async function promoteArtifacts(opts: ReleaseOpts) {
-	// Determine which commit to use for source artifacts
-	let sourceCommit = opts.commit;
-	if (opts.reuseEngineVersion) {
-		console.log(`==> Reusing artifacts from ${opts.reuseEngineVersion}`);
-		const ref = versionOrCommitToRef(opts.reuseEngineVersion);
-		await fetchGitRef(ref);
-		const result = await $`git rev-parse ${ref}`;
-		sourceCommit = result.stdout.trim().slice(0, 7);
-		console.log(`==> Source commit: ${sourceCommit}`);
-	}
+  // Determine which commit to use for source artifacts
+  let sourceCommit = opts.commit;
+  if (opts.reuseEngineVersion) {
+    console.log(`==> Reusing artifacts from ${opts.reuseEngineVersion}`);
+    const ref = versionOrCommitToRef(opts.reuseEngineVersion);
+    await fetchGitRef(ref);
+    const result = await $`git rev-parse ${ref}`;
+    sourceCommit = result.stdout.trim().slice(0, 7);
+    console.log(`==> Source commit: ${sourceCommit}`);
+  }
 
-	// Promote TypeScript SDK artifacts (uploaded by build-artifacts.ts to sandbox-agent/{commit}/typescript/)
-	await promotePath(opts, sourceCommit, "typescript");
+  // Promote TypeScript SDK artifacts (uploaded by build-artifacts.ts to sandbox-agent/{commit}/typescript/)
+  await promotePath(opts, sourceCommit, "typescript");
 
-	// Promote binary artifacts (uploaded by CI in release.yaml to sandbox-agent/{commit}/binaries/)
-	await promotePath(opts, sourceCommit, "binaries");
+  // Promote binary artifacts (uploaded by CI in release.yaml to sandbox-agent/{commit}/binaries/)
+  await promotePath(opts, sourceCommit, "binaries");
 
-	// Upload install scripts
-	await uploadInstallScripts(opts, opts.version);
-	if (opts.latest) {
-		await uploadInstallScripts(opts, "latest");
-		await uploadInstallScripts(opts, opts.minorVersionChannel);
-	}
+  // Upload install scripts
+  await uploadInstallScripts(opts, opts.version);
+  if (opts.latest) {
+    await uploadInstallScripts(opts, "latest");
+    await uploadInstallScripts(opts, opts.minorVersionChannel);
+  }
 
-	// Upload gigacode install scripts
-	await uploadGigacodeInstallScripts(opts, opts.version);
-	if (opts.latest) {
-		await uploadGigacodeInstallScripts(opts, "latest");
-	}
+  // Upload gigacode install scripts
+  await uploadGigacodeInstallScripts(opts, opts.version);
+  if (opts.latest) {
+    await uploadGigacodeInstallScripts(opts, "latest");
+  }
 }
 
-
 async function uploadInstallScripts(opts: ReleaseOpts, version: string) {
-	const installScriptPaths = [
-		path.resolve(opts.root, "scripts/release/static/install.sh"),
-		path.resolve(opts.root, "scripts/release/static/install.ps1"),
-	];
+  const installScriptPaths = [path.resolve(opts.root, "scripts/release/static/install.sh"), path.resolve(opts.root, "scripts/release/static/install.ps1")];
 
-	for (const scriptPath of installScriptPaths) {
-		let scriptContent = await fs.readFile(scriptPath, "utf-8");
-		scriptContent = scriptContent.replace(/__VERSION__/g, version);
+  for (const scriptPath of installScriptPaths) {
+    let scriptContent = await fs.readFile(scriptPath, "utf-8");
+    scriptContent = scriptContent.replace(/__VERSION__/g, version);
 
-		const uploadKey = `${PREFIX}/${version}/${scriptPath.split("/").pop() ?? ""}`;
+    const uploadKey = `${PREFIX}/${version}/${scriptPath.split("/").pop() ?? ""}`;
 
-		console.log(`Uploading install script: ${uploadKey}`);
-		await uploadContentToReleases(scriptContent, uploadKey);
-	}
+    console.log(`Uploading install script: ${uploadKey}`);
+    await uploadContentToReleases(scriptContent, uploadKey);
+  }
 }
 
 async function uploadGigacodeInstallScripts(opts: ReleaseOpts, version: string) {
-	const installScriptPaths = [
-		path.resolve(opts.root, "scripts/release/static/gigacode-install.sh"),
-		path.resolve(opts.root, "scripts/release/static/gigacode-install.ps1"),
-	];
+  const installScriptPaths = [
+    path.resolve(opts.root, "scripts/release/static/gigacode-install.sh"),
+    path.resolve(opts.root, "scripts/release/static/gigacode-install.ps1"),
+  ];
 
-	for (const scriptPath of installScriptPaths) {
-		let scriptContent = await fs.readFile(scriptPath, "utf-8");
-		scriptContent = scriptContent.replace(/__VERSION__/g, version);
+  for (const scriptPath of installScriptPaths) {
+    let scriptContent = await fs.readFile(scriptPath, "utf-8");
+    scriptContent = scriptContent.replace(/__VERSION__/g, version);
 
-		const uploadKey = `${PREFIX}/${version}/${scriptPath.split("/").pop() ?? ""}`;
+    const uploadKey = `${PREFIX}/${version}/${scriptPath.split("/").pop() ?? ""}`;
 
-		console.log(`Uploading gigacode install script: ${uploadKey}`);
-		await uploadContentToReleases(scriptContent, uploadKey);
-	}
+    console.log(`Uploading gigacode install script: ${uploadKey}`);
+    await uploadContentToReleases(scriptContent, uploadKey);
+  }
 }
 
 async function copyPath(sourcePrefix: string, targetPrefix: string) {
-	console.log(`Copying ${sourcePrefix} -> ${targetPrefix}`);
-	await deleteReleasesPath(targetPrefix);
-	await copyReleasesPath(sourcePrefix, targetPrefix);
+  console.log(`Copying ${sourcePrefix} -> ${targetPrefix}`);
+  await deleteReleasesPath(targetPrefix);
+  await copyReleasesPath(sourcePrefix, targetPrefix);
 }
 
 /** S3-to-S3 copy from sandbox-agent/{commit}/{name}/ to sandbox-agent/{version}/{name}/ */
 async function promotePath(opts: ReleaseOpts, sourceCommit: string, name: string) {
-	console.log(`==> Promoting ${name} artifacts`);
+  console.log(`==> Promoting ${name} artifacts`);
 
-	const sourcePrefix = `${PREFIX}/${sourceCommit}/${name}/`;
-	const commitFiles = await listReleasesObjects(sourcePrefix);
-	if (!Array.isArray(commitFiles?.Contents) || commitFiles.Contents.length === 0) {
-		throw new Error(`No files found under ${sourcePrefix}`);
-	}
+  const sourcePrefix = `${PREFIX}/${sourceCommit}/${name}/`;
+  const commitFiles = await listReleasesObjects(sourcePrefix);
+  if (!Array.isArray(commitFiles?.Contents) || commitFiles.Contents.length === 0) {
+    throw new Error(`No files found under ${sourcePrefix}`);
+  }
 
-	await copyPath(sourcePrefix, `${PREFIX}/${opts.version}/${name}/`);
-	if (opts.latest) {
-		await copyPath(sourcePrefix, `${PREFIX}/latest/${name}/`);
-		if (name === "binaries") {
-			const binariesSourcePrefix = `${PREFIX}/${sourceCommit}/binaries/sandbox-agent-`;
-			const sandboxAgentBinaries = await listReleasesObjects(binariesSourcePrefix);
-			if (
-				!Array.isArray(sandboxAgentBinaries?.Contents) ||
-				sandboxAgentBinaries.Contents.length === 0
-			) {
-				throw new Error(`No sandbox-agent binaries found under ${binariesSourcePrefix}`);
-			}
+  await copyPath(sourcePrefix, `${PREFIX}/${opts.version}/${name}/`);
+  if (opts.latest) {
+    await copyPath(sourcePrefix, `${PREFIX}/latest/${name}/`);
+    if (name === "binaries") {
+      const binariesSourcePrefix = `${PREFIX}/${sourceCommit}/binaries/sandbox-agent-`;
+      const sandboxAgentBinaries = await listReleasesObjects(binariesSourcePrefix);
+      if (!Array.isArray(sandboxAgentBinaries?.Contents) || sandboxAgentBinaries.Contents.length === 0) {
+        throw new Error(`No sandbox-agent binaries found under ${binariesSourcePrefix}`);
+      }
 
-			await copyPath(
-				binariesSourcePrefix,
-				`${PREFIX}/${opts.minorVersionChannel}/binaries/sandbox-agent-`,
-			);
-			return;
-		}
+      await copyPath(binariesSourcePrefix, `${PREFIX}/${opts.minorVersionChannel}/binaries/sandbox-agent-`);
+      return;
+    }
 
-		await copyPath(sourcePrefix, `${PREFIX}/${opts.minorVersionChannel}/${name}/`);
-	}
+    await copyPath(sourcePrefix, `${PREFIX}/${opts.minorVersionChannel}/${name}/`);
+  }
 }
diff --git a/scripts/release/sdk.ts b/scripts/release/sdk.ts
index a09bd8b..738b46d 100644
--- a/scripts/release/sdk.ts
+++ b/scripts/release/sdk.ts
@@ -1,389 +1,397 @@
 import { $ } from "execa";
 import * as fs from "node:fs/promises";
-import { join } from "node:path";
+import { dirname, join, relative } from "node:path";
+import { glob } from "glob";
 import type { ReleaseOpts } from "./main";
 import { downloadFromReleases, PREFIX } from "./utils";
 
-// Crates to publish in dependency order
-const CRATES = [
-	"error",
-	"agent-credentials",
-	"agent-management",
-	"opencode-server-manager",
-	"opencode-adapter",
-	"acp-http-adapter",
-	"sandbox-agent",
-	"gigacode",
-] as const;
-
-// NPM CLI packages
-const CLI_PACKAGES = [
-	"@sandbox-agent/cli",
-	"@sandbox-agent/cli-linux-x64",
-	"@sandbox-agent/cli-linux-arm64",
-	"@sandbox-agent/cli-win32-x64",
-	"@sandbox-agent/cli-darwin-x64",
-	"@sandbox-agent/cli-darwin-arm64",
-	"@sandbox-agent/gigacode",
-	"@sandbox-agent/gigacode-linux-x64",
-	"@sandbox-agent/gigacode-linux-arm64",
-	"@sandbox-agent/gigacode-win32-x64",
-	"@sandbox-agent/gigacode-darwin-x64",
-	"@sandbox-agent/gigacode-darwin-arm64",
-] as const;
-
-// Mapping from npm package name to Rust target and binary extension
-const CLI_PLATFORM_MAP: Record<
-	string,
-	{ target: string; binaryExt: string; binaryName: string }
-> = {
-	"@sandbox-agent/cli-linux-x64": {
-		target: "x86_64-unknown-linux-musl",
-		binaryExt: "",
-		binaryName: "sandbox-agent",
-	},
-	"@sandbox-agent/cli-linux-arm64": {
-		target: "aarch64-unknown-linux-musl",
-		binaryExt: "",
-		binaryName: "sandbox-agent",
-	},
-	"@sandbox-agent/cli-win32-x64": {
-		target: "x86_64-pc-windows-gnu",
-		binaryExt: ".exe",
-		binaryName: "sandbox-agent",
-	},
-	"@sandbox-agent/cli-darwin-x64": {
-		target: "x86_64-apple-darwin",
-		binaryExt: "",
-		binaryName: "sandbox-agent",
-	},
-	"@sandbox-agent/cli-darwin-arm64": {
-		target: "aarch64-apple-darwin",
-		binaryExt: "",
-		binaryName: "sandbox-agent",
-	},
-	"@sandbox-agent/gigacode-linux-x64": {
-		target: "x86_64-unknown-linux-musl",
-		binaryExt: "",
-		binaryName: "gigacode",
-	},
-	"@sandbox-agent/gigacode-linux-arm64": {
-		target: "aarch64-unknown-linux-musl",
-		binaryExt: "",
-		binaryName: "gigacode",
-	},
-	"@sandbox-agent/gigacode-win32-x64": {
-		target: "x86_64-pc-windows-gnu",
-		binaryExt: ".exe",
-		binaryName: "gigacode",
-	},
-	"@sandbox-agent/gigacode-darwin-x64": {
-		target: "x86_64-apple-darwin",
-		binaryExt: "",
-		binaryName: "gigacode",
-	},
-	"@sandbox-agent/gigacode-darwin-arm64": {
-		target: "aarch64-apple-darwin",
-		binaryExt: "",
-		binaryName: "gigacode",
-	},
+// ─── Platform binary mapping (npm package → Rust target) ────────────────────
+// Maps CLI platform packages to their Rust build targets.
+// Keep in sync when adding new target platforms.
+const CLI_PLATFORM_MAP: Record<string, { target: string; binaryExt: string; binaryName: string }> = {
+  "@sandbox-agent/cli-linux-x64": {
+    target: "x86_64-unknown-linux-musl",
+    binaryExt: "",
+    binaryName: "sandbox-agent",
+  },
+  "@sandbox-agent/cli-linux-arm64": {
+    target: "aarch64-unknown-linux-musl",
+    binaryExt: "",
+    binaryName: "sandbox-agent",
+  },
+  "@sandbox-agent/cli-win32-x64": {
+    target: "x86_64-pc-windows-gnu",
+    binaryExt: ".exe",
+    binaryName: "sandbox-agent",
+  },
+  "@sandbox-agent/cli-darwin-x64": {
+    target: "x86_64-apple-darwin",
+    binaryExt: "",
+    binaryName: "sandbox-agent",
+  },
+  "@sandbox-agent/cli-darwin-arm64": {
+    target: "aarch64-apple-darwin",
+    binaryExt: "",
+    binaryName: "sandbox-agent",
+  },
+  "@sandbox-agent/gigacode-linux-x64": {
+    target: "x86_64-unknown-linux-musl",
+    binaryExt: "",
+    binaryName: "gigacode",
+  },
+  "@sandbox-agent/gigacode-linux-arm64": {
+    target: "aarch64-unknown-linux-musl",
+    binaryExt: "",
+    binaryName: "gigacode",
+  },
+  "@sandbox-agent/gigacode-win32-x64": {
+    target: "x86_64-pc-windows-gnu",
+    binaryExt: ".exe",
+    binaryName: "gigacode",
+  },
+  "@sandbox-agent/gigacode-darwin-x64": {
+    target: "x86_64-apple-darwin",
+    binaryExt: "",
+    binaryName: "gigacode",
+  },
+  "@sandbox-agent/gigacode-darwin-arm64": {
+    target: "aarch64-apple-darwin",
+    binaryExt: "",
+    binaryName: "gigacode",
+  },
 };
 
-async function npmVersionExists(
-	packageName: string,
-	version: string,
-): Promise<boolean> {
-	console.log(
-		`==> Checking if NPM version exists: ${packageName}@${version}`,
-	);
-	try {
-		await $({
-			stdout: "ignore",
-			stderr: "pipe",
-		})`npm view ${packageName}@${version} version`;
-		return true;
-	} catch (error: any) {
-		if (error.stderr) {
-			if (
-				!error.stderr.includes(
-					`No match found for version ${version}`,
-				) &&
-				!error.stderr.includes(
-					`'${packageName}@${version}' is not in this registry.`,
-				)
-			) {
-				throw new Error(
-					`unexpected npm view version output: ${error.stderr}`,
-				);
-			}
-		}
-		return false;
-	}
+// ─── Shared helpers ─────────────────────────────────────────────────────────
+
+async function npmVersionExists(packageName: string, version: string): Promise<boolean> {
+  console.log(`==> Checking if NPM version exists: ${packageName}@${version}`);
+  try {
+    await $({
+      stdout: "ignore",
+      stderr: "pipe",
+    })`npm view ${packageName}@${version} version`;
+    return true;
+  } catch (error: any) {
+    if (error.stderr) {
+      const stderr = error.stderr;
+      // Expected errors when version or package doesn't exist
+      const expected =
+        stderr.includes(`No match found for version ${version}`) ||
+        stderr.includes(`'${packageName}@${version}' is not in this registry.`) ||
+        stderr.includes("404 Not Found") ||
+        stderr.includes("is not in the npm registry");
+      if (!expected) {
+        throw new Error(`unexpected npm view version output: ${stderr}`);
+      }
+    }
+    return false;
+  }
 }
 
-async function crateVersionExists(
-	crateName: string,
-	version: string,
-): Promise<boolean> {
-	console.log(`==> Checking if crate version exists: ${crateName}@${version}`);
-	try {
-		const result = await $({
-			stdout: "pipe",
-			stderr: "pipe",
-		})`cargo search ${crateName} --limit 1`;
-		// cargo search output format: "cratename = \"version\" # description"
-		const output = result.stdout;
-		const match = output.match(new RegExp(`^${crateName}\\s*=\\s*"([^"]+)"`));
-		if (match && match[1] === version) {
-			return true;
-		}
-		return false;
-	} catch (error: any) {
-		// If cargo search fails, assume crate doesn't exist
-		return false;
-	}
+async function crateVersionExists(crateName: string, version: string): Promise<boolean> {
+  console.log(`==> Checking if crate version exists: ${crateName}@${version}`);
+  try {
+    const result = await $({
+      stdout: "pipe",
+      stderr: "pipe",
+    })`cargo search ${crateName} --limit 1`;
+    const output = result.stdout;
+    const match = output.match(new RegExp(`^${crateName}\\s*=\\s*"([^"]+)"`));
+    if (match && match[1] === version) {
+      return true;
+    }
+    return false;
+  } catch (error: any) {
+    return false;
+  }
 }
 
+// ─── Package discovery ──────────────────────────────────────────────────────
+
+interface NpmPackageInfo {
+  name: string;
+  dir: string;
+  hasBuildScript: boolean;
+  localDeps: string[];
+}
+
+/**
+ * Discover non-private npm packages matching the given glob patterns.
+ */
+async function discoverNpmPackages(root: string, patterns: string[]): Promise<NpmPackageInfo[]> {
+  const packages: NpmPackageInfo[] = [];
+
+  for (const pattern of patterns) {
+    const matches = await glob(pattern, { cwd: root });
+    for (const match of matches) {
+      const fullPath = join(root, match);
+      const pkg = JSON.parse(await fs.readFile(fullPath, "utf-8"));
+      if (pkg.private) continue;
+
+      const allDeps = { ...pkg.dependencies, ...pkg.peerDependencies };
+      const localDeps = Object.entries(allDeps || {})
+        .filter(([_, v]) => String(v).startsWith("workspace:"))
+        .map(([k]) => k);
+
+      packages.push({
+        name: pkg.name,
+        dir: dirname(fullPath),
+        hasBuildScript: !!pkg.scripts?.build,
+        localDeps,
+      });
+    }
+  }
+
+  return packages;
+}
+
+/**
+ * Topologically sort packages so dependencies are published before dependents.
+ */
+function topoSort(packages: NpmPackageInfo[]): NpmPackageInfo[] {
+  const byName = new Map(packages.map((p) => [p.name, p]));
+  const visited = new Set<string>();
+  const result: NpmPackageInfo[] = [];
+
+  function visit(pkg: NpmPackageInfo) {
+    if (visited.has(pkg.name)) return;
+    visited.add(pkg.name);
+    for (const dep of pkg.localDeps) {
+      const d = byName.get(dep);
+      if (d) visit(d);
+    }
+    result.push(pkg);
+  }
+
+  for (const pkg of packages) visit(pkg);
+  return result;
+}
+
+interface CrateInfo {
+  name: string;
+  dir: string;
+}
+
+/**
+ * Discover workspace crates via `cargo metadata` and return them in dependency order.
+ */
+async function discoverCrates(root: string): Promise<CrateInfo[]> {
+  const result = await $({ cwd: root, stdout: "pipe" })`cargo metadata --no-deps --format-version 1`;
+  const metadata = JSON.parse(result.stdout);
+
+  const memberIds = new Set<string>(metadata.workspace_members);
+  const workspacePackages = metadata.packages.filter((p: any) => memberIds.has(p.id));
+
+  // Build name→package map for topo sort
+  const byName = new Map<string, any>(workspacePackages.map((p: any) => [p.name, p]));
+
+  const visited = new Set<string>();
+  const sorted: CrateInfo[] = [];
+
+  function visit(pkg: any) {
+    if (visited.has(pkg.name)) return;
+    visited.add(pkg.name);
+    for (const dep of pkg.dependencies) {
+      const internal = byName.get(dep.name);
+      if (internal) visit(internal);
+    }
+    sorted.push({
+      name: pkg.name,
+      dir: dirname(pkg.manifest_path),
+    });
+  }
+
+  for (const pkg of workspacePackages) visit(pkg);
+  return sorted;
+}
+
+// ─── Crate publishing ───────────────────────────────────────────────────────
+
 export async function publishCrates(opts: ReleaseOpts) {
-	console.log("==> Publishing crates to crates.io");
+  console.log("==> Discovering workspace crates");
+  const crates = await discoverCrates(opts.root);
 
-	for (const crate of CRATES) {
-		const cratePath = crate === "gigacode"
-			? join(opts.root, "gigacode")
-			: join(opts.root, "server/packages", crate);
+  console.log(`Found ${crates.length} crates to publish:`);
+  for (const c of crates) console.log(`  - ${c.name}`);
 
-		// Read Cargo.toml to get the actual crate name
-		const cargoTomlPath = join(cratePath, "Cargo.toml");
-		const cargoToml = await fs.readFile(cargoTomlPath, "utf-8");
-		const nameMatch = cargoToml.match(/^name\s*=\s*"([^"]+)"/m);
-		const crateName = nameMatch ? nameMatch[1] : `sandbox-agent-${crate}`;
+  for (const crate of crates) {
+    const versionExists = await crateVersionExists(crate.name, opts.version);
+    if (versionExists) {
+      console.log(`Version ${opts.version} of ${crate.name} already exists on crates.io. Skipping...`);
+      continue;
+    }
 
-		// Check if version already exists
-		const versionExists = await crateVersionExists(crateName, opts.version);
-		if (versionExists) {
-			console.log(
-				`Version ${opts.version} of ${crateName} already exists on crates.io. Skipping...`,
-			);
-			continue;
-		}
+    console.log(`==> Publishing to crates.io: ${crate.name}@${opts.version}`);
 
-		// Publish
-		// Use --no-verify to skip the verification step because:
-		// 1. Code was already built/checked in the setup phase
-		// 2. Verification downloads published dependencies which may not have the latest
-		//    changes yet (crates.io indexing takes time)
-		console.log(`==> Publishing to crates.io: ${crateName}@${opts.version}`);
+    try {
+      await $({
+        stdout: "pipe",
+        stderr: "pipe",
+        cwd: crate.dir,
+      })`cargo publish --allow-dirty --no-verify`;
+      console.log(`✅ Published ${crate.name}@${opts.version}`);
+    } catch (err: any) {
+      if (err.stderr?.includes("already exists")) {
+        console.log(`Version ${opts.version} of ${crate.name} already exists on crates.io. Skipping...`);
+        continue;
+      }
+      console.error(`❌ Failed to publish ${crate.name}`);
+      console.error(err.stderr || err.message);
+      throw err;
+    }
 
-		try {
-			await $({
-				stdout: "pipe",
-				stderr: "pipe",
-				cwd: cratePath,
-			})`cargo publish --allow-dirty --no-verify`;
-			console.log(`✅ Published ${crateName}@${opts.version}`);
-		} catch (err: any) {
-			// Check if error is because crate already exists (from a previous partial run)
-			if (err.stderr?.includes("already exists")) {
-				console.log(
-					`Version ${opts.version} of ${crateName} already exists on crates.io. Skipping...`,
-				);
-				continue;
-			}
-			console.error(`❌ Failed to publish ${crateName}`);
-			console.error(err.stderr || err.message);
-			throw err;
-		}
+    console.log("Waiting for crates.io to index...");
+    await new Promise((resolve) => setTimeout(resolve, 30000));
+  }
 
-		// Wait a bit for crates.io to index the new version (needed for dependency resolution)
-		console.log("Waiting for crates.io to index...");
-		await new Promise((resolve) => setTimeout(resolve, 30000));
-	}
-
-	console.log("✅ All crates published");
+  console.log("✅ All crates published");
 }
 
-export async function publishNpmCliShared(opts: ReleaseOpts) {
-	const cliSharedPath = join(opts.root, "sdks/cli-shared");
-	const packageJsonPath = join(cliSharedPath, "package.json");
-	const packageJson = JSON.parse(await fs.readFile(packageJsonPath, "utf-8"));
-	const name = packageJson.name;
+// ─── NPM library publishing ────────────────────────────────────────────────
 
-	// Check if version already exists
-	const versionExists = await npmVersionExists(name, opts.version);
-	if (versionExists) {
-		console.log(
-			`Version ${opts.version} of ${name} already exists. Skipping...`,
-		);
-		return;
-	}
+/**
+ * Discover and publish all non-private library packages under sdks/.
+ * Excludes CLI/gigacode wrapper and platform packages (handled by publishNpmCli).
+ * Publishes in dependency order via topological sort.
+ */
+export async function publishNpmLibraries(opts: ReleaseOpts) {
+  console.log("==> Discovering library packages");
+  const all = await discoverNpmPackages(opts.root, ["sdks/*/package.json"]);
 
-	// Build cli-shared
-	console.log(`==> Building @sandbox-agent/cli-shared`);
-	await $({
-		stdio: "inherit",
-		cwd: opts.root,
-	})`pnpm --filter @sandbox-agent/cli-shared build`;
+  // Exclude CLI and gigacode directories (handled by publishNpmCli)
+  const libraries = all.filter((p) => {
+    const rel = relative(opts.root, p.dir);
+    return !(rel === "sdks/cli" || rel.startsWith("sdks/cli/")) && !(rel === "sdks/gigacode" || rel.startsWith("sdks/gigacode/"));
+  });
 
-	// Publish
-	console.log(`==> Publishing to NPM: ${name}@${opts.version}`);
+  const sorted = topoSort(libraries);
 
-	// Add --tag flag for release candidates
-	const isReleaseCandidate = opts.version.includes("-rc.");
-	const tag = isReleaseCandidate ? "rc" : (opts.latest ? "latest" : opts.minorVersionChannel);
+  console.log(`Found ${sorted.length} library packages to publish:`);
+  for (const pkg of sorted) console.log(`  - ${pkg.name}`);
 
-	await $({
-		stdio: "inherit",
-		cwd: cliSharedPath,
-	})`pnpm publish --access public --tag ${tag} --no-git-checks`;
+  const isReleaseCandidate = opts.version.includes("-rc.");
+  const tag = isReleaseCandidate ? "rc" : opts.latest ? "latest" : opts.minorVersionChannel;
 
-	console.log(`✅ Published ${name}@${opts.version}`);
+  for (const pkg of sorted) {
+    const versionExists = await npmVersionExists(pkg.name, opts.version);
+    if (versionExists) {
+      console.log(`Version ${opts.version} of ${pkg.name} already exists. Skipping...`);
+      continue;
+    }
+
+    if (pkg.hasBuildScript) {
+      console.log(`==> Building ${pkg.name}`);
+      await $({ stdio: "inherit", cwd: opts.root })`pnpm --filter ${pkg.name} build`;
+    }
+
+    console.log(`==> Publishing to NPM: ${pkg.name}@${opts.version}`);
+    try {
+      await $({ stdio: "inherit", cwd: pkg.dir })`pnpm publish --access public --tag ${tag} --no-git-checks`;
+      console.log(`✅ Published ${pkg.name}@${opts.version}`);
+    } catch (err: any) {
+      if (err.stderr?.includes("You cannot publish over the previously published versions") || err.stderr?.includes("403")) {
+        console.log(`⚠️ ${pkg.name}@${opts.version} already published (npm registry). Skipping.`);
+      } else {
+        throw err;
+      }
+    }
+  }
+
+  console.log("✅ All library packages published");
 }
 
-export async function publishNpmSdk(opts: ReleaseOpts) {
-	const sdkPath = join(opts.root, "sdks/typescript");
-	const packageJsonPath = join(sdkPath, "package.json");
-	const packageJson = JSON.parse(await fs.readFile(packageJsonPath, "utf-8"));
-	const name = packageJson.name;
-
-	// Check if version already exists
-	const versionExists = await npmVersionExists(name, opts.version);
-	if (versionExists) {
-		console.log(
-			`Version ${opts.version} of ${name} already exists. Skipping...`,
-		);
-		return;
-	}
-
-	// Build the SDK (cli-shared should already be built by publishNpmCliShared)
-	console.log(`==> Building TypeScript SDK`);
-	await $({
-		stdio: "inherit",
-		cwd: opts.root,
-	})`pnpm --filter sandbox-agent build`;
-
-	// Publish
-	console.log(`==> Publishing to NPM: ${name}@${opts.version}`);
-
-	// Add --tag flag for release candidates
-	const isReleaseCandidate = opts.version.includes("-rc.");
-	const tag = isReleaseCandidate ? "rc" : (opts.latest ? "latest" : opts.minorVersionChannel);
-
-	await $({
-		stdio: "inherit",
-		cwd: sdkPath,
-	})`pnpm publish --access public --tag ${tag} --no-git-checks`;
-
-	console.log(`✅ Published ${name}@${opts.version}`);
-}
+// ─── NPM CLI publishing ────────────────────────────────────────────────────
 
+/**
+ * Discover and publish CLI wrapper and platform packages.
+ * Platform packages get their binaries downloaded from R2 before publishing.
+ */
 export async function publishNpmCli(opts: ReleaseOpts) {
-	console.log("==> Publishing CLI packages to NPM");
+  console.log("==> Discovering CLI packages");
+  const packages = await discoverNpmPackages(opts.root, [
+    "sdks/cli/package.json",
+    "sdks/cli/platforms/*/package.json",
+    "sdks/gigacode/package.json",
+    "sdks/gigacode/platforms/*/package.json",
+  ]);
 
-	// Determine which commit to use for downloading binaries
-	let sourceCommit = opts.commit;
-	if (opts.reuseEngineVersion) {
-		const ref = opts.reuseEngineVersion.includes(".")
-			? `v${opts.reuseEngineVersion}`
-			: opts.reuseEngineVersion;
-		const result = await $`git rev-parse ${ref}`;
-		sourceCommit = result.stdout.trim().slice(0, 7);
-		console.log(`Using binaries from commit: ${sourceCommit}`);
-	}
+  console.log(`Found ${packages.length} CLI packages to publish:`);
+  for (const pkg of packages) console.log(`  - ${pkg.name}`);
 
-	for (const packageName of CLI_PACKAGES) {
-		// Check if version already exists
-		const versionExists = await npmVersionExists(packageName, opts.version);
-		if (versionExists) {
-			console.log(
-				`Version ${opts.version} of ${packageName} already exists. Skipping...`,
-			);
-			continue;
-		}
+  // Determine which commit to use for downloading binaries
+  let sourceCommit = opts.commit;
+  if (opts.reuseEngineVersion) {
+    const ref = opts.reuseEngineVersion.includes(".") ? `v${opts.reuseEngineVersion}` : opts.reuseEngineVersion;
+    const result = await $`git rev-parse ${ref}`;
+    sourceCommit = result.stdout.trim().slice(0, 7);
+    console.log(`Using binaries from commit: ${sourceCommit}`);
+  }
 
-		// Determine package path
-		let packagePath: string;
-		if (packageName === "@sandbox-agent/cli") {
-			packagePath = join(opts.root, "sdks/cli");
-		} else if (packageName === "@sandbox-agent/gigacode") {
-			packagePath = join(opts.root, "sdks/gigacode");
-		} else if (packageName.startsWith("@sandbox-agent/cli-")) {
-			// Platform-specific packages: @sandbox-agent/cli-linux-x64 -> sdks/cli/platforms/linux-x64
-			const platform = packageName.replace("@sandbox-agent/cli-", "");
-			packagePath = join(opts.root, "sdks/cli/platforms", platform);
-		} else if (packageName.startsWith("@sandbox-agent/gigacode-")) {
-			// Platform-specific packages: @sandbox-agent/gigacode-linux-x64 -> sdks/gigacode/platforms/linux-x64
-			const platform = packageName.replace("@sandbox-agent/gigacode-", "");
-			packagePath = join(opts.root, "sdks/gigacode/platforms", platform);
-		} else {
-			throw new Error(`Unknown CLI package: ${packageName}`);
-		}
+  for (const pkg of packages) {
+    const versionExists = await npmVersionExists(pkg.name, opts.version);
+    if (versionExists) {
+      console.log(`Version ${opts.version} of ${pkg.name} already exists. Skipping...`);
+      continue;
+    }
 
-		// Download binary from R2 for platform-specific packages
-		const platformInfo = CLI_PLATFORM_MAP[packageName];
-		if (platformInfo) {
-			const binDir = join(packagePath, "bin");
-			const binaryName = `${platformInfo.binaryName}${platformInfo.binaryExt}`;
-			const localBinaryPath = join(binDir, binaryName);
-			const remoteBinaryPath = `${PREFIX}/${sourceCommit}/binaries/${platformInfo.binaryName}-${platformInfo.target}${platformInfo.binaryExt}`;
+    // Download binary for platform-specific packages
+    const platformInfo = CLI_PLATFORM_MAP[pkg.name];
+    if (platformInfo) {
+      const binDir = join(pkg.dir, "bin");
+      const binaryName = `${platformInfo.binaryName}${platformInfo.binaryExt}`;
+      const localBinaryPath = join(binDir, binaryName);
+      const remoteBinaryPath = `${PREFIX}/${sourceCommit}/binaries/${platformInfo.binaryName}-${platformInfo.target}${platformInfo.binaryExt}`;
 
-			console.log(`==> Downloading binary for ${packageName}`);
-			console.log(`    From: ${remoteBinaryPath}`);
-			console.log(`    To: ${localBinaryPath}`);
+      console.log(`==> Downloading binary for ${pkg.name}`);
+      console.log(`    From: ${remoteBinaryPath}`);
+      console.log(`    To: ${localBinaryPath}`);
 
-			// Create bin directory
-			await fs.mkdir(binDir, { recursive: true });
+      await fs.mkdir(binDir, { recursive: true });
+      await downloadFromReleases(remoteBinaryPath, localBinaryPath);
 
-			// Download binary
-			await downloadFromReleases(remoteBinaryPath, localBinaryPath);
+      if (!platformInfo.binaryExt) {
+        await fs.chmod(localBinaryPath, 0o755);
+      }
+    }
 
-			// Make binary executable (not needed on Windows)
-			if (!platformInfo.binaryExt) {
-				await fs.chmod(localBinaryPath, 0o755);
-			}
-		}
+    // Publish
+    console.log(`==> Publishing to NPM: ${pkg.name}@${opts.version}`);
 
-		// Publish
-		console.log(`==> Publishing to NPM: ${packageName}@${opts.version}`);
+    const isReleaseCandidate = opts.version.includes("-rc.");
+    const tag = getCliPackageNpmTag({
+      packageName: pkg.name,
+      isReleaseCandidate,
+      latest: opts.latest,
+      minorVersionChannel: opts.minorVersionChannel,
+    });
 
-		// Add --tag flag for release candidates
-		const isReleaseCandidate = opts.version.includes("-rc.");
-		const tag = getCliPackageNpmTag({
-			packageName,
-			isReleaseCandidate,
-			latest: opts.latest,
-			minorVersionChannel: opts.minorVersionChannel,
-		});
+    try {
+      await $({
+        stdio: "inherit",
+        cwd: pkg.dir,
+      })`pnpm publish --access public --tag ${tag} --no-git-checks`;
+      console.log(`✅ Published ${pkg.name}@${opts.version}`);
+    } catch (err: any) {
+      if (err.stderr?.includes("You cannot publish over the previously published versions") || err.stderr?.includes("403")) {
+        console.log(`⚠️ ${pkg.name}@${opts.version} already published (npm registry). Skipping.`);
+      } else {
+        console.error(`❌ Failed to publish ${pkg.name}`);
+        throw err;
+      }
+    }
+  }
 
-		try {
-			await $({
-				stdio: "inherit",
-				cwd: packagePath,
-			})`pnpm publish --access public --tag ${tag} --no-git-checks`;
-			console.log(`✅ Published ${packageName}@${opts.version}`);
-
-		} catch (err) {
-			console.error(`❌ Failed to publish ${packageName}`);
-			throw err;
-		}
-	}
-
-	console.log("✅ All CLI packages published");
+  console.log("✅ All CLI packages published");
 }
 
-function getCliPackageNpmTag(opts: {
-	packageName: string;
-	isReleaseCandidate: boolean;
-	latest: boolean;
-	minorVersionChannel: string;
-}): string {
-	if (opts.isReleaseCandidate) {
-		return "rc";
-	}
+function getCliPackageNpmTag(opts: { packageName: string; isReleaseCandidate: boolean; latest: boolean; minorVersionChannel: string }): string {
+  if (opts.isReleaseCandidate) {
+    return "rc";
+  }
 
-	if (opts.latest) {
-		return "latest";
-	}
+  if (opts.latest) {
+    return "latest";
+  }
 
-	return opts.minorVersionChannel;
+  return opts.minorVersionChannel;
 }
-
diff --git a/scripts/release/tsconfig.json b/scripts/release/tsconfig.json
index 27ce8a7..c0c08b2 100644
--- a/scripts/release/tsconfig.json
+++ b/scripts/release/tsconfig.json
@@ -1,11 +1,13 @@
 {
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"types": ["node"],
-		"paths": {
-			"@/*": ["./src/*"]
-		}
-	},
-	"include": ["**/*.ts"],
-	"exclude": ["node_modules"]
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "types": ["node"]
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules"]
 }
diff --git a/scripts/release/update_version.ts b/scripts/release/update_version.ts
index c7c1c60..9dfa305 100644
--- a/scripts/release/update_version.ts
+++ b/scripts/release/update_version.ts
@@ -1,92 +1,188 @@
 import * as fs from "node:fs/promises";
+import { join } from "node:path";
 import { $ } from "execa";
 import { glob } from "glob";
+import * as semver from "semver";
 import type { ReleaseOpts } from "./main";
 
 function assert(condition: any, message?: string): asserts condition {
-	if (!condition) {
-		throw new Error(message || "Assertion failed");
-	}
+  if (!condition) {
+    throw new Error(message || "Assertion failed");
+  }
 }
 
+// Files containing version references that need channel/image tag updates.
+// Keep in sync with CLAUDE.md "Install Version References" section.
+const VERSION_REFERENCE_FILES = [
+  "README.md",
+  "docs/acp-http-client.mdx",
+  "docs/cli.mdx",
+  "docs/quickstart.mdx",
+  "docs/sdk-overview.mdx",
+  "docs/react-components.mdx",
+  "docs/session-persistence.mdx",
+  "docs/architecture.mdx",
+  "docs/deploy/local.mdx",
+  "docs/deploy/cloudflare.mdx",
+  "docs/deploy/vercel.mdx",
+  "docs/deploy/daytona.mdx",
+  "docs/deploy/e2b.mdx",
+  "docs/deploy/docker.mdx",
+  "docs/deploy/boxlite.mdx",
+  "docs/deploy/modal.mdx",
+  "docs/deploy/computesdk.mdx",
+  "frontend/packages/website/src/components/GetStarted.tsx",
+  ".claude/commands/post-release-testing.md",
+  "examples/cloudflare/Dockerfile",
+  "examples/boxlite/Dockerfile",
+  "examples/boxlite-python/Dockerfile",
+  "examples/daytona/src/index.ts",
+  "examples/shared/src/docker.ts",
+  "examples/docker/src/index.ts",
+  "examples/e2b/src/index.ts",
+  "examples/vercel/src/index.ts",
+  "sdks/typescript/src/providers/shared.ts",
+  "scripts/release/main.ts",
+  "scripts/release/promote-artifacts.ts",
+  "scripts/release/sdk.ts",
+];
+
 export async function updateVersion(opts: ReleaseOpts) {
-	// Define substitutions
-	const findReplace = [
-		{
-			path: "Cargo.toml",
-			find: /\[workspace\.package\]\nversion = ".*"/,
-			replace: `[workspace.package]\nversion = "${opts.version}"`,
-		},
-		{
-			path: "sdks/cli-shared/package.json",
-			find: /"version": ".*"/,
-			replace: `"version": "${opts.version}"`,
-		},
-		{
-			path: "sdks/typescript/package.json",
-			find: /"version": ".*"/,
-			replace: `"version": "${opts.version}"`,
-		},
-		{
-			path: "sdks/cli/package.json",
-			find: /"version": ".*"/,
-			replace: `"version": "${opts.version}"`,
-		},
-		{
-			path: "sdks/gigacode/package.json",
-			find: /"version": ".*"/,
-			replace: `"version": "${opts.version}"`,
-		},
-		{
-			path: "sdks/cli/platforms/*/package.json",
-			find: /"version": ".*"/,
-			replace: `"version": "${opts.version}"`,
-		},
-		{
-			path: "sdks/gigacode/platforms/*/package.json",
-			find: /"version": ".*"/,
-			replace: `"version": "${opts.version}"`,
-		},
-	];
+  // 1. Read current version from Cargo.toml before overwriting
+  const cargoTomlPath = join(opts.root, "Cargo.toml");
+  let cargoContent = await fs.readFile(cargoTomlPath, "utf-8");
 
-	// Update internal crate versions in workspace dependencies
-	// These need to match the new version so cargo publish can resolve them correctly
-	const internalCrates = [
-		"sandbox-agent",
-		"sandbox-agent-error",
-		"sandbox-agent-agent-management",
-		"sandbox-agent-agent-credentials",
-		"sandbox-agent-universal-agent-schema",
-		"sandbox-agent-extracted-agent-schemas",
-	];
+  const oldVersionMatch = cargoContent.match(/\[workspace\.package\]\nversion = "([^"]+)"/);
+  assert(oldVersionMatch, "Could not find workspace.package version in Cargo.toml");
+  const oldVersion = oldVersionMatch[1];
+  const oldParsed = semver.parse(oldVersion);
+  assert(oldParsed, `Could not parse old version: ${oldVersion}`);
+  const oldMinorChannel = `${oldParsed.major}.${oldParsed.minor}.x`;
 
-	const cargoTomlPath = `${opts.root}/Cargo.toml`;
-	let cargoContent = await fs.readFile(cargoTomlPath, "utf-8");
+  // Update [workspace.package] version
+  cargoContent = cargoContent.replace(/\[workspace\.package\]\nversion = ".*"/, `[workspace.package]\nversion = "${opts.version}"`);
 
-	for (const crate of internalCrates) {
-		// Match: crate-name = { version = "x.y.z", path = "..." }
-		const pattern = new RegExp(
-			`(${crate.replace(/-/g, "-")} = \\{ version = ")[^"]+(",)`,
-			"g"
-		);
-		cargoContent = cargoContent.replace(pattern, `$1${opts.version}$2`);
-	}
+  // Discover internal crates from [workspace.dependencies] by matching
+  // lines with both `version = "..."` and `path = "..."` (internal path deps)
+  const internalCratePattern = /^(\S+)\s*=\s*\{[^}]*version\s*=\s*"[^"]+"\s*,[^}]*path\s*=/gm;
+  let match;
+  const internalCrates: string[] = [];
+  while ((match = internalCratePattern.exec(cargoContent)) !== null) {
+    internalCrates.push(match[1]);
+  }
 
-	await fs.writeFile(cargoTomlPath, cargoContent);
-	await $({ cwd: opts.root })`git add Cargo.toml`;
+  console.log(`Discovered ${internalCrates.length} internal crates to version-bump:`);
+  for (const crate of internalCrates) console.log(`  - ${crate}`);
 
-	// Substitute all files
-	for (const { path: globPath, find, replace } of findReplace) {
-		const paths = await glob(globPath, { cwd: opts.root });
-		assert(paths.length > 0, `no paths matched: ${globPath}`);
-		for (const path of paths) {
-			const fullPath = `${opts.root}/${path}`;
-			const file = await fs.readFile(fullPath, "utf-8");
-			assert(find.test(file), `file does not match ${find}: ${fullPath}`);
-			const newFile = file.replace(find, replace);
-			await fs.writeFile(fullPath, newFile);
+  for (const crate of internalCrates) {
+    const pattern = new RegExp(`(${crate.replace(/-/g, "-")} = \\{ version = ")[^"]+(",)`, "g");
+    cargoContent = cargoContent.replace(pattern, `$1${opts.version}$2`);
+  }
 
-			await $({ cwd: opts.root })`git add ${path}`;
-		}
-	}
+  await fs.writeFile(cargoTomlPath, cargoContent);
+  await $({ cwd: opts.root })`git add Cargo.toml`;
+
+  // 2. Discover and update all non-private SDK package.json versions
+  const packageJsonPaths = await glob("sdks/**/package.json", {
+    cwd: opts.root,
+    ignore: ["**/node_modules/**"],
+  });
+
+  // Filter to non-private packages only
+  const toUpdate: string[] = [];
+  for (const relPath of packageJsonPaths) {
+    const fullPath = join(opts.root, relPath);
+    const content = await fs.readFile(fullPath, "utf-8");
+    const pkg = JSON.parse(content);
+    if (pkg.private) continue;
+    toUpdate.push(relPath);
+  }
+
+  console.log(`Discovered ${toUpdate.length} SDK package.json files to version-bump:`);
+  for (const relPath of toUpdate) console.log(`  - ${relPath}`);
+
+  for (const relPath of toUpdate) {
+    const fullPath = join(opts.root, relPath);
+    const content = await fs.readFile(fullPath, "utf-8");
+
+    const versionPattern = /"version": ".*"/;
+    assert(versionPattern.test(content), `No version field in ${relPath}`);
+
+    const updated = content.replace(versionPattern, `"version": "${opts.version}"`);
+    await fs.writeFile(fullPath, updated);
+    await $({ cwd: opts.root })`git add ${relPath}`;
+  }
+
+  // 3. Update version references across docs, examples, and code
+  await updateVersionReferences(opts, oldVersion, oldMinorChannel);
+}
+
+async function updateVersionReferences(opts: ReleaseOpts, oldVersion: string, oldMinorChannel: string) {
+  const newMinorChannel = opts.minorVersionChannel;
+
+  // Find old Docker image tags by scanning for rivetdev/sandbox-agent:<version>-full patterns
+  // The old version might be a different patch or RC, so we match any version-full tag
+  const oldDockerTagPattern = /rivetdev\/sandbox-agent:([0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9.]+)?)-full/;
+
+  console.log(`\nUpdating version references:`);
+  console.log(`  Old minor channel: ${oldMinorChannel}`);
+  console.log(`  New minor channel: ${newMinorChannel}`);
+  console.log(`  New Docker tag: ${opts.version}-full`);
+
+  const modifiedFiles: string[] = [];
+
+  for (const relPath of VERSION_REFERENCE_FILES) {
+    const fullPath = join(opts.root, relPath);
+
+    let content: string;
+    try {
+      content = await fs.readFile(fullPath, "utf-8");
+    } catch (err: any) {
+      if (err.code === "ENOENT") {
+        console.log(`  ⚠️  Skipping ${relPath} (file not found)`);
+        continue;
+      }
+      throw err;
+    }
+
+    const original = content;
+
+    // Replace minor channel references (e.g. sandbox-agent@0.5.x -> sandbox-agent@0.5.x)
+    content = content.replaceAll(`sandbox-agent@${oldMinorChannel}`, `sandbox-agent@${newMinorChannel}`);
+    content = content.replaceAll(`@sandbox-agent/cli@${oldMinorChannel}`, `@sandbox-agent/cli@${newMinorChannel}`);
+    content = content.replaceAll(`@sandbox-agent/react@${oldMinorChannel}`, `@sandbox-agent/react@${newMinorChannel}`);
+
+    // Replace install script URL channel
+    content = content.replaceAll(`releases.rivet.dev/sandbox-agent/${oldMinorChannel}/`, `releases.rivet.dev/sandbox-agent/${newMinorChannel}/`);
+
+    // If references drifted (for example Cargo.toml version was bumped without updating docs),
+    // normalize any other pinned minor-channel references to the release's channel.
+    content = content.replaceAll(/sandbox-agent@0\.\d+\.x/g, `sandbox-agent@${newMinorChannel}`);
+    content = content.replaceAll(/@sandbox-agent\/cli@0\.\d+\.x/g, `@sandbox-agent/cli@${newMinorChannel}`);
+    content = content.replaceAll(/@sandbox-agent\/react@0\.\d+\.x/g, `@sandbox-agent/react@${newMinorChannel}`);
+    content = content.replaceAll(/releases\.rivet\.dev\/sandbox-agent\/0\.\d+\.x\//g, `releases.rivet.dev/sandbox-agent/${newMinorChannel}/`);
+
+    // Replace Docker image tags (rivetdev/sandbox-agent:<anything>-full -> rivetdev/sandbox-agent:<version>-full)
+    content = content.replaceAll(
+      new RegExp(`rivetdev/sandbox-agent:[0-9]+\\.[0-9]+\\.[0-9]+(?:-[a-zA-Z0-9.]+)?-full`, "g"),
+      `rivetdev/sandbox-agent:${opts.version}-full`,
+    );
+
+    // Replace standalone version-full references in prose (e.g. "The `0.3.2-full` tag pins...")
+    // Match backtick-wrapped version-full patterns
+    content = content.replaceAll(new RegExp("`[0-9]+\\.[0-9]+\\.[0-9]+(?:-[a-zA-Z0-9.]+)?-full`", "g"), `\`${opts.version}-full\``);
+
+    if (content !== original) {
+      await fs.writeFile(fullPath, content);
+      modifiedFiles.push(relPath);
+      console.log(`  ✅ ${relPath}`);
+    }
+  }
+
+  if (modifiedFiles.length > 0) {
+    await $({ cwd: opts.root })`git add -f ${modifiedFiles}`;
+    console.log(`\nUpdated ${modifiedFiles.length} files with version references.`);
+  } else {
+    console.log(`\nNo version reference files needed updates.`);
+  }
 }
diff --git a/scripts/release/utils.ts b/scripts/release/utils.ts
index ed92c4e..4a81fa8 100644
--- a/scripts/release/utils.ts
+++ b/scripts/release/utils.ts
@@ -4,9 +4,9 @@ import { $ } from "execa";
 export const PREFIX = "sandbox-agent";
 
 export function assert(condition: any, message?: string): asserts condition {
-	if (!condition) {
-		throw new Error(message || "Assertion failed");
-	}
+  if (!condition) {
+    throw new Error(message || "Assertion failed");
+  }
 }
 
 /**
@@ -15,126 +15,112 @@ export function assert(condition: any, message?: string): asserts condition {
  * Otherwise, it's treated as a git revision and returned as-is (e.g., "bb7f292").
  */
 export function versionOrCommitToRef(versionOrCommit: string): string {
-	if (versionOrCommit.includes(".")) {
-		assert(
-			!versionOrCommit.startsWith("v"),
-			`Version should not start with "v" (got "${versionOrCommit}", use "${versionOrCommit.slice(1)}" instead)`,
-		);
-		return `v${versionOrCommit}`;
-	}
-	return versionOrCommit;
+  if (versionOrCommit.includes(".")) {
+    assert(!versionOrCommit.startsWith("v"), `Version should not start with "v" (got "${versionOrCommit}", use "${versionOrCommit.slice(1)}" instead)`);
+    return `v${versionOrCommit}`;
+  }
+  return versionOrCommit;
 }
 
 /**
  * Fetches a git ref from the remote. For tags, fetches all tags. For commits, unshallows the repo.
  */
 export async function fetchGitRef(ref: string): Promise<void> {
-	if (ref.startsWith("v")) {
-		console.log(`Fetching tags...`);
-		await $({ stdio: "inherit" })`git fetch --tags --force`;
-	} else {
-		// Git doesn't allow fetching commits directly by SHA, and CI often uses
-		// shallow clones. Unshallow the repo to ensure the commit is available.
-		console.log(`Unshallowing repo to find commit ${ref}...`);
-		try {
-			await $({ stdio: "inherit" })`git fetch --unshallow origin`;
-		} catch {
-			// Already unshallowed, just fetch
-			await $({ stdio: "inherit" })`git fetch origin`;
-		}
-	}
+  if (ref.startsWith("v")) {
+    console.log(`Fetching tags...`);
+    await $({ stdio: "inherit" })`git fetch --tags --force`;
+  } else {
+    // Git doesn't allow fetching commits directly by SHA, and CI often uses
+    // shallow clones. Unshallow the repo to ensure the commit is available.
+    console.log(`Unshallowing repo to find commit ${ref}...`);
+    try {
+      await $({ stdio: "inherit" })`git fetch --unshallow origin`;
+    } catch {
+      // Already unshallowed, just fetch
+      await $({ stdio: "inherit" })`git fetch origin`;
+    }
+  }
 }
 
 interface ReleasesS3Config {
-	awsEnv: Record<string, string>;
-	endpointUrl: string;
+  awsEnv: Record<string, string>;
+  endpointUrl: string;
 }
 
 let cachedConfig: ReleasesS3Config | null = null;
 
 async function getReleasesS3Config(): Promise<ReleasesS3Config> {
-	if (cachedConfig) {
-		return cachedConfig;
-	}
+  if (cachedConfig) {
+    return cachedConfig;
+  }
 
-	let awsAccessKeyId = process.env.R2_RELEASES_ACCESS_KEY_ID;
-	if (!awsAccessKeyId) {
-		const result =
-			await $`op read ${"op://Engineering/rivet-releases R2 Upload/username"}`;
-		awsAccessKeyId = result.stdout.trim();
-	}
-	let awsSecretAccessKey = process.env.R2_RELEASES_SECRET_ACCESS_KEY;
-	if (!awsSecretAccessKey) {
-		const result =
-			await $`op read ${"op://Engineering/rivet-releases R2 Upload/password"}`;
-		awsSecretAccessKey = result.stdout.trim();
-	}
+  let awsAccessKeyId = process.env.R2_RELEASES_ACCESS_KEY_ID;
+  if (!awsAccessKeyId) {
+    const result = await $`op read ${"op://Engineering/rivet-releases R2 Upload/username"}`;
+    awsAccessKeyId = result.stdout.trim();
+  }
+  let awsSecretAccessKey = process.env.R2_RELEASES_SECRET_ACCESS_KEY;
+  if (!awsSecretAccessKey) {
+    const result = await $`op read ${"op://Engineering/rivet-releases R2 Upload/password"}`;
+    awsSecretAccessKey = result.stdout.trim();
+  }
 
-	assert(awsAccessKeyId, "AWS_ACCESS_KEY_ID is required");
-	assert(awsSecretAccessKey, "AWS_SECRET_ACCESS_KEY is required");
+  assert(awsAccessKeyId, "AWS_ACCESS_KEY_ID is required");
+  assert(awsSecretAccessKey, "AWS_SECRET_ACCESS_KEY is required");
 
-	cachedConfig = {
-		awsEnv: {
-			AWS_ACCESS_KEY_ID: awsAccessKeyId,
-			AWS_SECRET_ACCESS_KEY: awsSecretAccessKey,
-			AWS_DEFAULT_REGION: "auto",
-		},
-		endpointUrl:
-			"https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com",
-	};
+  cachedConfig = {
+    awsEnv: {
+      AWS_ACCESS_KEY_ID: awsAccessKeyId,
+      AWS_SECRET_ACCESS_KEY: awsSecretAccessKey,
+      AWS_DEFAULT_REGION: "auto",
+    },
+    endpointUrl: "https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com",
+  };
 
-	return cachedConfig;
+  return cachedConfig;
 }
 
-export async function uploadDirToReleases(
-	localPath: string,
-	remotePath: string,
-): Promise<void> {
-	const { awsEnv, endpointUrl } = await getReleasesS3Config();
-	// Use --checksum-algorithm CRC32 for R2 compatibility (matches CI upload in release.yaml)
-	await $({
-		env: awsEnv,
-		shell: true,
-		stdio: "inherit",
-	})`aws s3 cp ${localPath} s3://rivet-releases/${remotePath} --recursive --checksum-algorithm CRC32 --endpoint-url ${endpointUrl}`;
+export async function uploadDirToReleases(localPath: string, remotePath: string): Promise<void> {
+  const { awsEnv, endpointUrl } = await getReleasesS3Config();
+  // Use --checksum-algorithm CRC32 for R2 compatibility (matches CI upload in release.yaml)
+  await $({
+    env: awsEnv,
+    shell: true,
+    stdio: "inherit",
+  })`aws s3 cp ${localPath} s3://rivet-releases/${remotePath} --recursive --checksum-algorithm CRC32 --endpoint-url ${endpointUrl}`;
 }
 
-export async function uploadContentToReleases(
-	content: string,
-	remotePath: string,
-): Promise<void> {
-	const { awsEnv, endpointUrl } = await getReleasesS3Config();
-	await $({
-		env: awsEnv,
-		input: content,
-		shell: true,
-		stdio: ["pipe", "inherit", "inherit"],
-	})`aws s3 cp - s3://rivet-releases/${remotePath} --endpoint-url ${endpointUrl}`;
+export async function uploadContentToReleases(content: string, remotePath: string): Promise<void> {
+  const { awsEnv, endpointUrl } = await getReleasesS3Config();
+  await $({
+    env: awsEnv,
+    input: content,
+    shell: true,
+    stdio: ["pipe", "inherit", "inherit"],
+  })`aws s3 cp - s3://rivet-releases/${remotePath} --endpoint-url ${endpointUrl}`;
 }
 
 export interface ListReleasesResult {
-	Contents?: { Key: string; Size: number }[];
+  Contents?: { Key: string; Size: number }[];
 }
 
-export async function listReleasesObjects(
-	prefix: string,
-): Promise<ListReleasesResult> {
-	const { awsEnv, endpointUrl } = await getReleasesS3Config();
-	const result = await $({
-		env: awsEnv,
-		shell: true,
-		stdio: ["pipe", "pipe", "inherit"],
-	})`aws s3api list-objects --bucket rivet-releases --prefix ${prefix} --endpoint-url ${endpointUrl}`;
-	return JSON.parse(result.stdout);
+export async function listReleasesObjects(prefix: string): Promise<ListReleasesResult> {
+  const { awsEnv, endpointUrl } = await getReleasesS3Config();
+  const result = await $({
+    env: awsEnv,
+    shell: true,
+    stdio: ["pipe", "pipe", "inherit"],
+  })`aws s3api list-objects --bucket rivet-releases --prefix ${prefix} --endpoint-url ${endpointUrl}`;
+  return JSON.parse(result.stdout);
 }
 
 export async function deleteReleasesPath(remotePath: string): Promise<void> {
-	const { awsEnv, endpointUrl } = await getReleasesS3Config();
-	await $({
-		env: awsEnv,
-		shell: true,
-		stdio: "inherit",
-	})`aws s3 rm s3://rivet-releases/${remotePath} --recursive --endpoint-url ${endpointUrl}`;
+  const { awsEnv, endpointUrl } = await getReleasesS3Config();
+  await $({
+    env: awsEnv,
+    shell: true,
+    stdio: "inherit",
+  })`aws s3 rm s3://rivet-releases/${remotePath} --recursive --endpoint-url ${endpointUrl}`;
 }
 
 /**
@@ -147,68 +133,59 @@ export async function deleteReleasesPath(remotePath: string): Promise<void> {
  *
  * See: https://community.cloudflare.com/t/r2-s3-compat-doesnt-support-net-sdk-for-copy-operations-due-to-tagging-header/616867
  */
-export async function copyReleasesPath(
-	sourcePath: string,
-	targetPath: string,
-): Promise<void> {
-	const { awsEnv, endpointUrl } = await getReleasesS3Config();
+export async function copyReleasesPath(sourcePath: string, targetPath: string): Promise<void> {
+  const { awsEnv, endpointUrl } = await getReleasesS3Config();
 
-	const listResult = await $({
-		env: awsEnv,
-	})`aws s3api list-objects --bucket rivet-releases --prefix ${sourcePath} --endpoint-url ${endpointUrl}`;
+  const listResult = await $({
+    env: awsEnv,
+  })`aws s3api list-objects --bucket rivet-releases --prefix ${sourcePath} --endpoint-url ${endpointUrl}`;
 
-	const objects = JSON.parse(listResult.stdout);
-	if (!objects.Contents?.length) {
-		throw new Error(`No objects found under ${sourcePath}`);
-	}
+  const objects = JSON.parse(listResult.stdout);
+  if (!objects.Contents?.length) {
+    throw new Error(`No objects found under ${sourcePath}`);
+  }
 
-	for (const obj of objects.Contents) {
-		const sourceKey = obj.Key;
-		const targetKey = sourceKey.replace(sourcePath, targetPath);
-		console.log(`  ${sourceKey} -> ${targetKey}`);
-		await $({
-			env: awsEnv,
-		})`aws s3api copy-object --bucket rivet-releases --key ${targetKey} --copy-source rivet-releases/${sourceKey} --endpoint-url ${endpointUrl}`;
-	}
+  for (const obj of objects.Contents) {
+    const sourceKey = obj.Key;
+    const targetKey = sourceKey.replace(sourcePath, targetPath);
+    console.log(`  ${sourceKey} -> ${targetKey}`);
+    await $({
+      env: awsEnv,
+    })`aws s3api copy-object --bucket rivet-releases --key ${targetKey} --copy-source rivet-releases/${sourceKey} --endpoint-url ${endpointUrl}`;
+  }
 }
 
 export function assertEquals<T>(actual: T, expected: T, message?: string): void {
-	if (actual !== expected) {
-		throw new Error(message || `Expected ${expected}, got ${actual}`);
-	}
+  if (actual !== expected) {
+    throw new Error(message || `Expected ${expected}, got ${actual}`);
+  }
 }
 
-export function assertExists<T>(
-	value: T | null | undefined,
-	message?: string,
-): asserts value is T {
-	if (value === null || value === undefined) {
-		throw new Error(message || "Value does not exist");
-	}
+export function assertExists<T>(value: T | null | undefined, message?: string): asserts value is T {
+  if (value === null || value === undefined) {
+    throw new Error(message || "Value does not exist");
+  }
 }
 
 export async function assertDirExists(dirPath: string): Promise<void> {
-	try {
-		const stat = await fs.stat(dirPath);
-		if (!stat.isDirectory()) {
-			throw new Error(`Path exists but is not a directory: ${dirPath}`);
-		}
-	} catch (err: any) {
-		if (err.code === "ENOENT") {
-			throw new Error(`Directory not found: ${dirPath}`);
-		}
-		throw err;
-	}
+  try {
+    const stat = await fs.stat(dirPath);
+    if (!stat.isDirectory()) {
+      throw new Error(`Path exists but is not a directory: ${dirPath}`);
+    }
+  } catch (err: any) {
+    if (err.code === "ENOENT") {
+      throw new Error(`Directory not found: ${dirPath}`);
+    }
+    throw err;
+  }
 }
 
-export async function downloadFromReleases(
-	remotePath: string,
-	localPath: string,
-): Promise<void> {
-	const { awsEnv, endpointUrl } = await getReleasesS3Config();
-	await $({
-		env: awsEnv,
-		shell: true,
-		stdio: "inherit",
-	})`aws s3 cp s3://rivet-releases/${remotePath} ${localPath} --endpoint-url ${endpointUrl}`;
+export async function downloadFromReleases(remotePath: string, localPath: string): Promise<void> {
+  const { awsEnv, endpointUrl } = await getReleasesS3Config();
+  await $({
+    env: awsEnv,
+    shell: true,
+    stdio: "inherit",
+  })`aws s3 cp s3://rivet-releases/${remotePath} ${localPath} --endpoint-url ${endpointUrl}`;
 }
diff --git a/scripts/sandbox-testing/package.json b/scripts/sandbox-testing/package.json
deleted file mode 100644
index 9c458d3..0000000
--- a/scripts/sandbox-testing/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"name": "@sandbox-agent/testing",
-	"private": true,
-	"type": "module",
-	"scripts": {
-		"test": "tsx test-sandbox.ts",
-		"test:docker": "tsx test-sandbox.ts docker",
-		"test:daytona": "tsx test-sandbox.ts daytona",
-		"test:mock": "tsx test-sandbox.ts docker --agent=mock",
-		"test:verbose": "tsx test-sandbox.ts docker --verbose"
-	},
-	"dependencies": {
-		"@daytonaio/sdk": "latest",
-		"@e2b/code-interpreter": "latest"
-	},
-	"devDependencies": {
-		"@types/node": "latest",
-		"tsx": "latest",
-		"typescript": "latest"
-	}
-}
diff --git a/scripts/sandbox-testing/test-sandbox.ts b/scripts/sandbox-testing/test-sandbox.ts
deleted file mode 100644
index a19224e..0000000
--- a/scripts/sandbox-testing/test-sandbox.ts
+++ /dev/null
@@ -1,715 +0,0 @@
-#!/usr/bin/env npx tsx
-/**
- * Sandbox Testing Script
- *
- * Tests sandbox-agent on various cloud sandbox providers.
- * Usage: npx tsx test-sandbox.ts [provider] [options]
- *
- * Providers: daytona, e2b, docker
- *
- * Options:
- *   --skip-build          Skip cargo build step
- *   --use-release         Use pre-built release binary from releases.rivet.dev
- *   --agent <name>        Test specific agent (claude, codex, mock)
- *   --skip-agent-install  Skip pre-installing agents (tests on-demand install like Daytona example)
- *   --keep-alive          Don't cleanup sandbox after test
- *   --verbose             Show all logs
- */
-
-import { execSync, spawn } from "node:child_process";
-import { existsSync, readFileSync, mkdtempSync, writeFileSync, rmSync } from "node:fs";
-import { homedir, tmpdir } from "node:os";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = join(__dirname, "../..");
-const SERVER_DIR = join(ROOT_DIR, "server");
-
-// Parse args
-const args = process.argv.slice(2);
-const provider = args.find((a) => !a.startsWith("--")) || "docker";
-const skipBuild = args.includes("--skip-build");
-const useRelease = args.includes("--use-release");
-const skipAgentInstall = args.includes("--skip-agent-install");
-const keepAlive = args.includes("--keep-alive");
-const verbose = args.includes("--verbose");
-const agentArg = args.find((a) => a.startsWith("--agent="))?.split("=")[1];
-
-// Colors
-const log = {
-	info: (msg: string) => console.log(`\x1b[34m[INFO]\x1b[0m ${msg}`),
-	success: (msg: string) => console.log(`\x1b[32m[OK]\x1b[0m ${msg}`),
-	error: (msg: string) => console.log(`\x1b[31m[ERROR]\x1b[0m ${msg}`),
-	warn: (msg: string) => console.log(`\x1b[33m[WARN]\x1b[0m ${msg}`),
-	debug: (msg: string) => verbose && console.log(`\x1b[90m[DEBUG]\x1b[0m ${msg}`),
-	section: (msg: string) => console.log(`\n\x1b[1m=== ${msg} ===\x1b[0m`),
-};
-
-// Credentials extraction using sandbox-agent CLI
-function extractCredentials(): { anthropicApiKey?: string; openaiApiKey?: string } {
-	// First check environment variables
-	const envCreds = {
-		anthropicApiKey: process.env.ANTHROPIC_API_KEY,
-		openaiApiKey: process.env.OPENAI_API_KEY,
-	};
-
-	// If both are set in env, use them
-	if (envCreds.anthropicApiKey && envCreds.openaiApiKey) {
-		return envCreds;
-	}
-
-	// Try to extract using sandbox-agent CLI
-	try {
-		const binaryPath = join(ROOT_DIR, "target/release/sandbox-agent");
-		const debugBinaryPath = join(ROOT_DIR, "target/debug/sandbox-agent");
-		const binary = existsSync(binaryPath) ? binaryPath : existsSync(debugBinaryPath) ? debugBinaryPath : null;
-
-		if (binary) {
-			const output = execSync(`${binary} credentials extract-env --export`, {
-				encoding: "utf-8",
-				stdio: ["pipe", "pipe", "pipe"],
-			});
-
-			// Parse export statements: export KEY="value"
-			for (const line of output.split("\n")) {
-				const match = line.match(/^export (\w+)="(.*)"/);
-				if (match) {
-					const [, key, value] = match;
-					if (key === "ANTHROPIC_API_KEY" && !envCreds.anthropicApiKey) {
-						envCreds.anthropicApiKey = value;
-					} else if (key === "OPENAI_API_KEY" && !envCreds.openaiApiKey) {
-						envCreds.openaiApiKey = value;
-					}
-				}
-			}
-			log.debug(`Extracted credentials via sandbox-agent CLI`);
-		}
-	} catch (err) {
-		log.debug(`Failed to extract credentials via CLI: ${err}`);
-	}
-
-	return envCreds;
-}
-
-function getAnthropicApiKey(): string | undefined {
-	return extractCredentials().anthropicApiKey;
-}
-
-function getOpenAiApiKey(): string | undefined {
-	return extractCredentials().openaiApiKey;
-}
-
-// Build sandbox-agent
-async function buildSandboxAgent(): Promise<string> {
-	log.section("Building sandbox-agent");
-
-	if (useRelease) {
-		log.info("Using pre-built release from releases.rivet.dev");
-		return "RELEASE";
-	}
-
-	// Binary is in workspace root target dir, not server target dir
-	const binaryPath = join(ROOT_DIR, "target/release/sandbox-agent");
-
-	if (skipBuild) {
-		if (!existsSync(binaryPath)) {
-			throw new Error(`Binary not found at ${binaryPath}. Run without --skip-build.`);
-		}
-		log.info(`Using existing binary: ${binaryPath}`);
-		return binaryPath;
-	}
-
-	log.info("Running cargo build --release...");
-	try {
-		execSync("cargo build --release -p sandbox-agent", {
-			cwd: ROOT_DIR,
-			stdio: verbose ? "inherit" : "pipe",
-		});
-		log.success(`Built: ${binaryPath}`);
-		return binaryPath;
-	} catch (err) {
-		throw new Error(`Build failed: ${err}`);
-	}
-}
-
-// Provider interface
-interface SandboxProvider {
-	name: string;
-	requiredEnv: string[];
-	create(opts: { envVars: Record<string, string> }): Promise<Sandbox>;
-}
-
-interface Sandbox {
-	id: string;
-	exec(cmd: string): Promise<{ stdout: string; stderr: string; exitCode: number }>;
-	upload(localPath: string, remotePath: string): Promise<void>;
-	getBaseUrl(port: number): Promise<string>;
-	cleanup(): Promise<void>;
-}
-
-// Docker provider
-// Uses Ubuntu because Claude Code and sandbox-agent are glibc binaries
-const dockerProvider: SandboxProvider = {
-	name: "docker",
-	requiredEnv: [],
-	async create({ envVars }) {
-		const id = `sandbox-test-${Date.now()}`;
-		const envArgs = Object.entries(envVars)
-			.map(([k, v]) => `-e ${k}=${v}`)
-			.join(" ");
-
-		log.info(`Creating Docker container: ${id}`);
-		execSync(
-			`docker run -d --name ${id} ${envArgs} -p 0:3000 ubuntu:22.04 tail -f /dev/null`,
-			{ stdio: verbose ? "inherit" : "pipe" },
-		);
-
-		// Install dependencies
-		execSync(`docker exec ${id} sh -c "apt-get update && apt-get install -y curl ca-certificates"`, {
-			stdio: verbose ? "inherit" : "pipe",
-		});
-
-		return {
-			id,
-			async exec(cmd) {
-				try {
-					const stdout = execSync(`docker exec ${id} sh -c "${cmd.replace(/"/g, '\\"')}"`, {
-						encoding: "utf-8",
-						stdio: ["pipe", "pipe", "pipe"],
-					});
-					return { stdout, stderr: "", exitCode: 0 };
-				} catch (err: any) {
-					return { stdout: err.stdout || "", stderr: err.stderr || "", exitCode: err.status || 1 };
-				}
-			},
-			async upload(localPath, remotePath) {
-				execSync(`docker cp "${localPath}" ${id}:${remotePath}`, { stdio: verbose ? "inherit" : "pipe" });
-				execSync(`docker exec ${id} chmod +x ${remotePath}`, { stdio: verbose ? "inherit" : "pipe" });
-			},
-			async getBaseUrl(port) {
-				const portMapping = execSync(`docker port ${id} ${port}`, { encoding: "utf-8" }).trim();
-				const hostPort = portMapping.split(":").pop();
-				return `http://localhost:${hostPort}`;
-			},
-			async cleanup() {
-				log.info(`Cleaning up container: ${id}`);
-				execSync(`docker rm -f ${id}`, { stdio: "pipe" });
-			},
-		};
-	},
-};
-
-// Daytona provider
-const daytonaProvider: SandboxProvider = {
-	name: "daytona",
-	requiredEnv: ["DAYTONA_API_KEY"],
-	async create({ envVars }) {
-		const { Daytona } = await import("@daytonaio/sdk");
-		const daytona = new Daytona();
-
-		log.info("Creating Daytona sandbox...");
-		// NOTE: Tier 1/2 sandboxes have restricted network that cannot be overridden
-		// networkAllowList requires CIDR notation (IP ranges), not domain names
-		const sandbox = await daytona.create({
-			image: "ubuntu:22.04",
-			envVars,
-		});
-		const id = sandbox.id;
-
-		// Install curl
-		await sandbox.process.executeCommand("apt-get update && apt-get install -y curl ca-certificates");
-
-		return {
-			id,
-			async exec(cmd) {
-				const result = await sandbox.process.executeCommand(cmd);
-				// Daytona SDK returns: { exitCode, result: string, artifacts: { stdout: string } }
-				return {
-					stdout: result.result || "",
-					stderr: "",
-					exitCode: result.exitCode ?? 0,
-				};
-			},
-			async upload(localPath, remotePath) {
-				const content = readFileSync(localPath);
-				// Daytona SDK signature: uploadFile(Buffer, remotePath)
-				await sandbox.fs.uploadFile(content, remotePath);
-				await sandbox.process.executeCommand(`chmod +x ${remotePath}`);
-			},
-			async getBaseUrl(port) {
-				const preview = await sandbox.getSignedPreviewUrl(port, 4 * 60 * 60);
-				return preview.url;
-			},
-			async cleanup() {
-				log.info(`Cleaning up Daytona sandbox: ${id}`);
-				await sandbox.delete(60);
-			},
-		};
-	},
-};
-
-// E2B provider
-const e2bProvider: SandboxProvider = {
-	name: "e2b",
-	requiredEnv: ["E2B_API_KEY"],
-	async create({ envVars }) {
-		const { Sandbox } = await import("@e2b/code-interpreter");
-
-		log.info("Creating E2B sandbox...");
-		let sandbox;
-		try {
-			sandbox = await Sandbox.create({
-				allowInternetAccess: true,
-				envs: envVars,
-			});
-		} catch (err: any) {
-			log.error(`E2B sandbox creation failed: ${err.message || err}`);
-			throw err;
-		}
-		const id = sandbox.sandboxId;
-
-		// Install curl (E2B uses Debian which has glibc, sandbox-agent will auto-detect)
-		const installResult = await sandbox.commands.run(
-			"sudo apt-get update && sudo apt-get install -y curl ca-certificates"
-		);
-		log.debug(`Install output: ${installResult.stdout} ${installResult.stderr}`);
-
-		return {
-			id,
-			async exec(cmd) {
-				const result = await sandbox.commands.run(cmd);
-				return {
-					stdout: result.stdout || "",
-					stderr: result.stderr || "",
-					exitCode: result.exitCode,
-				};
-			},
-			async upload(localPath, remotePath) {
-				const content = readFileSync(localPath);
-				await sandbox.files.write(remotePath, content);
-				await sandbox.commands.run(`chmod +x ${remotePath}`);
-			},
-			async getBaseUrl(port) {
-				return `https://${sandbox.getHost(port)}`;
-			},
-			async cleanup() {
-				log.info(`Cleaning up E2B sandbox: ${id}`);
-				await sandbox.kill();
-			},
-		};
-	},
-};
-
-// Get provider
-function getProvider(name: string): SandboxProvider {
-	switch (name) {
-		case "docker":
-			return dockerProvider;
-		case "daytona":
-			return daytonaProvider;
-		case "e2b":
-			return e2bProvider;
-		default:
-			throw new Error(`Unknown provider: ${name}. Available: docker, daytona, e2b`);
-	}
-}
-
-// Install sandbox-agent in sandbox
-async function installSandboxAgent(sandbox: Sandbox, binaryPath: string): Promise<void> {
-	log.section("Installing sandbox-agent");
-
-	if (binaryPath === "RELEASE") {
-		log.info("Installing from releases.rivet.dev...");
-		const result = await sandbox.exec(
-			"curl -fsSL https://releases.rivet.dev/sandbox-agent/0.2.x/install.sh | sh",
-		);
-		log.debug(`Install output: ${result.stdout}`);
-		if (result.exitCode !== 0) {
-			throw new Error(`Install failed: ${result.stderr}`);
-		}
-	} else {
-		log.info(`Uploading local binary: ${binaryPath}`);
-		await sandbox.upload(binaryPath, "/usr/local/bin/sandbox-agent");
-	}
-
-	// Verify installation
-	const version = await sandbox.exec("sandbox-agent --version");
-	log.success(`Installed: ${version.stdout.trim()}`);
-}
-
-// Install agents
-async function installAgents(sandbox: Sandbox, agents: string[]): Promise<void> {
-	log.section("Installing agents");
-
-	for (const agent of agents) {
-		log.info(`Installing ${agent}...`);
-
-		if (agent === "claude" || agent === "codex") {
-			const result = await sandbox.exec(`sandbox-agent install-agent ${agent}`);
-			if (result.exitCode !== 0) throw new Error(`Failed to install ${agent}: ${result.stderr}`);
-			log.success(`Installed ${agent}`);
-		} else if (agent === "mock") {
-			// Mock agent is built into sandbox-agent, no install needed
-			log.info("Mock agent is built-in, skipping install");
-		}
-	}
-}
-
-// Start server and check health
-async function startServerAndCheckHealth(sandbox: Sandbox): Promise<string> {
-	log.section("Starting server");
-
-	// Start server in background
-	await sandbox.exec("nohup sandbox-agent server --no-token --host 0.0.0.0 --port 3000 >/tmp/sandbox-agent.log 2>&1 &");
-	log.info("Server started in background");
-
-	// Get base URL
-	const baseUrl = await sandbox.getBaseUrl(3000);
-	log.info(`Base URL: ${baseUrl}`);
-
-	// Wait for health
-	log.info("Waiting for health check...");
-	for (let i = 0; i < 30; i++) {
-		try {
-			const response = await fetch(`${baseUrl}/v1/health`);
-			if (response.ok) {
-				const data = await response.json();
-				if (data.status === "ok") {
-					log.success("Health check passed!");
-					return baseUrl;
-				}
-			}
-		} catch {}
-		await new Promise((r) => setTimeout(r, 1000));
-	}
-
-	// Show logs on failure
-	const logs = await sandbox.exec("cat /tmp/sandbox-agent.log");
-	log.error("Server logs:\n" + logs.stdout);
-	throw new Error("Health check failed after 30 seconds");
-}
-
-// Send a message and wait for response, auto-approving permissions
-// Returns the response text
-async function sendMessage(baseUrl: string, sessionId: string, message: string): Promise<string> {
-	log.info(`Sending message: "${message.slice(0, 60)}${message.length > 60 ? "..." : ""}"`);
-	const msgRes = await fetch(`${baseUrl}/v1/sessions/${sessionId}/messages/stream`, {
-		method: "POST",
-		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify({ message }),
-	});
-	if (!msgRes.ok || !msgRes.body) {
-		throw new Error(`Failed to send message: ${await msgRes.text()}`);
-	}
-
-	// Process SSE stream
-	const reader = msgRes.body.getReader();
-	const decoder = new TextDecoder();
-	let buffer = "";
-	let responseText = "";
-	let receivedText = false;
-	let hasError = false;
-	let errorMessage = "";
-	let pendingPermission: string | null = null;
-
-	while (true) {
-		const { done, value } = await reader.read();
-		if (done) break;
-
-		buffer += decoder.decode(value, { stream: true });
-		const lines = buffer.split("\n");
-		buffer = lines.pop() || "";
-
-		for (const line of lines) {
-			if (!line.startsWith("data: ")) continue;
-			const data = line.slice(6);
-			if (data === "[DONE]") continue;
-
-			try {
-				const event = JSON.parse(data);
-				log.debug(`Event: ${event.type}`);
-
-				if (event.type === "item.delta") {
-					const delta = event.data?.delta;
-					const text = typeof delta === "string" ? delta : delta?.text || "";
-					if (text) {
-						if (!receivedText) {
-							log.info("Receiving response...");
-							receivedText = true;
-						}
-						process.stdout.write(text);
-						responseText += text;
-					}
-				}
-
-				// Handle permission requests - auto-approve
-				if (event.type === "permission.requested") {
-					const permissionId = event.data?.permission_id;
-					if (permissionId) {
-						pendingPermission = permissionId;
-						log.info(`Permission requested (${permissionId}), auto-approving...`);
-					}
-				}
-
-				if (event.type === "error") {
-					hasError = true;
-					errorMessage = event.data?.message || JSON.stringify(event.data);
-					log.error(`Error event: ${errorMessage}`);
-				}
-
-				if (event.type === "agent.unparsed") {
-					hasError = true;
-					errorMessage = `Agent unparsed: ${JSON.stringify(event.data)}`;
-					log.error(errorMessage);
-				}
-			} catch {}
-		}
-
-		// If we have a pending permission, approve it
-		if (pendingPermission) {
-			const permId = pendingPermission;
-			pendingPermission = null;
-			try {
-				const approveRes = await fetch(`${baseUrl}/v1/sessions/${sessionId}/permissions/${permId}/reply`, {
-					method: "POST",
-					headers: { "Content-Type": "application/json" },
-					body: JSON.stringify({ reply: "once" }),
-				});
-				if (approveRes.ok) {
-					log.success(`Permission ${permId} approved`);
-				} else {
-					log.warn(`Failed to approve permission: ${await approveRes.text()}`);
-				}
-			} catch (err) {
-				log.warn(`Error approving permission: ${err}`);
-			}
-		}
-	}
-
-	if (receivedText) {
-		console.log(); // newline after response
-	}
-
-	if (hasError) {
-		throw new Error(`Agent returned error: ${errorMessage}`);
-	}
-
-	return responseText;
-}
-
-// Test agent interaction
-async function testAgent(baseUrl: string, agent: string, message: string): Promise<void> {
-	log.section(`Testing ${agent} agent`);
-
-	const sessionId = crypto.randomUUID();
-
-	// Create session
-	log.info(`Creating session ${sessionId}...`);
-	const createRes = await fetch(`${baseUrl}/v1/sessions/${sessionId}`, {
-		method: "POST",
-		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify({ agent }),
-	});
-	if (!createRes.ok) {
-		throw new Error(`Failed to create session: ${await createRes.text()}`);
-	}
-	log.success("Session created");
-
-	const response = await sendMessage(baseUrl, sessionId, message);
-	if (!response) {
-		throw new Error("No response received from agent");
-	}
-	log.success("Received response from agent");
-}
-
-// Test that agent can actually modify files and run commands
-async function testAgentActions(baseUrl: string, agent: string, sandbox: Sandbox): Promise<void> {
-	log.section(`Testing ${agent} agent actions (file + command)`);
-
-	const sessionId = crypto.randomUUID();
-	const testFile = "/tmp/sandbox-test-file.txt";
-	const expectedContent = "Hello from sandbox test!";
-
-	// For Claude running as root in containers, we must use default permission mode
-	// and handle permissions via the API (bypass mode is not supported as root).
-	// For other agents, we can use bypass mode.
-	const permissionMode = agent === "claude" ? "default" : "bypass";
-	log.info(`Creating session ${sessionId} with permissionMode=${permissionMode}...`);
-	const createRes = await fetch(`${baseUrl}/v1/sessions/${sessionId}`, {
-		method: "POST",
-		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify({ agent, permissionMode }),
-	});
-	if (!createRes.ok) {
-		throw new Error(`Failed to create session: ${await createRes.text()}`);
-	}
-	log.success("Session created");
-
-	// Ask agent to create a file
-	const fileMessage = `Create a file at ${testFile} with exactly this content (no quotes, no extra text): ${expectedContent}`;
-	await sendMessage(baseUrl, sessionId, fileMessage);
-
-	// Wait for agent to complete action after permission approval
-	log.info("Waiting for agent to complete action...");
-	await new Promise((r) => setTimeout(r, 5000));
-
-	// Verify file was created
-	log.info("Verifying file was created...");
-	const fileCheck = await sandbox.exec(`cat ${testFile} 2>&1`);
-	if (fileCheck.exitCode !== 0) {
-		throw new Error(`File was not created: ${fileCheck.stderr || fileCheck.stdout}`);
-	}
-	if (!fileCheck.stdout.includes("Hello from sandbox test")) {
-		throw new Error(`File content mismatch. Expected "${expectedContent}", got "${fileCheck.stdout.trim()}"`);
-	}
-	log.success(`File created with correct content: "${fileCheck.stdout.trim()}"`);
-
-	// Ask agent to run a command and create output
-	const cmdMessage = `Run this command and tell me the output: echo "command-test-$(date +%s)" > /tmp/cmd-output.txt && cat /tmp/cmd-output.txt`;
-	await sendMessage(baseUrl, sessionId, cmdMessage);
-
-	// Verify command was executed
-	log.info("Verifying command was executed...");
-	const cmdCheck = await sandbox.exec("cat /tmp/cmd-output.txt 2>&1");
-	if (cmdCheck.exitCode !== 0) {
-		throw new Error(`Command output file not found: ${cmdCheck.stderr || cmdCheck.stdout}`);
-	}
-	if (!cmdCheck.stdout.includes("command-test-")) {
-		throw new Error(`Command output mismatch. Expected "command-test-*", got "${cmdCheck.stdout.trim()}"`);
-	}
-	log.success(`Command executed successfully: "${cmdCheck.stdout.trim()}"`);
-}
-
-// Check environment diagnostics
-async function checkEnvironment(sandbox: Sandbox): Promise<void> {
-	log.section("Environment diagnostics");
-
-	const checks = [
-		{ name: "Environment variables", cmd: "env | grep -E 'ANTHROPIC|OPENAI|CLAUDE|CODEX' | sed 's/=.*/=<set>/'" },
-		// Check both /root (Alpine) and /home/user (E2B/Debian) paths
-		{ name: "Agent binaries", cmd: "ls -la ~/.local/share/sandbox-agent/bin/ 2>/dev/null || ls -la /root/.local/share/sandbox-agent/bin/ 2>/dev/null || ls -la /home/user/.local/share/sandbox-agent/bin/ 2>/dev/null || echo 'No agents installed'" },
-		{ name: "Claude version", cmd: "~/.local/share/sandbox-agent/bin/claude --version 2>&1 || /root/.local/share/sandbox-agent/bin/claude --version 2>&1 || echo 'Claude not installed'" },
-		{ name: "sandbox-agent version", cmd: "sandbox-agent --version 2>/dev/null || echo 'Not installed'" },
-		{ name: "Server process", cmd: "pgrep -a sandbox-agent 2>/dev/null || ps aux | grep sandbox-agent | grep -v grep || echo 'Not running'" },
-		{ name: "Server logs (last 50 lines)", cmd: "tail -50 /tmp/sandbox-agent.log 2>/dev/null || echo 'No logs'" },
-		{ name: "Network: api.anthropic.com", cmd: "curl -s -o /dev/null -w '%{http_code}' --connect-timeout 5 https://api.anthropic.com/v1/messages 2>&1 || echo 'UNREACHABLE'" },
-		{ name: "Network: api.openai.com", cmd: "curl -s -o /dev/null -w '%{http_code}' --connect-timeout 5 https://api.openai.com/v1/models 2>&1 || echo 'UNREACHABLE'" },
-	];
-
-	for (const { name, cmd } of checks) {
-		const result = await sandbox.exec(cmd);
-		console.log(`\n\x1b[1m${name}:\x1b[0m`);
-		console.log(result.stdout || "(empty)");
-		if (result.stderr) console.log(`stderr: ${result.stderr}`);
-	}
-}
-
-// Main
-async function main() {
-	log.section(`Sandbox Testing (provider: ${provider})`);
-
-	// Check credentials
-	const anthropicKey = getAnthropicApiKey();
-	const openaiKey = getOpenAiApiKey();
-
-	log.info(`Anthropic API key: ${anthropicKey ? "found" : "not found"}`);
-	log.info(`OpenAI API key: ${openaiKey ? "found" : "not found"}`);
-
-	// Determine which agents to test
-	let agents: string[];
-	if (agentArg) {
-		agents = [agentArg];
-	} else if (anthropicKey) {
-		agents = ["claude"];
-	} else if (openaiKey) {
-		agents = ["codex"];
-	} else {
-		agents = ["mock"];
-		log.warn("No API keys found, using mock agent only");
-	}
-	log.info(`Agents to test: ${agents.join(", ")}`);
-
-	// Get provider
-	const prov = getProvider(provider);
-
-	// Check required env vars
-	for (const envVar of prov.requiredEnv) {
-		if (!process.env[envVar]) {
-			throw new Error(`Missing required environment variable: ${envVar}`);
-		}
-	}
-
-	// Build
-	const binaryPath = await buildSandboxAgent();
-
-	// Create sandbox
-	log.section(`Creating ${prov.name} sandbox`);
-	const envVars: Record<string, string> = {};
-	if (anthropicKey) envVars.ANTHROPIC_API_KEY = anthropicKey;
-	if (openaiKey) envVars.OPENAI_API_KEY = openaiKey;
-
-	const sandbox = await prov.create({ envVars });
-	log.success(`Created sandbox: ${sandbox.id}`);
-
-	try {
-		// Install sandbox-agent
-		await installSandboxAgent(sandbox, binaryPath);
-
-		// Install agents (unless --skip-agent-install to test on-demand install like Daytona example)
-		if (skipAgentInstall) {
-			log.info("Skipping agent pre-install (testing on-demand installation)");
-		} else {
-			await installAgents(sandbox, agents);
-		}
-
-		// Check environment
-		await checkEnvironment(sandbox);
-
-		// Start server and check health
-		const baseUrl = await startServerAndCheckHealth(sandbox);
-
-		// Test each agent
-		for (const agent of agents) {
-			// Basic response test
-			const message = agent === "mock" ? "hello" : "Say hello in 10 words or less";
-			await testAgent(baseUrl, agent, message);
-
-			// For real agents, also test file/command actions with permission handling.
-			// Claude uses default permission mode and we auto-approve via API.
-			// Other agents can use bypass mode.
-			if (agent !== "mock") {
-				await testAgentActions(baseUrl, agent, sandbox);
-			}
-		}
-
-		log.section("All tests passed!");
-
-		if (keepAlive) {
-			log.info(`Sandbox ${sandbox.id} is still running. Press Ctrl+C to cleanup.`);
-			log.info(`Base URL: ${await sandbox.getBaseUrl(3000)}`);
-			await new Promise(() => {}); // Wait forever
-		}
-	} catch (err) {
-		log.error(`Test failed: ${err}`);
-
-		// Show diagnostics on failure
-		try {
-			await checkEnvironment(sandbox);
-		} catch {}
-
-		if (!keepAlive) {
-			await sandbox.cleanup();
-		}
-		process.exit(1);
-	}
-
-	if (!keepAlive) {
-		await sandbox.cleanup();
-	}
-}
-
-main().catch((err) => {
-	log.error(err.message || err);
-	process.exit(1);
-});
diff --git a/scripts/skill-generator/generate.js b/scripts/skill-generator/generate.js
index 81556eb..682cbab 100644
--- a/scripts/skill-generator/generate.js
+++ b/scripts/skill-generator/generate.js
@@ -68,12 +68,14 @@ async function main() {
   const referenceMap = buildReferenceMap(references);
   const template = await fsp.readFile(TEMPLATE_PATH, "utf8");
 
-  const skillFile = template
-    .replace("{{QUICKSTART}}", quickstartContent)
-    .replace("{{REFERENCE_MAP}}", referenceMap);
+  const skillFile = template.replace("{{QUICKSTART}}", quickstartContent).replace("{{REFERENCE_MAP}}", referenceMap);
 
-  await fsp.writeFile(path.join(OUTPUT_ROOT, "SKILL.md"), `${skillFile.trim()}
-`, "utf8");
+  await fsp.writeFile(
+    path.join(OUTPUT_ROOT, "SKILL.md"),
+    `${skillFile.trim()}
+`,
+    "utf8",
+  );
 
   console.log(`Generated skill files in ${OUTPUT_ROOT}`);
 }
@@ -188,7 +190,10 @@ function buildReferenceMap(references) {
 
   for (const group of sortedGroups) {
     lines.push(`### ${formatSegment(group)}`, "");
-    const items = grouped.get(group).slice().sort((a, b) => a.title.localeCompare(b.title));
+    const items = grouped
+      .get(group)
+      .slice()
+      .sort((a, b) => a.title.localeCompare(b.title));
     for (const item of items) {
       lines.push(`- [${item.title}](${item.referencePath})`);
     }
@@ -281,9 +286,7 @@ function normalizeCodeBlock(block) {
   const opening = lines[0].trim();
   const closing = lines[lines.length - 1].trim();
   const contentLines = lines.slice(1, -1);
-  const indents = contentLines
-    .filter((line) => line.trim() !== "")
-    .map((line) => line.match(/^\s*/)?.[0].length ?? 0);
+  const indents = contentLines.filter((line) => line.trim() !== "").map((line) => line.match(/^\s*/)?.[0].length ?? 0);
   const minIndent = indents.length ? Math.min(...indents) : 0;
   const normalizedContent = contentLines.map((line) => line.slice(minIndent));
 
@@ -344,7 +347,10 @@ function getAttributeValue(attrs, name) {
 }
 
 function stripHtml(value) {
-  return value.replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim();
+  return value
+    .replace(/<[^>]+>/g, " ")
+    .replace(/\s+/g, " ")
+    .trim();
 }
 
 function collapseWhitespace(value) {
diff --git a/sdks/CLAUDE.md b/sdks/CLAUDE.md
new file mode 100644
index 0000000..a71eac4
--- /dev/null
+++ b/sdks/CLAUDE.md
@@ -0,0 +1,37 @@
+# SDK Instructions
+
+## TypeScript SDK Architecture
+
+- TypeScript clients are split into:
+  - `acp-http-client`: protocol-pure ACP-over-HTTP (`/v1/acp`) with no Sandbox-specific HTTP helpers.
+  - `sandbox-agent`: `SandboxAgent` SDK wrapper that combines ACP session operations with Sandbox control-plane and filesystem helpers.
+- `SandboxAgent` entry points are `SandboxAgent.connect(...)` and `SandboxAgent.start(...)`.
+- Stable Sandbox session methods are `createSession`, `resumeSession`, `resumeOrCreateSession`, `destroySession`, `rawSendSessionMethod`, `onSessionEvent`, `setSessionMode`, `setSessionModel`, `setSessionThoughtLevel`, `setSessionConfigOption`, `getSessionConfigOptions`, `getSessionModes`, `respondPermission`, `rawRespondPermission`, and `onPermissionRequest`.
+- `Session` helpers are `prompt(...)`, `rawSend(...)`, `onEvent(...)`, `setMode(...)`, `setModel(...)`, `setThoughtLevel(...)`, `setConfigOption(...)`, `getConfigOptions()`, `getModes()`, `respondPermission(...)`, `rawRespondPermission(...)`, and `onPermissionRequest(...)`.
+- Cleanup is `sdk.dispose()`.
+
+### React Component Methodology
+
+- Shared React UI belongs in `sdks/react` only when it is reusable outside the Inspector.
+- If the same UI pattern is shared between the Sandbox Agent Inspector and Foundry, prefer extracting it into `sdks/react` instead of maintaining parallel implementations.
+- Keep shared components unstyled by default: behavior in the package, styling in the consumer via `className`, slot-level `classNames`, render overrides, and `data-*` hooks.
+- Prefer extracting reusable pieces such as transcript, composer, and conversation surfaces. Keep Inspector-specific shells such as session selection, session headers, and control-plane actions in `frontend/packages/inspector/`.
+- Document all shared React components in `docs/react-components.mdx`, and keep that page aligned with the exported surface in `sdks/react/src/index.ts`.
+
+### TypeScript SDK Naming Conventions
+
+- Use `respond<Thing>(id, reply)` for SDK methods that reply to an agent-initiated request (e.g. `respondPermission`). This is the standard pattern for answering any inbound JSON-RPC request from the agent.
+- Prefix raw/low-level escape hatches with `raw` (e.g. `rawRespondPermission`, `rawSend`). These accept protocol-level types directly and bypass SDK abstractions.
+
+### Docs Source Of Truth
+
+- For TypeScript docs/examples, source of truth is implementation in:
+  - `sdks/typescript/src/client.ts`
+  - `sdks/typescript/src/index.ts`
+  - `sdks/acp-http-client/src/index.ts`
+- Do not document TypeScript APIs unless they are exported and implemented in those files.
+
+## Tests
+
+- TypeScript SDK tests should run against a real running server/runtime over real `/v1` HTTP APIs, typically using the real `mock` agent for deterministic behavior.
+- Do not use Vitest fetch/transport mocks to simulate server functionality in TypeScript SDK tests.
diff --git a/sdks/acp-http-client/package.json b/sdks/acp-http-client/package.json
index 6eb419a..0d61dc3 100644
--- a/sdks/acp-http-client/package.json
+++ b/sdks/acp-http-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acp-http-client",
-  "version": "0.1.0",
+  "version": "0.4.2",
   "description": "Protocol-faithful ACP JSON-RPC over streamable HTTP client.",
   "license": "Apache-2.0",
   "repository": {
@@ -17,7 +17,7 @@
     }
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "^0.14.1"
+    "@agentclientprotocol/sdk": "^0.16.1"
   },
   "files": [
     "dist"
diff --git a/sdks/acp-http-client/src/index.ts b/sdks/acp-http-client/src/index.ts
index 5c254a6..f8ac668 100644
--- a/sdks/acp-http-client/src/index.ts
+++ b/sdks/acp-http-client/src/index.ts
@@ -195,14 +195,12 @@ export class AcpHttpClient {
     return wrapRpc(this.connection.setSessionMode(request));
   }
 
-  async setSessionConfigOption(
-    request: SetSessionConfigOptionRequest,
-  ): Promise<SetSessionConfigOptionResponse> {
+  async setSessionConfigOption(request: SetSessionConfigOptionRequest): Promise<SetSessionConfigOptionResponse> {
     return wrapRpc(this.connection.setSessionConfigOption(request));
   }
 
-  async unstableListSessions(request: ListSessionsRequest): Promise<ListSessionsResponse> {
-    return wrapRpc(this.connection.unstable_listSessions(request));
+  async listSessions(request: ListSessionsRequest): Promise<ListSessionsResponse> {
+    return wrapRpc(this.connection.listSessions(request));
   }
 
   async unstableForkSession(request: ForkSessionRequest): Promise<ForkSessionResponse> {
@@ -213,9 +211,7 @@ export class AcpHttpClient {
     return wrapRpc(this.connection.unstable_resumeSession(request));
   }
 
-  async unstableSetSessionModel(
-    request: SetSessionModelRequest,
-  ): Promise<SetSessionModelResponse | void> {
+  async unstableSetSessionModel(request: SetSessionModelRequest): Promise<SetSessionModelResponse | void> {
     return wrapRpc(this.connection.unstable_setSessionModel(request));
   }
 
@@ -271,6 +267,8 @@ class StreamableHttpAcpTransport {
   private closed = false;
   private closingPromise: Promise<void> | null = null;
   private postedOnce = false;
+  private readonly seenResponseIds = new Set<string>();
+  private readonly seenResponseIdOrder: string[] = [];
 
   constructor(options: StreamableHttpAcpTransportOptions) {
     this.baseUrl = options.baseUrl.replace(/\/$/, "");
@@ -279,9 +277,7 @@ class StreamableHttpAcpTransport {
     this.token = options.token;
     this.defaultHeaders = options.defaultHeaders;
     this.onEnvelope = options.onEnvelope;
-    this.bootstrapQuery = options.transport?.bootstrapQuery
-      ? buildQueryParams(options.transport.bootstrapQuery)
-      : null;
+    this.bootstrapQuery = options.transport?.bootstrapQuery ? buildQueryParams(options.transport.bootstrapQuery) : null;
 
     this.stream = {
       readable: new ReadableStream<AnyMessage>({
@@ -376,31 +372,39 @@ class StreamableHttpAcpTransport {
     });
 
     const url = this.buildUrl(this.bootstrapQueryIfNeeded());
-    const response = await this.fetcher(url, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(message),
-    });
-
     this.postedOnce = true;
-
-    if (!response.ok) {
-      throw new AcpHttpError(response.status, await readProblem(response), response);
-    }
-
     this.ensureSseLoop();
+    void this.postMessage(url, headers, message);
+  }
 
-    if (response.status === 200) {
-      const text = await response.text();
-      if (text.trim()) {
-        const envelope = JSON.parse(text) as AnyMessage;
-        this.pushInbound(envelope);
+  private async postMessage(url: string, headers: Headers, message: AnyMessage): Promise<void> {
+    try {
+      const response = await this.fetcher(url, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(message),
+      });
+
+      if (!response.ok) {
+        throw new AcpHttpError(response.status, await readProblem(response), response);
       }
-    } else {
+
+      if (response.status === 200) {
+        const text = await response.text();
+        if (text.trim()) {
+          const envelope = JSON.parse(text) as AnyMessage;
+          this.pushInbound(envelope);
+        }
+        return;
+      }
+
       // Drain response body so the underlying connection is released back to
-      // the pool.  Without this, Node.js undici keeps the socket occupied and
+      // the pool. Without this, Node.js undici keeps the socket occupied and
       // may stall subsequent requests to the same origin.
       await response.text().catch(() => {});
+    } catch (error) {
+      console.error("ACP write error:", error);
+      this.failReadable(error);
     }
   }
 
@@ -450,7 +454,8 @@ class StreamableHttpAcpTransport {
           return;
         }
 
-        this.failReadable(error);
+        // SSE failure is non-fatal: the POST request/response flow still works.
+        // Exiting the loop allows ensureSseLoop() to restart it on the next POST.
         return;
       }
     }
@@ -534,6 +539,21 @@ class StreamableHttpAcpTransport {
       return;
     }
 
+    const responseId = responseEnvelopeId(envelope);
+    if (responseId) {
+      if (this.seenResponseIds.has(responseId)) {
+        return;
+      }
+      this.seenResponseIds.add(responseId);
+      this.seenResponseIdOrder.push(responseId);
+      if (this.seenResponseIdOrder.length > 2048) {
+        const oldest = this.seenResponseIdOrder.shift();
+        if (oldest) {
+          this.seenResponseIds.delete(oldest);
+        }
+      }
+    }
+
     this.observeEnvelope(envelope, "inbound");
 
     try {
@@ -631,10 +651,32 @@ function buildClientHandlers(client?: Partial<Client>): Client {
     waitForTerminalExit: client?.waitForTerminalExit,
     killTerminal: client?.killTerminal,
     extMethod: client?.extMethod,
-    extNotification: client?.extNotification,
+    extNotification: async (method: string, params: Record<string, unknown>) => {
+      if (client?.extNotification) {
+        await client.extNotification(method, params);
+      }
+    },
   };
 }
 
+function responseEnvelopeId(message: AnyMessage): string | null {
+  if (typeof message !== "object" || message === null) {
+    return null;
+  }
+  const record = message as Record<string, unknown>;
+  if ("method" in record) {
+    return null;
+  }
+  if (!("result" in record) && !("error" in record)) {
+    return null;
+  }
+  const id = record.id;
+  if (id === null || id === undefined) {
+    return null;
+  }
+  return String(id);
+}
+
 async function readProblem(response: Response): Promise<ProblemDetails | undefined> {
   try {
     const text = await response.clone().text();
diff --git a/sdks/acp-http-client/tests/smoke.test.ts b/sdks/acp-http-client/tests/smoke.test.ts
index 2380010..0e0403d 100644
--- a/sdks/acp-http-client/tests/smoke.test.ts
+++ b/sdks/acp-http-client/tests/smoke.test.ts
@@ -14,10 +14,7 @@ function findBinary(): string | null {
     return process.env.SANDBOX_AGENT_BIN;
   }
 
-  const cargoPaths = [
-    resolve(__dirname, "../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../target/release/sandbox-agent"),
-  ];
+  const cargoPaths = [resolve(__dirname, "../../../target/debug/sandbox-agent"), resolve(__dirname, "../../../target/release/sandbox-agent")];
 
   for (const p of cargoPaths) {
     if (existsSync(p)) {
@@ -30,9 +27,7 @@ function findBinary(): string | null {
 
 const BINARY_PATH = findBinary();
 if (!BINARY_PATH) {
-  throw new Error(
-    "sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.",
-  );
+  throw new Error("sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.");
 }
 if (!process.env.SANDBOX_AGENT_BIN) {
   process.env.SANDBOX_AGENT_BIN = BINARY_PATH;
@@ -42,11 +37,7 @@ function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-async function waitFor<T>(
-  fn: () => T | undefined | null,
-  timeoutMs = 5000,
-  stepMs = 25,
-): Promise<T> {
+async function waitFor<T>(fn: () => T | undefined | null, timeoutMs = 5000, stepMs = 25): Promise<T> {
   const started = Date.now();
   while (Date.now() - started < timeoutMs) {
     const value = fn();
@@ -74,6 +65,10 @@ describe("AcpHttpClient integration", () => {
       timeoutMs: 30000,
       env: {
         XDG_DATA_HOME: dataHome,
+        HOME: dataHome,
+        USERPROFILE: dataHome,
+        APPDATA: join(dataHome, "AppData", "Roaming"),
+        LOCALAPPDATA: join(dataHome, "AppData", "Local"),
       },
     });
     baseUrl = handle.baseUrl;
@@ -136,4 +131,54 @@ describe("AcpHttpClient integration", () => {
 
     await client.disconnect();
   });
+
+  it("answers session/request_permission while session/prompt is still in flight", async () => {
+    const permissionRequests: Array<{ sessionId: string; title?: string | null }> = [];
+    const serverId = `acp-http-client-permissions-${Date.now().toString(36)}`;
+
+    const client = new AcpHttpClient({
+      baseUrl,
+      token,
+      transport: {
+        path: `/v1/acp/${encodeURIComponent(serverId)}`,
+        bootstrapQuery: { agent: "mock" },
+      },
+      client: {
+        requestPermission: async (request) => {
+          permissionRequests.push({
+            sessionId: request.sessionId,
+            title: request.toolCall.title,
+          });
+          return {
+            outcome: {
+              outcome: "selected",
+              optionId: "reject-once",
+            },
+          };
+        },
+      },
+    });
+
+    await client.initialize();
+
+    const session = await client.newSession({
+      cwd: process.cwd(),
+      mcpServers: [],
+    });
+
+    const prompt = await client.prompt({
+      sessionId: session.sessionId,
+      prompt: [{ type: "text", text: "please trigger permission" }],
+    });
+
+    expect(prompt.stopReason).toBe("end_turn");
+    expect(permissionRequests).toEqual([
+      {
+        sessionId: session.sessionId,
+        title: "Write mock.txt",
+      },
+    ]);
+
+    await client.disconnect();
+  });
 });
diff --git a/sdks/cli-shared/package.json b/sdks/cli-shared/package.json
index 4317604..4b9a0ae 100644
--- a/sdks/cli-shared/package.json
+++ b/sdks/cli-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli-shared",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "Shared helpers for sandbox-agent CLI and SDK",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli-shared/src/index.ts b/sdks/cli-shared/src/index.ts
index c80125e..9a966f7 100644
--- a/sdks/cli-shared/src/index.ts
+++ b/sdks/cli-shared/src/index.ts
@@ -1,34 +1,34 @@
 export type InstallCommandBlock = {
-	label: string;
-	commands: string[];
+  label: string;
+  commands: string[];
 };
 
 export type NonExecutableBinaryMessageOptions = {
-	binPath: string;
-	trustPackages: string;
-	bunInstallBlocks: InstallCommandBlock[];
-	genericInstallCommands?: string[];
-	binaryName?: string;
+  binPath: string;
+  trustPackages: string;
+  bunInstallBlocks: InstallCommandBlock[];
+  genericInstallCommands?: string[];
+  binaryName?: string;
 };
 
 export type FsSubset = {
-	accessSync: (path: string, mode?: number) => void;
-	chmodSync: (path: string, mode: number) => void;
-	constants: { X_OK: number };
+  accessSync: (path: string, mode?: number) => void;
+  chmodSync: (path: string, mode: number) => void;
+  constants: { X_OK: number };
 };
 
 export function isBunRuntime(): boolean {
-	if (typeof process?.versions?.bun === "string") return true;
-	const userAgent = process?.env?.npm_config_user_agent || "";
-	return userAgent.includes("bun/");
+  if (typeof process?.versions?.bun === "string") return true;
+  const userAgent = process?.env?.npm_config_user_agent || "";
+  return userAgent.includes("bun/");
 }
 
 const PERMISSION_ERRORS = new Set(["EACCES", "EPERM", "ENOEXEC"]);
 
 function isPermissionError(error: unknown): boolean {
-	if (!error || typeof error !== "object") return false;
-	const code = (error as { code?: unknown }).code;
-	return typeof code === "string" && PERMISSION_ERRORS.has(code);
+  if (!error || typeof error !== "object") return false;
+  const code = (error as { code?: unknown }).code;
+  return typeof code === "string" && PERMISSION_ERRORS.has(code);
 }
 
 /**
@@ -39,68 +39,56 @@ function isPermissionError(error: unknown): boolean {
  * Requires fs to be passed in to avoid static imports that break browser builds.
  */
 export function assertExecutable(binPath: string, fs: FsSubset): boolean {
-	if (process.platform === "win32") {
-		return true;
-	}
+  if (process.platform === "win32") {
+    return true;
+  }
 
-	try {
-		fs.accessSync(binPath, fs.constants.X_OK);
-		return true;
-	} catch {
-		// Not executable, try to fix
-	}
+  try {
+    fs.accessSync(binPath, fs.constants.X_OK);
+    return true;
+  } catch {
+    // Not executable, try to fix
+  }
 
-	try {
-		fs.chmodSync(binPath, 0o755);
-		return true;
-	} catch (error) {
-		if (isPermissionError(error)) {
-			return false;
-		}
-		throw error;
-	}
+  try {
+    fs.chmodSync(binPath, 0o755);
+    return true;
+  } catch (error) {
+    if (isPermissionError(error)) {
+      return false;
+    }
+    throw error;
+  }
 }
 
-export function formatNonExecutableBinaryMessage(
-	options: NonExecutableBinaryMessageOptions,
-): string {
-	const {
-		binPath,
-		trustPackages,
-		bunInstallBlocks,
-		genericInstallCommands,
-		binaryName,
-	} = options;
+export function formatNonExecutableBinaryMessage(options: NonExecutableBinaryMessageOptions): string {
+  const { binPath, trustPackages, bunInstallBlocks, genericInstallCommands, binaryName } = options;
 
-	const label = binaryName ?? "sandbox-agent";
-	const lines = [`${label} binary is not executable: ${binPath}`];
+  const label = binaryName ?? "sandbox-agent";
+  const lines = [`${label} binary is not executable: ${binPath}`];
 
-	if (isBunRuntime()) {
-		lines.push(
-			"Allow Bun to run postinstall scripts for native binaries and reinstall:",
-		);
-		for (const block of bunInstallBlocks) {
-			lines.push(`${block.label}:`);
-			for (const command of block.commands) {
-				lines.push(`  ${command}`);
-			}
-		}
-		lines.push(`Or run: chmod +x "${binPath}"`);
-		return lines.join("\n");
-	}
+  if (isBunRuntime()) {
+    lines.push("Allow Bun to run postinstall scripts for native binaries and reinstall:");
+    for (const block of bunInstallBlocks) {
+      lines.push(`${block.label}:`);
+      for (const command of block.commands) {
+        lines.push(`  ${command}`);
+      }
+    }
+    lines.push(`Or run: chmod +x "${binPath}"`);
+    return lines.join("\n");
+  }
 
-	lines.push(
-		"Postinstall scripts for native packages did not run, so the binary was left non-executable.",
-	);
-	if (genericInstallCommands && genericInstallCommands.length > 0) {
-		lines.push("Reinstall with scripts enabled:");
-		for (const command of genericInstallCommands) {
-			lines.push(`  ${command}`);
-		}
-	} else {
-		lines.push("Reinstall with scripts enabled for:");
-		lines.push(`  ${trustPackages}`);
-	}
-	lines.push(`Or run: chmod +x "${binPath}"`);
-	return lines.join("\n");
+  lines.push("Postinstall scripts for native packages did not run, so the binary was left non-executable.");
+  if (genericInstallCommands && genericInstallCommands.length > 0) {
+    lines.push("Reinstall with scripts enabled:");
+    for (const command of genericInstallCommands) {
+      lines.push(`  ${command}`);
+    }
+  } else {
+    lines.push("Reinstall with scripts enabled for:");
+    lines.push(`  ${trustPackages}`);
+  }
+  lines.push(`Or run: chmod +x "${binPath}"`);
+  return lines.join("\n");
 }
diff --git a/sdks/cli/package.json b/sdks/cli/package.json
index 90ad966..a7e42c1 100644
--- a/sdks/cli/package.json
+++ b/sdks/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "CLI for sandbox-agent - run AI coding agents in sandboxes",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli/platforms/darwin-arm64/package.json b/sdks/cli/platforms/darwin-arm64/package.json
index 462abb3..9ed1a85 100644
--- a/sdks/cli/platforms/darwin-arm64/package.json
+++ b/sdks/cli/platforms/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli-darwin-arm64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "sandbox-agent CLI binary for macOS ARM64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli/platforms/darwin-x64/package.json b/sdks/cli/platforms/darwin-x64/package.json
index 20b2644..6379cdf 100644
--- a/sdks/cli/platforms/darwin-x64/package.json
+++ b/sdks/cli/platforms/darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli-darwin-x64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "sandbox-agent CLI binary for macOS x64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli/platforms/linux-arm64/package.json b/sdks/cli/platforms/linux-arm64/package.json
index 5f7439f..bbd677a 100644
--- a/sdks/cli/platforms/linux-arm64/package.json
+++ b/sdks/cli/platforms/linux-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli-linux-arm64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "sandbox-agent CLI binary for Linux arm64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli/platforms/linux-x64/package.json b/sdks/cli/platforms/linux-x64/package.json
index 15bc1a6..9793e98 100644
--- a/sdks/cli/platforms/linux-x64/package.json
+++ b/sdks/cli/platforms/linux-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli-linux-x64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "sandbox-agent CLI binary for Linux x64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli/platforms/win32-x64/package.json b/sdks/cli/platforms/win32-x64/package.json
index 3890155..0fec6cd 100644
--- a/sdks/cli/platforms/win32-x64/package.json
+++ b/sdks/cli/platforms/win32-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/cli-win32-x64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "sandbox-agent CLI binary for Windows x64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/cli/tests/launcher.test.ts b/sdks/cli/tests/launcher.test.ts
index 0353284..f0049f4 100644
--- a/sdks/cli/tests/launcher.test.ts
+++ b/sdks/cli/tests/launcher.test.ts
@@ -14,10 +14,7 @@ function findBinary(): string | null {
   }
 
   // Check cargo build output
-  const cargoPaths = [
-    resolve(__dirname, "../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../target/release/sandbox-agent"),
-  ];
+  const cargoPaths = [resolve(__dirname, "../../../target/debug/sandbox-agent"), resolve(__dirname, "../../../target/release/sandbox-agent")];
 
   for (const p of cargoPaths) {
     if (existsSync(p)) {
diff --git a/sdks/gigacode/package.json b/sdks/gigacode/package.json
index e16e70e..80ed110 100644
--- a/sdks/gigacode/package.json
+++ b/sdks/gigacode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/gigacode",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "Gigacode CLI (sandbox-agent with OpenCode attach by default)",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/gigacode/platforms/darwin-arm64/package.json b/sdks/gigacode/platforms/darwin-arm64/package.json
index 2324291..5a347ba 100644
--- a/sdks/gigacode/platforms/darwin-arm64/package.json
+++ b/sdks/gigacode/platforms/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/gigacode-darwin-arm64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "gigacode CLI binary for macOS arm64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/gigacode/platforms/darwin-x64/package.json b/sdks/gigacode/platforms/darwin-x64/package.json
index 6b94c06..976bdb4 100644
--- a/sdks/gigacode/platforms/darwin-x64/package.json
+++ b/sdks/gigacode/platforms/darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/gigacode-darwin-x64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "gigacode CLI binary for macOS x64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/gigacode/platforms/linux-arm64/package.json b/sdks/gigacode/platforms/linux-arm64/package.json
index 9b82cac..94ee741 100644
--- a/sdks/gigacode/platforms/linux-arm64/package.json
+++ b/sdks/gigacode/platforms/linux-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/gigacode-linux-arm64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "gigacode CLI binary for Linux arm64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/gigacode/platforms/linux-x64/package.json b/sdks/gigacode/platforms/linux-x64/package.json
index b9ac143..e6c8f36 100644
--- a/sdks/gigacode/platforms/linux-x64/package.json
+++ b/sdks/gigacode/platforms/linux-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/gigacode-linux-x64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "gigacode CLI binary for Linux x64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/gigacode/platforms/win32-x64/package.json b/sdks/gigacode/platforms/win32-x64/package.json
index ae287f0..4458d3b 100644
--- a/sdks/gigacode/platforms/win32-x64/package.json
+++ b/sdks/gigacode/platforms/win32-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sandbox-agent/gigacode-win32-x64",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "gigacode CLI binary for Windows x64",
   "license": "Apache-2.0",
   "repository": {
diff --git a/sdks/persist-indexeddb/README.md b/sdks/persist-indexeddb/README.md
new file mode 100644
index 0000000..02dc5c2
--- /dev/null
+++ b/sdks/persist-indexeddb/README.md
@@ -0,0 +1,5 @@
+# @sandbox-agent/persist-indexeddb
+
+> **Deprecated:** This package has been deprecated and removed.
+
+Copy the driver source into your project. See the [reference implementation](https://github.com/rivet-dev/sandbox-agent/tree/main/frontend/packages/inspector/src/persist-indexeddb.ts) and the [session persistence docs](https://sandboxagent.dev/session-persistence) for guidance.
diff --git a/sdks/persist-indexeddb/package.json b/sdks/persist-indexeddb/package.json
index dc204ca..98c59c7 100644
--- a/sdks/persist-indexeddb/package.json
+++ b/sdks/persist-indexeddb/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sandbox-agent/persist-indexeddb",
-  "version": "0.1.0",
-  "description": "IndexedDB persistence driver for the Sandbox Agent TypeScript SDK",
+  "version": "0.4.2",
+  "description": "IndexedDB persistence driver for the Sandbox Agent TypeScript SDK (DEPRECATED)",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -16,23 +16,16 @@
       "import": "./dist/index.js"
     }
   },
-  "dependencies": {
-    "sandbox-agent": "workspace:*"
-  },
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "tsup",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "fake-indexeddb": "^6.2.4",
     "tsup": "^8.0.0",
-    "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "typescript": "^5.7.0"
   }
 }
diff --git a/sdks/persist-indexeddb/src/index.ts b/sdks/persist-indexeddb/src/index.ts
index 3007435..e388530 100644
--- a/sdks/persist-indexeddb/src/index.ts
+++ b/sdks/persist-indexeddb/src/index.ts
@@ -1,327 +1,5 @@
-import type {
-  ListEventsRequest,
-  ListPage,
-  ListPageRequest,
-  SessionEvent,
-  SessionPersistDriver,
-  SessionRecord,
-} from "sandbox-agent";
-
-const DEFAULT_DB_NAME = "sandbox-agent-session-store";
-const DEFAULT_DB_VERSION = 2;
-const SESSIONS_STORE = "sessions";
-const EVENTS_STORE = "events";
-const EVENTS_BY_SESSION_INDEX = "by_session_index";
-const DEFAULT_LIST_LIMIT = 100;
-
-export interface IndexedDbSessionPersistDriverOptions {
-  databaseName?: string;
-  databaseVersion?: number;
-  indexedDb?: IDBFactory;
-}
-
-export class IndexedDbSessionPersistDriver implements SessionPersistDriver {
-  private readonly indexedDb: IDBFactory;
-  private readonly dbName: string;
-  private readonly dbVersion: number;
-  private readonly dbPromise: Promise<IDBDatabase>;
-
-  constructor(options: IndexedDbSessionPersistDriverOptions = {}) {
-    const indexedDb = options.indexedDb ?? globalThis.indexedDB;
-    if (!indexedDb) {
-      throw new Error("IndexedDB is not available in this runtime.");
-    }
-
-    this.indexedDb = indexedDb;
-    this.dbName = options.databaseName ?? DEFAULT_DB_NAME;
-    this.dbVersion = options.databaseVersion ?? DEFAULT_DB_VERSION;
-    this.dbPromise = this.openDatabase();
-  }
-
-  async getSession(id: string): Promise<SessionRecord | null> {
-    const db = await this.dbPromise;
-    const row = await requestToPromise<IDBValidKey | SessionRow | undefined>(
-      db.transaction(SESSIONS_STORE, "readonly").objectStore(SESSIONS_STORE).get(id),
-    );
-    if (!row || typeof row !== "object") {
-      return null;
-    }
-    return decodeSessionRow(row as SessionRow);
-  }
-
-  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
-    const db = await this.dbPromise;
-    const rows = await getAllRows<SessionRow>(db, SESSIONS_STORE);
-
-    rows.sort((a, b) => {
-      if (a.createdAt !== b.createdAt) {
-        return a.createdAt - b.createdAt;
-      }
-      return a.id.localeCompare(b.id);
-    });
-
-    const offset = parseCursor(request.cursor);
-    const limit = normalizeLimit(request.limit);
-    const slice = rows.slice(offset, offset + limit).map(decodeSessionRow);
-    const nextOffset = offset + slice.length;
-
-    return {
-      items: slice,
-      nextCursor: nextOffset < rows.length ? String(nextOffset) : undefined,
-    };
-  }
-
-  async updateSession(session: SessionRecord): Promise<void> {
-    const db = await this.dbPromise;
-    await transactionPromise(db, [SESSIONS_STORE], "readwrite", (tx) => {
-      tx.objectStore(SESSIONS_STORE).put(encodeSessionRow(session));
-    });
-  }
-
-  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
-    const db = await this.dbPromise;
-    const rows = (await getAllRows<EventRow>(db, EVENTS_STORE))
-      .filter((row) => row.sessionId === request.sessionId)
-      .sort(compareEventRowsByOrder);
-
-    const offset = parseCursor(request.cursor);
-    const limit = normalizeLimit(request.limit);
-    const slice = rows.slice(offset, offset + limit).map(decodeEventRow);
-    const nextOffset = offset + slice.length;
-
-    return {
-      items: slice,
-      nextCursor: nextOffset < rows.length ? String(nextOffset) : undefined,
-    };
-  }
-
-  async insertEvent(event: SessionEvent): Promise<void> {
-    const db = await this.dbPromise;
-    await transactionPromise(db, [EVENTS_STORE], "readwrite", (tx) => {
-      tx.objectStore(EVENTS_STORE).put(encodeEventRow(event));
-    });
-  }
-
-  async close(): Promise<void> {
-    const db = await this.dbPromise;
-    db.close();
-  }
-
-  private openDatabase(): Promise<IDBDatabase> {
-    return new Promise((resolve, reject) => {
-      const request = this.indexedDb.open(this.dbName, this.dbVersion);
-
-      request.onupgradeneeded = () => {
-        const db = request.result;
-
-        if (!db.objectStoreNames.contains(SESSIONS_STORE)) {
-          db.createObjectStore(SESSIONS_STORE, { keyPath: "id" });
-        }
-
-        if (!db.objectStoreNames.contains(EVENTS_STORE)) {
-          const events = db.createObjectStore(EVENTS_STORE, { keyPath: "id" });
-          events.createIndex(EVENTS_BY_SESSION_INDEX, ["sessionId", "eventIndex", "id"], {
-            unique: false,
-          });
-        } else {
-          const tx = request.transaction;
-          if (!tx) {
-            return;
-          }
-          const events = tx.objectStore(EVENTS_STORE);
-          if (!events.indexNames.contains(EVENTS_BY_SESSION_INDEX)) {
-            events.createIndex(EVENTS_BY_SESSION_INDEX, ["sessionId", "eventIndex", "id"], {
-              unique: false,
-            });
-          }
-        }
-      };
-
-      request.onsuccess = () => resolve(request.result);
-      request.onerror = () => reject(request.error ?? new Error("Unable to open IndexedDB"));
-    });
-  }
-}
-
-type SessionRow = {
-  id: string;
-  agent: string;
-  agentSessionId: string;
-  lastConnectionId: string;
-  createdAt: number;
-  destroyedAt?: number;
-  sessionInit?: SessionRecord["sessionInit"];
-};
-
-type EventRow = {
-  id: number | string;
-  eventIndex?: number;
-  sessionId: string;
-  createdAt: number;
-  connectionId: string;
-  sender: "client" | "agent";
-  payload: unknown;
-};
-
-function encodeSessionRow(session: SessionRecord): SessionRow {
-  return {
-    id: session.id,
-    agent: session.agent,
-    agentSessionId: session.agentSessionId,
-    lastConnectionId: session.lastConnectionId,
-    createdAt: session.createdAt,
-    destroyedAt: session.destroyedAt,
-    sessionInit: session.sessionInit,
-  };
-}
-
-function decodeSessionRow(row: SessionRow): SessionRecord {
-  return {
-    id: row.id,
-    agent: row.agent,
-    agentSessionId: row.agentSessionId,
-    lastConnectionId: row.lastConnectionId,
-    createdAt: row.createdAt,
-    destroyedAt: row.destroyedAt,
-    sessionInit: row.sessionInit,
-  };
-}
-
-function encodeEventRow(event: SessionEvent): EventRow {
-  return {
-    id: event.id,
-    eventIndex: event.eventIndex,
-    sessionId: event.sessionId,
-    createdAt: event.createdAt,
-    connectionId: event.connectionId,
-    sender: event.sender,
-    payload: event.payload,
-  };
-}
-
-function decodeEventRow(row: EventRow): SessionEvent {
-  return {
-    id: String(row.id),
-    eventIndex: parseEventIndex(row.eventIndex, row.id),
-    sessionId: row.sessionId,
-    createdAt: row.createdAt,
-    connectionId: row.connectionId,
-    sender: row.sender,
-    payload: row.payload as SessionEvent["payload"],
-  };
-}
-
-async function getAllRows<T>(db: IDBDatabase, storeName: string): Promise<T[]> {
-  return await transactionPromise<T[]>(db, [storeName], "readonly", async (tx) => {
-    const request = tx.objectStore(storeName).getAll();
-    return (await requestToPromise(request)) as T[];
-  });
-}
-
-function normalizeLimit(limit: number | undefined): number {
-  if (!Number.isFinite(limit) || (limit ?? 0) < 1) {
-    return DEFAULT_LIST_LIMIT;
-  }
-  return Math.floor(limit as number);
-}
-
-function parseCursor(cursor: string | undefined): number {
-  if (!cursor) {
-    return 0;
-  }
-  const parsed = Number.parseInt(cursor, 10);
-  if (!Number.isFinite(parsed) || parsed < 0) {
-    return 0;
-  }
-  return parsed;
-}
-
-function compareEventRowsByOrder(a: EventRow, b: EventRow): number {
-  const indexA = parseEventIndex(a.eventIndex, a.id);
-  const indexB = parseEventIndex(b.eventIndex, b.id);
-  if (indexA !== indexB) {
-    return indexA - indexB;
-  }
-  return String(a.id).localeCompare(String(b.id));
-}
-
-function parseEventIndex(value: number | undefined, fallback: number | string): number {
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return Math.max(0, Math.floor(value));
-  }
-
-  const parsed = Number.parseInt(String(fallback), 10);
-  if (!Number.isFinite(parsed) || parsed < 0) {
-    return 0;
-  }
-  return parsed;
-}
-
-function requestToPromise<T>(request: IDBRequest<T>): Promise<T> {
-  return new Promise((resolve, reject) => {
-    request.onsuccess = () => resolve(request.result);
-    request.onerror = () => reject(request.error ?? new Error("IndexedDB request failed"));
-  });
-}
-
-function transactionPromise<T>(
-  db: IDBDatabase,
-  stores: string[],
-  mode: IDBTransactionMode,
-  run: (tx: IDBTransaction) => T | Promise<T>,
-): Promise<T> {
-  return new Promise((resolve, reject) => {
-    const tx = db.transaction(stores, mode);
-    let settled = false;
-    let resultValue: T | undefined;
-    let runCompleted = false;
-    let txCompleted = false;
-
-    function tryResolve() {
-      if (settled || !runCompleted || !txCompleted) {
-        return;
-      }
-      settled = true;
-      resolve(resultValue as T);
-    }
-
-    tx.oncomplete = () => {
-      txCompleted = true;
-      tryResolve();
-    };
-
-    tx.onerror = () => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      reject(tx.error ?? new Error("IndexedDB transaction failed"));
-    };
-
-    tx.onabort = () => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      reject(tx.error ?? new Error("IndexedDB transaction aborted"));
-    };
-
-    Promise.resolve(run(tx))
-      .then((value) => {
-        resultValue = value;
-        runCompleted = true;
-        tryResolve();
-      })
-      .catch((error) => {
-        if (!settled) {
-          settled = true;
-          reject(error);
-        }
-        try {
-          tx.abort();
-        } catch {
-          // no-op
-        }
-      });
-  });
-}
+throw new Error(
+  "@sandbox-agent/persist-indexeddb has been deprecated and removed. " +
+    "Copy the reference implementation from frontend/packages/inspector/src/persist-indexeddb.ts into your project instead. " +
+    "See https://github.com/rivet-dev/sandbox-agent/tree/main/frontend/packages/inspector/src/persist-indexeddb.ts",
+);
diff --git a/sdks/persist-indexeddb/tests/driver.test.ts b/sdks/persist-indexeddb/tests/driver.test.ts
deleted file mode 100644
index 78acbe1..0000000
--- a/sdks/persist-indexeddb/tests/driver.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import "fake-indexeddb/auto";
-import { describe, it, expect } from "vitest";
-import { IndexedDbSessionPersistDriver } from "../src/index.ts";
-
-function uniqueDbName(prefix: string): string {
-  return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
-}
-
-describe("IndexedDbSessionPersistDriver", () => {
-  it("stores and pages sessions and events", async () => {
-    const dbName = uniqueDbName("indexeddb-driver");
-    const driver = new IndexedDbSessionPersistDriver({ databaseName: dbName });
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 100,
-    });
-
-    await driver.updateSession({
-      id: "s-2",
-      agent: "mock",
-      agentSessionId: "a-2",
-      lastConnectionId: "c-2",
-      createdAt: 200,
-      destroyedAt: 300,
-    });
-
-    await driver.insertEvent({
-      id: "evt-1",
-      eventIndex: 1,
-      sessionId: "s-1",
-      createdAt: 1,
-      connectionId: "c-1",
-      sender: "client",
-      payload: { jsonrpc: "2.0", method: "session/prompt", params: { sessionId: "a-1" } },
-    });
-
-    await driver.insertEvent({
-      id: "evt-2",
-      eventIndex: 2,
-      sessionId: "s-1",
-      createdAt: 2,
-      connectionId: "c-1",
-      sender: "agent",
-      payload: { jsonrpc: "2.0", method: "session/update", params: { sessionId: "a-1" } },
-    });
-
-    const loaded = await driver.getSession("s-2");
-    expect(loaded?.destroyedAt).toBe(300);
-
-    const page1 = await driver.listSessions({ limit: 1 });
-    expect(page1.items).toHaveLength(1);
-    expect(page1.items[0]?.id).toBe("s-1");
-    expect(page1.nextCursor).toBeTruthy();
-
-    const page2 = await driver.listSessions({ cursor: page1.nextCursor, limit: 1 });
-    expect(page2.items).toHaveLength(1);
-    expect(page2.items[0]?.id).toBe("s-2");
-    expect(page2.nextCursor).toBeUndefined();
-
-    const eventsPage = await driver.listEvents({ sessionId: "s-1", limit: 10 });
-    expect(eventsPage.items).toHaveLength(2);
-    expect(eventsPage.items[0]?.id).toBe("evt-1");
-    expect(eventsPage.items[0]?.eventIndex).toBe(1);
-    expect(eventsPage.items[1]?.id).toBe("evt-2");
-    expect(eventsPage.items[1]?.eventIndex).toBe(2);
-
-    await driver.close();
-  });
-
-  it("persists across driver instances for same database", async () => {
-    const dbName = uniqueDbName("indexeddb-reopen");
-
-    {
-      const driver = new IndexedDbSessionPersistDriver({ databaseName: dbName });
-      await driver.updateSession({
-        id: "s-1",
-        agent: "mock",
-        agentSessionId: "a-1",
-        lastConnectionId: "c-1",
-        createdAt: 1,
-      });
-      await driver.close();
-    }
-
-    {
-      const driver = new IndexedDbSessionPersistDriver({ databaseName: dbName });
-      const session = await driver.getSession("s-1");
-      expect(session?.id).toBe("s-1");
-      await driver.close();
-    }
-  });
-});
diff --git a/sdks/persist-indexeddb/tests/integration.test.ts b/sdks/persist-indexeddb/tests/integration.test.ts
deleted file mode 100644
index a30e70e..0000000
--- a/sdks/persist-indexeddb/tests/integration.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import "fake-indexeddb/auto";
-import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { existsSync, mkdtempSync, rmSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { tmpdir } from "node:os";
-import { SandboxAgent } from "sandbox-agent";
-import { spawnSandboxAgent, type SandboxAgentSpawnHandle } from "../../typescript/src/spawn.ts";
-import { prepareMockAgentDataHome } from "../../typescript/tests/helpers/mock-agent.ts";
-import { IndexedDbSessionPersistDriver } from "../src/index.ts";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-function findBinary(): string | null {
-  if (process.env.SANDBOX_AGENT_BIN) {
-    return process.env.SANDBOX_AGENT_BIN;
-  }
-
-  const cargoPaths = [
-    resolve(__dirname, "../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../target/release/sandbox-agent"),
-  ];
-
-  for (const p of cargoPaths) {
-    if (existsSync(p)) {
-      return p;
-    }
-  }
-
-  return null;
-}
-
-function uniqueDbName(prefix: string): string {
-  return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
-}
-
-const BINARY_PATH = findBinary();
-if (!BINARY_PATH) {
-  throw new Error(
-    "sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.",
-  );
-}
-if (!process.env.SANDBOX_AGENT_BIN) {
-  process.env.SANDBOX_AGENT_BIN = BINARY_PATH;
-}
-
-describe("IndexedDB persistence end-to-end", () => {
-  let handle: SandboxAgentSpawnHandle;
-  let baseUrl: string;
-  let token: string;
-  let dataHome: string;
-
-  beforeAll(async () => {
-    dataHome = mkdtempSync(join(tmpdir(), "indexeddb-integration-"));
-    prepareMockAgentDataHome(dataHome);
-
-    handle = await spawnSandboxAgent({
-      enabled: true,
-      log: "silent",
-      timeoutMs: 30000,
-      env: {
-        XDG_DATA_HOME: dataHome,
-      },
-    });
-    baseUrl = handle.baseUrl;
-    token = handle.token;
-  });
-
-  afterAll(async () => {
-    await handle.dispose();
-    rmSync(dataHome, { recursive: true, force: true });
-  });
-
-  it("restores sessions/events across sdk instances", async () => {
-    const dbName = uniqueDbName("sandbox-agent-browser-e2e");
-
-    const persist1 = new IndexedDbSessionPersistDriver({ databaseName: dbName });
-    const sdk1 = await SandboxAgent.connect({
-      baseUrl,
-      token,
-      persist: persist1,
-      replayMaxEvents: 40,
-      replayMaxChars: 16000,
-    });
-
-    const created = await sdk1.createSession({ agent: "mock" });
-    await created.prompt([{ type: "text", text: "indexeddb-first" }]);
-    const firstConnectionId = created.lastConnectionId;
-
-    await sdk1.dispose();
-    await persist1.close();
-
-    const persist2 = new IndexedDbSessionPersistDriver({ databaseName: dbName });
-    const sdk2 = await SandboxAgent.connect({
-      baseUrl,
-      token,
-      persist: persist2,
-      replayMaxEvents: 40,
-      replayMaxChars: 16000,
-    });
-
-    const restored = await sdk2.resumeSession(created.id);
-    expect(restored.lastConnectionId).not.toBe(firstConnectionId);
-
-    await restored.prompt([{ type: "text", text: "indexeddb-second" }]);
-
-    const sessions = await sdk2.listSessions({ limit: 20 });
-    expect(sessions.items.some((entry) => entry.id === created.id)).toBe(true);
-
-    const events = await sdk2.getEvents({ sessionId: created.id, limit: 1000 });
-    expect(events.items.length).toBeGreaterThan(0);
-
-    const replayInjected = events.items.find((event) => {
-      if (event.sender !== "client") {
-        return false;
-      }
-      const payload = event.payload as Record<string, unknown>;
-      const method = payload.method;
-      const params = payload.params as Record<string, unknown> | undefined;
-      const prompt = Array.isArray(params?.prompt) ? params?.prompt : [];
-      const firstBlock = prompt[0] as Record<string, unknown> | undefined;
-      return (
-        method === "session/prompt" &&
-        typeof firstBlock?.text === "string" &&
-        firstBlock.text.includes("Previous session history is replayed below")
-      );
-    });
-
-    expect(replayInjected).toBeTruthy();
-
-    await sdk2.dispose();
-    await persist2.close();
-  });
-});
diff --git a/sdks/persist-indexeddb/vitest.config.ts b/sdks/persist-indexeddb/vitest.config.ts
index 327d94c..605c659 100644
--- a/sdks/persist-indexeddb/vitest.config.ts
+++ b/sdks/persist-indexeddb/vitest.config.ts
@@ -4,6 +4,6 @@ export default defineConfig({
   test: {
     include: ["tests/**/*.test.ts"],
     testTimeout: 60000,
-    environment: "node"
+    environment: "node",
   },
 });
diff --git a/sdks/persist-postgres/README.md b/sdks/persist-postgres/README.md
new file mode 100644
index 0000000..5a3afba
--- /dev/null
+++ b/sdks/persist-postgres/README.md
@@ -0,0 +1,5 @@
+# @sandbox-agent/persist-postgres
+
+> **Deprecated:** This package has been deprecated and removed.
+
+Install `pg` directly and copy the driver source into your project. See the [full example](https://github.com/rivet-dev/sandbox-agent/tree/main/examples/persist-postgres) and the [session persistence docs](https://sandboxagent.dev/session-persistence) for guidance.
diff --git a/sdks/persist-postgres/package.json b/sdks/persist-postgres/package.json
index 0ad277d..3ffba1b 100644
--- a/sdks/persist-postgres/package.json
+++ b/sdks/persist-postgres/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sandbox-agent/persist-postgres",
-  "version": "0.1.0",
-  "description": "PostgreSQL persistence driver for the Sandbox Agent TypeScript SDK",
+  "version": "0.4.2",
+  "description": "PostgreSQL persistence driver for the Sandbox Agent TypeScript SDK (DEPRECATED)",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -16,24 +16,16 @@
       "import": "./dist/index.js"
     }
   },
-  "dependencies": {
-    "pg": "^8.16.3",
-    "sandbox-agent": "workspace:*"
-  },
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "tsup",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "@types/pg": "^8.15.6",
     "tsup": "^8.0.0",
-    "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "typescript": "^5.7.0"
   }
 }
diff --git a/sdks/persist-postgres/src/index.ts b/sdks/persist-postgres/src/index.ts
index f724f4d..ec76a53 100644
--- a/sdks/persist-postgres/src/index.ts
+++ b/sdks/persist-postgres/src/index.ts
@@ -1,322 +1,5 @@
-import { Pool, type PoolConfig } from "pg";
-import type {
-  ListEventsRequest,
-  ListPage,
-  ListPageRequest,
-  SessionEvent,
-  SessionPersistDriver,
-  SessionRecord,
-} from "sandbox-agent";
-
-const DEFAULT_LIST_LIMIT = 100;
-
-export interface PostgresSessionPersistDriverOptions {
-  connectionString?: string;
-  pool?: Pool;
-  poolConfig?: PoolConfig;
-  schema?: string;
-}
-
-export class PostgresSessionPersistDriver implements SessionPersistDriver {
-  private readonly pool: Pool;
-  private readonly ownsPool: boolean;
-  private readonly schema: string;
-  private readonly initialized: Promise<void>;
-
-  constructor(options: PostgresSessionPersistDriverOptions = {}) {
-    this.schema = normalizeSchema(options.schema ?? "public");
-
-    if (options.pool) {
-      this.pool = options.pool;
-      this.ownsPool = false;
-    } else {
-      this.pool = new Pool({
-        connectionString: options.connectionString,
-        ...options.poolConfig,
-      });
-      this.ownsPool = true;
-    }
-
-    this.initialized = this.initialize();
-  }
-
-  async getSession(id: string): Promise<SessionRecord | null> {
-    await this.ready();
-
-    const result = await this.pool.query<SessionRow>(
-      `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, session_init_json
-       FROM ${this.table("sessions")}
-       WHERE id = $1`,
-      [id],
-    );
-
-    if (result.rows.length === 0) {
-      return null;
-    }
-
-    return decodeSessionRow(result.rows[0]);
-  }
-
-  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
-    await this.ready();
-
-    const offset = parseCursor(request.cursor);
-    const limit = normalizeLimit(request.limit);
-
-    const rowsResult = await this.pool.query<SessionRow>(
-      `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, session_init_json
-       FROM ${this.table("sessions")}
-       ORDER BY created_at ASC, id ASC
-       LIMIT $1 OFFSET $2`,
-      [limit, offset],
-    );
-
-    const countResult = await this.pool.query<{ count: string }>(`SELECT COUNT(*) AS count FROM ${this.table("sessions")}`);
-    const total = parseInteger(countResult.rows[0]?.count ?? "0");
-    const nextOffset = offset + rowsResult.rows.length;
-
-    return {
-      items: rowsResult.rows.map(decodeSessionRow),
-      nextCursor: nextOffset < total ? String(nextOffset) : undefined,
-    };
-  }
-
-  async updateSession(session: SessionRecord): Promise<void> {
-    await this.ready();
-
-    await this.pool.query(
-      `INSERT INTO ${this.table("sessions")} (
-        id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, session_init_json
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7)
-      ON CONFLICT(id) DO UPDATE SET
-        agent = EXCLUDED.agent,
-        agent_session_id = EXCLUDED.agent_session_id,
-        last_connection_id = EXCLUDED.last_connection_id,
-        created_at = EXCLUDED.created_at,
-        destroyed_at = EXCLUDED.destroyed_at,
-        session_init_json = EXCLUDED.session_init_json`,
-      [
-        session.id,
-        session.agent,
-        session.agentSessionId,
-        session.lastConnectionId,
-        session.createdAt,
-        session.destroyedAt ?? null,
-        session.sessionInit ?? null,
-      ],
-    );
-  }
-
-  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
-    await this.ready();
-
-    const offset = parseCursor(request.cursor);
-    const limit = normalizeLimit(request.limit);
-
-    const rowsResult = await this.pool.query<EventRow>(
-      `SELECT id, event_index, session_id, created_at, connection_id, sender, payload_json
-       FROM ${this.table("events")}
-       WHERE session_id = $1
-       ORDER BY event_index ASC, id ASC
-       LIMIT $2 OFFSET $3`,
-      [request.sessionId, limit, offset],
-    );
-
-    const countResult = await this.pool.query<{ count: string }>(
-      `SELECT COUNT(*) AS count FROM ${this.table("events")} WHERE session_id = $1`,
-      [request.sessionId],
-    );
-    const total = parseInteger(countResult.rows[0]?.count ?? "0");
-    const nextOffset = offset + rowsResult.rows.length;
-
-    return {
-      items: rowsResult.rows.map(decodeEventRow),
-      nextCursor: nextOffset < total ? String(nextOffset) : undefined,
-    };
-  }
-
-  async insertEvent(event: SessionEvent): Promise<void> {
-    await this.ready();
-
-    await this.pool.query(
-      `INSERT INTO ${this.table("events")} (
-        id, event_index, session_id, created_at, connection_id, sender, payload_json
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7)
-      ON CONFLICT(id) DO UPDATE SET
-        event_index = EXCLUDED.event_index,
-        session_id = EXCLUDED.session_id,
-        created_at = EXCLUDED.created_at,
-        connection_id = EXCLUDED.connection_id,
-        sender = EXCLUDED.sender,
-        payload_json = EXCLUDED.payload_json`,
-      [
-        event.id,
-        event.eventIndex,
-        event.sessionId,
-        event.createdAt,
-        event.connectionId,
-        event.sender,
-        event.payload,
-      ],
-    );
-  }
-
-  async close(): Promise<void> {
-    if (!this.ownsPool) {
-      return;
-    }
-    await this.pool.end();
-  }
-
-  private async ready(): Promise<void> {
-    await this.initialized;
-  }
-
-  private table(name: "sessions" | "events"): string {
-    return `"${this.schema}"."${name}"`;
-  }
-
-  private async initialize(): Promise<void> {
-    await this.pool.query(`CREATE SCHEMA IF NOT EXISTS "${this.schema}"`);
-
-    await this.pool.query(`
-      CREATE TABLE IF NOT EXISTS ${this.table("sessions")} (
-        id TEXT PRIMARY KEY,
-        agent TEXT NOT NULL,
-        agent_session_id TEXT NOT NULL,
-        last_connection_id TEXT NOT NULL,
-        created_at BIGINT NOT NULL,
-        destroyed_at BIGINT,
-        session_init_json JSONB
-      )
-    `);
-
-    await this.pool.query(`
-      CREATE TABLE IF NOT EXISTS ${this.table("events")} (
-        id TEXT PRIMARY KEY,
-        event_index BIGINT NOT NULL,
-        session_id TEXT NOT NULL,
-        created_at BIGINT NOT NULL,
-        connection_id TEXT NOT NULL,
-        sender TEXT NOT NULL,
-        payload_json JSONB NOT NULL
-      )
-    `);
-
-    await this.pool.query(`
-      ALTER TABLE ${this.table("events")}
-      ALTER COLUMN id TYPE TEXT USING id::TEXT
-    `);
-
-    await this.pool.query(`
-      ALTER TABLE ${this.table("events")}
-      ADD COLUMN IF NOT EXISTS event_index BIGINT
-    `);
-
-    await this.pool.query(`
-      WITH ranked AS (
-        SELECT id, ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at ASC, id ASC) AS ranked_index
-        FROM ${this.table("events")}
-      )
-      UPDATE ${this.table("events")} AS current_events
-      SET event_index = ranked.ranked_index
-      FROM ranked
-      WHERE current_events.id = ranked.id
-        AND current_events.event_index IS NULL
-    `);
-
-    await this.pool.query(`
-      ALTER TABLE ${this.table("events")}
-      ALTER COLUMN event_index SET NOT NULL
-    `);
-
-    await this.pool.query(`
-      CREATE INDEX IF NOT EXISTS idx_events_session_order
-      ON ${this.table("events")}(session_id, event_index, id)
-    `);
-  }
-}
-
-type SessionRow = {
-  id: string;
-  agent: string;
-  agent_session_id: string;
-  last_connection_id: string;
-  created_at: string | number;
-  destroyed_at: string | number | null;
-  session_init_json: unknown | null;
-};
-
-type EventRow = {
-  id: string | number;
-  event_index: string | number;
-  session_id: string;
-  created_at: string | number;
-  connection_id: string;
-  sender: string;
-  payload_json: unknown;
-};
-
-function decodeSessionRow(row: SessionRow): SessionRecord {
-  return {
-    id: row.id,
-    agent: row.agent,
-    agentSessionId: row.agent_session_id,
-    lastConnectionId: row.last_connection_id,
-    createdAt: parseInteger(row.created_at),
-    destroyedAt: row.destroyed_at === null ? undefined : parseInteger(row.destroyed_at),
-    sessionInit: row.session_init_json ? (row.session_init_json as SessionRecord["sessionInit"]) : undefined,
-  };
-}
-
-function decodeEventRow(row: EventRow): SessionEvent {
-  return {
-    id: String(row.id),
-    eventIndex: parseInteger(row.event_index),
-    sessionId: row.session_id,
-    createdAt: parseInteger(row.created_at),
-    connectionId: row.connection_id,
-    sender: parseSender(row.sender),
-    payload: row.payload_json as SessionEvent["payload"],
-  };
-}
-
-function normalizeLimit(limit: number | undefined): number {
-  if (!Number.isFinite(limit) || (limit ?? 0) < 1) {
-    return DEFAULT_LIST_LIMIT;
-  }
-  return Math.floor(limit as number);
-}
-
-function parseCursor(cursor: string | undefined): number {
-  if (!cursor) {
-    return 0;
-  }
-  const parsed = Number.parseInt(cursor, 10);
-  if (!Number.isFinite(parsed) || parsed < 0) {
-    return 0;
-  }
-  return parsed;
-}
-
-function parseInteger(value: string | number): number {
-  const parsed = typeof value === "number" ? value : Number.parseInt(value, 10);
-  if (!Number.isFinite(parsed)) {
-    throw new Error(`Invalid integer value returned by postgres: ${String(value)}`);
-  }
-  return parsed;
-}
-
-function parseSender(value: string): SessionEvent["sender"] {
-  if (value === "agent" || value === "client") {
-    return value;
-  }
-  throw new Error(`Invalid sender value returned by postgres: ${value}`);
-}
-
-function normalizeSchema(schema: string): string {
-  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(schema)) {
-    throw new Error(`Invalid schema name '${schema}'. Use letters, numbers, and underscores only.`);
-  }
-  return schema;
-}
+throw new Error(
+  "@sandbox-agent/persist-postgres has been deprecated and removed. " +
+    "Copy the reference implementation from examples/persist-postgres into your project instead. " +
+    "See https://github.com/rivet-dev/sandbox-agent/tree/main/examples/persist-postgres",
+);
diff --git a/sdks/persist-postgres/tests/integration.test.ts b/sdks/persist-postgres/tests/integration.test.ts
deleted file mode 100644
index f453021..0000000
--- a/sdks/persist-postgres/tests/integration.test.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { execFileSync } from "node:child_process";
-import { existsSync, mkdtempSync, rmSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { tmpdir } from "node:os";
-import { randomUUID } from "node:crypto";
-import { Client } from "pg";
-import { SandboxAgent } from "sandbox-agent";
-import { spawnSandboxAgent, type SandboxAgentSpawnHandle } from "../../typescript/src/spawn.ts";
-import { prepareMockAgentDataHome } from "../../typescript/tests/helpers/mock-agent.ts";
-import { PostgresSessionPersistDriver } from "../src/index.ts";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-function findBinary(): string | null {
-  if (process.env.SANDBOX_AGENT_BIN) {
-    return process.env.SANDBOX_AGENT_BIN;
-  }
-
-  const cargoPaths = [
-    resolve(__dirname, "../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../target/release/sandbox-agent"),
-  ];
-
-  for (const p of cargoPaths) {
-    if (existsSync(p)) {
-      return p;
-    }
-  }
-
-  return null;
-}
-
-const BINARY_PATH = findBinary();
-if (!BINARY_PATH) {
-  throw new Error(
-    "sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.",
-  );
-}
-if (!process.env.SANDBOX_AGENT_BIN) {
-  process.env.SANDBOX_AGENT_BIN = BINARY_PATH;
-}
-
-interface PostgresContainer {
-  containerId: string;
-  connectionString: string;
-}
-
-describe("Postgres persistence driver", () => {
-  let handle: SandboxAgentSpawnHandle;
-  let baseUrl: string;
-  let token: string;
-  let dataHome: string;
-  let postgres: PostgresContainer | null = null;
-
-  beforeAll(async () => {
-    dataHome = mkdtempSync(join(tmpdir(), "postgres-integration-"));
-    prepareMockAgentDataHome(dataHome);
-
-    handle = await spawnSandboxAgent({
-      enabled: true,
-      log: "silent",
-      timeoutMs: 30000,
-      env: {
-        XDG_DATA_HOME: dataHome,
-      },
-    });
-    baseUrl = handle.baseUrl;
-    token = handle.token;
-  });
-
-  beforeEach(async () => {
-    postgres = await startPostgresContainer();
-  });
-
-  afterEach(() => {
-    if (postgres) {
-      stopPostgresContainer(postgres.containerId);
-      postgres = null;
-    }
-  });
-
-  afterAll(async () => {
-    await handle.dispose();
-    rmSync(dataHome, { recursive: true, force: true });
-  });
-
-  it("persists session/event history across SDK instances and supports replay restore", async () => {
-    const connectionString = requirePostgres(postgres).connectionString;
-
-    const persist1 = new PostgresSessionPersistDriver({
-      connectionString,
-    });
-
-    const sdk1 = await SandboxAgent.connect({
-      baseUrl,
-      token,
-      persist: persist1,
-      replayMaxEvents: 40,
-      replayMaxChars: 16000,
-    });
-
-    const created = await sdk1.createSession({ agent: "mock" });
-    await created.prompt([{ type: "text", text: "postgres-first" }]);
-    const firstConnectionId = created.lastConnectionId;
-
-    await sdk1.dispose();
-    await persist1.close();
-
-    const persist2 = new PostgresSessionPersistDriver({
-      connectionString,
-    });
-    const sdk2 = await SandboxAgent.connect({
-      baseUrl,
-      token,
-      persist: persist2,
-      replayMaxEvents: 40,
-      replayMaxChars: 16000,
-    });
-
-    const restored = await sdk2.resumeSession(created.id);
-    expect(restored.lastConnectionId).not.toBe(firstConnectionId);
-
-    await restored.prompt([{ type: "text", text: "postgres-second" }]);
-
-    const sessions = await sdk2.listSessions({ limit: 20 });
-    expect(sessions.items.some((entry) => entry.id === created.id)).toBe(true);
-
-    const events = await sdk2.getEvents({ sessionId: created.id, limit: 1000 });
-    expect(events.items.length).toBeGreaterThan(0);
-    expect(events.items.every((event) => typeof event.id === "string")).toBe(true);
-    expect(events.items.every((event) => Number.isInteger(event.eventIndex))).toBe(true);
-
-    for (let i = 1; i < events.items.length; i += 1) {
-      expect(events.items[i]!.eventIndex).toBeGreaterThanOrEqual(events.items[i - 1]!.eventIndex);
-    }
-
-    const replayInjected = events.items.find((event) => {
-      if (event.sender !== "client") {
-        return false;
-      }
-      const payload = event.payload as Record<string, unknown>;
-      const method = payload.method;
-      const params = payload.params as Record<string, unknown> | undefined;
-      const prompt = Array.isArray(params?.prompt) ? params?.prompt : [];
-      const firstBlock = prompt[0] as Record<string, unknown> | undefined;
-      return (
-        method === "session/prompt" &&
-        typeof firstBlock?.text === "string" &&
-        firstBlock.text.includes("Previous session history is replayed below")
-      );
-    });
-    expect(replayInjected).toBeTruthy();
-
-    await sdk2.dispose();
-    await persist2.close();
-  });
-});
-
-async function startPostgresContainer(): Promise<PostgresContainer> {
-  const name = `sandbox-agent-postgres-${randomUUID()}`;
-  const containerId = runDockerCommand([
-    "run",
-    "-d",
-    "--rm",
-    "--name",
-    name,
-    "-e",
-    "POSTGRES_USER=postgres",
-    "-e",
-    "POSTGRES_PASSWORD=postgres",
-    "-e",
-    "POSTGRES_DB=sandboxagent",
-    "-p",
-    "127.0.0.1::5432",
-    "postgres:16-alpine",
-  ]);
-
-  const portOutput = runDockerCommand(["port", containerId, "5432/tcp"]);
-  const port = parsePort(portOutput);
-  const connectionString = `postgres://postgres:postgres@127.0.0.1:${port}/sandboxagent`;
-  await waitForPostgres(connectionString);
-
-  return {
-    containerId,
-    connectionString,
-  };
-}
-
-function stopPostgresContainer(containerId: string): void {
-  try {
-    runDockerCommand(["rm", "-f", containerId]);
-  } catch {
-    // Container may already be gone when test teardown runs.
-  }
-}
-
-function runDockerCommand(args: string[]): string {
-  return execFileSync("docker", args, {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"],
-  }).trim();
-}
-
-function parsePort(output: string): string {
-  const firstLine = output.split("\n")[0]?.trim() ?? "";
-  const match = firstLine.match(/:(\d+)$/);
-  if (!match) {
-    throw new Error(`Failed to parse docker port output: '${output}'`);
-  }
-  return match[1];
-}
-
-async function waitForPostgres(connectionString: string): Promise<void> {
-  const timeoutMs = 30000;
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-
-  while (Date.now() < deadline) {
-    const client = new Client({ connectionString });
-    try {
-      await client.connect();
-      await client.query("SELECT 1");
-      await client.end();
-      return;
-    } catch (error) {
-      lastError = error;
-      try {
-        await client.end();
-      } catch {
-        // Ignore cleanup failures while retrying.
-      }
-      await delay(250);
-    }
-  }
-
-  throw new Error(`Postgres container did not become ready: ${String(lastError)}`);
-}
-
-function delay(ms: number): Promise<void> {
-  return new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
-}
-
-function requirePostgres(container: PostgresContainer | null): PostgresContainer {
-  if (!container) {
-    throw new Error("Postgres container was not initialized for this test.");
-  }
-  return container;
-}
diff --git a/sdks/persist-rivet/README.md b/sdks/persist-rivet/README.md
new file mode 100644
index 0000000..ce93b8d
--- /dev/null
+++ b/sdks/persist-rivet/README.md
@@ -0,0 +1,5 @@
+# @sandbox-agent/persist-rivet
+
+> **Deprecated:** This package has been deprecated and removed.
+
+Copy the driver source into your project. See the [multiplayer docs](https://github.com/rivet-dev/sandbox-agent/tree/main/docs/multiplayer.mdx) and the [session persistence docs](https://sandboxagent.dev/session-persistence) for guidance.
diff --git a/sdks/persist-rivet/package.json b/sdks/persist-rivet/package.json
index 44baf47..a8ea332 100644
--- a/sdks/persist-rivet/package.json
+++ b/sdks/persist-rivet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sandbox-agent/persist-rivet",
-  "version": "0.1.0",
-  "description": "Rivet Actor persistence driver for the Sandbox Agent TypeScript SDK",
+  "version": "0.4.2",
+  "description": "Rivet Actor persistence driver for the Sandbox Agent TypeScript SDK (DEPRECATED)",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -16,30 +16,16 @@
       "import": "./dist/index.js"
     }
   },
-  "dependencies": {
-    "sandbox-agent": "workspace:*"
-  },
-  "peerDependencies": {
-    "rivetkit": ">=0.5.0"
-  },
-  "peerDependenciesMeta": {
-    "rivetkit": {
-      "optional": true
-    }
-  },
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "tsup",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
     "tsup": "^8.0.0",
-    "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "typescript": "^5.7.0"
   }
 }
diff --git a/sdks/persist-rivet/src/index.ts b/sdks/persist-rivet/src/index.ts
index 7c5205f..87907c6 100644
--- a/sdks/persist-rivet/src/index.ts
+++ b/sdks/persist-rivet/src/index.ts
@@ -1,180 +1,5 @@
-import type {
-  ListEventsRequest,
-  ListPage,
-  ListPageRequest,
-  SessionEvent,
-  SessionPersistDriver,
-  SessionRecord,
-} from "sandbox-agent";
-
-/** Structural type compatible with rivetkit's ActorContext without importing it. */
-export interface ActorContextLike {
-  state: Record<string, unknown>;
-}
-
-export interface RivetPersistData {
-  sessions: Record<string, SessionRecord>;
-  events: Record<string, SessionEvent[]>;
-}
-
-export type RivetPersistState = {
-  _sandboxAgentPersist: RivetPersistData;
-};
-
-export interface RivetSessionPersistDriverOptions {
-  /** Maximum number of sessions to retain. Oldest are evicted first. Default: 1024. */
-  maxSessions?: number;
-  /** Maximum events per session. Oldest are trimmed first. Default: 500. */
-  maxEventsPerSession?: number;
-  /** Key on `c.state` where persist data is stored. Default: `"_sandboxAgentPersist"`. */
-  stateKey?: string;
-}
-
-const DEFAULT_MAX_SESSIONS = 1024;
-const DEFAULT_MAX_EVENTS_PER_SESSION = 500;
-const DEFAULT_LIST_LIMIT = 100;
-const DEFAULT_STATE_KEY = "_sandboxAgentPersist";
-
-export class RivetSessionPersistDriver implements SessionPersistDriver {
-  private readonly maxSessions: number;
-  private readonly maxEventsPerSession: number;
-  private readonly stateKey: string;
-  private readonly ctx: ActorContextLike;
-
-  constructor(ctx: ActorContextLike, options: RivetSessionPersistDriverOptions = {}) {
-    this.ctx = ctx;
-    this.maxSessions = normalizeCap(options.maxSessions, DEFAULT_MAX_SESSIONS);
-    this.maxEventsPerSession = normalizeCap(
-      options.maxEventsPerSession,
-      DEFAULT_MAX_EVENTS_PER_SESSION,
-    );
-    this.stateKey = options.stateKey ?? DEFAULT_STATE_KEY;
-
-    // Auto-initialize if absent; preserve existing data on actor wake.
-    if (!this.ctx.state[this.stateKey]) {
-      this.ctx.state[this.stateKey] = { sessions: {}, events: {} } satisfies RivetPersistData;
-    }
-  }
-
-  private get data(): RivetPersistData {
-    return this.ctx.state[this.stateKey] as RivetPersistData;
-  }
-
-  async getSession(id: string): Promise<SessionRecord | null> {
-    const session = this.data.sessions[id];
-    return session ? cloneSessionRecord(session) : null;
-  }
-
-  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
-    const sorted = Object.values(this.data.sessions).sort((a, b) => {
-      if (a.createdAt !== b.createdAt) {
-        return a.createdAt - b.createdAt;
-      }
-      return a.id.localeCompare(b.id);
-    });
-    const page = paginate(sorted, request);
-    return {
-      items: page.items.map(cloneSessionRecord),
-      nextCursor: page.nextCursor,
-    };
-  }
-
-  async updateSession(session: SessionRecord): Promise<void> {
-    this.data.sessions[session.id] = { ...session };
-
-    if (!this.data.events[session.id]) {
-      this.data.events[session.id] = [];
-    }
-
-    const ids = Object.keys(this.data.sessions);
-    if (ids.length <= this.maxSessions) {
-      return;
-    }
-
-    const overflow = ids.length - this.maxSessions;
-    const removable = Object.values(this.data.sessions)
-      .sort((a, b) => {
-        if (a.createdAt !== b.createdAt) {
-          return a.createdAt - b.createdAt;
-        }
-        return a.id.localeCompare(b.id);
-      })
-      .slice(0, overflow)
-      .map((s) => s.id);
-
-    for (const sessionId of removable) {
-      delete this.data.sessions[sessionId];
-      delete this.data.events[sessionId];
-    }
-  }
-
-  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
-    const all = [...(this.data.events[request.sessionId] ?? [])].sort((a, b) => {
-      if (a.eventIndex !== b.eventIndex) {
-        return a.eventIndex - b.eventIndex;
-      }
-      return a.id.localeCompare(b.id);
-    });
-    const page = paginate(all, request);
-    return {
-      items: page.items.map(cloneSessionEvent),
-      nextCursor: page.nextCursor,
-    };
-  }
-
-  async insertEvent(event: SessionEvent): Promise<void> {
-    const events = this.data.events[event.sessionId] ?? [];
-    events.push(cloneSessionEvent(event));
-
-    if (events.length > this.maxEventsPerSession) {
-      events.splice(0, events.length - this.maxEventsPerSession);
-    }
-
-    this.data.events[event.sessionId] = events;
-  }
-}
-
-function cloneSessionRecord(session: SessionRecord): SessionRecord {
-  return {
-    ...session,
-    sessionInit: session.sessionInit
-      ? (JSON.parse(JSON.stringify(session.sessionInit)) as SessionRecord["sessionInit"])
-      : undefined,
-  };
-}
-
-function cloneSessionEvent(event: SessionEvent): SessionEvent {
-  return {
-    ...event,
-    payload: JSON.parse(JSON.stringify(event.payload)) as SessionEvent["payload"],
-  };
-}
-
-function normalizeCap(value: number | undefined, fallback: number): number {
-  if (!Number.isFinite(value) || (value ?? 0) < 1) {
-    return fallback;
-  }
-  return Math.floor(value as number);
-}
-
-function paginate<T>(items: T[], request: ListPageRequest): ListPage<T> {
-  const offset = parseCursor(request.cursor);
-  const limit = normalizeCap(request.limit, DEFAULT_LIST_LIMIT);
-  const slice = items.slice(offset, offset + limit);
-  const nextOffset = offset + slice.length;
-  return {
-    items: slice,
-    nextCursor: nextOffset < items.length ? String(nextOffset) : undefined,
-  };
-}
-
-function parseCursor(cursor: string | undefined): number {
-  if (!cursor) {
-    return 0;
-  }
-  const parsed = Number.parseInt(cursor, 10);
-  if (!Number.isFinite(parsed) || parsed < 0) {
-    return 0;
-  }
-  return parsed;
-}
+throw new Error(
+  "@sandbox-agent/persist-rivet has been deprecated and removed. " +
+    "Copy the reference implementation from docs/multiplayer.mdx into your project instead. " +
+    "See https://github.com/rivet-dev/sandbox-agent/tree/main/docs/multiplayer.mdx",
+);
diff --git a/sdks/persist-rivet/tests/driver.test.ts b/sdks/persist-rivet/tests/driver.test.ts
deleted file mode 100644
index c16e733..0000000
--- a/sdks/persist-rivet/tests/driver.test.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { RivetSessionPersistDriver } from "../src/index.ts";
-import type { RivetPersistData } from "../src/index.ts";
-
-function makeCtx() {
-  return { state: {} as Record<string, unknown> };
-}
-
-describe("RivetSessionPersistDriver", () => {
-  it("auto-initializes state on construction", () => {
-    const ctx = makeCtx();
-    new RivetSessionPersistDriver(ctx);
-    const data = ctx.state._sandboxAgentPersist as RivetPersistData;
-    expect(data).toBeDefined();
-    expect(data.sessions).toEqual({});
-    expect(data.events).toEqual({});
-  });
-
-  it("preserves existing state on construction (actor wake)", async () => {
-    const ctx = makeCtx();
-    const driver1 = new RivetSessionPersistDriver(ctx);
-
-    await driver1.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 100,
-    });
-
-    // Simulate actor wake: new driver instance, same state object
-    const driver2 = new RivetSessionPersistDriver(ctx);
-    const session = await driver2.getSession("s-1");
-    expect(session?.id).toBe("s-1");
-    expect(session?.createdAt).toBe(100);
-  });
-
-  it("stores and retrieves sessions", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx());
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 100,
-    });
-
-    await driver.updateSession({
-      id: "s-2",
-      agent: "mock",
-      agentSessionId: "a-2",
-      lastConnectionId: "c-2",
-      createdAt: 200,
-      destroyedAt: 300,
-    });
-
-    const loaded = await driver.getSession("s-2");
-    expect(loaded?.destroyedAt).toBe(300);
-
-    const missing = await driver.getSession("s-nonexistent");
-    expect(missing).toBeNull();
-  });
-
-  it("pages sessions sorted by createdAt", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx());
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 100,
-    });
-
-    await driver.updateSession({
-      id: "s-2",
-      agent: "mock",
-      agentSessionId: "a-2",
-      lastConnectionId: "c-2",
-      createdAt: 200,
-    });
-
-    const page1 = await driver.listSessions({ limit: 1 });
-    expect(page1.items).toHaveLength(1);
-    expect(page1.items[0]?.id).toBe("s-1");
-    expect(page1.nextCursor).toBeTruthy();
-
-    const page2 = await driver.listSessions({ cursor: page1.nextCursor, limit: 1 });
-    expect(page2.items).toHaveLength(1);
-    expect(page2.items[0]?.id).toBe("s-2");
-    expect(page2.nextCursor).toBeUndefined();
-  });
-
-  it("stores and pages events", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx());
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 1,
-    });
-
-    await driver.insertEvent({
-      id: "evt-1",
-      eventIndex: 1,
-      sessionId: "s-1",
-      createdAt: 1,
-      connectionId: "c-1",
-      sender: "client",
-      payload: { jsonrpc: "2.0", method: "session/prompt", params: { sessionId: "a-1" } },
-    });
-
-    await driver.insertEvent({
-      id: "evt-2",
-      eventIndex: 2,
-      sessionId: "s-1",
-      createdAt: 2,
-      connectionId: "c-1",
-      sender: "agent",
-      payload: { jsonrpc: "2.0", method: "session/update", params: { sessionId: "a-1" } },
-    });
-
-    const eventsPage = await driver.listEvents({ sessionId: "s-1", limit: 10 });
-    expect(eventsPage.items).toHaveLength(2);
-    expect(eventsPage.items[0]?.id).toBe("evt-1");
-    expect(eventsPage.items[0]?.eventIndex).toBe(1);
-    expect(eventsPage.items[1]?.id).toBe("evt-2");
-    expect(eventsPage.items[1]?.eventIndex).toBe(2);
-  });
-
-  it("evicts oldest sessions when maxSessions exceeded", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx(), { maxSessions: 2 });
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 100,
-    });
-
-    await driver.updateSession({
-      id: "s-2",
-      agent: "mock",
-      agentSessionId: "a-2",
-      lastConnectionId: "c-2",
-      createdAt: 200,
-    });
-
-    // Adding a third session should evict the oldest (s-1)
-    await driver.updateSession({
-      id: "s-3",
-      agent: "mock",
-      agentSessionId: "a-3",
-      lastConnectionId: "c-3",
-      createdAt: 300,
-    });
-
-    expect(await driver.getSession("s-1")).toBeNull();
-    expect(await driver.getSession("s-2")).not.toBeNull();
-    expect(await driver.getSession("s-3")).not.toBeNull();
-  });
-
-  it("trims oldest events when maxEventsPerSession exceeded", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx(), { maxEventsPerSession: 2 });
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 1,
-    });
-
-    for (let i = 1; i <= 3; i++) {
-      await driver.insertEvent({
-        id: `evt-${i}`,
-        eventIndex: i,
-        sessionId: "s-1",
-        createdAt: i,
-        connectionId: "c-1",
-        sender: "client",
-        payload: { jsonrpc: "2.0", method: "session/prompt", params: { sessionId: "a-1" } },
-      });
-    }
-
-    const page = await driver.listEvents({ sessionId: "s-1" });
-    expect(page.items).toHaveLength(2);
-    // Oldest event (evt-1) should be trimmed
-    expect(page.items[0]?.id).toBe("evt-2");
-    expect(page.items[1]?.id).toBe("evt-3");
-  });
-
-  it("clones data to prevent external mutation", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx());
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 1,
-    });
-
-    const s1 = await driver.getSession("s-1");
-    const s2 = await driver.getSession("s-1");
-    expect(s1).toEqual(s2);
-    expect(s1).not.toBe(s2); // Different object references
-  });
-
-  it("supports custom stateKey", async () => {
-    const ctx = makeCtx();
-    const driver = new RivetSessionPersistDriver(ctx, { stateKey: "myPersist" });
-
-    await driver.updateSession({
-      id: "s-1",
-      agent: "mock",
-      agentSessionId: "a-1",
-      lastConnectionId: "c-1",
-      createdAt: 1,
-    });
-
-    expect((ctx.state.myPersist as RivetPersistData).sessions["s-1"]).toBeDefined();
-    expect(ctx.state._sandboxAgentPersist).toBeUndefined();
-  });
-
-  it("returns empty results for unknown session events", async () => {
-    const driver = new RivetSessionPersistDriver(makeCtx());
-    const page = await driver.listEvents({ sessionId: "nonexistent" });
-    expect(page.items).toHaveLength(0);
-    expect(page.nextCursor).toBeUndefined();
-  });
-});
diff --git a/sdks/persist-sqlite/README.md b/sdks/persist-sqlite/README.md
new file mode 100644
index 0000000..07296fe
--- /dev/null
+++ b/sdks/persist-sqlite/README.md
@@ -0,0 +1,5 @@
+# @sandbox-agent/persist-sqlite
+
+> **Deprecated:** This package has been deprecated and removed.
+
+Install `better-sqlite3` directly and copy the driver source into your project. See the [full example](https://github.com/rivet-dev/sandbox-agent/tree/main/examples/persist-sqlite) and the [session persistence docs](https://sandboxagent.dev/session-persistence) for guidance.
diff --git a/sdks/persist-sqlite/package.json b/sdks/persist-sqlite/package.json
index 46f1e58..c0a3133 100644
--- a/sdks/persist-sqlite/package.json
+++ b/sdks/persist-sqlite/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sandbox-agent/persist-sqlite",
-  "version": "0.1.0",
-  "description": "SQLite persistence driver for the Sandbox Agent TypeScript SDK",
+  "version": "0.4.2",
+  "description": "SQLite persistence driver for the Sandbox Agent TypeScript SDK (DEPRECATED)",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -16,22 +16,17 @@
       "import": "./dist/index.js"
     }
   },
-  "dependencies": {
-    "sandbox-agent": "workspace:*"
-  },
+  "dependencies": {},
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "tsup",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
     "tsup": "^8.0.0",
-    "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "typescript": "^5.7.0"
   }
 }
diff --git a/sdks/persist-sqlite/src/index.ts b/sdks/persist-sqlite/src/index.ts
index 867e83f..fa76679 100644
--- a/sdks/persist-sqlite/src/index.ts
+++ b/sdks/persist-sqlite/src/index.ts
@@ -1,306 +1,5 @@
-import { DatabaseSync } from "node:sqlite";
-import type {
-  ListEventsRequest,
-  ListPage,
-  ListPageRequest,
-  SessionEvent,
-  SessionPersistDriver,
-  SessionRecord,
-} from "sandbox-agent";
-
-const DEFAULT_LIST_LIMIT = 100;
-
-export interface SQLiteSessionPersistDriverOptions {
-  filename?: string;
-  open?: boolean;
-}
-
-export class SQLiteSessionPersistDriver implements SessionPersistDriver {
-  private readonly db: DatabaseSync;
-
-  constructor(options: SQLiteSessionPersistDriverOptions = {}) {
-    this.db = new DatabaseSync(options.filename ?? ":memory:", {
-      open: options.open ?? true,
-    });
-    this.initialize();
-  }
-
-  async getSession(id: string): Promise<SessionRecord | null> {
-    const row = this.db
-      .prepare(
-        `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, session_init_json
-         FROM sessions WHERE id = ?`,
-      )
-      .get(id) as SessionRow | undefined;
-
-    if (!row) {
-      return null;
-    }
-
-    return decodeSessionRow(row);
-  }
-
-  async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
-    const offset = parseCursor(request.cursor);
-    const limit = normalizeLimit(request.limit);
-
-    const rows = this.db
-      .prepare(
-        `SELECT id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, session_init_json
-         FROM sessions
-         ORDER BY created_at ASC, id ASC
-         LIMIT ? OFFSET ?`,
-      )
-      .all(limit, offset) as SessionRow[];
-
-    const countRow = this.db.prepare(`SELECT COUNT(*) as count FROM sessions`).get() as { count: number };
-    const nextOffset = offset + rows.length;
-
-    return {
-      items: rows.map(decodeSessionRow),
-      nextCursor: nextOffset < countRow.count ? String(nextOffset) : undefined,
-    };
-  }
-
-  async updateSession(session: SessionRecord): Promise<void> {
-    this.db
-      .prepare(
-        `INSERT INTO sessions (
-          id, agent, agent_session_id, last_connection_id, created_at, destroyed_at, session_init_json
-        ) VALUES (?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT(id) DO UPDATE SET
-          agent = excluded.agent,
-          agent_session_id = excluded.agent_session_id,
-          last_connection_id = excluded.last_connection_id,
-          created_at = excluded.created_at,
-          destroyed_at = excluded.destroyed_at,
-          session_init_json = excluded.session_init_json`,
-      )
-      .run(
-        session.id,
-        session.agent,
-        session.agentSessionId,
-        session.lastConnectionId,
-        session.createdAt,
-        session.destroyedAt ?? null,
-        session.sessionInit ? JSON.stringify(session.sessionInit) : null,
-      );
-  }
-
-  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
-    const offset = parseCursor(request.cursor);
-    const limit = normalizeLimit(request.limit);
-
-    const rows = this.db
-      .prepare(
-        `SELECT id, event_index, session_id, created_at, connection_id, sender, payload_json
-         FROM events
-         WHERE session_id = ?
-         ORDER BY event_index ASC, id ASC
-         LIMIT ? OFFSET ?`,
-      )
-      .all(request.sessionId, limit, offset) as EventRow[];
-
-    const countRow = this.db
-      .prepare(`SELECT COUNT(*) as count FROM events WHERE session_id = ?`)
-      .get(request.sessionId) as { count: number };
-
-    const nextOffset = offset + rows.length;
-
-    return {
-      items: rows.map(decodeEventRow),
-      nextCursor: nextOffset < countRow.count ? String(nextOffset) : undefined,
-    };
-  }
-
-  async insertEvent(event: SessionEvent): Promise<void> {
-    this.db
-      .prepare(
-        `INSERT INTO events (
-          id, event_index, session_id, created_at, connection_id, sender, payload_json
-        ) VALUES (?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT(id) DO UPDATE SET
-          event_index = excluded.event_index,
-          session_id = excluded.session_id,
-          created_at = excluded.created_at,
-          connection_id = excluded.connection_id,
-          sender = excluded.sender,
-          payload_json = excluded.payload_json`,
-      )
-      .run(
-        event.id,
-        event.eventIndex,
-        event.sessionId,
-        event.createdAt,
-        event.connectionId,
-        event.sender,
-        JSON.stringify(event.payload),
-      );
-  }
-
-  close(): void {
-    this.db.close();
-  }
-
-  private initialize(): void {
-    this.db.exec(`
-      CREATE TABLE IF NOT EXISTS sessions (
-        id TEXT PRIMARY KEY,
-        agent TEXT NOT NULL,
-        agent_session_id TEXT NOT NULL,
-        last_connection_id TEXT NOT NULL,
-        created_at INTEGER NOT NULL,
-        destroyed_at INTEGER,
-        session_init_json TEXT
-      )
-    `);
-
-    this.ensureEventsTable();
-  }
-
-  private ensureEventsTable(): void {
-    const tableInfo = this.db.prepare(`PRAGMA table_info(events)`).all() as TableInfoRow[];
-    if (tableInfo.length === 0) {
-      this.createEventsTable();
-      return;
-    }
-
-    const idColumn = tableInfo.find((column) => column.name === "id");
-    const hasEventIndex = tableInfo.some((column) => column.name === "event_index");
-    const idType = (idColumn?.type ?? "").trim().toUpperCase();
-    const idIsText = idType === "TEXT";
-
-    if (!idIsText || !hasEventIndex) {
-      this.rebuildEventsTable(hasEventIndex);
-    }
-
-    this.db.exec(`
-      CREATE INDEX IF NOT EXISTS idx_events_session_order
-      ON events(session_id, event_index, id)
-    `);
-  }
-
-  private createEventsTable(): void {
-    this.db.exec(`
-      CREATE TABLE IF NOT EXISTS events (
-        id TEXT PRIMARY KEY,
-        event_index INTEGER NOT NULL,
-        session_id TEXT NOT NULL,
-        created_at INTEGER NOT NULL,
-        connection_id TEXT NOT NULL,
-        sender TEXT NOT NULL,
-        payload_json TEXT NOT NULL
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_events_session_order
-      ON events(session_id, event_index, id)
-    `);
-  }
-
-  private rebuildEventsTable(hasEventIndex: boolean): void {
-    this.db.exec(`
-      ALTER TABLE events RENAME TO events_legacy;
-    `);
-
-    this.createEventsTable();
-
-    if (hasEventIndex) {
-      this.db.exec(`
-        INSERT INTO events (id, event_index, session_id, created_at, connection_id, sender, payload_json)
-        SELECT
-          CAST(id AS TEXT),
-          COALESCE(event_index, ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at ASC, id ASC)),
-          session_id,
-          created_at,
-          connection_id,
-          sender,
-          payload_json
-        FROM events_legacy
-      `);
-    } else {
-      this.db.exec(`
-        INSERT INTO events (id, event_index, session_id, created_at, connection_id, sender, payload_json)
-        SELECT
-          CAST(id AS TEXT),
-          ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at ASC, id ASC),
-          session_id,
-          created_at,
-          connection_id,
-          sender,
-          payload_json
-        FROM events_legacy
-      `);
-    }
-
-    this.db.exec(`DROP TABLE events_legacy`);
-  }
-}
-
-type SessionRow = {
-  id: string;
-  agent: string;
-  agent_session_id: string;
-  last_connection_id: string;
-  created_at: number;
-  destroyed_at: number | null;
-  session_init_json: string | null;
-};
-
-type EventRow = {
-  id: string;
-  event_index: number;
-  session_id: string;
-  created_at: number;
-  connection_id: string;
-  sender: "client" | "agent";
-  payload_json: string;
-};
-
-type TableInfoRow = {
-  name: string;
-  type: string;
-};
-
-function decodeSessionRow(row: SessionRow): SessionRecord {
-  return {
-    id: row.id,
-    agent: row.agent,
-    agentSessionId: row.agent_session_id,
-    lastConnectionId: row.last_connection_id,
-    createdAt: row.created_at,
-    destroyedAt: row.destroyed_at ?? undefined,
-    sessionInit: row.session_init_json
-      ? (JSON.parse(row.session_init_json) as SessionRecord["sessionInit"])
-      : undefined,
-  };
-}
-
-function decodeEventRow(row: EventRow): SessionEvent {
-  return {
-    id: row.id,
-    eventIndex: row.event_index,
-    sessionId: row.session_id,
-    createdAt: row.created_at,
-    connectionId: row.connection_id,
-    sender: row.sender,
-    payload: JSON.parse(row.payload_json),
-  };
-}
-
-function normalizeLimit(limit: number | undefined): number {
-  if (!Number.isFinite(limit) || (limit ?? 0) < 1) {
-    return DEFAULT_LIST_LIMIT;
-  }
-  return Math.floor(limit as number);
-}
-
-function parseCursor(cursor: string | undefined): number {
-  if (!cursor) {
-    return 0;
-  }
-  const parsed = Number.parseInt(cursor, 10);
-  if (!Number.isFinite(parsed) || parsed < 0) {
-    return 0;
-  }
-  return parsed;
-}
+throw new Error(
+  "@sandbox-agent/persist-sqlite has been deprecated and removed. " +
+    "Copy the reference implementation from examples/persist-sqlite into your project instead. " +
+    "See https://github.com/rivet-dev/sandbox-agent/tree/main/examples/persist-sqlite",
+);
diff --git a/sdks/persist-sqlite/tests/integration.test.ts b/sdks/persist-sqlite/tests/integration.test.ts
deleted file mode 100644
index fb4b99c..0000000
--- a/sdks/persist-sqlite/tests/integration.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { existsSync, mkdtempSync, rmSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { tmpdir } from "node:os";
-import { SandboxAgent } from "sandbox-agent";
-import { spawnSandboxAgent, type SandboxAgentSpawnHandle } from "../../typescript/src/spawn.ts";
-import { prepareMockAgentDataHome } from "../../typescript/tests/helpers/mock-agent.ts";
-import { SQLiteSessionPersistDriver } from "../src/index.ts";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-function findBinary(): string | null {
-  if (process.env.SANDBOX_AGENT_BIN) {
-    return process.env.SANDBOX_AGENT_BIN;
-  }
-
-  const cargoPaths = [
-    resolve(__dirname, "../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../target/release/sandbox-agent"),
-  ];
-
-  for (const p of cargoPaths) {
-    if (existsSync(p)) {
-      return p;
-    }
-  }
-
-  return null;
-}
-
-const BINARY_PATH = findBinary();
-if (!BINARY_PATH) {
-  throw new Error(
-    "sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.",
-  );
-}
-if (!process.env.SANDBOX_AGENT_BIN) {
-  process.env.SANDBOX_AGENT_BIN = BINARY_PATH;
-}
-
-describe("SQLite persistence driver", () => {
-  let handle: SandboxAgentSpawnHandle;
-  let baseUrl: string;
-  let token: string;
-  let dataHome: string;
-
-  beforeAll(async () => {
-    dataHome = mkdtempSync(join(tmpdir(), "sqlite-integration-"));
-    prepareMockAgentDataHome(dataHome);
-
-    handle = await spawnSandboxAgent({
-      enabled: true,
-      log: "silent",
-      timeoutMs: 30000,
-      env: {
-        XDG_DATA_HOME: dataHome,
-      },
-    });
-    baseUrl = handle.baseUrl;
-    token = handle.token;
-  });
-
-  afterAll(async () => {
-    await handle.dispose();
-    rmSync(dataHome, { recursive: true, force: true });
-  });
-
-  it("persists session/event history across SDK instances and supports replay restore", async () => {
-    const tempDir = mkdtempSync(join(tmpdir(), "sqlite-persist-"));
-    const dbPath = join(tempDir, "session-store.db");
-
-    const persist1 = new SQLiteSessionPersistDriver({ filename: dbPath });
-    const sdk1 = await SandboxAgent.connect({
-      baseUrl,
-      token,
-      persist: persist1,
-      replayMaxEvents: 40,
-      replayMaxChars: 16000,
-    });
-
-    const created = await sdk1.createSession({ agent: "mock" });
-    await created.prompt([{ type: "text", text: "sqlite-first" }]);
-    const firstConnectionId = created.lastConnectionId;
-
-    await sdk1.dispose();
-    persist1.close();
-
-    const persist2 = new SQLiteSessionPersistDriver({ filename: dbPath });
-    const sdk2 = await SandboxAgent.connect({
-      baseUrl,
-      token,
-      persist: persist2,
-      replayMaxEvents: 40,
-      replayMaxChars: 16000,
-    });
-
-    const restored = await sdk2.resumeSession(created.id);
-    expect(restored.lastConnectionId).not.toBe(firstConnectionId);
-
-    await restored.prompt([{ type: "text", text: "sqlite-second" }]);
-
-    const sessions = await sdk2.listSessions({ limit: 20 });
-    expect(sessions.items.some((entry) => entry.id === created.id)).toBe(true);
-
-    const events = await sdk2.getEvents({ sessionId: created.id, limit: 1000 });
-    expect(events.items.length).toBeGreaterThan(0);
-    expect(events.items.every((event) => typeof event.id === "string")).toBe(true);
-    expect(events.items.every((event) => Number.isInteger(event.eventIndex))).toBe(true);
-
-    for (let i = 1; i < events.items.length; i += 1) {
-      expect(events.items[i]!.eventIndex).toBeGreaterThanOrEqual(events.items[i - 1]!.eventIndex);
-    }
-
-    const replayInjected = events.items.find((event) => {
-      if (event.sender !== "client") {
-        return false;
-      }
-      const payload = event.payload as Record<string, unknown>;
-      const method = payload.method;
-      const params = payload.params as Record<string, unknown> | undefined;
-      const prompt = Array.isArray(params?.prompt) ? params?.prompt : [];
-      const firstBlock = prompt[0] as Record<string, unknown> | undefined;
-      return (
-        method === "session/prompt" &&
-        typeof firstBlock?.text === "string" &&
-        firstBlock.text.includes("Previous session history is replayed below")
-      );
-    });
-    expect(replayInjected).toBeTruthy();
-
-    await sdk2.dispose();
-    persist2.close();
-    rmSync(tempDir, { recursive: true, force: true });
-  });
-});
diff --git a/sdks/persist-sqlite/tsup.config.ts b/sdks/persist-sqlite/tsup.config.ts
index 70a8b7e..e896e72 100644
--- a/sdks/persist-sqlite/tsup.config.ts
+++ b/sdks/persist-sqlite/tsup.config.ts
@@ -7,4 +7,5 @@ export default defineConfig({
   sourcemap: true,
   clean: true,
   target: "es2022",
+  external: ["better-sqlite3"],
 });
diff --git a/sdks/react/package.json b/sdks/react/package.json
new file mode 100644
index 0000000..cb4cf7b
--- /dev/null
+++ b/sdks/react/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "@sandbox-agent/react",
+  "version": "0.4.2",
+  "description": "React components for Sandbox Agent frontend integrations",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rivet-dev/sandbox-agent"
+  },
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "typecheck": "tsc --noEmit"
+  },
+  "peerDependencies": {
+    "react": "^18.3.1 || ^19.0.0",
+    "sandbox-agent": "^0.2.2"
+  },
+  "dependencies": {
+    "@tanstack/react-virtual": "^3.13.22",
+    "ghostty-web": "^0.4.0"
+  },
+  "devDependencies": {
+    "@types/react": "^19.1.12",
+    "react": "^19.1.1",
+    "sandbox-agent": "workspace:*",
+    "tsup": "^8.0.0",
+    "typescript": "^5.7.0"
+  }
+}
diff --git a/sdks/react/src/AgentConversation.tsx b/sdks/react/src/AgentConversation.tsx
new file mode 100644
index 0000000..44dd0de
--- /dev/null
+++ b/sdks/react/src/AgentConversation.tsx
@@ -0,0 +1,85 @@
+"use client";
+
+import type { ReactNode, RefObject } from "react";
+import { AgentTranscript, type AgentTranscriptClassNames, type AgentTranscriptProps, type TranscriptEntry } from "./AgentTranscript.tsx";
+import { ChatComposer, type ChatComposerClassNames, type ChatComposerProps } from "./ChatComposer.tsx";
+
+export interface AgentConversationClassNames {
+  root: string;
+  transcript: string;
+  emptyState: string;
+  composer: string;
+}
+
+export interface AgentConversationProps {
+  entries: TranscriptEntry[];
+  className?: string;
+  classNames?: Partial<AgentConversationClassNames>;
+  emptyState?: ReactNode;
+  transcriptClassName?: string;
+  transcriptClassNames?: Partial<AgentTranscriptClassNames>;
+  scrollRef?: RefObject<HTMLDivElement | null>;
+  composerClassName?: string;
+  composerClassNames?: Partial<ChatComposerClassNames>;
+  transcriptProps?: Omit<AgentTranscriptProps, "entries" | "className" | "classNames" | "scrollRef">;
+  composerProps?: Omit<ChatComposerProps, "className" | "classNames">;
+}
+
+const DEFAULT_CLASS_NAMES: AgentConversationClassNames = {
+  root: "sa-agent-conversation",
+  transcript: "sa-agent-conversation-transcript",
+  emptyState: "sa-agent-conversation-empty-state",
+  composer: "sa-agent-conversation-composer",
+};
+
+const cx = (...values: Array<string | false | null | undefined>) => values.filter(Boolean).join(" ");
+
+const mergeClassNames = (defaults: AgentConversationClassNames, overrides?: Partial<AgentConversationClassNames>): AgentConversationClassNames => ({
+  root: cx(defaults.root, overrides?.root),
+  transcript: cx(defaults.transcript, overrides?.transcript),
+  emptyState: cx(defaults.emptyState, overrides?.emptyState),
+  composer: cx(defaults.composer, overrides?.composer),
+});
+
+export const AgentConversation = ({
+  entries,
+  className,
+  classNames: classNameOverrides,
+  emptyState,
+  transcriptClassName,
+  transcriptClassNames,
+  scrollRef,
+  composerClassName,
+  composerClassNames,
+  transcriptProps,
+  composerProps,
+}: AgentConversationProps) => {
+  const resolvedClassNames = mergeClassNames(DEFAULT_CLASS_NAMES, classNameOverrides);
+  const hasTranscriptContent = entries.length > 0 || Boolean(transcriptProps?.sessionError) || Boolean(transcriptProps?.eventError);
+
+  return (
+    <div className={cx(resolvedClassNames.root, className)} data-slot="root">
+      {hasTranscriptContent ? (
+        scrollRef ? (
+          <div className={cx(resolvedClassNames.transcript, transcriptClassName)} data-slot="transcript" ref={scrollRef}>
+            <AgentTranscript entries={entries} classNames={transcriptClassNames} {...transcriptProps} />
+          </div>
+        ) : (
+          <AgentTranscript
+            entries={entries}
+            className={cx(resolvedClassNames.transcript, transcriptClassName)}
+            classNames={transcriptClassNames}
+            {...transcriptProps}
+          />
+        )
+      ) : emptyState ? (
+        <div className={resolvedClassNames.emptyState} data-slot="empty-state">
+          {emptyState}
+        </div>
+      ) : null}
+      {composerProps ? (
+        <ChatComposer className={cx(resolvedClassNames.composer, composerClassName)} classNames={composerClassNames} {...composerProps} />
+      ) : null}
+    </div>
+  );
+};
diff --git a/sdks/react/src/AgentTranscript.tsx b/sdks/react/src/AgentTranscript.tsx
new file mode 100644
index 0000000..03fa2dc
--- /dev/null
+++ b/sdks/react/src/AgentTranscript.tsx
@@ -0,0 +1,910 @@
+"use client";
+
+import type { ReactNode, RefObject } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useTranscriptVirtualizer } from "./useTranscriptVirtualizer.ts";
+
+export type PermissionReply = "once" | "always" | "reject";
+
+export type PermissionOption = {
+  optionId: string;
+  name: string;
+  kind: string;
+};
+
+export type TranscriptEntry = {
+  id: string;
+  eventId?: string;
+  kind: "message" | "tool" | "meta" | "reasoning" | "permission";
+  time: string;
+  role?: "user" | "assistant";
+  text?: string;
+  toolName?: string;
+  toolInput?: string;
+  toolOutput?: string;
+  toolStatus?: string;
+  reasoning?: { text: string; visibility?: string };
+  meta?: { title: string; detail?: string; severity?: "info" | "error" };
+  permission?: {
+    permissionId: string;
+    title: string;
+    description?: string;
+    options: PermissionOption[];
+    resolved?: boolean;
+    selectedOptionId?: string;
+  };
+};
+
+export interface AgentTranscriptClassNames {
+  root: string;
+  divider: string;
+  dividerLine: string;
+  dividerText: string;
+  message: string;
+  messageContent: string;
+  messageText: string;
+  error: string;
+  toolGroupSingle: string;
+  toolGroupContainer: string;
+  toolGroupHeader: string;
+  toolGroupIcon: string;
+  toolGroupLabel: string;
+  toolGroupChevron: string;
+  toolGroupBody: string;
+  toolItem: string;
+  toolItemConnector: string;
+  toolItemDot: string;
+  toolItemLine: string;
+  toolItemContent: string;
+  toolItemHeader: string;
+  toolItemIcon: string;
+  toolItemLabel: string;
+  toolItemSpinner: string;
+  toolItemLink: string;
+  toolItemChevron: string;
+  toolItemBody: string;
+  toolSection: string;
+  toolSectionTitle: string;
+  toolCode: string;
+  toolCodeMuted: string;
+  permissionPrompt: string;
+  permissionHeader: string;
+  permissionIcon: string;
+  permissionTitle: string;
+  permissionDescription: string;
+  permissionActions: string;
+  permissionButton: string;
+  permissionAutoResolved: string;
+  thinkingRow: string;
+  thinkingAvatar: string;
+  thinkingAvatarImage: string;
+  thinkingAvatarLabel: string;
+  thinkingIndicator: string;
+  thinkingDot: string;
+  endAnchor: string;
+}
+
+export interface PermissionOptionRenderContext {
+  entry: TranscriptEntry;
+  option: PermissionOption;
+  label: string;
+  reply: PermissionReply;
+  selected: boolean;
+  dimmed: boolean;
+  resolved: boolean;
+}
+
+export interface AgentTranscriptProps {
+  entries: TranscriptEntry[];
+  className?: string;
+  classNames?: Partial<AgentTranscriptClassNames>;
+  endRef?: RefObject<HTMLDivElement | null>;
+  scrollRef?: RefObject<HTMLDivElement | null>;
+  scrollToEntryId?: string | null;
+  sessionError?: string | null;
+  eventError?: string | null;
+  isThinking?: boolean;
+  agentId?: string;
+  virtualize?: boolean;
+  onAtBottomChange?: (atBottom: boolean) => void;
+  onEventClick?: (eventId: string) => void;
+  onPermissionReply?: (permissionId: string, reply: PermissionReply) => void;
+  isDividerEntry?: (entry: TranscriptEntry) => boolean;
+  canOpenEvent?: (entry: TranscriptEntry) => boolean;
+  getToolGroupSummary?: (entries: TranscriptEntry[]) => string;
+  renderMessageText?: (entry: TranscriptEntry) => ReactNode;
+  renderInlinePendingIndicator?: () => ReactNode;
+  renderThinkingState?: (context: { agentId?: string }) => ReactNode;
+  renderToolItemIcon?: (entry: TranscriptEntry) => ReactNode;
+  renderToolGroupIcon?: (entries: TranscriptEntry[], expanded: boolean) => ReactNode;
+  renderChevron?: (expanded: boolean) => ReactNode;
+  renderEventLinkContent?: (entry: TranscriptEntry) => ReactNode;
+  renderPermissionIcon?: (entry: TranscriptEntry) => ReactNode;
+  renderPermissionOptionContent?: (context: PermissionOptionRenderContext) => ReactNode;
+}
+
+type GroupedEntries =
+  | { type: "message"; entries: TranscriptEntry[] }
+  | { type: "tool-group"; entries: TranscriptEntry[] }
+  | { type: "divider"; entries: TranscriptEntry[] }
+  | { type: "permission"; entries: TranscriptEntry[] };
+
+const VIRTUAL_GROUP_GAP_PX = 12;
+
+const DEFAULT_CLASS_NAMES: AgentTranscriptClassNames = {
+  root: "sa-agent-transcript",
+  divider: "sa-agent-transcript-divider",
+  dividerLine: "sa-agent-transcript-divider-line",
+  dividerText: "sa-agent-transcript-divider-text",
+  message: "sa-agent-transcript-message",
+  messageContent: "sa-agent-transcript-message-content",
+  messageText: "sa-agent-transcript-message-text",
+  error: "sa-agent-transcript-error",
+  toolGroupSingle: "sa-agent-transcript-tool-group-single",
+  toolGroupContainer: "sa-agent-transcript-tool-group",
+  toolGroupHeader: "sa-agent-transcript-tool-group-header",
+  toolGroupIcon: "sa-agent-transcript-tool-group-icon",
+  toolGroupLabel: "sa-agent-transcript-tool-group-label",
+  toolGroupChevron: "sa-agent-transcript-tool-group-chevron",
+  toolGroupBody: "sa-agent-transcript-tool-group-body",
+  toolItem: "sa-agent-transcript-tool-item",
+  toolItemConnector: "sa-agent-transcript-tool-item-connector",
+  toolItemDot: "sa-agent-transcript-tool-item-dot",
+  toolItemLine: "sa-agent-transcript-tool-item-line",
+  toolItemContent: "sa-agent-transcript-tool-item-content",
+  toolItemHeader: "sa-agent-transcript-tool-item-header",
+  toolItemIcon: "sa-agent-transcript-tool-item-icon",
+  toolItemLabel: "sa-agent-transcript-tool-item-label",
+  toolItemSpinner: "sa-agent-transcript-tool-item-spinner",
+  toolItemLink: "sa-agent-transcript-tool-item-link",
+  toolItemChevron: "sa-agent-transcript-tool-item-chevron",
+  toolItemBody: "sa-agent-transcript-tool-item-body",
+  toolSection: "sa-agent-transcript-tool-section",
+  toolSectionTitle: "sa-agent-transcript-tool-section-title",
+  toolCode: "sa-agent-transcript-tool-code",
+  toolCodeMuted: "sa-agent-transcript-tool-code-muted",
+  permissionPrompt: "sa-agent-transcript-permission-prompt",
+  permissionHeader: "sa-agent-transcript-permission-header",
+  permissionIcon: "sa-agent-transcript-permission-icon",
+  permissionTitle: "sa-agent-transcript-permission-title",
+  permissionDescription: "sa-agent-transcript-permission-description",
+  permissionActions: "sa-agent-transcript-permission-actions",
+  permissionButton: "sa-agent-transcript-permission-button",
+  permissionAutoResolved: "sa-agent-transcript-permission-auto-resolved",
+  thinkingRow: "sa-agent-transcript-thinking-row",
+  thinkingAvatar: "sa-agent-transcript-thinking-avatar",
+  thinkingAvatarImage: "sa-agent-transcript-thinking-avatar-image",
+  thinkingAvatarLabel: "sa-agent-transcript-thinking-avatar-label",
+  thinkingIndicator: "sa-agent-transcript-thinking-indicator",
+  thinkingDot: "sa-agent-transcript-thinking-dot",
+  endAnchor: "sa-agent-transcript-end",
+};
+
+const DEFAULT_DIVIDER_TITLES = new Set(["Session Started", "Turn Started", "Turn Ended"]);
+
+const cx = (...values: Array<string | false | null | undefined>) => values.filter(Boolean).join(" ");
+
+const mergeClassNames = (defaults: AgentTranscriptClassNames, overrides?: Partial<AgentTranscriptClassNames>): AgentTranscriptClassNames => ({
+  root: cx(defaults.root, overrides?.root),
+  divider: cx(defaults.divider, overrides?.divider),
+  dividerLine: cx(defaults.dividerLine, overrides?.dividerLine),
+  dividerText: cx(defaults.dividerText, overrides?.dividerText),
+  message: cx(defaults.message, overrides?.message),
+  messageContent: cx(defaults.messageContent, overrides?.messageContent),
+  messageText: cx(defaults.messageText, overrides?.messageText),
+  error: cx(defaults.error, overrides?.error),
+  toolGroupSingle: cx(defaults.toolGroupSingle, overrides?.toolGroupSingle),
+  toolGroupContainer: cx(defaults.toolGroupContainer, overrides?.toolGroupContainer),
+  toolGroupHeader: cx(defaults.toolGroupHeader, overrides?.toolGroupHeader),
+  toolGroupIcon: cx(defaults.toolGroupIcon, overrides?.toolGroupIcon),
+  toolGroupLabel: cx(defaults.toolGroupLabel, overrides?.toolGroupLabel),
+  toolGroupChevron: cx(defaults.toolGroupChevron, overrides?.toolGroupChevron),
+  toolGroupBody: cx(defaults.toolGroupBody, overrides?.toolGroupBody),
+  toolItem: cx(defaults.toolItem, overrides?.toolItem),
+  toolItemConnector: cx(defaults.toolItemConnector, overrides?.toolItemConnector),
+  toolItemDot: cx(defaults.toolItemDot, overrides?.toolItemDot),
+  toolItemLine: cx(defaults.toolItemLine, overrides?.toolItemLine),
+  toolItemContent: cx(defaults.toolItemContent, overrides?.toolItemContent),
+  toolItemHeader: cx(defaults.toolItemHeader, overrides?.toolItemHeader),
+  toolItemIcon: cx(defaults.toolItemIcon, overrides?.toolItemIcon),
+  toolItemLabel: cx(defaults.toolItemLabel, overrides?.toolItemLabel),
+  toolItemSpinner: cx(defaults.toolItemSpinner, overrides?.toolItemSpinner),
+  toolItemLink: cx(defaults.toolItemLink, overrides?.toolItemLink),
+  toolItemChevron: cx(defaults.toolItemChevron, overrides?.toolItemChevron),
+  toolItemBody: cx(defaults.toolItemBody, overrides?.toolItemBody),
+  toolSection: cx(defaults.toolSection, overrides?.toolSection),
+  toolSectionTitle: cx(defaults.toolSectionTitle, overrides?.toolSectionTitle),
+  toolCode: cx(defaults.toolCode, overrides?.toolCode),
+  toolCodeMuted: cx(defaults.toolCodeMuted, overrides?.toolCodeMuted),
+  permissionPrompt: cx(defaults.permissionPrompt, overrides?.permissionPrompt),
+  permissionHeader: cx(defaults.permissionHeader, overrides?.permissionHeader),
+  permissionIcon: cx(defaults.permissionIcon, overrides?.permissionIcon),
+  permissionTitle: cx(defaults.permissionTitle, overrides?.permissionTitle),
+  permissionDescription: cx(defaults.permissionDescription, overrides?.permissionDescription),
+  permissionActions: cx(defaults.permissionActions, overrides?.permissionActions),
+  permissionButton: cx(defaults.permissionButton, overrides?.permissionButton),
+  permissionAutoResolved: cx(defaults.permissionAutoResolved, overrides?.permissionAutoResolved),
+  thinkingRow: cx(defaults.thinkingRow, overrides?.thinkingRow),
+  thinkingAvatar: cx(defaults.thinkingAvatar, overrides?.thinkingAvatar),
+  thinkingAvatarImage: cx(defaults.thinkingAvatarImage, overrides?.thinkingAvatarImage),
+  thinkingAvatarLabel: cx(defaults.thinkingAvatarLabel, overrides?.thinkingAvatarLabel),
+  thinkingIndicator: cx(defaults.thinkingIndicator, overrides?.thinkingIndicator),
+  thinkingDot: cx(defaults.thinkingDot, overrides?.thinkingDot),
+  endAnchor: cx(defaults.endAnchor, overrides?.endAnchor),
+});
+
+const getMessageVariant = (entry: TranscriptEntry) => {
+  if (entry.kind === "tool") return "tool";
+  if (entry.kind === "meta") return entry.meta?.severity === "error" ? "error" : "system";
+  if (entry.kind === "reasoning") return "assistant";
+  if (entry.kind === "permission") return "system";
+  if (entry.role === "user") return "user";
+  return "assistant";
+};
+
+const getToolItemLabel = (entry: TranscriptEntry) => {
+  if (entry.kind === "tool") {
+    const statusLabel = entry.toolStatus && entry.toolStatus !== "completed" ? ` (${entry.toolStatus.replaceAll("_", " ")})` : "";
+    return `${entry.toolName ?? "tool"}${statusLabel}`;
+  }
+
+  if (entry.kind === "reasoning") {
+    return `Reasoning${entry.reasoning?.visibility ? ` (${entry.reasoning.visibility})` : ""}`;
+  }
+
+  return entry.meta?.title ?? "Status";
+};
+
+const getDefaultToolItemIcon = (entry: TranscriptEntry) => {
+  if (entry.kind === "tool") return "Tool";
+  if (entry.kind === "reasoning") return "Thought";
+  return entry.meta?.severity === "error" ? "Error" : "Info";
+};
+
+const getDefaultToolGroupSummary = (entries: TranscriptEntry[]) => {
+  const count = entries.length;
+  return `${count} Event${count === 1 ? "" : "s"}`;
+};
+
+const getPermissionReplyForOption = (kind: string): PermissionReply => {
+  if (kind === "allow_once") return "once";
+  if (kind === "allow_always") return "always";
+  return "reject";
+};
+
+const getPermissionOptionLabel = (option: PermissionOption) => {
+  if (option.name) return option.name;
+  if (option.kind === "allow_once") return "Allow Once";
+  if (option.kind === "allow_always") return "Always Allow";
+  if (option.kind === "reject_once") return "Reject";
+  if (option.kind === "reject_always") return "Reject Always";
+  return option.kind;
+};
+
+const getPermissionOptionTone = (kind: string) => (kind.startsWith("allow") ? "allow" : "reject");
+
+const defaultRenderMessageText = (entry: TranscriptEntry) => entry.text;
+const defaultRenderPendingIndicator = () => "...";
+const defaultRenderChevron = (expanded: boolean) => (expanded ? "▾" : "▸");
+const defaultRenderEventLinkContent = () => "Open";
+const defaultRenderPermissionIcon = () => "Permission";
+const defaultRenderPermissionOptionContent = ({ label }: PermissionOptionRenderContext) => label;
+const defaultIsDividerEntry = (entry: TranscriptEntry) => entry.kind === "meta" && DEFAULT_DIVIDER_TITLES.has(entry.meta?.title ?? "");
+
+const defaultCanOpenEvent = (entry: TranscriptEntry) => Boolean(entry.eventId);
+
+const buildGroupedEntries = (entries: TranscriptEntry[], isDividerEntry: (entry: TranscriptEntry) => boolean): GroupedEntries[] => {
+  const groupedEntries: GroupedEntries[] = [];
+  let currentToolGroup: TranscriptEntry[] = [];
+
+  const flushToolGroup = () => {
+    if (currentToolGroup.length === 0) {
+      return;
+    }
+    groupedEntries.push({ type: "tool-group", entries: currentToolGroup });
+    currentToolGroup = [];
+  };
+
+  for (const entry of entries) {
+    if (isDividerEntry(entry)) {
+      flushToolGroup();
+      groupedEntries.push({ type: "divider", entries: [entry] });
+      continue;
+    }
+
+    if (entry.kind === "permission") {
+      flushToolGroup();
+      groupedEntries.push({ type: "permission", entries: [entry] });
+      continue;
+    }
+
+    if (entry.kind === "tool" || entry.kind === "reasoning" || entry.kind === "meta") {
+      currentToolGroup.push(entry);
+      continue;
+    }
+
+    flushToolGroup();
+    groupedEntries.push({ type: "message", entries: [entry] });
+  }
+
+  flushToolGroup();
+  return groupedEntries;
+};
+
+const getGroupedEntryKey = (group: GroupedEntries, index: number): string => {
+  const firstEntry = group.entries[0];
+
+  if (group.type === "tool-group") {
+    return `tool-group:${firstEntry?.id ?? index}`;
+  }
+
+  return firstEntry?.id ?? `${group.type}:${index}`;
+};
+
+const ToolItem = ({
+  entry,
+  isLast,
+  expanded,
+  onExpandedChange,
+  classNames,
+  onEventClick,
+  canOpenEvent,
+  renderInlinePendingIndicator,
+  renderToolItemIcon,
+  renderChevron,
+  renderEventLinkContent,
+}: {
+  entry: TranscriptEntry;
+  isLast: boolean;
+  expanded: boolean;
+  onExpandedChange: (expanded: boolean) => void;
+  classNames: AgentTranscriptClassNames;
+  onEventClick?: (eventId: string) => void;
+  canOpenEvent: (entry: TranscriptEntry) => boolean;
+  renderInlinePendingIndicator: () => ReactNode;
+  renderToolItemIcon: (entry: TranscriptEntry) => ReactNode;
+  renderChevron: (expanded: boolean) => ReactNode;
+  renderEventLinkContent: (entry: TranscriptEntry) => ReactNode;
+}) => {
+  const isTool = entry.kind === "tool";
+  const isReasoning = entry.kind === "reasoning";
+  const isMeta = entry.kind === "meta";
+  const isComplete = isTool && (entry.toolStatus === "completed" || entry.toolStatus === "failed");
+  const isFailed = isTool && entry.toolStatus === "failed";
+  const isInProgress = isTool && entry.toolStatus === "in_progress";
+  const hasContent = isTool
+    ? Boolean(entry.toolInput || entry.toolOutput)
+    : isReasoning
+      ? Boolean(entry.reasoning?.text?.trim())
+      : Boolean(entry.meta?.detail?.trim());
+  const showEventLink = Boolean(entry.eventId && onEventClick && canOpenEvent(entry));
+
+  return (
+    <div
+      className={cx(classNames.toolItem, isLast && "last", isFailed && "failed")}
+      data-slot="tool-item"
+      data-kind={entry.kind}
+      data-state={entry.toolStatus}
+      data-last={isLast ? "true" : undefined}
+      data-failed={isFailed ? "true" : undefined}
+    >
+      <div className={classNames.toolItemConnector} data-slot="tool-item-connector">
+        <div className={classNames.toolItemDot} data-slot="tool-item-dot" />
+        {!isLast ? <div className={classNames.toolItemLine} data-slot="tool-item-line" /> : null}
+      </div>
+      <div className={classNames.toolItemContent} data-slot="tool-item-content">
+        <button
+          type="button"
+          className={cx(classNames.toolItemHeader, expanded && "expanded")}
+          data-slot="tool-item-header"
+          data-expanded={expanded ? "true" : undefined}
+          data-has-content={hasContent ? "true" : undefined}
+          disabled={!hasContent}
+          onClick={() => {
+            if (hasContent) {
+              onExpandedChange(!expanded);
+            }
+          }}
+        >
+          <span className={classNames.toolItemIcon} data-slot="tool-item-icon">
+            {renderToolItemIcon(entry)}
+          </span>
+          <span className={classNames.toolItemLabel} data-slot="tool-item-label">
+            {getToolItemLabel(entry)}
+          </span>
+          {isInProgress ? (
+            <span className={classNames.toolItemSpinner} data-slot="tool-item-spinner">
+              {renderInlinePendingIndicator()}
+            </span>
+          ) : null}
+          {showEventLink ? (
+            <span
+              className={classNames.toolItemLink}
+              data-slot="tool-item-link"
+              role="button"
+              tabIndex={0}
+              onClick={(event) => {
+                event.stopPropagation();
+                onEventClick?.(entry.eventId!);
+              }}
+              onKeyDown={(event) => {
+                if (event.key === "Enter" || event.key === " ") {
+                  event.preventDefault();
+                  event.stopPropagation();
+                  onEventClick?.(entry.eventId!);
+                }
+              }}
+            >
+              {renderEventLinkContent(entry)}
+            </span>
+          ) : null}
+          {hasContent ? (
+            <span className={classNames.toolItemChevron} data-slot="tool-item-chevron">
+              {renderChevron(expanded)}
+            </span>
+          ) : null}
+        </button>
+        {expanded && hasContent ? (
+          <div className={classNames.toolItemBody} data-slot="tool-item-body">
+            {isTool && entry.toolInput ? (
+              <div className={classNames.toolSection} data-slot="tool-section" data-section="input">
+                <div className={classNames.toolSectionTitle} data-slot="tool-section-title">
+                  Input
+                </div>
+                <pre className={classNames.toolCode} data-slot="tool-code">
+                  {entry.toolInput}
+                </pre>
+              </div>
+            ) : null}
+            {isTool && isComplete && entry.toolOutput ? (
+              <div className={classNames.toolSection} data-slot="tool-section" data-section="output">
+                <div className={classNames.toolSectionTitle} data-slot="tool-section-title">
+                  Output
+                </div>
+                <pre className={classNames.toolCode} data-slot="tool-code">
+                  {entry.toolOutput}
+                </pre>
+              </div>
+            ) : null}
+            {isReasoning && entry.reasoning?.text ? (
+              <div className={classNames.toolSection} data-slot="tool-section" data-section="reasoning">
+                <pre className={cx(classNames.toolCode, classNames.toolCodeMuted)} data-slot="tool-code">
+                  {entry.reasoning.text}
+                </pre>
+              </div>
+            ) : null}
+            {isMeta && entry.meta?.detail ? (
+              <div className={classNames.toolSection} data-slot="tool-section" data-section="meta">
+                <pre className={classNames.toolCode} data-slot="tool-code">
+                  {entry.meta.detail}
+                </pre>
+              </div>
+            ) : null}
+          </div>
+        ) : null}
+      </div>
+    </div>
+  );
+};
+
+const ToolGroup = ({
+  entries,
+  expanded,
+  onExpandedChange,
+  expandedItemIds,
+  onToolItemExpandedChange,
+  classNames,
+  onEventClick,
+  canOpenEvent,
+  getToolGroupSummary,
+  renderInlinePendingIndicator,
+  renderToolItemIcon,
+  renderToolGroupIcon,
+  renderChevron,
+  renderEventLinkContent,
+}: {
+  entries: TranscriptEntry[];
+  expanded: boolean;
+  onExpandedChange: (expanded: boolean) => void;
+  expandedItemIds: Record<string, boolean>;
+  onToolItemExpandedChange: (entryId: string, expanded: boolean) => void;
+  classNames: AgentTranscriptClassNames;
+  onEventClick?: (eventId: string) => void;
+  canOpenEvent: (entry: TranscriptEntry) => boolean;
+  getToolGroupSummary: (entries: TranscriptEntry[]) => string;
+  renderInlinePendingIndicator: () => ReactNode;
+  renderToolItemIcon: (entry: TranscriptEntry) => ReactNode;
+  renderToolGroupIcon: (entries: TranscriptEntry[], expanded: boolean) => ReactNode;
+  renderChevron: (expanded: boolean) => ReactNode;
+  renderEventLinkContent: (entry: TranscriptEntry) => ReactNode;
+}) => {
+  const hasFailed = entries.some((entry) => entry.kind === "tool" && entry.toolStatus === "failed");
+
+  if (entries.length === 1) {
+    return (
+      <div className={classNames.toolGroupSingle} data-slot="tool-group-single">
+        <ToolItem
+          entry={entries[0]}
+          isLast={true}
+          expanded={Boolean(expandedItemIds[entries[0]!.id])}
+          onExpandedChange={(nextExpanded) => onToolItemExpandedChange(entries[0]!.id, nextExpanded)}
+          classNames={classNames}
+          onEventClick={onEventClick}
+          canOpenEvent={canOpenEvent}
+          renderInlinePendingIndicator={renderInlinePendingIndicator}
+          renderToolItemIcon={renderToolItemIcon}
+          renderChevron={renderChevron}
+          renderEventLinkContent={renderEventLinkContent}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className={cx(classNames.toolGroupContainer, hasFailed && "failed")} data-slot="tool-group" data-failed={hasFailed ? "true" : undefined}>
+      <button
+        type="button"
+        className={cx(classNames.toolGroupHeader, expanded && "expanded")}
+        data-slot="tool-group-header"
+        data-expanded={expanded ? "true" : undefined}
+        onClick={() => onExpandedChange(!expanded)}
+      >
+        <span className={classNames.toolGroupIcon} data-slot="tool-group-icon">
+          {renderToolGroupIcon(entries, expanded)}
+        </span>
+        <span className={classNames.toolGroupLabel} data-slot="tool-group-label">
+          {getToolGroupSummary(entries)}
+        </span>
+        <span className={classNames.toolGroupChevron} data-slot="tool-group-chevron">
+          {renderChevron(expanded)}
+        </span>
+      </button>
+      {expanded ? (
+        <div className={classNames.toolGroupBody} data-slot="tool-group-body">
+          {entries.map((entry, index) => (
+            <ToolItem
+              key={entry.id}
+              entry={entry}
+              isLast={index === entries.length - 1}
+              expanded={Boolean(expandedItemIds[entry.id])}
+              onExpandedChange={(nextExpanded) => onToolItemExpandedChange(entry.id, nextExpanded)}
+              classNames={classNames}
+              onEventClick={onEventClick}
+              canOpenEvent={canOpenEvent}
+              renderInlinePendingIndicator={renderInlinePendingIndicator}
+              renderToolItemIcon={renderToolItemIcon}
+              renderChevron={renderChevron}
+              renderEventLinkContent={renderEventLinkContent}
+            />
+          ))}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+const PermissionPrompt = ({
+  entry,
+  classNames,
+  onPermissionReply,
+  renderPermissionIcon,
+  renderPermissionOptionContent,
+}: {
+  entry: TranscriptEntry;
+  classNames: AgentTranscriptClassNames;
+  onPermissionReply?: (permissionId: string, reply: PermissionReply) => void;
+  renderPermissionIcon: (entry: TranscriptEntry) => ReactNode;
+  renderPermissionOptionContent: (context: PermissionOptionRenderContext) => ReactNode;
+}) => {
+  const permission = entry.permission;
+  if (!permission) {
+    return null;
+  }
+
+  const resolved = Boolean(permission.resolved);
+  const selectedOptionId = permission.selectedOptionId;
+  const canReply = Boolean(onPermissionReply) && !resolved;
+
+  return (
+    <div className={cx(classNames.permissionPrompt, resolved && "resolved")} data-slot="permission-prompt" data-resolved={resolved ? "true" : undefined}>
+      <div className={classNames.permissionHeader} data-slot="permission-header">
+        <span className={classNames.permissionIcon} data-slot="permission-icon">
+          {renderPermissionIcon(entry)}
+        </span>
+        <span className={classNames.permissionTitle} data-slot="permission-title">
+          {permission.title}
+        </span>
+      </div>
+      {permission.description ? (
+        <div className={classNames.permissionDescription} data-slot="permission-description">
+          {permission.description}
+        </div>
+      ) : null}
+      <div className={classNames.permissionActions} data-slot="permission-actions">
+        {permission.options.map((option) => {
+          const reply = getPermissionReplyForOption(option.kind);
+          const label = getPermissionOptionLabel(option);
+          const selected = resolved && selectedOptionId === option.optionId;
+          const dimmed = resolved && !selected && selectedOptionId != null;
+          const tone = getPermissionOptionTone(option.kind);
+
+          return (
+            <button
+              key={option.optionId}
+              type="button"
+              className={cx(classNames.permissionButton, tone, selected && "selected", dimmed && "dimmed")}
+              data-slot="permission-button"
+              data-tone={tone}
+              data-selected={selected ? "true" : undefined}
+              data-dimmed={dimmed ? "true" : undefined}
+              disabled={!canReply}
+              onClick={() => onPermissionReply?.(permission.permissionId, reply)}
+            >
+              {renderPermissionOptionContent({
+                entry,
+                option,
+                label,
+                reply,
+                selected,
+                dimmed,
+                resolved,
+              })}
+            </button>
+          );
+        })}
+        {resolved && !selectedOptionId ? (
+          <span className={classNames.permissionAutoResolved} data-slot="permission-auto-resolved">
+            Auto-resolved
+          </span>
+        ) : null}
+      </div>
+    </div>
+  );
+};
+
+export const AgentTranscript = ({
+  entries,
+  className,
+  classNames: classNameOverrides,
+  endRef,
+  scrollRef,
+  scrollToEntryId,
+  sessionError,
+  eventError,
+  isThinking,
+  agentId,
+  virtualize = false,
+  onAtBottomChange,
+  onEventClick,
+  onPermissionReply,
+  isDividerEntry = defaultIsDividerEntry,
+  canOpenEvent = defaultCanOpenEvent,
+  getToolGroupSummary = getDefaultToolGroupSummary,
+  renderMessageText = defaultRenderMessageText,
+  renderInlinePendingIndicator = defaultRenderPendingIndicator,
+  renderThinkingState,
+  renderToolItemIcon = getDefaultToolItemIcon,
+  renderToolGroupIcon = () => null,
+  renderChevron = defaultRenderChevron,
+  renderEventLinkContent = defaultRenderEventLinkContent,
+  renderPermissionIcon = defaultRenderPermissionIcon,
+  renderPermissionOptionContent = defaultRenderPermissionOptionContent,
+}: AgentTranscriptProps) => {
+  const resolvedClassNames = useMemo(() => mergeClassNames(DEFAULT_CLASS_NAMES, classNameOverrides), [classNameOverrides]);
+  const groupedEntries = useMemo(() => buildGroupedEntries(entries, isDividerEntry), [entries, isDividerEntry]);
+  const [expandedToolGroups, setExpandedToolGroups] = useState<Record<string, boolean>>({});
+  const [expandedToolItems, setExpandedToolItems] = useState<Record<string, boolean>>({});
+  const lastScrollTargetRef = useRef<string | null>(null);
+  const isVirtualized = virtualize && Boolean(scrollRef);
+  const { virtualizer, isFollowingRef } = useTranscriptVirtualizer(groupedEntries, isVirtualized ? scrollRef : undefined, onAtBottomChange);
+
+  useEffect(() => {
+    if (!scrollToEntryId) {
+      lastScrollTargetRef.current = null;
+      return;
+    }
+
+    if (!isVirtualized || scrollToEntryId === lastScrollTargetRef.current) {
+      return;
+    }
+
+    const targetIndex = groupedEntries.findIndex((group) => group.entries.some((entry) => entry.id === scrollToEntryId));
+    if (targetIndex < 0) {
+      return;
+    }
+
+    lastScrollTargetRef.current = scrollToEntryId;
+
+    const frameId = requestAnimationFrame(() => {
+      virtualizer.scrollToIndex(targetIndex, {
+        align: "center",
+        behavior: "smooth",
+      });
+    });
+
+    return () => {
+      cancelAnimationFrame(frameId);
+    };
+  }, [groupedEntries, isVirtualized, scrollToEntryId, virtualizer]);
+
+  useEffect(() => {
+    if (!isVirtualized || !scrollRef?.current || !isFollowingRef.current) {
+      return;
+    }
+
+    const scrollElement = scrollRef.current;
+    const frameId = requestAnimationFrame(() => {
+      scrollElement.scrollTo({ top: scrollElement.scrollHeight });
+    });
+
+    return () => {
+      cancelAnimationFrame(frameId);
+    };
+  }, [eventError, isFollowingRef, isThinking, isVirtualized, scrollRef, sessionError]);
+
+  const setToolGroupExpanded = (groupKey: string, expanded: boolean) => {
+    setExpandedToolGroups((current) => {
+      if (current[groupKey] === expanded) {
+        return current;
+      }
+      return { ...current, [groupKey]: expanded };
+    });
+  };
+
+  const setToolItemExpanded = (entryId: string, expanded: boolean) => {
+    setExpandedToolItems((current) => {
+      if (current[entryId] === expanded) {
+        return current;
+      }
+      return { ...current, [entryId]: expanded };
+    });
+  };
+
+  const renderGroup = (group: GroupedEntries, index: number) => {
+    if (group.type === "divider") {
+      const entry = group.entries[0];
+      const title = entry.meta?.title ?? "Status";
+      return (
+        <div key={entry.id} className={resolvedClassNames.divider} data-slot="divider">
+          <div className={resolvedClassNames.dividerLine} data-slot="divider-line" />
+          <span className={resolvedClassNames.dividerText} data-slot="divider-text">
+            {title}
+          </span>
+          <div className={resolvedClassNames.dividerLine} data-slot="divider-line" />
+        </div>
+      );
+    }
+
+    if (group.type === "tool-group") {
+      const groupKey = getGroupedEntryKey(group, index);
+
+      return (
+        <ToolGroup
+          key={groupKey}
+          entries={group.entries}
+          expanded={Boolean(expandedToolGroups[groupKey])}
+          onExpandedChange={(expanded) => setToolGroupExpanded(groupKey, expanded)}
+          expandedItemIds={expandedToolItems}
+          onToolItemExpandedChange={setToolItemExpanded}
+          classNames={resolvedClassNames}
+          onEventClick={onEventClick}
+          canOpenEvent={canOpenEvent}
+          getToolGroupSummary={getToolGroupSummary}
+          renderInlinePendingIndicator={renderInlinePendingIndicator}
+          renderToolItemIcon={renderToolItemIcon}
+          renderToolGroupIcon={renderToolGroupIcon}
+          renderChevron={renderChevron}
+          renderEventLinkContent={renderEventLinkContent}
+        />
+      );
+    }
+
+    if (group.type === "permission") {
+      const entry = group.entries[0];
+      return (
+        <PermissionPrompt
+          key={entry.id}
+          entry={entry}
+          classNames={resolvedClassNames}
+          onPermissionReply={onPermissionReply}
+          renderPermissionIcon={renderPermissionIcon}
+          renderPermissionOptionContent={renderPermissionOptionContent}
+        />
+      );
+    }
+
+    const entry = group.entries[0];
+    const messageVariant = getMessageVariant(entry);
+
+    return (
+      <div
+        key={entry.id}
+        className={cx(resolvedClassNames.message, messageVariant, "no-avatar")}
+        data-slot="message"
+        data-kind={entry.kind}
+        data-role={entry.role}
+        data-variant={messageVariant}
+        data-severity={entry.meta?.severity}
+      >
+        <div className={resolvedClassNames.messageContent} data-slot="message-content">
+          {entry.text ? (
+            <div className={resolvedClassNames.messageText} data-slot="message-text">
+              {renderMessageText(entry)}
+            </div>
+          ) : (
+            <span className={resolvedClassNames.thinkingIndicator} data-slot="thinking-indicator">
+              {renderInlinePendingIndicator()}
+            </span>
+          )}
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <div className={cx(resolvedClassNames.root, className)} data-slot="root" data-virtualized={isVirtualized ? "true" : undefined}>
+      {isVirtualized ? (
+        <div
+          data-slot="virtual-list"
+          style={{
+            height: `${virtualizer.getTotalSize()}px`,
+            position: "relative",
+            width: "100%",
+          }}
+        >
+          {virtualizer.getVirtualItems().map((virtualItem) => {
+            const group = groupedEntries[virtualItem.index];
+            if (!group) {
+              return null;
+            }
+
+            return (
+              <div
+                key={getGroupedEntryKey(group, virtualItem.index)}
+                data-index={virtualItem.index}
+                ref={(node) => {
+                  if (node) {
+                    virtualizer.measureElement(node);
+                  }
+                }}
+                style={{
+                  left: 0,
+                  position: "absolute",
+                  top: 0,
+                  transform: `translateY(${virtualItem.start}px)`,
+                  width: "100%",
+                }}
+              >
+                <div style={{ paddingBottom: virtualItem.index === groupedEntries.length - 1 ? 0 : `${VIRTUAL_GROUP_GAP_PX}px` }}>
+                  {renderGroup(group, virtualItem.index)}
+                </div>
+              </div>
+            );
+          })}
+        </div>
+      ) : (
+        groupedEntries.map((group, index) => renderGroup(group, index))
+      )}
+      {sessionError ? (
+        <div className={resolvedClassNames.error} data-slot="error" data-source="session">
+          {sessionError}
+        </div>
+      ) : null}
+      {eventError ? (
+        <div className={resolvedClassNames.error} data-slot="error" data-source="event">
+          {eventError}
+        </div>
+      ) : null}
+      {isThinking
+        ? (renderThinkingState?.({ agentId }) ?? (
+            <div className={resolvedClassNames.thinkingRow} data-slot="thinking-row">
+              <span className={resolvedClassNames.thinkingIndicator} data-slot="thinking-indicator">
+                Thinking...
+              </span>
+            </div>
+          ))
+        : null}
+      {!isVirtualized ? <div ref={endRef} className={resolvedClassNames.endAnchor} data-slot="end-anchor" /> : null}
+    </div>
+  );
+};
diff --git a/sdks/react/src/ChatComposer.tsx b/sdks/react/src/ChatComposer.tsx
new file mode 100644
index 0000000..7f92ebd
--- /dev/null
+++ b/sdks/react/src/ChatComposer.tsx
@@ -0,0 +1,114 @@
+"use client";
+
+import type { KeyboardEvent, ReactNode, Ref, TextareaHTMLAttributes } from "react";
+
+export interface ChatComposerClassNames {
+  root: string;
+  form: string;
+  input: string;
+  submit: string;
+  submitContent: string;
+}
+
+export interface ChatComposerProps {
+  message: string;
+  onMessageChange: (value: string) => void;
+  onSubmit: () => void;
+  onKeyDown?: (event: KeyboardEvent<HTMLTextAreaElement>) => void;
+  placeholder?: string;
+  disabled?: boolean;
+  submitDisabled?: boolean;
+  allowEmptySubmit?: boolean;
+  submitLabel?: string;
+  className?: string;
+  classNames?: Partial<ChatComposerClassNames>;
+  inputRef?: Ref<HTMLTextAreaElement>;
+  rows?: number;
+  textareaProps?: Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, "className" | "disabled" | "onChange" | "onKeyDown" | "placeholder" | "rows" | "value">;
+  renderSubmitContent?: () => ReactNode;
+  renderFooter?: () => ReactNode;
+}
+
+const DEFAULT_CLASS_NAMES: ChatComposerClassNames = {
+  root: "sa-chat-composer",
+  form: "sa-chat-composer-form",
+  input: "sa-chat-composer-input",
+  submit: "sa-chat-composer-submit",
+  submitContent: "sa-chat-composer-submit-content",
+};
+
+const cx = (...values: Array<string | false | null | undefined>) => values.filter(Boolean).join(" ");
+
+const mergeClassNames = (defaults: ChatComposerClassNames, overrides?: Partial<ChatComposerClassNames>): ChatComposerClassNames => ({
+  root: cx(defaults.root, overrides?.root),
+  form: cx(defaults.form, overrides?.form),
+  input: cx(defaults.input, overrides?.input),
+  submit: cx(defaults.submit, overrides?.submit),
+  submitContent: cx(defaults.submitContent, overrides?.submitContent),
+});
+
+export const ChatComposer = ({
+  message,
+  onMessageChange,
+  onSubmit,
+  onKeyDown,
+  placeholder,
+  disabled = false,
+  submitDisabled = false,
+  allowEmptySubmit = false,
+  submitLabel = "Send",
+  className,
+  classNames: classNameOverrides,
+  inputRef,
+  rows = 1,
+  textareaProps,
+  renderSubmitContent,
+  renderFooter,
+}: ChatComposerProps) => {
+  const resolvedClassNames = mergeClassNames(DEFAULT_CLASS_NAMES, classNameOverrides);
+  const isSubmitDisabled = disabled || submitDisabled || (!allowEmptySubmit && message.trim().length === 0);
+
+  return (
+    <div className={cx(resolvedClassNames.root, className)} data-slot="root">
+      <form
+        className={resolvedClassNames.form}
+        data-slot="form"
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (!isSubmitDisabled) {
+            onSubmit();
+          }
+        }}
+      >
+        <textarea
+          {...textareaProps}
+          ref={inputRef}
+          className={resolvedClassNames.input}
+          data-slot="input"
+          data-disabled={disabled ? "true" : undefined}
+          data-empty={message.trim().length === 0 ? "true" : undefined}
+          value={message}
+          onChange={(event) => onMessageChange(event.target.value)}
+          onKeyDown={onKeyDown}
+          placeholder={placeholder}
+          rows={rows}
+          disabled={disabled}
+        />
+        {renderFooter?.()}
+        <button
+          type="submit"
+          className={resolvedClassNames.submit}
+          data-slot="submit"
+          data-disabled={isSubmitDisabled ? "true" : undefined}
+          disabled={isSubmitDisabled}
+          aria-label={submitLabel}
+          title={submitLabel}
+        >
+          <span className={resolvedClassNames.submitContent} data-slot="submit-content">
+            {renderSubmitContent?.() ?? submitLabel}
+          </span>
+        </button>
+      </form>
+    </div>
+  );
+};
diff --git a/sdks/react/src/DesktopViewer.tsx b/sdks/react/src/DesktopViewer.tsx
new file mode 100644
index 0000000..55e0794
--- /dev/null
+++ b/sdks/react/src/DesktopViewer.tsx
@@ -0,0 +1,272 @@
+"use client";
+
+import type { CSSProperties, MouseEvent, WheelEvent } from "react";
+import { useEffect, useRef, useState } from "react";
+import type { DesktopMouseButton, DesktopStreamErrorStatus, DesktopStreamReadyStatus, SandboxAgent } from "sandbox-agent";
+
+type ConnectionState = "connecting" | "ready" | "closed" | "error";
+
+export type DesktopViewerClient = Pick<SandboxAgent, "connectDesktopStream">;
+
+export interface DesktopViewerProps {
+  client: DesktopViewerClient;
+  className?: string;
+  style?: CSSProperties;
+  imageStyle?: CSSProperties;
+  height?: number | string;
+  showStatusBar?: boolean;
+  onConnect?: (status: DesktopStreamReadyStatus) => void;
+  onDisconnect?: () => void;
+  onError?: (error: DesktopStreamErrorStatus | Error) => void;
+}
+
+const shellStyle: CSSProperties = {
+  display: "flex",
+  flexDirection: "column",
+  overflow: "hidden",
+  border: "1px solid rgba(15, 23, 42, 0.14)",
+  borderRadius: 14,
+  background: "linear-gradient(180deg, rgba(248, 250, 252, 0.96) 0%, rgba(226, 232, 240, 0.92) 100%)",
+  boxShadow: "0 20px 40px rgba(15, 23, 42, 0.08)",
+};
+
+const statusBarStyle: CSSProperties = {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "space-between",
+  gap: 12,
+  padding: "10px 14px",
+  borderBottom: "1px solid rgba(15, 23, 42, 0.08)",
+  background: "rgba(255, 255, 255, 0.78)",
+  color: "#0f172a",
+  fontSize: 12,
+  lineHeight: 1.4,
+};
+
+const viewportStyle: CSSProperties = {
+  position: "relative",
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  overflow: "hidden",
+  background: "radial-gradient(circle at top, rgba(14, 165, 233, 0.18), transparent 45%), linear-gradient(180deg, #0f172a 0%, #111827 100%)",
+};
+
+const videoBaseStyle: CSSProperties = {
+  display: "block",
+  width: "100%",
+  height: "100%",
+  objectFit: "contain",
+  userSelect: "none",
+};
+
+const hintStyle: CSSProperties = {
+  opacity: 0.66,
+};
+
+const getStatusColor = (state: ConnectionState): string => {
+  switch (state) {
+    case "ready":
+      return "#15803d";
+    case "error":
+      return "#b91c1c";
+    case "closed":
+      return "#b45309";
+    default:
+      return "#475569";
+  }
+};
+
+export const DesktopViewer = ({
+  client,
+  className,
+  style,
+  imageStyle,
+  height = 480,
+  showStatusBar = true,
+  onConnect,
+  onDisconnect,
+  onError,
+}: DesktopViewerProps) => {
+  const wrapperRef = useRef<HTMLDivElement | null>(null);
+  const videoRef = useRef<HTMLVideoElement | null>(null);
+  const sessionRef = useRef<ReturnType<DesktopViewerClient["connectDesktopStream"]> | null>(null);
+  const [connectionState, setConnectionState] = useState<ConnectionState>("connecting");
+  const [statusMessage, setStatusMessage] = useState("Starting desktop stream...");
+  const [hasVideo, setHasVideo] = useState(false);
+  const [resolution, setResolution] = useState<{ width: number; height: number } | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    setConnectionState("connecting");
+    setStatusMessage("Connecting to desktop stream...");
+    setResolution(null);
+    setHasVideo(false);
+
+    const session = client.connectDesktopStream();
+    sessionRef.current = session;
+
+    session.onReady((status) => {
+      if (cancelled) return;
+      setConnectionState("ready");
+      setStatusMessage("Desktop stream connected.");
+      setResolution({ width: status.width, height: status.height });
+      onConnect?.(status);
+    });
+    session.onTrack((stream) => {
+      if (cancelled) return;
+      const video = videoRef.current;
+      if (video) {
+        video.srcObject = stream;
+        void video.play().catch(() => undefined);
+        setHasVideo(true);
+      }
+    });
+    session.onError((error) => {
+      if (cancelled) return;
+      setConnectionState("error");
+      setStatusMessage(error instanceof Error ? error.message : error.message);
+      onError?.(error);
+    });
+    session.onDisconnect(() => {
+      if (cancelled) return;
+      setConnectionState((current) => (current === "error" ? current : "closed"));
+      setStatusMessage((current) => (current === "Desktop stream connected." ? "Desktop stream disconnected." : current));
+      onDisconnect?.();
+    });
+
+    return () => {
+      cancelled = true;
+      session.close();
+      sessionRef.current = null;
+      const video = videoRef.current;
+      if (video) {
+        video.srcObject = null;
+      }
+      setHasVideo(false);
+    };
+  }, [client, onConnect, onDisconnect, onError]);
+
+  const scalePoint = (clientX: number, clientY: number) => {
+    const video = videoRef.current;
+    if (!video || !resolution) {
+      return null;
+    }
+    const rect = video.getBoundingClientRect();
+    if (rect.width === 0 || rect.height === 0) {
+      return null;
+    }
+    // The video uses objectFit: "contain", so we need to compute the actual
+    // rendered content area within the <video> element to map coordinates
+    // accurately (ignoring letterbox bars).
+    const videoAspect = resolution.width / resolution.height;
+    const elemAspect = rect.width / rect.height;
+    let renderW: number;
+    let renderH: number;
+    if (elemAspect > videoAspect) {
+      // Pillarboxed (black bars on left/right)
+      renderH = rect.height;
+      renderW = rect.height * videoAspect;
+    } else {
+      // Letterboxed (black bars on top/bottom)
+      renderW = rect.width;
+      renderH = rect.width / videoAspect;
+    }
+    const offsetX = (rect.width - renderW) / 2;
+    const offsetY = (rect.height - renderH) / 2;
+    const relX = clientX - rect.left - offsetX;
+    const relY = clientY - rect.top - offsetY;
+    const x = Math.max(0, Math.min(resolution.width, (relX / renderW) * resolution.width));
+    const y = Math.max(0, Math.min(resolution.height, (relY / renderH) * resolution.height));
+    return {
+      x: Math.round(x),
+      y: Math.round(y),
+    };
+  };
+
+  const buttonFromMouseEvent = (event: MouseEvent<HTMLDivElement>): DesktopMouseButton => {
+    switch (event.button) {
+      case 1:
+        return "middle";
+      case 2:
+        return "right";
+      default:
+        return "left";
+    }
+  };
+
+  const withSession = (callback: (session: NonNullable<ReturnType<DesktopViewerClient["connectDesktopStream"]>>) => void) => {
+    const session = sessionRef.current;
+    if (session) {
+      callback(session);
+    }
+  };
+
+  return (
+    <div className={className} style={{ ...shellStyle, ...style }}>
+      {showStatusBar ? (
+        <div style={statusBarStyle}>
+          <span style={{ color: getStatusColor(connectionState) }}>{statusMessage}</span>
+          <span style={hintStyle}>{resolution ? `${resolution.width}×${resolution.height}` : "Awaiting stream"}</span>
+        </div>
+      ) : null}
+      <div
+        ref={wrapperRef}
+        role="button"
+        tabIndex={0}
+        style={{ ...viewportStyle, height }}
+        onMouseMove={(event) => {
+          const point = scalePoint(event.clientX, event.clientY);
+          if (!point) {
+            return;
+          }
+          withSession((session) => session.moveMouse(point.x, point.y));
+        }}
+        onContextMenu={(event) => {
+          event.preventDefault();
+        }}
+        onMouseDown={(event) => {
+          event.preventDefault();
+          // preventDefault on mousedown suppresses the default focus behavior,
+          // so we must explicitly focus the wrapper to receive keyboard events.
+          wrapperRef.current?.focus();
+          const point = scalePoint(event.clientX, event.clientY);
+          withSession((session) => session.mouseDown(buttonFromMouseEvent(event), point?.x, point?.y));
+        }}
+        onMouseUp={(event) => {
+          const point = scalePoint(event.clientX, event.clientY);
+          withSession((session) => session.mouseUp(buttonFromMouseEvent(event), point?.x, point?.y));
+        }}
+        onWheel={(event: WheelEvent<HTMLDivElement>) => {
+          event.preventDefault();
+          const point = scalePoint(event.clientX, event.clientY);
+          if (!point) {
+            return;
+          }
+          withSession((session) => session.scroll(point.x, point.y, Math.round(event.deltaX), Math.round(event.deltaY)));
+        }}
+        onKeyDown={(event) => {
+          event.preventDefault();
+          event.stopPropagation();
+          withSession((session) => session.keyDown(event.key));
+        }}
+        onKeyUp={(event) => {
+          event.preventDefault();
+          event.stopPropagation();
+          withSession((session) => session.keyUp(event.key));
+        }}
+      >
+        <video
+          ref={videoRef}
+          autoPlay
+          playsInline
+          muted
+          tabIndex={-1}
+          draggable={false}
+          style={{ ...videoBaseStyle, ...imageStyle, display: hasVideo ? "block" : "none", pointerEvents: "none" }}
+        />
+      </div>
+    </div>
+  );
+};
diff --git a/sdks/react/src/ProcessTerminal.tsx b/sdks/react/src/ProcessTerminal.tsx
new file mode 100644
index 0000000..1b9aa11
--- /dev/null
+++ b/sdks/react/src/ProcessTerminal.tsx
@@ -0,0 +1,280 @@
+"use client";
+
+import type { FitAddon as GhosttyFitAddon, Terminal as GhosttyTerminal } from "ghostty-web";
+import type { CSSProperties } from "react";
+import { useEffect, useRef, useState } from "react";
+import type {
+  SandboxAgent,
+  TerminalErrorStatus,
+  TerminalExitStatus,
+  TerminalReadyStatus,
+} from "sandbox-agent";
+
+type ConnectionState = "connecting" | "ready" | "closed" | "error";
+
+export type ProcessTerminalClient = Pick<SandboxAgent, "connectProcessTerminal">;
+
+export interface ProcessTerminalProps {
+  client: ProcessTerminalClient;
+  processId: string;
+  className?: string;
+  style?: CSSProperties;
+  terminalStyle?: CSSProperties;
+  statusBarStyleOverride?: CSSProperties;
+  height?: number | string;
+  showStatusBar?: boolean;
+  onExit?: (status: TerminalExitStatus) => void;
+  onError?: (error: TerminalErrorStatus | Error) => void;
+}
+
+const terminalTheme = {
+  background: "#09090b",
+  foreground: "#f4f4f5",
+  cursor: "#f97316",
+  cursorAccent: "#09090b",
+  selectionBackground: "#27272a",
+  black: "#18181b",
+  red: "#f87171",
+  green: "#4ade80",
+  yellow: "#fbbf24",
+  blue: "#60a5fa",
+  magenta: "#f472b6",
+  cyan: "#22d3ee",
+  white: "#e4e4e7",
+  brightBlack: "#3f3f46",
+  brightRed: "#fb7185",
+  brightGreen: "#86efac",
+  brightYellow: "#fde047",
+  brightBlue: "#93c5fd",
+  brightMagenta: "#f9a8d4",
+  brightCyan: "#67e8f9",
+  brightWhite: "#fafafa",
+};
+
+const shellStyle: CSSProperties = {
+  display: "flex",
+  flexDirection: "column",
+  overflow: "hidden",
+  border: "1px solid rgba(255, 255, 255, 0.1)",
+  borderRadius: 10,
+  background: "rgba(0, 0, 0, 0.3)",
+};
+
+const statusBarStyle: CSSProperties = {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "space-between",
+  gap: 12,
+  padding: "8px 12px",
+  borderBottom: "1px solid rgba(255, 255, 255, 0.08)",
+  background: "rgba(0, 0, 0, 0.2)",
+  color: "rgba(244, 244, 245, 0.86)",
+  fontSize: 11,
+  lineHeight: 1.4,
+};
+
+const hostBaseStyle: CSSProperties = {
+  minHeight: 320,
+  padding: 10,
+  overflow: "hidden",
+};
+
+const exitCodeStyle: CSSProperties = {
+  fontFamily: "ui-monospace, SFMono-Regular, SF Mono, Menlo, monospace",
+  opacity: 0.72,
+};
+
+const getStatusColor = (state: ConnectionState): string => {
+  switch (state) {
+    case "ready":
+      return "#4ade80";
+    case "error":
+      return "#fb7185";
+    case "closed":
+      return "#fbbf24";
+    default:
+      return "rgba(244, 244, 245, 0.72)";
+  }
+};
+
+export const ProcessTerminal = ({
+  client,
+  processId,
+  className,
+  style,
+  terminalStyle,
+  statusBarStyleOverride,
+  height = 360,
+  showStatusBar = true,
+  onExit,
+  onError,
+}: ProcessTerminalProps) => {
+  const hostRef = useRef<HTMLDivElement | null>(null);
+  const [connectionState, setConnectionState] = useState<ConnectionState>("connecting");
+  const [statusMessage, setStatusMessage] = useState("Connecting to PTY...");
+  const [exitCode, setExitCode] = useState<number | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+    let terminal: GhosttyTerminal | null = null;
+    let fitAddon: GhosttyFitAddon | null = null;
+    let session: ReturnType<ProcessTerminalClient["connectProcessTerminal"]> | null = null;
+    let resizeRaf = 0;
+    let removeDataListener: { dispose(): void } | null = null;
+    let removeResizeListener: { dispose(): void } | null = null;
+
+    setConnectionState("connecting");
+    setStatusMessage("Connecting to PTY...");
+    setExitCode(null);
+
+    const syncSize = () => {
+      if (!terminal || !session) {
+        return;
+      }
+
+      session.resize({
+        cols: terminal.cols,
+        rows: terminal.rows,
+      });
+    };
+
+    const connect = async () => {
+      try {
+        const ghostty = await import("ghostty-web");
+        await ghostty.init();
+
+        if (cancelled || !hostRef.current) {
+          return;
+        }
+
+        terminal = new ghostty.Terminal({
+          allowTransparency: true,
+          cursorBlink: true,
+          cursorStyle: "block",
+          fontFamily: "ui-monospace, SFMono-Regular, SF Mono, Menlo, monospace",
+          fontSize: 13,
+          smoothScrollDuration: 90,
+          theme: terminalTheme,
+        });
+        fitAddon = new ghostty.FitAddon();
+
+        terminal.open(hostRef.current);
+        const terminalRoot = hostRef.current.firstElementChild;
+        if (terminalRoot instanceof HTMLElement) {
+          terminalRoot.style.width = "100%";
+          terminalRoot.style.height = "100%";
+        }
+        terminal.loadAddon(fitAddon);
+        fitAddon.fit();
+        fitAddon.observeResize();
+        terminal.focus();
+
+        removeDataListener = terminal.onData((data) => {
+          session?.sendInput(data);
+        });
+
+        removeResizeListener = terminal.onResize(() => {
+          if (resizeRaf) {
+            window.cancelAnimationFrame(resizeRaf);
+          }
+          resizeRaf = window.requestAnimationFrame(syncSize);
+        });
+
+        const nextSession = client.connectProcessTerminal(processId);
+        session = nextSession;
+
+        nextSession.onReady((frame: TerminalReadyStatus) => {
+          if (cancelled || frame.type !== "ready") {
+            return;
+          }
+
+          setConnectionState("ready");
+          setStatusMessage("Connected");
+          syncSize();
+        });
+
+        nextSession.onData((bytes: Uint8Array) => {
+          if (cancelled || !terminal) {
+            return;
+          }
+          terminal.write(bytes);
+        });
+
+        nextSession.onExit((frame: TerminalExitStatus) => {
+          if (cancelled || frame.type !== "exit") {
+            return;
+          }
+
+          setConnectionState("closed");
+          setExitCode(frame.exitCode ?? null);
+          setStatusMessage(frame.exitCode == null ? "Process exited." : `Process exited with code ${frame.exitCode}.`);
+          onExit?.(frame);
+        });
+
+        nextSession.onError((error: TerminalErrorStatus | Error) => {
+          if (cancelled) {
+            return;
+          }
+
+          setConnectionState("error");
+          setStatusMessage(error instanceof Error ? error.message : error.message);
+          onError?.(error);
+        });
+
+        nextSession.onClose(() => {
+          if (cancelled) {
+            return;
+          }
+
+          setConnectionState((current) => (current === "error" ? current : "closed"));
+          setStatusMessage((current) => (current === "Connected" ? "Terminal disconnected." : current));
+        });
+      } catch (error) {
+        if (cancelled) {
+          return;
+        }
+
+        const nextError = error instanceof Error ? error : new Error("Failed to initialize terminal.");
+        setConnectionState("error");
+        setStatusMessage(nextError.message);
+        onError?.(nextError);
+      }
+    };
+
+    void connect();
+
+    return () => {
+      cancelled = true;
+      if (resizeRaf) {
+        window.cancelAnimationFrame(resizeRaf);
+      }
+      removeDataListener?.dispose();
+      removeResizeListener?.dispose();
+      session?.close();
+      terminal?.dispose();
+    };
+  }, [client, onError, onExit, processId]);
+
+  return (
+    <div className={className} style={{ ...shellStyle, ...style }}>
+      {showStatusBar ? (
+        <div style={{ ...statusBarStyle, ...statusBarStyleOverride }}>
+          <span style={{ color: getStatusColor(connectionState) }}>{statusMessage}</span>
+          {exitCode != null ? <span style={exitCodeStyle}>exit={exitCode}</span> : null}
+        </div>
+      ) : null}
+      <div
+        ref={hostRef}
+        role="presentation"
+        style={{
+          ...hostBaseStyle,
+          height,
+          ...terminalStyle,
+        }}
+        onClick={() => {
+          hostRef.current?.querySelector("textarea")?.focus();
+        }}
+      />
+    </div>
+  );
+};
diff --git a/sdks/react/src/index.ts b/sdks/react/src/index.ts
new file mode 100644
index 0000000..1d8d1e1
--- /dev/null
+++ b/sdks/react/src/index.ts
@@ -0,0 +1,35 @@
+export { AgentConversation } from "./AgentConversation.tsx";
+export { AgentTranscript } from "./AgentTranscript.tsx";
+export { ChatComposer } from "./ChatComposer.tsx";
+export { DesktopViewer } from "./DesktopViewer.tsx";
+export { ProcessTerminal } from "./ProcessTerminal.tsx";
+export { useTranscriptVirtualizer } from "./useTranscriptVirtualizer.ts";
+
+export type {
+  AgentConversationClassNames,
+  AgentConversationProps,
+} from "./AgentConversation.tsx";
+
+export type {
+  AgentTranscriptClassNames,
+  AgentTranscriptProps,
+  PermissionOption,
+  PermissionOptionRenderContext,
+  PermissionReply,
+  TranscriptEntry,
+} from "./AgentTranscript.tsx";
+
+export type {
+  ChatComposerClassNames,
+  ChatComposerProps,
+} from "./ChatComposer.tsx";
+
+export type {
+  DesktopViewerClient,
+  DesktopViewerProps,
+} from "./DesktopViewer.tsx";
+
+export type {
+  ProcessTerminalClient,
+  ProcessTerminalProps,
+} from "./ProcessTerminal.tsx";
diff --git a/sdks/react/src/useTranscriptVirtualizer.ts b/sdks/react/src/useTranscriptVirtualizer.ts
new file mode 100644
index 0000000..a90d75f
--- /dev/null
+++ b/sdks/react/src/useTranscriptVirtualizer.ts
@@ -0,0 +1,58 @@
+"use client";
+
+import type { RefObject } from "react";
+import { useEffect, useRef } from "react";
+import { useVirtualizer } from "@tanstack/react-virtual";
+
+export function useTranscriptVirtualizer<T>(items: T[], scrollElementRef?: RefObject<HTMLDivElement | null>, onAtBottomChange?: (atBottom: boolean) => void) {
+  const isFollowingRef = useRef(true);
+
+  const virtualizer = useVirtualizer({
+    count: items.length,
+    getScrollElement: () => scrollElementRef?.current ?? null,
+    estimateSize: () => 80,
+    measureElement: (element) => element.getBoundingClientRect().height,
+    overscan: 10,
+  });
+
+  virtualizer.shouldAdjustScrollPositionOnItemSizeChange = () => isFollowingRef.current;
+
+  useEffect(() => {
+    const scrollElement = scrollElementRef?.current;
+    if (!scrollElement) {
+      return;
+    }
+
+    const updateFollowState = () => {
+      const atBottom = scrollElement.scrollHeight - scrollElement.scrollTop - scrollElement.clientHeight < 50;
+      isFollowingRef.current = atBottom;
+      onAtBottomChange?.(atBottom);
+    };
+
+    updateFollowState();
+    scrollElement.addEventListener("scroll", updateFollowState, { passive: true });
+
+    return () => {
+      scrollElement.removeEventListener("scroll", updateFollowState);
+    };
+  }, [onAtBottomChange, scrollElementRef]);
+
+  useEffect(() => {
+    if (!isFollowingRef.current || items.length === 0) {
+      return;
+    }
+
+    const frameId = requestAnimationFrame(() => {
+      virtualizer.scrollToIndex(items.length - 1, {
+        align: "end",
+        behavior: "smooth",
+      });
+    });
+
+    return () => {
+      cancelAnimationFrame(frameId);
+    };
+  }, [items.length, virtualizer]);
+
+  return { virtualizer, isFollowingRef };
+}
diff --git a/sdks/react/tsconfig.json b/sdks/react/tsconfig.json
new file mode 100644
index 0000000..1ee4e6b
--- /dev/null
+++ b/sdks/react/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/sdks/react/tsup.config.ts b/sdks/react/tsup.config.ts
new file mode 100644
index 0000000..70a8b7e
--- /dev/null
+++ b/sdks/react/tsup.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: ["esm"],
+  dts: true,
+  sourcemap: true,
+  clean: true,
+  target: "es2022",
+});
diff --git a/sdks/typescript/package.json b/sdks/typescript/package.json
index 2df4050..afd0190 100644
--- a/sdks/typescript/package.json
+++ b/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox-agent",
-  "version": "0.2.0",
+  "version": "0.4.2",
   "description": "Universal API for automatic coding agents in sandboxes. Supports Claude Code, Codex, OpenCode, and Amp.",
   "license": "Apache-2.0",
   "repository": {
@@ -14,11 +14,87 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
+    },
+    "./local": {
+      "types": "./dist/providers/local.d.ts",
+      "import": "./dist/providers/local.js"
+    },
+    "./e2b": {
+      "types": "./dist/providers/e2b.d.ts",
+      "import": "./dist/providers/e2b.js"
+    },
+    "./daytona": {
+      "types": "./dist/providers/daytona.d.ts",
+      "import": "./dist/providers/daytona.js"
+    },
+    "./docker": {
+      "types": "./dist/providers/docker.d.ts",
+      "import": "./dist/providers/docker.js"
+    },
+    "./vercel": {
+      "types": "./dist/providers/vercel.d.ts",
+      "import": "./dist/providers/vercel.js"
+    },
+    "./cloudflare": {
+      "types": "./dist/providers/cloudflare.d.ts",
+      "import": "./dist/providers/cloudflare.js"
+    },
+    "./modal": {
+      "types": "./dist/providers/modal.d.ts",
+      "import": "./dist/providers/modal.js"
+    },
+    "./computesdk": {
+      "types": "./dist/providers/computesdk.d.ts",
+      "import": "./dist/providers/computesdk.js"
+    },
+    "./sprites": {
+      "types": "./dist/providers/sprites.d.ts",
+      "import": "./dist/providers/sprites.js"
+    }
+  },
+  "peerDependencies": {
+    "@cloudflare/sandbox": ">=0.1.0",
+    "@daytonaio/sdk": ">=0.12.0",
+    "@e2b/code-interpreter": ">=1.0.0",
+    "@fly/sprites": ">=0.0.1",
+    "@vercel/sandbox": ">=0.1.0",
+    "dockerode": ">=4.0.0",
+    "get-port": ">=7.0.0",
+    "modal": ">=0.1.0",
+    "computesdk": ">=0.1.0"
+  },
+  "peerDependenciesMeta": {
+    "@cloudflare/sandbox": {
+      "optional": true
+    },
+    "@daytonaio/sdk": {
+      "optional": true
+    },
+    "@e2b/code-interpreter": {
+      "optional": true
+    },
+    "@fly/sprites": {
+      "optional": true
+    },
+    "@vercel/sandbox": {
+      "optional": true
+    },
+    "dockerode": {
+      "optional": true
+    },
+    "get-port": {
+      "optional": true
+    },
+    "modal": {
+      "optional": true
+    },
+    "computesdk": {
+      "optional": true
     }
   },
   "dependencies": {
-    "acp-http-client": "workspace:*",
-    "@sandbox-agent/cli-shared": "workspace:*"
+    "@sandbox-agent/cli-shared": "workspace:*",
+    "acp-http-client": "workspace:*"
   },
   "files": [
     "dist"
@@ -27,17 +103,29 @@
     "generate:openapi": "SANDBOX_AGENT_SKIP_INSPECTOR=1 cargo run -p sandbox-agent-openapi-gen -- --out ../../docs/openapi.json",
     "generate:types": "openapi-typescript ../../docs/openapi.json -o src/generated/openapi.ts && node ./scripts/patch-openapi-types.mjs",
     "generate": "pnpm run generate:openapi && pnpm run generate:types",
-    "build": "pnpm --filter acp-http-client build && if [ -z \"$SKIP_OPENAPI_GEN\" ]; then pnpm run generate:openapi; fi && pnpm run generate:types && tsup",
+    "build": "pnpm --filter acp-http-client build && pnpm --filter @sandbox-agent/cli-shared build && if [ -z \"$SKIP_OPENAPI_GEN\" ]; then pnpm run generate:openapi; fi && pnpm run generate:types && tsup",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest"
   },
   "devDependencies": {
+    "@cloudflare/sandbox": ">=0.1.0",
+    "@daytonaio/sdk": ">=0.12.0",
+    "@e2b/code-interpreter": ">=1.0.0",
+    "@fly/sprites": ">=0.0.1",
+    "@types/dockerode": "^4.0.0",
     "@types/node": "^22.0.0",
+    "@types/ws": "^8.18.1",
+    "@vercel/sandbox": ">=0.1.0",
+    "dockerode": ">=4.0.0",
+    "get-port": ">=7.0.0",
+    "modal": ">=0.1.0",
+    "computesdk": ">=0.1.0",
     "openapi-typescript": "^6.7.0",
     "tsup": "^8.0.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^3.0.0",
+    "ws": "^8.19.0"
   },
   "optionalDependencies": {
     "@sandbox-agent/cli": "workspace:*"
diff --git a/sdks/typescript/scripts/patch-openapi-types.mjs b/sdks/typescript/scripts/patch-openapi-types.mjs
index b9e3dbe..d0e663c 100644
--- a/sdks/typescript/scripts/patch-openapi-types.mjs
+++ b/sdks/typescript/scripts/patch-openapi-types.mjs
@@ -5,9 +5,9 @@ const target = resolve(process.cwd(), "src/generated/openapi.ts");
 let source = readFileSync(target, "utf8");
 
 const replacements = [
-  ["components[\"schemas\"][\"McpCommand\"]", "string"],
-  ["components[\"schemas\"][\"McpOAuthConfigOrDisabled\"]", "Record<string, unknown> | null"],
-  ["components[\"schemas\"][\"McpRemoteTransport\"]", "string"],
+  ['components["schemas"]["McpCommand"]', "string"],
+  ['components["schemas"]["McpOAuthConfigOrDisabled"]', "Record<string, unknown> | null"],
+  ['components["schemas"]["McpRemoteTransport"]', "string"],
 ];
 
 for (const [from, to] of replacements) {
diff --git a/sdks/typescript/src/client.ts b/sdks/typescript/src/client.ts
index e724e24..47e6dc3 100644
--- a/sdks/typescript/src/client.ts
+++ b/sdks/typescript/src/client.ts
@@ -1,5 +1,6 @@
 import {
   AcpHttpClient,
+  AcpRpcError,
   PROTOCOL_VERSION,
   type AcpEnvelopeDirection,
   type AnyMessage,
@@ -7,19 +8,60 @@ import {
   type CancelNotification,
   type NewSessionRequest,
   type NewSessionResponse,
+  type PermissionOption,
+  type PermissionOptionKind,
   type PromptRequest,
   type PromptResponse,
+  type RequestPermissionRequest,
+  type RequestPermissionResponse,
+  type SessionConfigOption,
   type SessionNotification,
+  type SessionModeState,
+  type SetSessionConfigOptionResponse,
   type SetSessionConfigOptionRequest,
+  type SetSessionModeResponse,
   type SetSessionModeRequest,
 } from "acp-http-client";
-import type { SandboxAgentSpawnHandle, SandboxAgentSpawnOptions } from "./spawn.ts";
+import type { SandboxProvider } from "./providers/types.ts";
+import { DesktopStreamSession, type DesktopStreamConnectOptions } from "./desktop-stream.ts";
 import {
   type AcpServerListResponse,
   type AgentInfo,
   type AgentInstallRequest,
   type AgentInstallResponse,
   type AgentListResponse,
+  type DesktopActionResponse,
+  type DesktopClipboardQuery,
+  type DesktopClipboardResponse,
+  type DesktopClipboardWriteRequest,
+  type DesktopDisplayInfoResponse,
+  type DesktopKeyboardDownRequest,
+  type DesktopKeyboardPressRequest,
+  type DesktopKeyboardTypeRequest,
+  type DesktopLaunchRequest,
+  type DesktopLaunchResponse,
+  type DesktopMouseClickRequest,
+  type DesktopMouseDownRequest,
+  type DesktopMouseDragRequest,
+  type DesktopMouseMoveRequest,
+  type DesktopMousePositionResponse,
+  type DesktopMouseScrollRequest,
+  type DesktopMouseUpRequest,
+  type DesktopKeyboardUpRequest,
+  type DesktopOpenRequest,
+  type DesktopOpenResponse,
+  type DesktopRecordingInfo,
+  type DesktopRecordingListResponse,
+  type DesktopRecordingStartRequest,
+  type DesktopRegionScreenshotQuery,
+  type DesktopScreenshotQuery,
+  type DesktopStartRequest,
+  type DesktopStatusResponse,
+  type DesktopStreamStatusResponse,
+  type DesktopWindowInfo,
+  type DesktopWindowListResponse,
+  type DesktopWindowMoveRequest,
+  type DesktopWindowResizeRequest,
   type FsActionResponse,
   type FsDeleteQuery,
   type FsEntriesQuery,
@@ -39,44 +81,112 @@ import {
   type McpConfigQuery,
   type McpServerConfig,
   type ProblemDetails,
+  type ProcessConfig,
+  type ProcessCreateRequest,
+  type ProcessInfo,
+  type ProcessInputRequest,
+  type ProcessInputResponse,
+  type ProcessListQuery,
+  type ProcessListResponse,
+  type ProcessOwner,
+  type ProcessLogEntry,
+  type ProcessLogsQuery,
+  type ProcessLogsResponse,
+  type ProcessRunRequest,
+  type ProcessRunResponse,
+  type ProcessSignalQuery,
+  type ProcessTerminalClientFrame,
+  type ProcessTerminalServerFrame,
+  type ProcessTerminalResizeRequest,
+  type ProcessTerminalResizeResponse,
   type SessionEvent,
   type SessionPersistDriver,
   type SessionRecord,
   type SkillsConfig,
   type SkillsConfigQuery,
+  type TerminalErrorStatus,
+  type TerminalExitStatus,
+  type TerminalReadyStatus,
+  type TerminalResizePayload,
 } from "./types.ts";
 
 const API_PREFIX = "/v1";
 const FS_PATH = `${API_PREFIX}/fs`;
+const DEFAULT_BASE_URL = "http://sandbox-agent";
 
 const DEFAULT_REPLAY_MAX_EVENTS = 50;
 const DEFAULT_REPLAY_MAX_CHARS = 12_000;
 const EVENT_INDEX_SCAN_EVENTS_LIMIT = 500;
+const MAX_EVENT_INDEX_INSERT_RETRIES = 3;
+const SESSION_CANCEL_METHOD = "session/cancel";
+const MANUAL_CANCEL_ERROR = "Manual session/cancel calls are not allowed. Use destroySession(sessionId) instead.";
+const HEALTH_WAIT_MIN_DELAY_MS = 500;
+const HEALTH_WAIT_MAX_DELAY_MS = 15_000;
+const HEALTH_WAIT_LOG_AFTER_MS = 5_000;
+const HEALTH_WAIT_LOG_EVERY_MS = 10_000;
+const HEALTH_WAIT_ENSURE_SERVER_AFTER_FAILURES = 3;
 
-export interface SandboxAgentConnectOptions {
-  baseUrl: string;
+export interface SandboxAgentHealthWaitOptions {
+  timeoutMs?: number;
+}
+
+interface SandboxAgentConnectCommonOptions {
+  headers?: HeadersInit;
+  persist?: SessionPersistDriver;
+  replayMaxEvents?: number;
+  replayMaxChars?: number;
+  signal?: AbortSignal;
   token?: string;
+  skipHealthCheck?: boolean;
+  /** @deprecated Use skipHealthCheck instead. */
+  waitForHealth?: boolean | SandboxAgentHealthWaitOptions;
+}
+
+export type SandboxAgentConnectOptions =
+  | (SandboxAgentConnectCommonOptions & {
+      baseUrl: string;
+      fetch?: typeof fetch;
+    })
+  | (SandboxAgentConnectCommonOptions & {
+      fetch: typeof fetch;
+      baseUrl?: string;
+    });
+
+export interface SandboxAgentStartOptions {
+  sandbox: SandboxProvider;
+  sandboxId?: string;
+  skipHealthCheck?: boolean;
   fetch?: typeof fetch;
   headers?: HeadersInit;
   persist?: SessionPersistDriver;
   replayMaxEvents?: number;
   replayMaxChars?: number;
-}
-
-export interface SandboxAgentStartOptions extends Omit<SandboxAgentConnectOptions, "baseUrl" | "token"> {
-  spawn?: SandboxAgentSpawnOptions | boolean;
+  signal?: AbortSignal;
+  token?: string;
 }
 
 export interface SessionCreateRequest {
   id?: string;
   agent: string;
+  /** Shorthand for `sessionInit.cwd`. Ignored when `sessionInit` is provided. */
+  cwd?: string;
+  /** Full session init. When omitted, built from `cwd` (or default) with empty `mcpServers`. */
   sessionInit?: Omit<NewSessionRequest, "_meta">;
+  model?: string;
+  mode?: string;
+  thoughtLevel?: string;
 }
 
 export interface SessionResumeOrCreateRequest {
   id: string;
   agent: string;
+  /** Shorthand for `sessionInit.cwd`. Ignored when `sessionInit` is provided. */
+  cwd?: string;
+  /** Full session init. When omitted, built from `cwd` (or default) with empty `mcpServers`. */
   sessionInit?: Omit<NewSessionRequest, "_meta">;
+  model?: string;
+  mode?: string;
+  thoughtLevel?: string;
 }
 
 export interface SessionSendOptions {
@@ -84,6 +194,49 @@ export interface SessionSendOptions {
 }
 
 export type SessionEventListener = (event: SessionEvent) => void;
+export type PermissionReply = "once" | "always" | "reject";
+export type PermissionRequestListener = (request: SessionPermissionRequest) => void;
+export type ProcessLogListener = (entry: ProcessLogEntry) => void;
+export type ProcessLogFollowQuery = Omit<ProcessLogsQuery, "follow">;
+
+export interface SessionPermissionRequestOption {
+  optionId: string;
+  name: string;
+  kind: PermissionOptionKind;
+}
+
+export interface SessionPermissionRequest {
+  id: string;
+  createdAt: number;
+  sessionId: string;
+  agentSessionId: string;
+  availableReplies: PermissionReply[];
+  options: SessionPermissionRequestOption[];
+  toolCall: RequestPermissionRequest["toolCall"];
+  rawRequest: RequestPermissionRequest;
+}
+
+export interface AgentQueryOptions {
+  config?: boolean;
+  noCache?: boolean;
+}
+
+export interface ProcessLogSubscription {
+  close(): void;
+  closed: Promise<void>;
+}
+
+export interface ProcessTerminalWebSocketUrlOptions {
+  accessToken?: string;
+}
+
+export interface ProcessTerminalConnectOptions extends ProcessTerminalWebSocketUrlOptions {
+  protocols?: string | string[];
+  WebSocket?: typeof WebSocket;
+}
+
+export type ProcessTerminalSessionOptions = ProcessTerminalConnectOptions;
+export type DesktopStreamSessionOptions = DesktopStreamConnectOptions;
 
 export class SandboxAgentError extends Error {
   readonly status: number;
@@ -99,6 +252,80 @@ export class SandboxAgentError extends Error {
   }
 }
 
+export class SandboxDestroyedError extends Error {
+  readonly sandboxId: string;
+  readonly provider: string;
+
+  constructor(sandboxId: string, provider: string, options?: { cause?: unknown }) {
+    super(`Sandbox '${provider}/${sandboxId}' no longer exists and cannot be reconnected.`, options);
+    this.name = "SandboxDestroyedError";
+    this.sandboxId = sandboxId;
+    this.provider = provider;
+  }
+}
+
+export class UnsupportedSessionCategoryError extends Error {
+  readonly sessionId: string;
+  readonly category: string;
+  readonly availableCategories: string[];
+
+  constructor(sessionId: string, category: string, availableCategories: string[]) {
+    super(`Session '${sessionId}' does not support category '${category}'. Available categories: ${availableCategories.join(", ") || "(none)"}`);
+    this.name = "UnsupportedSessionCategoryError";
+    this.sessionId = sessionId;
+    this.category = category;
+    this.availableCategories = availableCategories;
+  }
+}
+
+export class UnsupportedSessionValueError extends Error {
+  readonly sessionId: string;
+  readonly category: string;
+  readonly configId: string;
+  readonly requestedValue: string;
+  readonly allowedValues: string[];
+
+  constructor(sessionId: string, category: string, configId: string, requestedValue: string, allowedValues: string[]) {
+    super(
+      `Session '${sessionId}' does not support value '${requestedValue}' for category '${category}' (configId='${configId}'). Allowed values: ${allowedValues.join(", ") || "(none)"}`,
+    );
+    this.name = "UnsupportedSessionValueError";
+    this.sessionId = sessionId;
+    this.category = category;
+    this.configId = configId;
+    this.requestedValue = requestedValue;
+    this.allowedValues = allowedValues;
+  }
+}
+
+export class UnsupportedSessionConfigOptionError extends Error {
+  readonly sessionId: string;
+  readonly configId: string;
+  readonly availableConfigIds: string[];
+
+  constructor(sessionId: string, configId: string, availableConfigIds: string[]) {
+    super(`Session '${sessionId}' does not expose config option '${configId}'. Available configIds: ${availableConfigIds.join(", ") || "(none)"}`);
+    this.name = "UnsupportedSessionConfigOptionError";
+    this.sessionId = sessionId;
+    this.configId = configId;
+    this.availableConfigIds = availableConfigIds;
+  }
+}
+
+export class UnsupportedPermissionReplyError extends Error {
+  readonly permissionId: string;
+  readonly requestedReply: PermissionReply;
+  readonly availableReplies: PermissionReply[];
+
+  constructor(permissionId: string, requestedReply: PermissionReply, availableReplies: PermissionReply[]) {
+    super(`Permission '${permissionId}' does not support reply '${requestedReply}'. Available replies: ${availableReplies.join(", ") || "(none)"}`);
+    this.name = "UnsupportedPermissionReplyError";
+    this.permissionId = permissionId;
+    this.requestedReply = requestedReply;
+    this.availableReplies = availableReplies;
+  }
+}
+
 export class Session {
   private record: SessionRecord;
   private readonly sandbox: SandboxAgent;
@@ -141,21 +368,65 @@ export class Session {
     return this;
   }
 
-  async send(method: string, params: Record<string, unknown> = {}, options: SessionSendOptions = {}): Promise<unknown> {
-    const updated = await this.sandbox.sendSessionMethod(this.id, method, params, options);
+  async rawSend(method: string, params: Record<string, unknown> = {}, options: SessionSendOptions = {}): Promise<unknown> {
+    const updated = await this.sandbox.rawSendSessionMethod(this.id, method, params, options);
     this.apply(updated.session.toRecord());
     return updated.response;
   }
 
   async prompt(prompt: PromptRequest["prompt"]): Promise<PromptResponse> {
-    const response = await this.send("session/prompt", { prompt });
+    const response = await this.rawSend("session/prompt", { prompt });
     return response as PromptResponse;
   }
 
+  async setMode(modeId: string): Promise<SetSessionModeResponse | void> {
+    const updated = await this.sandbox.setSessionMode(this.id, modeId);
+    this.apply(updated.session.toRecord());
+    return updated.response;
+  }
+
+  async setConfigOption(configId: string, value: string): Promise<SetSessionConfigOptionResponse> {
+    const updated = await this.sandbox.setSessionConfigOption(this.id, configId, value);
+    this.apply(updated.session.toRecord());
+    return updated.response;
+  }
+
+  async setModel(model: string): Promise<SetSessionConfigOptionResponse> {
+    const updated = await this.sandbox.setSessionModel(this.id, model);
+    this.apply(updated.session.toRecord());
+    return updated.response;
+  }
+
+  async setThoughtLevel(thoughtLevel: string): Promise<SetSessionConfigOptionResponse> {
+    const updated = await this.sandbox.setSessionThoughtLevel(this.id, thoughtLevel);
+    this.apply(updated.session.toRecord());
+    return updated.response;
+  }
+
+  async getConfigOptions(): Promise<SessionConfigOption[]> {
+    return this.sandbox.getSessionConfigOptions(this.id);
+  }
+
+  async getModes(): Promise<SessionModeState | null> {
+    return this.sandbox.getSessionModes(this.id);
+  }
+
   onEvent(listener: SessionEventListener): () => void {
     return this.sandbox.onSessionEvent(this.id, listener);
   }
 
+  onPermissionRequest(listener: PermissionRequestListener): () => void {
+    return this.sandbox.onPermissionRequest(this.id, listener);
+  }
+
+  async respondPermission(permissionId: string, reply: PermissionReply): Promise<void> {
+    await this.sandbox.respondPermission(permissionId, reply);
+  }
+
+  async rawRespondPermission(permissionId: string, response: RequestPermissionResponse): Promise<void> {
+    await this.sandbox.rawRespondPermission(permissionId, response);
+  }
+
   toRecord(): SessionRecord {
     return { ...this.record };
   }
@@ -175,6 +446,8 @@ export class LiveAcpConnection {
   private readonly pendingNewSessionLocals: string[] = [];
   private readonly pendingRequestSessionById = new Map<string, string>();
   private readonly pendingReplayByLocalSessionId = new Map<string, string>();
+  private lastAdapterExit: { success: boolean; code: number | null } | null = null;
+  private lastAdapterExitAt = 0;
 
   private readonly onObservedEnvelope: (
     connection: LiveAcpConnection,
@@ -182,22 +455,30 @@ export class LiveAcpConnection {
     direction: AcpEnvelopeDirection,
     localSessionId: string | null,
   ) => void;
+  private readonly onPermissionRequest: (
+    connection: LiveAcpConnection,
+    localSessionId: string,
+    agentSessionId: string,
+    request: RequestPermissionRequest,
+  ) => Promise<RequestPermissionResponse>;
 
   private constructor(
     agent: string,
     connectionId: string,
     acp: AcpHttpClient,
-    onObservedEnvelope: (
+    onObservedEnvelope: (connection: LiveAcpConnection, envelope: AnyMessage, direction: AcpEnvelopeDirection, localSessionId: string | null) => void,
+    onPermissionRequest: (
       connection: LiveAcpConnection,
-      envelope: AnyMessage,
-      direction: AcpEnvelopeDirection,
-      localSessionId: string | null,
-    ) => void,
+      localSessionId: string,
+      agentSessionId: string,
+      request: RequestPermissionRequest,
+    ) => Promise<RequestPermissionResponse>,
   ) {
     this.agent = agent;
     this.connectionId = connectionId;
     this.acp = acp;
     this.onObservedEnvelope = onObservedEnvelope;
+    this.onPermissionRequest = onPermissionRequest;
   }
 
   static async create(options: {
@@ -207,12 +488,13 @@ export class LiveAcpConnection {
     headers?: HeadersInit;
     agent: string;
     serverId: string;
-    onObservedEnvelope: (
+    onObservedEnvelope: (connection: LiveAcpConnection, envelope: AnyMessage, direction: AcpEnvelopeDirection, localSessionId: string | null) => void;
+    onPermissionRequest: (
       connection: LiveAcpConnection,
-      envelope: AnyMessage,
-      direction: AcpEnvelopeDirection,
-      localSessionId: string | null,
-    ) => void;
+      localSessionId: string,
+      agentSessionId: string,
+      request: RequestPermissionRequest,
+    ) => Promise<RequestPermissionResponse>;
   }): Promise<LiveAcpConnection> {
     const connectionId = randomId();
 
@@ -227,9 +509,19 @@ export class LiveAcpConnection {
         bootstrapQuery: { agent: options.agent },
       },
       client: {
+        requestPermission: async (request: RequestPermissionRequest) => {
+          if (!live) {
+            return cancelledPermissionResponse();
+          }
+          return live.handlePermissionRequest(request);
+        },
         sessionUpdate: async (_notification: SessionNotification) => {
           // Session updates are observed via envelope persistence.
         },
+        extNotification: async (method: string, params: Record<string, unknown>) => {
+          if (!live) return;
+          live.handleAdapterNotification(method, params);
+        },
       },
       onEnvelope: (envelope, direction) => {
         if (!live) {
@@ -239,7 +531,7 @@ export class LiveAcpConnection {
       },
     });
 
-    live = new LiveAcpConnection(options.agent, connectionId, acp, options.onObservedEnvelope);
+    live = new LiveAcpConnection(options.agent, connectionId, acp, options.onObservedEnvelope, options.onPermissionRequest);
 
     const initResult = await acp.initialize({
       protocolVersion: PROTOCOL_VERSION,
@@ -282,10 +574,8 @@ export class LiveAcpConnection {
     this.pendingReplayByLocalSessionId.set(localSessionId, replayText);
   }
 
-  async createRemoteSession(
-    localSessionId: string,
-    sessionInit: Omit<NewSessionRequest, "_meta">,
-  ): Promise<NewSessionResponse> {
+  async createRemoteSession(localSessionId: string, sessionInit: Omit<NewSessionRequest, "_meta">): Promise<NewSessionResponse> {
+    const createStartedAt = Date.now();
     this.pendingNewSessionLocals.push(localSessionId);
 
     try {
@@ -297,16 +587,16 @@ export class LiveAcpConnection {
       if (index !== -1) {
         this.pendingNewSessionLocals.splice(index, 1);
       }
+      const adapterExit = this.lastAdapterExit;
+      if (adapterExit && this.lastAdapterExitAt >= createStartedAt) {
+        const suffix = adapterExit.code == null ? "" : ` (code ${adapterExit.code})`;
+        throw new Error(`Agent process exited while creating session${suffix}`);
+      }
       throw error;
     }
   }
 
-  async sendSessionMethod(
-    localSessionId: string,
-    method: string,
-    params: Record<string, unknown>,
-    options: SessionSendOptions,
-  ): Promise<unknown> {
+  async sendSessionMethod(localSessionId: string, method: string, params: Record<string, unknown>, options: SessionSendOptions): Promise<unknown> {
     const agentSessionId = this.sessionByLocalId.get(localSessionId);
     if (!agentSessionId) {
       throw new Error(`session '${localSessionId}' is not bound to live ACP connection '${this.connectionId}'`);
@@ -356,6 +646,27 @@ export class LiveAcpConnection {
     this.onObservedEnvelope(this, envelope, direction, localSessionId);
   }
 
+  private handleAdapterNotification(method: string, params: Record<string, unknown>): void {
+    if (method !== "_adapter/agent_exited") {
+      return;
+    }
+    this.lastAdapterExit = {
+      success: params.success === true,
+      code: typeof params.code === "number" ? params.code : null,
+    };
+    this.lastAdapterExitAt = Date.now();
+  }
+
+  private async handlePermissionRequest(request: RequestPermissionRequest): Promise<RequestPermissionResponse> {
+    const agentSessionId = request.sessionId;
+    const localSessionId = this.localByAgentSessionId.get(agentSessionId);
+    if (!localSessionId) {
+      return cancelledPermissionResponse();
+    }
+
+    return this.onPermissionRequest(this, localSessionId, agentSessionId, clonePermissionRequest(request));
+  }
+
   private resolveSessionId(envelope: AnyMessage, direction: AcpEnvelopeDirection): string | null {
     const id = envelopeId(envelope);
     const method = envelopeMethod(envelope);
@@ -400,79 +711,392 @@ export class LiveAcpConnection {
   }
 }
 
+export class ProcessTerminalSession {
+  readonly socket: WebSocket;
+  readonly closed: Promise<void>;
+
+  private readonly readyListeners = new Set<(status: TerminalReadyStatus) => void>();
+  private readonly dataListeners = new Set<(data: Uint8Array) => void>();
+  private readonly exitListeners = new Set<(status: TerminalExitStatus) => void>();
+  private readonly errorListeners = new Set<(error: TerminalErrorStatus | Error) => void>();
+  private readonly closeListeners = new Set<() => void>();
+
+  private closeSignalSent = false;
+  private closedResolve!: () => void;
+
+  constructor(socket: WebSocket) {
+    this.socket = socket;
+    this.socket.binaryType = "arraybuffer";
+    this.closed = new Promise<void>((resolve) => {
+      this.closedResolve = resolve;
+    });
+
+    this.socket.addEventListener("message", (event) => {
+      void this.handleMessage(event.data);
+    });
+    this.socket.addEventListener("error", () => {
+      this.emitError(new Error("Terminal websocket connection failed."));
+    });
+    this.socket.addEventListener("close", () => {
+      this.closedResolve();
+      for (const listener of this.closeListeners) {
+        listener();
+      }
+    });
+  }
+
+  onReady(listener: (status: TerminalReadyStatus) => void): () => void {
+    this.readyListeners.add(listener);
+    return () => {
+      this.readyListeners.delete(listener);
+    };
+  }
+
+  onData(listener: (data: Uint8Array) => void): () => void {
+    this.dataListeners.add(listener);
+    return () => {
+      this.dataListeners.delete(listener);
+    };
+  }
+
+  onExit(listener: (status: TerminalExitStatus) => void): () => void {
+    this.exitListeners.add(listener);
+    return () => {
+      this.exitListeners.delete(listener);
+    };
+  }
+
+  onError(listener: (error: TerminalErrorStatus | Error) => void): () => void {
+    this.errorListeners.add(listener);
+    return () => {
+      this.errorListeners.delete(listener);
+    };
+  }
+
+  onClose(listener: () => void): () => void {
+    this.closeListeners.add(listener);
+    return () => {
+      this.closeListeners.delete(listener);
+    };
+  }
+
+  sendInput(data: string | ArrayBuffer | ArrayBufferView): void {
+    const payload = encodeTerminalInput(data);
+    this.sendFrame({
+      type: "input",
+      data: payload.data,
+      encoding: payload.encoding,
+    });
+  }
+
+  resize(payload: TerminalResizePayload): void {
+    this.sendFrame({
+      type: "resize",
+      cols: payload.cols,
+      rows: payload.rows,
+    });
+  }
+
+  close(): void {
+    if (this.socket.readyState === WS_READY_STATE_CONNECTING) {
+      this.socket.addEventListener(
+        "open",
+        () => {
+          this.close();
+        },
+        { once: true },
+      );
+      return;
+    }
+
+    if (this.socket.readyState === WS_READY_STATE_OPEN) {
+      if (!this.closeSignalSent) {
+        this.closeSignalSent = true;
+        this.sendFrame({ type: "close" });
+      }
+      this.socket.close();
+      return;
+    }
+
+    if (this.socket.readyState !== WS_READY_STATE_CLOSED) {
+      this.socket.close();
+    }
+  }
+
+  private async handleMessage(data: unknown): Promise<void> {
+    try {
+      if (typeof data === "string") {
+        const frame = parseProcessTerminalServerFrame(data);
+        if (!frame) {
+          this.emitError(new Error("Received invalid terminal control frame."));
+          return;
+        }
+
+        if (frame.type === "ready") {
+          for (const listener of this.readyListeners) {
+            listener(frame);
+          }
+          return;
+        }
+
+        if (frame.type === "exit") {
+          for (const listener of this.exitListeners) {
+            listener(frame);
+          }
+          return;
+        }
+
+        this.emitError(frame);
+        return;
+      }
+
+      const bytes = await decodeTerminalBytes(data);
+      for (const listener of this.dataListeners) {
+        listener(bytes);
+      }
+    } catch (error) {
+      this.emitError(error instanceof Error ? error : new Error(String(error)));
+    }
+  }
+
+  private sendFrame(frame: ProcessTerminalClientFrame): void {
+    if (this.socket.readyState !== WS_READY_STATE_OPEN) {
+      return;
+    }
+
+    this.socket.send(JSON.stringify(frame));
+  }
+
+  private emitError(error: TerminalErrorStatus | Error): void {
+    for (const listener of this.errorListeners) {
+      listener(error);
+    }
+  }
+}
+
+const WS_READY_STATE_CONNECTING = 0;
+const WS_READY_STATE_OPEN = 1;
+const WS_READY_STATE_CLOSED = 3;
+
 export class SandboxAgent {
   private readonly baseUrl: string;
   private readonly token?: string;
   private readonly fetcher: typeof fetch;
   private readonly defaultHeaders?: HeadersInit;
+  private readonly healthWait: NormalizedHealthWaitOptions;
+  private readonly healthWaitAbortController = new AbortController();
+  private sandboxProvider?: SandboxProvider;
+  private sandboxProviderId?: string;
+  private sandboxProviderRawId?: string;
 
   private readonly persist: SessionPersistDriver;
   private readonly replayMaxEvents: number;
   private readonly replayMaxChars: number;
 
-  private spawnHandle?: SandboxAgentSpawnHandle;
+  private healthPromise?: Promise<void>;
+  private healthError?: Error;
+  private disposed = false;
 
   private readonly liveConnections = new Map<string, LiveAcpConnection>();
+  private readonly pendingLiveConnections = new Map<string, Promise<LiveAcpConnection>>();
   private readonly sessionHandles = new Map<string, Session>();
   private readonly eventListeners = new Map<string, Set<SessionEventListener>>();
+  private readonly permissionListeners = new Map<string, Set<PermissionRequestListener>>();
+  private readonly pendingPermissionRequests = new Map<string, PendingPermissionRequestState>();
   private readonly nextSessionEventIndexBySession = new Map<string, number>();
   private readonly seedSessionEventIndexBySession = new Map<string, Promise<void>>();
+  private readonly pendingObservedEnvelopePersistenceBySession = new Map<string, Promise<void>>();
 
   constructor(options: SandboxAgentConnectOptions) {
-    this.baseUrl = options.baseUrl.replace(/\/$/, "");
+    const baseUrl = options.baseUrl?.trim();
+    if (!baseUrl && !options.fetch) {
+      throw new Error("baseUrl is required unless fetch is provided.");
+    }
+    this.baseUrl = (baseUrl || DEFAULT_BASE_URL).replace(/\/$/, "");
     this.token = options.token;
-    this.fetcher = options.fetch ?? globalThis.fetch.bind(globalThis);
+    const resolvedFetch = options.fetch ?? globalThis.fetch?.bind(globalThis);
+    if (!resolvedFetch) {
+      throw new Error("Fetch API is not available; provide a fetch implementation.");
+    }
+    this.fetcher = resolvedFetch;
     this.defaultHeaders = options.headers;
+    this.healthWait = normalizeHealthWaitOptions(options.skipHealthCheck, options.waitForHealth, options.signal);
     this.persist = options.persist ?? new InMemorySessionPersistDriver();
 
     this.replayMaxEvents = normalizePositiveInt(options.replayMaxEvents, DEFAULT_REPLAY_MAX_EVENTS);
     this.replayMaxChars = normalizePositiveInt(options.replayMaxChars, DEFAULT_REPLAY_MAX_CHARS);
 
-    if (!this.fetcher) {
-      throw new Error("Fetch API is not available; provide a fetch implementation.");
-    }
+    this.startHealthWait();
   }
 
   static async connect(options: SandboxAgentConnectOptions): Promise<SandboxAgent> {
     return new SandboxAgent(options);
   }
 
-  static async start(options: SandboxAgentStartOptions = {}): Promise<SandboxAgent> {
-    const spawnOptions = normalizeSpawnOptions(options.spawn, true);
-    if (!spawnOptions.enabled) {
-      throw new Error("SandboxAgent.start requires spawn to be enabled.");
+  static async start(options: SandboxAgentStartOptions): Promise<SandboxAgent> {
+    const provider = options.sandbox;
+    if (!provider.getUrl && !provider.getFetch) {
+      throw new Error(`Sandbox provider '${provider.name}' must implement getUrl() or getFetch().`);
     }
 
-    const { spawnSandboxAgent } = await import("./spawn.js");
-    const handle = await spawnSandboxAgent(spawnOptions, options.fetch ?? globalThis.fetch);
+    const existingSandbox = options.sandboxId ? parseSandboxProviderId(options.sandboxId) : null;
 
-    const client = new SandboxAgent({
-      baseUrl: handle.baseUrl,
-      token: handle.token,
-      fetch: options.fetch,
-      headers: options.headers,
-      persist: options.persist,
-      replayMaxEvents: options.replayMaxEvents,
-      replayMaxChars: options.replayMaxChars,
-    });
+    if (existingSandbox && existingSandbox.provider !== provider.name) {
+      throw new Error(
+        `SandboxAgent.start received sandboxId '${options.sandboxId}' for provider '${existingSandbox.provider}', but the configured provider is '${provider.name}'.`,
+      );
+    }
 
-    client.spawnHandle = handle;
-    return client;
+    const rawSandboxId = existingSandbox?.rawId ?? (await provider.create());
+    const prefixedSandboxId = `${provider.name}/${rawSandboxId}`;
+    const createdSandbox = !existingSandbox;
+
+    if (existingSandbox) {
+      await provider.reconnect?.(rawSandboxId);
+      await provider.ensureServer?.(rawSandboxId);
+    }
+
+    try {
+      const fetcher = await resolveProviderFetch(provider, rawSandboxId);
+      const baseUrl = provider.getUrl ? await provider.getUrl(rawSandboxId) : undefined;
+      const providerFetch = options.fetch ?? fetcher;
+      const commonConnectOptions = {
+        headers: options.headers,
+        persist: options.persist,
+        replayMaxEvents: options.replayMaxEvents,
+        replayMaxChars: options.replayMaxChars,
+        signal: options.signal,
+        skipHealthCheck: options.skipHealthCheck,
+        token: options.token ?? (await resolveProviderToken(provider, rawSandboxId)),
+      };
+
+      const client = providerFetch
+        ? new SandboxAgent({
+            ...commonConnectOptions,
+            baseUrl,
+            fetch: providerFetch,
+          })
+        : new SandboxAgent({
+            ...commonConnectOptions,
+            baseUrl: requireSandboxBaseUrl(baseUrl, provider.name),
+          });
+
+      client.sandboxProvider = provider;
+      client.sandboxProviderId = prefixedSandboxId;
+      client.sandboxProviderRawId = rawSandboxId;
+      return client;
+    } catch (error) {
+      if (createdSandbox) {
+        try {
+          await provider.destroy(rawSandboxId);
+        } catch {
+          // Best-effort cleanup if connect fails after provisioning.
+        }
+      }
+      throw error;
+    }
+  }
+
+  get sandboxId(): string | undefined {
+    return this.sandboxProviderId;
+  }
+
+  get sandbox(): SandboxProvider | undefined {
+    return this.sandboxProvider;
+  }
+
+  get inspectorUrl(): string {
+    return `${this.baseUrl.replace(/\/+$/, "")}/ui/`;
   }
 
   async dispose(): Promise<void> {
+    this.disposed = true;
+    this.healthWaitAbortController.abort(createAbortError("SandboxAgent was disposed."));
+
+    for (const [permissionId, pending] of this.pendingPermissionRequests) {
+      this.pendingPermissionRequests.delete(permissionId);
+      pending.resolve(cancelledPermissionResponse());
+    }
+
     const connections = [...this.liveConnections.values()];
     this.liveConnections.clear();
+    const pending = [...this.pendingLiveConnections.values()];
+    this.pendingLiveConnections.clear();
+    this.pendingObservedEnvelopePersistenceBySession.clear();
+
+    const pendingSettled = await Promise.allSettled(pending);
+    for (const item of pendingSettled) {
+      if (item.status === "fulfilled") {
+        connections.push(item.value);
+      }
+    }
 
     await Promise.all(
       connections.map(async (connection) => {
         await connection.close();
       }),
     );
+  }
 
-    if (this.spawnHandle) {
-      await this.spawnHandle.dispose();
-      this.spawnHandle = undefined;
+  async destroySandbox(): Promise<void> {
+    const provider = this.sandboxProvider;
+    const rawSandboxId = this.sandboxProviderRawId;
+
+    try {
+      if (provider && rawSandboxId) {
+        await provider.destroy(rawSandboxId);
+      } else if (!provider || !rawSandboxId) {
+        throw new Error("SandboxAgent is not attached to a provisioned sandbox.");
+      }
+    } finally {
+      await this.dispose();
+      this.sandboxProvider = undefined;
+      this.sandboxProviderId = undefined;
+      this.sandboxProviderRawId = undefined;
+    }
+  }
+
+  async pauseSandbox(): Promise<void> {
+    const provider = this.sandboxProvider;
+    const rawSandboxId = this.sandboxProviderRawId;
+
+    try {
+      if (provider && rawSandboxId) {
+        if (provider.pause) {
+          await provider.pause(rawSandboxId);
+        } else {
+          await provider.destroy(rawSandboxId);
+        }
+      } else if (!provider || !rawSandboxId) {
+        throw new Error("SandboxAgent is not attached to a provisioned sandbox.");
+      }
+    } finally {
+      await this.dispose();
+      this.sandboxProvider = undefined;
+      this.sandboxProviderId = undefined;
+      this.sandboxProviderRawId = undefined;
+    }
+  }
+
+  async killSandbox(): Promise<void> {
+    const provider = this.sandboxProvider;
+    const rawSandboxId = this.sandboxProviderRawId;
+
+    try {
+      if (provider && rawSandboxId) {
+        if (provider.kill) {
+          await provider.kill(rawSandboxId);
+        } else {
+          await provider.destroy(rawSandboxId);
+        }
+      } else if (!provider || !rawSandboxId) {
+        throw new Error("SandboxAgent is not attached to a provisioned sandbox.");
+      }
+    } finally {
+      await this.dispose();
+      this.sandboxProvider = undefined;
+      this.sandboxProviderId = undefined;
+      this.sandboxProviderRawId = undefined;
     }
   }
 
@@ -503,7 +1127,7 @@ export class SandboxAgent {
 
     const localSessionId = request.id?.trim() || randomId();
     const live = await this.getLiveConnection(request.agent.trim());
-    const sessionInit = normalizeSessionInit(request.sessionInit);
+    const sessionInit = normalizeSessionInit(request.sessionInit, request.cwd, this.sandboxProvider?.defaultCwd);
 
     const response = await live.createRemoteSession(localSessionId, sessionInit);
 
@@ -513,13 +1137,36 @@ export class SandboxAgent {
       agentSessionId: response.sessionId,
       lastConnectionId: live.connectionId,
       createdAt: nowMs(),
+      sandboxId: this.sandboxProviderId,
       sessionInit,
+      configOptions: cloneConfigOptions(response.configOptions),
+      modes: cloneModes(response.modes),
     };
 
     await this.persist.updateSession(record);
-    this.nextSessionEventIndexBySession.set(record.id, 1);
     live.bindSession(record.id, record.agentSessionId);
-    return this.upsertSessionHandle(record);
+    let session = this.upsertSessionHandle(record);
+
+    try {
+      if (request.mode) {
+        session = (await this.setSessionMode(session.id, request.mode)).session;
+      }
+      if (request.model) {
+        session = (await this.setSessionModel(session.id, request.model)).session;
+      }
+      if (request.thoughtLevel) {
+        session = (await this.setSessionThoughtLevel(session.id, request.thoughtLevel)).session;
+      }
+    } catch (err) {
+      try {
+        await this.destroySession(session.id);
+      } catch {
+        // Best-effort cleanup
+      }
+      throw err;
+    }
+
+    return session;
   }
 
   async resumeSession(id: string): Promise<Session> {
@@ -536,13 +1183,15 @@ export class SandboxAgent {
     const replaySource = await this.collectReplayEvents(existing.id, this.replayMaxEvents);
     const replayText = buildReplayText(replaySource, this.replayMaxChars);
 
-    const recreated = await live.createRemoteSession(existing.id, normalizeSessionInit(existing.sessionInit));
+    const recreated = await live.createRemoteSession(existing.id, normalizeSessionInit(existing.sessionInit, undefined, this.sandboxProvider?.defaultCwd));
 
     const updated: SessionRecord = {
       ...existing,
       agentSessionId: recreated.sessionId,
       lastConnectionId: live.connectionId,
       destroyedAt: undefined,
+      configOptions: cloneConfigOptions(recreated.configOptions),
+      modes: cloneModes(recreated.modes),
     };
 
     await this.persist.updateSession(updated);
@@ -555,16 +1204,30 @@ export class SandboxAgent {
   async resumeOrCreateSession(request: SessionResumeOrCreateRequest): Promise<Session> {
     const existing = await this.persist.getSession(request.id);
     if (existing) {
-      return this.resumeSession(existing.id);
+      let session = await this.resumeSession(existing.id);
+      if (request.mode) {
+        session = (await this.setSessionMode(session.id, request.mode)).session;
+      }
+      if (request.model) {
+        session = (await this.setSessionModel(session.id, request.model)).session;
+      }
+      if (request.thoughtLevel) {
+        session = (await this.setSessionThoughtLevel(session.id, request.thoughtLevel)).session;
+      }
+      return session;
     }
     return this.createSession(request);
   }
 
   async destroySession(id: string): Promise<Session> {
-    const existing = await this.persist.getSession(id);
-    if (!existing) {
-      throw new Error(`session '${id}' not found`);
+    this.cancelPendingPermissionsForSession(id);
+
+    try {
+      await this.sendSessionMethodInternal(id, SESSION_CANCEL_METHOD, {}, {}, true);
+    } catch {
+      // Best-effort: agent may already be gone
     }
+    const existing = await this.requireSessionRecord(id);
 
     const updated: SessionRecord = {
       ...existing,
@@ -575,12 +1238,182 @@ export class SandboxAgent {
     return this.upsertSessionHandle(updated);
   }
 
-  async sendSessionMethod(
+  async setSessionMode(sessionId: string, modeId: string): Promise<{ session: Session; response: SetSessionModeResponse | void }> {
+    const mode = modeId.trim();
+    if (!mode) {
+      throw new Error("setSessionMode requires a non-empty modeId");
+    }
+
+    const record = await this.requireSessionRecord(sessionId);
+    const knownModeIds = extractKnownModeIds(record.modes);
+    if (knownModeIds.length > 0 && !knownModeIds.includes(mode)) {
+      throw new UnsupportedSessionValueError(sessionId, "mode", "mode", mode, knownModeIds);
+    }
+
+    try {
+      return (await this.sendSessionMethodInternal(sessionId, "session/set_mode", { modeId: mode }, {}, false)) as {
+        session: Session;
+        response: SetSessionModeResponse | void;
+      };
+    } catch (error) {
+      if (!(error instanceof AcpRpcError) || error.code !== -32601) {
+        throw error;
+      }
+      return this.setSessionCategoryValue(sessionId, "mode", mode);
+    }
+  }
+
+  async setSessionConfigOption(sessionId: string, configId: string, value: string): Promise<{ session: Session; response: SetSessionConfigOptionResponse }> {
+    const resolvedConfigId = configId.trim();
+    if (!resolvedConfigId) {
+      throw new Error("setSessionConfigOption requires a non-empty configId");
+    }
+    const resolvedValue = value.trim();
+    if (!resolvedValue) {
+      throw new Error("setSessionConfigOption requires a non-empty value");
+    }
+
+    const options = await this.getSessionConfigOptions(sessionId);
+    const option = findConfigOptionById(options, resolvedConfigId);
+    if (!option) {
+      throw new UnsupportedSessionConfigOptionError(
+        sessionId,
+        resolvedConfigId,
+        options.map((item) => item.id),
+      );
+    }
+
+    const allowedValues = extractConfigValues(option);
+    if (allowedValues.length > 0 && !allowedValues.includes(resolvedValue)) {
+      throw new UnsupportedSessionValueError(sessionId, option.category ?? "uncategorized", option.id, resolvedValue, allowedValues);
+    }
+
+    return (await this.sendSessionMethodInternal(
+      sessionId,
+      "session/set_config_option",
+      {
+        configId: resolvedConfigId,
+        value: resolvedValue,
+      },
+      {},
+      false,
+    )) as { session: Session; response: SetSessionConfigOptionResponse };
+  }
+
+  async setSessionModel(sessionId: string, model: string): Promise<{ session: Session; response: SetSessionConfigOptionResponse }> {
+    return this.setSessionCategoryValue(sessionId, "model", model);
+  }
+
+  async setSessionThoughtLevel(sessionId: string, thoughtLevel: string): Promise<{ session: Session; response: SetSessionConfigOptionResponse }> {
+    return this.setSessionCategoryValue(sessionId, "thought_level", thoughtLevel);
+  }
+
+  async getSessionConfigOptions(sessionId: string): Promise<SessionConfigOption[]> {
+    const record = await this.requireSessionRecord(sessionId);
+    const hydrated = await this.hydrateSessionConfigOptions(record.id, record);
+    return cloneConfigOptions(hydrated.configOptions) ?? [];
+  }
+
+  async getSessionModes(sessionId: string): Promise<SessionModeState | null> {
+    const record = await this.requireSessionRecord(sessionId);
+    if (record.modes && record.modes.availableModes.length > 0) {
+      return cloneModes(record.modes);
+    }
+
+    const hydrated = await this.hydrateSessionConfigOptions(record.id, record);
+    if (hydrated.modes && hydrated.modes.availableModes.length > 0) {
+      return cloneModes(hydrated.modes);
+    }
+
+    const derived = deriveModesFromConfigOptions(hydrated.configOptions);
+    if (!derived) {
+      return cloneModes(hydrated.modes);
+    }
+
+    const updated: SessionRecord = {
+      ...hydrated,
+      modes: derived,
+    };
+    await this.persist.updateSession(updated);
+    return cloneModes(derived);
+  }
+
+  private async setSessionCategoryValue(
+    sessionId: string,
+    category: string,
+    value: string,
+  ): Promise<{ session: Session; response: SetSessionConfigOptionResponse }> {
+    const resolvedValue = value.trim();
+    if (!resolvedValue) {
+      throw new Error(`setSession${toTitleCase(category)} requires a non-empty value`);
+    }
+
+    const options = await this.getSessionConfigOptions(sessionId);
+    const option = findConfigOptionByCategory(options, category);
+    if (!option) {
+      const categories = uniqueCategories(options);
+      throw new UnsupportedSessionCategoryError(sessionId, category, categories);
+    }
+
+    const allowedValues = extractConfigValues(option);
+    if (allowedValues.length > 0 && !allowedValues.includes(resolvedValue)) {
+      throw new UnsupportedSessionValueError(sessionId, category, option.id, resolvedValue, allowedValues);
+    }
+
+    return this.setSessionConfigOption(sessionId, option.id, resolvedValue);
+  }
+
+  private async hydrateSessionConfigOptions(sessionId: string, snapshot: SessionRecord): Promise<SessionRecord> {
+    if (snapshot.configOptions !== undefined) {
+      return snapshot;
+    }
+
+    const info = await this.getAgent(snapshot.agent, { config: true });
+    let configOptions = normalizeSessionConfigOptions(info.configOptions) ?? [];
+    // Re-read the record from persistence so we merge against the latest
+    // state, not a stale snapshot captured before the network await.
+    const record = await this.persist.getSession(sessionId);
+    if (!record) {
+      return { ...snapshot, configOptions };
+    }
+
+    const currentModeId = record.modes?.currentModeId;
+    if (currentModeId) {
+      const modeOption = findConfigOptionByCategory(configOptions, "mode");
+      if (modeOption) {
+        configOptions = applyConfigOptionValue(configOptions, modeOption.id, currentModeId) ?? configOptions;
+      }
+    }
+
+    const updated: SessionRecord = {
+      ...record,
+      configOptions,
+      modes: deriveModesFromConfigOptions(configOptions) ?? record.modes,
+    };
+    await this.persist.updateSession(updated);
+    return updated;
+  }
+
+  async rawSendSessionMethod(
     sessionId: string,
     method: string,
     params: Record<string, unknown>,
     options: SessionSendOptions = {},
   ): Promise<{ session: Session; response: unknown }> {
+    return this.sendSessionMethodInternal(sessionId, method, params, options, false);
+  }
+
+  private async sendSessionMethodInternal(
+    sessionId: string,
+    method: string,
+    params: Record<string, unknown>,
+    options: SessionSendOptions,
+    allowManagedCancel: boolean,
+  ): Promise<{ session: Session; response: unknown }> {
+    if (method === SESSION_CANCEL_METHOD && !allowManagedCancel) {
+      throw new Error(MANUAL_CANCEL_ERROR);
+    }
+
     const record = await this.persist.getSession(sessionId);
     if (!record) {
       throw new Error(`session '${sessionId}' not found`);
@@ -590,10 +1423,11 @@ export class SandboxAgent {
     if (!live.hasBoundSession(record.id, record.agentSessionId)) {
       // The persisted session points at a stale connection; restore lazily.
       const restored = await this.resumeSession(record.id);
-      return this.sendSessionMethod(restored.id, method, params, options);
+      return this.sendSessionMethodInternal(restored.id, method, params, options, allowManagedCancel);
     }
 
     const response = await live.sendSessionMethod(record.id, method, params, options);
+    await this.persistSessionStateFromMethod(record.id, method, params, response);
     const refreshed = await this.requireSessionRecord(record.id);
     return {
       session: this.upsertSessionHandle(refreshed),
@@ -601,6 +1435,78 @@ export class SandboxAgent {
     };
   }
 
+  private async persistSessionStateFromMethod(sessionId: string, method: string, params: Record<string, unknown>, response: unknown): Promise<void> {
+    // Re-read the record from persistence so we merge against the latest
+    // state, not a stale snapshot captured before the RPC await.
+    const record = await this.persist.getSession(sessionId);
+    if (!record) {
+      return;
+    }
+
+    if (method === "session/set_config_option") {
+      const configId = typeof params.configId === "string" ? params.configId : null;
+      const value = typeof params.value === "string" ? params.value : null;
+      const updates: Partial<SessionRecord> = {};
+
+      const serverConfigOptions = extractConfigOptionsFromSetResponse(response);
+      if (serverConfigOptions) {
+        updates.configOptions = cloneConfigOptions(serverConfigOptions);
+      } else if (record.configOptions && configId && value) {
+        // Server didn't return configOptions — optimistically update the
+        // cached currentValue so subsequent getConfigOptions() reflects the
+        // change without a round-trip.
+        const updated = applyConfigOptionValue(record.configOptions, configId, value);
+        if (updated) {
+          updates.configOptions = updated;
+        }
+      }
+
+      // When a mode-category config option is set via set_config_option
+      // (fallback path from setSessionMode), keep modes.currentModeId in sync.
+      if (configId && value) {
+        const source = updates.configOptions ?? record.configOptions;
+        const option = source ? findConfigOptionById(source, configId) : null;
+        if (option?.category === "mode") {
+          const nextModes = applyCurrentMode(record.modes, value);
+          if (nextModes) {
+            updates.modes = nextModes;
+          }
+        }
+      }
+
+      if (Object.keys(updates).length > 0) {
+        await this.persist.updateSession({ ...record, ...updates });
+      }
+      return;
+    }
+
+    if (method === "session/set_mode") {
+      const modeId = typeof params.modeId === "string" ? params.modeId : null;
+      if (!modeId) {
+        return;
+      }
+      const updates: Partial<SessionRecord> = {};
+      const nextModes = applyCurrentMode(record.modes, modeId);
+      if (nextModes) {
+        updates.modes = nextModes;
+      }
+      // Keep configOptions mode-category currentValue in sync with the new
+      // mode, mirroring the reverse sync in the set_config_option path above.
+      if (record.configOptions) {
+        const modeOption = findConfigOptionByCategory(record.configOptions, "mode");
+        if (modeOption) {
+          const updated = applyConfigOptionValue(record.configOptions, modeOption.id, modeId);
+          if (updated) {
+            updates.configOptions = updated;
+          }
+        }
+      }
+      if (Object.keys(updates).length > 0) {
+        await this.persist.updateSession({ ...record, ...updates });
+      }
+    }
+  }
+
   onSessionEvent(sessionId: string, listener: SessionEventListener): () => void {
     const listeners = this.eventListeners.get(sessionId) ?? new Set<SessionEventListener>();
     listeners.add(listener);
@@ -618,20 +1524,264 @@ export class SandboxAgent {
     };
   }
 
+  onPermissionRequest(sessionId: string, listener: PermissionRequestListener): () => void {
+    const listeners = this.permissionListeners.get(sessionId) ?? new Set<PermissionRequestListener>();
+    listeners.add(listener);
+    this.permissionListeners.set(sessionId, listeners);
+
+    return () => {
+      const set = this.permissionListeners.get(sessionId);
+      if (!set) {
+        return;
+      }
+      set.delete(listener);
+      if (set.size === 0) {
+        this.permissionListeners.delete(sessionId);
+      }
+    };
+  }
+
+  async respondPermission(permissionId: string, reply: PermissionReply): Promise<void> {
+    const pending = this.pendingPermissionRequests.get(permissionId);
+    if (!pending) {
+      throw new Error(`permission '${permissionId}' not found`);
+    }
+
+    let response: RequestPermissionResponse;
+    try {
+      response = permissionReplyToResponse(permissionId, pending.request, reply);
+    } catch (error) {
+      pending.reject(error instanceof Error ? error : new Error(String(error)));
+      this.pendingPermissionRequests.delete(permissionId);
+      throw error;
+    }
+    this.resolvePendingPermission(permissionId, response);
+  }
+
+  async rawRespondPermission(permissionId: string, response: RequestPermissionResponse): Promise<void> {
+    if (!this.pendingPermissionRequests.has(permissionId)) {
+      throw new Error(`permission '${permissionId}' not found`);
+    }
+    this.resolvePendingPermission(permissionId, clonePermissionResponse(response));
+  }
+
   async getHealth(): Promise<HealthResponse> {
-    return this.requestJson("GET", `${API_PREFIX}/health`);
+    return this.requestHealth();
   }
 
-  async listAgents(options?: { config?: boolean }): Promise<AgentListResponse> {
+  async startDesktop(request: DesktopStartRequest = {}): Promise<DesktopStatusResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/start`, {
+      body: request,
+    });
+  }
+
+  async stopDesktop(): Promise<DesktopStatusResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/stop`);
+  }
+
+  async getDesktopStatus(): Promise<DesktopStatusResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/status`);
+  }
+
+  async getDesktopDisplayInfo(): Promise<DesktopDisplayInfoResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/display/info`);
+  }
+
+  async takeDesktopScreenshot(query: DesktopScreenshotQuery = {}): Promise<Uint8Array> {
+    const response = await this.requestRaw("GET", `${API_PREFIX}/desktop/screenshot`, {
+      query,
+      accept: "image/*",
+    });
+    const buffer = await response.arrayBuffer();
+    return new Uint8Array(buffer);
+  }
+
+  async takeDesktopRegionScreenshot(query: DesktopRegionScreenshotQuery): Promise<Uint8Array> {
+    const response = await this.requestRaw("GET", `${API_PREFIX}/desktop/screenshot/region`, {
+      query,
+      accept: "image/*",
+    });
+    const buffer = await response.arrayBuffer();
+    return new Uint8Array(buffer);
+  }
+
+  async getDesktopMousePosition(): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/mouse/position`);
+  }
+
+  async moveDesktopMouse(request: DesktopMouseMoveRequest): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/mouse/move`, {
+      body: request,
+    });
+  }
+
+  async clickDesktop(request: DesktopMouseClickRequest): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/mouse/click`, {
+      body: request,
+    });
+  }
+
+  async mouseDownDesktop(request: DesktopMouseDownRequest): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/mouse/down`, {
+      body: request,
+    });
+  }
+
+  async mouseUpDesktop(request: DesktopMouseUpRequest): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/mouse/up`, {
+      body: request,
+    });
+  }
+
+  async dragDesktopMouse(request: DesktopMouseDragRequest): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/mouse/drag`, {
+      body: request,
+    });
+  }
+
+  async scrollDesktop(request: DesktopMouseScrollRequest): Promise<DesktopMousePositionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/mouse/scroll`, {
+      body: request,
+    });
+  }
+
+  async typeDesktopText(request: DesktopKeyboardTypeRequest): Promise<DesktopActionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/keyboard/type`, {
+      body: request,
+    });
+  }
+
+  async pressDesktopKey(request: DesktopKeyboardPressRequest): Promise<DesktopActionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/keyboard/press`, {
+      body: request,
+    });
+  }
+
+  async keyDownDesktop(request: DesktopKeyboardDownRequest): Promise<DesktopActionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/keyboard/down`, {
+      body: request,
+    });
+  }
+
+  async keyUpDesktop(request: DesktopKeyboardUpRequest): Promise<DesktopActionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/keyboard/up`, {
+      body: request,
+    });
+  }
+
+  async listDesktopWindows(): Promise<DesktopWindowListResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/windows`);
+  }
+
+  async getDesktopFocusedWindow(): Promise<DesktopWindowInfo> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/windows/focused`);
+  }
+
+  async focusDesktopWindow(windowId: string): Promise<DesktopWindowInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/windows/${encodeURIComponent(windowId)}/focus`);
+  }
+
+  async moveDesktopWindow(windowId: string, request: DesktopWindowMoveRequest): Promise<DesktopWindowInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/windows/${encodeURIComponent(windowId)}/move`, {
+      body: request,
+    });
+  }
+
+  async resizeDesktopWindow(windowId: string, request: DesktopWindowResizeRequest): Promise<DesktopWindowInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/windows/${encodeURIComponent(windowId)}/resize`, {
+      body: request,
+    });
+  }
+
+  async getDesktopClipboard(query: DesktopClipboardQuery = {}): Promise<DesktopClipboardResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/clipboard`, {
+      query,
+    });
+  }
+
+  async setDesktopClipboard(request: DesktopClipboardWriteRequest): Promise<DesktopActionResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/clipboard`, {
+      body: request,
+    });
+  }
+
+  async launchDesktopApp(request: DesktopLaunchRequest): Promise<DesktopLaunchResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/launch`, {
+      body: request,
+    });
+  }
+
+  async openDesktopTarget(request: DesktopOpenRequest): Promise<DesktopOpenResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/open`, {
+      body: request,
+    });
+  }
+
+  async getDesktopStreamStatus(): Promise<DesktopStreamStatusResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/stream/status`);
+  }
+
+  async startDesktopRecording(request: DesktopRecordingStartRequest = {}): Promise<DesktopRecordingInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/recording/start`, {
+      body: request,
+    });
+  }
+
+  async stopDesktopRecording(): Promise<DesktopRecordingInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/recording/stop`);
+  }
+
+  async listDesktopRecordings(): Promise<DesktopRecordingListResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/recordings`);
+  }
+
+  async getDesktopRecording(id: string): Promise<DesktopRecordingInfo> {
+    return this.requestJson("GET", `${API_PREFIX}/desktop/recordings/${encodeURIComponent(id)}`);
+  }
+
+  async downloadDesktopRecording(id: string): Promise<Uint8Array> {
+    const response = await this.requestRaw("GET", `${API_PREFIX}/desktop/recordings/${encodeURIComponent(id)}/download`, {
+      accept: "video/mp4",
+    });
+    const buffer = await response.arrayBuffer();
+    return new Uint8Array(buffer);
+  }
+
+  async deleteDesktopRecording(id: string): Promise<void> {
+    await this.requestRaw("DELETE", `${API_PREFIX}/desktop/recordings/${encodeURIComponent(id)}`);
+  }
+
+  async startDesktopStream(): Promise<DesktopStreamStatusResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/stream/start`);
+  }
+
+  async stopDesktopStream(): Promise<DesktopStreamStatusResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/desktop/stream/stop`);
+  }
+
+  async listAgents(options?: AgentQueryOptions): Promise<AgentListResponse> {
     return this.requestJson("GET", `${API_PREFIX}/agents`, {
-      query: options?.config ? { config: "true" } : undefined,
+      query: toAgentQuery(options),
     });
   }
 
-  async getAgent(agent: string, options?: { config?: boolean }): Promise<AgentInfo> {
-    return this.requestJson("GET", `${API_PREFIX}/agents/${encodeURIComponent(agent)}`, {
-      query: options?.config ? { config: "true" } : undefined,
-    });
+  async getAgent(agent: string, options?: AgentQueryOptions): Promise<AgentInfo> {
+    try {
+      return await this.requestJson("GET", `${API_PREFIX}/agents/${encodeURIComponent(agent)}`, {
+        query: toAgentQuery(options),
+      });
+    } catch (error) {
+      if (!(error instanceof SandboxAgentError) || error.status !== 404) {
+        throw error;
+      }
+
+      const listed = await this.listAgents(options);
+      const match = listed.agents.find((entry) => entry.id === agent);
+      if (match) {
+        return match;
+      }
+      throw error;
+    }
   }
 
   async installAgent(agent: string, request: AgentInstallRequest = {}): Promise<AgentInstallResponse> {
@@ -719,27 +1869,194 @@ export class SandboxAgent {
     await this.requestRaw("DELETE", `${API_PREFIX}/config/skills`, { query });
   }
 
+  async getProcessConfig(): Promise<ProcessConfig> {
+    return this.requestJson("GET", `${API_PREFIX}/processes/config`);
+  }
+
+  async setProcessConfig(config: ProcessConfig): Promise<ProcessConfig> {
+    return this.requestJson("POST", `${API_PREFIX}/processes/config`, {
+      body: config,
+    });
+  }
+
+  async createProcess(request: ProcessCreateRequest): Promise<ProcessInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/processes`, {
+      body: request,
+    });
+  }
+
+  async runProcess(request: ProcessRunRequest): Promise<ProcessRunResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/processes/run`, {
+      body: request,
+    });
+  }
+
+  async listProcesses(query?: ProcessListQuery): Promise<ProcessListResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/processes`, {
+      query,
+    });
+  }
+
+  async getProcess(id: string): Promise<ProcessInfo> {
+    return this.requestJson("GET", `${API_PREFIX}/processes/${encodeURIComponent(id)}`);
+  }
+
+  async stopProcess(id: string, query?: ProcessSignalQuery): Promise<ProcessInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/processes/${encodeURIComponent(id)}/stop`, {
+      query,
+    });
+  }
+
+  async killProcess(id: string, query?: ProcessSignalQuery): Promise<ProcessInfo> {
+    return this.requestJson("POST", `${API_PREFIX}/processes/${encodeURIComponent(id)}/kill`, {
+      query,
+    });
+  }
+
+  async deleteProcess(id: string): Promise<void> {
+    await this.requestRaw("DELETE", `${API_PREFIX}/processes/${encodeURIComponent(id)}`);
+  }
+
+  async getProcessLogs(id: string, query: ProcessLogFollowQuery = {}): Promise<ProcessLogsResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/processes/${encodeURIComponent(id)}/logs`, {
+      query,
+    });
+  }
+
+  async followProcessLogs(id: string, listener: ProcessLogListener, query: ProcessLogFollowQuery = {}): Promise<ProcessLogSubscription> {
+    const abortController = new AbortController();
+    const response = await this.requestRaw("GET", `${API_PREFIX}/processes/${encodeURIComponent(id)}/logs`, {
+      query: { ...query, follow: true },
+      accept: "text/event-stream",
+      signal: abortController.signal,
+    });
+
+    if (!response.body) {
+      abortController.abort();
+      throw new Error("SSE stream is not readable in this environment.");
+    }
+
+    const closed = consumeProcessLogSse(response.body, listener, abortController.signal);
+
+    return {
+      close: () => abortController.abort(),
+      closed,
+    };
+  }
+
+  async sendProcessInput(id: string, request: ProcessInputRequest): Promise<ProcessInputResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/processes/${encodeURIComponent(id)}/input`, {
+      body: request,
+    });
+  }
+
+  async resizeProcessTerminal(id: string, request: ProcessTerminalResizeRequest): Promise<ProcessTerminalResizeResponse> {
+    return this.requestJson("POST", `${API_PREFIX}/processes/${encodeURIComponent(id)}/terminal/resize`, {
+      body: request,
+    });
+  }
+
+  buildProcessTerminalWebSocketUrl(id: string, options: ProcessTerminalWebSocketUrlOptions = {}): string {
+    return toWebSocketUrl(
+      this.buildUrl(`${API_PREFIX}/processes/${encodeURIComponent(id)}/terminal/ws`, {
+        access_token: options.accessToken ?? this.token,
+      }),
+    );
+  }
+
+  connectProcessTerminalWebSocket(id: string, options: ProcessTerminalConnectOptions = {}): WebSocket {
+    const WebSocketCtor = options.WebSocket ?? globalThis.WebSocket;
+    if (!WebSocketCtor) {
+      throw new Error("WebSocket API is not available; provide a WebSocket implementation.");
+    }
+
+    return new WebSocketCtor(
+      this.buildProcessTerminalWebSocketUrl(id, {
+        accessToken: options.accessToken,
+      }),
+      options.protocols,
+    );
+  }
+
+  connectProcessTerminal(id: string, options: ProcessTerminalSessionOptions = {}): ProcessTerminalSession {
+    return new ProcessTerminalSession(this.connectProcessTerminalWebSocket(id, options));
+  }
+
+  buildDesktopStreamWebSocketUrl(options: ProcessTerminalWebSocketUrlOptions = {}): string {
+    return toWebSocketUrl(
+      this.buildUrl(`${API_PREFIX}/desktop/stream/signaling`, {
+        access_token: options.accessToken ?? this.token,
+      }),
+    );
+  }
+
+  connectDesktopStreamWebSocket(options: DesktopStreamConnectOptions = {}): WebSocket {
+    const WebSocketCtor = options.WebSocket ?? globalThis.WebSocket;
+    if (!WebSocketCtor) {
+      throw new Error("WebSocket API is not available; provide a WebSocket implementation.");
+    }
+
+    return new WebSocketCtor(
+      this.buildDesktopStreamWebSocketUrl({
+        accessToken: options.accessToken,
+      }),
+      options.protocols,
+    );
+  }
+
+  connectDesktopStream(options: DesktopStreamSessionOptions = {}): DesktopStreamSession {
+    return new DesktopStreamSession(this.connectDesktopStreamWebSocket(options));
+  }
+
   private async getLiveConnection(agent: string): Promise<LiveAcpConnection> {
+    await this.awaitHealthy();
+
     const existing = this.liveConnections.get(agent);
     if (existing) {
       return existing;
     }
 
-    const serverId = `sdk-${agent}-${randomId()}`;
-    const created = await LiveAcpConnection.create({
-      baseUrl: this.baseUrl,
-      token: this.token,
-      fetcher: this.fetcher,
-      headers: this.defaultHeaders,
-      agent,
-      serverId,
-      onObservedEnvelope: (connection, envelope, direction, localSessionId) => {
-        void this.persistObservedEnvelope(connection, envelope, direction, localSessionId);
-      },
-    });
+    const pending = this.pendingLiveConnections.get(agent);
+    if (pending) {
+      return pending;
+    }
 
-    this.liveConnections.set(agent, created);
-    return created;
+    const creating = (async () => {
+      const serverId = `sdk-${agent}-${randomId()}`;
+      const created = await LiveAcpConnection.create({
+        baseUrl: this.baseUrl,
+        token: this.token,
+        fetcher: this.fetcher,
+        headers: this.defaultHeaders,
+        agent,
+        serverId,
+        onObservedEnvelope: (connection, envelope, direction, localSessionId) => {
+          void this.enqueueObservedEnvelopePersistence(connection, envelope, direction, localSessionId).catch((error) => {
+            console.error("Failed to persist observed sandbox-agent envelope", error);
+          });
+        },
+        onPermissionRequest: async (connection, localSessionId, agentSessionId, request) =>
+          this.enqueuePermissionRequest(connection, localSessionId, agentSessionId, request),
+      });
+
+      const raced = this.liveConnections.get(agent);
+      if (raced) {
+        await created.close();
+        return raced;
+      }
+
+      this.liveConnections.set(agent, created);
+      return created;
+    })();
+
+    this.pendingLiveConnections.set(agent, creating);
+    try {
+      return await creating;
+    } finally {
+      if (this.pendingLiveConnections.get(agent) === creating) {
+        this.pendingLiveConnections.delete(agent);
+      }
+    }
   }
 
   private async persistObservedEnvelope(
@@ -752,17 +2069,33 @@ export class SandboxAgent {
       return;
     }
 
-    const event: SessionEvent = {
-      id: randomId(),
-      eventIndex: await this.allocateSessionEventIndex(localSessionId),
-      sessionId: localSessionId,
-      createdAt: nowMs(),
-      connectionId: connection.connectionId,
-      sender: direction === "outbound" ? "client" : "agent",
-      payload: cloneEnvelope(envelope),
-    };
+    let event: SessionEvent | null = null;
+    for (let attempt = 0; attempt < MAX_EVENT_INDEX_INSERT_RETRIES; attempt += 1) {
+      event = {
+        id: randomId(),
+        eventIndex: await this.allocateSessionEventIndex(localSessionId),
+        sessionId: localSessionId,
+        createdAt: nowMs(),
+        connectionId: connection.connectionId,
+        sender: direction === "outbound" ? "client" : "agent",
+        payload: cloneEnvelope(envelope),
+      };
 
-    await this.persist.insertEvent(event);
+      try {
+        await this.persist.insertEvent(localSessionId, event);
+        break;
+      } catch (error) {
+        if (!isSessionEventIndexConflict(error) || attempt === MAX_EVENT_INDEX_INSERT_RETRIES - 1) {
+          throw error;
+        }
+      }
+    }
+
+    if (!event) {
+      return;
+    }
+
+    await this.persistSessionStateFromEvent(localSessionId, envelope, direction);
 
     const listeners = this.eventListeners.get(localSessionId);
     if (!listeners || listeners.size === 0) {
@@ -774,6 +2107,80 @@ export class SandboxAgent {
     }
   }
 
+  private async enqueueObservedEnvelopePersistence(
+    connection: LiveAcpConnection,
+    envelope: AnyMessage,
+    direction: AcpEnvelopeDirection,
+    localSessionId: string | null,
+  ): Promise<void> {
+    if (!localSessionId) {
+      return;
+    }
+
+    const previous = this.pendingObservedEnvelopePersistenceBySession.get(localSessionId) ?? Promise.resolve();
+    const current = previous
+      .catch(() => {
+        // Keep later envelope persistence moving even if an earlier write failed.
+      })
+      .then(() => this.persistObservedEnvelope(connection, envelope, direction, localSessionId));
+
+    this.pendingObservedEnvelopePersistenceBySession.set(localSessionId, current);
+
+    try {
+      await current;
+    } finally {
+      if (this.pendingObservedEnvelopePersistenceBySession.get(localSessionId) === current) {
+        this.pendingObservedEnvelopePersistenceBySession.delete(localSessionId);
+      }
+    }
+  }
+
+  private async persistSessionStateFromEvent(sessionId: string, envelope: AnyMessage, direction: AcpEnvelopeDirection): Promise<void> {
+    if (direction !== "inbound") {
+      return;
+    }
+
+    if (envelopeMethod(envelope) !== "session/update") {
+      return;
+    }
+
+    const update = envelopeSessionUpdate(envelope);
+    if (!update || typeof update.sessionUpdate !== "string") {
+      return;
+    }
+
+    const record = await this.persist.getSession(sessionId);
+    if (!record) {
+      return;
+    }
+
+    if (update.sessionUpdate === "config_option_update") {
+      const configOptions = normalizeSessionConfigOptions(update.configOptions);
+      if (configOptions) {
+        await this.persist.updateSession({
+          ...record,
+          configOptions,
+        });
+      }
+      return;
+    }
+
+    if (update.sessionUpdate === "current_mode_update") {
+      const modeId = typeof update.currentModeId === "string" ? update.currentModeId : null;
+      if (!modeId) {
+        return;
+      }
+      const nextModes = applyCurrentMode(record.modes, modeId);
+      if (!nextModes) {
+        return;
+      }
+      await this.persist.updateSession({
+        ...record,
+        modes: nextModes,
+      });
+    }
+  }
+
   private async allocateSessionEventIndex(sessionId: string): Promise<number> {
     await this.ensureSessionEventIndexSeeded(sessionId);
     const nextIndex = this.nextSessionEventIndexBySession.get(sessionId) ?? 1;
@@ -871,6 +2278,69 @@ export class SandboxAgent {
     return record;
   }
 
+  private async enqueuePermissionRequest(
+    _connection: LiveAcpConnection,
+    localSessionId: string,
+    agentSessionId: string,
+    request: RequestPermissionRequest,
+  ): Promise<RequestPermissionResponse> {
+    const listeners = this.permissionListeners.get(localSessionId);
+    if (!listeners || listeners.size === 0) {
+      return cancelledPermissionResponse();
+    }
+
+    const pendingId = randomId();
+    const permissionRequest: SessionPermissionRequest = {
+      id: pendingId,
+      createdAt: nowMs(),
+      sessionId: localSessionId,
+      agentSessionId,
+      availableReplies: availablePermissionReplies(request.options),
+      options: request.options.map(clonePermissionOption),
+      toolCall: clonePermissionToolCall(request.toolCall),
+      rawRequest: clonePermissionRequest(request),
+    };
+
+    return await new Promise<RequestPermissionResponse>((resolve, reject) => {
+      this.pendingPermissionRequests.set(pendingId, {
+        id: pendingId,
+        sessionId: localSessionId,
+        request: clonePermissionRequest(request),
+        resolve,
+        reject,
+      });
+
+      try {
+        for (const listener of listeners) {
+          listener(permissionRequest);
+        }
+      } catch (error) {
+        this.pendingPermissionRequests.delete(pendingId);
+        reject(error);
+      }
+    });
+  }
+
+  private resolvePendingPermission(permissionId: string, response: RequestPermissionResponse): void {
+    const pending = this.pendingPermissionRequests.get(permissionId);
+    if (!pending) {
+      throw new Error(`permission '${permissionId}' not found`);
+    }
+
+    this.pendingPermissionRequests.delete(permissionId);
+    pending.resolve(response);
+  }
+
+  private cancelPendingPermissionsForSession(sessionId: string): void {
+    for (const [permissionId, pending] of this.pendingPermissionRequests) {
+      if (pending.sessionId !== sessionId) {
+        continue;
+      }
+      this.pendingPermissionRequests.delete(permissionId);
+      pending.resolve(cancelledPermissionResponse());
+    }
+  }
+
   private async requestJson<T>(method: string, path: string, options: RequestOptions = {}): Promise<T> {
     const response = await this.requestRaw(method, path, {
       query: options.query,
@@ -878,6 +2348,7 @@ export class SandboxAgent {
       headers: options.headers,
       accept: options.accept ?? "application/json",
       signal: options.signal,
+      skipReadyWait: options.skipReadyWait,
     });
 
     if (response.status === 204) {
@@ -888,6 +2359,10 @@ export class SandboxAgent {
   }
 
   private async requestRaw(method: string, path: string, options: RequestOptions = {}): Promise<Response> {
+    if (!options.skipReadyWait) {
+      await this.awaitHealthy(options.signal);
+    }
+
     const url = this.buildUrl(path, options.query);
     const headers = this.buildHeaders(options.headers);
 
@@ -924,6 +2399,84 @@ export class SandboxAgent {
     return response;
   }
 
+  private startHealthWait(): void {
+    if (!this.healthWait.enabled || this.healthPromise) {
+      return;
+    }
+
+    this.healthPromise = this.runHealthWait().catch((error) => {
+      this.healthError = error instanceof Error ? error : new Error(String(error));
+    });
+  }
+
+  private async awaitHealthy(signal?: AbortSignal): Promise<void> {
+    if (!this.healthPromise) {
+      throwIfAborted(signal);
+      return;
+    }
+
+    await waitForAbortable(this.healthPromise, signal);
+    throwIfAborted(signal);
+    if (this.healthError) {
+      throw this.healthError;
+    }
+  }
+
+  private async runHealthWait(): Promise<void> {
+    const signal = this.healthWait.enabled ? anyAbortSignal([this.healthWait.signal, this.healthWaitAbortController.signal]) : undefined;
+    const startedAt = Date.now();
+    const deadline = typeof this.healthWait.timeoutMs === "number" ? startedAt + this.healthWait.timeoutMs : undefined;
+
+    let delayMs = HEALTH_WAIT_MIN_DELAY_MS;
+    let nextLogAt = startedAt + HEALTH_WAIT_LOG_AFTER_MS;
+    let lastError: unknown;
+    let consecutiveFailures = 0;
+
+    while (!this.disposed && (deadline === undefined || Date.now() < deadline)) {
+      throwIfAborted(signal);
+
+      try {
+        const health = await this.requestHealth({ signal });
+        if (health.status === "ok") {
+          return;
+        }
+        lastError = new Error(`Unexpected health response: ${JSON.stringify(health)}`);
+        consecutiveFailures++;
+      } catch (error) {
+        if (isAbortError(error)) {
+          throw error;
+        }
+        lastError = error;
+        consecutiveFailures++;
+      }
+
+      if (consecutiveFailures >= HEALTH_WAIT_ENSURE_SERVER_AFTER_FAILURES && this.sandboxProvider?.ensureServer && this.sandboxProviderRawId) {
+        try {
+          await this.sandboxProvider.ensureServer(this.sandboxProviderRawId);
+        } catch {
+          // Best-effort; the next health check will determine if it worked.
+        }
+        consecutiveFailures = 0;
+      }
+
+      const now = Date.now();
+      if (now >= nextLogAt) {
+        const details = formatHealthWaitError(lastError);
+        console.warn(`sandbox-agent at ${this.baseUrl} is not healthy after ${now - startedAt}ms; still waiting (${details})`);
+        nextLogAt = now + HEALTH_WAIT_LOG_EVERY_MS;
+      }
+
+      await sleep(delayMs, signal);
+      delayMs = Math.min(HEALTH_WAIT_MAX_DELAY_MS, delayMs * 2);
+    }
+
+    if (this.disposed) {
+      return;
+    }
+
+    throw new Error(`Timed out waiting for sandbox-agent health after ${this.healthWait.timeoutMs}ms (${formatHealthWaitError(lastError)})`);
+  }
+
   private buildHeaders(extra?: HeadersInit): Headers {
     const headers = new Headers(this.defaultHeaders ?? undefined);
 
@@ -953,8 +2506,31 @@ export class SandboxAgent {
 
     return url.toString();
   }
+
+  private async requestHealth(options: { signal?: AbortSignal } = {}): Promise<HealthResponse> {
+    return this.requestJson("GET", `${API_PREFIX}/health`, {
+      signal: options.signal,
+      skipReadyWait: true,
+    });
+  }
 }
 
+function isSessionEventIndexConflict(error: unknown): boolean {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+
+  return /UNIQUE constraint failed: .*session_id, .*event_index/.test(error.message);
+}
+
+type PendingPermissionRequestState = {
+  id: string;
+  sessionId: string;
+  request: RequestPermissionRequest;
+  resolve: (response: RequestPermissionResponse) => void;
+  reject: (reason?: unknown) => void;
+};
+
 type QueryValue = string | number | boolean | null | undefined;
 
 type RequestOptions = {
@@ -965,8 +2541,89 @@ type RequestOptions = {
   headers?: HeadersInit;
   accept?: string;
   signal?: AbortSignal;
+  skipReadyWait?: boolean;
 };
 
+type NormalizedHealthWaitOptions = { enabled: false; timeoutMs?: undefined; signal?: undefined } | { enabled: true; timeoutMs?: number; signal?: AbortSignal };
+
+function parseProcessTerminalServerFrame(payload: string): ProcessTerminalServerFrame | null {
+  try {
+    const parsed = JSON.parse(payload) as unknown;
+    if (!isRecord(parsed) || typeof parsed.type !== "string") {
+      return null;
+    }
+
+    if (parsed.type === "ready" && typeof parsed.processId === "string") {
+      return parsed as ProcessTerminalServerFrame;
+    }
+
+    if (parsed.type === "exit" && (parsed.exitCode === undefined || parsed.exitCode === null || typeof parsed.exitCode === "number")) {
+      return parsed as ProcessTerminalServerFrame;
+    }
+
+    if (parsed.type === "error" && typeof parsed.message === "string") {
+      return parsed as ProcessTerminalServerFrame;
+    }
+  } catch {
+    return null;
+  }
+
+  return null;
+}
+
+function encodeTerminalInput(data: string | ArrayBuffer | ArrayBufferView): { data: string; encoding?: "base64" } {
+  if (typeof data === "string") {
+    return { data };
+  }
+
+  const bytes = encodeTerminalBytes(data);
+  return {
+    data: bytesToBase64(bytes),
+    encoding: "base64",
+  };
+}
+
+function encodeTerminalBytes(data: ArrayBuffer | ArrayBufferView): Uint8Array {
+  if (data instanceof ArrayBuffer) {
+    return new Uint8Array(data);
+  }
+
+  return new Uint8Array(data.buffer, data.byteOffset, data.byteLength).slice();
+}
+
+async function decodeTerminalBytes(data: unknown): Promise<Uint8Array> {
+  if (data instanceof ArrayBuffer) {
+    return new Uint8Array(data);
+  }
+
+  if (ArrayBuffer.isView(data)) {
+    return new Uint8Array(data.buffer, data.byteOffset, data.byteLength).slice();
+  }
+
+  if (typeof Blob !== "undefined" && data instanceof Blob) {
+    return new Uint8Array(await data.arrayBuffer());
+  }
+
+  throw new Error(`Unsupported terminal frame payload: ${String(data)}`);
+}
+
+function bytesToBase64(bytes: Uint8Array): string {
+  if (typeof Buffer !== "undefined") {
+    return Buffer.from(bytes).toString("base64");
+  }
+
+  if (typeof btoa === "function") {
+    let binary = "";
+    const chunkSize = 0x8000;
+    for (let index = 0; index < bytes.length; index += chunkSize) {
+      binary += String.fromCharCode(...bytes.subarray(index, index + chunkSize));
+    }
+    return btoa(binary);
+  }
+
+  throw new Error("Base64 encoding is not available in this environment.");
+}
+
 /**
  * Auto-select and call `authenticate` based on the agent's advertised auth methods.
  * Prefers env-var-based methods that the server process already has configured.
@@ -975,12 +2632,7 @@ async function autoAuthenticate(acp: AcpHttpClient, methods: AuthMethod[]): Prom
   // Only attempt env-var-based methods that the server process can satisfy
   // automatically.  Interactive methods (e.g. "claude-login") cannot be
   // fulfilled programmatically and must be skipped.
-  const envBased = methods.find(
-    (m) =>
-      m.id === "codex-api-key" ||
-      m.id === "openai-api-key" ||
-      m.id === "anthropic-api-key",
-  );
+  const envBased = methods.find((m) => m.id === "codex-api-key" || m.id === "openai-api-key" || m.id === "anthropic-api-key");
 
   if (!envBased) {
     return;
@@ -994,19 +2646,32 @@ async function autoAuthenticate(acp: AcpHttpClient, methods: AuthMethod[]): Prom
   }
 }
 
+function toAgentQuery(options: AgentQueryOptions | undefined): Record<string, QueryValue> | undefined {
+  if (!options) {
+    return undefined;
+  }
+
+  return {
+    config: options.config,
+    no_cache: options.noCache,
+  };
+}
+
 function normalizeSessionInit(
   value: Omit<NewSessionRequest, "_meta"> | undefined,
+  cwdShorthand?: string,
+  providerDefaultCwd?: string,
 ): Omit<NewSessionRequest, "_meta"> {
   if (!value) {
     return {
-      cwd: defaultCwd(),
+      cwd: cwdShorthand ?? providerDefaultCwd ?? defaultCwd(),
       mcpServers: [],
     };
   }
 
   return {
     ...value,
-    cwd: value.cwd ?? defaultCwd(),
+    cwd: value.cwd ?? cwdShorthand ?? providerDefaultCwd ?? defaultCwd(),
     mcpServers: value.mcpServers ?? [],
   };
 }
@@ -1032,8 +2697,7 @@ function buildReplayText(events: SessionEvent[], maxChars: number): string | nul
     return null;
   }
 
-  const prefix =
-    "Previous session history is replayed below as JSON-RPC envelopes. Use it as context before responding to the latest user prompt.\n";
+  const prefix = "Previous session history is replayed below as JSON-RPC envelopes. Use it as context before responding to the latest user prompt.\n";
   let text = prefix;
 
   for (const event of events) {
@@ -1098,6 +2762,26 @@ function cloneEnvelope(envelope: AnyMessage): AnyMessage {
   return JSON.parse(JSON.stringify(envelope)) as AnyMessage;
 }
 
+function clonePermissionRequest(request: RequestPermissionRequest): RequestPermissionRequest {
+  return JSON.parse(JSON.stringify(request)) as RequestPermissionRequest;
+}
+
+function clonePermissionResponse(response: RequestPermissionResponse): RequestPermissionResponse {
+  return JSON.parse(JSON.stringify(response)) as RequestPermissionResponse;
+}
+
+function clonePermissionOption(option: PermissionOption): SessionPermissionRequestOption {
+  return {
+    optionId: option.optionId,
+    name: option.name,
+    kind: option.kind,
+  };
+}
+
+function clonePermissionToolCall(toolCall: RequestPermissionRequest["toolCall"]): RequestPermissionRequest["toolCall"] {
+  return JSON.parse(JSON.stringify(toolCall)) as RequestPermissionRequest["toolCall"];
+}
+
 function isRecord(value: unknown): value is Record<string, any> {
   return typeof value === "object" && value !== null;
 }
@@ -1127,24 +2811,72 @@ function normalizePositiveInt(value: number | undefined, fallback: number): numb
   return Math.floor(value as number);
 }
 
-function normalizeSpawnOptions(
-  spawn: SandboxAgentSpawnOptions | boolean | undefined,
-  defaultEnabled: boolean,
-): SandboxAgentSpawnOptions & { enabled: boolean } {
-  if (spawn === false) {
+function normalizeHealthWaitOptions(
+  skipHealthCheck: boolean | undefined,
+  waitForHealth: boolean | SandboxAgentHealthWaitOptions | undefined,
+  signal: AbortSignal | undefined,
+): NormalizedHealthWaitOptions {
+  if (skipHealthCheck === true || waitForHealth === false) {
     return { enabled: false };
   }
 
-  if (spawn === true || spawn === undefined) {
-    return { enabled: defaultEnabled };
+  if (waitForHealth === true || waitForHealth === undefined) {
+    return { enabled: true, signal };
+  }
+
+  const timeoutMs =
+    typeof waitForHealth.timeoutMs === "number" && Number.isFinite(waitForHealth.timeoutMs) && waitForHealth.timeoutMs > 0
+      ? Math.floor(waitForHealth.timeoutMs)
+      : undefined;
+
+  return {
+    enabled: true,
+    signal,
+    timeoutMs,
+  };
+}
+
+function parseSandboxProviderId(sandboxId: string): { provider: string; rawId: string } {
+  const slashIndex = sandboxId.indexOf("/");
+  if (slashIndex < 1 || slashIndex === sandboxId.length - 1) {
+    throw new Error(`Sandbox IDs must be prefixed as "{provider}/{id}". Received '${sandboxId}'.`);
   }
 
   return {
-    ...spawn,
-    enabled: spawn.enabled ?? defaultEnabled,
+    provider: sandboxId.slice(0, slashIndex),
+    rawId: sandboxId.slice(slashIndex + 1),
   };
 }
 
+function requireSandboxBaseUrl(baseUrl: string | undefined, providerName: string): string {
+  if (!baseUrl) {
+    throw new Error(`Sandbox provider '${providerName}' did not return a base URL.`);
+  }
+  return baseUrl;
+}
+
+async function resolveProviderFetch(provider: SandboxProvider, rawSandboxId: string): Promise<typeof globalThis.fetch | undefined> {
+  if (provider.getFetch) {
+    return await provider.getFetch(rawSandboxId);
+  }
+
+  return undefined;
+}
+
+async function resolveProviderToken(provider: SandboxProvider, rawSandboxId: string): Promise<string | undefined> {
+  const maybeGetToken = (
+    provider as SandboxProvider & {
+      getToken?: (sandboxId: string) => string | undefined | Promise<string | undefined>;
+    }
+  ).getToken;
+  if (typeof maybeGetToken !== "function") {
+    return undefined;
+  }
+
+  const token = await maybeGetToken.call(provider, rawSandboxId);
+  return typeof token === "string" && token ? token : undefined;
+}
+
 async function readProblem(response: Response): Promise<ProblemDetails | undefined> {
   try {
     const text = await response.clone().text();
@@ -1156,3 +2888,419 @@ async function readProblem(response: Response): Promise<ProblemDetails | undefin
     return undefined;
   }
 }
+
+function normalizeSessionConfigOptions(value: unknown): SessionConfigOption[] | undefined {
+  if (!Array.isArray(value)) {
+    return undefined;
+  }
+  const normalized = value.filter(isSessionConfigOption) as SessionConfigOption[];
+  return cloneConfigOptions(normalized) ?? [];
+}
+
+function extractConfigOptionsFromSetResponse(response: unknown): SessionConfigOption[] | undefined {
+  if (!isRecord(response)) {
+    return undefined;
+  }
+  return normalizeSessionConfigOptions(response.configOptions);
+}
+
+function findConfigOptionByCategory(options: SessionConfigOption[], category: string): SessionConfigOption | undefined {
+  return options.find((option) => option.category === category);
+}
+
+function findConfigOptionById(options: SessionConfigOption[], configId: string): SessionConfigOption | undefined {
+  return options.find((option) => option.id === configId);
+}
+
+function uniqueCategories(options: SessionConfigOption[]): string[] {
+  return [...new Set(options.map((option) => option.category).filter((value): value is string => !!value))].sort();
+}
+
+function extractConfigValues(option: SessionConfigOption): string[] {
+  if (!isRecord(option) || option.type !== "select" || !Array.isArray(option.options)) {
+    return [];
+  }
+
+  const values: string[] = [];
+  for (const entry of option.options as unknown[]) {
+    if (isRecord(entry) && typeof entry.value === "string") {
+      values.push(entry.value);
+      continue;
+    }
+    if (isRecord(entry) && Array.isArray(entry.options)) {
+      for (const nested of entry.options) {
+        if (isRecord(nested) && typeof nested.value === "string") {
+          values.push(nested.value);
+        }
+      }
+    }
+  }
+
+  return [...new Set(values)];
+}
+
+function extractKnownModeIds(modes: SessionModeState | null | undefined): string[] {
+  if (!modes || !Array.isArray(modes.availableModes)) {
+    return [];
+  }
+  return modes.availableModes.map((mode) => (typeof mode.id === "string" ? mode.id : null)).filter((value): value is string => !!value);
+}
+
+function deriveModesFromConfigOptions(configOptions: SessionConfigOption[] | undefined): SessionModeState | null {
+  if (!configOptions || configOptions.length === 0) {
+    return null;
+  }
+
+  const modeOption = findConfigOptionByCategory(configOptions, "mode");
+  if (!modeOption || modeOption.type !== "select" || !Array.isArray(modeOption.options)) {
+    return null;
+  }
+
+  const availableModes = modeOption.options
+    .flatMap((entry: unknown) => flattenConfigOptions(entry))
+    .map((entry: { value: string; name: string; description?: string }) => ({
+      id: entry.value,
+      name: entry.name,
+      description: entry.description ?? null,
+    }));
+
+  return {
+    currentModeId: typeof modeOption.currentValue === "string" && modeOption.currentValue.length > 0 ? modeOption.currentValue : (availableModes[0]?.id ?? ""),
+    availableModes,
+  };
+}
+
+function applyCurrentMode(modes: SessionModeState | null | undefined, currentModeId: string): SessionModeState | null {
+  if (modes && Array.isArray(modes.availableModes)) {
+    return {
+      ...modes,
+      currentModeId,
+    };
+  }
+  return {
+    currentModeId,
+    availableModes: [],
+  };
+}
+
+function applyConfigOptionValue(configOptions: SessionConfigOption[], configId: string, value: string): SessionConfigOption[] | null {
+  const idx = configOptions.findIndex((o) => o.id === configId);
+  if (idx === -1) {
+    return null;
+  }
+  const updated = cloneConfigOptions(configOptions) ?? [];
+  updated[idx] = { ...updated[idx]!, currentValue: value } as SessionConfigOption;
+  return updated;
+}
+
+function flattenConfigOptions(entry: unknown): Array<{ value: string; name: string; description?: string }> {
+  if (!isRecord(entry)) {
+    return [];
+  }
+  if (typeof entry.value === "string" && typeof entry.name === "string") {
+    return [
+      {
+        value: entry.value,
+        name: entry.name,
+        description: typeof entry.description === "string" ? entry.description : undefined,
+      },
+    ];
+  }
+  if (!Array.isArray(entry.options)) {
+    return [];
+  }
+  return entry.options.flatMap((nested) => flattenConfigOptions(nested));
+}
+
+function envelopeSessionUpdate(message: AnyMessage): Record<string, unknown> | null {
+  if (!isRecord(message) || !("params" in message) || !isRecord(message.params)) {
+    return null;
+  }
+  if (!("update" in message.params) || !isRecord(message.params.update)) {
+    return null;
+  }
+  return message.params.update;
+}
+
+function cloneConfigOptions(value: SessionConfigOption[] | null | undefined): SessionConfigOption[] | undefined {
+  if (!value) {
+    return undefined;
+  }
+  return JSON.parse(JSON.stringify(value)) as SessionConfigOption[];
+}
+
+function cloneModes(value: SessionModeState | null | undefined): SessionModeState | null {
+  if (!value) {
+    return null;
+  }
+  return JSON.parse(JSON.stringify(value)) as SessionModeState;
+}
+
+function availablePermissionReplies(options: PermissionOption[]): PermissionReply[] {
+  const replies = new Set<PermissionReply>();
+  for (const option of options) {
+    if (option.kind === "allow_once") {
+      replies.add("once");
+    } else if (option.kind === "allow_always") {
+      replies.add("always");
+    } else if (option.kind === "reject_once" || option.kind === "reject_always") {
+      replies.add("reject");
+    }
+  }
+  return [...replies];
+}
+
+function permissionReplyToResponse(permissionId: string, request: RequestPermissionRequest, reply: PermissionReply): RequestPermissionResponse {
+  const preferredKinds: PermissionOptionKind[] =
+    reply === "once" ? ["allow_once"] : reply === "always" ? ["allow_always", "allow_once"] : ["reject_once", "reject_always"];
+
+  const selected = preferredKinds
+    .map((kind) => request.options.find((option) => option.kind === kind))
+    .find((option): option is PermissionOption => Boolean(option));
+
+  if (!selected) {
+    throw new UnsupportedPermissionReplyError(permissionId, reply, availablePermissionReplies(request.options));
+  }
+
+  return {
+    outcome: {
+      outcome: "selected",
+      optionId: selected.optionId,
+    },
+  };
+}
+
+function cancelledPermissionResponse(): RequestPermissionResponse {
+  return {
+    outcome: {
+      outcome: "cancelled",
+    },
+  };
+}
+
+function isSessionConfigOption(value: unknown): value is SessionConfigOption {
+  return isRecord(value) && typeof value.id === "string" && typeof value.name === "string" && typeof value.type === "string";
+}
+
+function toTitleCase(input: string): string {
+  if (!input) {
+    return "";
+  }
+  return input
+    .split(/[_\s-]+/)
+    .filter(Boolean)
+    .map((part) => part[0]!.toUpperCase() + part.slice(1))
+    .join("");
+}
+
+function formatHealthWaitError(error: unknown): string {
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+
+  if (error === undefined || error === null) {
+    return "unknown error";
+  }
+
+  return String(error);
+}
+
+function anyAbortSignal(signals: Array<AbortSignal | undefined>): AbortSignal | undefined {
+  const active = signals.filter((signal): signal is AbortSignal => Boolean(signal));
+  if (active.length === 0) {
+    return undefined;
+  }
+
+  if (active.length === 1) {
+    return active[0];
+  }
+
+  const controller = new AbortController();
+  const onAbort = (event: Event) => {
+    cleanup();
+    const signal = event.target as AbortSignal;
+    controller.abort(signal.reason ?? createAbortError());
+  };
+  const cleanup = () => {
+    for (const signal of active) {
+      signal.removeEventListener("abort", onAbort);
+    }
+  };
+
+  for (const signal of active) {
+    if (signal.aborted) {
+      controller.abort(signal.reason ?? createAbortError());
+      return controller.signal;
+    }
+  }
+
+  for (const signal of active) {
+    signal.addEventListener("abort", onAbort, { once: true });
+  }
+
+  return controller.signal;
+}
+
+function throwIfAborted(signal: AbortSignal | undefined): void {
+  if (!signal?.aborted) {
+    return;
+  }
+
+  throw signal.reason instanceof Error ? signal.reason : createAbortError(signal.reason);
+}
+
+async function waitForAbortable<T>(promise: Promise<T>, signal: AbortSignal | undefined): Promise<T> {
+  if (!signal) {
+    return promise;
+  }
+
+  throwIfAborted(signal);
+
+  return new Promise<T>((resolve, reject) => {
+    const onAbort = () => {
+      cleanup();
+      reject(signal.reason instanceof Error ? signal.reason : createAbortError(signal.reason));
+    };
+    const cleanup = () => {
+      signal.removeEventListener("abort", onAbort);
+    };
+
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then(
+      (value) => {
+        cleanup();
+        resolve(value);
+      },
+      (error) => {
+        cleanup();
+        reject(error);
+      },
+    );
+  });
+}
+
+async function consumeProcessLogSse(body: ReadableStream<Uint8Array>, listener: ProcessLogListener, signal: AbortSignal): Promise<void> {
+  const reader = body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+
+  try {
+    while (!signal.aborted) {
+      const { done, value } = await reader.read();
+      if (done) {
+        return;
+      }
+
+      buffer += decoder.decode(value, { stream: true }).replace(/\r\n/g, "\n");
+
+      let separatorIndex = buffer.indexOf("\n\n");
+      while (separatorIndex !== -1) {
+        const chunk = buffer.slice(0, separatorIndex);
+        buffer = buffer.slice(separatorIndex + 2);
+
+        const entry = parseProcessLogSseChunk(chunk);
+        if (entry) {
+          listener(entry);
+        }
+
+        separatorIndex = buffer.indexOf("\n\n");
+      }
+    }
+  } catch (error) {
+    if (signal.aborted || isAbortError(error)) {
+      return;
+    }
+    throw error;
+  } finally {
+    reader.releaseLock();
+  }
+}
+
+function parseProcessLogSseChunk(chunk: string): ProcessLogEntry | null {
+  if (!chunk.trim()) {
+    return null;
+  }
+
+  let eventName = "message";
+  const dataLines: string[] = [];
+
+  for (const line of chunk.split("\n")) {
+    if (!line || line.startsWith(":")) {
+      continue;
+    }
+
+    if (line.startsWith("event:")) {
+      eventName = line.slice(6).trim();
+      continue;
+    }
+
+    if (line.startsWith("data:")) {
+      dataLines.push(line.slice(5).trimStart());
+    }
+  }
+
+  if (eventName !== "log") {
+    return null;
+  }
+
+  const data = dataLines.join("\n");
+  if (!data.trim()) {
+    return null;
+  }
+
+  return JSON.parse(data) as ProcessLogEntry;
+}
+
+function toWebSocketUrl(url: string): string {
+  const parsed = new URL(url);
+  if (parsed.protocol === "http:") {
+    parsed.protocol = "ws:";
+  } else if (parsed.protocol === "https:") {
+    parsed.protocol = "wss:";
+  }
+  return parsed.toString();
+}
+
+function isAbortError(error: unknown): boolean {
+  return error instanceof Error && error.name === "AbortError";
+}
+
+function createAbortError(reason?: unknown): Error {
+  if (reason instanceof Error) {
+    return reason;
+  }
+
+  const message = typeof reason === "string" ? reason : "This operation was aborted.";
+  if (typeof DOMException !== "undefined") {
+    return new DOMException(message, "AbortError");
+  }
+
+  const error = new Error(message);
+  error.name = "AbortError";
+  return error;
+}
+
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  if (!signal) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
+  throwIfAborted(signal);
+
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve();
+    }, ms);
+    const onAbort = () => {
+      cleanup();
+      reject(signal.reason instanceof Error ? signal.reason : createAbortError(signal.reason));
+    };
+    const cleanup = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", onAbort);
+    };
+
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+}
diff --git a/sdks/typescript/src/desktop-stream.ts b/sdks/typescript/src/desktop-stream.ts
new file mode 100644
index 0000000..cc52398
--- /dev/null
+++ b/sdks/typescript/src/desktop-stream.ts
@@ -0,0 +1,541 @@
+import type { DesktopMouseButton } from "./types.ts";
+
+const WS_READY_STATE_OPEN = 1;
+const WS_READY_STATE_CLOSED = 3;
+
+export interface DesktopStreamReadyStatus {
+  type: "ready";
+  width: number;
+  height: number;
+}
+
+export interface DesktopStreamErrorStatus {
+  type: "error";
+  message: string;
+}
+
+export type DesktopStreamStatusMessage = DesktopStreamReadyStatus | DesktopStreamErrorStatus;
+
+export interface DesktopStreamConnectOptions {
+  accessToken?: string;
+  WebSocket?: typeof WebSocket;
+  protocols?: string | string[];
+  RTCPeerConnection?: typeof RTCPeerConnection;
+  rtcConfig?: RTCConfiguration;
+}
+
+/**
+ * Neko data channel binary input protocol (Big Endian, v3).
+ *
+ * Reference implementation:
+ *   https://github.com/demodesk/neko-client/blob/37f93eae6bd55b333c94bd009d7f2b079075a026/src/component/internal/webrtc.ts
+ *
+ * Server-side protocol:
+ *   https://github.com/m1k1o/neko/blob/master/server/internal/webrtc/payload/receive.go
+ *
+ * Pinned to neko server image: m1k1o/neko:base@sha256:14e4012bc361025f71205ffc2a9342a628f39168c0a1d855db033fb18590fcae
+ */
+const NEKO_OP_MOVE = 0x01;
+const NEKO_OP_SCROLL = 0x02;
+const NEKO_OP_KEY_DOWN = 0x03;
+const NEKO_OP_KEY_UP = 0x04;
+const NEKO_OP_BTN_DOWN = 0x05;
+const NEKO_OP_BTN_UP = 0x06;
+
+function mouseButtonToX11(button?: DesktopMouseButton): number {
+  switch (button) {
+    case "middle":
+      return 2;
+    case "right":
+      return 3;
+    default:
+      return 1;
+  }
+}
+
+function keyToX11Keysym(key: string): number {
+  if (key.length === 1) {
+    const cp = key.charCodeAt(0);
+    if (cp >= 0x20 && cp <= 0x7e) return cp;
+    return 0x01000000 + cp;
+  }
+
+  const map: Record<string, number> = {
+    Backspace: 0xff08,
+    Tab: 0xff09,
+    Return: 0xff0d,
+    Enter: 0xff0d,
+    Escape: 0xff1b,
+    Delete: 0xffff,
+    Home: 0xff50,
+    Left: 0xff51,
+    ArrowLeft: 0xff51,
+    Up: 0xff52,
+    ArrowUp: 0xff52,
+    Right: 0xff53,
+    ArrowRight: 0xff53,
+    Down: 0xff54,
+    ArrowDown: 0xff54,
+    PageUp: 0xff55,
+    PageDown: 0xff56,
+    End: 0xff57,
+    Insert: 0xff63,
+    F1: 0xffbe,
+    F2: 0xffbf,
+    F3: 0xffc0,
+    F4: 0xffc1,
+    F5: 0xffc2,
+    F6: 0xffc3,
+    F7: 0xffc4,
+    F8: 0xffc5,
+    F9: 0xffc6,
+    F10: 0xffc7,
+    F11: 0xffc8,
+    F12: 0xffc9,
+    Shift: 0xffe1,
+    ShiftLeft: 0xffe1,
+    ShiftRight: 0xffe2,
+    Control: 0xffe3,
+    ControlLeft: 0xffe3,
+    ControlRight: 0xffe4,
+    Alt: 0xffe9,
+    AltLeft: 0xffe9,
+    AltRight: 0xffea,
+    Meta: 0xffeb,
+    MetaLeft: 0xffeb,
+    MetaRight: 0xffec,
+    CapsLock: 0xffe5,
+    NumLock: 0xff7f,
+    ScrollLock: 0xff14,
+    " ": 0x0020,
+    Space: 0x0020,
+  };
+
+  return map[key] ?? 0;
+}
+
+export class DesktopStreamSession {
+  readonly socket: WebSocket;
+  readonly closed: Promise<void>;
+
+  private pc: RTCPeerConnection | null = null;
+  private dataChannel: RTCDataChannel | null = null;
+  private mediaStream: MediaStream | null = null;
+  private connected = false;
+  private pendingCandidates: Record<string, unknown>[] = [];
+  private cachedReadyStatus: DesktopStreamReadyStatus | null = null;
+
+  private readonly readyListeners = new Set<(status: DesktopStreamReadyStatus) => void>();
+  private readonly trackListeners = new Set<(stream: MediaStream) => void>();
+  private readonly connectListeners = new Set<() => void>();
+  private readonly disconnectListeners = new Set<() => void>();
+  private readonly errorListeners = new Set<(error: DesktopStreamErrorStatus | Error) => void>();
+
+  private closedResolve!: () => void;
+  private readonly PeerConnection: typeof RTCPeerConnection;
+  private readonly rtcConfig: RTCConfiguration;
+
+  constructor(socket: WebSocket, options: DesktopStreamConnectOptions = {}) {
+    this.socket = socket;
+    this.PeerConnection = options.RTCPeerConnection ?? globalThis.RTCPeerConnection;
+    this.rtcConfig = options.rtcConfig ?? {};
+
+    this.closed = new Promise<void>((resolve) => {
+      this.closedResolve = resolve;
+    });
+
+    this.socket.addEventListener("message", (event) => {
+      this.handleMessage(event.data as string);
+    });
+    this.socket.addEventListener("error", () => {
+      this.emitError(new Error("Desktop stream signaling connection failed."));
+    });
+    this.socket.addEventListener("close", () => {
+      this.teardownPeerConnection();
+      this.closedResolve();
+      for (const listener of this.disconnectListeners) {
+        listener();
+      }
+    });
+  }
+
+  onReady(listener: (status: DesktopStreamReadyStatus) => void): () => void {
+    this.readyListeners.add(listener);
+    // Deliver cached status to late listeners (handles race where system/init
+    // arrives before onReady is called).
+    if (this.cachedReadyStatus) {
+      listener(this.cachedReadyStatus);
+    }
+    return () => {
+      this.readyListeners.delete(listener);
+    };
+  }
+
+  onTrack(listener: (stream: MediaStream) => void): () => void {
+    this.trackListeners.add(listener);
+    if (this.mediaStream) {
+      listener(this.mediaStream);
+    }
+    return () => {
+      this.trackListeners.delete(listener);
+    };
+  }
+
+  onConnect(listener: () => void): () => void {
+    this.connectListeners.add(listener);
+    return () => {
+      this.connectListeners.delete(listener);
+    };
+  }
+
+  onDisconnect(listener: () => void): () => void {
+    this.disconnectListeners.add(listener);
+    return () => {
+      this.disconnectListeners.delete(listener);
+    };
+  }
+
+  onError(listener: (error: DesktopStreamErrorStatus | Error) => void): () => void {
+    this.errorListeners.add(listener);
+    return () => {
+      this.errorListeners.delete(listener);
+    };
+  }
+
+  /** @deprecated Use onDisconnect instead. */
+  onClose(listener: () => void): () => void {
+    return this.onDisconnect(listener);
+  }
+
+  /** @deprecated No longer emits JPEG frames. Use onTrack for WebRTC media. */
+  onFrame(_listener: (frame: Uint8Array) => void): () => void {
+    return () => {};
+  }
+
+  getMediaStream(): MediaStream | null {
+    return this.mediaStream;
+  }
+
+  /** Build a neko data channel message with the 3-byte header (event + length). */
+  private buildNekoMsg(event: number, payloadSize: number): { buf: ArrayBuffer; view: DataView } {
+    const totalLen = 3 + payloadSize; // 1 byte event + 2 bytes length + payload
+    const buf = new ArrayBuffer(totalLen);
+    const view = new DataView(buf);
+    view.setUint8(0, event);
+    view.setUint16(1, payloadSize, false);
+    return { buf, view };
+  }
+
+  moveMouse(x: number, y: number): void {
+    // Move payload: X(uint16) + Y(uint16) = 4 bytes
+    const { buf, view } = this.buildNekoMsg(NEKO_OP_MOVE, 4);
+    view.setUint16(3, x, false);
+    view.setUint16(5, y, false);
+    this.sendDataChannel(buf);
+  }
+
+  mouseDown(button?: DesktopMouseButton, x?: number, y?: number): void {
+    if (x != null && y != null) {
+      this.moveMouse(x, y);
+    }
+    // Button payload: Key(uint32) = 4 bytes
+    const { buf, view } = this.buildNekoMsg(NEKO_OP_BTN_DOWN, 4);
+    view.setUint32(3, mouseButtonToX11(button), false);
+    this.sendDataChannel(buf);
+  }
+
+  mouseUp(button?: DesktopMouseButton, x?: number, y?: number): void {
+    if (x != null && y != null) {
+      this.moveMouse(x, y);
+    }
+    const { buf, view } = this.buildNekoMsg(NEKO_OP_BTN_UP, 4);
+    view.setUint32(3, mouseButtonToX11(button), false);
+    this.sendDataChannel(buf);
+  }
+
+  scroll(x: number, y: number, deltaX?: number, deltaY?: number): void {
+    this.moveMouse(x, y);
+    // Scroll payload: DeltaX(int16) + DeltaY(int16) + ControlKey(uint8) = 5 bytes
+    const { buf, view } = this.buildNekoMsg(NEKO_OP_SCROLL, 5);
+    view.setInt16(3, deltaX ?? 0, false);
+    view.setInt16(5, deltaY ?? 0, false);
+    view.setUint8(7, 0); // controlKey = false
+    this.sendDataChannel(buf);
+  }
+
+  keyDown(key: string): void {
+    const keysym = keyToX11Keysym(key);
+    if (keysym === 0) return;
+    // Key payload: Key(uint32) = 4 bytes
+    const { buf, view } = this.buildNekoMsg(NEKO_OP_KEY_DOWN, 4);
+    view.setUint32(3, keysym, false);
+    this.sendDataChannel(buf);
+  }
+
+  keyUp(key: string): void {
+    const keysym = keyToX11Keysym(key);
+    if (keysym === 0) return;
+    const { buf, view } = this.buildNekoMsg(NEKO_OP_KEY_UP, 4);
+    view.setUint32(3, keysym, false);
+    this.sendDataChannel(buf);
+  }
+
+  close(): void {
+    this.teardownPeerConnection();
+    if (this.socket.readyState !== WS_READY_STATE_CLOSED) {
+      this.socket.close();
+    }
+  }
+
+  private handleMessage(data: string): void {
+    let msg: Record<string, unknown>;
+    try {
+      msg = JSON.parse(data) as Record<string, unknown>;
+    } catch {
+      return;
+    }
+
+    const event = (msg.event as string) ?? "";
+
+    // Neko uses "payload" for message data, not "data".
+    const payload = (msg.payload ?? msg.data) as Record<string, unknown> | undefined;
+
+    switch (event) {
+      case "system/init": {
+        const screenData = payload?.screen_size as Record<string, unknown> | undefined;
+        if (screenData) {
+          const status: DesktopStreamReadyStatus = {
+            type: "ready",
+            width: Number(screenData.width) || 0,
+            height: Number(screenData.height) || 0,
+          };
+          this.cachedReadyStatus = status;
+          for (const listener of this.readyListeners) {
+            listener(status);
+          }
+        }
+        // Request control so this session can send input.
+        this.sendSignaling("control/request", {});
+        // Request WebRTC stream from neko. The server will respond with
+        // signal/provide containing the SDP offer.
+        this.sendSignaling("signal/request", { video: {}, audio: {} });
+        break;
+      }
+
+      case "signal/provide":
+      case "signal/offer": {
+        if (payload?.sdp) {
+          void this.handleNekoOffer(payload);
+        }
+        break;
+      }
+
+      case "signal/restart": {
+        // Server-initiated renegotiation (treated as a new offer).
+        // Ref: https://github.com/demodesk/neko-client/blob/37f93ea/src/component/internal/messages.ts#L190-L192
+        if (payload?.sdp) {
+          void this.handleNekoOffer(payload);
+        }
+        break;
+      }
+
+      case "signal/candidate": {
+        if (payload) {
+          void this.handleNekoCandidate(payload);
+        }
+        break;
+      }
+
+      case "signal/close": {
+        // Server is closing the WebRTC connection.
+        this.teardownPeerConnection();
+        break;
+      }
+
+      case "system/disconnect": {
+        const message = (payload as Record<string, unknown>)?.message as string | undefined;
+        this.emitError(new Error(message ?? "Server disconnected."));
+        this.close();
+        break;
+      }
+
+      default:
+        break;
+    }
+  }
+
+  private async handleNekoOffer(data: Record<string, unknown>): Promise<void> {
+    try {
+      const iceServers: RTCIceServer[] = [];
+      const nekoIce = (data.iceservers ?? data.ice) as Array<Record<string, unknown>> | undefined;
+      if (nekoIce) {
+        for (const server of nekoIce) {
+          if (server.urls) {
+            iceServers.push(server as unknown as RTCIceServer);
+          }
+        }
+      }
+      if (iceServers.length === 0) {
+        iceServers.push({ urls: "stun:stun.l.google.com:19302" });
+      }
+
+      const config: RTCConfiguration = { ...this.rtcConfig, iceServers };
+      const pc = new this.PeerConnection(config);
+      this.pc = pc;
+
+      pc.ontrack = (event) => {
+        const stream = event.streams[0] ?? new MediaStream([event.track]);
+        this.mediaStream = stream;
+        for (const listener of this.trackListeners) {
+          listener(stream);
+        }
+      };
+
+      pc.onicecandidate = (event) => {
+        if (event.candidate) {
+          this.sendSignaling("signal/candidate", event.candidate.toJSON());
+        }
+      };
+
+      // Ref: https://github.com/demodesk/neko-client/blob/37f93ea/src/component/internal/webrtc.ts#L123-L173
+      pc.onconnectionstatechange = () => {
+        switch (pc.connectionState) {
+          case "connected":
+            if (!this.connected) {
+              this.connected = true;
+              for (const listener of this.connectListeners) {
+                listener();
+              }
+            }
+            break;
+          case "closed":
+          case "failed":
+            this.emitError(new Error(`WebRTC connection ${pc.connectionState}.`));
+            break;
+        }
+      };
+
+      pc.oniceconnectionstatechange = () => {
+        switch (pc.iceConnectionState) {
+          case "connected":
+            if (!this.connected) {
+              this.connected = true;
+              for (const listener of this.connectListeners) {
+                listener();
+              }
+            }
+            break;
+          case "closed":
+          case "failed":
+            this.emitError(new Error(`WebRTC ICE ${pc.iceConnectionState}.`));
+            break;
+        }
+      };
+
+      // Neko v3 creates data channels on the server side.
+      // Ref: https://github.com/demodesk/neko-client/blob/37f93ea/src/component/internal/webrtc.ts#L477-L486
+      pc.ondatachannel = (event) => {
+        this.dataChannel = event.channel;
+        this.dataChannel.binaryType = "arraybuffer";
+        this.dataChannel.onerror = () => {
+          this.emitError(new Error("WebRTC data channel error."));
+        };
+        this.dataChannel.onclose = () => {
+          this.dataChannel = null;
+        };
+      };
+
+      const sdp = data.sdp as string;
+      await pc.setRemoteDescription({ type: "offer", sdp });
+
+      // Flush any ICE candidates that arrived before the PC was ready.
+      for (const pending of this.pendingCandidates) {
+        try {
+          await pc.addIceCandidate(pending as unknown as RTCIceCandidateInit);
+        } catch {
+          // ignore stale candidates
+        }
+      }
+      this.pendingCandidates = [];
+
+      const answer = await pc.createAnswer();
+      // Enable stereo audio for Chromium.
+      // Ref: https://github.com/demodesk/neko-client/blob/37f93ea/src/component/internal/webrtc.ts#L262
+      if (answer.sdp) {
+        answer.sdp = answer.sdp.replace(/(stereo=1;)?useinbandfec=1/, "useinbandfec=1;stereo=1");
+      }
+      await pc.setLocalDescription(answer);
+
+      this.sendSignaling("signal/answer", { sdp: answer.sdp });
+    } catch (error) {
+      this.emitError(error instanceof Error ? error : new Error(String(error)));
+    }
+  }
+
+  private async handleNekoCandidate(data: Record<string, unknown>): Promise<void> {
+    // Buffer candidates that arrive before the peer connection is created.
+    if (!this.pc) {
+      this.pendingCandidates.push(data);
+      return;
+    }
+    try {
+      const candidate = data as unknown as RTCIceCandidateInit;
+      await this.pc.addIceCandidate(candidate);
+    } catch (error) {
+      this.emitError(error instanceof Error ? error : new Error(String(error)));
+    }
+  }
+
+  private sendSignaling(event: string, payload: unknown): void {
+    if (this.socket.readyState !== WS_READY_STATE_OPEN) return;
+    this.socket.send(JSON.stringify({ event, payload }));
+  }
+
+  private sendDataChannel(buf: ArrayBuffer): void {
+    if (this.dataChannel && this.dataChannel.readyState === "open") {
+      this.dataChannel.send(buf);
+    }
+  }
+
+  /** Tear down the peer connection, nullifying handlers first to prevent stale
+   *  callbacks. Matches the reference disconnect() pattern.
+   *  Ref: https://github.com/demodesk/neko-client/blob/37f93ea/src/component/internal/webrtc.ts#L321-L363 */
+  private teardownPeerConnection(): void {
+    if (this.dataChannel) {
+      this.dataChannel.onerror = null;
+      this.dataChannel.onmessage = null;
+      this.dataChannel.onopen = null;
+      this.dataChannel.onclose = null;
+      try {
+        this.dataChannel.close();
+      } catch {
+        /* ignore */
+      }
+      this.dataChannel = null;
+    }
+    if (this.pc) {
+      this.pc.onicecandidate = null;
+      this.pc.onicecandidateerror = null;
+      this.pc.onconnectionstatechange = null;
+      this.pc.oniceconnectionstatechange = null;
+      this.pc.onsignalingstatechange = null;
+      this.pc.onnegotiationneeded = null;
+      this.pc.ontrack = null;
+      this.pc.ondatachannel = null;
+      try {
+        this.pc.close();
+      } catch {
+        /* ignore */
+      }
+      this.pc = null;
+    }
+    this.mediaStream = null;
+    this.connected = false;
+  }
+
+  private emitError(error: DesktopStreamErrorStatus | Error): void {
+    for (const listener of this.errorListeners) {
+      listener(error);
+    }
+  }
+}
diff --git a/sdks/typescript/src/generated/openapi.ts b/sdks/typescript/src/generated/openapi.ts
index 91ab56b..537102f 100644
--- a/sdks/typescript/src/generated/openapi.ts
+++ b/sdks/typescript/src/generated/openapi.ts
@@ -3,7 +3,6 @@
  * Do not make direct changes to the file.
  */
 
-
 export interface paths {
   "/v1/acp": {
     get: operations["get_v1_acp_servers"];
@@ -32,6 +31,276 @@ export interface paths {
     put: operations["put_v1_config_skills"];
     delete: operations["delete_v1_config_skills"];
   };
+  "/v1/desktop/clipboard": {
+    /**
+     * Read the desktop clipboard.
+     * @description Returns the current text content of the X11 clipboard.
+     */
+    get: operations["get_v1_desktop_clipboard"];
+    /**
+     * Write to the desktop clipboard.
+     * @description Sets the text content of the X11 clipboard.
+     */
+    post: operations["post_v1_desktop_clipboard"];
+  };
+  "/v1/desktop/display/info": {
+    /**
+     * Get desktop display information.
+     * @description Performs a health-gated display query against the managed desktop and
+     * returns the current display identifier and resolution.
+     */
+    get: operations["get_v1_desktop_display_info"];
+  };
+  "/v1/desktop/keyboard/down": {
+    /**
+     * Press and hold a desktop keyboard key.
+     * @description Performs a health-gated `xdotool keydown` operation against the managed
+     * desktop.
+     */
+    post: operations["post_v1_desktop_keyboard_down"];
+  };
+  "/v1/desktop/keyboard/press": {
+    /**
+     * Press a desktop keyboard shortcut.
+     * @description Performs a health-gated `xdotool key` operation against the managed
+     * desktop.
+     */
+    post: operations["post_v1_desktop_keyboard_press"];
+  };
+  "/v1/desktop/keyboard/type": {
+    /**
+     * Type desktop keyboard text.
+     * @description Performs a health-gated `xdotool type` operation against the managed
+     * desktop.
+     */
+    post: operations["post_v1_desktop_keyboard_type"];
+  };
+  "/v1/desktop/keyboard/up": {
+    /**
+     * Release a desktop keyboard key.
+     * @description Performs a health-gated `xdotool keyup` operation against the managed
+     * desktop.
+     */
+    post: operations["post_v1_desktop_keyboard_up"];
+  };
+  "/v1/desktop/launch": {
+    /**
+     * Launch a desktop application.
+     * @description Launches an application by name on the managed desktop, optionally waiting
+     * for its window to appear.
+     */
+    post: operations["post_v1_desktop_launch"];
+  };
+  "/v1/desktop/mouse/click": {
+    /**
+     * Click on the desktop.
+     * @description Performs a health-gated pointer move and click against the managed desktop
+     * and returns the resulting mouse position.
+     */
+    post: operations["post_v1_desktop_mouse_click"];
+  };
+  "/v1/desktop/mouse/down": {
+    /**
+     * Press and hold a desktop mouse button.
+     * @description Performs a health-gated optional pointer move followed by `xdotool mousedown`
+     * and returns the resulting mouse position.
+     */
+    post: operations["post_v1_desktop_mouse_down"];
+  };
+  "/v1/desktop/mouse/drag": {
+    /**
+     * Drag the desktop mouse.
+     * @description Performs a health-gated drag gesture against the managed desktop and
+     * returns the resulting mouse position.
+     */
+    post: operations["post_v1_desktop_mouse_drag"];
+  };
+  "/v1/desktop/mouse/move": {
+    /**
+     * Move the desktop mouse.
+     * @description Performs a health-gated absolute pointer move on the managed desktop and
+     * returns the resulting mouse position.
+     */
+    post: operations["post_v1_desktop_mouse_move"];
+  };
+  "/v1/desktop/mouse/position": {
+    /**
+     * Get the current desktop mouse position.
+     * @description Performs a health-gated mouse position query against the managed desktop.
+     */
+    get: operations["get_v1_desktop_mouse_position"];
+  };
+  "/v1/desktop/mouse/scroll": {
+    /**
+     * Scroll the desktop mouse wheel.
+     * @description Performs a health-gated scroll gesture at the requested coordinates and
+     * returns the resulting mouse position.
+     */
+    post: operations["post_v1_desktop_mouse_scroll"];
+  };
+  "/v1/desktop/mouse/up": {
+    /**
+     * Release a desktop mouse button.
+     * @description Performs a health-gated optional pointer move followed by `xdotool mouseup`
+     * and returns the resulting mouse position.
+     */
+    post: operations["post_v1_desktop_mouse_up"];
+  };
+  "/v1/desktop/open": {
+    /**
+     * Open a file or URL with the default handler.
+     * @description Opens a file path or URL using xdg-open on the managed desktop.
+     */
+    post: operations["post_v1_desktop_open"];
+  };
+  "/v1/desktop/recording/start": {
+    /**
+     * Start desktop recording.
+     * @description Starts an ffmpeg x11grab recording against the managed desktop and returns
+     * the created recording metadata.
+     */
+    post: operations["post_v1_desktop_recording_start"];
+  };
+  "/v1/desktop/recording/stop": {
+    /**
+     * Stop desktop recording.
+     * @description Stops the active desktop recording and returns the finalized recording
+     * metadata.
+     */
+    post: operations["post_v1_desktop_recording_stop"];
+  };
+  "/v1/desktop/recordings": {
+    /**
+     * List desktop recordings.
+     * @description Returns the current desktop recording catalog.
+     */
+    get: operations["get_v1_desktop_recordings"];
+  };
+  "/v1/desktop/recordings/{id}": {
+    /**
+     * Get desktop recording metadata.
+     * @description Returns metadata for a single desktop recording.
+     */
+    get: operations["get_v1_desktop_recording"];
+    /**
+     * Delete a desktop recording.
+     * @description Removes a completed desktop recording and its file from disk.
+     */
+    delete: operations["delete_v1_desktop_recording"];
+  };
+  "/v1/desktop/recordings/{id}/download": {
+    /**
+     * Download a desktop recording.
+     * @description Serves the recorded MP4 bytes for a completed desktop recording.
+     */
+    get: operations["get_v1_desktop_recording_download"];
+  };
+  "/v1/desktop/screenshot": {
+    /**
+     * Capture a full desktop screenshot.
+     * @description Performs a health-gated full-frame screenshot of the managed desktop and
+     * returns the requested image bytes.
+     */
+    get: operations["get_v1_desktop_screenshot"];
+  };
+  "/v1/desktop/screenshot/region": {
+    /**
+     * Capture a desktop screenshot region.
+     * @description Performs a health-gated screenshot crop against the managed desktop and
+     * returns the requested region image bytes.
+     */
+    get: operations["get_v1_desktop_screenshot_region"];
+  };
+  "/v1/desktop/start": {
+    /**
+     * Start the private desktop runtime.
+     * @description Lazily launches the managed Xvfb/openbox stack, validates display health,
+     * and returns the resulting desktop status snapshot.
+     */
+    post: operations["post_v1_desktop_start"];
+  };
+  "/v1/desktop/status": {
+    /**
+     * Get desktop runtime status.
+     * @description Returns the current desktop runtime state, dependency status, active
+     * display metadata, and supervised process information.
+     */
+    get: operations["get_v1_desktop_status"];
+  };
+  "/v1/desktop/stop": {
+    /**
+     * Stop the private desktop runtime.
+     * @description Terminates the managed openbox/Xvfb/dbus processes owned by the desktop
+     * runtime and returns the resulting status snapshot.
+     */
+    post: operations["post_v1_desktop_stop"];
+  };
+  "/v1/desktop/stream/signaling": {
+    /**
+     * Open a desktop WebRTC signaling session.
+     * @description Upgrades the connection to a WebSocket used for WebRTC signaling between
+     * the browser client and the desktop streaming process. Also accepts mouse
+     * and keyboard input frames as a fallback transport.
+     */
+    get: operations["get_v1_desktop_stream_ws"];
+  };
+  "/v1/desktop/stream/start": {
+    /**
+     * Start desktop streaming.
+     * @description Enables desktop websocket streaming for the managed desktop.
+     */
+    post: operations["post_v1_desktop_stream_start"];
+  };
+  "/v1/desktop/stream/status": {
+    /**
+     * Get desktop stream status.
+     * @description Returns the current state of the desktop WebRTC streaming session.
+     */
+    get: operations["get_v1_desktop_stream_status"];
+  };
+  "/v1/desktop/stream/stop": {
+    /**
+     * Stop desktop streaming.
+     * @description Disables desktop websocket streaming for the managed desktop.
+     */
+    post: operations["post_v1_desktop_stream_stop"];
+  };
+  "/v1/desktop/windows": {
+    /**
+     * List visible desktop windows.
+     * @description Performs a health-gated visible-window enumeration against the managed
+     * desktop and returns the current window metadata.
+     */
+    get: operations["get_v1_desktop_windows"];
+  };
+  "/v1/desktop/windows/focused": {
+    /**
+     * Get the currently focused desktop window.
+     * @description Returns information about the window that currently has input focus.
+     */
+    get: operations["get_v1_desktop_windows_focused"];
+  };
+  "/v1/desktop/windows/{id}/focus": {
+    /**
+     * Focus a desktop window.
+     * @description Brings the specified window to the foreground and gives it input focus.
+     */
+    post: operations["post_v1_desktop_window_focus"];
+  };
+  "/v1/desktop/windows/{id}/move": {
+    /**
+     * Move a desktop window.
+     * @description Moves the specified window to the given position.
+     */
+    post: operations["post_v1_desktop_window_move"];
+  };
+  "/v1/desktop/windows/{id}/resize": {
+    /**
+     * Resize a desktop window.
+     * @description Resizes the specified window to the given dimensions.
+     */
+    post: operations["post_v1_desktop_window_resize"];
+  };
   "/v1/fs/entries": {
     get: operations["get_v1_fs_entries"];
   };
@@ -57,6 +326,108 @@ export interface paths {
   "/v1/health": {
     get: operations["get_v1_health"];
   };
+  "/v1/processes": {
+    /**
+     * List all managed processes.
+     * @description Returns a list of all processes (running and exited) currently tracked
+     * by the runtime, sorted by process ID.
+     */
+    get: operations["get_v1_processes"];
+    /**
+     * Create a long-lived managed process.
+     * @description Spawns a new process with the given command and arguments. Supports both
+     * pipe-based and PTY (tty) modes. Returns the process descriptor on success.
+     */
+    post: operations["post_v1_processes"];
+  };
+  "/v1/processes/config": {
+    /**
+     * Get process runtime configuration.
+     * @description Returns the current runtime configuration for the process management API,
+     * including limits for concurrency, timeouts, and buffer sizes.
+     */
+    get: operations["get_v1_processes_config"];
+    /**
+     * Update process runtime configuration.
+     * @description Replaces the runtime configuration for the process management API.
+     * Validates that all values are non-zero and clamps default timeout to max.
+     */
+    post: operations["post_v1_processes_config"];
+  };
+  "/v1/processes/run": {
+    /**
+     * Run a one-shot command.
+     * @description Executes a command to completion and returns its stdout, stderr, exit code,
+     * and duration. Supports configurable timeout and output size limits.
+     */
+    post: operations["post_v1_processes_run"];
+  };
+  "/v1/processes/{id}": {
+    /**
+     * Get a single process by ID.
+     * @description Returns the current state of a managed process including its status,
+     * PID, exit code, and creation/exit timestamps.
+     */
+    get: operations["get_v1_process"];
+    /**
+     * Delete a process record.
+     * @description Removes a stopped process from the runtime. Returns 409 if the process
+     * is still running; stop or kill it first.
+     */
+    delete: operations["delete_v1_process"];
+  };
+  "/v1/processes/{id}/input": {
+    /**
+     * Write input to a process.
+     * @description Sends data to a process's stdin (pipe mode) or PTY writer (tty mode).
+     * Data can be encoded as base64, utf8, or text. Returns 413 if the decoded
+     * payload exceeds the configured `maxInputBytesPerRequest` limit.
+     */
+    post: operations["post_v1_process_input"];
+  };
+  "/v1/processes/{id}/kill": {
+    /**
+     * Send SIGKILL to a process.
+     * @description Sends SIGKILL to the process and optionally waits up to `waitMs`
+     * milliseconds for the process to exit before returning.
+     */
+    post: operations["post_v1_process_kill"];
+  };
+  "/v1/processes/{id}/logs": {
+    /**
+     * Fetch process logs.
+     * @description Returns buffered log entries for a process. Supports filtering by stream
+     * type, tail count, and sequence-based resumption. When `follow=true`,
+     * returns an SSE stream that replays buffered entries then streams live output.
+     */
+    get: operations["get_v1_process_logs"];
+  };
+  "/v1/processes/{id}/stop": {
+    /**
+     * Send SIGTERM to a process.
+     * @description Sends SIGTERM to the process and optionally waits up to `waitMs`
+     * milliseconds for the process to exit before returning.
+     */
+    post: operations["post_v1_process_stop"];
+  };
+  "/v1/processes/{id}/terminal/resize": {
+    /**
+     * Resize a process terminal.
+     * @description Sets the PTY window size (columns and rows) for a tty-mode process and
+     * sends SIGWINCH so the child process can adapt.
+     */
+    post: operations["post_v1_process_terminal_resize"];
+  };
+  "/v1/processes/{id}/terminal/ws": {
+    /**
+     * Open an interactive WebSocket terminal session.
+     * @description Upgrades the connection to a WebSocket for bidirectional PTY I/O. Accepts
+     * `access_token` query param for browser-based auth (WebSocket API cannot
+     * send custom headers). Streams raw PTY output as binary frames and accepts
+     * JSON control frames for input, resize, and close.
+     */
+    get: operations["get_v1_process_terminal_ws"];
+  };
 }
 
 export type webhooks = Record<string, never>;
@@ -132,8 +503,273 @@ export interface components {
     AgentListResponse: {
       agents: components["schemas"]["AgentInfo"][];
     };
+    DesktopActionResponse: {
+      ok: boolean;
+    };
+    DesktopClipboardQuery: {
+      selection?: string | null;
+    };
+    DesktopClipboardResponse: {
+      selection: string;
+      text: string;
+    };
+    DesktopClipboardWriteRequest: {
+      selection?: string | null;
+      text: string;
+    };
+    DesktopDisplayInfoResponse: {
+      display: string;
+      resolution: components["schemas"]["DesktopResolution"];
+    };
+    DesktopErrorInfo: {
+      code: string;
+      message: string;
+    };
+    DesktopKeyModifiers: {
+      alt?: boolean | null;
+      cmd?: boolean | null;
+      ctrl?: boolean | null;
+      shift?: boolean | null;
+    };
+    DesktopKeyboardDownRequest: {
+      key: string;
+    };
+    DesktopKeyboardPressRequest: {
+      key: string;
+      modifiers?: components["schemas"]["DesktopKeyModifiers"] | null;
+    };
+    DesktopKeyboardTypeRequest: {
+      /** Format: int32 */
+      delayMs?: number | null;
+      text: string;
+    };
+    DesktopKeyboardUpRequest: {
+      key: string;
+    };
+    DesktopLaunchRequest: {
+      app: string;
+      args?: string[] | null;
+      wait?: boolean | null;
+    };
+    DesktopLaunchResponse: {
+      /** Format: int32 */
+      pid?: number | null;
+      processId: string;
+      windowId?: string | null;
+    };
     /** @enum {string} */
-    ErrorType: "invalid_request" | "conflict" | "unsupported_agent" | "agent_not_installed" | "install_failed" | "agent_process_exited" | "token_invalid" | "permission_denied" | "not_acceptable" | "unsupported_media_type" | "session_not_found" | "session_already_exists" | "mode_not_supported" | "stream_error" | "timeout";
+    DesktopMouseButton: "left" | "middle" | "right";
+    DesktopMouseClickRequest: {
+      button?: components["schemas"]["DesktopMouseButton"] | null;
+      /** Format: int32 */
+      clickCount?: number | null;
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopMouseDownRequest: {
+      button?: components["schemas"]["DesktopMouseButton"] | null;
+      /** Format: int32 */
+      x?: number | null;
+      /** Format: int32 */
+      y?: number | null;
+    };
+    DesktopMouseDragRequest: {
+      button?: components["schemas"]["DesktopMouseButton"] | null;
+      /** Format: int32 */
+      endX: number;
+      /** Format: int32 */
+      endY: number;
+      /** Format: int32 */
+      startX: number;
+      /** Format: int32 */
+      startY: number;
+    };
+    DesktopMouseMoveRequest: {
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopMousePositionResponse: {
+      /** Format: int32 */
+      screen?: number | null;
+      window?: string | null;
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopMouseScrollRequest: {
+      /** Format: int32 */
+      deltaX?: number | null;
+      /** Format: int32 */
+      deltaY?: number | null;
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopMouseUpRequest: {
+      button?: components["schemas"]["DesktopMouseButton"] | null;
+      /** Format: int32 */
+      x?: number | null;
+      /** Format: int32 */
+      y?: number | null;
+    };
+    DesktopOpenRequest: {
+      target: string;
+    };
+    DesktopOpenResponse: {
+      /** Format: int32 */
+      pid?: number | null;
+      processId: string;
+    };
+    DesktopProcessInfo: {
+      logPath?: string | null;
+      name: string;
+      /** Format: int32 */
+      pid?: number | null;
+      running: boolean;
+    };
+    DesktopRecordingInfo: {
+      /** Format: int64 */
+      bytes: number;
+      endedAt?: string | null;
+      fileName: string;
+      id: string;
+      processId?: string | null;
+      startedAt: string;
+      status: components["schemas"]["DesktopRecordingStatus"];
+    };
+    DesktopRecordingListResponse: {
+      recordings: components["schemas"]["DesktopRecordingInfo"][];
+    };
+    DesktopRecordingStartRequest: {
+      /** Format: int32 */
+      fps?: number | null;
+    };
+    /** @enum {string} */
+    DesktopRecordingStatus: "recording" | "completed" | "failed";
+    DesktopRegionScreenshotQuery: {
+      format?: components["schemas"]["DesktopScreenshotFormat"] | null;
+      /** Format: int32 */
+      height: number;
+      /** Format: int32 */
+      quality?: number | null;
+      /** Format: float */
+      scale?: number | null;
+      showCursor?: boolean | null;
+      /** Format: int32 */
+      width: number;
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopResolution: {
+      /** Format: int32 */
+      dpi?: number | null;
+      /** Format: int32 */
+      height: number;
+      /** Format: int32 */
+      width: number;
+    };
+    /** @enum {string} */
+    DesktopScreenshotFormat: "png" | "jpeg" | "webp";
+    DesktopScreenshotQuery: {
+      format?: components["schemas"]["DesktopScreenshotFormat"] | null;
+      /** Format: int32 */
+      quality?: number | null;
+      /** Format: float */
+      scale?: number | null;
+      showCursor?: boolean | null;
+    };
+    DesktopStartRequest: {
+      /** Format: int32 */
+      displayNum?: number | null;
+      /** Format: int32 */
+      dpi?: number | null;
+      /** Format: int32 */
+      height?: number | null;
+      /** Format: int32 */
+      recordingFps?: number | null;
+      stateDir?: string | null;
+      streamAudioCodec?: string | null;
+      /** Format: int32 */
+      streamFrameRate?: number | null;
+      streamVideoCodec?: string | null;
+      webrtcPortRange?: string | null;
+      /** Format: int32 */
+      width?: number | null;
+    };
+    /** @enum {string} */
+    DesktopState: "inactive" | "install_required" | "starting" | "active" | "stopping" | "failed";
+    DesktopStatusResponse: {
+      display?: string | null;
+      installCommand?: string | null;
+      lastError?: components["schemas"]["DesktopErrorInfo"] | null;
+      missingDependencies?: string[];
+      processes?: components["schemas"]["DesktopProcessInfo"][];
+      resolution?: components["schemas"]["DesktopResolution"] | null;
+      runtimeLogPath?: string | null;
+      startedAt?: string | null;
+      state: components["schemas"]["DesktopState"];
+      /** @description Current visible windows (included when the desktop is active). */
+      windows?: components["schemas"]["DesktopWindowInfo"][];
+    };
+    DesktopStreamStatusResponse: {
+      active: boolean;
+      processId?: string | null;
+      windowId?: string | null;
+    };
+    DesktopWindowInfo: {
+      /** Format: int32 */
+      height: number;
+      id: string;
+      isActive: boolean;
+      title: string;
+      /** Format: int32 */
+      width: number;
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopWindowListResponse: {
+      windows: components["schemas"]["DesktopWindowInfo"][];
+    };
+    DesktopWindowMoveRequest: {
+      /** Format: int32 */
+      x: number;
+      /** Format: int32 */
+      y: number;
+    };
+    DesktopWindowResizeRequest: {
+      /** Format: int32 */
+      height: number;
+      /** Format: int32 */
+      width: number;
+    };
+    /** @enum {string} */
+    ErrorType:
+      | "invalid_request"
+      | "conflict"
+      | "unsupported_agent"
+      | "agent_not_installed"
+      | "install_failed"
+      | "agent_process_exited"
+      | "token_invalid"
+      | "permission_denied"
+      | "not_acceptable"
+      | "unsupported_media_type"
+      | "not_found"
+      | "session_not_found"
+      | "session_already_exists"
+      | "mode_not_supported"
+      | "stream_error"
+      | "timeout";
     FsActionResponse: {
       path: string;
     };
@@ -192,35 +828,37 @@ export interface components {
       directory: string;
       mcpName: string;
     };
-    McpServerConfig: ({
-      args?: string[];
-      command: string;
-      cwd?: string | null;
-      enabled?: boolean | null;
-      env?: {
-        [key: string]: string;
-      } | null;
-      /** Format: int64 */
-      timeoutMs?: number | null;
-      /** @enum {string} */
-      type: "local";
-    }) | ({
-      bearerTokenEnvVar?: string | null;
-      enabled?: boolean | null;
-      envHeaders?: {
-        [key: string]: string;
-      } | null;
-      headers?: {
-        [key: string]: string;
-      } | null;
-      oauth?: Record<string, unknown> | null | null;
-      /** Format: int64 */
-      timeoutMs?: number | null;
-      transport?: string | null;
-      /** @enum {string} */
-      type: "remote";
-      url: string;
-    });
+    McpServerConfig:
+      | {
+          args?: string[];
+          command: string;
+          cwd?: string | null;
+          enabled?: boolean | null;
+          env?: {
+            [key: string]: string;
+          } | null;
+          /** Format: int64 */
+          timeoutMs?: number | null;
+          /** @enum {string} */
+          type: "local";
+        }
+      | {
+          bearerTokenEnvVar?: string | null;
+          enabled?: boolean | null;
+          envHeaders?: {
+            [key: string]: string;
+          } | null;
+          headers?: {
+            [key: string]: string;
+          } | null;
+          oauth?: Record<string, unknown> | null | null;
+          /** Format: int64 */
+          timeoutMs?: number | null;
+          transport?: string | null;
+          /** @enum {string} */
+          type: "remote";
+          url: string;
+        };
     ProblemDetails: {
       detail?: string | null;
       instance?: string | null;
@@ -230,6 +868,122 @@ export interface components {
       type: string;
       [key: string]: unknown;
     };
+    ProcessConfig: {
+      /** Format: int64 */
+      defaultRunTimeoutMs: number;
+      maxConcurrentProcesses: number;
+      maxInputBytesPerRequest: number;
+      maxLogBytesPerProcess: number;
+      maxOutputBytes: number;
+      /** Format: int64 */
+      maxRunTimeoutMs: number;
+    };
+    ProcessCreateRequest: {
+      args?: string[];
+      command: string;
+      cwd?: string | null;
+      env?: {
+        [key: string]: string;
+      };
+      interactive?: boolean;
+      tty?: boolean;
+    };
+    ProcessInfo: {
+      args: string[];
+      command: string;
+      /** Format: int64 */
+      createdAtMs: number;
+      cwd?: string | null;
+      /** Format: int32 */
+      exitCode?: number | null;
+      /** Format: int64 */
+      exitedAtMs?: number | null;
+      id: string;
+      interactive: boolean;
+      owner: components["schemas"]["ProcessOwner"];
+      /** Format: int32 */
+      pid?: number | null;
+      status: components["schemas"]["ProcessState"];
+      tty: boolean;
+    };
+    ProcessInputRequest: {
+      data: string;
+      encoding?: string | null;
+    };
+    ProcessInputResponse: {
+      bytesWritten: number;
+    };
+    ProcessListQuery: {
+      owner?: components["schemas"]["ProcessOwner"] | null;
+    };
+    ProcessListResponse: {
+      processes: components["schemas"]["ProcessInfo"][];
+    };
+    ProcessLogEntry: {
+      data: string;
+      encoding: string;
+      /** Format: int64 */
+      sequence: number;
+      stream: components["schemas"]["ProcessLogsStream"];
+      /** Format: int64 */
+      timestampMs: number;
+    };
+    ProcessLogsQuery: {
+      follow?: boolean | null;
+      /** Format: int64 */
+      since?: number | null;
+      stream?: components["schemas"]["ProcessLogsStream"] | null;
+      tail?: number | null;
+    };
+    ProcessLogsResponse: {
+      entries: components["schemas"]["ProcessLogEntry"][];
+      processId: string;
+      stream: components["schemas"]["ProcessLogsStream"];
+    };
+    /** @enum {string} */
+    ProcessLogsStream: "stdout" | "stderr" | "combined" | "pty";
+    /** @enum {string} */
+    ProcessOwner: "user" | "desktop" | "system";
+    ProcessRunRequest: {
+      args?: string[];
+      command: string;
+      cwd?: string | null;
+      env?: {
+        [key: string]: string;
+      };
+      maxOutputBytes?: number | null;
+      /** Format: int64 */
+      timeoutMs?: number | null;
+    };
+    ProcessRunResponse: {
+      /** Format: int64 */
+      durationMs: number;
+      /** Format: int32 */
+      exitCode?: number | null;
+      stderr: string;
+      stderrTruncated: boolean;
+      stdout: string;
+      stdoutTruncated: boolean;
+      timedOut: boolean;
+    };
+    ProcessSignalQuery: {
+      /** Format: int64 */
+      waitMs?: number | null;
+    };
+    /** @enum {string} */
+    ProcessState: "running" | "exited";
+    ProcessTerminalResizeRequest: {
+      /** Format: int32 */
+      cols: number;
+      /** Format: int32 */
+      rows: number;
+    };
+    ProcessTerminalResizeResponse: {
+      /** Format: int32 */
+      cols: number;
+      /** Format: int32 */
+      rows: number;
+    };
     /** @enum {string} */
     ServerStatus: "running" | "stopped";
     ServerStatusInfo: {
@@ -264,7 +1018,6 @@ export type $defs = Record<string, never>;
 export type external = Record<string, never>;
 
 export interface operations {
-
   get_v1_acp_servers: {
     responses: {
       /** @description Active ACP server instances */
@@ -599,6 +1352,1118 @@ export interface operations {
       };
     };
   };
+  /**
+   * Read the desktop clipboard.
+   * @description Returns the current text content of the X11 clipboard.
+   */
+  get_v1_desktop_clipboard: {
+    parameters: {
+      query?: {
+        selection?: string | null;
+      };
+    };
+    responses: {
+      /** @description Clipboard contents */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopClipboardResponse"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Clipboard read failed */
+      500: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Write to the desktop clipboard.
+   * @description Sets the text content of the X11 clipboard.
+   */
+  post_v1_desktop_clipboard: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopClipboardWriteRequest"];
+      };
+    };
+    responses: {
+      /** @description Clipboard updated */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopActionResponse"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Clipboard write failed */
+      500: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get desktop display information.
+   * @description Performs a health-gated display query against the managed desktop and
+   * returns the current display identifier and resolution.
+   */
+  get_v1_desktop_display_info: {
+    responses: {
+      /** @description Desktop display information */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopDisplayInfoResponse"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or display query failed */
+      503: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Press and hold a desktop keyboard key.
+   * @description Performs a health-gated `xdotool keydown` operation against the managed
+   * desktop.
+   */
+  post_v1_desktop_keyboard_down: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopKeyboardDownRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop keyboard action result */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopActionResponse"];
+        };
+      };
+      /** @description Invalid keyboard down request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Press a desktop keyboard shortcut.
+   * @description Performs a health-gated `xdotool key` operation against the managed
+   * desktop.
+   */
+  post_v1_desktop_keyboard_press: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopKeyboardPressRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop keyboard action result */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopActionResponse"];
+        };
+      };
+      /** @description Invalid keyboard press request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Type desktop keyboard text.
+   * @description Performs a health-gated `xdotool type` operation against the managed
+   * desktop.
+   */
+  post_v1_desktop_keyboard_type: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopKeyboardTypeRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop keyboard action result */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopActionResponse"];
+        };
+      };
+      /** @description Invalid keyboard type request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Release a desktop keyboard key.
+   * @description Performs a health-gated `xdotool keyup` operation against the managed
+   * desktop.
+   */
+  post_v1_desktop_keyboard_up: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopKeyboardUpRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop keyboard action result */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopActionResponse"];
+        };
+      };
+      /** @description Invalid keyboard up request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Launch a desktop application.
+   * @description Launches an application by name on the managed desktop, optionally waiting
+   * for its window to appear.
+   */
+  post_v1_desktop_launch: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopLaunchRequest"];
+      };
+    };
+    responses: {
+      /** @description Application launched */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopLaunchResponse"];
+        };
+      };
+      /** @description Application not found */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Click on the desktop.
+   * @description Performs a health-gated pointer move and click against the managed desktop
+   * and returns the resulting mouse position.
+   */
+  post_v1_desktop_mouse_click: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopMouseClickRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop mouse position after click */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Invalid mouse click request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Press and hold a desktop mouse button.
+   * @description Performs a health-gated optional pointer move followed by `xdotool mousedown`
+   * and returns the resulting mouse position.
+   */
+  post_v1_desktop_mouse_down: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopMouseDownRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop mouse position after button press */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Invalid mouse down request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Drag the desktop mouse.
+   * @description Performs a health-gated drag gesture against the managed desktop and
+   * returns the resulting mouse position.
+   */
+  post_v1_desktop_mouse_drag: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopMouseDragRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop mouse position after drag */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Invalid mouse drag request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Move the desktop mouse.
+   * @description Performs a health-gated absolute pointer move on the managed desktop and
+   * returns the resulting mouse position.
+   */
+  post_v1_desktop_mouse_move: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopMouseMoveRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop mouse position after move */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Invalid mouse move request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get the current desktop mouse position.
+   * @description Performs a health-gated mouse position query against the managed desktop.
+   */
+  get_v1_desktop_mouse_position: {
+    responses: {
+      /** @description Desktop mouse position */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input check failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Scroll the desktop mouse wheel.
+   * @description Performs a health-gated scroll gesture at the requested coordinates and
+   * returns the resulting mouse position.
+   */
+  post_v1_desktop_mouse_scroll: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopMouseScrollRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop mouse position after scroll */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Invalid mouse scroll request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Release a desktop mouse button.
+   * @description Performs a health-gated optional pointer move followed by `xdotool mouseup`
+   * and returns the resulting mouse position.
+   */
+  post_v1_desktop_mouse_up: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopMouseUpRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop mouse position after button release */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopMousePositionResponse"];
+        };
+      };
+      /** @description Invalid mouse up request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or input failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Open a file or URL with the default handler.
+   * @description Opens a file path or URL using xdg-open on the managed desktop.
+   */
+  post_v1_desktop_open: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopOpenRequest"];
+      };
+    };
+    responses: {
+      /** @description Target opened */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopOpenResponse"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Start desktop recording.
+   * @description Starts an ffmpeg x11grab recording against the managed desktop and returns
+   * the created recording metadata.
+   */
+  post_v1_desktop_recording_start: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopRecordingStartRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop recording started */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopRecordingInfo"];
+        };
+      };
+      /** @description Desktop runtime is not ready or a recording is already active */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop recording failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Stop desktop recording.
+   * @description Stops the active desktop recording and returns the finalized recording
+   * metadata.
+   */
+  post_v1_desktop_recording_stop: {
+    responses: {
+      /** @description Desktop recording stopped */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopRecordingInfo"];
+        };
+      };
+      /** @description No active desktop recording */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop recording stop failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * List desktop recordings.
+   * @description Returns the current desktop recording catalog.
+   */
+  get_v1_desktop_recordings: {
+    responses: {
+      /** @description Desktop recordings */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopRecordingListResponse"];
+        };
+      };
+      /** @description Desktop recordings query failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get desktop recording metadata.
+   * @description Returns metadata for a single desktop recording.
+   */
+  get_v1_desktop_recording: {
+    parameters: {
+      path: {
+        /** @description Desktop recording ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Desktop recording metadata */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopRecordingInfo"];
+        };
+      };
+      /** @description Unknown desktop recording */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Delete a desktop recording.
+   * @description Removes a completed desktop recording and its file from disk.
+   */
+  delete_v1_desktop_recording: {
+    parameters: {
+      path: {
+        /** @description Desktop recording ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Desktop recording deleted */
+      204: {
+        content: never;
+      };
+      /** @description Unknown desktop recording */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop recording is still active */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Download a desktop recording.
+   * @description Serves the recorded MP4 bytes for a completed desktop recording.
+   */
+  get_v1_desktop_recording_download: {
+    parameters: {
+      path: {
+        /** @description Desktop recording ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Desktop recording as MP4 bytes */
+      200: {
+        content: never;
+      };
+      /** @description Unknown desktop recording */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Capture a full desktop screenshot.
+   * @description Performs a health-gated full-frame screenshot of the managed desktop and
+   * returns the requested image bytes.
+   */
+  get_v1_desktop_screenshot: {
+    parameters: {
+      query?: {
+        format?: components["schemas"]["DesktopScreenshotFormat"] | null;
+        quality?: number | null;
+        scale?: number | null;
+        showCursor?: boolean | null;
+      };
+    };
+    responses: {
+      /** @description Desktop screenshot as image bytes */
+      200: {
+        content: never;
+      };
+      /** @description Invalid screenshot query */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or screenshot capture failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Capture a desktop screenshot region.
+   * @description Performs a health-gated screenshot crop against the managed desktop and
+   * returns the requested region image bytes.
+   */
+  get_v1_desktop_screenshot_region: {
+    parameters: {
+      query: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        format?: components["schemas"]["DesktopScreenshotFormat"] | null;
+        quality?: number | null;
+        scale?: number | null;
+        showCursor?: boolean | null;
+      };
+    };
+    responses: {
+      /** @description Desktop screenshot region as image bytes */
+      200: {
+        content: never;
+      };
+      /** @description Invalid screenshot region */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or screenshot capture failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Start the private desktop runtime.
+   * @description Lazily launches the managed Xvfb/openbox stack, validates display health,
+   * and returns the resulting desktop status snapshot.
+   */
+  post_v1_desktop_start: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopStartRequest"];
+      };
+    };
+    responses: {
+      /** @description Desktop runtime status after start */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopStatusResponse"];
+        };
+      };
+      /** @description Invalid desktop start request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is already transitioning */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime could not be started */
+      503: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get desktop runtime status.
+   * @description Returns the current desktop runtime state, dependency status, active
+   * display metadata, and supervised process information.
+   */
+  get_v1_desktop_status: {
+    responses: {
+      /** @description Desktop runtime status */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopStatusResponse"];
+        };
+      };
+      /** @description Authentication required */
+      401: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Stop the private desktop runtime.
+   * @description Terminates the managed openbox/Xvfb/dbus processes owned by the desktop
+   * runtime and returns the resulting status snapshot.
+   */
+  post_v1_desktop_stop: {
+    responses: {
+      /** @description Desktop runtime status after stop */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopStatusResponse"];
+        };
+      };
+      /** @description Desktop runtime is already transitioning */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Open a desktop WebRTC signaling session.
+   * @description Upgrades the connection to a WebSocket used for WebRTC signaling between
+   * the browser client and the desktop streaming process. Also accepts mouse
+   * and keyboard input frames as a fallback transport.
+   */
+  get_v1_desktop_stream_ws: {
+    parameters: {
+      query?: {
+        /** @description Bearer token alternative for WS auth */
+        access_token?: string | null;
+      };
+    };
+    responses: {
+      /** @description WebSocket upgraded */
+      101: {
+        content: never;
+      };
+      /** @description Desktop runtime or streaming session is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop stream failed */
+      502: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Start desktop streaming.
+   * @description Enables desktop websocket streaming for the managed desktop.
+   */
+  post_v1_desktop_stream_start: {
+    responses: {
+      /** @description Desktop streaming started */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopStreamStatusResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Get desktop stream status.
+   * @description Returns the current state of the desktop WebRTC streaming session.
+   */
+  get_v1_desktop_stream_status: {
+    responses: {
+      /** @description Desktop stream status */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopStreamStatusResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Stop desktop streaming.
+   * @description Disables desktop websocket streaming for the managed desktop.
+   */
+  post_v1_desktop_stream_stop: {
+    responses: {
+      /** @description Desktop streaming stopped */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopStreamStatusResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * List visible desktop windows.
+   * @description Performs a health-gated visible-window enumeration against the managed
+   * desktop and returns the current window metadata.
+   */
+  get_v1_desktop_windows: {
+    responses: {
+      /** @description Visible desktop windows */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopWindowListResponse"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime health or window query failed */
+      503: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get the currently focused desktop window.
+   * @description Returns information about the window that currently has input focus.
+   */
+  get_v1_desktop_windows_focused: {
+    responses: {
+      /** @description Focused window info */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopWindowInfo"];
+        };
+      };
+      /** @description No window is focused */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Focus a desktop window.
+   * @description Brings the specified window to the foreground and gives it input focus.
+   */
+  post_v1_desktop_window_focus: {
+    parameters: {
+      path: {
+        /** @description X11 window ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Window info after focus */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopWindowInfo"];
+        };
+      };
+      /** @description Window not found */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Move a desktop window.
+   * @description Moves the specified window to the given position.
+   */
+  post_v1_desktop_window_move: {
+    parameters: {
+      path: {
+        /** @description X11 window ID */
+        id: string;
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopWindowMoveRequest"];
+      };
+    };
+    responses: {
+      /** @description Window info after move */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopWindowInfo"];
+        };
+      };
+      /** @description Window not found */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Resize a desktop window.
+   * @description Resizes the specified window to the given dimensions.
+   */
+  post_v1_desktop_window_resize: {
+    parameters: {
+      path: {
+        /** @description X11 window ID */
+        id: string;
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DesktopWindowResizeRequest"];
+      };
+    };
+    responses: {
+      /** @description Window info after resize */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DesktopWindowInfo"];
+        };
+      };
+      /** @description Window not found */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Desktop runtime is not ready */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
   get_v1_fs_entries: {
     parameters: {
       query?: {
@@ -748,4 +2613,491 @@ export interface operations {
       };
     };
   };
+  /**
+   * List all managed processes.
+   * @description Returns a list of all processes (running and exited) currently tracked
+   * by the runtime, sorted by process ID.
+   */
+  get_v1_processes: {
+    parameters: {
+      query?: {
+        owner?: components["schemas"]["ProcessOwner"] | null;
+      };
+    };
+    responses: {
+      /** @description List processes */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessListResponse"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Create a long-lived managed process.
+   * @description Spawns a new process with the given command and arguments. Supports both
+   * pipe-based and PTY (tty) modes. Returns the process descriptor on success.
+   */
+  post_v1_processes: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["ProcessCreateRequest"];
+      };
+    };
+    responses: {
+      /** @description Started process */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessInfo"];
+        };
+      };
+      /** @description Invalid request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process limit or state conflict */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get process runtime configuration.
+   * @description Returns the current runtime configuration for the process management API,
+   * including limits for concurrency, timeouts, and buffer sizes.
+   */
+  get_v1_processes_config: {
+    responses: {
+      /** @description Current runtime process config */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessConfig"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Update process runtime configuration.
+   * @description Replaces the runtime configuration for the process management API.
+   * Validates that all values are non-zero and clamps default timeout to max.
+   */
+  post_v1_processes_config: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["ProcessConfig"];
+      };
+    };
+    responses: {
+      /** @description Updated runtime process config */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessConfig"];
+        };
+      };
+      /** @description Invalid config */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Run a one-shot command.
+   * @description Executes a command to completion and returns its stdout, stderr, exit code,
+   * and duration. Supports configurable timeout and output size limits.
+   */
+  post_v1_processes_run: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["ProcessRunRequest"];
+      };
+    };
+    responses: {
+      /** @description One-off command result */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessRunResponse"];
+        };
+      };
+      /** @description Invalid request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Get a single process by ID.
+   * @description Returns the current state of a managed process including its status,
+   * PID, exit code, and creation/exit timestamps.
+   */
+  get_v1_process: {
+    parameters: {
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Process details */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessInfo"];
+        };
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Delete a process record.
+   * @description Removes a stopped process from the runtime. Returns 409 if the process
+   * is still running; stop or kill it first.
+   */
+  delete_v1_process: {
+    parameters: {
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Process deleted */
+      204: {
+        content: never;
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process is still running */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Write input to a process.
+   * @description Sends data to a process's stdin (pipe mode) or PTY writer (tty mode).
+   * Data can be encoded as base64, utf8, or text. Returns 413 if the decoded
+   * payload exceeds the configured `maxInputBytesPerRequest` limit.
+   */
+  post_v1_process_input: {
+    parameters: {
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["ProcessInputRequest"];
+      };
+    };
+    responses: {
+      /** @description Input accepted */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessInputResponse"];
+        };
+      };
+      /** @description Invalid request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process not writable */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Input exceeds configured limit */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Send SIGKILL to a process.
+   * @description Sends SIGKILL to the process and optionally waits up to `waitMs`
+   * milliseconds for the process to exit before returning.
+   */
+  post_v1_process_kill: {
+    parameters: {
+      query?: {
+        /** @description Wait up to N ms for process to exit */
+        waitMs?: number | null;
+      };
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Kill signal sent */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessInfo"];
+        };
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Fetch process logs.
+   * @description Returns buffered log entries for a process. Supports filtering by stream
+   * type, tail count, and sequence-based resumption. When `follow=true`,
+   * returns an SSE stream that replays buffered entries then streams live output.
+   */
+  get_v1_process_logs: {
+    parameters: {
+      query?: {
+        /** @description stdout|stderr|combined|pty */
+        stream?: components["schemas"]["ProcessLogsStream"] | null;
+        /** @description Tail N entries */
+        tail?: number | null;
+        /** @description Follow via SSE */
+        follow?: boolean | null;
+        /** @description Only entries with sequence greater than this */
+        since?: number | null;
+      };
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Process logs */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessLogsResponse"];
+        };
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Send SIGTERM to a process.
+   * @description Sends SIGTERM to the process and optionally waits up to `waitMs`
+   * milliseconds for the process to exit before returning.
+   */
+  post_v1_process_stop: {
+    parameters: {
+      query?: {
+        /** @description Wait up to N ms for process to exit */
+        waitMs?: number | null;
+      };
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description Stop signal sent */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessInfo"];
+        };
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Resize a process terminal.
+   * @description Sets the PTY window size (columns and rows) for a tty-mode process and
+   * sends SIGWINCH so the child process can adapt.
+   */
+  post_v1_process_terminal_resize: {
+    parameters: {
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["ProcessTerminalResizeRequest"];
+      };
+    };
+    responses: {
+      /** @description Resize accepted */
+      200: {
+        content: {
+          "application/json": components["schemas"]["ProcessTerminalResizeResponse"];
+        };
+      };
+      /** @description Invalid request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Not a terminal process */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
+  /**
+   * Open an interactive WebSocket terminal session.
+   * @description Upgrades the connection to a WebSocket for bidirectional PTY I/O. Accepts
+   * `access_token` query param for browser-based auth (WebSocket API cannot
+   * send custom headers). Streams raw PTY output as binary frames and accepts
+   * JSON control frames for input, resize, and close.
+   */
+  get_v1_process_terminal_ws: {
+    parameters: {
+      query?: {
+        /** @description Bearer token alternative for WS auth */
+        access_token?: string | null;
+      };
+      path: {
+        /** @description Process ID */
+        id: string;
+      };
+    };
+    responses: {
+      /** @description WebSocket upgraded */
+      101: {
+        content: never;
+      };
+      /** @description Invalid websocket frame or upgrade request */
+      400: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Unknown process */
+      404: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Not a terminal process */
+      409: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+      /** @description Process API unsupported on this platform */
+      501: {
+        content: {
+          "application/json": components["schemas"]["ProblemDetails"];
+        };
+      };
+    };
+  };
 }
diff --git a/sdks/typescript/src/index.ts b/sdks/typescript/src/index.ts
index cb7d8cf..cd4611b 100644
--- a/sdks/typescript/src/index.ts
+++ b/sdks/typescript/src/index.ts
@@ -1,37 +1,94 @@
 export {
   LiveAcpConnection,
+  ProcessTerminalSession,
   SandboxAgent,
   SandboxAgentError,
+  SandboxDestroyedError,
   Session,
+  UnsupportedPermissionReplyError,
+  UnsupportedSessionCategoryError,
+  UnsupportedSessionConfigOptionError,
+  UnsupportedSessionValueError,
 } from "./client.ts";
 
 export { AcpRpcError } from "acp-http-client";
 
 export { buildInspectorUrl } from "./inspector.ts";
+export { DesktopStreamSession } from "./desktop-stream.ts";
+export type {
+  DesktopStreamConnectOptions,
+  DesktopStreamErrorStatus,
+  DesktopStreamReadyStatus,
+  DesktopStreamStatusMessage,
+} from "./desktop-stream.ts";
 
 export type {
+  SandboxAgentHealthWaitOptions,
+  AgentQueryOptions,
+  DesktopStreamSessionOptions,
+  ProcessLogFollowQuery,
+  ProcessLogListener,
+  ProcessLogSubscription,
+  ProcessTerminalConnectOptions,
+  ProcessTerminalSessionOptions,
+  ProcessTerminalWebSocketUrlOptions,
   SandboxAgentConnectOptions,
   SandboxAgentStartOptions,
   SessionCreateRequest,
   SessionResumeOrCreateRequest,
   SessionSendOptions,
   SessionEventListener,
+  PermissionReply,
+  PermissionRequestListener,
+  SessionPermissionRequest,
+  SessionPermissionRequestOption,
 } from "./client.ts";
 
 export type { InspectorUrlOptions } from "./inspector.ts";
 
-export {
-  InMemorySessionPersistDriver,
-} from "./types.ts";
+export { InMemorySessionPersistDriver } from "./types.ts";
+export type { SandboxProvider } from "./providers/types.ts";
 
 export type {
   AcpEnvelope,
   AcpServerInfo,
   AcpServerListResponse,
   AgentInfo,
+  AgentQuery,
   AgentInstallRequest,
   AgentInstallResponse,
   AgentListResponse,
+  DesktopActionResponse,
+  DesktopDisplayInfoResponse,
+  DesktopErrorInfo,
+  DesktopKeyboardDownRequest,
+  DesktopKeyboardUpRequest,
+  DesktopKeyModifiers,
+  DesktopKeyboardPressRequest,
+  DesktopKeyboardTypeRequest,
+  DesktopMouseButton,
+  DesktopMouseClickRequest,
+  DesktopMouseDownRequest,
+  DesktopMouseDragRequest,
+  DesktopMouseMoveRequest,
+  DesktopMousePositionResponse,
+  DesktopMouseScrollRequest,
+  DesktopMouseUpRequest,
+  DesktopProcessInfo,
+  DesktopRecordingInfo,
+  DesktopRecordingListResponse,
+  DesktopRecordingStartRequest,
+  DesktopRecordingStatus,
+  DesktopRegionScreenshotQuery,
+  DesktopResolution,
+  DesktopScreenshotFormat,
+  DesktopScreenshotQuery,
+  DesktopStartRequest,
+  DesktopState,
+  DesktopStatusResponse,
+  DesktopStreamStatusResponse,
+  DesktopWindowInfo,
+  DesktopWindowListResponse,
   FsActionResponse,
   FsDeleteQuery,
   FsEntriesQuery,
@@ -51,14 +108,48 @@ export type {
   McpConfigQuery,
   McpServerConfig,
   ProblemDetails,
+  ProcessConfig,
+  ProcessCreateRequest,
+  ProcessInfo,
+  ProcessInputRequest,
+  ProcessInputResponse,
+  ProcessListQuery,
+  ProcessListResponse,
+  ProcessLogEntry,
+  ProcessLogsQuery,
+  ProcessLogsResponse,
+  ProcessOwner,
+  ProcessLogsStream,
+  ProcessRunRequest,
+  ProcessRunResponse,
+  ProcessSignalQuery,
+  ProcessState,
+  ProcessTerminalClientFrame,
+  ProcessTerminalErrorFrame,
+  ProcessTerminalExitFrame,
+  ProcessTerminalReadyFrame,
+  ProcessTerminalResizeRequest,
+  ProcessTerminalResizeResponse,
+  ProcessTerminalServerFrame,
   SessionEvent,
   SessionPersistDriver,
   SessionRecord,
   SkillsConfig,
   SkillsConfigQuery,
+  TerminalErrorStatus,
+  TerminalExitStatus,
+  TerminalReadyStatus,
+  TerminalResizePayload,
+  TerminalStatusMessage,
 } from "./types.ts";
 
 export type {
   SandboxAgentSpawnLogMode,
   SandboxAgentSpawnOptions,
 } from "./spawn.ts";
+
+export type {
+  SpritesProviderOptions,
+  SpritesCreateOverrides,
+  SpritesClientOverrides,
+} from "./providers/sprites.ts";
diff --git a/sdks/typescript/src/providers/cloudflare.ts b/sdks/typescript/src/providers/cloudflare.ts
new file mode 100644
index 0000000..7f0bd25
--- /dev/null
+++ b/sdks/typescript/src/providers/cloudflare.ts
@@ -0,0 +1,80 @@
+import type { SandboxProvider } from "./types.ts";
+
+const DEFAULT_AGENT_PORT = 3000;
+
+export interface CloudflareSandboxClient {
+  create?(options?: Record<string, unknown>): Promise<{ id?: string; sandboxId?: string }>;
+  connect?(
+    sandboxId: string,
+    options?: Record<string, unknown>,
+  ): Promise<{
+    close?(): Promise<void>;
+    stop?(): Promise<void>;
+    containerFetch(input: RequestInfo | URL, init?: RequestInit, port?: number): Promise<Response>;
+  }>;
+}
+
+export interface CloudflareProviderOptions {
+  sdk: CloudflareSandboxClient;
+  create?: Record<string, unknown> | (() => Record<string, unknown> | Promise<Record<string, unknown>>);
+  agentPort?: number;
+}
+
+async function resolveCreateOptions(value: CloudflareProviderOptions["create"]): Promise<Record<string, unknown>> {
+  if (!value) {
+    return {};
+  }
+  if (typeof value === "function") {
+    return await value();
+  }
+  return value;
+}
+
+export function cloudflare(options: CloudflareProviderOptions): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+  const sdk = options.sdk;
+
+  return {
+    name: "cloudflare",
+    defaultCwd: "/root",
+    async create(): Promise<string> {
+      if (typeof sdk.create !== "function") {
+        throw new Error('sandbox provider "cloudflare" requires a sdk with a `create()` method.');
+      }
+      const sandbox = await sdk.create(await resolveCreateOptions(options.create));
+      const sandboxId = sandbox.sandboxId ?? sandbox.id;
+      if (!sandboxId) {
+        throw new Error("cloudflare sandbox did not return an id");
+      }
+      return sandboxId;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      if (typeof sdk.connect !== "function") {
+        throw new Error('sandbox provider "cloudflare" requires a sdk with a `connect()` method.');
+      }
+      const sandbox = await sdk.connect(sandboxId);
+      if (typeof sandbox.close === "function") {
+        await sandbox.close();
+        return;
+      }
+      if (typeof sandbox.stop === "function") {
+        await sandbox.stop();
+      }
+    },
+    async getFetch(sandboxId: string): Promise<typeof globalThis.fetch> {
+      if (typeof sdk.connect !== "function") {
+        throw new Error('sandbox provider "cloudflare" requires a sdk with a `connect()` method.');
+      }
+      const sandbox = await sdk.connect(sandboxId);
+      return async (input, init) =>
+        sandbox.containerFetch(
+          input,
+          {
+            ...(init ?? {}),
+            signal: undefined,
+          },
+          agentPort,
+        );
+    },
+  };
+}
diff --git a/sdks/typescript/src/providers/computesdk.ts b/sdks/typescript/src/providers/computesdk.ts
new file mode 100644
index 0000000..3ebb0da
--- /dev/null
+++ b/sdks/typescript/src/providers/computesdk.ts
@@ -0,0 +1,67 @@
+import { compute, type CreateSandboxOptions } from "computesdk";
+import type { SandboxProvider } from "./types.ts";
+import { DEFAULT_AGENTS, SANDBOX_AGENT_INSTALL_SCRIPT } from "./shared.ts";
+
+const DEFAULT_AGENT_PORT = 3000;
+
+type ComputeCreateOverrides = Partial<CreateSandboxOptions>;
+
+export interface ComputeSdkProviderOptions {
+  create?: ComputeCreateOverrides | (() => ComputeCreateOverrides | Promise<ComputeCreateOverrides>);
+  agentPort?: number;
+}
+
+async function resolveCreateOptions(value: ComputeSdkProviderOptions["create"]): Promise<ComputeCreateOverrides> {
+  if (!value) return {};
+  return typeof value === "function" ? await value() : value;
+}
+
+export function computesdk(options: ComputeSdkProviderOptions = {}): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+
+  return {
+    name: "computesdk",
+    defaultCwd: "/root",
+    async create(): Promise<string> {
+      const createOpts = await resolveCreateOptions(options.create);
+      const sandbox = await compute.sandbox.create({
+        ...createOpts,
+        envs: createOpts.envs && Object.keys(createOpts.envs).length > 0 ? createOpts.envs : undefined,
+      });
+
+      const run = async (cmd: string, runOptions?: { background?: boolean }) => {
+        const result = await sandbox.runCommand(cmd, runOptions);
+        if (typeof result?.exitCode === "number" && result.exitCode !== 0) {
+          throw new Error(`computesdk command failed: ${cmd} (exit ${result.exitCode})\n${result.stderr || ""}`);
+        }
+        return result;
+      };
+
+      await run(`curl -fsSL ${SANDBOX_AGENT_INSTALL_SCRIPT} | sh`);
+      for (const agent of DEFAULT_AGENTS) {
+        await run(`sandbox-agent install-agent ${agent}`);
+      }
+      await run(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`, {
+        background: true,
+      });
+
+      return sandbox.sandboxId;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const sandbox = await compute.sandbox.getById(sandboxId);
+      if (sandbox) await sandbox.destroy();
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const sandbox = await compute.sandbox.getById(sandboxId);
+      if (!sandbox) throw new Error(`computesdk sandbox not found: ${sandboxId}`);
+      return sandbox.getUrl({ port: agentPort });
+    },
+    async ensureServer(sandboxId: string): Promise<void> {
+      const sandbox = await compute.sandbox.getById(sandboxId);
+      if (!sandbox) throw new Error(`computesdk sandbox not found: ${sandboxId}`);
+      await sandbox.runCommand(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`, {
+        background: true,
+      });
+    },
+  };
+}
diff --git a/sdks/typescript/src/providers/daytona.ts b/sdks/typescript/src/providers/daytona.ts
new file mode 100644
index 0000000..7df740c
--- /dev/null
+++ b/sdks/typescript/src/providers/daytona.ts
@@ -0,0 +1,71 @@
+import { Daytona } from "@daytonaio/sdk";
+import type { SandboxProvider } from "./types.ts";
+import { DEFAULT_SANDBOX_AGENT_IMAGE, buildServerStartCommand } from "./shared.ts";
+
+const DEFAULT_AGENT_PORT = 3000;
+const DEFAULT_PREVIEW_TTL_SECONDS = 4 * 60 * 60;
+const DEFAULT_CWD = "/home/sandbox";
+
+type DaytonaCreateParams = NonNullable<Parameters<Daytona["create"]>[0]>;
+
+type DaytonaCreateOverrides = Partial<DaytonaCreateParams>;
+
+export interface DaytonaProviderOptions {
+  create?: DaytonaCreateOverrides | (() => DaytonaCreateOverrides | Promise<DaytonaCreateOverrides>);
+  image?: DaytonaCreateParams["image"];
+  agentPort?: number;
+  cwd?: string;
+  previewTtlSeconds?: number;
+  deleteTimeoutSeconds?: number;
+}
+
+async function resolveCreateOptions(value: DaytonaProviderOptions["create"]): Promise<DaytonaCreateOverrides | undefined> {
+  if (!value) return undefined;
+  if (typeof value === "function") return await value();
+  return value;
+}
+
+export function daytona(options: DaytonaProviderOptions = {}): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+  const image = options.image ?? DEFAULT_SANDBOX_AGENT_IMAGE;
+  const cwd = options.cwd ?? DEFAULT_CWD;
+  const previewTtlSeconds = options.previewTtlSeconds ?? DEFAULT_PREVIEW_TTL_SECONDS;
+  const client = new Daytona();
+
+  return {
+    name: "daytona",
+    defaultCwd: cwd,
+    async create(): Promise<string> {
+      const createOpts = await resolveCreateOptions(options.create);
+      const sandbox = await client.create({
+        image,
+        autoStopInterval: 0,
+        ...createOpts,
+      } as DaytonaCreateParams);
+      await sandbox.process.executeCommand(buildServerStartCommand(agentPort));
+      return sandbox.id;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const sandbox = await client.get(sandboxId);
+      if (!sandbox) {
+        return;
+      }
+      await sandbox.delete(options.deleteTimeoutSeconds);
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const sandbox = await client.get(sandboxId);
+      if (!sandbox) {
+        throw new Error(`daytona sandbox not found: ${sandboxId}`);
+      }
+      const preview = await sandbox.getSignedPreviewUrl(agentPort, previewTtlSeconds);
+      return typeof preview === "string" ? preview : preview.url;
+    },
+    async ensureServer(sandboxId: string): Promise<void> {
+      const sandbox = await client.get(sandboxId);
+      if (!sandbox) {
+        throw new Error(`daytona sandbox not found: ${sandboxId}`);
+      }
+      await sandbox.process.executeCommand(buildServerStartCommand(agentPort));
+    },
+  };
+}
diff --git a/sdks/typescript/src/providers/docker.ts b/sdks/typescript/src/providers/docker.ts
new file mode 100644
index 0000000..5db67bf
--- /dev/null
+++ b/sdks/typescript/src/providers/docker.ts
@@ -0,0 +1,86 @@
+import Docker from "dockerode";
+import getPort from "get-port";
+import type { SandboxProvider } from "./types.ts";
+import { DEFAULT_SANDBOX_AGENT_IMAGE } from "./shared.ts";
+
+const DEFAULT_HOST = "127.0.0.1";
+const DEFAULT_AGENT_PORT = 3000;
+
+export interface DockerProviderOptions {
+  image?: string;
+  host?: string;
+  agentPort?: number;
+  env?: string[] | (() => string[] | Promise<string[]>);
+  binds?: string[] | (() => string[] | Promise<string[]>);
+  createContainerOptions?: Record<string, unknown>;
+}
+
+async function resolveValue<T>(value: T | (() => T | Promise<T>) | undefined, fallback: T): Promise<T> {
+  if (value === undefined) {
+    return fallback;
+  }
+  if (typeof value === "function") {
+    return await (value as () => T | Promise<T>)();
+  }
+  return value;
+}
+
+function extractMappedPort(
+  inspect: { NetworkSettings?: { Ports?: Record<string, Array<{ HostPort?: string }> | null | undefined> } },
+  containerPort: number,
+): number {
+  const hostPort = inspect.NetworkSettings?.Ports?.[`${containerPort}/tcp`]?.[0]?.HostPort;
+  if (!hostPort) {
+    throw new Error(`docker sandbox-agent port ${containerPort} is not published`);
+  }
+  return Number(hostPort);
+}
+
+export function docker(options: DockerProviderOptions = {}): SandboxProvider {
+  const image = options.image ?? DEFAULT_SANDBOX_AGENT_IMAGE;
+  const host = options.host ?? DEFAULT_HOST;
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+  const client = new Docker({ socketPath: "/var/run/docker.sock" });
+
+  return {
+    name: "docker",
+    defaultCwd: "/home/sandbox",
+    async create(): Promise<string> {
+      const hostPort = await getPort();
+      const env = await resolveValue(options.env, []);
+      const binds = await resolveValue(options.binds, []);
+
+      const container = await client.createContainer({
+        Image: image,
+        Cmd: ["server", "--no-token", "--host", "0.0.0.0", "--port", String(agentPort)],
+        Env: env,
+        ExposedPorts: { [`${agentPort}/tcp`]: {} },
+        HostConfig: {
+          AutoRemove: true,
+          Binds: binds,
+          PortBindings: {
+            [`${agentPort}/tcp`]: [{ HostPort: String(hostPort) }],
+          },
+        },
+        ...(options.createContainerOptions ?? {}),
+      });
+
+      await container.start();
+      return container.id;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const container = client.getContainer(sandboxId);
+      try {
+        await container.stop({ t: 5 });
+      } catch {}
+      try {
+        await container.remove({ force: true });
+      } catch {}
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const container = client.getContainer(sandboxId);
+      const hostPort = extractMappedPort(await container.inspect(), agentPort);
+      return `http://${host}:${hostPort}`;
+    },
+  };
+}
diff --git a/sdks/typescript/src/providers/e2b.ts b/sdks/typescript/src/providers/e2b.ts
new file mode 100644
index 0000000..c35a187
--- /dev/null
+++ b/sdks/typescript/src/providers/e2b.ts
@@ -0,0 +1,112 @@
+import { NotFoundError, Sandbox, type SandboxBetaCreateOpts, type SandboxConnectOpts } from "@e2b/code-interpreter";
+import { SandboxDestroyedError } from "../client.ts";
+import type { SandboxProvider } from "./types.ts";
+import { DEFAULT_AGENTS, SANDBOX_AGENT_INSTALL_SCRIPT } from "./shared.ts";
+
+const DEFAULT_AGENT_PORT = 3000;
+const DEFAULT_TIMEOUT_MS = 3_600_000;
+const SANDBOX_AGENT_PATH_EXPORT = 'export PATH="/usr/local/bin:$HOME/.local/bin:$PATH"';
+
+type E2BCreateOverrides = Omit<Partial<SandboxBetaCreateOpts>, "timeoutMs" | "autoPause">;
+type E2BConnectOverrides = Omit<Partial<SandboxConnectOpts>, "timeoutMs">;
+type E2BTemplateOverride = string | (() => string | Promise<string>);
+
+export interface E2BProviderOptions {
+  create?: E2BCreateOverrides | (() => E2BCreateOverrides | Promise<E2BCreateOverrides>);
+  connect?: E2BConnectOverrides | ((sandboxId: string) => E2BConnectOverrides | Promise<E2BConnectOverrides>);
+  template?: E2BTemplateOverride;
+  agentPort?: number;
+  timeoutMs?: number;
+  autoPause?: boolean;
+}
+
+async function resolveOptions(value: E2BProviderOptions["create"] | E2BProviderOptions["connect"], sandboxId?: string): Promise<Record<string, unknown>> {
+  if (!value) return {};
+  if (typeof value === "function") {
+    if (sandboxId) {
+      return await (value as (id: string) => Record<string, unknown> | Promise<Record<string, unknown>>)(sandboxId);
+    }
+    return await (value as () => Record<string, unknown> | Promise<Record<string, unknown>>)();
+  }
+  return value;
+}
+
+async function resolveTemplate(value: E2BTemplateOverride | undefined): Promise<string | undefined> {
+  if (!value) return undefined;
+  return typeof value === "function" ? await value() : value;
+}
+
+function buildShellCommand(command: string, strict = false): string {
+  const strictPrefix = strict ? "set -euo pipefail; " : "";
+  return `bash -lc '${strictPrefix}${SANDBOX_AGENT_PATH_EXPORT}; ${command}'`;
+}
+
+export function e2b(options: E2BProviderOptions = {}): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const autoPause = options.autoPause ?? true;
+
+  return {
+    name: "e2b",
+    defaultCwd: "/home/user",
+    async create(): Promise<string> {
+      const createOpts = await resolveOptions(options.create);
+      const rawTemplate = typeof createOpts.template === "string" ? createOpts.template : undefined;
+      const restCreateOpts = { ...createOpts };
+      delete restCreateOpts.template;
+      const template = (await resolveTemplate(options.template)) ?? rawTemplate;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const sandbox = template
+        ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          await Sandbox.betaCreate(template, { allowInternetAccess: true, ...restCreateOpts, timeoutMs, autoPause } as any)
+        : // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          await Sandbox.betaCreate({ allowInternetAccess: true, ...restCreateOpts, timeoutMs, autoPause } as any);
+
+      await sandbox.commands.run(buildShellCommand(`curl -fsSL ${SANDBOX_AGENT_INSTALL_SCRIPT} | sh`, true)).then((r) => {
+        if (r.exitCode !== 0) throw new Error(`e2b install failed:\n${r.stderr}`);
+      });
+      for (const agent of DEFAULT_AGENTS) {
+        await sandbox.commands.run(buildShellCommand(`sandbox-agent install-agent ${agent}`)).then((r) => {
+          if (r.exitCode !== 0) throw new Error(`e2b agent install failed: ${agent}\n${r.stderr}`);
+        });
+      }
+      await sandbox.commands.run(buildShellCommand(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`), { background: true, timeoutMs: 0 });
+
+      return sandbox.sandboxId;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      await this.pause?.(sandboxId);
+    },
+    async reconnect(sandboxId: string): Promise<void> {
+      const connectOpts = await resolveOptions(options.connect, sandboxId);
+      try {
+        await Sandbox.connect(sandboxId, { ...connectOpts, timeoutMs } as SandboxConnectOpts);
+      } catch (error) {
+        if (error instanceof NotFoundError) {
+          throw new SandboxDestroyedError(sandboxId, "e2b", { cause: error });
+        }
+        throw error;
+      }
+    },
+    async pause(sandboxId: string): Promise<void> {
+      const connectOpts = await resolveOptions(options.connect, sandboxId);
+      const sandbox = await Sandbox.connect(sandboxId, { ...connectOpts, timeoutMs } as SandboxConnectOpts);
+      await sandbox.betaPause();
+    },
+    async kill(sandboxId: string): Promise<void> {
+      const connectOpts = await resolveOptions(options.connect, sandboxId);
+      const sandbox = await Sandbox.connect(sandboxId, { ...connectOpts, timeoutMs } as SandboxConnectOpts);
+      await sandbox.kill();
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const connectOpts = await resolveOptions(options.connect, sandboxId);
+      const sandbox = await Sandbox.connect(sandboxId, { ...connectOpts, timeoutMs } as SandboxConnectOpts);
+      return `https://${sandbox.getHost(agentPort)}`;
+    },
+    async ensureServer(sandboxId: string): Promise<void> {
+      const connectOpts = await resolveOptions(options.connect, sandboxId);
+      const sandbox = await Sandbox.connect(sandboxId, { ...connectOpts, timeoutMs } as SandboxConnectOpts);
+      await sandbox.commands.run(buildShellCommand(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`), { background: true, timeoutMs: 0 });
+    },
+  };
+}
diff --git a/sdks/typescript/src/providers/local.ts b/sdks/typescript/src/providers/local.ts
new file mode 100644
index 0000000..18fc3d4
--- /dev/null
+++ b/sdks/typescript/src/providers/local.ts
@@ -0,0 +1,84 @@
+import { spawnSandboxAgent, type SandboxAgentSpawnHandle, type SandboxAgentSpawnLogMode, type SandboxAgentSpawnOptions } from "../spawn.ts";
+import type { SandboxProvider } from "./types.ts";
+
+export interface LocalProviderOptions {
+  host?: string;
+  port?: number;
+  token?: string;
+  binaryPath?: string;
+  log?: SandboxAgentSpawnLogMode;
+  env?: Record<string, string>;
+}
+
+const localSandboxes = new Map<string, SandboxAgentSpawnHandle>();
+
+type LocalSandboxProvider = SandboxProvider & {
+  getToken(sandboxId: string): Promise<string | undefined>;
+};
+
+export function local(options: LocalProviderOptions = {}): SandboxProvider {
+  const provider: LocalSandboxProvider = {
+    name: "local",
+    async create(): Promise<string> {
+      const handle = await spawnSandboxAgent(
+        {
+          host: options.host,
+          port: options.port,
+          token: options.token,
+          binaryPath: options.binaryPath,
+          log: options.log,
+          env: options.env,
+        } satisfies SandboxAgentSpawnOptions,
+        globalThis.fetch?.bind(globalThis),
+      );
+
+      const rawSandboxId = baseUrlToSandboxId(handle.baseUrl);
+      localSandboxes.set(rawSandboxId, handle);
+      return rawSandboxId;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const handle = localSandboxes.get(sandboxId);
+      if (!handle) {
+        return;
+      }
+      localSandboxes.delete(sandboxId);
+      await handle.dispose();
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      return `http://${sandboxId}`;
+    },
+    async getFetch(sandboxId: string): Promise<typeof globalThis.fetch> {
+      const handle = localSandboxes.get(sandboxId);
+      const token = options.token ?? handle?.token;
+      const fetcher = globalThis.fetch?.bind(globalThis);
+      if (!fetcher) {
+        throw new Error("Fetch API is not available; provide a fetch implementation.");
+      }
+
+      if (!token) {
+        return fetcher;
+      }
+
+      return async (input, init) => {
+        const request = new Request(input, init);
+        const targetUrl = new URL(request.url);
+        targetUrl.protocol = "http:";
+        targetUrl.host = sandboxId;
+        const headers = new Headers(request.headers);
+        if (!headers.has("authorization")) {
+          headers.set("authorization", `Bearer ${token}`);
+        }
+        const forwarded = new Request(targetUrl.toString(), request);
+        return fetcher(new Request(forwarded, { headers }));
+      };
+    },
+    async getToken(sandboxId: string): Promise<string | undefined> {
+      return options.token ?? localSandboxes.get(sandboxId)?.token;
+    },
+  };
+  return provider;
+}
+
+function baseUrlToSandboxId(baseUrl: string): string {
+  return new URL(baseUrl).host;
+}
diff --git a/sdks/typescript/src/providers/modal.ts b/sdks/typescript/src/providers/modal.ts
new file mode 100644
index 0000000..fad98c2
--- /dev/null
+++ b/sdks/typescript/src/providers/modal.ts
@@ -0,0 +1,84 @@
+import { ModalClient, type Image, type SandboxCreateParams } from "modal";
+import type { SandboxProvider } from "./types.ts";
+import { DEFAULT_SANDBOX_AGENT_IMAGE } from "./shared.ts";
+
+const DEFAULT_AGENT_PORT = 3000;
+const DEFAULT_APP_NAME = "sandbox-agent";
+const DEFAULT_MEMORY_MIB = 2048;
+
+type ModalCreateOverrides = Omit<Partial<SandboxCreateParams>, "secrets" | "encryptedPorts"> & {
+  secrets?: Record<string, string>;
+  encryptedPorts?: number[];
+  appName?: string;
+};
+
+export interface ModalProviderOptions {
+  create?: ModalCreateOverrides | (() => ModalCreateOverrides | Promise<ModalCreateOverrides>);
+  image?: string | Image;
+  agentPort?: number;
+}
+
+async function resolveCreateOptions(value: ModalProviderOptions["create"]): Promise<ModalCreateOverrides> {
+  if (!value) return {};
+  return typeof value === "function" ? await value() : value;
+}
+
+export function modal(options: ModalProviderOptions = {}): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+  const client = new ModalClient();
+
+  return {
+    name: "modal",
+    defaultCwd: "/root",
+    async create(): Promise<string> {
+      const createOpts = await resolveCreateOptions(options.create);
+      const appName = createOpts.appName ?? DEFAULT_APP_NAME;
+      const baseImage = options.image ?? DEFAULT_SANDBOX_AGENT_IMAGE;
+      const app = await client.apps.fromName(appName, { createIfMissing: true });
+
+      // The default `-full` base image already includes sandbox-agent and all
+      // agents pre-installed, so no additional dockerfile commands are needed.
+      const image = typeof baseImage === "string" ? client.images.fromRegistry(baseImage) : baseImage;
+
+      const envVars = createOpts.secrets ?? {};
+      const secrets = Object.keys(envVars).length > 0 ? [await client.secrets.fromObject(envVars)] : [];
+      const sandboxCreateOpts = { ...createOpts };
+      delete sandboxCreateOpts.appName;
+      delete sandboxCreateOpts.secrets;
+
+      const extraPorts = createOpts.encryptedPorts ?? [];
+      delete sandboxCreateOpts.encryptedPorts;
+
+      const sb = await client.sandboxes.create(app, image, {
+        ...sandboxCreateOpts,
+        encryptedPorts: [agentPort, ...extraPorts],
+        secrets,
+        memoryMiB: sandboxCreateOpts.memoryMiB ?? DEFAULT_MEMORY_MIB,
+      });
+
+      // Start the server as a long-running exec process. We intentionally
+      // do NOT await p.wait() — the process stays alive for the sandbox
+      // lifetime and keeps the port open for the tunnel.
+      sb.exec(["sandbox-agent", "server", "--no-token", "--host", "0.0.0.0", "--port", String(agentPort)]);
+
+      return sb.sandboxId;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const sb = await client.sandboxes.fromId(sandboxId);
+      await sb.terminate();
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const sb = await client.sandboxes.fromId(sandboxId);
+      const tunnels = await sb.tunnels();
+      const tunnel = tunnels[agentPort];
+      if (!tunnel) {
+        throw new Error(`modal: no tunnel found for port ${agentPort}`);
+      }
+      return tunnel.url;
+    },
+    async ensureServer(sandboxId: string): Promise<void> {
+      const sb = await client.sandboxes.fromId(sandboxId);
+      sb.exec(["sandbox-agent", "server", "--no-token", "--host", "0.0.0.0", "--port", String(agentPort)]);
+    },
+  };
+}
diff --git a/sdks/typescript/src/providers/shared.ts b/sdks/typescript/src/providers/shared.ts
new file mode 100644
index 0000000..eda610e
--- /dev/null
+++ b/sdks/typescript/src/providers/shared.ts
@@ -0,0 +1,9 @@
+export const SANDBOX_AGENT_VERSION = "0.5.0-rc.2";
+export const DEFAULT_SANDBOX_AGENT_IMAGE = `rivetdev/sandbox-agent:${SANDBOX_AGENT_VERSION}-full`;
+export const SANDBOX_AGENT_INSTALL_SCRIPT = `https://releases.rivet.dev/sandbox-agent/${SANDBOX_AGENT_VERSION}/install.sh`;
+export const SANDBOX_AGENT_NPX_SPEC = `@sandbox-agent/cli@${SANDBOX_AGENT_VERSION}`;
+export const DEFAULT_AGENTS = ["claude", "codex"] as const;
+
+export function buildServerStartCommand(port: number): string {
+  return `nohup sandbox-agent server --no-token --host 0.0.0.0 --port ${port} >/tmp/sandbox-agent.log 2>&1 &`;
+}
diff --git a/sdks/typescript/src/providers/sprites.ts b/sdks/typescript/src/providers/sprites.ts
new file mode 100644
index 0000000..aebc3db
--- /dev/null
+++ b/sdks/typescript/src/providers/sprites.ts
@@ -0,0 +1,267 @@
+import { ExecError, SpritesClient, type ClientOptions as SpritesClientOptions, type SpriteConfig } from "@fly/sprites";
+import { SandboxDestroyedError } from "../client.ts";
+import type { SandboxProvider } from "./types.ts";
+import { SANDBOX_AGENT_NPX_SPEC } from "./shared.ts";
+
+const DEFAULT_AGENT_PORT = 8080;
+const DEFAULT_SERVICE_NAME = "sandbox-agent";
+const DEFAULT_NAME_PREFIX = "sandbox-agent";
+const DEFAULT_SERVICE_START_DURATION = "10m";
+
+export interface SpritesCreateOverrides {
+  name?: string;
+  config?: SpriteConfig;
+}
+
+export type SpritesClientOverrides = Partial<SpritesClientOptions>;
+
+export interface SpritesProviderOptions {
+  token?: string | (() => string | Promise<string>);
+  client?: SpritesClientOverrides | (() => SpritesClientOverrides | Promise<SpritesClientOverrides>);
+  create?: SpritesCreateOverrides | (() => SpritesCreateOverrides | Promise<SpritesCreateOverrides>);
+  env?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+  installAgents?: readonly string[];
+  agentPort?: number;
+  serviceName?: string;
+  serviceStartDuration?: string;
+  namePrefix?: string;
+}
+
+type SpritesSandboxProvider = SandboxProvider & {
+  getToken(sandboxId: string): Promise<string>;
+};
+
+interface SpritesService {
+  cmd?: string;
+  args?: string[];
+  http_port?: number | null;
+  state?: {
+    status?: string;
+  };
+}
+
+async function resolveValue<T>(value: T | (() => T | Promise<T>) | undefined, fallback: T): Promise<T> {
+  if (value === undefined) {
+    return fallback;
+  }
+  if (typeof value === "function") {
+    return await (value as () => T | Promise<T>)();
+  }
+  return value;
+}
+
+async function resolveToken(value: SpritesProviderOptions["token"]): Promise<string> {
+  const token = await resolveValue(value, process.env.SPRITES_API_KEY ?? process.env.SPRITE_TOKEN ?? process.env.SPRITES_TOKEN ?? "");
+  if (!token) {
+    throw new Error("sprites provider requires a token. Set SPRITES_API_KEY (or SPRITE_TOKEN) or pass `token`.");
+  }
+  return token;
+}
+
+function createSpritesClient(token: string, options: SpritesClientOverrides): SpritesClient {
+  return new SpritesClient(token, options);
+}
+
+function generateSpriteName(prefix: string): string {
+  const suffix =
+    typeof globalThis.crypto?.randomUUID === "function"
+      ? globalThis.crypto.randomUUID().slice(0, 8)
+      : `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${prefix}-${suffix}`.toLowerCase();
+}
+
+function isSpriteNotFoundError(error: unknown): boolean {
+  return error instanceof Error && error.message.startsWith("Sprite not found:");
+}
+
+function shellQuote(value: string): string {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+
+function buildServiceCommand(env: Record<string, string>, port: number): string {
+  const exportParts: string[] = [];
+  for (const [key, value] of Object.entries(env)) {
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
+      throw new Error(`sprites provider received an invalid environment variable name: ${key}`);
+    }
+    exportParts.push(`export ${key}=${shellQuote(value)}`);
+  }
+
+  exportParts.push(`exec npx -y ${SANDBOX_AGENT_NPX_SPEC} server --no-token --host 0.0.0.0 --port ${port}`);
+  return exportParts.join("; ");
+}
+
+async function runSpriteCommand(sprite: ReturnType<SpritesClient["sprite"]>, file: string, args: string[], env?: Record<string, string>): Promise<void> {
+  try {
+    const result = await sprite.execFile(file, args, env ? { env } : undefined);
+    if (result.exitCode !== 0) {
+      throw new Error(`sprites command failed: ${file} ${args.join(" ")}`);
+    }
+  } catch (error) {
+    if (error instanceof ExecError) {
+      throw new Error(
+        `sprites command failed: ${file} ${args.join(" ")} (exit ${error.exitCode})\nstdout:\n${String(error.stdout)}\nstderr:\n${String(error.stderr)}`,
+        { cause: error },
+      );
+    }
+    throw error;
+  }
+}
+
+async function fetchService(client: SpritesClient, spriteName: string, serviceName: string): Promise<SpritesService | undefined> {
+  const response = await fetch(`${client.baseURL}/v1/sprites/${encodeURIComponent(spriteName)}/services/${encodeURIComponent(serviceName)}`, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${client.token}`,
+    },
+  });
+
+  if (response.status === 404) {
+    return undefined;
+  }
+
+  if (!response.ok) {
+    throw new Error(`sprites service lookup failed (status ${response.status}): ${await response.text()}`);
+  }
+
+  return (await response.json()) as SpritesService;
+}
+
+async function upsertService(client: SpritesClient, spriteName: string, serviceName: string, port: number, command: string): Promise<void> {
+  const existing = await fetchService(client, spriteName, serviceName);
+  const expectedArgs = ["-lc", command];
+  const isCurrent = existing?.cmd === "bash" && existing.http_port === port && JSON.stringify(existing.args ?? []) === JSON.stringify(expectedArgs);
+  if (isCurrent) {
+    return;
+  }
+
+  const response = await fetch(`${client.baseURL}/v1/sprites/${encodeURIComponent(spriteName)}/services/${encodeURIComponent(serviceName)}`, {
+    method: "PUT",
+    headers: {
+      Authorization: `Bearer ${client.token}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      cmd: "bash",
+      args: expectedArgs,
+      http_port: port,
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`sprites service upsert failed (status ${response.status}): ${await response.text()}`);
+  }
+}
+
+async function startServiceIfNeeded(client: SpritesClient, spriteName: string, serviceName: string, duration: string): Promise<void> {
+  const existing = await fetchService(client, spriteName, serviceName);
+  if (existing?.state?.status === "running" || existing?.state?.status === "starting") {
+    return;
+  }
+
+  const response = await fetch(
+    `${client.baseURL}/v1/sprites/${encodeURIComponent(spriteName)}/services/${encodeURIComponent(serviceName)}/start?duration=${encodeURIComponent(duration)}`,
+    {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${client.token}`,
+      },
+    },
+  );
+
+  if (!response.ok) {
+    throw new Error(`sprites service start failed (status ${response.status}): ${await response.text()}`);
+  }
+
+  await response.text();
+}
+
+async function ensureService(
+  client: SpritesClient,
+  spriteName: string,
+  serviceName: string,
+  port: number,
+  duration: string,
+  env: Record<string, string>,
+): Promise<void> {
+  const command = buildServiceCommand(env, port);
+  await upsertService(client, spriteName, serviceName, port, command);
+  await startServiceIfNeeded(client, spriteName, serviceName, duration);
+}
+
+export function sprites(options: SpritesProviderOptions = {}): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+  const serviceName = options.serviceName ?? DEFAULT_SERVICE_NAME;
+  const serviceStartDuration = options.serviceStartDuration ?? DEFAULT_SERVICE_START_DURATION;
+  const namePrefix = options.namePrefix ?? DEFAULT_NAME_PREFIX;
+  const installAgents = [...(options.installAgents ?? [])];
+
+  const getClient = async (): Promise<SpritesClient> => {
+    const token = await resolveToken(options.token);
+    const clientOptions = await resolveValue(options.client, {});
+    return createSpritesClient(token, clientOptions);
+  };
+
+  const getServerEnv = async (): Promise<Record<string, string>> => {
+    return await resolveValue(options.env, {});
+  };
+
+  const provider: SpritesSandboxProvider = {
+    name: "sprites",
+    defaultCwd: "/home/sprite",
+    async create(): Promise<string> {
+      const client = await getClient();
+      const createOptions = await resolveValue(options.create, {});
+      const spriteName = createOptions.name ?? generateSpriteName(namePrefix);
+      const sprite = await client.createSprite(spriteName, createOptions.config);
+
+      const serverEnv = await getServerEnv();
+      for (const agent of installAgents) {
+        await runSpriteCommand(sprite, "bash", ["-lc", `npx -y ${SANDBOX_AGENT_NPX_SPEC} install-agent ${agent}`], serverEnv);
+      }
+
+      await ensureService(client, spriteName, serviceName, agentPort, serviceStartDuration, serverEnv);
+      return sprite.name;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const client = await getClient();
+      try {
+        await client.deleteSprite(sandboxId);
+      } catch (error) {
+        if (isSpriteNotFoundError(error) || (error instanceof Error && error.message.includes("status 404"))) {
+          return;
+        }
+        throw error;
+      }
+    },
+    async reconnect(sandboxId: string): Promise<void> {
+      const client = await getClient();
+      try {
+        await client.getSprite(sandboxId);
+      } catch (error) {
+        if (isSpriteNotFoundError(error)) {
+          throw new SandboxDestroyedError(sandboxId, "sprites", { cause: error });
+        }
+        throw error;
+      }
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const client = await getClient();
+      const sprite = await client.getSprite(sandboxId);
+      const url = (sprite as { url?: string }).url;
+      if (!url) {
+        throw new Error(`sprites API did not return a URL for sprite: ${sandboxId}`);
+      }
+      return url;
+    },
+    async ensureServer(sandboxId: string): Promise<void> {
+      const client = await getClient();
+      await ensureService(client, sandboxId, serviceName, agentPort, serviceStartDuration, await getServerEnv());
+    },
+    async getToken(): Promise<string> {
+      return await resolveToken(options.token);
+    },
+  };
+
+  return provider;
+}
diff --git a/sdks/typescript/src/providers/types.ts b/sdks/typescript/src/providers/types.ts
new file mode 100644
index 0000000..9c925d1
--- /dev/null
+++ b/sdks/typescript/src/providers/types.ts
@@ -0,0 +1,57 @@
+export interface SandboxProvider {
+  /** Provider name. Must match the prefix in sandbox IDs (for example "e2b"). */
+  name: string;
+
+  /** Provision a new sandbox and return the provider-specific ID. */
+  create(): Promise<string>;
+
+  /** Permanently tear down a sandbox. */
+  destroy(sandboxId: string): Promise<void>;
+
+  /**
+   * Reconnect to an existing sandbox before the SDK attempts health checks.
+   * Providers can use this to resume paused sandboxes or surface provider-specific
+   * reconnect errors.
+   */
+  reconnect?(sandboxId: string): Promise<void>;
+
+  /**
+   * Gracefully stop or pause a sandbox without permanently deleting it.
+   * When omitted, callers should fall back to `destroy()`.
+   */
+  pause?(sandboxId: string): Promise<void>;
+
+  /**
+   * Permanently delete a sandbox. When omitted, callers should fall back to
+   * `destroy()`.
+   */
+  kill?(sandboxId: string): Promise<void>;
+
+  /**
+   * Return the sandbox-agent base URL for this sandbox.
+   * Providers that cannot expose a URL should implement `getFetch()` instead.
+   */
+  getUrl?(sandboxId: string): Promise<string>;
+
+  /**
+   * Return a fetch implementation that routes requests to the sandbox.
+   * Providers that expose a URL can implement `getUrl()` instead.
+   */
+  getFetch?(sandboxId: string): Promise<typeof globalThis.fetch>;
+
+  /**
+   * Ensure the sandbox-agent server process is running inside the sandbox.
+   * Called during health-wait after consecutive failures, and before
+   * reconnecting to an existing sandbox. Implementations should be
+   * idempotent — if the server is already running, this should be a no-op
+   * (e.g. the duplicate process exits on port conflict).
+   */
+  ensureServer?(sandboxId: string): Promise<void>;
+
+  /**
+   * Default working directory for sessions when the caller does not specify
+   * one. Remote providers should set this to a path that exists inside the
+   * sandbox (e.g. '/home/user'). When omitted, falls back to process.cwd().
+   */
+  defaultCwd?: string;
+}
diff --git a/sdks/typescript/src/providers/vercel.ts b/sdks/typescript/src/providers/vercel.ts
new file mode 100644
index 0000000..905b8f1
--- /dev/null
+++ b/sdks/typescript/src/providers/vercel.ts
@@ -0,0 +1,66 @@
+import { Sandbox } from "@vercel/sandbox";
+import type { SandboxProvider } from "./types.ts";
+import { DEFAULT_AGENTS, SANDBOX_AGENT_INSTALL_SCRIPT } from "./shared.ts";
+
+const DEFAULT_AGENT_PORT = 3000;
+
+export interface VercelProviderOptions {
+  create?: Record<string, unknown> | (() => Record<string, unknown> | Promise<Record<string, unknown>>);
+  agentPort?: number;
+}
+
+async function resolveCreateOptions(value: VercelProviderOptions["create"], agentPort: number): Promise<Record<string, unknown>> {
+  const resolved = typeof value === "function" ? await value() : (value ?? {});
+  return {
+    ports: [agentPort],
+    ...resolved,
+  };
+}
+
+async function runVercelCommand(sandbox: InstanceType<typeof Sandbox>, cmd: string, args: string[] = []): Promise<void> {
+  const result = await sandbox.runCommand({ cmd, args });
+  if (result.exitCode !== 0) {
+    const stderr = await result.stderr();
+    throw new Error(`vercel command failed: ${cmd} ${args.join(" ")}\n${stderr}`);
+  }
+}
+
+export function vercel(options: VercelProviderOptions = {}): SandboxProvider {
+  const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
+
+  return {
+    name: "vercel",
+    defaultCwd: "/home/vercel-sandbox",
+    async create(): Promise<string> {
+      const sandbox = await Sandbox.create((await resolveCreateOptions(options.create, agentPort)) as Parameters<typeof Sandbox.create>[0]);
+
+      await runVercelCommand(sandbox, "sh", ["-c", `curl -fsSL ${SANDBOX_AGENT_INSTALL_SCRIPT} | sh`]);
+      for (const agent of DEFAULT_AGENTS) {
+        await runVercelCommand(sandbox, "sandbox-agent", ["install-agent", agent]);
+      }
+      await sandbox.runCommand({
+        cmd: "sandbox-agent",
+        args: ["server", "--no-token", "--host", "0.0.0.0", "--port", String(agentPort)],
+        detached: true,
+      });
+
+      return sandbox.sandboxId;
+    },
+    async destroy(sandboxId: string): Promise<void> {
+      const sandbox = await Sandbox.get({ sandboxId });
+      await sandbox.stop();
+    },
+    async getUrl(sandboxId: string): Promise<string> {
+      const sandbox = await Sandbox.get({ sandboxId });
+      return sandbox.domain(agentPort);
+    },
+    async ensureServer(sandboxId: string): Promise<void> {
+      const sandbox = await Sandbox.get({ sandboxId });
+      await sandbox.runCommand({
+        cmd: "sandbox-agent",
+        args: ["server", "--no-token", "--host", "0.0.0.0", "--port", String(agentPort)],
+        detached: true,
+      });
+    },
+  };
+}
diff --git a/sdks/typescript/src/spawn.ts b/sdks/typescript/src/spawn.ts
index 380afbc..9614c1a 100644
--- a/sdks/typescript/src/spawn.ts
+++ b/sdks/typescript/src/spawn.ts
@@ -1,9 +1,6 @@
 import type { ChildProcess } from "node:child_process";
 import type { AddressInfo } from "node:net";
-import {
-  assertExecutable,
-  formatNonExecutableBinaryMessage,
-} from "@sandbox-agent/cli-shared";
+import { assertExecutable, formatNonExecutableBinaryMessage } from "@sandbox-agent/cli-shared";
 
 export type SandboxAgentSpawnLogMode = "inherit" | "pipe" | "silent";
 
@@ -40,17 +37,12 @@ export function isNodeRuntime(): boolean {
   return typeof process !== "undefined" && !!process.versions?.node;
 }
 
-export async function spawnSandboxAgent(
-  options: SandboxAgentSpawnOptions,
-  fetcher?: typeof fetch,
-): Promise<SandboxAgentSpawnHandle> {
+export async function spawnSandboxAgent(options: SandboxAgentSpawnOptions, fetcher?: typeof fetch): Promise<SandboxAgentSpawnHandle> {
   if (!isNodeRuntime()) {
     throw new Error("Autospawn requires a Node.js runtime.");
   }
 
-  const {
-    spawn,
-  } = await import("node:child_process");
+  const { spawn } = await import("node:child_process");
   const crypto = await import("node:crypto");
   const fs = await import("node:fs");
   const path = await import("node:path");
@@ -82,17 +74,11 @@ export async function spawnSandboxAgent(
         bunInstallBlocks: [
           {
             label: "Project install",
-            commands: [
-              `bun pm trust ${TRUST_PACKAGES}`,
-              "bun add sandbox-agent",
-            ],
+            commands: [`bun pm trust ${TRUST_PACKAGES}`, "bun add sandbox-agent"],
           },
           {
             label: "Global install",
-            commands: [
-              `bun pm -g trust ${TRUST_PACKAGES}`,
-              "bun add -g sandbox-agent",
-            ],
+            commands: [`bun pm -g trust ${TRUST_PACKAGES}`, "bun add -g sandbox-agent"],
           },
         ],
       }),
@@ -189,13 +175,7 @@ async function getFreePort(net: typeof import("node:net"), host: string): Promis
   });
 }
 
-async function waitForHealth(
-  baseUrl: string,
-  fetcher: typeof fetch | undefined,
-  timeoutMs: number,
-  child: ChildProcess,
-  token: string,
-): Promise<void> {
+async function waitForHealth(baseUrl: string, fetcher: typeof fetch | undefined, timeoutMs: number, child: ChildProcess, token: string): Promise<void> {
   if (!fetcher) {
     throw new Error("Fetch API is not available; provide a fetch implementation.");
   }
diff --git a/sdks/typescript/src/types.ts b/sdks/typescript/src/types.ts
index 17b321e..d56a829 100644
--- a/sdks/typescript/src/types.ts
+++ b/sdks/typescript/src/types.ts
@@ -1,11 +1,54 @@
-import type { AnyMessage, NewSessionRequest } from "acp-http-client";
+import type { AnyMessage, NewSessionRequest, SessionConfigOption, SessionModeState } from "acp-http-client";
 import type { components, operations } from "./generated/openapi.ts";
 
 export type ProblemDetails = components["schemas"]["ProblemDetails"];
 
 export type HealthResponse = JsonResponse<operations["get_v1_health"], 200>;
+export type DesktopState = components["schemas"]["DesktopState"];
+export type DesktopResolution = components["schemas"]["DesktopResolution"];
+export type DesktopErrorInfo = components["schemas"]["DesktopErrorInfo"];
+export type DesktopProcessInfo = components["schemas"]["DesktopProcessInfo"];
+export type DesktopStatusResponse = JsonResponse<operations["get_v1_desktop_status"], 200>;
+export type DesktopStartRequest = JsonRequestBody<operations["post_v1_desktop_start"]>;
+export type DesktopScreenshotFormat = components["schemas"]["DesktopScreenshotFormat"];
+export type DesktopScreenshotQuery =
+  QueryParams<operations["get_v1_desktop_screenshot"]> extends never ? Record<string, never> : QueryParams<operations["get_v1_desktop_screenshot"]>;
+export type DesktopRegionScreenshotQuery = QueryParams<operations["get_v1_desktop_screenshot_region"]>;
+export type DesktopMousePositionResponse = JsonResponse<operations["get_v1_desktop_mouse_position"], 200>;
+export type DesktopMouseButton = components["schemas"]["DesktopMouseButton"];
+export type DesktopMouseMoveRequest = JsonRequestBody<operations["post_v1_desktop_mouse_move"]>;
+export type DesktopMouseClickRequest = JsonRequestBody<operations["post_v1_desktop_mouse_click"]>;
+export type DesktopMouseDownRequest = JsonRequestBody<operations["post_v1_desktop_mouse_down"]>;
+export type DesktopMouseUpRequest = JsonRequestBody<operations["post_v1_desktop_mouse_up"]>;
+export type DesktopMouseDragRequest = JsonRequestBody<operations["post_v1_desktop_mouse_drag"]>;
+export type DesktopMouseScrollRequest = JsonRequestBody<operations["post_v1_desktop_mouse_scroll"]>;
+export type DesktopKeyboardTypeRequest = JsonRequestBody<operations["post_v1_desktop_keyboard_type"]>;
+export type DesktopKeyModifiers = components["schemas"]["DesktopKeyModifiers"];
+export type DesktopKeyboardPressRequest = JsonRequestBody<operations["post_v1_desktop_keyboard_press"]>;
+export type DesktopKeyboardDownRequest = JsonRequestBody<operations["post_v1_desktop_keyboard_down"]>;
+export type DesktopKeyboardUpRequest = JsonRequestBody<operations["post_v1_desktop_keyboard_up"]>;
+export type DesktopActionResponse = JsonResponse<operations["post_v1_desktop_keyboard_type"], 200>;
+export type DesktopDisplayInfoResponse = JsonResponse<operations["get_v1_desktop_display_info"], 200>;
+export type DesktopWindowInfo = components["schemas"]["DesktopWindowInfo"];
+export type DesktopWindowListResponse = JsonResponse<operations["get_v1_desktop_windows"], 200>;
+export type DesktopRecordingStartRequest = JsonRequestBody<operations["post_v1_desktop_recording_start"]>;
+export type DesktopRecordingStatus = components["schemas"]["DesktopRecordingStatus"];
+export type DesktopRecordingInfo = JsonResponse<operations["post_v1_desktop_recording_start"], 200>;
+export type DesktopRecordingListResponse = JsonResponse<operations["get_v1_desktop_recordings"], 200>;
+export type DesktopStreamStatusResponse = JsonResponse<operations["post_v1_desktop_stream_start"], 200>;
+export type DesktopClipboardResponse = JsonResponse<operations["get_v1_desktop_clipboard"], 200>;
+export type DesktopClipboardQuery =
+  QueryParams<operations["get_v1_desktop_clipboard"]> extends never ? Record<string, never> : QueryParams<operations["get_v1_desktop_clipboard"]>;
+export type DesktopClipboardWriteRequest = JsonRequestBody<operations["post_v1_desktop_clipboard"]>;
+export type DesktopLaunchRequest = JsonRequestBody<operations["post_v1_desktop_launch"]>;
+export type DesktopLaunchResponse = JsonResponse<operations["post_v1_desktop_launch"], 200>;
+export type DesktopOpenRequest = JsonRequestBody<operations["post_v1_desktop_open"]>;
+export type DesktopOpenResponse = JsonResponse<operations["post_v1_desktop_open"], 200>;
+export type DesktopWindowMoveRequest = JsonRequestBody<operations["post_v1_desktop_window_move"]>;
+export type DesktopWindowResizeRequest = JsonRequestBody<operations["post_v1_desktop_window_resize"]>;
 export type AgentListResponse = JsonResponse<operations["get_v1_agents"], 200>;
 export type AgentInfo = components["schemas"]["AgentInfo"];
+export type AgentQuery = QueryParams<operations["get_v1_agents"]>;
 export type AgentInstallRequest = JsonRequestBody<operations["post_v1_agent_install"]>;
 export type AgentInstallResponse = JsonResponse<operations["post_v1_agent_install"], 200>;
 
@@ -31,6 +74,67 @@ export type McpServerConfig = components["schemas"]["McpServerConfig"];
 export type SkillsConfigQuery = QueryParams<operations["get_v1_config_skills"]>;
 export type SkillsConfig = components["schemas"]["SkillsConfig"];
 
+export type ProcessConfig = JsonResponse<operations["get_v1_processes_config"], 200>;
+export type ProcessCreateRequest = JsonRequestBody<operations["post_v1_processes"]>;
+export type ProcessInfo = components["schemas"]["ProcessInfo"];
+export type ProcessInputRequest = JsonRequestBody<operations["post_v1_process_input"]>;
+export type ProcessInputResponse = JsonResponse<operations["post_v1_process_input"], 200>;
+export type ProcessListQuery = QueryParams<operations["get_v1_processes"]>;
+export type ProcessListResponse = JsonResponse<operations["get_v1_processes"], 200>;
+export type ProcessLogEntry = components["schemas"]["ProcessLogEntry"];
+export type ProcessLogsQuery = QueryParams<operations["get_v1_process_logs"]>;
+export type ProcessLogsResponse = JsonResponse<operations["get_v1_process_logs"], 200>;
+export type ProcessLogsStream = components["schemas"]["ProcessLogsStream"];
+export type ProcessOwner = components["schemas"]["ProcessOwner"];
+export type ProcessRunRequest = JsonRequestBody<operations["post_v1_processes_run"]>;
+export type ProcessRunResponse = JsonResponse<operations["post_v1_processes_run"], 200>;
+export type ProcessSignalQuery = QueryParams<operations["post_v1_process_stop"]>;
+export type ProcessState = components["schemas"]["ProcessState"];
+export type ProcessTerminalResizeRequest = JsonRequestBody<operations["post_v1_process_terminal_resize"]>;
+export type ProcessTerminalResizeResponse = JsonResponse<operations["post_v1_process_terminal_resize"], 200>;
+
+export type ProcessTerminalClientFrame =
+  | {
+      type: "input";
+      data: string;
+      encoding?: string;
+    }
+  | {
+      type: "resize";
+      cols: number;
+      rows: number;
+    }
+  | {
+      type: "close";
+    };
+
+export interface ProcessTerminalReadyFrame {
+  type: "ready";
+  processId: string;
+}
+
+export interface ProcessTerminalExitFrame {
+  type: "exit";
+  exitCode?: number | null;
+}
+
+export interface ProcessTerminalErrorFrame {
+  type: "error";
+  message: string;
+}
+
+export type ProcessTerminalServerFrame = ProcessTerminalReadyFrame | ProcessTerminalExitFrame | ProcessTerminalErrorFrame;
+
+export type TerminalReadyStatus = ProcessTerminalReadyFrame;
+export type TerminalExitStatus = ProcessTerminalExitFrame;
+export type TerminalErrorStatus = ProcessTerminalErrorFrame;
+export type TerminalStatusMessage = ProcessTerminalServerFrame;
+
+export interface TerminalResizePayload {
+  cols: number;
+  rows: number;
+}
+
 export interface SessionRecord {
   id: string;
   agent: string;
@@ -38,7 +142,10 @@ export interface SessionRecord {
   lastConnectionId: string;
   createdAt: number;
   destroyedAt?: number;
+  sandboxId?: string;
   sessionInit?: Omit<NewSessionRequest, "_meta">;
+  configOptions?: SessionConfigOption[];
+  modes?: SessionModeState | null;
 }
 
 export type SessionEventSender = "client" | "agent";
@@ -69,11 +176,11 @@ export interface ListEventsRequest extends ListPageRequest {
 }
 
 export interface SessionPersistDriver {
-  getSession(id: string): Promise<SessionRecord | null>;
+  getSession(id: string): Promise<SessionRecord | undefined>;
   listSessions(request?: ListPageRequest): Promise<ListPage<SessionRecord>>;
   updateSession(session: SessionRecord): Promise<void>;
   listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>>;
-  insertEvent(event: SessionEvent): Promise<void>;
+  insertEvent(sessionId: string, event: SessionEvent): Promise<void>;
 }
 
 export interface InMemorySessionPersistDriverOptions {
@@ -93,15 +200,12 @@ export class InMemorySessionPersistDriver implements SessionPersistDriver {
 
   constructor(options: InMemorySessionPersistDriverOptions = {}) {
     this.maxSessions = normalizeCap(options.maxSessions, DEFAULT_MAX_SESSIONS);
-    this.maxEventsPerSession = normalizeCap(
-      options.maxEventsPerSession,
-      DEFAULT_MAX_EVENTS_PER_SESSION,
-    );
+    this.maxEventsPerSession = normalizeCap(options.maxEventsPerSession, DEFAULT_MAX_EVENTS_PER_SESSION);
   }
 
-  async getSession(id: string): Promise<SessionRecord | null> {
+  async getSession(id: string): Promise<SessionRecord | undefined> {
     const session = this.sessions.get(id);
-    return session ? cloneSessionRecord(session) : null;
+    return session ? cloneSessionRecord(session) : undefined;
   }
 
   async listSessions(request: ListPageRequest = {}): Promise<ListPage<SessionRecord>> {
@@ -160,24 +264,24 @@ export class InMemorySessionPersistDriver implements SessionPersistDriver {
     };
   }
 
-  async insertEvent(event: SessionEvent): Promise<void> {
-    const events = this.eventsBySession.get(event.sessionId) ?? [];
+  async insertEvent(sessionId: string, event: SessionEvent): Promise<void> {
+    const events = this.eventsBySession.get(sessionId) ?? [];
     events.push(cloneSessionEvent(event));
 
     if (events.length > this.maxEventsPerSession) {
       events.splice(0, events.length - this.maxEventsPerSession);
     }
 
-    this.eventsBySession.set(event.sessionId, events);
+    this.eventsBySession.set(sessionId, events);
   }
 }
 
 function cloneSessionRecord(session: SessionRecord): SessionRecord {
   return {
     ...session,
-    sessionInit: session.sessionInit
-      ? (JSON.parse(JSON.stringify(session.sessionInit)) as SessionRecord["sessionInit"])
-      : undefined,
+    sessionInit: session.sessionInit ? (JSON.parse(JSON.stringify(session.sessionInit)) as SessionRecord["sessionInit"]) : undefined,
+    configOptions: session.configOptions ? (JSON.parse(JSON.stringify(session.configOptions)) as SessionRecord["configOptions"]) : undefined,
+    modes: session.modes ? (JSON.parse(JSON.stringify(session.modes)) as SessionRecord["modes"]) : session.modes,
   };
 }
 
@@ -201,11 +305,7 @@ type JsonRequestBody<T> = T extends {
   ? B
   : never;
 
-type QueryParams<T> = T extends { parameters: { query: infer Q } }
-  ? Q
-  : T extends { parameters: { query?: infer Q } }
-    ? Q
-    : never;
+type QueryParams<T> = T extends { parameters: { query: infer Q } } ? Q : T extends { parameters: { query?: infer Q } } ? Q : never;
 
 function normalizeCap(value: number | undefined, fallback: number): number {
   if (!Number.isFinite(value) || (value ?? 0) < 1) {
diff --git a/sdks/typescript/tests/helpers/docker.ts b/sdks/typescript/tests/helpers/docker.ts
new file mode 100644
index 0000000..c15c03c
--- /dev/null
+++ b/sdks/typescript/tests/helpers/docker.ts
@@ -0,0 +1,244 @@
+import { execFileSync } from "node:child_process";
+import { mkdtempSync, mkdirSync, rmSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const REPO_ROOT = resolve(__dirname, "../../../..");
+const CONTAINER_PORT = 3000;
+const DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
+const DEFAULT_IMAGE_TAG = "sandbox-agent-test:dev";
+const STANDARD_PATHS = new Set(["/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"]);
+
+let cachedImage: string | undefined;
+let containerCounter = 0;
+
+export type DockerSandboxAgentHandle = {
+  baseUrl: string;
+  token: string;
+  dispose: () => Promise<void>;
+};
+
+export type DockerSandboxAgentOptions = {
+  env?: Record<string, string>;
+  pathMode?: "merge" | "replace";
+  timeoutMs?: number;
+};
+
+type TestLayout = {
+  rootDir: string;
+  homeDir: string;
+  xdgDataHome: string;
+  xdgStateHome: string;
+  appDataDir: string;
+  localAppDataDir: string;
+  installDir: string;
+};
+
+export function createDockerTestLayout(): TestLayout {
+  const tempRoot = join(REPO_ROOT, ".context", "docker-test-");
+  mkdirSync(resolve(REPO_ROOT, ".context"), { recursive: true });
+  const rootDir = mkdtempSync(tempRoot);
+  const homeDir = join(rootDir, "home");
+  const xdgDataHome = join(rootDir, "xdg-data");
+  const xdgStateHome = join(rootDir, "xdg-state");
+  const appDataDir = join(rootDir, "appdata", "Roaming");
+  const localAppDataDir = join(rootDir, "appdata", "Local");
+  const installDir = join(xdgDataHome, "sandbox-agent", "bin");
+
+  for (const dir of [homeDir, xdgDataHome, xdgStateHome, appDataDir, localAppDataDir, installDir]) {
+    mkdirSync(dir, { recursive: true });
+  }
+
+  return {
+    rootDir,
+    homeDir,
+    xdgDataHome,
+    xdgStateHome,
+    appDataDir,
+    localAppDataDir,
+    installDir,
+  };
+}
+
+export function disposeDockerTestLayout(layout: TestLayout): void {
+  try {
+    rmSync(layout.rootDir, { recursive: true, force: true });
+  } catch (error) {
+    if (typeof process.getuid === "function" && typeof process.getgid === "function") {
+      try {
+        execFileSync(
+          "docker",
+          [
+            "run",
+            "--rm",
+            "--user",
+            "0:0",
+            "--entrypoint",
+            "sh",
+            "-v",
+            `${layout.rootDir}:${layout.rootDir}`,
+            ensureImage(),
+            "-c",
+            `chown -R ${process.getuid()}:${process.getgid()} '${layout.rootDir}'`,
+          ],
+          { stdio: "pipe" },
+        );
+        rmSync(layout.rootDir, { recursive: true, force: true });
+        return;
+      } catch {}
+    }
+    throw error;
+  }
+}
+
+export async function startDockerSandboxAgent(layout: TestLayout, options: DockerSandboxAgentOptions = {}): Promise<DockerSandboxAgentHandle> {
+  const image = ensureImage();
+  const containerId = uniqueContainerId();
+  const env = buildEnv(layout, options.env ?? {}, options.pathMode ?? "merge");
+  const mounts = buildMounts(layout.rootDir, env);
+
+  const args = ["run", "-d", "--rm", "--name", containerId, "-p", `127.0.0.1::${CONTAINER_PORT}`];
+
+  if (typeof process.getuid === "function" && typeof process.getgid === "function") {
+    args.push("--user", `${process.getuid()}:${process.getgid()}`);
+  }
+
+  if (process.platform === "linux") {
+    args.push("--add-host", "host.docker.internal:host-gateway");
+  }
+
+  for (const mount of mounts) {
+    args.push("-v", `${mount}:${mount}`);
+  }
+
+  for (const [key, value] of Object.entries(env)) {
+    args.push("-e", `${key}=${value}`);
+  }
+
+  args.push(image, "server", "--host", "0.0.0.0", "--port", String(CONTAINER_PORT), "--no-token");
+
+  execFileSync("docker", args, { stdio: "pipe" });
+
+  try {
+    const mapping = execFileSync("docker", ["port", containerId, `${CONTAINER_PORT}/tcp`], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+    }).trim();
+    const mappingParts = mapping.split(":");
+    const hostPort = mappingParts[mappingParts.length - 1]?.trim();
+    if (!hostPort) {
+      throw new Error(`missing mapped host port in ${mapping}`);
+    }
+    const baseUrl = `http://127.0.0.1:${hostPort}`;
+    await waitForHealth(baseUrl, options.timeoutMs ?? 30_000);
+
+    return {
+      baseUrl,
+      token: "",
+      dispose: async () => {
+        try {
+          execFileSync("docker", ["rm", "-f", containerId], { stdio: "pipe" });
+        } catch {}
+      },
+    };
+  } catch (error) {
+    try {
+      execFileSync("docker", ["rm", "-f", containerId], { stdio: "pipe" });
+    } catch {}
+    throw error;
+  }
+}
+
+function ensureImage(): string {
+  if (cachedImage) {
+    return cachedImage;
+  }
+
+  cachedImage = process.env.SANDBOX_AGENT_TEST_IMAGE ?? DEFAULT_IMAGE_TAG;
+  execFileSync("docker", ["build", "--tag", cachedImage, "--file", resolve(REPO_ROOT, "docker/test-agent/Dockerfile"), REPO_ROOT], {
+    cwd: REPO_ROOT,
+    stdio: ["ignore", "ignore", "pipe"],
+  });
+  return cachedImage;
+}
+
+function buildEnv(layout: TestLayout, extraEnv: Record<string, string>, pathMode: "merge" | "replace"): Record<string, string> {
+  const env: Record<string, string> = {
+    HOME: layout.homeDir,
+    USERPROFILE: layout.homeDir,
+    XDG_DATA_HOME: layout.xdgDataHome,
+    XDG_STATE_HOME: layout.xdgStateHome,
+    APPDATA: layout.appDataDir,
+    LOCALAPPDATA: layout.localAppDataDir,
+    PATH: DEFAULT_PATH,
+  };
+
+  const customPathEntries = new Set<string>();
+  for (const entry of (extraEnv.PATH ?? "").split(":")) {
+    if (!entry || entry === DEFAULT_PATH || !entry.startsWith("/")) continue;
+    if (entry.startsWith(layout.rootDir)) {
+      customPathEntries.add(entry);
+    }
+  }
+  if (pathMode === "replace") {
+    env.PATH = extraEnv.PATH ?? "";
+  } else if (customPathEntries.size > 0) {
+    env.PATH = `${Array.from(customPathEntries).join(":")}:${DEFAULT_PATH}`;
+  }
+
+  for (const [key, value] of Object.entries(extraEnv)) {
+    if (key === "PATH") {
+      continue;
+    }
+    env[key] = rewriteLocalhostUrl(key, value);
+  }
+
+  return env;
+}
+
+function buildMounts(rootDir: string, env: Record<string, string>): string[] {
+  const mounts = new Set<string>([rootDir]);
+
+  for (const key of ["HOME", "USERPROFILE", "XDG_DATA_HOME", "XDG_STATE_HOME", "APPDATA", "LOCALAPPDATA", "SANDBOX_AGENT_DESKTOP_FAKE_STATE_DIR"]) {
+    const value = env[key];
+    if (value?.startsWith("/")) {
+      mounts.add(value);
+    }
+  }
+
+  for (const entry of (env.PATH ?? "").split(":")) {
+    if (entry.startsWith("/") && !STANDARD_PATHS.has(entry)) {
+      mounts.add(entry);
+    }
+  }
+
+  return Array.from(mounts);
+}
+
+async function waitForHealth(baseUrl: string, timeoutMs: number): Promise<void> {
+  const started = Date.now();
+  while (Date.now() - started < timeoutMs) {
+    try {
+      const response = await fetch(`${baseUrl}/v1/health`);
+      if (response.ok) {
+        return;
+      }
+    } catch {}
+    await new Promise((resolve) => setTimeout(resolve, 200));
+  }
+
+  throw new Error(`timed out waiting for sandbox-agent health at ${baseUrl}`);
+}
+
+function uniqueContainerId(): string {
+  containerCounter += 1;
+  return `sandbox-agent-ts-${process.pid}-${Date.now().toString(36)}-${containerCounter.toString(36)}`;
+}
+
+function rewriteLocalhostUrl(key: string, value: string): string {
+  if (key.endsWith("_URL") || key.endsWith("_URI")) {
+    return value.replace("http://127.0.0.1", "http://host.docker.internal").replace("http://localhost", "http://host.docker.internal");
+  }
+  return value;
+}
diff --git a/sdks/typescript/tests/helpers/mock-agent.ts b/sdks/typescript/tests/helpers/mock-agent.ts
index 3d5677b..882b993 100644
--- a/sdks/typescript/tests/helpers/mock-agent.ts
+++ b/sdks/typescript/tests/helpers/mock-agent.ts
@@ -1,23 +1,36 @@
 import { chmodSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
-export function prepareMockAgentDataHome(dataHome: string): void {
-  const installDir = join(dataHome, "sandbox-agent", "bin");
-  const processDir = join(installDir, "agent_processes");
-  mkdirSync(processDir, { recursive: true });
+function candidateInstallDirs(dataHome: string): string[] {
+  const dirs = [join(dataHome, "sandbox-agent", "bin")];
+  if (process.platform === "darwin") {
+    dirs.push(join(dataHome, "Library", "Application Support", "sandbox-agent", "bin"));
+  } else if (process.platform === "win32") {
+    dirs.push(join(dataHome, "AppData", "Roaming", "sandbox-agent", "bin"));
+  }
+  return dirs;
+}
 
-  const runner = process.platform === "win32"
-    ? join(processDir, "mock-acp.cmd")
-    : join(processDir, "mock-acp");
-
-  const scriptFile = process.platform === "win32"
-    ? join(processDir, "mock-acp.js")
-    : runner;
+export function prepareMockAgentDataHome(dataHome: string): Record<string, string> {
+  const runtimeEnv: Record<string, string> = {};
+  if (process.platform === "darwin") {
+    runtimeEnv.HOME = dataHome;
+    runtimeEnv.XDG_DATA_HOME = join(dataHome, ".local", "share");
+  } else if (process.platform === "win32") {
+    runtimeEnv.USERPROFILE = dataHome;
+    runtimeEnv.APPDATA = join(dataHome, "AppData", "Roaming");
+    runtimeEnv.LOCALAPPDATA = join(dataHome, "AppData", "Local");
+  } else {
+    runtimeEnv.HOME = dataHome;
+    runtimeEnv.XDG_DATA_HOME = dataHome;
+  }
 
   const nodeScript = String.raw`#!/usr/bin/env node
 const { createInterface } = require("node:readline");
 
 let nextSession = 0;
+let nextPermission = 0;
+const pendingPermissions = new Map();
 
 function emit(value) {
   process.stdout.write(JSON.stringify(value) + "\n");
@@ -54,6 +67,38 @@ rl.on("line", (line) => {
   const hasId = Object.prototype.hasOwnProperty.call(msg, "id");
   const method = hasMethod ? msg.method : undefined;
 
+  if (!hasMethod && hasId) {
+    const pending = pendingPermissions.get(String(msg.id));
+    if (pending) {
+      pendingPermissions.delete(String(msg.id));
+      const outcome = msg?.result?.outcome;
+      const optionId = outcome?.outcome === "selected" ? outcome.optionId : "cancelled";
+      const suffix = optionId === "reject-once" ? "rejected" : "approved";
+      emit({
+        jsonrpc: "2.0",
+        method: "session/update",
+        params: {
+          sessionId: pending.sessionId,
+          update: {
+            sessionUpdate: "agent_message_chunk",
+            content: {
+              type: "text",
+              text: "mock permission " + suffix + ": " + optionId,
+            },
+          },
+        },
+      });
+      emit({
+        jsonrpc: "2.0",
+        id: pending.promptId,
+        result: {
+          stopReason: "end_turn",
+        },
+      });
+    }
+    return;
+  }
+
   if (method === "session/prompt") {
     const sessionId = typeof msg?.params?.sessionId === "string" ? msg.params.sessionId : "";
     const text = firstText(msg?.params?.prompt);
@@ -71,6 +116,51 @@ rl.on("line", (line) => {
         },
       },
     });
+
+    if (text.includes("permission")) {
+      nextPermission += 1;
+      const permissionId = "permission-" + nextPermission;
+      pendingPermissions.set(permissionId, {
+        promptId: msg.id,
+        sessionId,
+      });
+      emit({
+        jsonrpc: "2.0",
+        id: permissionId,
+        method: "session/request_permission",
+        params: {
+          sessionId,
+          toolCall: {
+            toolCallId: "tool-call-" + nextPermission,
+            title: "Write mock.txt",
+            kind: "edit",
+            status: "pending",
+            locations: [{ path: "/tmp/mock.txt" }],
+            rawInput: {
+              path: "/tmp/mock.txt",
+              content: "hello",
+            },
+          },
+          options: [
+            {
+              kind: "allow_once",
+              name: "Allow once",
+              optionId: "allow-once",
+            },
+            {
+              kind: "allow_always",
+              name: "Always allow",
+              optionId: "allow-always",
+            },
+            {
+              kind: "reject_once",
+              name: "Reject",
+              optionId: "reject-once",
+            },
+          ],
+        },
+      });
+    }
   }
 
   if (!hasMethod || !hasId) {
@@ -106,6 +196,10 @@ rl.on("line", (line) => {
   }
 
   if (method === "session/prompt") {
+    const text = firstText(msg?.params?.prompt);
+    if (text.includes("permission")) {
+      return;
+    }
     emit({
       jsonrpc: "2.0",
       id: msg.id,
@@ -127,14 +221,25 @@ rl.on("line", (line) => {
 });
 `;
 
-  writeFileSync(scriptFile, nodeScript);
+  for (const installDir of candidateInstallDirs(dataHome)) {
+    const processDir = join(installDir, "agent_processes");
+    mkdirSync(processDir, { recursive: true });
 
-  if (process.platform === "win32") {
-    writeFileSync(runner, `@echo off\r\nnode "${scriptFile}" %*\r\n`);
+    const runner = process.platform === "win32" ? join(processDir, "mock-acp.cmd") : join(processDir, "mock-acp");
+
+    const scriptFile = process.platform === "win32" ? join(processDir, "mock-acp.js") : runner;
+
+    writeFileSync(scriptFile, nodeScript);
+
+    if (process.platform === "win32") {
+      writeFileSync(runner, `@echo off\r\nnode "${scriptFile}" %*\r\n`);
+    }
+
+    chmodSync(scriptFile, 0o755);
+    if (process.platform === "win32") {
+      chmodSync(runner, 0o755);
+    }
   }
 
-  chmodSync(scriptFile, 0o755);
-  if (process.platform === "win32") {
-    chmodSync(runner, 0o755);
-  }
+  return runtimeEnv;
 }
diff --git a/sdks/typescript/tests/integration.test.ts b/sdks/typescript/tests/integration.test.ts
index 71f9189..d5ae278 100644
--- a/sdks/typescript/tests/integration.test.ts
+++ b/sdks/typescript/tests/integration.test.ts
@@ -1,58 +1,64 @@
-import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { existsSync } from "node:fs";
-import { mkdtempSync, rmSync } from "node:fs";
-import { dirname, resolve } from "node:path";
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { join } from "node:path";
-import { fileURLToPath } from "node:url";
 import { tmpdir } from "node:os";
 import {
   InMemorySessionPersistDriver,
   SandboxAgent,
+  type ListEventsRequest,
+  type ListPage,
   type SessionEvent,
+  type SessionPersistDriver,
+  type SessionRecord,
 } from "../src/index.ts";
-import { spawnSandboxAgent, isNodeRuntime, type SandboxAgentSpawnHandle } from "../src/spawn.ts";
+import { isNodeRuntime } from "../src/spawn.ts";
+import { createDockerTestLayout, disposeDockerTestLayout, startDockerSandboxAgent, type DockerSandboxAgentHandle } from "./helpers/docker.ts";
 import { prepareMockAgentDataHome } from "./helpers/mock-agent.ts";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-function findBinary(): string | null {
-  if (process.env.SANDBOX_AGENT_BIN) {
-    return process.env.SANDBOX_AGENT_BIN;
-  }
-
-  const cargoPaths = [
-    resolve(__dirname, "../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../target/release/sandbox-agent"),
-  ];
-
-  for (const p of cargoPaths) {
-    if (existsSync(p)) {
-      return p;
-    }
-  }
-
-  return null;
-}
-
-const BINARY_PATH = findBinary();
-if (!BINARY_PATH) {
-  throw new Error(
-    "sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.",
-  );
-}
-if (!process.env.SANDBOX_AGENT_BIN) {
-  process.env.SANDBOX_AGENT_BIN = BINARY_PATH;
-}
+import WebSocket from "ws";
 
 function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-async function waitFor<T>(
-  fn: () => T | undefined | null,
-  timeoutMs = 6000,
-  stepMs = 30,
-): Promise<T> {
+class StrictUniqueSessionPersistDriver implements SessionPersistDriver {
+  private readonly events = new InMemorySessionPersistDriver({
+    maxEventsPerSession: 500,
+  });
+  private readonly eventIndexesBySession = new Map<string, Set<number>>();
+
+  async getSession(id: string): Promise<SessionRecord | null> {
+    return this.events.getSession(id);
+  }
+
+  async listSessions(request?: { cursor?: string; limit?: number }): Promise<ListPage<SessionRecord>> {
+    return this.events.listSessions(request);
+  }
+
+  async updateSession(session: SessionRecord): Promise<void> {
+    await this.events.updateSession(session);
+  }
+
+  async listEvents(request: ListEventsRequest): Promise<ListPage<SessionEvent>> {
+    return this.events.listEvents(request);
+  }
+
+  async insertEvent(sessionId: string, event: SessionEvent): Promise<void> {
+    await sleep(5);
+
+    const indexes = this.eventIndexesBySession.get(sessionId) ?? new Set<number>();
+    if (indexes.has(event.eventIndex)) {
+      throw new Error("UNIQUE constraint failed: sandbox_agent_events.session_id, sandbox_agent_events.event_index");
+    }
+
+    indexes.add(event.eventIndex);
+    this.eventIndexesBySession.set(sessionId, indexes);
+
+    await sleep(5);
+    await this.events.insertEvent(sessionId, event);
+  }
+}
+
+async function waitFor<T>(fn: () => T | undefined | null, timeoutMs = 6000, stepMs = 30): Promise<T> {
   const started = Date.now();
   while (Date.now() - started < timeoutMs) {
     const value = fn();
@@ -64,31 +70,162 @@ async function waitFor<T>(
   throw new Error("timed out waiting for condition");
 }
 
+async function waitForAsync<T>(fn: () => Promise<T | undefined | null>, timeoutMs = 6000, stepMs = 30): Promise<T> {
+  const started = Date.now();
+  while (Date.now() - started < timeoutMs) {
+    const value = await fn();
+    if (value !== undefined && value !== null) {
+      return value;
+    }
+    await sleep(stepMs);
+  }
+  throw new Error("timed out waiting for condition");
+}
+
+async function withTimeout<T>(promise: Promise<T>, label: string, timeoutMs = 15_000): Promise<T> {
+  return await Promise.race([
+    promise,
+    sleep(timeoutMs).then(() => {
+      throw new Error(`${label} timed out after ${timeoutMs}ms`);
+    }),
+  ]);
+}
+
+function buildTarArchive(entries: Array<{ name: string; content: string }>): Uint8Array {
+  const blocks: Buffer[] = [];
+
+  for (const entry of entries) {
+    const content = Buffer.from(entry.content, "utf8");
+    const header = Buffer.alloc(512, 0);
+
+    writeTarString(header, 0, 100, entry.name);
+    writeTarOctal(header, 100, 8, 0o644);
+    writeTarOctal(header, 108, 8, 0);
+    writeTarOctal(header, 116, 8, 0);
+    writeTarOctal(header, 124, 12, content.length);
+    writeTarOctal(header, 136, 12, Math.floor(Date.now() / 1000));
+    header.fill(0x20, 148, 156);
+    header[156] = "0".charCodeAt(0);
+    writeTarString(header, 257, 6, "ustar");
+    writeTarString(header, 263, 2, "00");
+
+    let checksum = 0;
+    for (const byte of header) {
+      checksum += byte;
+    }
+    writeTarChecksum(header, checksum);
+
+    blocks.push(header);
+    blocks.push(content);
+
+    const remainder = content.length % 512;
+    if (remainder !== 0) {
+      blocks.push(Buffer.alloc(512 - remainder, 0));
+    }
+  }
+
+  blocks.push(Buffer.alloc(1024, 0));
+  return Buffer.concat(blocks);
+}
+
+function writeTarString(buffer: Buffer, offset: number, length: number, value: string): void {
+  const bytes = Buffer.from(value, "utf8");
+  bytes.copy(buffer, offset, 0, Math.min(bytes.length, length));
+}
+
+function writeTarOctal(buffer: Buffer, offset: number, length: number, value: number): void {
+  const rendered = value.toString(8).padStart(length - 1, "0");
+  writeTarString(buffer, offset, length, rendered);
+  buffer[offset + length - 1] = 0;
+}
+
+function writeTarChecksum(buffer: Buffer, checksum: number): void {
+  const rendered = checksum.toString(8).padStart(6, "0");
+  writeTarString(buffer, 148, 6, rendered);
+  buffer[154] = 0;
+  buffer[155] = 0x20;
+}
+
+function decodeProcessLogData(data: string, encoding: string): string {
+  if (encoding === "base64") {
+    return Buffer.from(data, "base64").toString("utf8");
+  }
+  return data;
+}
+
+function nodeCommand(source: string): { command: string; args: string[] } {
+  return {
+    command: "node",
+    args: ["-e", source],
+  };
+}
+
+function forwardRequest(defaultFetch: typeof fetch, baseUrl: string, outgoing: Request, parsed: URL): Promise<Response> {
+  const forwardedInit: RequestInit & { duplex?: "half" } = {
+    method: outgoing.method,
+    headers: new Headers(outgoing.headers),
+    signal: outgoing.signal,
+  };
+
+  if (outgoing.method !== "GET" && outgoing.method !== "HEAD") {
+    forwardedInit.body = outgoing.body;
+    forwardedInit.duplex = "half";
+  }
+
+  const forwardedUrl = new URL(`${parsed.pathname}${parsed.search}`, baseUrl);
+  return defaultFetch(forwardedUrl, forwardedInit);
+}
+
+async function launchDesktopFocusWindow(sdk: SandboxAgent, display: string): Promise<string> {
+  const windowProcess = await sdk.createProcess({
+    command: "xterm",
+    args: ["-geometry", "80x24+40+40", "-title", "Sandbox Desktop Test", "-e", "sh", "-lc", "sleep 60"],
+    env: { DISPLAY: display },
+  });
+
+  await waitForAsync(
+    async () => {
+      const result = await sdk.runProcess({
+        command: "sh",
+        args: [
+          "-lc",
+          'wid="$(xdotool search --onlyvisible --name \'Sandbox Desktop Test\' 2>/dev/null | head -n 1 || true)"; if [ -z "$wid" ]; then exit 3; fi; xdotool windowactivate "$wid"',
+        ],
+        env: { DISPLAY: display },
+        timeoutMs: 5_000,
+      });
+
+      return result.exitCode === 0 ? true : undefined;
+    },
+    10_000,
+    200,
+  );
+
+  return windowProcess.id;
+}
+
 describe("Integration: TypeScript SDK flat session API", () => {
-  let handle: SandboxAgentSpawnHandle;
+  let handle: DockerSandboxAgentHandle;
   let baseUrl: string;
   let token: string;
-  let dataHome: string;
+  let layout: ReturnType<typeof createDockerTestLayout>;
 
-  beforeAll(async () => {
-    dataHome = mkdtempSync(join(tmpdir(), "sdk-integration-"));
-    prepareMockAgentDataHome(dataHome);
+  beforeEach(async () => {
+    layout = createDockerTestLayout();
+    prepareMockAgentDataHome(layout.xdgDataHome);
 
-    handle = await spawnSandboxAgent({
-      enabled: true,
-      log: "silent",
+    handle = await startDockerSandboxAgent(layout, {
       timeoutMs: 30000,
-      env: {
-        XDG_DATA_HOME: dataHome,
-      },
     });
     baseUrl = handle.baseUrl;
     token = handle.token;
   });
 
-  afterAll(async () => {
-    await handle.dispose();
-    rmSync(dataHome, { recursive: true, force: true });
+  afterEach(async () => {
+    await handle?.dispose?.();
+    if (layout) {
+      disposeDockerTestLayout(layout);
+    }
   });
 
   it("detects Node.js runtime", () => {
@@ -122,6 +259,9 @@ describe("Integration: TypeScript SDK flat session API", () => {
     const fetched = await sdk.getSession(session.id);
     expect(fetched?.agent).toBe("mock");
 
+    const acpServers = await sdk.listAcpServers();
+    expect(acpServers.servers.some((server) => server.agent === "mock")).toBe(true);
+
     const events = await sdk.getEvents({ sessionId: session.id, limit: 100 });
     expect(events.items.length).toBeGreaterThan(0);
     expect(events.items.some((event) => event.sender === "client")).toBe(true);
@@ -137,6 +277,224 @@ describe("Integration: TypeScript SDK flat session API", () => {
     await sdk.dispose();
   });
 
+  it("preserves observed event indexes across session creation follow-up calls", async () => {
+    const persist = new StrictUniqueSessionPersistDriver();
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+      persist,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+    const prompt = await session.prompt([{ type: "text", text: "preserve event indexes" }]);
+    expect(prompt.stopReason).toBe("end_turn");
+
+    const events = await waitForAsync(async () => {
+      const page = await sdk.getEvents({ sessionId: session.id, limit: 200 });
+      return page.items.length >= 4 ? page : null;
+    });
+    expect(new Set(events.items.map((event) => event.eventIndex)).size).toBe(events.items.length);
+
+    await sdk.dispose();
+  });
+
+  it("covers agent query flags and filesystem HTTP helpers", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const directory = join(layout.rootDir, "fs-test");
+    const nestedDir = join(directory, "nested");
+    const filePath = join(directory, "notes.txt");
+    const movedPath = join(directory, "notes-moved.txt");
+    const uploadDir = join(directory, "uploaded");
+    mkdirSync(directory, { recursive: true });
+
+    try {
+      const listedAgents = await sdk.listAgents({ config: true, noCache: true });
+      expect(listedAgents.agents.some((agent) => agent.id === "mock")).toBe(true);
+
+      const mockAgent = await sdk.getAgent("mock", { config: true, noCache: true });
+      expect(mockAgent.id).toBe("mock");
+      expect(Array.isArray(mockAgent.configOptions)).toBe(true);
+
+      await sdk.mkdirFs({ path: nestedDir });
+      await sdk.writeFsFile({ path: filePath }, "hello from sdk");
+
+      const bytes = await sdk.readFsFile({ path: filePath });
+      expect(new TextDecoder().decode(bytes)).toBe("hello from sdk");
+
+      const stat = await sdk.statFs({ path: filePath });
+      expect(stat.path).toBe(filePath);
+      expect(stat.size).toBe(bytes.byteLength);
+
+      const entries = await sdk.listFsEntries({ path: directory });
+      expect(entries.some((entry) => entry.path === nestedDir)).toBe(true);
+      expect(entries.some((entry) => entry.path === filePath)).toBe(true);
+
+      const moved = await sdk.moveFs({
+        from: filePath,
+        to: movedPath,
+        overwrite: true,
+      });
+      expect(moved.to).toBe(movedPath);
+
+      const uploadResult = await sdk.uploadFsBatch(buildTarArchive([{ name: "batch.txt", content: "batch upload works" }]), { path: uploadDir });
+      expect(uploadResult.paths.some((path) => path.endsWith("batch.txt"))).toBe(true);
+
+      const uploaded = await sdk.readFsFile({ path: join(uploadDir, "batch.txt") });
+      expect(new TextDecoder().decode(uploaded)).toBe("batch upload works");
+
+      const deleted = await sdk.deleteFsEntry({ path: movedPath });
+      expect(deleted.path).toBe(movedPath);
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+      await sdk.dispose();
+    }
+  });
+
+  it("uses custom fetch for both HTTP helpers and ACP session traffic", async () => {
+    const defaultFetch = globalThis.fetch;
+    if (!defaultFetch) {
+      throw new Error("Global fetch is not available in this runtime.");
+    }
+
+    const seenPaths: string[] = [];
+    const customFetch: typeof fetch = async (input, init) => {
+      const outgoing = new Request(input, init);
+      const parsed = new URL(outgoing.url);
+      seenPaths.push(parsed.pathname);
+
+      return forwardRequest(defaultFetch, baseUrl, outgoing, parsed);
+    };
+
+    const sdk = await SandboxAgent.connect({
+      token,
+      fetch: customFetch,
+    });
+    let sessionId: string | undefined;
+
+    try {
+      await withTimeout(sdk.getHealth(), "custom fetch getHealth");
+      const session = await withTimeout(sdk.createSession({ agent: "mock" }), "custom fetch createSession");
+      sessionId = session.id;
+      expect(session.agent).toBe("mock");
+      await withTimeout(sdk.destroySession(session.id), "custom fetch destroySession");
+
+      expect(seenPaths).toContain("/v1/health");
+      expect(seenPaths.some((path) => path.startsWith("/v1/acp/"))).toBe(true);
+    } finally {
+      if (sessionId) {
+        await sdk.destroySession(sessionId).catch(() => {});
+      }
+      await withTimeout(sdk.dispose(), "custom fetch dispose");
+    }
+  }, 60_000);
+
+  it("requires baseUrl when fetch is not provided", async () => {
+    await expect(SandboxAgent.connect({ token } as any)).rejects.toThrow("baseUrl is required unless fetch is provided.");
+  });
+
+  it("waits for health before non-ACP HTTP helpers", async () => {
+    const defaultFetch = globalThis.fetch;
+    if (!defaultFetch) {
+      throw new Error("Global fetch is not available in this runtime.");
+    }
+
+    let healthAttempts = 0;
+    const seenPaths: string[] = [];
+    const customFetch: typeof fetch = async (input, init) => {
+      const outgoing = new Request(input, init);
+      const parsed = new URL(outgoing.url);
+      seenPaths.push(parsed.pathname);
+
+      if (parsed.pathname === "/v1/health") {
+        healthAttempts += 1;
+        if (healthAttempts < 3) {
+          return new Response("warming up", { status: 503 });
+        }
+      }
+
+      return forwardRequest(defaultFetch, baseUrl, outgoing, parsed);
+    };
+
+    const sdk = await SandboxAgent.connect({
+      token,
+      fetch: customFetch,
+    });
+
+    const agents = await sdk.listAgents();
+    expect(Array.isArray(agents.agents)).toBe(true);
+    expect(healthAttempts).toBe(3);
+
+    const firstAgentsRequest = seenPaths.indexOf("/v1/agents");
+    expect(firstAgentsRequest).toBeGreaterThanOrEqual(0);
+    expect(seenPaths.slice(0, firstAgentsRequest)).toEqual(["/v1/health", "/v1/health", "/v1/health"]);
+
+    await sdk.dispose();
+  });
+
+  it("surfaces health timeout when a request awaits readiness", async () => {
+    const customFetch: typeof fetch = async (input, init) => {
+      const outgoing = new Request(input, init);
+      const parsed = new URL(outgoing.url);
+
+      if (parsed.pathname === "/v1/health") {
+        return new Response("warming up", { status: 503 });
+      }
+
+      throw new Error(`Unexpected request path during timeout test: ${parsed.pathname}`);
+    };
+
+    const sdk = await SandboxAgent.connect({
+      token,
+      fetch: customFetch,
+      waitForHealth: { timeoutMs: 100 },
+    });
+
+    await expect(sdk.listAgents()).rejects.toThrow("Timed out waiting for sandbox-agent health");
+    await sdk.dispose();
+  });
+
+  it("aborts the shared health wait when connect signal is aborted", async () => {
+    const controller = new AbortController();
+    const customFetch: typeof fetch = async (input, init) => {
+      const outgoing = new Request(input, init);
+      const parsed = new URL(outgoing.url);
+
+      if (parsed.pathname !== "/v1/health") {
+        throw new Error(`Unexpected request path during abort test: ${parsed.pathname}`);
+      }
+
+      return new Promise<Response>((_resolve, reject) => {
+        const onAbort = () => {
+          outgoing.signal.removeEventListener("abort", onAbort);
+          reject(outgoing.signal.reason ?? new DOMException("Connect aborted", "AbortError"));
+        };
+
+        if (outgoing.signal.aborted) {
+          onAbort();
+          return;
+        }
+
+        outgoing.signal.addEventListener("abort", onAbort, { once: true });
+      });
+    };
+
+    const sdk = await SandboxAgent.connect({
+      token,
+      fetch: customFetch,
+      signal: controller.signal,
+    });
+
+    const pending = sdk.listAgents();
+    controller.abort(new DOMException("Connect aborted", "AbortError"));
+
+    await expect(pending).rejects.toThrow("Connect aborted");
+    await sdk.dispose();
+  });
+
   it("restores a session on stale connection by recreating and replaying history on first prompt", async () => {
     const persist = new InMemorySessionPersistDriver({
       maxEventsPerSession: 200,
@@ -180,11 +538,7 @@ describe("Integration: TypeScript SDK flat session API", () => {
       const params = payload.params as Record<string, unknown> | undefined;
       const prompt = Array.isArray(params?.prompt) ? params?.prompt : [];
       const firstBlock = prompt[0] as Record<string, unknown> | undefined;
-      return (
-        method === "session/prompt" &&
-        typeof firstBlock?.text === "string" &&
-        firstBlock.text.includes("Previous session history is replayed below")
-      );
+      return method === "session/prompt" && typeof firstBlock?.text === "string" && firstBlock.text.includes("Previous session history is replayed below");
     });
 
     expect(replayInjected).toBeTruthy();
@@ -215,13 +569,178 @@ describe("Integration: TypeScript SDK flat session API", () => {
     await sdk.dispose();
   });
 
+  it("blocks manual session/cancel and requires destroySession", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+
+    await expect(session.rawSend("session/cancel")).rejects.toThrow("Use destroySession(sessionId) instead.");
+    await expect(sdk.rawSendSessionMethod(session.id, "session/cancel", {})).rejects.toThrow("Use destroySession(sessionId) instead.");
+
+    const destroyed = await sdk.destroySession(session.id);
+    expect(destroyed.destroyedAt).toBeDefined();
+
+    const reloaded = await sdk.getSession(session.id);
+    expect(reloaded?.destroyedAt).toBeDefined();
+
+    await sdk.dispose();
+  });
+
+  it("supports typed config helpers and createSession preconfiguration", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({
+      agent: "mock",
+      model: "mock",
+    });
+
+    const options = await session.getConfigOptions();
+    expect(options.some((option) => option.category === "model")).toBe(true);
+
+    await expect(session.setModel("unknown-model")).rejects.toThrow("does not support value");
+
+    await sdk.dispose();
+  });
+
+  it("setModel happy path switches to a valid model", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+    await session.setModel("mock-fast");
+
+    const options = await session.getConfigOptions();
+    const modelOption = options.find((o) => o.category === "model");
+    expect(modelOption?.currentValue).toBe("mock-fast");
+
+    await sdk.dispose();
+  });
+
+  it("setMode happy path switches to a valid mode", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+    await session.setMode("plan");
+
+    const modes = await waitForAsync(async () => {
+      const current = await session.getModes();
+      return current?.currentModeId === "plan" ? current : null;
+    });
+    expect(modes.currentModeId).toBe("plan");
+
+    const modeOption = await waitForAsync(async () => {
+      const option = (await session.getConfigOptions()).find((o) => o.category === "mode");
+      return option?.currentValue === "plan" ? option : null;
+    });
+    expect(modeOption.currentValue).toBe("plan");
+
+    await sdk.dispose();
+  });
+
+  it("setThoughtLevel happy path switches to a valid thought level", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+    await session.setThoughtLevel("high");
+
+    const options = await session.getConfigOptions();
+    const thoughtOption = options.find((o) => o.category === "thought_level");
+    expect(thoughtOption?.currentValue).toBe("high");
+
+    await sdk.dispose();
+  });
+
+  it("setModel/setMode/setThoughtLevel can be changed multiple times", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+
+    // Model: mock → mock-fast → mock
+    await session.setModel("mock-fast");
+    expect((await session.getConfigOptions()).find((o) => o.category === "model")?.currentValue).toBe("mock-fast");
+    await session.setModel("mock");
+    expect((await session.getConfigOptions()).find((o) => o.category === "model")?.currentValue).toBe("mock");
+
+    // Mode: normal → plan → normal
+    await session.setMode("plan");
+    expect((await session.getModes())?.currentModeId).toBe("plan");
+    await session.setMode("normal");
+    expect((await session.getModes())?.currentModeId).toBe("normal");
+
+    // Thought level: low → high → medium → low
+    await session.setThoughtLevel("high");
+    expect((await session.getConfigOptions()).find((o) => o.category === "thought_level")?.currentValue).toBe("high");
+    await session.setThoughtLevel("medium");
+    expect((await session.getConfigOptions()).find((o) => o.category === "thought_level")?.currentValue).toBe("medium");
+    await session.setThoughtLevel("low");
+    expect((await session.getConfigOptions()).find((o) => o.category === "thought_level")?.currentValue).toBe("low");
+
+    await sdk.dispose();
+  });
+
+  it("surfaces ACP permission requests and maps approve/reject replies", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const session = await sdk.createSession({ agent: "mock" });
+    const permissionIds: string[] = [];
+    const permissionTexts: string[] = [];
+
+    const offPermissions = session.onPermissionRequest((request) => {
+      permissionIds.push(request.id);
+      const reply = permissionIds.length === 1 ? "reject" : "always";
+      void session.respondPermission(request.id, reply);
+    });
+
+    const offEvents = session.onEvent((event) => {
+      const text = (event.payload as any)?.params?.update?.content?.text;
+      if (typeof text === "string" && text.startsWith("mock permission ")) {
+        permissionTexts.push(text);
+      }
+    });
+
+    await session.prompt([{ type: "text", text: "trigger permission request one" }]);
+    await session.prompt([{ type: "text", text: "trigger permission request two" }]);
+
+    await waitFor(() => (permissionIds.length === 2 ? permissionIds : undefined));
+    await waitFor(() => (permissionTexts.length === 2 ? permissionTexts : undefined));
+
+    expect(permissionTexts[0]).toContain("rejected");
+    expect(permissionTexts[1]).toContain("approved");
+
+    offEvents();
+    offPermissions();
+    await sdk.dispose();
+  });
+
   it("supports MCP and skills config HTTP helpers", async () => {
     const sdk = await SandboxAgent.connect({
       baseUrl,
       token,
     });
 
-    const directory = mkdtempSync(join(tmpdir(), "sdk-config-"));
+    const directory = join(layout.rootDir, "config-test");
+
+    mkdirSync(directory, { recursive: true });
 
     const mcpConfig = {
       type: "local" as const,
@@ -281,4 +800,285 @@ describe("Integration: TypeScript SDK flat session API", () => {
     await sdk.dispose();
     rmSync(directory, { recursive: true, force: true });
   });
+
+  it("covers process runtime HTTP helpers, log streaming, and terminal websocket access", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+
+    const originalConfig = await sdk.getProcessConfig();
+    const updatedConfig = await sdk.setProcessConfig({
+      ...originalConfig,
+      maxOutputBytes: originalConfig.maxOutputBytes + 1,
+    });
+    expect(updatedConfig.maxOutputBytes).toBe(originalConfig.maxOutputBytes + 1);
+
+    const runResult = await sdk.runProcess({
+      ...nodeCommand("process.stdout.write('run-stdout'); process.stderr.write('run-stderr');"),
+      timeoutMs: 5_000,
+    });
+    expect(runResult.stdout).toContain("run-stdout");
+    expect(runResult.stderr).toContain("run-stderr");
+
+    let interactiveProcessId: string | undefined;
+    let ttyProcessId: string | undefined;
+    let killProcessId: string | undefined;
+
+    try {
+      const interactiveProcess = await sdk.createProcess({
+        ...nodeCommand(`
+          process.stdin.setEncoding("utf8");
+          process.stdout.write("ready\\n");
+          process.stdin.on("data", (chunk) => {
+            process.stdout.write("echo:" + chunk);
+          });
+          setInterval(() => {}, 1_000);
+        `),
+        interactive: true,
+      });
+      interactiveProcessId = interactiveProcess.id;
+
+      const listed = await sdk.listProcesses();
+      expect(listed.processes.some((process) => process.id === interactiveProcess.id)).toBe(true);
+
+      const fetched = await sdk.getProcess(interactiveProcess.id);
+      expect(fetched.status).toBe("running");
+
+      const initialLogs = await waitForAsync(async () => {
+        const logs = await sdk.getProcessLogs(interactiveProcess.id, { tail: 10 });
+        return logs.entries.some((entry) => decodeProcessLogData(entry.data, entry.encoding).includes("ready")) ? logs : undefined;
+      });
+      expect(initialLogs.entries.some((entry) => decodeProcessLogData(entry.data, entry.encoding).includes("ready"))).toBe(true);
+
+      const followedLogs: string[] = [];
+      const subscription = await sdk.followProcessLogs(
+        interactiveProcess.id,
+        (entry) => {
+          followedLogs.push(decodeProcessLogData(entry.data, entry.encoding));
+        },
+        { tail: 1 },
+      );
+
+      try {
+        const inputResult = await sdk.sendProcessInput(interactiveProcess.id, {
+          data: Buffer.from("hello over stdin\n", "utf8").toString("base64"),
+          encoding: "base64",
+        });
+        expect(inputResult.bytesWritten).toBeGreaterThan(0);
+
+        await waitFor(() => {
+          const joined = followedLogs.join("");
+          return joined.includes("echo:hello over stdin") ? joined : undefined;
+        });
+      } finally {
+        subscription.close();
+        await subscription.closed;
+      }
+
+      const stopped = await sdk.stopProcess(interactiveProcess.id, { waitMs: 5_000 });
+      expect(stopped.status).toBe("exited");
+
+      await sdk.deleteProcess(interactiveProcess.id);
+      interactiveProcessId = undefined;
+
+      const ttyProcess = await sdk.createProcess({
+        ...nodeCommand(`
+          process.stdin.setEncoding("utf8");
+          process.stdin.on("data", (chunk) => {
+            process.stdout.write(chunk);
+          });
+          setInterval(() => {}, 1_000);
+        `),
+        interactive: true,
+        tty: true,
+      });
+      ttyProcessId = ttyProcess.id;
+
+      const resized = await sdk.resizeProcessTerminal(ttyProcess.id, {
+        cols: 120,
+        rows: 40,
+      });
+      expect(resized.cols).toBe(120);
+      expect(resized.rows).toBe(40);
+
+      const wsUrl = sdk.buildProcessTerminalWebSocketUrl(ttyProcess.id);
+      expect(wsUrl.startsWith("ws://") || wsUrl.startsWith("wss://")).toBe(true);
+
+      const session = sdk.connectProcessTerminal(ttyProcess.id, {
+        WebSocket: WebSocket as unknown as typeof globalThis.WebSocket,
+      });
+      const readyFrames: string[] = [];
+      const ttyOutput: string[] = [];
+      const exitFrames: Array<number | null | undefined> = [];
+      const terminalErrors: string[] = [];
+      let closeCount = 0;
+
+      session.onReady((frame) => {
+        readyFrames.push(frame.processId);
+      });
+      session.onData((bytes) => {
+        ttyOutput.push(Buffer.from(bytes).toString("utf8"));
+      });
+      session.onExit((frame) => {
+        exitFrames.push(frame.exitCode);
+      });
+      session.onError((error) => {
+        terminalErrors.push(error instanceof Error ? error.message : error.message);
+      });
+      session.onClose(() => {
+        closeCount += 1;
+      });
+
+      await waitFor(() => readyFrames[0]);
+
+      session.sendInput("hello tty\n");
+
+      await waitFor(() => {
+        const joined = ttyOutput.join("");
+        return joined.includes("hello tty") ? joined : undefined;
+      });
+
+      session.close();
+      await session.closed;
+      expect(closeCount).toBeGreaterThan(0);
+      expect(exitFrames).toHaveLength(0);
+      expect(terminalErrors).toEqual([]);
+
+      await waitForAsync(async () => {
+        const processInfo = await sdk.getProcess(ttyProcess.id);
+        return processInfo.status === "running" ? processInfo : undefined;
+      });
+
+      const killedTty = await sdk.killProcess(ttyProcess.id, { waitMs: 5_000 });
+      expect(killedTty.status).toBe("exited");
+
+      await sdk.deleteProcess(ttyProcess.id);
+      ttyProcessId = undefined;
+
+      const killProcess = await sdk.createProcess({
+        ...nodeCommand("setInterval(() => {}, 1_000);"),
+      });
+      killProcessId = killProcess.id;
+
+      const killed = await sdk.killProcess(killProcess.id, { waitMs: 5_000 });
+      expect(killed.status).toBe("exited");
+
+      await sdk.deleteProcess(killProcess.id);
+      killProcessId = undefined;
+    } finally {
+      await sdk.setProcessConfig(originalConfig);
+
+      if (interactiveProcessId) {
+        await sdk.killProcess(interactiveProcessId, { waitMs: 5_000 }).catch(() => {});
+        await sdk.deleteProcess(interactiveProcessId).catch(() => {});
+      }
+
+      if (ttyProcessId) {
+        await sdk.killProcess(ttyProcessId, { waitMs: 5_000 }).catch(() => {});
+        await sdk.deleteProcess(ttyProcessId).catch(() => {});
+      }
+
+      if (killProcessId) {
+        await sdk.killProcess(killProcessId, { waitMs: 5_000 }).catch(() => {});
+        await sdk.deleteProcess(killProcessId).catch(() => {});
+      }
+
+      await sdk.dispose();
+    }
+  });
+
+  it("covers desktop status, screenshot, display, mouse, and keyboard helpers", async () => {
+    const sdk = await SandboxAgent.connect({
+      baseUrl,
+      token,
+    });
+    let focusWindowProcessId: string | undefined;
+
+    try {
+      const initialStatus = await sdk.getDesktopStatus();
+      expect(initialStatus.state).toBe("inactive");
+
+      const started = await sdk.startDesktop({
+        width: 1440,
+        height: 900,
+        dpi: 96,
+      });
+      expect(started.state).toBe("active");
+      expect(started.display?.startsWith(":")).toBe(true);
+      expect(started.missingDependencies).toEqual([]);
+
+      const displayInfo = await sdk.getDesktopDisplayInfo();
+      expect(displayInfo.display).toBe(started.display);
+      expect(displayInfo.resolution.width).toBe(1440);
+      expect(displayInfo.resolution.height).toBe(900);
+
+      const screenshot = await sdk.takeDesktopScreenshot();
+      expect(Buffer.from(screenshot.subarray(0, 8)).equals(Buffer.from("\x89PNG\r\n\x1a\n", "binary"))).toBe(true);
+
+      const region = await sdk.takeDesktopRegionScreenshot({
+        x: 10,
+        y: 20,
+        width: 40,
+        height: 50,
+      });
+      expect(Buffer.from(region.subarray(0, 8)).equals(Buffer.from("\x89PNG\r\n\x1a\n", "binary"))).toBe(true);
+
+      const moved = await sdk.moveDesktopMouse({ x: 40, y: 50 });
+      expect(moved.x).toBe(40);
+      expect(moved.y).toBe(50);
+
+      const dragged = await sdk.dragDesktopMouse({
+        startX: 40,
+        startY: 50,
+        endX: 80,
+        endY: 90,
+        button: "left",
+      });
+      expect(dragged.x).toBe(80);
+      expect(dragged.y).toBe(90);
+
+      const clicked = await sdk.clickDesktop({
+        x: 80,
+        y: 90,
+        button: "left",
+        clickCount: 1,
+      });
+      expect(clicked.x).toBe(80);
+      expect(clicked.y).toBe(90);
+
+      const scrolled = await sdk.scrollDesktop({
+        x: 80,
+        y: 90,
+        deltaY: -2,
+      });
+      expect(scrolled.x).toBe(80);
+      expect(scrolled.y).toBe(90);
+
+      const position = await sdk.getDesktopMousePosition();
+      expect(position.x).toBe(80);
+      expect(position.y).toBe(90);
+
+      focusWindowProcessId = await launchDesktopFocusWindow(sdk, started.display!);
+
+      const typed = await sdk.typeDesktopText({
+        text: "hello desktop",
+        delayMs: 5,
+      });
+      expect(typed.ok).toBe(true);
+
+      const pressed = await sdk.pressDesktopKey({ key: "ctrl+l" });
+      expect(pressed.ok).toBe(true);
+
+      const stopped = await sdk.stopDesktop();
+      expect(stopped.state).toBe("inactive");
+    } finally {
+      if (focusWindowProcessId) {
+        await sdk.killProcess(focusWindowProcessId, { waitMs: 5_000 }).catch(() => {});
+        await sdk.deleteProcess(focusWindowProcessId).catch(() => {});
+      }
+      await sdk.stopDesktop().catch(() => {});
+      await sdk.dispose();
+    }
+  });
 });
diff --git a/sdks/typescript/tests/provider-lifecycle.test.ts b/sdks/typescript/tests/provider-lifecycle.test.ts
new file mode 100644
index 0000000..65ea733
--- /dev/null
+++ b/sdks/typescript/tests/provider-lifecycle.test.ts
@@ -0,0 +1,511 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { SandboxAgent, SandboxDestroyedError, type SandboxProvider } from "../src/index.ts";
+
+const e2bMocks = vi.hoisted(() => {
+  class MockNotFoundError extends Error {
+    constructor(message: string) {
+      super(message);
+      this.name = "NotFoundError";
+    }
+  }
+
+  return {
+    MockNotFoundError,
+    betaCreate: vi.fn(),
+    connect: vi.fn(),
+  };
+});
+
+const modalMocks = vi.hoisted(() => ({
+  appsFromName: vi.fn(),
+  imageFromRegistry: vi.fn(),
+  secretFromObject: vi.fn(),
+  sandboxCreate: vi.fn(),
+  sandboxFromId: vi.fn(),
+}));
+
+const computeSdkMocks = vi.hoisted(() => ({
+  create: vi.fn(),
+  getById: vi.fn(),
+}));
+
+const spritesMocks = vi.hoisted(() => ({
+  createSprite: vi.fn(),
+  getSprite: vi.fn(),
+  deleteSprite: vi.fn(),
+}));
+
+vi.mock("@e2b/code-interpreter", () => ({
+  NotFoundError: e2bMocks.MockNotFoundError,
+  Sandbox: {
+    betaCreate: e2bMocks.betaCreate,
+    connect: e2bMocks.connect,
+  },
+}));
+
+vi.mock("modal", () => ({
+  ModalClient: class MockModalClient {
+    apps = { fromName: modalMocks.appsFromName };
+    images = { fromRegistry: modalMocks.imageFromRegistry };
+    secrets = { fromObject: modalMocks.secretFromObject };
+    sandboxes = {
+      create: modalMocks.sandboxCreate,
+      fromId: modalMocks.sandboxFromId,
+    };
+  },
+}));
+
+vi.mock("computesdk", () => ({
+  compute: {
+    sandbox: {
+      create: computeSdkMocks.create,
+      getById: computeSdkMocks.getById,
+    },
+  },
+}));
+
+vi.mock("@fly/sprites", () => ({
+  SpritesClient: class MockSpritesClient {
+    readonly token: string;
+    readonly baseURL: string;
+
+    constructor(token: string, options: { baseURL?: string } = {}) {
+      this.token = token;
+      this.baseURL = options.baseURL ?? "https://api.sprites.dev";
+    }
+
+    createSprite = spritesMocks.createSprite;
+    getSprite = spritesMocks.getSprite;
+    deleteSprite = spritesMocks.deleteSprite;
+  },
+}));
+
+import { e2b } from "../src/providers/e2b.ts";
+import { modal } from "../src/providers/modal.ts";
+import { computesdk } from "../src/providers/computesdk.ts";
+import { sprites } from "../src/providers/sprites.ts";
+
+function createFetch(): typeof fetch {
+  return async () => new Response(null, { status: 200 });
+}
+
+function createBaseProvider(overrides: Partial<SandboxProvider> = {}): SandboxProvider {
+  return {
+    name: "mock",
+    async create(): Promise<string> {
+      return "created";
+    },
+    async destroy(): Promise<void> {},
+    async getUrl(): Promise<string> {
+      return "http://127.0.0.1:3000";
+    },
+    ...overrides,
+  };
+}
+
+function createMockSandbox() {
+  return {
+    sandboxId: "sbx-123",
+    getHost: vi.fn(() => "sandbox.example"),
+    betaPause: vi.fn(async () => true),
+    kill: vi.fn(async () => undefined),
+    commands: {
+      run: vi.fn(async () => ({ exitCode: 0, stderr: "" })),
+    },
+  };
+}
+
+function createMockModalImage() {
+  return {
+    dockerfileCommands: vi.fn(function dockerfileCommands() {
+      return this;
+    }),
+  };
+}
+
+beforeEach(() => {
+  e2bMocks.betaCreate.mockReset();
+  e2bMocks.connect.mockReset();
+  modalMocks.appsFromName.mockReset();
+  modalMocks.imageFromRegistry.mockReset();
+  modalMocks.secretFromObject.mockReset();
+  modalMocks.sandboxCreate.mockReset();
+  modalMocks.sandboxFromId.mockReset();
+  computeSdkMocks.create.mockReset();
+  computeSdkMocks.getById.mockReset();
+  spritesMocks.createSprite.mockReset();
+  spritesMocks.getSprite.mockReset();
+  spritesMocks.deleteSprite.mockReset();
+});
+
+describe("SandboxAgent provider lifecycle", () => {
+  it("reconnects an existing sandbox before ensureServer", async () => {
+    const order: string[] = [];
+    const provider = createBaseProvider({
+      reconnect: vi.fn(async () => {
+        order.push("reconnect");
+      }),
+      ensureServer: vi.fn(async () => {
+        order.push("ensureServer");
+      }),
+    });
+
+    const sdk = await SandboxAgent.start({
+      sandbox: provider,
+      sandboxId: "mock/existing",
+      skipHealthCheck: true,
+      fetch: createFetch(),
+    });
+
+    expect(order).toEqual(["reconnect", "ensureServer"]);
+
+    await sdk.killSandbox();
+  });
+
+  it("surfaces SandboxDestroyedError from reconnect", async () => {
+    const provider = createBaseProvider({
+      reconnect: vi.fn(async () => {
+        throw new SandboxDestroyedError("existing", "mock");
+      }),
+      ensureServer: vi.fn(async () => undefined),
+    });
+
+    await expect(
+      SandboxAgent.start({
+        sandbox: provider,
+        sandboxId: "mock/existing",
+        skipHealthCheck: true,
+        fetch: createFetch(),
+      }),
+    ).rejects.toBeInstanceOf(SandboxDestroyedError);
+
+    expect(provider.ensureServer).not.toHaveBeenCalled();
+  });
+
+  it("uses provider pause and kill hooks for explicit lifecycle control", async () => {
+    const pause = vi.fn(async () => undefined);
+    const kill = vi.fn(async () => undefined);
+    const provider = createBaseProvider({ pause, kill });
+
+    const paused = await SandboxAgent.start({
+      sandbox: provider,
+      skipHealthCheck: true,
+      fetch: createFetch(),
+    });
+    await paused.pauseSandbox();
+    expect(pause).toHaveBeenCalledWith("created");
+
+    const killed = await SandboxAgent.start({
+      sandbox: provider,
+      skipHealthCheck: true,
+      fetch: createFetch(),
+    });
+    await killed.killSandbox();
+    expect(kill).toHaveBeenCalledWith("created");
+  });
+});
+
+describe("e2b provider", () => {
+  it("creates sandboxes with betaCreate, autoPause, and the default timeout", async () => {
+    const sandbox = createMockSandbox();
+    e2bMocks.betaCreate.mockResolvedValue(sandbox);
+
+    const provider = e2b({
+      create: {
+        envs: { ANTHROPIC_API_KEY: "test" },
+      },
+    });
+
+    await expect(provider.create()).resolves.toBe("sbx-123");
+
+    expect(e2bMocks.betaCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        allowInternetAccess: true,
+        autoPause: true,
+        timeoutMs: 3_600_000,
+        envs: { ANTHROPIC_API_KEY: "test" },
+      }),
+    );
+  });
+
+  it("allows timeoutMs and autoPause to be overridden", async () => {
+    const sandbox = createMockSandbox();
+    e2bMocks.betaCreate.mockResolvedValue(sandbox);
+
+    const provider = e2b({
+      timeoutMs: 123_456,
+      autoPause: false,
+    });
+
+    await provider.create();
+
+    expect(e2bMocks.betaCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        autoPause: false,
+        timeoutMs: 123_456,
+      }),
+    );
+  });
+
+  it("pauses by default in destroy and uses kill for permanent deletion", async () => {
+    const sandbox = createMockSandbox();
+    e2bMocks.connect.mockResolvedValue(sandbox);
+    const provider = e2b();
+
+    await provider.destroy("sbx-123");
+    expect(e2bMocks.connect).toHaveBeenLastCalledWith("sbx-123", { timeoutMs: 3_600_000 });
+    expect(sandbox.betaPause).toHaveBeenCalledTimes(1);
+    expect(sandbox.kill).not.toHaveBeenCalled();
+
+    await provider.kill?.("sbx-123");
+    expect(sandbox.kill).toHaveBeenCalledTimes(1);
+  });
+
+  it("maps missing reconnect targets to SandboxDestroyedError", async () => {
+    e2bMocks.connect.mockRejectedValue(new e2bMocks.MockNotFoundError("gone"));
+    const provider = e2b();
+
+    await expect(provider.reconnect?.("missing-sandbox")).rejects.toBeInstanceOf(SandboxDestroyedError);
+  });
+
+  it("passes a configured template to betaCreate", async () => {
+    const sandbox = createMockSandbox();
+    e2bMocks.betaCreate.mockResolvedValue(sandbox);
+
+    const provider = e2b({
+      template: "my-template",
+      create: { envs: { ANTHROPIC_API_KEY: "test" } },
+    });
+
+    await provider.create();
+
+    expect(e2bMocks.betaCreate).toHaveBeenCalledWith(
+      "my-template",
+      expect.objectContaining({
+        allowInternetAccess: true,
+        envs: { ANTHROPIC_API_KEY: "test" },
+        timeoutMs: 3_600_000,
+      }),
+    );
+  });
+
+  it("accepts legacy create.template values from plain JavaScript", async () => {
+    const sandbox = createMockSandbox();
+    e2bMocks.betaCreate.mockResolvedValue(sandbox);
+
+    const provider = e2b({
+      create: { template: "legacy-template" } as never,
+    });
+
+    await provider.create();
+
+    expect(e2bMocks.betaCreate).toHaveBeenCalledWith(
+      "legacy-template",
+      expect.objectContaining({
+        allowInternetAccess: true,
+        timeoutMs: 3_600_000,
+      }),
+    );
+  });
+});
+
+describe("modal provider", () => {
+  it("uses the configured base image when building the sandbox image", async () => {
+    const app = { appId: "app-123" };
+    const image = createMockModalImage();
+    const sandbox = {
+      sandboxId: "sbx-modal",
+      exec: vi.fn(),
+    };
+
+    modalMocks.appsFromName.mockResolvedValue(app);
+    modalMocks.imageFromRegistry.mockReturnValue(image);
+    modalMocks.sandboxCreate.mockResolvedValue(sandbox);
+
+    const provider = modal({
+      image: "python:3.12-slim",
+      create: {
+        appName: "custom-app",
+        secrets: { OPENAI_API_KEY: "test" },
+      },
+    });
+
+    await expect(provider.create()).resolves.toBe("sbx-modal");
+
+    expect(modalMocks.appsFromName).toHaveBeenCalledWith("custom-app", { createIfMissing: true });
+    expect(modalMocks.imageFromRegistry).toHaveBeenCalledWith("python:3.12-slim");
+    expect(image.dockerfileCommands).not.toHaveBeenCalled();
+    expect(modalMocks.sandboxCreate).toHaveBeenCalledWith(
+      app,
+      image,
+      expect.objectContaining({
+        encryptedPorts: [3000],
+        memoryMiB: 2048,
+      }),
+    );
+  });
+});
+
+describe("computesdk provider", () => {
+  it("passes image and template options through to compute.sandbox.create", async () => {
+    const sandbox = {
+      sandboxId: "sbx-compute",
+      runCommand: vi.fn(async () => ({ exitCode: 0, stderr: "" })),
+    };
+    computeSdkMocks.create.mockResolvedValue(sandbox);
+
+    const provider = computesdk({
+      create: {
+        envs: { ANTHROPIC_API_KEY: "test" },
+        image: "ghcr.io/example/sandbox-agent:latest",
+        templateId: "tmpl-123",
+      },
+    });
+
+    await expect(provider.create()).resolves.toBe("sbx-compute");
+
+    expect(computeSdkMocks.create).toHaveBeenCalledWith(
+      expect.objectContaining({
+        envs: { ANTHROPIC_API_KEY: "test" },
+        image: "ghcr.io/example/sandbox-agent:latest",
+        templateId: "tmpl-123",
+      }),
+    );
+  });
+});
+
+describe("sprites provider", () => {
+  it("creates a sprite, installs sandbox-agent, and configures the managed service", async () => {
+    const sprite = {
+      name: "sprite-1",
+      execFile: vi.fn(async () => ({ stdout: "", stderr: "", exitCode: 0 })),
+    };
+    spritesMocks.createSprite.mockResolvedValue(sprite);
+
+    const fetchMock = vi
+      .fn<typeof fetch>()
+      .mockResolvedValueOnce(new Response(null, { status: 404 }))
+      .mockResolvedValueOnce(new Response(JSON.stringify({}), { status: 200 }))
+      .mockResolvedValueOnce(new Response(JSON.stringify({ state: { status: "stopped" } }), { status: 200 }))
+      .mockResolvedValueOnce(new Response("", { status: 200 }));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const provider = sprites({
+      token: "sprite-token",
+      create: {
+        name: "sprite-1",
+      },
+      env: {
+        OPENAI_API_KEY: "test'value",
+      },
+    });
+
+    await expect(provider.create()).resolves.toBe("sprite-1");
+
+    expect(spritesMocks.createSprite).toHaveBeenCalledWith("sprite-1", undefined);
+    expect(sprite.execFile).not.toHaveBeenCalled();
+
+    const putCall = fetchMock.mock.calls.find(([url, init]) => String(url).includes("/services/sandbox-agent") && init?.method === "PUT");
+    expect(putCall).toBeDefined();
+    expect(String(putCall?.[0])).toContain("/v1/sprites/sprite-1/services/sandbox-agent");
+    expect(putCall?.[1]?.headers).toMatchObject({
+      Authorization: "Bearer sprite-token",
+      "Content-Type": "application/json",
+    });
+    const serviceRequest = JSON.parse(String(putCall?.[1]?.body)) as { args: string[] };
+    expect(serviceRequest.args[1]).toContain("exec npx -y @sandbox-agent/cli@0.5.0-rc.2 server --no-token --host 0.0.0.0 --port 8080");
+    expect(serviceRequest.args[1]).toContain("OPENAI_API_KEY='test'\\''value'");
+  });
+
+  it("optionally installs agents through npx when requested", async () => {
+    const sprite = {
+      name: "sprite-1",
+      execFile: vi.fn(async () => ({ stdout: "", stderr: "", exitCode: 0 })),
+    };
+    spritesMocks.createSprite.mockResolvedValue(sprite);
+
+    const fetchMock = vi
+      .fn<typeof fetch>()
+      .mockResolvedValueOnce(new Response(null, { status: 404 }))
+      .mockResolvedValueOnce(new Response(JSON.stringify({}), { status: 200 }))
+      .mockResolvedValueOnce(new Response(JSON.stringify({ state: { status: "stopped" } }), { status: 200 }))
+      .mockResolvedValueOnce(new Response("", { status: 200 }));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const provider = sprites({
+      token: "sprite-token",
+      create: { name: "sprite-1" },
+      env: { OPENAI_API_KEY: "test" },
+      installAgents: ["claude", "codex"],
+    });
+
+    await provider.create();
+
+    expect(sprite.execFile).toHaveBeenCalledWith("bash", ["-lc", "npx -y @sandbox-agent/cli@0.5.0-rc.2 install-agent claude"], {
+      env: { OPENAI_API_KEY: "test" },
+    });
+    expect(sprite.execFile).toHaveBeenCalledWith("bash", ["-lc", "npx -y @sandbox-agent/cli@0.5.0-rc.2 install-agent codex"], {
+      env: { OPENAI_API_KEY: "test" },
+    });
+  });
+
+  it("returns the sprite URL and provider token for authenticated access", async () => {
+    spritesMocks.getSprite.mockResolvedValue({
+      name: "sprite-1",
+      url: "https://sprite-1.sprites.app",
+    });
+
+    const provider = sprites({
+      token: "sprite-token",
+    });
+
+    await expect(provider.getUrl?.("sprite-1")).resolves.toBe("https://sprite-1.sprites.app");
+    await expect((provider as SandboxProvider & { getToken: (sandboxId: string) => Promise<string> }).getToken("sprite-1")).resolves.toBe("sprite-token");
+  });
+
+  it("maps missing reconnect targets to SandboxDestroyedError", async () => {
+    spritesMocks.getSprite.mockRejectedValue(new Error("Sprite not found: missing-sprite"));
+    const provider = sprites({
+      token: "sprite-token",
+    });
+
+    await expect(provider.reconnect?.("missing-sprite")).rejects.toBeInstanceOf(SandboxDestroyedError);
+  });
+
+  it("skips starting the service when the desired service is already running", async () => {
+    const fetchMock = vi
+      .fn<typeof fetch>()
+      .mockResolvedValueOnce(
+        new Response(
+          JSON.stringify({
+            cmd: "bash",
+            args: ["-lc", "exec npx -y @sandbox-agent/cli@0.5.0-rc.2 server --no-token --host 0.0.0.0 --port 8080"],
+            http_port: 8080,
+            state: { status: "running" },
+          }),
+          { status: 200 },
+        ),
+      )
+      .mockResolvedValueOnce(
+        new Response(
+          JSON.stringify({
+            cmd: "bash",
+            args: ["-lc", "exec npx -y @sandbox-agent/cli@0.5.0-rc.2 server --no-token --host 0.0.0.0 --port 8080"],
+            http_port: 8080,
+            state: { status: "running" },
+          }),
+          { status: 200 },
+        ),
+      );
+    vi.stubGlobal("fetch", fetchMock);
+
+    const provider = sprites({
+      token: "sprite-token",
+    });
+
+    await provider.ensureServer?.("sprite-1");
+
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    expect(fetchMock.mock.calls.every(([, init]) => init?.method === "GET")).toBe(true);
+  });
+});
diff --git a/sdks/typescript/tests/providers.test.ts b/sdks/typescript/tests/providers.test.ts
new file mode 100644
index 0000000..e6cb0a3
--- /dev/null
+++ b/sdks/typescript/tests/providers.test.ts
@@ -0,0 +1,456 @@
+import { describe, it, expect, beforeAll, afterAll, afterEach } from "vitest";
+import { createRequire } from "node:module";
+import { existsSync, mkdtempSync, rmSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { tmpdir } from "node:os";
+import { execSync } from "node:child_process";
+
+const _require = createRequire(import.meta.url);
+import { InMemorySessionPersistDriver, SandboxAgent, type SandboxProvider } from "../src/index.ts";
+import { local } from "../src/providers/local.ts";
+import { docker } from "../src/providers/docker.ts";
+import { e2b } from "../src/providers/e2b.ts";
+import { daytona } from "../src/providers/daytona.ts";
+import { vercel } from "../src/providers/vercel.ts";
+import { modal } from "../src/providers/modal.ts";
+import { computesdk } from "../src/providers/computesdk.ts";
+import { sprites } from "../src/providers/sprites.ts";
+import { prepareMockAgentDataHome } from "./helpers/mock-agent.ts";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+function findBinary(): string | null {
+  if (process.env.SANDBOX_AGENT_BIN) {
+    return process.env.SANDBOX_AGENT_BIN;
+  }
+
+  const cargoPaths = [resolve(__dirname, "../../../target/debug/sandbox-agent"), resolve(__dirname, "../../../target/release/sandbox-agent")];
+  for (const candidate of cargoPaths) {
+    if (existsSync(candidate)) {
+      return candidate;
+    }
+  }
+
+  return null;
+}
+
+const BINARY_PATH = findBinary();
+// if (!BINARY_PATH) {
+//   throw new Error("sandbox-agent binary not found. Build it (cargo build -p sandbox-agent) or set SANDBOX_AGENT_BIN.");
+// }
+if (!process.env.SANDBOX_AGENT_BIN && BINARY_PATH) {
+  process.env.SANDBOX_AGENT_BIN = BINARY_PATH;
+}
+
+function isModuleAvailable(name: string): boolean {
+  try {
+    _require.resolve(name);
+    return true;
+  } catch {
+    return existsSync(resolve(__dirname, "../node_modules", ...name.split("/"), "package.json"));
+  }
+}
+
+function isDockerAvailable(): boolean {
+  try {
+    execSync("docker info", { stdio: "ignore", timeout: 5_000 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Provider registry — each entry defines how to create a provider and
+// what preconditions are required for it to run.
+// ---------------------------------------------------------------------------
+
+interface ProviderEntry {
+  name: string;
+  /** Human-readable reasons this provider can't run, or empty if ready. */
+  skipReasons: string[];
+  /** Human-readable reasons session tests can't run, or empty if ready. */
+  sessionSkipReasons?: string[];
+  /** Return a fresh provider instance for a single test. */
+  createProvider: () => SandboxProvider;
+  /** Optional per-provider setup (e.g. create temp dirs). Returns cleanup fn. */
+  setup?: () => { cleanup: () => void };
+  /** Agent to use for session tests. */
+  agent: string;
+  /** Timeout for start() — remote providers need longer. */
+  startTimeoutMs?: number;
+  /** Some providers (e.g. local) can verify the sandbox is gone after destroy. */
+  canVerifyDestroyedSandbox?: boolean;
+  /** Working directory to use for createSession/prompt tests. */
+  sessionCwd?: string;
+  /**
+   * Whether session tests (createSession, prompt) should run.
+   * The mock agent only works with local provider (requires mock-acp process binary).
+   * Remote providers need a real agent (claude) which requires compatible server version + API keys.
+   */
+  sessionTestsEnabled: boolean;
+}
+
+function missingEnvVars(...vars: string[]): string[] {
+  const missing = vars.filter((v) => !process.env[v]);
+  return missing.length > 0 ? [`missing env: ${missing.join(", ")}`] : [];
+}
+
+function missingAnyEnvVars(...vars: string[]): string[] {
+  return vars.some((v) => Boolean(process.env[v])) ? [] : [`missing env: one of ${vars.join(", ")}`];
+}
+
+function missingModules(...modules: string[]): string[] {
+  const missing = modules.filter((m) => !isModuleAvailable(m));
+  return missing.length > 0 ? [`missing npm packages: ${missing.join(", ")}`] : [];
+}
+
+function collectApiKeys(): Record<string, string> {
+  const keys: Record<string, string> = {};
+  if (process.env.ANTHROPIC_API_KEY) keys.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+  if (process.env.OPENAI_API_KEY) keys.OPENAI_API_KEY = process.env.OPENAI_API_KEY;
+  return keys;
+}
+
+function buildProviders(): ProviderEntry[] {
+  const entries: ProviderEntry[] = [];
+
+  // --- local ---
+  // Uses the mock-acp process binary created by prepareMockAgentDataHome.
+  {
+    let dataHome: string | undefined;
+    entries.push({
+      name: "local",
+      skipReasons: [],
+      agent: "mock",
+      canVerifyDestroyedSandbox: true,
+      sessionCwd: process.cwd(),
+      sessionTestsEnabled: true,
+      setup() {
+        dataHome = mkdtempSync(join(tmpdir(), "sdk-provider-local-"));
+        return {
+          cleanup: () => {
+            if (dataHome) rmSync(dataHome, { recursive: true, force: true });
+          },
+        };
+      },
+      createProvider() {
+        return local({
+          log: "silent",
+          env: prepareMockAgentDataHome(dataHome!),
+        });
+      },
+    });
+  }
+
+  // --- docker ---
+  // Requires SANDBOX_AGENT_DOCKER_IMAGE (e.g. "sandbox-agent-dev:local").
+  // Session tests disabled: released server images use a different ACP protocol
+  // version than the current SDK branch, causing "Query closed before response
+  // received" errors on session creation.
+  {
+    entries.push({
+      name: "docker",
+      skipReasons: [
+        ...missingEnvVars("SANDBOX_AGENT_DOCKER_IMAGE"),
+        ...missingModules("dockerode", "get-port"),
+        ...(isDockerAvailable() ? [] : ["Docker daemon not available"]),
+      ],
+      agent: "claude",
+      startTimeoutMs: 180_000,
+      canVerifyDestroyedSandbox: false,
+      sessionTestsEnabled: false,
+      createProvider() {
+        const apiKeys = [
+          process.env.ANTHROPIC_API_KEY ? `ANTHROPIC_API_KEY=${process.env.ANTHROPIC_API_KEY}` : "",
+          process.env.OPENAI_API_KEY ? `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}` : "",
+        ].filter(Boolean);
+        return docker({
+          image: process.env.SANDBOX_AGENT_DOCKER_IMAGE,
+          env: apiKeys,
+        });
+      },
+    });
+  }
+
+  // --- e2b ---
+  {
+    entries.push({
+      name: "e2b",
+      skipReasons: [...missingEnvVars("E2B_API_KEY"), ...missingModules("@e2b/code-interpreter")],
+      agent: "claude",
+      startTimeoutMs: 300_000,
+      canVerifyDestroyedSandbox: false,
+      sessionSkipReasons: missingEnvVars("ANTHROPIC_API_KEY"),
+      sessionCwd: "/home/user",
+      sessionTestsEnabled: true,
+      createProvider() {
+        return e2b({
+          create: { envs: collectApiKeys() },
+        });
+      },
+    });
+  }
+
+  // --- daytona ---
+  {
+    entries.push({
+      name: "daytona",
+      skipReasons: [...missingEnvVars("DAYTONA_API_KEY"), ...missingModules("@daytonaio/sdk")],
+      agent: "claude",
+      startTimeoutMs: 300_000,
+      canVerifyDestroyedSandbox: false,
+      sessionSkipReasons: missingEnvVars("ANTHROPIC_API_KEY"),
+      sessionCwd: "/home/sandbox",
+      sessionTestsEnabled: true,
+      createProvider() {
+        return daytona({
+          create: { envVars: collectApiKeys() },
+        });
+      },
+    });
+  }
+
+  // --- vercel ---
+  {
+    entries.push({
+      name: "vercel",
+      skipReasons: [...missingEnvVars("VERCEL_ACCESS_TOKEN"), ...missingModules("@vercel/sandbox")],
+      agent: "claude",
+      startTimeoutMs: 300_000,
+      canVerifyDestroyedSandbox: false,
+      sessionTestsEnabled: false,
+      createProvider() {
+        return vercel({
+          create: { env: collectApiKeys() },
+        });
+      },
+    });
+  }
+
+  // --- modal ---
+  {
+    entries.push({
+      name: "modal",
+      skipReasons: [...missingEnvVars("MODAL_TOKEN_ID", "MODAL_TOKEN_SECRET"), ...missingModules("modal")],
+      agent: "claude",
+      startTimeoutMs: 300_000,
+      canVerifyDestroyedSandbox: false,
+      sessionSkipReasons: missingEnvVars("ANTHROPIC_API_KEY"),
+      sessionCwd: "/root",
+      sessionTestsEnabled: true,
+      createProvider() {
+        return modal({
+          image: process.env.SANDBOX_AGENT_MODAL_IMAGE,
+          create: { secrets: collectApiKeys() },
+        });
+      },
+    });
+  }
+
+  // --- computesdk ---
+  {
+    entries.push({
+      name: "computesdk",
+      skipReasons: [...missingEnvVars("COMPUTESDK_API_KEY"), ...missingModules("computesdk")],
+      agent: "claude",
+      startTimeoutMs: 300_000,
+      canVerifyDestroyedSandbox: false,
+      sessionTestsEnabled: false,
+      createProvider() {
+        return computesdk({
+          create: { envs: collectApiKeys() },
+        });
+      },
+    });
+  }
+
+  // --- sprites ---
+  {
+    entries.push({
+      name: "sprites",
+      skipReasons: [...missingAnyEnvVars("SPRITES_API_KEY", "SPRITE_TOKEN", "SPRITES_TOKEN"), ...missingModules("@fly/sprites")],
+      agent: "claude",
+      startTimeoutMs: 300_000,
+      canVerifyDestroyedSandbox: false,
+      sessionSkipReasons: missingEnvVars("ANTHROPIC_API_KEY"),
+      sessionCwd: "/home/sprite",
+      sessionTestsEnabled: true,
+      createProvider() {
+        return sprites({
+          token: process.env.SPRITES_API_KEY ?? process.env.SPRITE_TOKEN ?? process.env.SPRITES_TOKEN,
+          env: collectApiKeys(),
+          installAgents: ["claude"],
+          serviceStartDuration: "10m",
+        });
+      },
+    });
+  }
+
+  return entries;
+}
+
+// ---------------------------------------------------------------------------
+// Shared test suite — runs the same assertions against every provider.
+//
+// Provider lifecycle tests (start, sandboxId, reconnect, destroy) use only
+// listAgents() and never create sessions — these work regardless of which
+// agents are installed or whether API keys are present.
+//
+// Session tests (createSession, prompt) are only enabled for providers where
+// the agent is known to work. For local, the mock-acp process binary is
+// created by test setup. For remote providers, a real agent (claude) is used
+// which requires ANTHROPIC_API_KEY and a compatible server version.
+// ---------------------------------------------------------------------------
+
+function providerSuite(entry: ProviderEntry) {
+  const skip = entry.skipReasons.length > 0;
+
+  const descFn = skip ? describe.skip : describe;
+
+  descFn(`SandboxProvider: ${entry.name}`, () => {
+    let sdk: SandboxAgent | undefined;
+    let cleanupFn: (() => void) | undefined;
+
+    if (skip) {
+      it.skip(`skipped — ${entry.skipReasons.join("; ")}`, () => {});
+      return;
+    }
+
+    beforeAll(() => {
+      const result = entry.setup?.();
+      cleanupFn = result?.cleanup;
+    });
+
+    afterEach(async () => {
+      if (!sdk) return;
+      await sdk.killSandbox().catch(async () => {
+        await sdk?.dispose().catch(() => {});
+      });
+      sdk = undefined;
+    }, 30_000);
+
+    afterAll(() => {
+      cleanupFn?.();
+    });
+
+    // -- lifecycle tests (no session creation) --
+
+    it(
+      "starts with a prefixed sandboxId and passes health",
+      async () => {
+        sdk = await SandboxAgent.start({ sandbox: entry.createProvider() });
+        expect(sdk.sandboxId).toMatch(new RegExp(`^${entry.name}/`));
+
+        // listAgents() awaits the internal health gate, confirming the server is ready.
+        const agents = await sdk.listAgents();
+        expect(agents.agents.length).toBeGreaterThan(0);
+      },
+      entry.startTimeoutMs,
+    );
+
+    it("rejects mismatched sandboxId prefixes", async () => {
+      await expect(
+        SandboxAgent.start({
+          sandbox: entry.createProvider(),
+          sandboxId: "wrong-provider/example",
+        }),
+      ).rejects.toThrow(/provider/i);
+    });
+
+    it(
+      "reconnects after dispose without destroying the sandbox",
+      async () => {
+        sdk = await SandboxAgent.start({ sandbox: entry.createProvider() });
+        const sandboxId = sdk.sandboxId;
+        expect(sandboxId).toBeTruthy();
+
+        await sdk.dispose();
+
+        const reconnected = await SandboxAgent.start({
+          sandbox: entry.createProvider(),
+          sandboxId,
+        });
+
+        const agents = await reconnected.listAgents();
+        expect(agents.agents.length).toBeGreaterThan(0);
+        sdk = reconnected;
+      },
+      entry.startTimeoutMs ? entry.startTimeoutMs * 2 : undefined,
+    );
+
+    it(
+      "destroySandbox tears the sandbox down",
+      async () => {
+        sdk = await SandboxAgent.start({ sandbox: entry.createProvider() });
+        const sandboxId = sdk.sandboxId;
+        expect(sandboxId).toBeTruthy();
+
+        await sdk.destroySandbox();
+        sdk = undefined;
+
+        if (entry.canVerifyDestroyedSandbox) {
+          const reconnected = await SandboxAgent.start({
+            sandbox: entry.createProvider(),
+            sandboxId,
+            skipHealthCheck: true,
+          });
+          await expect(reconnected.listAgents()).rejects.toThrow();
+        }
+
+        if (entry.name === "e2b") {
+          const rawSandboxId = sandboxId?.slice(sandboxId.indexOf("/") + 1);
+          await entry.createProvider().kill?.(rawSandboxId!);
+        }
+      },
+      entry.startTimeoutMs,
+    );
+
+    // -- session tests (require working agent) --
+
+    const sessionIt = entry.sessionTestsEnabled && (entry.sessionSkipReasons?.length ?? 0) === 0 ? it : it.skip;
+
+    sessionIt(
+      "creates sessions with persisted sandboxId",
+      async () => {
+        const persist = new InMemorySessionPersistDriver();
+        sdk = await SandboxAgent.start({ sandbox: entry.createProvider(), persist });
+
+        const session = await sdk.createSession({ agent: entry.agent, cwd: entry.sessionCwd });
+        const record = await persist.getSession(session.id);
+
+        expect(record?.sandboxId).toBe(sdk.sandboxId);
+      },
+      entry.startTimeoutMs,
+    );
+
+    sessionIt(
+      "sends a prompt and receives a response",
+      async () => {
+        sdk = await SandboxAgent.start({ sandbox: entry.createProvider() });
+
+        const session = await sdk.createSession({ agent: entry.agent, cwd: entry.sessionCwd });
+        const events: unknown[] = [];
+        const off = session.onEvent((event) => {
+          events.push(event);
+        });
+
+        const result = await session.prompt([{ type: "text", text: "Say hello in one word." }]);
+        off();
+
+        expect(result.stopReason).toBe("end_turn");
+        expect(events.length).toBeGreaterThan(0);
+      },
+      entry.startTimeoutMs ? entry.startTimeoutMs * 2 : 30_000,
+    );
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Register all providers
+// ---------------------------------------------------------------------------
+
+for (const entry of buildProviders()) {
+  providerSuite(entry);
+}
diff --git a/sdks/typescript/tsup.config.ts b/sdks/typescript/tsup.config.ts
index faf3167..5da303b 100644
--- a/sdks/typescript/tsup.config.ts
+++ b/sdks/typescript/tsup.config.ts
@@ -1,9 +1,31 @@
 import { defineConfig } from "tsup";
 
 export default defineConfig({
-  entry: ["src/index.ts"],
+  entry: [
+    "src/index.ts",
+    "src/providers/local.ts",
+    "src/providers/e2b.ts",
+    "src/providers/daytona.ts",
+    "src/providers/docker.ts",
+    "src/providers/vercel.ts",
+    "src/providers/cloudflare.ts",
+    "src/providers/modal.ts",
+    "src/providers/computesdk.ts",
+    "src/providers/sprites.ts",
+  ],
   format: ["esm"],
   dts: true,
   clean: true,
   sourcemap: true,
+  external: [
+    "@cloudflare/sandbox",
+    "@daytonaio/sdk",
+    "@e2b/code-interpreter",
+    "@fly/sprites",
+    "@vercel/sandbox",
+    "dockerode",
+    "get-port",
+    "modal",
+    "computesdk",
+  ],
 });
diff --git a/sdks/typescript/vitest.config.ts b/sdks/typescript/vitest.config.ts
index 8676010..a3ba3f3 100644
--- a/sdks/typescript/vitest.config.ts
+++ b/sdks/typescript/vitest.config.ts
@@ -4,5 +4,6 @@ export default defineConfig({
   test: {
     include: ["tests/**/*.test.ts"],
     testTimeout: 30000,
+    hookTimeout: 120000,
   },
 });
diff --git a/server/ARCHITECTURE.md b/server/ARCHITECTURE.md
index 774c38a..4ac7de8 100644
--- a/server/ARCHITECTURE.md
+++ b/server/ARCHITECTURE.md
@@ -101,25 +101,23 @@ Each session tracks:
 ### Lifecycle
 
 ```
-POST /v1/sessions/{sessionId}     Create session, auto-install agent
+POST /v1/acp/{serverId}?agent=... initialize ACP server, auto-install agent
         ↓
-POST /v1/sessions/{id}/messages   Spawn agent subprocess, stream output
-POST /v1/sessions/{id}/messages/stream   Post and stream a single turn
+POST /v1/acp/{serverId}           session/new
+POST /v1/acp/{serverId}           session/prompt
         ↓
-GET /v1/sessions/{id}/events      Poll for new events (offset-based)
-GET /v1/sessions/{id}/events/sse  Subscribe to SSE stream
+GET /v1/acp/{serverId}            Subscribe to ACP SSE stream
         ↓
-POST .../questions/{id}/reply     Answer agent question
-POST .../permissions/{id}/reply   Grant/deny permission request
+JSON-RPC response envelopes       Answer questions / reply to permissions
         ↓
-(agent process terminates)        Session marked as ended
+DELETE /v1/acp/{serverId}         Close ACP server
 ```
 
 ### Event Streaming
 
-- Events are stored in memory per session and assigned a monotonically increasing `id`.
-- `/events` returns a slice of events by offset/limit.
-- `/events/sse` streams new events from the same offset semantics.
+- ACP envelopes are stored in memory per server and assigned a monotonically increasing SSE `id`.
+- `GET /v1/acp/{serverId}` replays buffered envelopes and then streams live updates.
+- Clients continue turns by POSTing ACP JSON-RPC requests to the same server id.
 
 When a message is sent:
 
diff --git a/server/CLAUDE.md b/server/CLAUDE.md
index 2c217d7..88f4f0a 100644
--- a/server/CLAUDE.md
+++ b/server/CLAUDE.md
@@ -1,18 +1,47 @@
 # Server Instructions
 
-## ACP v2 Architecture
+## ACP v1 Baseline
 
-- Public API routes are defined in `server/packages/sandbox-agent/src/router.rs`.
-- ACP runtime/process bridge is in `server/packages/sandbox-agent/src/acp_runtime.rs`.
-- `/v2` is the only active API surface for sessions/prompts (`/v2/rpc`).
-- Keep binary filesystem transfer endpoints as dedicated HTTP APIs:
-  - `GET /v2/fs/file`
-  - `PUT /v2/fs/file`
-  - `POST /v2/fs/upload-batch`
-  - Rationale: host-owned cross-agent-consistent behavior and large binary transfer needs that ACP JSON-RPC is not suited to stream efficiently.
-  - Maintain ACP variants in parallel only when they share the same underlying filesystem implementation; SDK defaults should still prefer HTTP for large/binary transfers.
-- `/v1/*` must remain hard-removed (`410`) and `/opencode/*` stays disabled (`503`) until Phase 7.
-- Agent install logic (native + ACP agent process + lazy install) is handled by `server/packages/agent-management/`.
+- v1 is ACP-native.
+- `/v1/*` is removed and returns `410 Gone` (`application/problem+json`).
+- `/opencode/*` is disabled during ACP core phases and returns `503`.
+- Prompt/session traffic is ACP JSON-RPC over streamable HTTP on `/v1/rpc`:
+  - `POST /v1/rpc`
+  - `GET /v1/rpc` (SSE)
+  - `DELETE /v1/rpc`
+- Control-plane endpoints:
+  - `GET /v1/health`
+  - `GET /v1/agents`
+  - `POST /v1/agents/{agent}/install`
+- Binary filesystem transfer endpoints (intentionally HTTP, not ACP extension methods):
+  - `GET /v1/fs/file`
+  - `PUT /v1/fs/file`
+  - `POST /v1/fs/upload-batch`
+- Sandbox Agent ACP extension method naming:
+  - Custom ACP methods use `_sandboxagent/...` (not `_sandboxagent/v1/...`).
+  - Session detach method is `_sandboxagent/session/detach`.
+
+## API Scope
+
+- ACP is the primary protocol for agent/session behavior and all functionality that talks directly to the agent.
+- ACP extensions may be used for gaps (for example `skills`, `models`, and related metadata), but the default is that agent-facing behavior is implemented by the agent through ACP.
+- Custom HTTP APIs are for non-agent/session platform services (for example filesystem, terminals, and other host/runtime capabilities).
+- Filesystem and terminal APIs remain Sandbox Agent-specific HTTP contracts and are not ACP.
+  - Do not make Sandbox Agent core flows depend on ACP client implementations of `fs/*` or `terminal/*`; in practice those client-side capabilities are often incomplete or inconsistent.
+  - ACP-native filesystem and terminal methods are also too limited for Sandbox Agent host/runtime needs, so prefer the native HTTP APIs for richer behavior.
+- Keep `GET /v1/fs/file`, `PUT /v1/fs/file`, and `POST /v1/fs/upload-batch` on HTTP:
+  - These are Sandbox Agent host/runtime operations with cross-agent-consistent behavior.
+  - They may involve very large binary transfers that ACP JSON-RPC envelopes are not suited to stream.
+  - This is intentionally separate from ACP native `fs/read_text_file` and `fs/write_text_file`.
+  - ACP extension variants may exist in parallel, but SDK defaults should prefer HTTP for these binary transfer operations.
+
+## Architecture
+
+- HTTP contract and problem/error mapping: `server/packages/sandbox-agent/src/router.rs`
+- ACP proxy runtime: `server/packages/sandbox-agent/src/acp_proxy_runtime.rs`
+- ACP client runtime and agent process bridge: `server/packages/sandbox-agent/src/acp_runtime/mod.rs`
+- Agent install logic (native + ACP agent process + lazy install): `server/packages/agent-management/`
+- Inspector UI served at `/ui/` and bound to ACP over HTTP from `frontend/packages/inspector/`
 
 ## API Contract Rules
 
@@ -21,16 +50,34 @@
 - Regenerate `docs/openapi.json` after endpoint contract changes.
 - Keep CLI and HTTP endpoint behavior aligned (`docs/cli.mdx`).
 
+## ACP Protocol Compliance
+
+- Before adding any new ACP method, property, or config option category to the SDK, verify it exists in the ACP spec at `https://agentclientprotocol.com/llms-full.txt`.
+- Valid `SessionConfigOptionCategory` values are: `mode`, `model`, `thought_level`, `other`, or custom categories prefixed with `_` (e.g. `_permission_mode`).
+- Do not invent ACP properties or categories (e.g. `permission_mode` is not a valid ACP category — use `_permission_mode` if it's a custom extension, or use existing ACP mechanisms like `session/set_mode`).
+- `NewSessionRequest` only has `_meta`, `cwd`, and `mcpServers`. Do not add non-ACP fields to it.
+- Sandbox Agent SDK abstractions (like `SessionCreateRequest`) may add convenience properties, but must clearly map to real ACP methods internally and not send fabricated fields over the wire.
+
+## Source Documents
+
+- ACP protocol specification (full LLM-readable reference): `https://agentclientprotocol.com/llms-full.txt`
+- `~/misc/acp-docs/schema/schema.json`
+- `~/misc/acp-docs/schema/meta.json`
+- `research/acp/spec.md`
+- `research/acp/v1-schema-to-acp-mapping.md`
+- `research/acp/friction.md`
+- `research/acp/todo.md`
+
 ## Tests
 
-Primary v2 integration coverage:
-- `server/packages/sandbox-agent/tests/v2_api.rs`
-- `server/packages/sandbox-agent/tests/v2_agent_process_matrix.rs`
+Primary v1 integration coverage:
+- `server/packages/sandbox-agent/tests/v1_api.rs`
+- `server/packages/sandbox-agent/tests/v1_agent_process_matrix.rs`
 
 Run:
 ```bash
-cargo test -p sandbox-agent --test v2_api
-cargo test -p sandbox-agent --test v2_agent_process_matrix
+cargo test -p sandbox-agent --test v1_api
+cargo test -p sandbox-agent --test v1_agent_process_matrix
 ```
 
 ## Migration Docs Sync
@@ -38,3 +85,9 @@ cargo test -p sandbox-agent --test v2_agent_process_matrix
 - Keep `research/acp/spec.md` as the source spec.
 - Update `research/acp/todo.md` when scope/status changes.
 - Log blockers/decisions in `research/acp/friction.md`.
+
+## Docker Examples (Dev Testing)
+
+- When manually testing bleeding-edge (unreleased) versions of sandbox-agent in `examples/`, use `SANDBOX_AGENT_DEV=1` with the Docker-based examples.
+- This triggers a local build of `docker/runtime/Dockerfile.full` which builds the server binary from local source and packages it into the Docker image.
+- Example: `SANDBOX_AGENT_DEV=1 pnpm --filter @sandbox-agent/example-mcp start`
diff --git a/server/compose.dev.yaml b/server/compose.dev.yaml
new file mode 100644
index 0000000..faac1b3
--- /dev/null
+++ b/server/compose.dev.yaml
@@ -0,0 +1,42 @@
+name: sandbox-agent-dev
+
+services:
+  backend:
+    build:
+      context: ..
+      dockerfile: docker/test-agent/Dockerfile
+    image: sandbox-agent-dev
+    command: ["server", "--host", "0.0.0.0", "--port", "3000", "--no-token"]
+    environment:
+      RUST_LOG: "${RUST_LOG:-info}"
+    ports:
+      - "2468:3000"
+      # UDP port range for WebRTC media transport (neko)
+      - "59050-59070:59050-59070/udp"
+
+  frontend:
+    build:
+      context: ..
+      dockerfile: docker/inspector-dev/Dockerfile
+    working_dir: /app
+    depends_on:
+      - backend
+    environment:
+      SANDBOX_AGENT_URL: "http://backend:3000"
+    ports:
+      - "5173:5173"
+    volumes:
+      - "..:/app"
+      # Keep Linux-native node_modules inside the container.
+      - "sa_root_node_modules:/app/node_modules"
+      - "sa_inspector_node_modules:/app/frontend/packages/inspector/node_modules"
+      - "sa_react_node_modules:/app/sdks/react/node_modules"
+      - "sa_typescript_node_modules:/app/sdks/typescript/node_modules"
+      - "sa_pnpm_store:/root/.local/share/pnpm/store"
+
+volumes:
+  sa_root_node_modules: {}
+  sa_inspector_node_modules: {}
+  sa_react_node_modules: {}
+  sa_typescript_node_modules: {}
+  sa_pnpm_store: {}
diff --git a/server/packages/acp-http-adapter/src/app.rs b/server/packages/acp-http-adapter/src/app.rs
index 556892f..cd2e074 100644
--- a/server/packages/acp-http-adapter/src/app.rs
+++ b/server/packages/acp-http-adapter/src/app.rs
@@ -93,6 +93,20 @@ fn map_error(err: AdapterError) -> Response {
             "timeout",
             "timed out waiting for agent response",
         ),
+        AdapterError::Exited { exit_code, stderr } => {
+            let detail = if let Some(stderr) = stderr {
+                format!(
+                    "agent process exited before responding (exit_code: {:?}, stderr: {})",
+                    exit_code, stderr
+                )
+            } else {
+                format!(
+                    "agent process exited before responding (exit_code: {:?})",
+                    exit_code
+                )
+            };
+            problem(StatusCode::BAD_GATEWAY, "agent_exited", &detail)
+        }
         AdapterError::Write(write) => problem(
             StatusCode::BAD_GATEWAY,
             "write_failed",
diff --git a/server/packages/acp-http-adapter/src/main.rs b/server/packages/acp-http-adapter/src/main.rs
index 16b1c0f..7ca7819 100644
--- a/server/packages/acp-http-adapter/src/main.rs
+++ b/server/packages/acp-http-adapter/src/main.rs
@@ -32,6 +32,7 @@ async fn main() {
 }
 
 async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    let started = std::time::Instant::now();
     tracing_subscriber::fmt()
         .with_env_filter(
             tracing_subscriber::EnvFilter::try_from_default_env()
@@ -41,6 +42,12 @@ async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         .init();
 
     let cli = Cli::parse();
+    tracing::info!(
+        host = %cli.host,
+        port = cli.port,
+        startup_ms = started.elapsed().as_millis() as u64,
+        "acp-http-adapter.run: starting server"
+    );
     run_server(ServerConfig {
         host: cli.host,
         port: cli.port,
diff --git a/server/packages/acp-http-adapter/src/process.rs b/server/packages/acp-http-adapter/src/process.rs
index bfaac2c..cec1d27 100644
--- a/server/packages/acp-http-adapter/src/process.rs
+++ b/server/packages/acp-http-adapter/src/process.rs
@@ -16,6 +16,7 @@ use tokio_stream::wrappers::BroadcastStream;
 use crate::registry::LaunchSpec;
 
 const RING_BUFFER_SIZE: usize = 1024;
+const STDERR_TAIL_SIZE: usize = 16;
 
 #[derive(Debug, Error)]
 pub enum AdapterError {
@@ -33,6 +34,11 @@ pub enum AdapterError {
     Serialize(serde_json::Error),
     #[error("failed to write subprocess stdin: {0}")]
     Write(std::io::Error),
+    #[error("agent process exited before responding")]
+    Exited {
+        exit_code: Option<i32>,
+        stderr: Option<String>,
+    },
     #[error("timeout waiting for response")]
     Timeout,
 }
@@ -61,6 +67,7 @@ pub struct AdapterRuntime {
     shutting_down: AtomicBool,
     spawned_at: Instant,
     first_stdout: Arc<AtomicBool>,
+    stderr_tail: Arc<Mutex<VecDeque<String>>>,
 }
 
 impl AdapterRuntime {
@@ -120,6 +127,7 @@ impl AdapterRuntime {
             shutting_down: AtomicBool::new(false),
             spawned_at: spawn_start,
             first_stdout: Arc::new(AtomicBool::new(false)),
+            stderr_tail: Arc::new(Mutex::new(VecDeque::with_capacity(STDERR_TAIL_SIZE))),
         };
 
         runtime.spawn_stdout_loop(stdout);
@@ -198,6 +206,16 @@ impl AdapterRuntime {
                         "post: response channel dropped (agent process may have exited)"
                     );
                     self.pending.lock().await.remove(&key);
+                    if let Some((exit_code, stderr)) = self.try_process_exit_info().await {
+                        tracing::error!(
+                            method = %method,
+                            id = %key,
+                            exit_code = ?exit_code,
+                            stderr = ?stderr,
+                            "post: agent process exited before response channel completed"
+                        );
+                        return Err(AdapterError::Exited { exit_code, stderr });
+                    }
                     Err(AdapterError::Timeout)
                 }
                 Err(_) => {
@@ -213,6 +231,16 @@ impl AdapterRuntime {
                         "post: TIMEOUT waiting for agent response"
                     );
                     self.pending.lock().await.remove(&key);
+                    if let Some((exit_code, stderr)) = self.try_process_exit_info().await {
+                        tracing::error!(
+                            method = %method,
+                            id = %key,
+                            exit_code = ?exit_code,
+                            stderr = ?stderr,
+                            "post: agent process exited before timeout completed"
+                        );
+                        return Err(AdapterError::Exited { exit_code, stderr });
+                    }
                     Err(AdapterError::Timeout)
                 }
             }
@@ -445,6 +473,7 @@ impl AdapterRuntime {
 
     fn spawn_stderr_loop(&self, stderr: tokio::process::ChildStderr) {
         let spawned_at = self.spawned_at;
+        let stderr_tail = self.stderr_tail.clone();
 
         tokio::spawn(async move {
             let mut lines = BufReader::new(stderr).lines();
@@ -452,6 +481,13 @@ impl AdapterRuntime {
 
             while let Ok(Some(line)) = lines.next_line().await {
                 line_count += 1;
+                {
+                    let mut tail = stderr_tail.lock().await;
+                    tail.push_back(line.clone());
+                    while tail.len() > STDERR_TAIL_SIZE {
+                        tail.pop_front();
+                    }
+                }
                 tracing::info!(
                     line_number = line_count,
                     age_ms = spawned_at.elapsed().as_millis() as u64,
@@ -560,6 +596,28 @@ impl AdapterRuntime {
         tracing::debug!(method = method, id = %id, "stdin: write+flush complete");
         Ok(())
     }
+
+    async fn try_process_exit_info(&self) -> Option<(Option<i32>, Option<String>)> {
+        let mut child = self.child.lock().await;
+        match child.try_wait() {
+            Ok(Some(status)) => {
+                let exit_code = status.code();
+                drop(child);
+                let stderr = self.stderr_tail_summary().await;
+                Some((exit_code, stderr))
+            }
+            Ok(None) => None,
+            Err(_) => None,
+        }
+    }
+
+    pub async fn stderr_tail_summary(&self) -> Option<String> {
+        let tail = self.stderr_tail.lock().await;
+        if tail.is_empty() {
+            return None;
+        }
+        Some(tail.iter().cloned().collect::<Vec<_>>().join("\n"))
+    }
 }
 
 fn id_key(value: &Value) -> String {
diff --git a/server/packages/agent-management/Cargo.toml b/server/packages/agent-management/Cargo.toml
index 799229e..f9ad9cb 100644
--- a/server/packages/agent-management/Cargo.toml
+++ b/server/packages/agent-management/Cargo.toml
@@ -20,3 +20,4 @@ url.workspace = true
 dirs.workspace = true
 tempfile.workspace = true
 time.workspace = true
+tracing.workspace = true
diff --git a/server/packages/agent-management/src/agents.rs b/server/packages/agent-management/src/agents.rs
index c36d6f8..4f90634 100644
--- a/server/packages/agent-management/src/agents.rs
+++ b/server/packages/agent-management/src/agents.rs
@@ -4,6 +4,7 @@ use std::fs;
 use std::io::{self, Read};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
+use std::time::Instant;
 
 use flate2::read::GzDecoder;
 use reqwest::blocking::Client;
@@ -14,6 +15,8 @@ use url::Url;
 const DEFAULT_ACP_REGISTRY_URL: &str =
     "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json";
 
+const ADAPTERS_JSON: &str = include_str!("../../../../scripts/audit-acp-deps/adapters.json");
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum AgentId {
@@ -78,7 +81,7 @@ impl AgentId {
 
     fn agent_process_registry_id(self) -> Option<&'static str> {
         match self {
-            AgentId::Claude => Some("claude-code-acp"),
+            AgentId::Claude => Some("claude-acp"),
             AgentId::Codex => Some("codex-acp"),
             AgentId::Opencode => Some("opencode"),
             AgentId::Amp => Some("amp-acp"),
@@ -90,7 +93,7 @@ impl AgentId {
 
     fn agent_process_binary_hint(self) -> Option<&'static str> {
         match self {
-            AgentId::Claude => Some("claude-code-acp"),
+            AgentId::Claude => Some("claude-agent-acp"),
             AgentId::Codex => Some("codex-acp"),
             AgentId::Opencode => Some("opencode"),
             AgentId::Amp => Some("amp-acp"),
@@ -321,6 +324,14 @@ impl AgentManager {
         agent: AgentId,
         options: InstallOptions,
     ) -> Result<InstallResult, AgentError> {
+        let install_started = Instant::now();
+        tracing::info!(
+            agent = agent.as_str(),
+            reinstall = options.reinstall,
+            native_version = ?options.version,
+            agent_process_version = ?options.agent_process_version,
+            "agent_manager.install: starting"
+        );
         fs::create_dir_all(&self.install_dir)?;
         fs::create_dir_all(self.install_dir.join("agent_processes"))?;
 
@@ -345,10 +356,20 @@ impl AgentManager {
             artifacts.push(artifact);
         }
 
-        Ok(InstallResult {
+        let result = InstallResult {
             artifacts,
             already_installed,
-        })
+        };
+
+        tracing::info!(
+            agent = agent.as_str(),
+            already_installed = result.already_installed,
+            artifact_count = result.artifacts.len(),
+            total_ms = elapsed_ms(install_started),
+            "agent_manager.install: completed"
+        );
+
+        Ok(result)
     }
 
     pub fn is_installed(&self, agent: AgentId) -> bool {
@@ -392,25 +413,41 @@ impl AgentManager {
         &self,
         agent: AgentId,
     ) -> Result<AgentProcessLaunchSpec, AgentError> {
+        let started = Instant::now();
         if agent == AgentId::Mock {
-            return Ok(AgentProcessLaunchSpec {
+            let spec = AgentProcessLaunchSpec {
                 program: self.agent_process_path(agent),
                 args: Vec::new(),
                 env: HashMap::new(),
                 source: InstallSource::Builtin,
                 version: Some("builtin".to_string()),
-            });
+            };
+            tracing::info!(
+                agent = agent.as_str(),
+                source = ?spec.source,
+                total_ms = elapsed_ms(started),
+                "agent_manager.resolve_agent_process: resolved builtin"
+            );
+            return Ok(spec);
         }
 
         let launcher = self.agent_process_path(agent);
         if launcher.exists() {
-            return Ok(AgentProcessLaunchSpec {
+            let spec = AgentProcessLaunchSpec {
                 program: launcher,
                 args: Vec::new(),
                 env: HashMap::new(),
                 source: InstallSource::LocalPath,
                 version: None,
-            });
+            };
+            tracing::info!(
+                agent = agent.as_str(),
+                source = ?spec.source,
+                program = %spec.program.display(),
+                total_ms = elapsed_ms(started),
+                "agent_manager.resolve_agent_process: resolved local launcher"
+            );
+            return Ok(spec);
         }
 
         if let Some(bin) = agent.agent_process_binary_hint().and_then(find_in_path) {
@@ -419,29 +456,47 @@ impl AgentManager {
             } else {
                 Vec::new()
             };
-            return Ok(AgentProcessLaunchSpec {
+            let spec = AgentProcessLaunchSpec {
                 program: bin,
                 args,
                 env: HashMap::new(),
                 source: InstallSource::LocalPath,
                 version: None,
-            });
+            };
+            tracing::info!(
+                agent = agent.as_str(),
+                source = ?spec.source,
+                program = %spec.program.display(),
+                args = ?spec.args,
+                total_ms = elapsed_ms(started),
+                "agent_manager.resolve_agent_process: resolved PATH binary hint"
+            );
+            return Ok(spec);
         }
 
         if agent == AgentId::Opencode {
             let native = self.resolve_binary(agent)?;
-            return Ok(AgentProcessLaunchSpec {
+            let spec = AgentProcessLaunchSpec {
                 program: native,
                 args: vec!["acp".to_string()],
                 env: HashMap::new(),
                 source: InstallSource::LocalPath,
                 version: None,
-            });
+            };
+            tracing::info!(
+                agent = agent.as_str(),
+                source = ?spec.source,
+                program = %spec.program.display(),
+                args = ?spec.args,
+                total_ms = elapsed_ms(started),
+                "agent_manager.resolve_agent_process: resolved opencode native"
+            );
+            return Ok(spec);
         }
 
         Err(AgentError::AgentProcessNotFound {
             agent,
-            hint: Some("run install to provision ACP agent process".to_string()),
+            hint: Some(format!("run step 3: `sandbox-agent install-agent {agent}`")),
         })
     }
 
@@ -454,11 +509,23 @@ impl AgentManager {
         agent: AgentId,
         options: &InstallOptions,
     ) -> Result<Option<InstalledArtifact>, AgentError> {
+        let started = Instant::now();
         if !options.reinstall && self.native_installed(agent) {
+            tracing::info!(
+                agent = agent.as_str(),
+                total_ms = elapsed_ms(started),
+                "agent_manager.install_native: already installed"
+            );
             return Ok(None);
         }
 
         let path = self.binary_path(agent);
+        tracing::info!(
+            agent = agent.as_str(),
+            path = %path.display(),
+            version_override = ?options.version,
+            "agent_manager.install_native: installing"
+        );
         match agent {
             AgentId::Claude => install_claude(&path, self.platform, options.version.as_deref())?,
             AgentId::Codex => install_codex(&path, self.platform, options.version.as_deref())?,
@@ -474,12 +541,22 @@ impl AgentManager {
             }
         }
 
-        Ok(Some(InstalledArtifact {
+        let artifact = InstalledArtifact {
             kind: InstalledArtifactKind::NativeAgent,
             path,
             version: self.version(agent).ok().flatten(),
             source: InstallSource::Fallback,
-        }))
+        };
+
+        tracing::info!(
+            agent = agent.as_str(),
+            source = ?artifact.source,
+            version = ?artifact.version,
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_native: completed"
+        );
+
+        Ok(Some(artifact))
     }
 
     fn install_agent_process(
@@ -487,8 +564,14 @@ impl AgentManager {
         agent: AgentId,
         options: &InstallOptions,
     ) -> Result<Option<InstalledArtifact>, AgentError> {
+        let started = Instant::now();
         if !options.reinstall {
             if self.agent_process_status(agent).is_some() {
+                tracing::info!(
+                    agent = agent.as_str(),
+                    total_ms = elapsed_ms(started),
+                    "agent_manager.install_agent_process: already installed"
+                );
                 return Ok(None);
             }
         }
@@ -496,31 +579,116 @@ impl AgentManager {
         if agent == AgentId::Mock {
             let path = self.agent_process_path(agent);
             write_mock_agent_process_launcher(&path)?;
-            return Ok(Some(InstalledArtifact {
+            let artifact = InstalledArtifact {
                 kind: InstalledArtifactKind::AgentProcess,
                 path,
                 version: Some("builtin".to_string()),
                 source: InstallSource::Builtin,
-            }));
+            };
+            tracing::info!(
+                agent = agent.as_str(),
+                source = ?artifact.source,
+                total_ms = elapsed_ms(started),
+                "agent_manager.install_agent_process: installed builtin launcher"
+            );
+            return Ok(Some(artifact));
         }
 
         if let Some(artifact) = self.install_agent_process_from_registry(agent, options)? {
+            tracing::info!(
+                agent = agent.as_str(),
+                source = ?artifact.source,
+                version = ?artifact.version,
+                total_ms = elapsed_ms(started),
+                "agent_manager.install_agent_process: installed from registry"
+            );
             return Ok(Some(artifact));
         }
 
         let artifact = self.install_agent_process_fallback(agent, options)?;
+        tracing::info!(
+            agent = agent.as_str(),
+            source = ?artifact.source,
+            version = ?artifact.version,
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_agent_process: installed from fallback"
+        );
         Ok(Some(artifact))
     }
 
-    fn agent_process_status(&self, agent: AgentId) -> Option<AgentProcessStatus> {
-        if agent == AgentId::Mock {
-            return Some(AgentProcessStatus {
-                source: InstallSource::Builtin,
-                version: Some("builtin".to_string()),
-            });
+    fn install_npm_agent_process_package(
+        &self,
+        agent: AgentId,
+        package: &str,
+        args: &[String],
+        env: &HashMap<String, String>,
+        source: InstallSource,
+        version: Option<String>,
+    ) -> Result<InstalledArtifact, AgentError> {
+        let started = Instant::now();
+        let root = self.agent_process_storage_dir(agent);
+        if root.exists() {
+            fs::remove_dir_all(&root)?;
+        }
+        fs::create_dir_all(&root)?;
+
+        let npm_install_started = Instant::now();
+        install_npm_package(&root, package, agent)?;
+        let npm_install_ms = elapsed_ms(npm_install_started);
+
+        let bin_name = agent.agent_process_binary_hint().ok_or_else(|| {
+            AgentError::ExtractFailed(format!(
+                "missing executable hint for agent process package: {agent}"
+            ))
+        })?;
+
+        let cmd_path = npm_bin_path(&root, bin_name);
+        if !cmd_path.exists() {
+            return Err(AgentError::ExtractFailed(format!(
+                "installed package missing executable: {}",
+                cmd_path.display()
+            )));
         }
 
         let launcher = self.agent_process_path(agent);
+        let write_started = Instant::now();
+        write_exec_agent_process_launcher(&launcher, &cmd_path, args, env)?;
+        let write_ms = elapsed_ms(write_started);
+        let verify_started = Instant::now();
+        verify_command(&launcher, &[])?;
+        let verify_ms = elapsed_ms(verify_started);
+
+        tracing::info!(
+            agent = agent.as_str(),
+            package = %package,
+            cmd = %cmd_path.display(),
+            npm_install_ms = npm_install_ms,
+            write_ms = write_ms,
+            verify_ms = verify_ms,
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_npm_agent_process_package: completed"
+        );
+
+        Ok(InstalledArtifact {
+            kind: InstalledArtifactKind::AgentProcess,
+            path: launcher,
+            version,
+            source,
+        })
+    }
+
+    fn agent_process_status(&self, agent: AgentId) -> Option<AgentProcessStatus> {
+        let launcher = self.agent_process_path(agent);
+
+        if agent == AgentId::Mock {
+            if launcher.exists() {
+                return Some(AgentProcessStatus {
+                    source: InstallSource::Builtin,
+                    version: Some("builtin".to_string()),
+                });
+            }
+            return None;
+        }
         if launcher.exists() {
             return Some(AgentProcessStatus {
                 source: InstallSource::LocalPath,
@@ -540,59 +708,111 @@ impl AgentManager {
         agent: AgentId,
         options: &InstallOptions,
     ) -> Result<Option<InstalledArtifact>, AgentError> {
+        let started = Instant::now();
         let Some(registry_id) = agent.agent_process_registry_id() else {
             return Ok(None);
         };
 
+        tracing::info!(
+            agent = agent.as_str(),
+            registry_id = registry_id,
+            url = %self.registry_url,
+            "agent_manager.install_agent_process_from_registry: fetching registry"
+        );
+        let fetch_started = Instant::now();
         let registry = fetch_registry(&self.registry_url)?;
+        tracing::info!(
+            agent = agent.as_str(),
+            registry_id = registry_id,
+            fetch_ms = elapsed_ms(fetch_started),
+            "agent_manager.install_agent_process_from_registry: registry fetched"
+        );
         let Some(entry) = registry.agents.into_iter().find(|a| a.id == registry_id) else {
+            tracing::info!(
+                agent = agent.as_str(),
+                registry_id = registry_id,
+                total_ms = elapsed_ms(started),
+                "agent_manager.install_agent_process_from_registry: missing entry"
+            );
             return Ok(None);
         };
 
         if let Some(npx) = entry.distribution.npx {
             let package =
                 apply_npx_version_override(&npx.package, options.agent_process_version.as_deref());
-            let launcher = self.agent_process_path(agent);
-            write_npx_agent_process_launcher(&launcher, &package, &npx.args, &npx.env)?;
-            verify_command(&launcher, &[])?;
-            return Ok(Some(InstalledArtifact {
-                kind: InstalledArtifactKind::AgentProcess,
-                path: launcher,
-                version: options
-                    .agent_process_version
-                    .clone()
-                    .or(entry.version)
-                    .or(extract_npx_version(&package)),
-                source: InstallSource::Registry,
-            }));
+            let version = options
+                .agent_process_version
+                .clone()
+                .or(entry.version)
+                .or(extract_npx_version(&package));
+            let artifact = self.install_npm_agent_process_package(
+                agent,
+                &package,
+                &npx.args,
+                &npx.env,
+                InstallSource::Registry,
+                version,
+            )?;
+            tracing::info!(
+                agent = agent.as_str(),
+                package = %package,
+                total_ms = elapsed_ms(started),
+                "agent_manager.install_agent_process_from_registry: npm package installed"
+            );
+            return Ok(Some(artifact));
         }
 
         if let Some(binary) = entry.distribution.binary {
             let key = self.platform.registry_key();
             if let Some(target) = binary.get(key) {
                 let archive_url = Url::parse(&target.archive)?;
+                let download_started = Instant::now();
                 let payload = download_bytes(&archive_url)?;
+                let download_ms = elapsed_ms(download_started);
                 let root = self.agent_process_storage_dir(agent);
                 if root.exists() {
                     fs::remove_dir_all(&root)?;
                 }
                 fs::create_dir_all(&root)?;
+                let unpack_started = Instant::now();
                 unpack_archive(&payload, &archive_url, &root)?;
+                let unpack_ms = elapsed_ms(unpack_started);
 
                 let cmd_path = resolve_extracted_command(&root, &target.cmd)?;
                 let launcher = self.agent_process_path(agent);
+                let write_started = Instant::now();
                 write_exec_agent_process_launcher(&launcher, &cmd_path, &target.args, &target.env)?;
+                let write_ms = elapsed_ms(write_started);
+                let verify_started = Instant::now();
                 verify_command(&launcher, &[])?;
+                let verify_ms = elapsed_ms(verify_started);
 
-                return Ok(Some(InstalledArtifact {
+                let artifact = InstalledArtifact {
                     kind: InstalledArtifactKind::AgentProcess,
                     path: launcher,
                     version: options.agent_process_version.clone().or(entry.version),
                     source: InstallSource::Registry,
-                }));
+                };
+                tracing::info!(
+                    agent = agent.as_str(),
+                    archive_url = %archive_url,
+                    download_ms = download_ms,
+                    unpack_ms = unpack_ms,
+                    write_ms = write_ms,
+                    verify_ms = verify_ms,
+                    total_ms = elapsed_ms(started),
+                    "agent_manager.install_agent_process_from_registry: binary launcher installed"
+                );
+                return Ok(Some(artifact));
             }
         }
 
+        tracing::info!(
+            agent = agent.as_str(),
+            registry_id = registry_id,
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_agent_process_from_registry: no compatible distribution"
+        );
         Ok(None)
     }
 
@@ -601,24 +821,10 @@ impl AgentManager {
         agent: AgentId,
         options: &InstallOptions,
     ) -> Result<InstalledArtifact, AgentError> {
-        let launcher = self.agent_process_path(agent);
-
-        match agent {
-            AgentId::Claude => {
-                let package = fallback_npx_package(
-                    "@zed-industries/claude-code-acp",
-                    options.agent_process_version.as_deref(),
-                );
-                write_npx_agent_process_launcher(&launcher, &package, &[], &HashMap::new())?;
-            }
-            AgentId::Codex => {
-                let package = fallback_npx_package(
-                    "@zed-industries/codex-acp",
-                    options.agent_process_version.as_deref(),
-                );
-                write_npx_agent_process_launcher(&launcher, &package, &[], &HashMap::new())?;
-            }
+        let started = Instant::now();
+        let artifact = match agent {
             AgentId::Opencode => {
+                let launcher = self.agent_process_path(agent);
                 let native = self.resolve_binary(agent)?;
                 write_exec_agent_process_launcher(
                     &launcher,
@@ -626,37 +832,59 @@ impl AgentManager {
                     &["acp".to_string()],
                     &HashMap::new(),
                 )?;
-            }
-            AgentId::Amp => {
-                let package =
-                    fallback_npx_package("amp-acp", options.agent_process_version.as_deref());
-                write_npx_agent_process_launcher(&launcher, &package, &[], &HashMap::new())?;
-            }
-            AgentId::Pi => {
-                let package =
-                    fallback_npx_package("pi-acp", options.agent_process_version.as_deref());
-                write_npx_agent_process_launcher(&launcher, &package, &[], &HashMap::new())?;
-            }
-            AgentId::Cursor => {
-                let package = fallback_npx_package(
-                    "@blowmage/cursor-agent-acp",
-                    options.agent_process_version.as_deref(),
-                );
-                write_npx_agent_process_launcher(&launcher, &package, &[], &HashMap::new())?;
+                verify_command(&launcher, &[])?;
+                InstalledArtifact {
+                    kind: InstalledArtifactKind::AgentProcess,
+                    path: launcher,
+                    version: options.agent_process_version.clone(),
+                    source: InstallSource::Fallback,
+                }
             }
             AgentId::Mock => {
+                let launcher = self.agent_process_path(agent);
                 write_mock_agent_process_launcher(&launcher)?;
+                InstalledArtifact {
+                    kind: InstalledArtifactKind::AgentProcess,
+                    path: launcher,
+                    version: options.agent_process_version.clone(),
+                    source: InstallSource::Fallback,
+                }
             }
-        }
+            _ => {
+                let (npm_package, pinned_version) =
+                    adapter_entry(agent.as_str()).ok_or_else(|| {
+                        AgentError::ExtractFailed(format!(
+                            "no adapter entry in adapters.json for agent: {agent}"
+                        ))
+                    })?;
+                let version = options
+                    .agent_process_version
+                    .as_deref()
+                    .or(Some(pinned_version));
+                let package = fallback_npx_package(npm_package, version);
+                self.install_npm_agent_process_package(
+                    agent,
+                    &package,
+                    &[],
+                    &HashMap::new(),
+                    InstallSource::Fallback,
+                    options
+                        .agent_process_version
+                        .clone()
+                        .or(extract_npx_version(&package)),
+                )?
+            }
+        };
 
-        verify_command(&launcher, &[])?;
+        tracing::info!(
+            agent = agent.as_str(),
+            source = ?artifact.source,
+            version = ?artifact.version,
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_agent_process_fallback: launcher installed"
+        );
 
-        Ok(InstalledArtifact {
-            kind: InstalledArtifactKind::AgentProcess,
-            path: launcher,
-            version: options.agent_process_version.clone(),
-            source: InstallSource::Fallback,
-        })
+        Ok(artifact)
     }
 }
 
@@ -732,6 +960,44 @@ pub enum AgentError {
     RegistryParse(String),
     #[error("command verification failed: {0}")]
     VerifyFailed(String),
+    #[error(
+        "npm is required to install {agent}. install npm, then run step 3: `sandbox-agent install-agent {agent}`"
+    )]
+    MissingNpm { agent: AgentId },
+}
+
+/// Looks up the pinned adapter entry from `adapters.json` for the given agent ID.
+/// Returns `(npm_package, pinned_version)`.
+fn adapter_entry(agent_id: &str) -> Option<(&'static str, &'static str)> {
+    use std::sync::OnceLock;
+
+    #[derive(Deserialize)]
+    struct AdaptersConfig {
+        adapters: Vec<AdapterEntry>,
+    }
+    #[derive(Deserialize)]
+    #[serde(rename_all = "camelCase")]
+    struct AdapterEntry {
+        agent_id: String,
+        npm_package: String,
+        pinned_version: String,
+    }
+
+    static PARSED: OnceLock<Vec<(String, String, String)>> = OnceLock::new();
+    let entries = PARSED.get_or_init(|| {
+        let config: AdaptersConfig =
+            serde_json::from_str(ADAPTERS_JSON).expect("adapters.json is valid");
+        config
+            .adapters
+            .into_iter()
+            .map(|e| (e.agent_id, e.npm_package, e.pinned_version))
+            .collect()
+    });
+
+    entries
+        .iter()
+        .find(|(id, _, _)| id == agent_id)
+        .map(|(_, pkg, ver)| (pkg.as_str(), ver.as_str()))
 }
 
 fn fallback_npx_package(base: &str, version: Option<&str>) -> String {
@@ -779,15 +1045,36 @@ fn split_package_version(package: &str) -> Option<(&str, &str)> {
     }
 }
 
-fn write_npx_agent_process_launcher(
-    path: &Path,
-    package: &str,
-    args: &[String],
-    env: &HashMap<String, String>,
-) -> Result<(), AgentError> {
-    let mut command = vec!["npx".to_string(), "-y".to_string(), package.to_string()];
-    command.extend(args.iter().cloned());
-    write_launcher(path, &command, env)
+fn install_npm_package(root: &Path, package: &str, agent: AgentId) -> Result<(), AgentError> {
+    let mut command = Command::new("npm");
+    command
+        .arg("install")
+        .arg("--no-audit")
+        .arg("--no-fund")
+        .arg("--prefix")
+        .arg(root)
+        .arg(package)
+        .stdout(Stdio::null())
+        .stderr(Stdio::null());
+
+    match command.status() {
+        Ok(status) if status.success() => Ok(()),
+        Ok(status) => Err(AgentError::VerifyFailed(format!(
+            "npm install failed for {agent} with status {status}. run step 3: `sandbox-agent install-agent {agent}`"
+        ))),
+        Err(err) if err.kind() == io::ErrorKind::NotFound => Err(AgentError::MissingNpm { agent }),
+        Err(err) => Err(AgentError::VerifyFailed(format!(
+            "failed to execute npm for {agent}: {err}"
+        ))),
+    }
+}
+
+fn npm_bin_path(root: &Path, bin_name: &str) -> PathBuf {
+    let mut path = root.join("node_modules").join(".bin").join(bin_name);
+    if cfg!(windows) {
+        path.set_extension("cmd");
+    }
+    path
 }
 
 fn write_exec_agent_process_launcher(
@@ -806,9 +1093,9 @@ fn write_mock_agent_process_launcher(path: &Path) -> Result<(), AgentError> {
         fs::create_dir_all(parent)?;
     }
     let script = if cfg!(windows) {
-        "@echo off\r\necho mock agent process is in-process in sandbox-agent\r\nexit /b 1\r\n"
+        "@echo off\r\nif not \"%SANDBOX_AGENT_BIN%\"==\"\" (\r\n  \"%SANDBOX_AGENT_BIN%\" mock-agent-process %*\r\n  exit /b %errorlevel%\r\n)\r\nsandbox-agent mock-agent-process %*\r\n"
     } else {
-        "#!/usr/bin/env sh\necho 'mock agent process is in-process in sandbox-agent'\nexit 1\n"
+        "#!/usr/bin/env sh\nif [ -n \"${SANDBOX_AGENT_BIN:-}\" ]; then\n  exec \"$SANDBOX_AGENT_BIN\" mock-agent-process \"$@\"\nfi\nexec sandbox-agent mock-agent-process \"$@\"\n"
     };
     write_text_file(path, script)
 }
@@ -998,6 +1285,15 @@ fn install_claude(
     platform: Platform,
     version: Option<&str>,
 ) -> Result<(), AgentError> {
+    let started = Instant::now();
+    tracing::info!(
+        path = %path.display(),
+        platform = ?platform,
+        version_override = ?version,
+        "agent_manager.install_claude: starting"
+    );
+
+    let version_started = Instant::now();
     let version = match version {
         Some(version) => version.to_string(),
         None => {
@@ -1009,6 +1305,7 @@ fn install_claude(
             text.trim().to_string()
         }
     };
+    let version_ms = elapsed_ms(version_started);
 
     let platform_segment = match platform {
         Platform::LinuxX64 => "linux-x64",
@@ -1023,12 +1320,26 @@ fn install_claude(
     let url = Url::parse(&format!(
         "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/{version}/{platform_segment}/claude"
     ))?;
+    let download_started = Instant::now();
     let bytes = download_bytes(&url)?;
+    let download_ms = elapsed_ms(download_started);
+    let write_started = Instant::now();
     write_executable(path, &bytes)?;
+    tracing::info!(
+        version = %version,
+        url = %url,
+        bytes = bytes.len(),
+        version_ms = version_ms,
+        download_ms = download_ms,
+        write_ms = elapsed_ms(write_started),
+        total_ms = elapsed_ms(started),
+        "agent_manager.install_claude: completed"
+    );
     Ok(())
 }
 
 fn install_amp(path: &Path, platform: Platform, version: Option<&str>) -> Result<(), AgentError> {
+    let started = Instant::now();
     let version = match version {
         Some(version) => version.to_string(),
         None => {
@@ -1053,12 +1364,25 @@ fn install_amp(path: &Path, platform: Platform, version: Option<&str>) -> Result
     let url = Url::parse(&format!(
         "https://storage.googleapis.com/amp-public-assets-prod-0/cli/{version}/amp-{platform_segment}"
     ))?;
+    let download_started = Instant::now();
     let bytes = download_bytes(&url)?;
+    let download_ms = elapsed_ms(download_started);
+    let write_started = Instant::now();
     write_executable(path, &bytes)?;
+    tracing::info!(
+        version = %version,
+        url = %url,
+        bytes = bytes.len(),
+        download_ms = download_ms,
+        write_ms = elapsed_ms(write_started),
+        total_ms = elapsed_ms(started),
+        "agent_manager.install_amp: completed"
+    );
     Ok(())
 }
 
 fn install_codex(path: &Path, platform: Platform, version: Option<&str>) -> Result<(), AgentError> {
+    let started = Instant::now();
     let target = match platform {
         Platform::LinuxX64 | Platform::LinuxX64Musl => "x86_64-unknown-linux-musl",
         Platform::LinuxArm64 => "aarch64-unknown-linux-musl",
@@ -1077,11 +1401,15 @@ fn install_codex(path: &Path, platform: Platform, version: Option<&str>) -> Resu
         ))?,
     };
 
+    let download_started = Instant::now();
     let bytes = download_bytes(&url)?;
+    let download_ms = elapsed_ms(download_started);
     let temp_dir = tempfile::tempdir()?;
+    let unpack_started = Instant::now();
     let cursor = io::Cursor::new(bytes);
     let mut archive = tar::Archive::new(GzDecoder::new(cursor));
     archive.unpack(temp_dir.path())?;
+    let unpack_ms = elapsed_ms(unpack_started);
 
     let expected = if cfg!(windows) {
         format!("codex-{target}.exe")
@@ -1091,7 +1419,17 @@ fn install_codex(path: &Path, platform: Platform, version: Option<&str>) -> Resu
 
     let binary = find_file_recursive(temp_dir.path(), &expected)?
         .ok_or_else(|| AgentError::ExtractFailed(format!("missing {expected}")))?;
+    let move_started = Instant::now();
     move_executable(&binary, path)?;
+    tracing::info!(
+        url = %url,
+        target = target,
+        download_ms = download_ms,
+        unpack_ms = unpack_ms,
+        move_ms = elapsed_ms(move_started),
+        total_ms = elapsed_ms(started),
+        "agent_manager.install_codex: completed"
+    );
     Ok(())
 }
 
@@ -1100,7 +1438,15 @@ fn install_opencode(
     platform: Platform,
     version: Option<&str>,
 ) -> Result<(), AgentError> {
-    match platform {
+    let started = Instant::now();
+    tracing::info!(
+        path = %path.display(),
+        platform = ?platform,
+        version_override = ?version,
+        "agent_manager.install_opencode: starting"
+    );
+
+    let result = match platform {
         Platform::MacosArm64 => {
             let url = match version {
                 Some(version) => Url::parse(&format!(
@@ -1141,22 +1487,46 @@ fn install_opencode(
                 ))?,
             };
 
+            let download_started = Instant::now();
             let bytes = download_bytes(&url)?;
+            let download_ms = elapsed_ms(download_started);
             let temp_dir = tempfile::tempdir()?;
+            let unpack_started = Instant::now();
             let cursor = io::Cursor::new(bytes);
             let mut archive = tar::Archive::new(GzDecoder::new(cursor));
             archive.unpack(temp_dir.path())?;
+            let unpack_ms = elapsed_ms(unpack_started);
             let binary = find_file_recursive(temp_dir.path(), "opencode")
                 .or_else(|_| find_file_recursive(temp_dir.path(), "opencode.exe"))?
                 .ok_or_else(|| AgentError::ExtractFailed("missing opencode".to_string()))?;
+            let move_started = Instant::now();
             move_executable(&binary, path)?;
+            tracing::info!(
+                url = %url,
+                download_ms = download_ms,
+                unpack_ms = unpack_ms,
+                move_ms = elapsed_ms(move_started),
+                "agent_manager.install_opencode: tarball extraction complete"
+            );
             Ok(())
         }
+    };
+
+    if result.is_ok() {
+        tracing::info!(
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_opencode: completed"
+        );
     }
+
+    result
 }
 
 fn install_zip_binary(path: &Path, url: &Url, binary_name: &str) -> Result<(), AgentError> {
+    let started = Instant::now();
+    let download_started = Instant::now();
     let bytes = download_bytes(url)?;
+    let download_ms = elapsed_ms(download_started);
     let reader = io::Cursor::new(bytes);
     let mut archive =
         zip::ZipArchive::new(reader).map_err(|err| AgentError::ExtractFailed(err.to_string()))?;
@@ -1173,7 +1543,16 @@ fn install_zip_binary(path: &Path, url: &Url, binary_name: &str) -> Result<(), A
         let out_path = temp_dir.path().join(binary_name);
         let mut out_file = fs::File::create(&out_path)?;
         io::copy(&mut file, &mut out_file)?;
+        let move_started = Instant::now();
         move_executable(&out_path, path)?;
+        tracing::info!(
+            url = %url,
+            binary_name = binary_name,
+            download_ms = download_ms,
+            move_ms = elapsed_ms(move_started),
+            total_ms = elapsed_ms(started),
+            "agent_manager.install_zip_binary: completed"
+        );
         return Ok(());
     }
     Err(AgentError::ExtractFailed(format!("missing {binary_name}")))
@@ -1231,6 +1610,10 @@ fn find_file_recursive(dir: &Path, filename: &str) -> Result<Option<PathBuf>, Ag
     Ok(None)
 }
 
+fn elapsed_ms(start: Instant) -> u64 {
+    start.elapsed().as_millis() as u64
+}
+
 fn parse_version_output(output: &std::process::Output) -> Option<String> {
     let stdout = String::from_utf8_lossy(&output.stdout);
     let stderr = String::from_utf8_lossy(&output.stderr);
@@ -1265,6 +1648,38 @@ mod tests {
         }
     }
 
+    fn write_fake_npm(path: &Path) {
+        write_exec(
+            path,
+            r#"#!/usr/bin/env sh
+set -e
+prefix=""
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    install|--no-audit|--no-fund)
+      shift
+      ;;
+    --prefix)
+      prefix="$2"
+      shift 2
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+[ -n "$prefix" ] || exit 1
+mkdir -p "$prefix/node_modules/.bin"
+for bin in claude-code-acp codex-acp amp-acp pi-acp cursor-agent-acp; do
+  echo '#!/usr/bin/env sh' > "$prefix/node_modules/.bin/$bin"
+  echo 'exit 0' >> "$prefix/node_modules/.bin/$bin"
+  chmod +x "$prefix/node_modules/.bin/$bin"
+done
+exit 0
+"#,
+        );
+    }
+
     fn env_lock() -> &'static Mutex<()> {
         static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
         LOCK.get_or_init(|| Mutex::new(()))
@@ -1407,7 +1822,7 @@ mod tests {
 
         let bin_dir = temp_dir.path().join("bin");
         fs::create_dir_all(&bin_dir).expect("create bin dir");
-        write_exec(&bin_dir.join("npx"), "#!/usr/bin/env sh\nexit 0\n");
+        write_fake_npm(&bin_dir.join("npm"));
 
         let original_path = std::env::var_os("PATH").unwrap_or_default();
         let mut paths = vec![bin_dir.clone()];
@@ -1455,8 +1870,8 @@ mod tests {
         let launcher =
             fs::read_to_string(manager.agent_process_path(AgentId::Codex)).expect("launcher");
         assert!(
-            launcher.contains("@example/codex-acp@9.9.9"),
-            "launcher should include overridden package version"
+            launcher.contains("node_modules/.bin/codex-acp"),
+            "launcher should invoke installed codex executable"
         );
     }
 
@@ -1474,7 +1889,7 @@ mod tests {
 
         let bin_dir = temp_dir.path().join("bin");
         fs::create_dir_all(&bin_dir).expect("create bin dir");
-        write_exec(&bin_dir.join("npx"), "#!/usr/bin/env sh\nexit 0\n");
+        write_fake_npm(&bin_dir.join("npm"));
 
         let original_path = std::env::var_os("PATH").unwrap_or_default();
         let mut paths = vec![bin_dir.clone()];
@@ -1496,6 +1911,39 @@ mod tests {
         assert_eq!(agent_process_artifact.source, InstallSource::Fallback);
     }
 
+    #[test]
+    fn install_returns_missing_npm_error_for_npm_backed_agents() {
+        let _env_lock = env_lock().lock().expect("env lock");
+
+        let temp_dir = tempfile::tempdir().expect("create tempdir");
+        let mut manager = AgentManager::with_platform(temp_dir.path(), Platform::LinuxX64);
+
+        write_exec(
+            &manager.binary_path(AgentId::Codex),
+            "#!/usr/bin/env sh\nexit 0\n",
+        );
+
+        let bin_dir = temp_dir.path().join("bin");
+        fs::create_dir_all(&bin_dir).expect("create bin dir");
+
+        let original_path = std::env::var_os("PATH").unwrap_or_default();
+        let combined_path = std::env::join_paths([bin_dir]).expect("join PATH");
+        let _path_guard = EnvVarGuard::set("PATH", &combined_path);
+
+        manager.registry_url = serve_registry_once(serde_json::json!({ "agents": [] }));
+
+        let error = manager
+            .install(AgentId::Codex, InstallOptions::default())
+            .expect_err("install should fail without npm");
+
+        match error {
+            AgentError::MissingNpm { agent } => assert_eq!(agent, AgentId::Codex),
+            other => panic!("expected MissingNpm, got {other:?}"),
+        }
+
+        drop(original_path);
+    }
+
     #[test]
     fn reinstall_mock_returns_agent_process_artifact() {
         let temp_dir = tempfile::tempdir().expect("create tempdir");
@@ -1522,7 +1970,35 @@ mod tests {
     }
 
     #[test]
-    fn install_pi_skips_native_and_writes_fallback_npx_launcher() {
+    fn mock_launcher_prefers_sandbox_agent_bin() {
+        let temp_dir = tempfile::tempdir().expect("create tempdir");
+        let manager = AgentManager::with_platform(temp_dir.path(), Platform::LinuxX64);
+
+        manager
+            .install(
+                AgentId::Mock,
+                InstallOptions {
+                    reinstall: true,
+                    version: None,
+                    agent_process_version: None,
+                },
+            )
+            .expect("mock install");
+
+        let launcher = manager.agent_process_path(AgentId::Mock);
+        let mut file = fs::File::open(&launcher).expect("open mock launcher");
+        let mut contents = String::new();
+        file.read_to_string(&mut contents)
+            .expect("read mock launcher");
+
+        assert!(
+            contents.contains("SANDBOX_AGENT_BIN"),
+            "mock launcher should reference SANDBOX_AGENT_BIN"
+        );
+    }
+
+    #[test]
+    fn install_pi_skips_native_and_installs_fallback_npm_launcher() {
         let _env_lock = env_lock().lock().expect("env lock");
 
         let temp_dir = tempfile::tempdir().expect("create tempdir");
@@ -1530,7 +2006,7 @@ mod tests {
 
         let bin_dir = temp_dir.path().join("bin");
         fs::create_dir_all(&bin_dir).expect("create bin dir");
-        write_exec(&bin_dir.join("npx"), "#!/usr/bin/env sh\nexit 0\n");
+        write_fake_npm(&bin_dir.join("npm"));
 
         let original_path = std::env::var_os("PATH").unwrap_or_default();
         let mut paths = vec![bin_dir.clone()];
@@ -1564,8 +2040,8 @@ mod tests {
         let launcher =
             fs::read_to_string(manager.agent_process_path(AgentId::Pi)).expect("read pi launcher");
         assert!(
-            launcher.contains("pi-acp"),
-            "pi launcher should reference pi-acp package"
+            launcher.contains("node_modules/.bin/pi-acp"),
+            "pi launcher should use installed pi executable"
         );
 
         // resolve_agent_process should now find it.
@@ -1590,7 +2066,7 @@ mod tests {
     }
 
     #[test]
-    fn install_cursor_skips_native_and_writes_fallback_npx_launcher() {
+    fn install_cursor_skips_native_and_installs_fallback_npm_launcher() {
         let _env_lock = env_lock().lock().expect("env lock");
 
         let temp_dir = tempfile::tempdir().expect("create tempdir");
@@ -1598,7 +2074,7 @@ mod tests {
 
         let bin_dir = temp_dir.path().join("bin");
         fs::create_dir_all(&bin_dir).expect("create bin dir");
-        write_exec(&bin_dir.join("npx"), "#!/usr/bin/env sh\nexit 0\n");
+        write_fake_npm(&bin_dir.join("npm"));
 
         let original_path = std::env::var_os("PATH").unwrap_or_default();
         let mut paths = vec![bin_dir.clone()];
@@ -1630,8 +2106,8 @@ mod tests {
         let launcher = fs::read_to_string(manager.agent_process_path(AgentId::Cursor))
             .expect("read cursor launcher");
         assert!(
-            launcher.contains("@blowmage/cursor-agent-acp"),
-            "cursor launcher should reference @blowmage/cursor-agent-acp package"
+            launcher.contains("node_modules/.bin/cursor-agent-acp"),
+            "cursor launcher should use installed cursor executable"
         );
 
         let spec = manager
diff --git a/server/packages/error/src/lib.rs b/server/packages/error/src/lib.rs
index 9bc1734..d0e8c0c 100644
--- a/server/packages/error/src/lib.rs
+++ b/server/packages/error/src/lib.rs
@@ -17,6 +17,7 @@ pub enum ErrorType {
     PermissionDenied,
     NotAcceptable,
     UnsupportedMediaType,
+    NotFound,
     SessionNotFound,
     SessionAlreadyExists,
     ModeNotSupported,
@@ -37,6 +38,7 @@ impl ErrorType {
             Self::PermissionDenied => "urn:sandbox-agent:error:permission_denied",
             Self::NotAcceptable => "urn:sandbox-agent:error:not_acceptable",
             Self::UnsupportedMediaType => "urn:sandbox-agent:error:unsupported_media_type",
+            Self::NotFound => "urn:sandbox-agent:error:not_found",
             Self::SessionNotFound => "urn:sandbox-agent:error:session_not_found",
             Self::SessionAlreadyExists => "urn:sandbox-agent:error:session_already_exists",
             Self::ModeNotSupported => "urn:sandbox-agent:error:mode_not_supported",
@@ -57,6 +59,7 @@ impl ErrorType {
             Self::PermissionDenied => "Permission Denied",
             Self::NotAcceptable => "Not Acceptable",
             Self::UnsupportedMediaType => "Unsupported Media Type",
+            Self::NotFound => "Not Found",
             Self::SessionNotFound => "Session Not Found",
             Self::SessionAlreadyExists => "Session Already Exists",
             Self::ModeNotSupported => "Mode Not Supported",
@@ -77,6 +80,7 @@ impl ErrorType {
             Self::PermissionDenied => 403,
             Self::NotAcceptable => 406,
             Self::UnsupportedMediaType => 415,
+            Self::NotFound => 404,
             Self::SessionNotFound => 404,
             Self::SessionAlreadyExists => 409,
             Self::ModeNotSupported => 400,
@@ -155,6 +159,8 @@ pub enum SandboxError {
     NotAcceptable { message: String },
     #[error("unsupported media type: {message}")]
     UnsupportedMediaType { message: String },
+    #[error("not found: {resource} {id}")]
+    NotFound { resource: String, id: String },
     #[error("session not found: {session_id}")]
     SessionNotFound { session_id: String },
     #[error("session already exists: {session_id}")]
@@ -180,6 +186,7 @@ impl SandboxError {
             Self::PermissionDenied { .. } => ErrorType::PermissionDenied,
             Self::NotAcceptable { .. } => ErrorType::NotAcceptable,
             Self::UnsupportedMediaType { .. } => ErrorType::UnsupportedMediaType,
+            Self::NotFound { .. } => ErrorType::NotFound,
             Self::SessionNotFound { .. } => ErrorType::SessionNotFound,
             Self::SessionAlreadyExists { .. } => ErrorType::SessionAlreadyExists,
             Self::ModeNotSupported { .. } => ErrorType::ModeNotSupported,
@@ -264,6 +271,12 @@ impl SandboxError {
                 map.insert("message".to_string(), Value::String(message.clone()));
                 (None, None, Some(Value::Object(map)))
             }
+            Self::NotFound { resource, id } => {
+                let mut map = Map::new();
+                map.insert("resource".to_string(), Value::String(resource.clone()));
+                map.insert("id".to_string(), Value::String(id.clone()));
+                (None, None, Some(Value::Object(map)))
+            }
             Self::SessionNotFound { session_id } => (None, Some(session_id.clone()), None),
             Self::SessionAlreadyExists { session_id } => (None, Some(session_id.clone()), None),
             Self::ModeNotSupported { agent, mode } => {
diff --git a/server/packages/sandbox-agent/Cargo.toml b/server/packages/sandbox-agent/Cargo.toml
index bb8328c..8749a22 100644
--- a/server/packages/sandbox-agent/Cargo.toml
+++ b/server/packages/sandbox-agent/Cargo.toml
@@ -41,6 +41,7 @@ base64.workspace = true
 toml_edit.workspace = true
 tar.workspace = true
 zip.workspace = true
+tokio-tungstenite = "0.24"
 tempfile = { workspace = true, optional = true }
 
 [target.'cfg(unix)'.dependencies]
@@ -55,6 +56,7 @@ insta.workspace = true
 tower.workspace = true
 tempfile.workspace = true
 serial_test = "3.2"
+tokio-tungstenite = "0.24"
 
 [features]
 test-utils = ["tempfile"]
diff --git a/server/packages/sandbox-agent/src/acp_proxy_runtime.rs b/server/packages/sandbox-agent/src/acp_proxy_runtime.rs
index 9e1e13c..e0a4f99 100644
--- a/server/packages/sandbox-agent/src/acp_proxy_runtime.rs
+++ b/server/packages/sandbox-agent/src/acp_proxy_runtime.rs
@@ -11,7 +11,7 @@ use futures::Stream;
 use sandbox_agent_agent_management::agents::{AgentId, AgentManager, InstallOptions};
 use sandbox_agent_error::SandboxError;
 use sandbox_agent_opencode_adapter::{AcpDispatch, AcpDispatchResult, AcpPayloadStream};
-use serde_json::Value;
+use serde_json::{Number, Value};
 use tokio::sync::{Mutex, RwLock};
 
 const DEFAULT_REQUEST_TIMEOUT_MS: u64 = 120_000;
@@ -134,6 +134,8 @@ impl AcpProxyRuntime {
             "acp_proxy: instance resolved"
         );
 
+        let payload = normalize_payload_for_agent(instance.agent, payload);
+
         match instance.runtime.post(payload).await {
             Ok(PostOutcome::Response(value)) => {
                 let total_ms = start.elapsed().as_millis() as u64;
@@ -145,6 +147,7 @@ impl AcpProxyRuntime {
                     "acp_proxy: POST → response"
                 );
                 let value = annotate_agent_error(instance.agent, value);
+                let value = annotate_agent_stderr(value, &instance.runtime).await;
                 Ok(ProxyPostOutcome::Response(value))
             }
             Ok(PostOutcome::Accepted) => {
@@ -165,7 +168,7 @@ impl AcpProxyRuntime {
                     error = %err,
                     "acp_proxy: POST → error"
                 );
-                Err(map_adapter_error(err))
+                Err(map_adapter_error(err, Some(instance.agent)))
             }
         }
     }
@@ -277,41 +280,53 @@ impl AcpProxyRuntime {
         server_id: &str,
         agent: AgentId,
     ) -> Result<Arc<ProxyInstance>, SandboxError> {
-        let start = std::time::Instant::now();
+        let total_started = std::time::Instant::now();
         tracing::info!(
             server_id = server_id,
             agent = agent.as_str(),
             "create_instance: starting"
         );
 
+        let install_started = std::time::Instant::now();
         self.ensure_installed(agent).await?;
-        let install_elapsed = start.elapsed();
         tracing::info!(
             server_id = server_id,
             agent = agent.as_str(),
-            install_ms = install_elapsed.as_millis() as u64,
+            install_ms = install_started.elapsed().as_millis() as u64,
             "create_instance: agent installed/verified"
         );
 
+        let resolve_started = std::time::Instant::now();
         let manager = self.inner.agent_manager.clone();
-        let launch = tokio::task::spawn_blocking(move || manager.resolve_agent_process(agent))
+        let mut launch = tokio::task::spawn_blocking(move || manager.resolve_agent_process(agent))
             .await
             .map_err(|err| SandboxError::StreamError {
-                message: format!("failed to resolve ACP agent process launch spec: {err}"),
+                message: format!("failed to resolve agent process launch spec: {err}"),
             })?
             .map_err(|err| SandboxError::StreamError {
                 message: err.to_string(),
             })?;
 
+        if agent == AgentId::Mock {
+            if let Ok(exe) = std::env::current_exe() {
+                let path = exe.to_string_lossy().to_string();
+                launch
+                    .env
+                    .entry("SANDBOX_AGENT_BIN".to_string())
+                    .or_insert(path);
+            }
+        }
+
         tracing::info!(
             server_id = server_id,
             agent = agent.as_str(),
             program = ?launch.program,
             args = ?launch.args,
-            resolve_ms = start.elapsed().as_millis() as u64,
+            resolve_ms = resolve_started.elapsed().as_millis() as u64,
             "create_instance: launch spec resolved, spawning"
         );
 
+        let spawn_started = std::time::Instant::now();
         let runtime = AdapterRuntime::start(
             LaunchSpec {
                 program: launch.program,
@@ -321,12 +336,13 @@ impl AcpProxyRuntime {
             self.inner.request_timeout,
         )
         .await
-        .map_err(map_adapter_error)?;
+        .map_err(|err| map_adapter_error(err, Some(agent)))?;
 
-        let total_ms = start.elapsed().as_millis() as u64;
+        let total_ms = total_started.elapsed().as_millis() as u64;
         tracing::info!(
             server_id = server_id,
             agent = agent.as_str(),
+            spawn_ms = spawn_started.elapsed().as_millis() as u64,
             total_ms = total_ms,
             "create_instance: ready"
         );
@@ -340,16 +356,27 @@ impl AcpProxyRuntime {
     }
 
     async fn ensure_installed(&self, agent: AgentId) -> Result<(), SandboxError> {
+        let started = std::time::Instant::now();
         if self.inner.require_preinstall {
             if !self.is_ready(agent).await {
                 return Err(SandboxError::AgentNotInstalled {
                     agent: agent.as_str().to_string(),
                 });
             }
+            tracing::info!(
+                agent = agent.as_str(),
+                total_ms = started.elapsed().as_millis() as u64,
+                "ensure_installed: preinstall requirement satisfied"
+            );
             return Ok(());
         }
 
         if self.is_ready(agent).await {
+            tracing::info!(
+                agent = agent.as_str(),
+                total_ms = started.elapsed().as_millis() as u64,
+                "ensure_installed: already ready"
+            );
             return Ok(());
         }
 
@@ -363,9 +390,19 @@ impl AcpProxyRuntime {
         let _guard = lock.lock().await;
 
         if self.is_ready(agent).await {
+            tracing::info!(
+                agent = agent.as_str(),
+                total_ms = started.elapsed().as_millis() as u64,
+                "ensure_installed: became ready while waiting for lock"
+            );
             return Ok(());
         }
 
+        tracing::info!(
+            agent = agent.as_str(),
+            "ensure_installed: installing missing artifacts"
+        );
+        let install_started = std::time::Instant::now();
         let manager = self.inner.agent_manager.clone();
         tokio::task::spawn_blocking(move || manager.install(agent, InstallOptions::default()))
             .await
@@ -378,12 +415,18 @@ impl AcpProxyRuntime {
                 stderr: Some(err.to_string()),
             })?;
 
+        tracing::info!(
+            agent = agent.as_str(),
+            install_ms = install_started.elapsed().as_millis() as u64,
+            total_ms = started.elapsed().as_millis() as u64,
+            "ensure_installed: install complete"
+        );
         Ok(())
     }
 
     async fn is_ready(&self, agent: AgentId) -> bool {
         if agent == AgentId::Mock {
-            return self.inner.agent_manager.agent_process_path(agent).exists();
+            return true;
         }
         self.inner.agent_manager.is_installed(agent)
     }
@@ -432,7 +475,7 @@ impl AcpDispatch for AcpProxyRuntime {
     }
 }
 
-fn map_adapter_error(err: AdapterError) -> SandboxError {
+fn map_adapter_error(err: AdapterError, agent: Option<AgentId>) -> SandboxError {
     match err {
         AdapterError::InvalidEnvelope => SandboxError::InvalidRequest {
             message: "request body must be a JSON-RPC object".to_string(),
@@ -446,6 +489,29 @@ fn map_adapter_error(err: AdapterError) -> SandboxError {
         AdapterError::Write(error) => SandboxError::StreamError {
             message: format!("failed writing to agent stdin: {error}"),
         },
+        AdapterError::Exited { exit_code, stderr } => {
+            if let Some(agent) = agent {
+                SandboxError::AgentProcessExited {
+                    agent: agent.as_str().to_string(),
+                    exit_code,
+                    stderr,
+                }
+            } else {
+                SandboxError::StreamError {
+                    message: if let Some(stderr) = stderr {
+                        format!(
+                            "agent process exited before responding (exit_code: {:?}, stderr: {})",
+                            exit_code, stderr
+                        )
+                    } else {
+                        format!(
+                            "agent process exited before responding (exit_code: {:?})",
+                            exit_code
+                        )
+                    },
+                }
+            }
+        }
         AdapterError::Spawn(error) => SandboxError::StreamError {
             message: format!("failed to start agent process: {error}"),
         },
@@ -457,8 +523,85 @@ fn map_adapter_error(err: AdapterError) -> SandboxError {
     }
 }
 
+fn normalize_payload_for_agent(agent: AgentId, payload: Value) -> Value {
+    if agent != AgentId::Pi {
+        return payload;
+    }
+
+    // Pi's ACP adapter is stricter than other adapters for a couple of bootstrap
+    // fields. Normalize here so older/raw ACP clients still work against Pi.
+    normalize_pi_payload(payload)
+}
+
+fn normalize_pi_payload(mut payload: Value) -> Value {
+    let method = payload
+        .get("method")
+        .and_then(Value::as_str)
+        .unwrap_or_default();
+
+    match method {
+        "initialize" => {
+            // Some clients send ACP protocolVersion as a string ("1.0"), but
+            // pi-acp expects a numeric JSON value and rejects strings.
+            if let Some(protocol) = payload.pointer_mut("/params/protocolVersion") {
+                if let Some(raw) = protocol.as_str() {
+                    if let Some(number) = parse_json_number(raw) {
+                        *protocol = Value::Number(number);
+                    }
+                }
+            }
+        }
+        "session/new" => {
+            // The TypeScript SDK and opencode adapter already send mcpServers: [],
+            // but raw /v1/acp callers may omit it. pi-acp currently validates
+            // mcpServers as required, so default it here for compatibility.
+            if let Some(params) = payload.get_mut("params").and_then(Value::as_object_mut) {
+                params
+                    .entry("mcpServers".to_string())
+                    .or_insert_with(|| Value::Array(Vec::new()));
+            }
+        }
+        _ => {}
+    }
+
+    payload
+}
+
+fn parse_json_number(raw: &str) -> Option<Number> {
+    let trimmed = raw.trim();
+
+    if let Ok(unsigned) = trimmed.parse::<u64>() {
+        return Some(Number::from(unsigned));
+    }
+
+    if let Ok(signed) = trimmed.parse::<i64>() {
+        return Some(Number::from(signed));
+    }
+
+    trimmed.parse::<f64>().ok().and_then(Number::from_f64)
+}
+
 /// Inspect JSON-RPC error responses from agent processes and add helpful hints
 /// when we can infer the root cause from a known error pattern.
+async fn annotate_agent_stderr(mut value: Value, runtime: &AdapterRuntime) -> Value {
+    if value.get("error").is_none() {
+        return value;
+    }
+    if let Some(stderr) = runtime.stderr_tail_summary().await {
+        if let Some(error) = value.get_mut("error") {
+            if let Some(error_obj) = error.as_object_mut() {
+                let data = error_obj
+                    .entry("data")
+                    .or_insert_with(|| Value::Object(Default::default()));
+                if let Some(obj) = data.as_object_mut() {
+                    obj.insert("agentStderr".to_string(), Value::String(stderr));
+                }
+            }
+        }
+    }
+    value
+}
+
 fn annotate_agent_error(agent: AgentId, mut value: Value) -> Value {
     if agent != AgentId::Pi {
         return value;
diff --git a/server/packages/sandbox-agent/src/cli.rs b/server/packages/sandbox-agent/src/cli.rs
index 4443269..000ea41 100644
--- a/server/packages/sandbox-agent/src/cli.rs
+++ b/server/packages/sandbox-agent/src/cli.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 use std::io::Write;
 use std::path::PathBuf;
 use std::process::Command as ProcessCommand;
@@ -11,6 +11,7 @@ mod build_version {
     include!(concat!(env!("OUT_DIR"), "/version.rs"));
 }
 
+use crate::desktop_install::{install_desktop, DesktopInstallRequest, DesktopPackageManager};
 use crate::router::{
     build_router_with_state, shutdown_servers, AppState, AuthConfig, BrandingMode,
 };
@@ -24,7 +25,7 @@ use sandbox_agent_agent_credentials::{
     ProviderCredentials,
 };
 use sandbox_agent_agent_management::agents::{AgentId, AgentManager, InstallOptions};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use thiserror::Error;
 use tower_http::cors::{Any, CorsLayer};
@@ -75,14 +76,19 @@ pub enum Command {
     Server(ServerArgs),
     /// Call the HTTP API without writing client code.
     Api(ApiArgs),
+    /// Install first-party runtime dependencies.
+    Install(InstallArgs),
     /// EXPERIMENTAL: OpenCode compatibility layer (disabled until ACP Phase 7).
     Opencode(OpencodeArgs),
     /// Manage the sandbox-agent background daemon.
     Daemon(DaemonArgs),
-    /// Install or reinstall an agent without running the server.
+    /// Install or reinstall one agent, or `all` supported agents, without running the server.
     InstallAgent(InstallAgentArgs),
     /// Inspect locally discovered credentials.
     Credentials(CredentialsArgs),
+    /// Internal: stdio JSON-RPC echo agent for the mock agent process.
+    #[command(hide = true)]
+    MockAgentProcess,
 }
 
 #[derive(Args, Debug)]
@@ -115,6 +121,12 @@ pub struct ApiArgs {
     command: ApiCommand,
 }
 
+#[derive(Args, Debug)]
+pub struct InstallArgs {
+    #[command(subcommand)]
+    command: InstallCommand,
+}
+
 #[derive(Args, Debug)]
 pub struct OpencodeArgs {
     #[arg(long, short = 'H', default_value = DEFAULT_HOST)]
@@ -153,6 +165,12 @@ pub struct DaemonArgs {
     command: DaemonCommand,
 }
 
+#[derive(Subcommand, Debug)]
+pub enum InstallCommand {
+    /// Install desktop runtime dependencies.
+    Desktop(InstallDesktopArgs),
+}
+
 #[derive(Subcommand, Debug)]
 pub enum DaemonCommand {
     /// Start the daemon in the background.
@@ -220,6 +238,8 @@ pub struct AgentsArgs {
 pub enum AgentsCommand {
     /// List all agents and install status.
     List(ClientArgs),
+    /// Emit JSON report of model/mode/thought options for all agents.
+    Report(ClientArgs),
     /// Install or reinstall an agent.
     Install(ApiInstallAgentArgs),
 }
@@ -293,7 +313,10 @@ pub struct AcpCloseArgs {
 
 #[derive(Args, Debug)]
 pub struct InstallAgentArgs {
-    agent: String,
+    #[arg(required_unless_present = "all", conflicts_with = "all")]
+    agent: Option<String>,
+    #[arg(long, conflicts_with = "agent")]
+    all: bool,
     #[arg(long, short = 'r')]
     reinstall: bool,
     #[arg(long = "agent-version")]
@@ -302,6 +325,18 @@ pub struct InstallAgentArgs {
     agent_process_version: Option<String>,
 }
 
+#[derive(Args, Debug)]
+pub struct InstallDesktopArgs {
+    #[arg(long, default_value_t = false)]
+    yes: bool,
+    #[arg(long, default_value_t = false)]
+    print_only: bool,
+    #[arg(long, value_enum)]
+    package_manager: Option<DesktopPackageManager>,
+    #[arg(long, default_value_t = false)]
+    no_fonts: bool,
+}
+
 #[derive(Args, Debug)]
 pub struct CredentialsExtractArgs {
     #[arg(long, short = 'a', value_enum)]
@@ -397,10 +432,18 @@ pub fn run_command(command: &Command, cli: &CliConfig) -> Result<(), CliError> {
     match command {
         Command::Server(args) => run_server(cli, args),
         Command::Api(subcommand) => run_api(&subcommand.command, cli),
+        Command::Install(subcommand) => run_install(&subcommand.command),
         Command::Opencode(args) => run_opencode(cli, args),
         Command::Daemon(subcommand) => run_daemon(&subcommand.command, cli),
         Command::InstallAgent(args) => install_agent_local(args),
         Command::Credentials(subcommand) => run_credentials(&subcommand.command),
+        Command::MockAgentProcess => run_mock_agent_process(),
+    }
+}
+
+fn run_install(command: &InstallCommand) -> Result<(), CliError> {
+    match command {
+        InstallCommand::Desktop(args) => install_desktop_local(args),
     }
 }
 
@@ -468,6 +511,17 @@ fn run_api(command: &ApiCommand, cli: &CliConfig) -> Result<(), CliError> {
     }
 }
 
+fn install_desktop_local(args: &InstallDesktopArgs) -> Result<(), CliError> {
+    install_desktop(DesktopInstallRequest {
+        yes: args.yes,
+        print_only: args.print_only,
+        package_manager: args.package_manager,
+        no_fonts: args.no_fonts,
+    })
+    .map(|_| ())
+    .map_err(CliError::Server)
+}
+
 fn run_agents(command: &AgentsCommand, cli: &CliConfig) -> Result<(), CliError> {
     match command {
         AgentsCommand::List(args) => {
@@ -475,6 +529,7 @@ fn run_agents(command: &AgentsCommand, cli: &CliConfig) -> Result<(), CliError>
             let result = call_acp_extension(&ctx, ACP_EXTENSION_AGENT_LIST_METHOD, json!({}))?;
             write_stdout_line(&serde_json::to_string_pretty(&result)?)
         }
+        AgentsCommand::Report(args) => run_agents_report(args, cli),
         AgentsCommand::Install(args) => {
             let ctx = ClientContext::new(cli, &args.client)?;
             let mut params = serde_json::Map::new();
@@ -498,6 +553,223 @@ fn run_agents(command: &AgentsCommand, cli: &CliConfig) -> Result<(), CliError>
     }
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct AgentListApiResponse {
+    agents: Vec<AgentListApiAgent>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct AgentListApiAgent {
+    id: String,
+    installed: bool,
+    #[serde(default)]
+    config_error: Option<String>,
+    #[serde(default)]
+    config_options: Option<Vec<Value>>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct RawConfigOption {
+    #[serde(default)]
+    id: Option<String>,
+    #[serde(default)]
+    category: Option<String>,
+    #[serde(default)]
+    current_value: Option<Value>,
+    #[serde(default)]
+    options: Vec<RawConfigOptionChoice>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct RawConfigOptionChoice {
+    #[serde(default)]
+    value: Value,
+    #[serde(default)]
+    name: Option<String>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct AgentConfigReport {
+    generated_at_ms: u128,
+    endpoint: String,
+    agents: Vec<AgentConfigReportEntry>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct AgentConfigReportEntry {
+    id: String,
+    installed: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    config_error: Option<String>,
+    models: AgentConfigCategoryReport,
+    modes: AgentConfigCategoryReport,
+    thought_levels: AgentConfigCategoryReport,
+}
+
+#[derive(Debug, Serialize, Default, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+struct AgentConfigCategoryReport {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    current_value: Option<String>,
+    values: Vec<AgentConfigValueReport>,
+}
+
+#[derive(Debug, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+struct AgentConfigValueReport {
+    value: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    name: Option<String>,
+}
+
+#[derive(Clone, Copy)]
+enum ConfigReportCategory {
+    Model,
+    Mode,
+    ThoughtLevel,
+}
+
+#[derive(Default)]
+struct CategoryAccumulator {
+    current_value: Option<String>,
+    values: BTreeMap<String, Option<String>>,
+}
+
+impl CategoryAccumulator {
+    fn absorb(&mut self, option: &RawConfigOption) {
+        if self.current_value.is_none() {
+            self.current_value = config_value_to_string(option.current_value.as_ref());
+        }
+
+        for candidate in &option.options {
+            let Some(value) = config_value_to_string(Some(&candidate.value)) else {
+                continue;
+            };
+            let name = candidate
+                .name
+                .as_ref()
+                .map(|value| value.trim().to_string())
+                .filter(|value| !value.is_empty());
+            let entry = self.values.entry(value).or_insert(None);
+            if entry.is_none() && name.is_some() {
+                *entry = name;
+            }
+        }
+    }
+
+    fn into_report(mut self) -> AgentConfigCategoryReport {
+        if let Some(current) = self.current_value.clone() {
+            self.values.entry(current).or_insert(None);
+        }
+        AgentConfigCategoryReport {
+            current_value: self.current_value,
+            values: self
+                .values
+                .into_iter()
+                .map(|(value, name)| AgentConfigValueReport { value, name })
+                .collect(),
+        }
+    }
+}
+
+fn run_agents_report(args: &ClientArgs, cli: &CliConfig) -> Result<(), CliError> {
+    let ctx = ClientContext::new(cli, args)?;
+    let response = ctx.get(&format!("{API_PREFIX}/agents?config=true"))?;
+    let status = response.status();
+    let text = response.text()?;
+
+    if !status.is_success() {
+        print_error_body(&text)?;
+        return Err(CliError::HttpStatus(status));
+    }
+
+    let parsed: AgentListApiResponse = serde_json::from_str(&text)?;
+    let report = build_agent_config_report(parsed, &ctx.endpoint);
+    write_stdout_line(&serde_json::to_string_pretty(&report)?)
+}
+
+fn build_agent_config_report(input: AgentListApiResponse, endpoint: &str) -> AgentConfigReport {
+    let generated_at_ms = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|duration| duration.as_millis())
+        .unwrap_or(0);
+
+    let agents = input
+        .agents
+        .into_iter()
+        .map(|agent| {
+            let mut model = CategoryAccumulator::default();
+            let mut mode = CategoryAccumulator::default();
+            let mut thought_level = CategoryAccumulator::default();
+
+            for option_value in agent.config_options.unwrap_or_default() {
+                let Ok(option) = serde_json::from_value::<RawConfigOption>(option_value) else {
+                    continue;
+                };
+                let Some(category) = option
+                    .category
+                    .as_deref()
+                    .or(option.id.as_deref())
+                    .and_then(classify_report_category)
+                else {
+                    continue;
+                };
+
+                match category {
+                    ConfigReportCategory::Model => model.absorb(&option),
+                    ConfigReportCategory::Mode => mode.absorb(&option),
+                    ConfigReportCategory::ThoughtLevel => thought_level.absorb(&option),
+                }
+            }
+
+            AgentConfigReportEntry {
+                id: agent.id,
+                installed: agent.installed,
+                config_error: agent.config_error,
+                models: model.into_report(),
+                modes: mode.into_report(),
+                thought_levels: thought_level.into_report(),
+            }
+        })
+        .collect();
+
+    AgentConfigReport {
+        generated_at_ms,
+        endpoint: endpoint.to_string(),
+        agents,
+    }
+}
+
+fn classify_report_category(raw: &str) -> Option<ConfigReportCategory> {
+    let normalized = raw
+        .trim()
+        .to_ascii_lowercase()
+        .replace('-', "_")
+        .replace(' ', "_");
+
+    match normalized.as_str() {
+        "model" | "model_id" => Some(ConfigReportCategory::Model),
+        "mode" | "agent_mode" => Some(ConfigReportCategory::Mode),
+        "thought" | "thoughtlevel" | "thought_level" | "thinking" | "thinking_level"
+        | "reasoning" | "reasoning_effort" => Some(ConfigReportCategory::ThoughtLevel),
+        _ => None,
+    }
+}
+
+fn config_value_to_string(value: Option<&Value>) -> Option<String> {
+    match value {
+        Some(Value::String(value)) => Some(value.clone()),
+        Some(Value::Null) | None => None,
+        Some(other) => Some(other.to_string()),
+    }
+}
+
 fn call_acp_extension(ctx: &ClientContext, method: &str, params: Value) -> Result<Value, CliError> {
     let server_id = unique_cli_server_id("cli-ext");
     let initialize_path = build_acp_server_path(&server_id, Some("mock"))?;
@@ -706,6 +978,71 @@ fn run_credentials(command: &CredentialsCommand) -> Result<(), CliError> {
     }
 }
 
+fn run_mock_agent_process() -> Result<(), CliError> {
+    use std::io::BufRead;
+
+    let stdin = std::io::stdin();
+    let reader = stdin.lock();
+
+    for line in reader.lines() {
+        let line = line.map_err(|e| CliError::Server(format!("stdin read error: {}", e)))?;
+        if line.trim().is_empty() {
+            continue;
+        }
+
+        let msg: Value = match serde_json::from_str(&line) {
+            Ok(v) => v,
+            Err(e) => {
+                let err_notification = json!({
+                    "jsonrpc": "2.0",
+                    "method": "mock/parse_error",
+                    "params": {
+                        "error": e.to_string(),
+                        "raw": line,
+                    }
+                });
+                write_stdout_line(&serde_json::to_string(&err_notification)?)?;
+                continue;
+            }
+        };
+
+        // Echo notification for every message
+        let echo = json!({
+            "jsonrpc": "2.0",
+            "method": "mock/echo",
+            "params": { "message": msg }
+        });
+        write_stdout_line(&serde_json::to_string(&echo)?)?;
+
+        let has_method = msg.get("method").and_then(|v| v.as_str()).is_some();
+        let has_id = msg.get("id").is_some();
+
+        if has_method && has_id {
+            // Request -> respond with echo result
+            let response = json!({
+                "jsonrpc": "2.0",
+                "id": msg["id"],
+                "result": { "echoed": msg }
+            });
+            write_stdout_line(&serde_json::to_string(&response)?)?;
+        } else if !has_method && has_id {
+            // Client response
+            let notification = json!({
+                "jsonrpc": "2.0",
+                "method": "mock/client_response",
+                "params": {
+                    "id": msg["id"],
+                    "result": msg.get("result").unwrap_or(&Value::Null),
+                    "error": msg.get("error").unwrap_or(&Value::Null),
+                }
+            });
+            write_stdout_line(&serde_json::to_string(&notification)?)?;
+        }
+    }
+
+    Ok(())
+}
+
 fn load_json_payload(
     json_inline: Option<&str>,
     json_file: Option<&std::path::Path>,
@@ -726,24 +1063,73 @@ fn load_json_payload(
 }
 
 fn install_agent_local(args: &InstallAgentArgs) -> Result<(), CliError> {
-    let agent_id = AgentId::parse(&args.agent)
-        .ok_or_else(|| CliError::Server(format!("unsupported agent: {}", args.agent)))?;
+    if args.all && (args.agent_version.is_some() || args.agent_process_version.is_some()) {
+        return Err(CliError::Server(
+            "--agent-version and --agent-process-version are only supported for single-agent installs"
+                .to_string(),
+        ));
+    }
+
+    let agents = resolve_install_agents(args)?;
 
     let manager = AgentManager::new(default_install_dir())
         .map_err(|err| CliError::Server(err.to_string()))?;
 
-    let result = manager
-        .install(
-            agent_id,
-            InstallOptions {
-                reinstall: args.reinstall,
-                version: args.agent_version.clone(),
-                agent_process_version: args.agent_process_version.clone(),
-            },
-        )
-        .map_err(|err| CliError::Server(err.to_string()))?;
+    if agents.len() == 1 {
+        let result = manager
+            .install(
+                agents[0],
+                InstallOptions {
+                    reinstall: args.reinstall,
+                    version: args.agent_version.clone(),
+                    agent_process_version: args.agent_process_version.clone(),
+                },
+            )
+            .map_err(|err| CliError::Server(err.to_string()))?;
+        let output = install_result_json(result);
+        return write_stdout_line(&serde_json::to_string_pretty(&output)?);
+    }
 
-    let output = json!({
+    let mut results = Vec::with_capacity(agents.len());
+    for agent_id in agents {
+        let result = manager
+            .install(
+                agent_id,
+                InstallOptions {
+                    reinstall: args.reinstall,
+                    version: None,
+                    agent_process_version: None,
+                },
+            )
+            .map_err(|err| CliError::Server(err.to_string()))?;
+        results.push(json!({
+            "agent": agent_id.as_str(),
+            "result": install_result_json(result),
+        }));
+    }
+
+    write_stdout_line(&serde_json::to_string_pretty(
+        &json!({ "agents": results }),
+    )?)
+}
+
+fn resolve_install_agents(args: &InstallAgentArgs) -> Result<Vec<AgentId>, CliError> {
+    if args.all {
+        return Ok(AgentId::all().to_vec());
+    }
+
+    let agent = args
+        .agent
+        .as_deref()
+        .ok_or_else(|| CliError::Server("missing agent: provide <AGENT> or --all".to_string()))?;
+
+    AgentId::parse(agent)
+        .map(|agent_id| vec![agent_id])
+        .ok_or_else(|| CliError::Server(format!("unsupported agent: {agent}")))
+}
+
+fn install_result_json(result: sandbox_agent_agent_management::agents::InstallResult) -> Value {
+    json!({
         "alreadyInstalled": result.already_installed,
         "artifacts": result.artifacts.into_iter().map(|artifact| json!({
             "kind": format!("{:?}", artifact.kind),
@@ -751,9 +1137,7 @@ fn install_agent_local(args: &InstallAgentArgs) -> Result<(), CliError> {
             "source": format!("{:?}", artifact.source),
             "version": artifact.version,
         })).collect::<Vec<_>>()
-    });
-
-    write_stdout_line(&serde_json::to_string_pretty(&output)?)
+    })
 }
 
 #[derive(Serialize)]
@@ -1196,6 +1580,60 @@ fn write_stderr_line(text: &str) -> Result<(), CliError> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn resolve_install_agents_expands_all() {
+        assert_eq!(
+            resolve_install_agents(&InstallAgentArgs {
+                agent: None,
+                all: true,
+                reinstall: false,
+                agent_version: None,
+                agent_process_version: None,
+            })
+            .unwrap(),
+            AgentId::all().to_vec()
+        );
+    }
+
+    #[test]
+    fn resolve_install_agents_supports_single_agent() {
+        assert_eq!(
+            resolve_install_agents(&InstallAgentArgs {
+                agent: Some("codex".to_string()),
+                all: false,
+                reinstall: false,
+                agent_version: None,
+                agent_process_version: None,
+            })
+            .unwrap(),
+            vec![AgentId::Codex]
+        );
+    }
+
+    #[test]
+    fn resolve_install_agents_rejects_unknown_agent() {
+        assert!(resolve_install_agents(&InstallAgentArgs {
+            agent: Some("nope".to_string()),
+            all: false,
+            reinstall: false,
+            agent_version: None,
+            agent_process_version: None,
+        })
+        .is_err());
+    }
+
+    #[test]
+    fn resolve_install_agents_rejects_positional_all() {
+        assert!(resolve_install_agents(&InstallAgentArgs {
+            agent: Some("all".to_string()),
+            all: false,
+            reinstall: false,
+            agent_version: None,
+            agent_process_version: None,
+        })
+        .is_err());
+    }
+
     #[test]
     fn apply_last_event_id_header_sets_header_when_provided() {
         let client = HttpClient::builder().build().expect("build client");
@@ -1219,4 +1657,96 @@ mod tests {
             .expect("build request");
         assert!(request.headers().get("last-event-id").is_none());
     }
+
+    #[test]
+    fn classify_report_category_supports_common_aliases() {
+        assert!(matches!(
+            classify_report_category("model"),
+            Some(ConfigReportCategory::Model)
+        ));
+        assert!(matches!(
+            classify_report_category("mode"),
+            Some(ConfigReportCategory::Mode)
+        ));
+        assert!(matches!(
+            classify_report_category("thought_level"),
+            Some(ConfigReportCategory::ThoughtLevel)
+        ));
+        assert!(matches!(
+            classify_report_category("reasoning_effort"),
+            Some(ConfigReportCategory::ThoughtLevel)
+        ));
+        assert!(classify_report_category("arbitrary").is_none());
+    }
+
+    #[test]
+    fn build_agent_config_report_extracts_model_mode_and_thought() {
+        let response = AgentListApiResponse {
+            agents: vec![AgentListApiAgent {
+                id: "codex".to_string(),
+                installed: true,
+                config_error: None,
+                config_options: Some(vec![
+                    json!({
+                        "id": "model",
+                        "category": "model",
+                        "currentValue": "gpt-5",
+                        "options": [
+                            {"value": "gpt-5", "name": "GPT-5"},
+                            {"value": "gpt-5-mini", "name": "GPT-5 mini"}
+                        ]
+                    }),
+                    json!({
+                        "id": "mode",
+                        "category": "mode",
+                        "currentValue": "default",
+                        "options": [
+                            {"value": "default", "name": "Default"},
+                            {"value": "plan", "name": "Plan"}
+                        ]
+                    }),
+                    json!({
+                        "id": "thought",
+                        "category": "thought_level",
+                        "currentValue": "medium",
+                        "options": [
+                            {"value": "low", "name": "Low"},
+                            {"value": "medium", "name": "Medium"},
+                            {"value": "high", "name": "High"}
+                        ]
+                    }),
+                ]),
+            }],
+        };
+
+        let report = build_agent_config_report(response, "http://127.0.0.1:2468");
+        let agent = report.agents.first().expect("agent report");
+
+        assert_eq!(agent.id, "codex");
+        assert_eq!(agent.models.current_value.as_deref(), Some("gpt-5"));
+        assert_eq!(agent.modes.current_value.as_deref(), Some("default"));
+        assert_eq!(
+            agent.thought_levels.current_value.as_deref(),
+            Some("medium")
+        );
+
+        let model_values: Vec<&str> = agent
+            .models
+            .values
+            .iter()
+            .map(|item| item.value.as_str())
+            .collect();
+        assert!(model_values.contains(&"gpt-5"));
+        assert!(model_values.contains(&"gpt-5-mini"));
+
+        let thought_values: Vec<&str> = agent
+            .thought_levels
+            .values
+            .iter()
+            .map(|item| item.value.as_str())
+            .collect();
+        assert!(thought_values.contains(&"low"));
+        assert!(thought_values.contains(&"medium"));
+        assert!(thought_values.contains(&"high"));
+    }
 }
diff --git a/server/packages/sandbox-agent/src/desktop_errors.rs b/server/packages/sandbox-agent/src/desktop_errors.rs
new file mode 100644
index 0000000..ce57e9e
--- /dev/null
+++ b/server/packages/sandbox-agent/src/desktop_errors.rs
@@ -0,0 +1,251 @@
+use sandbox_agent_error::ProblemDetails;
+use serde_json::{json, Map, Value};
+
+use crate::desktop_types::{DesktopErrorInfo, DesktopProcessInfo};
+
+#[derive(Debug, Clone)]
+pub struct DesktopProblem {
+    status: u16,
+    title: &'static str,
+    code: &'static str,
+    message: String,
+    missing_dependencies: Vec<String>,
+    install_command: Option<String>,
+    processes: Vec<DesktopProcessInfo>,
+}
+
+impl DesktopProblem {
+    pub fn unsupported_platform(message: impl Into<String>) -> Self {
+        Self::new(
+            501,
+            "Desktop Unsupported",
+            "desktop_unsupported_platform",
+            message,
+        )
+    }
+
+    pub fn dependencies_missing(
+        missing_dependencies: Vec<String>,
+        install_command: Option<String>,
+        processes: Vec<DesktopProcessInfo>,
+    ) -> Self {
+        let mut message = if missing_dependencies.is_empty() {
+            "Desktop dependencies are not installed".to_string()
+        } else {
+            format!(
+                "Desktop dependencies are not installed: {}",
+                missing_dependencies.join(", ")
+            )
+        };
+        if let Some(command) = install_command.as_ref() {
+            message.push_str(&format!(
+                ". Run `{command}` to install them, or install the required tools manually."
+            ));
+        }
+        Self::new(
+            503,
+            "Desktop Dependencies Missing",
+            "desktop_dependencies_missing",
+            message,
+        )
+        .with_missing_dependencies(missing_dependencies)
+        .with_install_command(install_command)
+        .with_processes(processes)
+    }
+
+    pub fn runtime_inactive(message: impl Into<String>) -> Self {
+        Self::new(
+            409,
+            "Desktop Runtime Inactive",
+            "desktop_runtime_inactive",
+            message,
+        )
+    }
+
+    pub fn runtime_starting(message: impl Into<String>) -> Self {
+        Self::new(
+            409,
+            "Desktop Runtime Starting",
+            "desktop_runtime_starting",
+            message,
+        )
+    }
+
+    pub fn runtime_failed(
+        message: impl Into<String>,
+        install_command: Option<String>,
+        processes: Vec<DesktopProcessInfo>,
+    ) -> Self {
+        Self::new(
+            503,
+            "Desktop Runtime Failed",
+            "desktop_runtime_failed",
+            message,
+        )
+        .with_install_command(install_command)
+        .with_processes(processes)
+    }
+
+    pub fn invalid_action(message: impl Into<String>) -> Self {
+        Self::new(
+            400,
+            "Desktop Invalid Action",
+            "desktop_invalid_action",
+            message,
+        )
+    }
+
+    pub fn screenshot_failed(
+        message: impl Into<String>,
+        processes: Vec<DesktopProcessInfo>,
+    ) -> Self {
+        Self::new(
+            502,
+            "Desktop Screenshot Failed",
+            "desktop_screenshot_failed",
+            message,
+        )
+        .with_processes(processes)
+    }
+
+    pub fn input_failed(message: impl Into<String>, processes: Vec<DesktopProcessInfo>) -> Self {
+        Self::new(502, "Desktop Input Failed", "desktop_input_failed", message)
+            .with_processes(processes)
+    }
+
+    pub fn window_not_found(message: impl Into<String>) -> Self {
+        Self::new(404, "Window Not Found", "window_not_found", message)
+    }
+
+    pub fn no_focused_window() -> Self {
+        Self::new(
+            404,
+            "No Focused Window",
+            "no_focused_window",
+            "No window currently has focus",
+        )
+    }
+
+    pub fn stream_already_active(message: impl Into<String>) -> Self {
+        Self::new(
+            409,
+            "Stream Already Active",
+            "stream_already_active",
+            message,
+        )
+    }
+
+    pub fn stream_not_active(message: impl Into<String>) -> Self {
+        Self::new(409, "Stream Not Active", "stream_not_active", message)
+    }
+
+    pub fn clipboard_failed(message: impl Into<String>) -> Self {
+        Self::new(500, "Clipboard Failed", "clipboard_failed", message)
+    }
+
+    pub fn app_not_found(message: impl Into<String>) -> Self {
+        Self::new(404, "App Not Found", "app_not_found", message)
+    }
+
+    pub fn to_problem_details(&self) -> ProblemDetails {
+        let mut extensions = Map::new();
+        extensions.insert("code".to_string(), Value::String(self.code.to_string()));
+        if !self.missing_dependencies.is_empty() {
+            extensions.insert(
+                "missingDependencies".to_string(),
+                Value::Array(
+                    self.missing_dependencies
+                        .iter()
+                        .cloned()
+                        .map(Value::String)
+                        .collect(),
+                ),
+            );
+        }
+        if let Some(install_command) = self.install_command.as_ref() {
+            extensions.insert(
+                "installCommand".to_string(),
+                Value::String(install_command.clone()),
+            );
+        }
+        if !self.processes.is_empty() {
+            extensions.insert("processes".to_string(), json!(self.processes));
+        }
+
+        ProblemDetails {
+            type_: format!("urn:sandbox-agent:error:{}", self.code),
+            title: self.title.to_string(),
+            status: self.status,
+            detail: Some(self.message.clone()),
+            instance: None,
+            extensions,
+        }
+    }
+
+    pub fn to_error_info(&self) -> DesktopErrorInfo {
+        DesktopErrorInfo {
+            code: self.code.to_string(),
+            message: self.message.clone(),
+        }
+    }
+
+    pub fn code(&self) -> &'static str {
+        self.code
+    }
+
+    fn new(
+        status: u16,
+        title: &'static str,
+        code: &'static str,
+        message: impl Into<String>,
+    ) -> Self {
+        Self {
+            status,
+            title,
+            code,
+            message: message.into(),
+            missing_dependencies: Vec::new(),
+            install_command: None,
+            processes: Vec::new(),
+        }
+    }
+
+    fn with_missing_dependencies(mut self, missing_dependencies: Vec<String>) -> Self {
+        self.missing_dependencies = missing_dependencies;
+        self
+    }
+
+    fn with_install_command(mut self, install_command: Option<String>) -> Self {
+        self.install_command = install_command;
+        self
+    }
+
+    fn with_processes(mut self, processes: Vec<DesktopProcessInfo>) -> Self {
+        self.processes = processes;
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn dependencies_missing_detail_includes_install_command() {
+        let problem = DesktopProblem::dependencies_missing(
+            vec!["Xvfb".to_string(), "openbox".to_string()],
+            Some("sandbox-agent install desktop --yes".to_string()),
+            Vec::new(),
+        );
+        let details = problem.to_problem_details();
+        let detail = details.detail.expect("detail");
+        assert!(detail.contains("Desktop dependencies are not installed: Xvfb, openbox"));
+        assert!(detail.contains("sandbox-agent install desktop --yes"));
+        assert_eq!(
+            details.extensions.get("installCommand"),
+            Some(&Value::String(
+                "sandbox-agent install desktop --yes".to_string()
+            ))
+        );
+    }
+}
diff --git a/server/packages/sandbox-agent/src/desktop_install.rs b/server/packages/sandbox-agent/src/desktop_install.rs
new file mode 100644
index 0000000..480da7d
--- /dev/null
+++ b/server/packages/sandbox-agent/src/desktop_install.rs
@@ -0,0 +1,324 @@
+use std::fmt;
+use std::io::{self, Write};
+use std::path::PathBuf;
+use std::process::Command as ProcessCommand;
+
+use clap::ValueEnum;
+
+const AUTOMATIC_INSTALL_SUPPORTED_DISTROS: &str =
+    "Automatic desktop dependency installation is supported on Debian/Ubuntu (apt), Fedora/RHEL (dnf), and Alpine (apk).";
+const AUTOMATIC_INSTALL_UNSUPPORTED_ENVS: &str =
+    "Automatic installation is not supported on macOS, Windows, or Linux distributions without apt, dnf, or apk.";
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
+pub enum DesktopPackageManager {
+    Apt,
+    Dnf,
+    Apk,
+}
+
+#[derive(Debug, Clone)]
+pub struct DesktopInstallRequest {
+    pub yes: bool,
+    pub print_only: bool,
+    pub package_manager: Option<DesktopPackageManager>,
+    pub no_fonts: bool,
+}
+
+pub(crate) fn desktop_platform_support_message() -> String {
+    format!("Desktop APIs are only supported on Linux. {AUTOMATIC_INSTALL_SUPPORTED_DISTROS}")
+}
+
+fn linux_install_support_message() -> String {
+    format!("{AUTOMATIC_INSTALL_SUPPORTED_DISTROS} {AUTOMATIC_INSTALL_UNSUPPORTED_ENVS}")
+}
+
+pub fn install_desktop(request: DesktopInstallRequest) -> Result<(), String> {
+    if std::env::consts::OS != "linux" {
+        return Err(format!(
+            "desktop installation is only supported on Linux. {}",
+            linux_install_support_message()
+        ));
+    }
+
+    let package_manager = match request.package_manager {
+        Some(value) => value,
+        None => detect_package_manager().ok_or_else(|| {
+            format!(
+                "could not detect a supported package manager. {} Install the desktop dependencies manually on this distribution.",
+                linux_install_support_message()
+            )
+        })?,
+    };
+
+    let packages = desktop_packages(package_manager, request.no_fonts);
+    let used_sudo = !running_as_root() && find_binary("sudo").is_some();
+    if !running_as_root() && !used_sudo {
+        return Err(
+            "desktop installation requires root or sudo access; rerun as root or install dependencies manually"
+                .to_string(),
+        );
+    }
+
+    println!("Desktop package manager: {}", package_manager);
+    println!("Desktop packages:");
+    for package in &packages {
+        println!("  - {package}");
+    }
+    println!("Install command:");
+    println!(
+        "  {}",
+        render_install_command(package_manager, used_sudo, &packages)
+    );
+
+    if request.print_only {
+        return Ok(());
+    }
+
+    if !request.yes && !prompt_yes_no("Proceed with desktop dependency installation? [y/N] ")? {
+        return Err("installation cancelled".to_string());
+    }
+
+    run_install_commands(package_manager, used_sudo, &packages)?;
+
+    println!("Desktop dependencies installed.");
+    Ok(())
+}
+
+fn detect_package_manager() -> Option<DesktopPackageManager> {
+    if find_binary("apt-get").is_some() {
+        return Some(DesktopPackageManager::Apt);
+    }
+    if find_binary("dnf").is_some() {
+        return Some(DesktopPackageManager::Dnf);
+    }
+    if find_binary("apk").is_some() {
+        return Some(DesktopPackageManager::Apk);
+    }
+    None
+}
+
+fn desktop_packages(package_manager: DesktopPackageManager, no_fonts: bool) -> Vec<String> {
+    let mut packages = match package_manager {
+        DesktopPackageManager::Apt => vec![
+            "xvfb",
+            "openbox",
+            "xdotool",
+            "imagemagick",
+            "ffmpeg",
+            "x11-xserver-utils",
+            "dbus-x11",
+            "xauth",
+            "fonts-dejavu-core",
+        ],
+        DesktopPackageManager::Dnf => vec![
+            "xorg-x11-server-Xvfb",
+            "openbox",
+            "xdotool",
+            "ImageMagick",
+            "ffmpeg",
+            "xrandr",
+            "dbus-x11",
+            "xauth",
+            "dejavu-sans-fonts",
+        ],
+        DesktopPackageManager::Apk => vec![
+            "xvfb",
+            "openbox",
+            "xdotool",
+            "imagemagick",
+            "ffmpeg",
+            "xrandr",
+            "dbus",
+            "xauth",
+            "ttf-dejavu",
+        ],
+    }
+    .into_iter()
+    .map(str::to_string)
+    .collect::<Vec<_>>();
+
+    if no_fonts {
+        packages.retain(|package| {
+            package != "fonts-dejavu-core"
+                && package != "dejavu-sans-fonts"
+                && package != "ttf-dejavu"
+        });
+    }
+
+    packages
+}
+
+fn render_install_command(
+    package_manager: DesktopPackageManager,
+    used_sudo: bool,
+    packages: &[String],
+) -> String {
+    let sudo = if used_sudo { "sudo " } else { "" };
+    match package_manager {
+        DesktopPackageManager::Apt => format!(
+            "{sudo}apt-get update && {sudo}env DEBIAN_FRONTEND=noninteractive apt-get install -y {}",
+            packages.join(" ")
+        ),
+        DesktopPackageManager::Dnf => {
+            format!("{sudo}dnf install -y {}", packages.join(" "))
+        }
+        DesktopPackageManager::Apk => {
+            format!("{sudo}apk add --no-cache {}", packages.join(" "))
+        }
+    }
+}
+
+fn run_install_commands(
+    package_manager: DesktopPackageManager,
+    used_sudo: bool,
+    packages: &[String],
+) -> Result<(), String> {
+    match package_manager {
+        DesktopPackageManager::Apt => {
+            run_command(command_with_privilege(
+                used_sudo,
+                "apt-get",
+                vec!["update".to_string()],
+            ))?;
+            let mut args = vec![
+                "DEBIAN_FRONTEND=noninteractive".to_string(),
+                "apt-get".to_string(),
+                "install".to_string(),
+                "-y".to_string(),
+            ];
+            args.extend(packages.iter().cloned());
+            run_command(command_with_privilege(used_sudo, "env", args))?;
+        }
+        DesktopPackageManager::Dnf => {
+            let mut args = vec!["install".to_string(), "-y".to_string()];
+            args.extend(packages.iter().cloned());
+            run_command(command_with_privilege(used_sudo, "dnf", args))?;
+        }
+        DesktopPackageManager::Apk => {
+            let mut args = vec!["add".to_string(), "--no-cache".to_string()];
+            args.extend(packages.iter().cloned());
+            run_command(command_with_privilege(used_sudo, "apk", args))?;
+        }
+    }
+    Ok(())
+}
+
+fn command_with_privilege(
+    used_sudo: bool,
+    program: &str,
+    args: Vec<String>,
+) -> (String, Vec<String>) {
+    if used_sudo {
+        let mut sudo_args = vec![program.to_string()];
+        sudo_args.extend(args);
+        ("sudo".to_string(), sudo_args)
+    } else {
+        (program.to_string(), args)
+    }
+}
+
+fn run_command((program, args): (String, Vec<String>)) -> Result<(), String> {
+    let status = ProcessCommand::new(&program)
+        .args(&args)
+        .status()
+        .map_err(|err| format!("failed to run `{program}`: {err}"))?;
+    if !status.success() {
+        return Err(format!(
+            "command `{}` exited with status {}",
+            format_command(&program, &args),
+            status
+        ));
+    }
+    Ok(())
+}
+
+fn prompt_yes_no(prompt: &str) -> Result<bool, String> {
+    print!("{prompt}");
+    io::stdout()
+        .flush()
+        .map_err(|err| format!("failed to flush prompt: {err}"))?;
+    let mut input = String::new();
+    io::stdin()
+        .read_line(&mut input)
+        .map_err(|err| format!("failed to read confirmation: {err}"))?;
+    let normalized = input.trim().to_ascii_lowercase();
+    Ok(matches!(normalized.as_str(), "y" | "yes"))
+}
+
+fn running_as_root() -> bool {
+    #[cfg(unix)]
+    unsafe {
+        return libc::geteuid() == 0;
+    }
+    #[cfg(not(unix))]
+    {
+        false
+    }
+}
+
+fn find_binary(name: &str) -> Option<PathBuf> {
+    let path_env = std::env::var_os("PATH")?;
+    for path in std::env::split_paths(&path_env) {
+        let candidate = path.join(name);
+        if candidate.is_file() {
+            return Some(candidate);
+        }
+    }
+    None
+}
+
+fn format_command(program: &str, args: &[String]) -> String {
+    let mut parts = vec![program.to_string()];
+    parts.extend(args.iter().cloned());
+    parts.join(" ")
+}
+
+impl fmt::Display for DesktopPackageManager {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            DesktopPackageManager::Apt => write!(f, "apt"),
+            DesktopPackageManager::Dnf => write!(f, "dnf"),
+            DesktopPackageManager::Apk => write!(f, "apk"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn desktop_platform_support_message_mentions_linux_and_supported_distros() {
+        let message = desktop_platform_support_message();
+        assert!(message.contains("only supported on Linux"));
+        assert!(message.contains("Debian/Ubuntu (apt)"));
+        assert!(message.contains("Fedora/RHEL (dnf)"));
+        assert!(message.contains("Alpine (apk)"));
+    }
+
+    #[test]
+    fn linux_install_support_message_mentions_unsupported_environments() {
+        let message = linux_install_support_message();
+        assert!(message.contains("Debian/Ubuntu (apt)"));
+        assert!(message.contains("Fedora/RHEL (dnf)"));
+        assert!(message.contains("Alpine (apk)"));
+        assert!(message.contains("macOS"));
+        assert!(message.contains("Windows"));
+        assert!(message.contains("without apt, dnf, or apk"));
+    }
+
+    #[test]
+    fn desktop_packages_support_no_fonts() {
+        let packages = desktop_packages(DesktopPackageManager::Apt, true);
+        assert!(!packages.iter().any(|value| value == "fonts-dejavu-core"));
+        assert!(packages.iter().any(|value| value == "xvfb"));
+    }
+
+    #[test]
+    fn render_install_command_matches_package_manager() {
+        let packages = vec!["xvfb".to_string(), "openbox".to_string()];
+        let command = render_install_command(DesktopPackageManager::Apk, false, &packages);
+        assert_eq!(command, "apk add --no-cache xvfb openbox");
+    }
+}
diff --git a/server/packages/sandbox-agent/src/desktop_recording.rs b/server/packages/sandbox-agent/src/desktop_recording.rs
new file mode 100644
index 0000000..39b174a
--- /dev/null
+++ b/server/packages/sandbox-agent/src/desktop_recording.rs
@@ -0,0 +1,329 @@
+use std::collections::BTreeMap;
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use tokio::sync::Mutex;
+
+use sandbox_agent_error::SandboxError;
+
+use crate::desktop_types::{
+    DesktopRecordingInfo, DesktopRecordingListResponse, DesktopRecordingStartRequest,
+    DesktopRecordingStatus, DesktopResolution,
+};
+use crate::process_runtime::{
+    ProcessOwner, ProcessRuntime, ProcessStartSpec, ProcessStatus, RestartPolicy,
+};
+
+#[derive(Debug, Clone)]
+pub struct DesktopRecordingContext {
+    pub display: String,
+    pub environment: std::collections::HashMap<String, String>,
+    pub resolution: DesktopResolution,
+}
+
+#[derive(Debug, Clone)]
+pub struct DesktopRecordingManager {
+    process_runtime: Arc<ProcessRuntime>,
+    recordings_dir: PathBuf,
+    inner: Arc<Mutex<DesktopRecordingState>>,
+}
+
+#[derive(Debug, Default)]
+struct DesktopRecordingState {
+    next_id: u64,
+    current_id: Option<String>,
+    recordings: BTreeMap<String, RecordingEntry>,
+}
+
+#[derive(Debug, Clone)]
+struct RecordingEntry {
+    info: DesktopRecordingInfo,
+    path: PathBuf,
+}
+
+impl DesktopRecordingManager {
+    pub fn new(process_runtime: Arc<ProcessRuntime>, state_dir: PathBuf) -> Self {
+        Self {
+            process_runtime,
+            recordings_dir: state_dir.join("recordings"),
+            inner: Arc::new(Mutex::new(DesktopRecordingState::default())),
+        }
+    }
+
+    pub async fn start(
+        &self,
+        context: DesktopRecordingContext,
+        request: DesktopRecordingStartRequest,
+    ) -> Result<DesktopRecordingInfo, SandboxError> {
+        if find_binary("ffmpeg").is_none() {
+            return Err(SandboxError::Conflict {
+                message: "ffmpeg is required for desktop recording".to_string(),
+            });
+        }
+
+        self.ensure_recordings_dir()?;
+
+        {
+            let mut state = self.inner.lock().await;
+            self.refresh_locked(&mut state).await?;
+            if state.current_id.is_some() {
+                return Err(SandboxError::Conflict {
+                    message: "a desktop recording is already active".to_string(),
+                });
+            }
+        }
+
+        let mut state = self.inner.lock().await;
+        let id_num = state.next_id + 1;
+        state.next_id = id_num;
+        let id = format!("rec_{id_num}");
+        let file_name = format!("{id}.mp4");
+        let path = self.recordings_dir.join(&file_name);
+        let fps = request.fps.unwrap_or(30).clamp(1, 60);
+        let args = vec![
+            "-y".to_string(),
+            "-video_size".to_string(),
+            format!("{}x{}", context.resolution.width, context.resolution.height),
+            "-framerate".to_string(),
+            fps.to_string(),
+            "-f".to_string(),
+            "x11grab".to_string(),
+            "-i".to_string(),
+            context.display,
+            "-c:v".to_string(),
+            "libx264".to_string(),
+            "-preset".to_string(),
+            "ultrafast".to_string(),
+            "-pix_fmt".to_string(),
+            "yuv420p".to_string(),
+            path.to_string_lossy().to_string(),
+        ];
+        let snapshot = self
+            .process_runtime
+            .start_process(ProcessStartSpec {
+                command: "ffmpeg".to_string(),
+                args,
+                cwd: None,
+                env: context.environment,
+                tty: false,
+                interactive: false,
+                owner: ProcessOwner::Desktop,
+                restart_policy: Some(RestartPolicy::Never),
+            })
+            .await?;
+
+        let info = DesktopRecordingInfo {
+            id: id.clone(),
+            status: DesktopRecordingStatus::Recording,
+            process_id: Some(snapshot.id),
+            file_name,
+            bytes: 0,
+            started_at: chrono::Utc::now().to_rfc3339(),
+            ended_at: None,
+        };
+        state.current_id = Some(id.clone());
+        state.recordings.insert(
+            id,
+            RecordingEntry {
+                info: info.clone(),
+                path,
+            },
+        );
+        Ok(info)
+    }
+
+    pub async fn stop(&self) -> Result<DesktopRecordingInfo, SandboxError> {
+        let (recording_id, process_id) = {
+            let mut state = self.inner.lock().await;
+            self.refresh_locked(&mut state).await?;
+            let recording_id = state
+                .current_id
+                .clone()
+                .ok_or_else(|| SandboxError::Conflict {
+                    message: "no desktop recording is active".to_string(),
+                })?;
+            let process_id = state
+                .recordings
+                .get(&recording_id)
+                .and_then(|entry| entry.info.process_id.clone());
+            (recording_id, process_id)
+        };
+
+        if let Some(process_id) = process_id {
+            let snapshot = self
+                .process_runtime
+                .stop_process(&process_id, Some(5_000))
+                .await?;
+            if snapshot.status == ProcessStatus::Running {
+                let _ = self
+                    .process_runtime
+                    .kill_process(&process_id, Some(1_000))
+                    .await;
+            }
+        }
+
+        let mut state = self.inner.lock().await;
+        self.refresh_locked(&mut state).await?;
+        let entry = state
+            .recordings
+            .get(&recording_id)
+            .ok_or_else(|| SandboxError::NotFound {
+                resource: "desktop_recording".to_string(),
+                id: recording_id.clone(),
+            })?;
+        Ok(entry.info.clone())
+    }
+
+    pub async fn list(&self) -> Result<DesktopRecordingListResponse, SandboxError> {
+        let mut state = self.inner.lock().await;
+        self.refresh_locked(&mut state).await?;
+        Ok(DesktopRecordingListResponse {
+            recordings: state
+                .recordings
+                .values()
+                .map(|entry| entry.info.clone())
+                .collect(),
+        })
+    }
+
+    pub async fn get(&self, id: &str) -> Result<DesktopRecordingInfo, SandboxError> {
+        let mut state = self.inner.lock().await;
+        self.refresh_locked(&mut state).await?;
+        state
+            .recordings
+            .get(id)
+            .map(|entry| entry.info.clone())
+            .ok_or_else(|| SandboxError::NotFound {
+                resource: "desktop_recording".to_string(),
+                id: id.to_string(),
+            })
+    }
+
+    pub async fn download_path(&self, id: &str) -> Result<PathBuf, SandboxError> {
+        let mut state = self.inner.lock().await;
+        self.refresh_locked(&mut state).await?;
+        let entry = state
+            .recordings
+            .get(id)
+            .ok_or_else(|| SandboxError::NotFound {
+                resource: "desktop_recording".to_string(),
+                id: id.to_string(),
+            })?;
+        if !entry.path.is_file() {
+            return Err(SandboxError::NotFound {
+                resource: "desktop_recording_file".to_string(),
+                id: id.to_string(),
+            });
+        }
+        Ok(entry.path.clone())
+    }
+
+    pub async fn delete(&self, id: &str) -> Result<(), SandboxError> {
+        let mut state = self.inner.lock().await;
+        self.refresh_locked(&mut state).await?;
+        if state.current_id.as_deref() == Some(id) {
+            return Err(SandboxError::Conflict {
+                message: "stop the active desktop recording before deleting it".to_string(),
+            });
+        }
+        let entry = state
+            .recordings
+            .remove(id)
+            .ok_or_else(|| SandboxError::NotFound {
+                resource: "desktop_recording".to_string(),
+                id: id.to_string(),
+            })?;
+        if entry.path.exists() {
+            fs::remove_file(&entry.path).map_err(|err| SandboxError::StreamError {
+                message: format!(
+                    "failed to delete desktop recording {}: {err}",
+                    entry.path.display()
+                ),
+            })?;
+        }
+        Ok(())
+    }
+
+    fn ensure_recordings_dir(&self) -> Result<(), SandboxError> {
+        fs::create_dir_all(&self.recordings_dir).map_err(|err| SandboxError::StreamError {
+            message: format!(
+                "failed to create desktop recordings dir {}: {err}",
+                self.recordings_dir.display()
+            ),
+        })
+    }
+
+    async fn refresh_locked(&self, state: &mut DesktopRecordingState) -> Result<(), SandboxError> {
+        let ids: Vec<String> = state.recordings.keys().cloned().collect();
+        for id in ids {
+            let should_clear_current = {
+                let Some(entry) = state.recordings.get_mut(&id) else {
+                    continue;
+                };
+                let Some(process_id) = entry.info.process_id.clone() else {
+                    Self::refresh_bytes(entry);
+                    continue;
+                };
+
+                let snapshot = match self.process_runtime.snapshot(&process_id).await {
+                    Ok(snapshot) => snapshot,
+                    Err(SandboxError::NotFound { .. }) => {
+                        Self::finalize_entry(entry, false);
+                        continue;
+                    }
+                    Err(err) => return Err(err),
+                };
+
+                if snapshot.status == ProcessStatus::Running {
+                    Self::refresh_bytes(entry);
+                    false
+                } else {
+                    Self::finalize_entry(entry, snapshot.exit_code == Some(0));
+                    true
+                }
+            };
+
+            if should_clear_current && state.current_id.as_deref() == Some(id.as_str()) {
+                state.current_id = None;
+            }
+        }
+
+        Ok(())
+    }
+
+    fn refresh_bytes(entry: &mut RecordingEntry) {
+        entry.info.bytes = file_size(&entry.path);
+    }
+
+    fn finalize_entry(entry: &mut RecordingEntry, success: bool) {
+        let bytes = file_size(&entry.path);
+        entry.info.status = if success || (entry.path.is_file() && bytes > 0) {
+            DesktopRecordingStatus::Completed
+        } else {
+            DesktopRecordingStatus::Failed
+        };
+        entry
+            .info
+            .ended_at
+            .get_or_insert_with(|| chrono::Utc::now().to_rfc3339());
+        entry.info.bytes = bytes;
+    }
+}
+
+fn find_binary(name: &str) -> Option<PathBuf> {
+    let path_env = std::env::var_os("PATH")?;
+    for path in std::env::split_paths(&path_env) {
+        let candidate = path.join(name);
+        if candidate.is_file() {
+            return Some(candidate);
+        }
+    }
+    None
+}
+
+fn file_size(path: &Path) -> u64 {
+    fs::metadata(path)
+        .map(|metadata| metadata.len())
+        .unwrap_or(0)
+}
diff --git a/server/packages/sandbox-agent/src/desktop_runtime.rs b/server/packages/sandbox-agent/src/desktop_runtime.rs
new file mode 100644
index 0000000..29a84dc
--- /dev/null
+++ b/server/packages/sandbox-agent/src/desktop_runtime.rs
@@ -0,0 +1,2708 @@
+use std::collections::HashMap;
+use std::fs::{self, OpenOptions};
+use std::path::{Path, PathBuf};
+use std::process::{Output, Stdio};
+use std::sync::Arc;
+use std::time::Duration;
+
+use tokio::process::{Child, Command};
+use tokio::sync::Mutex;
+
+use sandbox_agent_error::SandboxError;
+
+use crate::desktop_errors::DesktopProblem;
+use crate::desktop_install::desktop_platform_support_message;
+use crate::desktop_recording::{DesktopRecordingContext, DesktopRecordingManager};
+use crate::desktop_streaming::DesktopStreamingManager;
+use crate::desktop_types::{
+    DesktopActionResponse, DesktopDisplayInfoResponse, DesktopErrorInfo, DesktopKeyModifiers,
+    DesktopKeyboardDownRequest, DesktopKeyboardPressRequest, DesktopKeyboardTypeRequest,
+    DesktopKeyboardUpRequest, DesktopMouseButton, DesktopMouseClickRequest,
+    DesktopMouseDownRequest, DesktopMouseDragRequest, DesktopMouseMoveRequest,
+    DesktopMousePositionResponse, DesktopMouseScrollRequest, DesktopMouseUpRequest,
+    DesktopProcessInfo, DesktopRecordingInfo, DesktopRecordingListResponse,
+    DesktopRecordingStartRequest, DesktopRegionScreenshotQuery, DesktopResolution,
+    DesktopScreenshotFormat, DesktopScreenshotQuery, DesktopStartRequest, DesktopState,
+    DesktopStatusResponse, DesktopStreamStatusResponse, DesktopWindowInfo,
+    DesktopWindowListResponse,
+};
+use crate::process_runtime::{
+    ProcessOwner, ProcessRuntime, ProcessStartSpec, ProcessStatus, RestartPolicy,
+};
+
+const DEFAULT_WIDTH: u32 = 1440;
+const DEFAULT_HEIGHT: u32 = 900;
+const DEFAULT_DPI: u32 = 96;
+const DEFAULT_DISPLAY_NUM: i32 = 99;
+const MAX_DISPLAY_PROBE: i32 = 10;
+const SCREENSHOT_TIMEOUT: Duration = Duration::from_secs(10);
+const INPUT_TIMEOUT: Duration = Duration::from_secs(5);
+const STARTUP_TIMEOUT: Duration = Duration::from_secs(15);
+const PNG_SIGNATURE: &[u8] = b"\x89PNG\r\n\x1a\n";
+const JPEG_SIGNATURE: &[u8] = b"\xff\xd8\xff";
+const WEBP_RIFF_SIGNATURE: &[u8] = b"RIFF";
+const WEBP_WEBP_SIGNATURE: &[u8] = b"WEBP";
+
+#[derive(Debug, Clone)]
+pub struct DesktopRuntime {
+    config: DesktopRuntimeConfig,
+    process_runtime: Arc<ProcessRuntime>,
+    recording_manager: DesktopRecordingManager,
+    streaming_manager: DesktopStreamingManager,
+    inner: Arc<Mutex<DesktopRuntimeStateData>>,
+}
+
+#[derive(Debug, Clone)]
+pub struct DesktopRuntimeConfig {
+    state_dir: PathBuf,
+    display_num: i32,
+    assume_linux_for_tests: bool,
+}
+
+#[derive(Debug)]
+struct DesktopRuntimeStateData {
+    state: DesktopState,
+    display_num: i32,
+    display: Option<String>,
+    resolution: Option<DesktopResolution>,
+    started_at: Option<String>,
+    last_error: Option<DesktopErrorInfo>,
+    missing_dependencies: Vec<String>,
+    install_command: Option<String>,
+    runtime_log_path: PathBuf,
+    environment: HashMap<String, String>,
+    xvfb: Option<ManagedDesktopProcess>,
+    openbox: Option<ManagedDesktopProcess>,
+    dbus_pid: Option<u32>,
+    streaming_config: Option<crate::desktop_streaming::StreamingConfig>,
+    recording_fps: Option<u32>,
+}
+
+#[derive(Debug)]
+struct ManagedDesktopProcess {
+    name: &'static str,
+    process_id: String,
+    pid: Option<u32>,
+    running: bool,
+}
+
+#[derive(Debug, Clone)]
+struct DesktopReadyContext {
+    display: String,
+    environment: HashMap<String, String>,
+    resolution: DesktopResolution,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct DesktopScreenshotData {
+    pub bytes: Vec<u8>,
+    pub content_type: &'static str,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+struct DesktopScreenshotOptions {
+    format: DesktopScreenshotFormat,
+    quality: u8,
+    scale: f32,
+}
+
+impl Default for DesktopScreenshotOptions {
+    fn default() -> Self {
+        Self {
+            format: DesktopScreenshotFormat::Png,
+            quality: 85,
+            scale: 1.0,
+        }
+    }
+}
+
+impl DesktopScreenshotOptions {
+    fn content_type(self) -> &'static str {
+        match self.format {
+            DesktopScreenshotFormat::Png => "image/png",
+            DesktopScreenshotFormat::Jpeg => "image/jpeg",
+            DesktopScreenshotFormat::Webp => "image/webp",
+        }
+    }
+
+    fn output_arg(self) -> &'static str {
+        match self.format {
+            DesktopScreenshotFormat::Png => "png:-",
+            DesktopScreenshotFormat::Jpeg => "jpeg:-",
+            DesktopScreenshotFormat::Webp => "webp:-",
+        }
+    }
+
+    fn needs_convert(self) -> bool {
+        self.format != DesktopScreenshotFormat::Png || (self.scale - 1.0).abs() > f32::EPSILON
+    }
+}
+
+impl Default for DesktopRuntimeConfig {
+    fn default() -> Self {
+        Self {
+            state_dir: default_state_dir(),
+            display_num: DEFAULT_DISPLAY_NUM,
+            assume_linux_for_tests: false,
+        }
+    }
+}
+
+impl DesktopRuntime {
+    pub fn new(process_runtime: Arc<ProcessRuntime>) -> Self {
+        Self::with_config(process_runtime, DesktopRuntimeConfig::default())
+    }
+
+    pub fn with_config(process_runtime: Arc<ProcessRuntime>, config: DesktopRuntimeConfig) -> Self {
+        let runtime_log_path = config.state_dir.join("desktop-runtime.log");
+        let recording_manager =
+            DesktopRecordingManager::new(process_runtime.clone(), config.state_dir.clone());
+        Self {
+            streaming_manager: DesktopStreamingManager::new(process_runtime.clone()),
+            process_runtime,
+            recording_manager,
+            inner: Arc::new(Mutex::new(DesktopRuntimeStateData {
+                state: DesktopState::Inactive,
+                display_num: config.display_num,
+                display: None,
+                resolution: None,
+                started_at: None,
+                last_error: None,
+                missing_dependencies: Vec::new(),
+                install_command: None,
+                runtime_log_path,
+                environment: HashMap::new(),
+                xvfb: None,
+                openbox: None,
+                dbus_pid: None,
+                streaming_config: None,
+                recording_fps: None,
+            })),
+            config,
+        }
+    }
+
+    pub async fn status(&self) -> DesktopStatusResponse {
+        let mut state = self.inner.lock().await;
+        self.refresh_status_locked(&mut state).await;
+        let mut response = self.snapshot_locked(&state);
+        drop(state);
+        self.append_neko_process(&mut response).await;
+
+        // Include the current window list when the desktop is active so callers
+        // get windows for free when polling status (avoids a separate request).
+        if response.state == DesktopState::Active {
+            if let Ok(window_list) = self.list_windows().await {
+                response.windows = window_list.windows;
+            }
+        }
+
+        response
+    }
+
+    pub async fn start(
+        &self,
+        request: DesktopStartRequest,
+    ) -> Result<DesktopStatusResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+
+        if !self.platform_supported() {
+            let problem = DesktopProblem::unsupported_platform(desktop_platform_support_message());
+            self.record_problem_locked(&mut state, &problem);
+            state.state = DesktopState::Failed;
+            return Err(problem);
+        }
+
+        if matches!(state.state, DesktopState::Starting | DesktopState::Stopping) {
+            return Err(DesktopProblem::runtime_starting(
+                "Desktop runtime is busy transitioning state",
+            ));
+        }
+
+        self.refresh_status_locked(&mut state).await;
+        if state.state == DesktopState::Active {
+            let mut response = self.snapshot_locked(&state);
+            drop(state);
+            self.append_neko_process(&mut response).await;
+            return Ok(response);
+        }
+
+        if !state.missing_dependencies.is_empty() {
+            return Err(DesktopProblem::dependencies_missing(
+                state.missing_dependencies.clone(),
+                state.install_command.clone(),
+                self.processes_locked(&state),
+            ));
+        }
+
+        self.ensure_state_dir_locked(&state).map_err(|err| {
+            DesktopProblem::runtime_failed(err, None, self.processes_locked(&state))
+        })?;
+        self.write_runtime_log_locked(&state, "starting desktop runtime");
+
+        let width = request.width.unwrap_or(DEFAULT_WIDTH);
+        let height = request.height.unwrap_or(DEFAULT_HEIGHT);
+        let dpi = request.dpi.unwrap_or(DEFAULT_DPI);
+        validate_start_request(width, height, dpi)?;
+
+        // Override display_num if provided in request
+        let display_num =
+            self.choose_display_num_from(request.display_num.unwrap_or(self.config.display_num))?;
+        let display = format!(":{display_num}");
+        let resolution = DesktopResolution {
+            width,
+            height,
+            dpi: Some(dpi),
+        };
+        let environment = self.base_environment(&display)?;
+
+        // Store streaming and recording config for later use
+        state.streaming_config = if request.stream_video_codec.is_some()
+            || request.stream_audio_codec.is_some()
+            || request.stream_frame_rate.is_some()
+            || request.webrtc_port_range.is_some()
+        {
+            Some(crate::desktop_streaming::StreamingConfig {
+                video_codec: request
+                    .stream_video_codec
+                    .unwrap_or_else(|| "vp8".to_string()),
+                audio_codec: request
+                    .stream_audio_codec
+                    .unwrap_or_else(|| "opus".to_string()),
+                frame_rate: request.stream_frame_rate.unwrap_or(30).clamp(1, 60),
+                webrtc_port_range: request
+                    .webrtc_port_range
+                    .unwrap_or_else(|| "59050-59070".to_string()),
+            })
+        } else {
+            None
+        };
+        state.recording_fps = request.recording_fps.map(|fps| fps.clamp(1, 60));
+
+        state.state = DesktopState::Starting;
+        state.display_num = display_num;
+        state.display = Some(display.clone());
+        state.resolution = Some(resolution.clone());
+        state.started_at = None;
+        state.last_error = None;
+        state.environment = environment;
+        state.install_command = None;
+
+        if let Err(problem) = self.start_dbus_locked(&mut state).await {
+            return Err(self.fail_start_locked(&mut state, problem).await);
+        }
+        if let Err(problem) = self.start_xvfb_locked(&mut state, &resolution).await {
+            return Err(self.fail_start_locked(&mut state, problem).await);
+        }
+        if let Err(problem) = self.wait_for_socket(display_num).await {
+            return Err(self.fail_start_locked(&mut state, problem).await);
+        }
+        if let Err(problem) = self.start_openbox_locked(&mut state).await {
+            return Err(self.fail_start_locked(&mut state, problem).await);
+        }
+
+        let ready = DesktopReadyContext {
+            display,
+            environment: state.environment.clone(),
+            resolution,
+        };
+
+        let display_info = match self.query_display_info_locked(&state, &ready).await {
+            Ok(display_info) => display_info,
+            Err(problem) => return Err(self.fail_start_locked(&mut state, problem).await),
+        };
+        state.resolution = Some(display_info.resolution.clone());
+
+        let screenshot_options = DesktopScreenshotOptions::default();
+        if let Err(problem) = self
+            .capture_screenshot_locked(&state, None, &screenshot_options)
+            .await
+        {
+            return Err(self.fail_start_locked(&mut state, problem).await);
+        }
+
+        state.state = DesktopState::Active;
+        state.started_at = Some(chrono::Utc::now().to_rfc3339());
+        state.last_error = None;
+        self.write_runtime_log_locked(
+            &state,
+            &format!(
+                "desktop runtime active on {} ({}x{}, dpi {})",
+                display_info.display,
+                display_info.resolution.width,
+                display_info.resolution.height,
+                display_info.resolution.dpi.unwrap_or(DEFAULT_DPI)
+            ),
+        );
+
+        let mut response = self.snapshot_locked(&state);
+        drop(state);
+        self.append_neko_process(&mut response).await;
+        Ok(response)
+    }
+
+    pub async fn stop(&self) -> Result<DesktopStatusResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        if matches!(state.state, DesktopState::Starting | DesktopState::Stopping) {
+            return Err(DesktopProblem::runtime_starting(
+                "Desktop runtime is busy transitioning state",
+            ));
+        }
+
+        state.state = DesktopState::Stopping;
+        self.write_runtime_log_locked(&state, "stopping desktop runtime");
+        let _ = self.recording_manager.stop().await;
+        let _ = self.streaming_manager.stop().await;
+
+        self.stop_openbox_locked(&mut state).await;
+        self.stop_xvfb_locked(&mut state).await;
+        self.stop_dbus_locked(&mut state);
+
+        state.state = DesktopState::Inactive;
+        state.display = None;
+        state.resolution = None;
+        state.started_at = None;
+        state.last_error = None;
+        state.missing_dependencies = self.detect_missing_dependencies();
+        state.install_command = self.install_command_for(&state.missing_dependencies);
+        state.environment.clear();
+        state.streaming_config = None;
+        state.recording_fps = None;
+
+        let mut response = self.snapshot_locked(&state);
+        drop(state);
+        self.append_neko_process(&mut response).await;
+        Ok(response)
+    }
+
+    pub async fn shutdown(&self) {
+        let _ = self.stop().await;
+    }
+
+    pub async fn screenshot(
+        &self,
+        query: DesktopScreenshotQuery,
+    ) -> Result<DesktopScreenshotData, DesktopProblem> {
+        let options = screenshot_options(query.format, query.quality, query.scale)?;
+        let show_cursor = query.show_cursor.unwrap_or(false);
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let mut bytes = self
+            .capture_screenshot_locked(&state, Some(&ready), &options)
+            .await?;
+        if show_cursor {
+            bytes = self
+                .composite_cursor(&state, &ready, bytes, &options)
+                .await?;
+        }
+        Ok(DesktopScreenshotData {
+            bytes,
+            content_type: options.content_type(),
+        })
+    }
+
+    pub async fn screenshot_region(
+        &self,
+        query: DesktopRegionScreenshotQuery,
+    ) -> Result<DesktopScreenshotData, DesktopProblem> {
+        validate_region(&query)?;
+        let options = screenshot_options(query.format, query.quality, query.scale)?;
+        let show_cursor = query.show_cursor.unwrap_or(false);
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let crop = format!("{}x{}+{}+{}", query.width, query.height, query.x, query.y);
+        let mut bytes = self
+            .capture_screenshot_with_crop_locked(&state, &ready, &crop, &options)
+            .await?;
+        if show_cursor {
+            bytes = self
+                .composite_cursor_region(
+                    &state,
+                    &ready,
+                    bytes,
+                    &options,
+                    query.x,
+                    query.y,
+                    query.width,
+                    query.height,
+                )
+                .await?;
+        }
+        Ok(DesktopScreenshotData {
+            bytes,
+            content_type: options.content_type(),
+        })
+    }
+
+    pub async fn mouse_position(&self) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn move_mouse(
+        &self,
+        request: DesktopMouseMoveRequest,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        validate_coordinates(request.x, request.y)?;
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = vec![
+            "mousemove".to_string(),
+            request.x.to_string(),
+            request.y.to_string(),
+        ];
+        self.run_input_command_locked(&state, &ready, args).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn click_mouse(
+        &self,
+        request: DesktopMouseClickRequest,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        validate_coordinates(request.x, request.y)?;
+        let click_count = request.click_count.unwrap_or(1);
+        if click_count == 0 {
+            return Err(DesktopProblem::invalid_action(
+                "clickCount must be greater than 0",
+            ));
+        }
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let button = mouse_button_code(request.button.unwrap_or(DesktopMouseButton::Left));
+        let mut args = vec![
+            "mousemove".to_string(),
+            request.x.to_string(),
+            request.y.to_string(),
+            "click".to_string(),
+        ];
+        if click_count > 1 {
+            args.push("--repeat".to_string());
+            args.push(click_count.to_string());
+        }
+        args.push(button.to_string());
+        self.run_input_command_locked(&state, &ready, args).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn mouse_down(
+        &self,
+        request: DesktopMouseDownRequest,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        let coordinates = validate_optional_coordinates(request.x, request.y)?;
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let button = mouse_button_code(request.button.unwrap_or(DesktopMouseButton::Left));
+        let args = mouse_button_transition_args("mousedown", coordinates, button);
+        self.run_input_command_locked(&state, &ready, args).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn mouse_up(
+        &self,
+        request: DesktopMouseUpRequest,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        let coordinates = validate_optional_coordinates(request.x, request.y)?;
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let button = mouse_button_code(request.button.unwrap_or(DesktopMouseButton::Left));
+        let args = mouse_button_transition_args("mouseup", coordinates, button);
+        self.run_input_command_locked(&state, &ready, args).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn drag_mouse(
+        &self,
+        request: DesktopMouseDragRequest,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        validate_coordinates(request.start_x, request.start_y)?;
+        validate_coordinates(request.end_x, request.end_y)?;
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let button = mouse_button_code(request.button.unwrap_or(DesktopMouseButton::Left));
+        let args = vec![
+            "mousemove".to_string(),
+            request.start_x.to_string(),
+            request.start_y.to_string(),
+            "mousedown".to_string(),
+            button.to_string(),
+            "mousemove".to_string(),
+            request.end_x.to_string(),
+            request.end_y.to_string(),
+            "mouseup".to_string(),
+            button.to_string(),
+        ];
+        self.run_input_command_locked(&state, &ready, args).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn scroll_mouse(
+        &self,
+        request: DesktopMouseScrollRequest,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        validate_coordinates(request.x, request.y)?;
+        let delta_x = request.delta_x.unwrap_or(0);
+        let delta_y = request.delta_y.unwrap_or(0);
+        if delta_x == 0 && delta_y == 0 {
+            return Err(DesktopProblem::invalid_action(
+                "deltaX or deltaY must be non-zero",
+            ));
+        }
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let mut args = vec![
+            "mousemove".to_string(),
+            request.x.to_string(),
+            request.y.to_string(),
+        ];
+
+        append_scroll_clicks(&mut args, delta_y, 5, 4);
+        append_scroll_clicks(&mut args, delta_x, 7, 6);
+
+        self.run_input_command_locked(&state, &ready, args).await?;
+        self.mouse_position_locked(&state, &ready).await
+    }
+
+    pub async fn type_text(
+        &self,
+        request: DesktopKeyboardTypeRequest,
+    ) -> Result<DesktopActionResponse, DesktopProblem> {
+        if request.text.is_empty() {
+            return Err(DesktopProblem::invalid_action("text must not be empty"));
+        }
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = type_text_args(request.text, request.delay_ms.unwrap_or(10));
+        self.run_input_command_locked(&state, &ready, args).await?;
+        Ok(DesktopActionResponse { ok: true })
+    }
+
+    pub async fn press_key(
+        &self,
+        request: DesktopKeyboardPressRequest,
+    ) -> Result<DesktopActionResponse, DesktopProblem> {
+        if request.key.trim().is_empty() {
+            return Err(DesktopProblem::invalid_action("key must not be empty"));
+        }
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = press_key_args(request.key, request.modifiers);
+        self.run_input_command_locked(&state, &ready, args).await?;
+        Ok(DesktopActionResponse { ok: true })
+    }
+
+    pub async fn key_down(
+        &self,
+        request: DesktopKeyboardDownRequest,
+    ) -> Result<DesktopActionResponse, DesktopProblem> {
+        if request.key.trim().is_empty() {
+            return Err(DesktopProblem::invalid_action("key must not be empty"));
+        }
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = key_transition_args("keydown", request.key);
+        self.run_input_command_locked(&state, &ready, args).await?;
+        Ok(DesktopActionResponse { ok: true })
+    }
+
+    pub async fn key_up(
+        &self,
+        request: DesktopKeyboardUpRequest,
+    ) -> Result<DesktopActionResponse, DesktopProblem> {
+        if request.key.trim().is_empty() {
+            return Err(DesktopProblem::invalid_action("key must not be empty"));
+        }
+
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = key_transition_args("keyup", request.key);
+        self.run_input_command_locked(&state, &ready, args).await?;
+        Ok(DesktopActionResponse { ok: true })
+    }
+
+    pub async fn display_info(&self) -> Result<DesktopDisplayInfoResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        self.query_display_info_locked(&state, &ready).await
+    }
+
+    pub async fn list_windows(&self) -> Result<DesktopWindowListResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let active_window_id = self.active_window_id_locked(&state, &ready).await?;
+        let window_ids = self.window_ids_locked(&state, &ready).await?;
+        let mut windows = Vec::with_capacity(window_ids.len());
+        for window_id in window_ids {
+            let title = self.window_title_locked(&state, &ready, &window_id).await?;
+            let (x, y, width, height) = self
+                .window_geometry_locked(&state, &ready, &window_id)
+                .await?;
+            let is_active = active_window_id
+                .as_deref()
+                .map(|active| active == window_id)
+                .unwrap_or(false);
+
+            // Filter out noise: window-manager chrome, toolkit internals, and
+            // invisible helper windows. Always keep the active window so the
+            // caller can track focus even when the WM itself is focused.
+            if !is_active {
+                let trimmed = title.trim();
+                if trimmed.is_empty() || trimmed == "Openbox" || (width < 120 && height < 80) {
+                    continue;
+                }
+            }
+
+            windows.push(DesktopWindowInfo {
+                id: window_id.clone(),
+                title,
+                x,
+                y,
+                width,
+                height,
+                is_active,
+            });
+        }
+        Ok(DesktopWindowListResponse { windows })
+    }
+
+    pub async fn start_recording(
+        &self,
+        request: DesktopRecordingStartRequest,
+    ) -> Result<DesktopRecordingInfo, SandboxError> {
+        let context = self.recording_context().await?;
+        self.recording_manager.start(context, request).await
+    }
+
+    pub async fn stop_recording(&self) -> Result<DesktopRecordingInfo, SandboxError> {
+        self.recording_manager.stop().await
+    }
+
+    pub async fn list_recordings(&self) -> Result<DesktopRecordingListResponse, SandboxError> {
+        self.recording_manager.list().await
+    }
+
+    pub async fn get_recording(&self, id: &str) -> Result<DesktopRecordingInfo, SandboxError> {
+        self.recording_manager.get(id).await
+    }
+
+    pub async fn recording_download_path(&self, id: &str) -> Result<PathBuf, SandboxError> {
+        self.recording_manager.download_path(id).await
+    }
+
+    pub async fn delete_recording(&self, id: &str) -> Result<(), SandboxError> {
+        self.recording_manager.delete(id).await
+    }
+
+    pub async fn start_streaming(&self) -> Result<DesktopStreamStatusResponse, SandboxError> {
+        let state = self.inner.lock().await;
+        let display = state
+            .display
+            .as_deref()
+            .ok_or_else(|| SandboxError::Conflict {
+                message: "desktop runtime is not active".to_string(),
+            })?;
+        let resolution = state
+            .resolution
+            .clone()
+            .ok_or_else(|| SandboxError::Conflict {
+                message: "desktop runtime is not active".to_string(),
+            })?;
+        let environment = state.environment.clone();
+        let display = display.to_string();
+        let streaming_config = state.streaming_config.clone();
+        drop(state);
+        self.streaming_manager
+            .start(&display, resolution, &environment, streaming_config, None)
+            .await
+    }
+
+    pub async fn stop_streaming(&self) -> DesktopStreamStatusResponse {
+        self.streaming_manager.stop().await
+    }
+
+    pub async fn ensure_streaming_active(&self) -> Result<(), SandboxError> {
+        self.streaming_manager.ensure_active().await
+    }
+
+    pub fn streaming_manager(&self) -> &DesktopStreamingManager {
+        &self.streaming_manager
+    }
+
+    async fn recording_context(&self) -> Result<DesktopRecordingContext, SandboxError> {
+        let mut state = self.inner.lock().await;
+        let ready = self
+            .ensure_ready_locked(&mut state)
+            .await
+            .map_err(desktop_problem_to_sandbox_error)?;
+        Ok(DesktopRecordingContext {
+            display: ready.display,
+            environment: ready.environment,
+            resolution: ready.resolution,
+        })
+    }
+
+    async fn ensure_ready_locked(
+        &self,
+        state: &mut DesktopRuntimeStateData,
+    ) -> Result<DesktopReadyContext, DesktopProblem> {
+        self.refresh_status_locked(state).await;
+        match state.state {
+            DesktopState::Active => {
+                let display = state.display.clone().ok_or_else(|| {
+                    DesktopProblem::runtime_failed(
+                        "Desktop runtime has no active display",
+                        state.install_command.clone(),
+                        self.processes_locked(state),
+                    )
+                })?;
+                let resolution = state.resolution.clone().ok_or_else(|| {
+                    DesktopProblem::runtime_failed(
+                        "Desktop runtime has no active resolution",
+                        state.install_command.clone(),
+                        self.processes_locked(state),
+                    )
+                })?;
+                Ok(DesktopReadyContext {
+                    display,
+                    environment: state.environment.clone(),
+                    resolution,
+                })
+            }
+            DesktopState::InstallRequired => Err(DesktopProblem::dependencies_missing(
+                state.missing_dependencies.clone(),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            )),
+            DesktopState::Inactive => Err(DesktopProblem::runtime_inactive(
+                "Desktop runtime has not been started",
+            )),
+            DesktopState::Starting | DesktopState::Stopping => Err(
+                DesktopProblem::runtime_starting("Desktop runtime is still transitioning"),
+            ),
+            DesktopState::Failed => Err(DesktopProblem::runtime_failed(
+                state
+                    .last_error
+                    .as_ref()
+                    .map(|error| error.message.clone())
+                    .unwrap_or_else(|| "Desktop runtime is unhealthy".to_string()),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            )),
+        }
+    }
+
+    async fn refresh_status_locked(&self, state: &mut DesktopRuntimeStateData) {
+        let missing_dependencies = if self.platform_supported() {
+            self.detect_missing_dependencies()
+        } else {
+            Vec::new()
+        };
+        state.missing_dependencies = missing_dependencies.clone();
+        state.install_command = self.install_command_for(&missing_dependencies);
+
+        if !self.platform_supported() {
+            state.state = DesktopState::Failed;
+            state.last_error = Some(
+                DesktopProblem::unsupported_platform(desktop_platform_support_message())
+                    .to_error_info(),
+            );
+            return;
+        }
+
+        if !missing_dependencies.is_empty() {
+            state.state = DesktopState::InstallRequired;
+            state.last_error = Some(
+                DesktopProblem::dependencies_missing(
+                    missing_dependencies,
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+                .to_error_info(),
+            );
+            return;
+        }
+
+        if matches!(
+            state.state,
+            DesktopState::Inactive | DesktopState::Starting | DesktopState::Stopping
+        ) {
+            if state.state == DesktopState::Inactive {
+                state.last_error = None;
+            }
+            return;
+        }
+
+        if state.state == DesktopState::Failed
+            && state.display.is_none()
+            && state.xvfb.is_none()
+            && state.openbox.is_none()
+            && state.dbus_pid.is_none()
+        {
+            return;
+        }
+
+        let Some(display) = state.display.clone() else {
+            state.state = DesktopState::Failed;
+            state.last_error = Some(
+                DesktopProblem::runtime_failed(
+                    "Desktop runtime has no display",
+                    None,
+                    self.processes_locked(state),
+                )
+                .to_error_info(),
+            );
+            return;
+        };
+
+        if let Err(problem) = self.ensure_process_running_locked(state, "Xvfb").await {
+            self.record_problem_locked(state, &problem);
+            state.state = DesktopState::Failed;
+            return;
+        }
+        if let Err(problem) = self.ensure_process_running_locked(state, "openbox").await {
+            self.record_problem_locked(state, &problem);
+            state.state = DesktopState::Failed;
+            return;
+        }
+
+        if !socket_path(state.display_num).exists() {
+            let problem = DesktopProblem::runtime_failed(
+                format!("X socket for display {display} is missing"),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            );
+            self.record_problem_locked(state, &problem);
+            state.state = DesktopState::Failed;
+            return;
+        }
+
+        let ready = DesktopReadyContext {
+            display,
+            environment: state.environment.clone(),
+            resolution: state.resolution.clone().unwrap_or(DesktopResolution {
+                width: DEFAULT_WIDTH,
+                height: DEFAULT_HEIGHT,
+                dpi: Some(DEFAULT_DPI),
+            }),
+        };
+
+        match self.query_display_info_locked(state, &ready).await {
+            Ok(display_info) => {
+                state.resolution = Some(display_info.resolution);
+            }
+            Err(problem) => {
+                self.record_problem_locked(state, &problem);
+                state.state = DesktopState::Failed;
+                return;
+            }
+        }
+
+        let screenshot_options = DesktopScreenshotOptions::default();
+        if let Err(problem) = self
+            .capture_screenshot_locked(state, Some(&ready), &screenshot_options)
+            .await
+        {
+            self.record_problem_locked(state, &problem);
+            state.state = DesktopState::Failed;
+            return;
+        }
+
+        state.state = DesktopState::Active;
+        state.last_error = None;
+    }
+
+    async fn ensure_process_running_locked(
+        &self,
+        state: &mut DesktopRuntimeStateData,
+        name: &str,
+    ) -> Result<(), DesktopProblem> {
+        let process_id = match name {
+            "Xvfb" => state
+                .xvfb
+                .as_ref()
+                .map(|process| process.process_id.clone()),
+            "openbox" => state
+                .openbox
+                .as_ref()
+                .map(|process| process.process_id.clone()),
+            _ => None,
+        };
+
+        let Some(process_id) = process_id else {
+            return Err(DesktopProblem::runtime_failed(
+                format!("{name} is not running"),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ));
+        };
+
+        let snapshot = self
+            .process_runtime
+            .snapshot(&process_id)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to inspect {name}: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+
+        if let Some(process) = match name {
+            "Xvfb" => state.xvfb.as_mut(),
+            "openbox" => state.openbox.as_mut(),
+            _ => None,
+        } {
+            process.pid = snapshot.pid;
+            process.running = snapshot.status == ProcessStatus::Running;
+        }
+
+        if snapshot.status == ProcessStatus::Running {
+            return Ok(());
+        }
+
+        self.write_runtime_log_locked(state, &format!("{name} exited; attempting restart"));
+        match name {
+            "Xvfb" => {
+                let resolution = state.resolution.clone().ok_or_else(|| {
+                    DesktopProblem::runtime_failed(
+                        "desktop resolution missing during Xvfb restart",
+                        state.install_command.clone(),
+                        self.processes_locked(state),
+                    )
+                })?;
+                state.xvfb = None;
+                self.start_xvfb_locked(state, &resolution).await?;
+            }
+            "openbox" => {
+                state.openbox = None;
+                self.start_openbox_locked(state).await?;
+            }
+            _ => {}
+        }
+
+        let restarted_snapshot = self
+            .process_runtime
+            .snapshot(match name {
+                "Xvfb" => state
+                    .xvfb
+                    .as_ref()
+                    .map(|process| process.process_id.as_str())
+                    .unwrap_or_default(),
+                "openbox" => state
+                    .openbox
+                    .as_ref()
+                    .map(|process| process.process_id.as_str())
+                    .unwrap_or_default(),
+                _ => "",
+            })
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to inspect restarted {name}: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+        if restarted_snapshot.status == ProcessStatus::Running {
+            Ok(())
+        } else {
+            Err(DesktopProblem::runtime_failed(
+                format!("{name} exited with status {:?}", snapshot.exit_code),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ))
+        }
+    }
+
+    async fn start_dbus_locked(
+        &self,
+        state: &mut DesktopRuntimeStateData,
+    ) -> Result<(), DesktopProblem> {
+        if find_binary("dbus-launch").is_none() {
+            self.write_runtime_log_locked(
+                state,
+                "dbus-launch not found; continuing without D-Bus session",
+            );
+            return Ok(());
+        }
+
+        let output = run_command_output("dbus-launch", &[], &state.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to launch dbus-launch: {err}"),
+                    None,
+                    self.processes_locked(state),
+                )
+            })?;
+
+        if !output.status.success() {
+            self.write_runtime_log_locked(
+                state,
+                &format!(
+                    "dbus-launch failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+            );
+            return Ok(());
+        }
+
+        for line in String::from_utf8_lossy(&output.stdout).lines() {
+            if let Some((key, value)) = line.split_once('=') {
+                let cleaned = value.trim().trim_end_matches(';').to_string();
+                if key == "DBUS_SESSION_BUS_ADDRESS" {
+                    state.environment.insert(key.to_string(), cleaned);
+                } else if key == "DBUS_SESSION_BUS_PID" {
+                    state.dbus_pid = cleaned.parse::<u32>().ok();
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    async fn start_xvfb_locked(
+        &self,
+        state: &mut DesktopRuntimeStateData,
+        resolution: &DesktopResolution,
+    ) -> Result<(), DesktopProblem> {
+        let Some(display) = state.display.clone() else {
+            return Err(DesktopProblem::runtime_failed(
+                "Desktop display was not configured before starting Xvfb",
+                None,
+                self.processes_locked(state),
+            ));
+        };
+        let args = vec![
+            display,
+            "-screen".to_string(),
+            "0".to_string(),
+            format!("{}x{}x24", resolution.width, resolution.height),
+            "-dpi".to_string(),
+            resolution.dpi.unwrap_or(DEFAULT_DPI).to_string(),
+            "-nolisten".to_string(),
+            "tcp".to_string(),
+        ];
+        let snapshot = self
+            .process_runtime
+            .start_process(ProcessStartSpec {
+                command: "Xvfb".to_string(),
+                args,
+                cwd: None,
+                env: state.environment.clone(),
+                tty: false,
+                interactive: false,
+                owner: ProcessOwner::Desktop,
+                restart_policy: Some(RestartPolicy::Always),
+            })
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to start Xvfb: {err}"),
+                    None,
+                    self.processes_locked(state),
+                )
+            })?;
+        state.xvfb = Some(ManagedDesktopProcess {
+            name: "Xvfb",
+            process_id: snapshot.id,
+            pid: snapshot.pid,
+            running: snapshot.status == ProcessStatus::Running,
+        });
+        Ok(())
+    }
+
+    async fn start_openbox_locked(
+        &self,
+        state: &mut DesktopRuntimeStateData,
+    ) -> Result<(), DesktopProblem> {
+        let snapshot = self
+            .process_runtime
+            .start_process(ProcessStartSpec {
+                command: "openbox".to_string(),
+                args: Vec::new(),
+                cwd: None,
+                env: state.environment.clone(),
+                tty: false,
+                interactive: false,
+                owner: ProcessOwner::Desktop,
+                restart_policy: Some(RestartPolicy::Always),
+            })
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to start openbox: {err}"),
+                    None,
+                    self.processes_locked(state),
+                )
+            })?;
+        state.openbox = Some(ManagedDesktopProcess {
+            name: "openbox",
+            process_id: snapshot.id,
+            pid: snapshot.pid,
+            running: snapshot.status == ProcessStatus::Running,
+        });
+        Ok(())
+    }
+
+    async fn stop_xvfb_locked(&self, state: &mut DesktopRuntimeStateData) {
+        if let Some(process) = state.xvfb.take() {
+            self.write_runtime_log_locked(state, "stopping Xvfb");
+            let _ = self
+                .process_runtime
+                .stop_process(&process.process_id, Some(2_000))
+                .await;
+            if self
+                .process_runtime
+                .snapshot(&process.process_id)
+                .await
+                .ok()
+                .is_some_and(|snapshot| snapshot.status == ProcessStatus::Running)
+            {
+                let _ = self
+                    .process_runtime
+                    .kill_process(&process.process_id, Some(1_000))
+                    .await;
+            }
+        }
+    }
+
+    async fn stop_openbox_locked(&self, state: &mut DesktopRuntimeStateData) {
+        if let Some(process) = state.openbox.take() {
+            self.write_runtime_log_locked(state, "stopping openbox");
+            let _ = self
+                .process_runtime
+                .stop_process(&process.process_id, Some(2_000))
+                .await;
+            if self
+                .process_runtime
+                .snapshot(&process.process_id)
+                .await
+                .ok()
+                .is_some_and(|snapshot| snapshot.status == ProcessStatus::Running)
+            {
+                let _ = self
+                    .process_runtime
+                    .kill_process(&process.process_id, Some(1_000))
+                    .await;
+            }
+        }
+    }
+
+    fn stop_dbus_locked(&self, state: &mut DesktopRuntimeStateData) {
+        if let Some(pid) = state.dbus_pid.take() {
+            #[cfg(unix)]
+            unsafe {
+                libc::kill(pid as i32, libc::SIGTERM);
+            }
+        }
+    }
+
+    async fn fail_start_locked(
+        &self,
+        state: &mut DesktopRuntimeStateData,
+        problem: DesktopProblem,
+    ) -> DesktopProblem {
+        self.record_problem_locked(state, &problem);
+        self.write_runtime_log_locked(state, "desktop runtime startup failed; cleaning up");
+        self.stop_openbox_locked(state).await;
+        self.stop_xvfb_locked(state).await;
+        self.stop_dbus_locked(state);
+        state.state = DesktopState::Failed;
+        state.display = None;
+        state.resolution = None;
+        state.started_at = None;
+        state.environment.clear();
+        problem
+    }
+
+    async fn capture_screenshot_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: Option<&DesktopReadyContext>,
+        options: &DesktopScreenshotOptions,
+    ) -> Result<Vec<u8>, DesktopProblem> {
+        match ready {
+            Some(ready) => {
+                self.capture_screenshot_with_crop_locked(state, ready, "", options)
+                    .await
+            }
+            None => {
+                let ready = DesktopReadyContext {
+                    display: state
+                        .display
+                        .clone()
+                        .unwrap_or_else(|| format!(":{}", state.display_num)),
+                    environment: state.environment.clone(),
+                    resolution: state.resolution.clone().unwrap_or(DesktopResolution {
+                        width: DEFAULT_WIDTH,
+                        height: DEFAULT_HEIGHT,
+                        dpi: Some(DEFAULT_DPI),
+                    }),
+                };
+                self.capture_screenshot_with_crop_locked(state, &ready, "", options)
+                    .await
+            }
+        }
+    }
+
+    async fn capture_screenshot_with_crop_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        crop: &str,
+        options: &DesktopScreenshotOptions,
+    ) -> Result<Vec<u8>, DesktopProblem> {
+        let mut args = vec!["-window".to_string(), "root".to_string()];
+        if !crop.is_empty() {
+            args.push("-crop".to_string());
+            args.push(crop.to_string());
+        }
+        args.push("png:-".to_string());
+
+        let output = run_command_output("import", &args, &ready.environment, SCREENSHOT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::screenshot_failed(
+                    format!("failed to capture desktop screenshot: {err}"),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            return Err(DesktopProblem::screenshot_failed(
+                format!(
+                    "desktop screenshot command failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                self.processes_locked(state),
+            ));
+        }
+        let bytes = maybe_convert_screenshot(output.stdout, options, &ready.environment)
+            .await
+            .map_err(|message| {
+                DesktopProblem::screenshot_failed(message, self.processes_locked(state))
+            })?;
+        validate_image_bytes(&bytes, options.format).map_err(|message| {
+            DesktopProblem::screenshot_failed(message, self.processes_locked(state))
+        })?;
+        Ok(bytes)
+    }
+
+    async fn active_window_id_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+    ) -> Result<Option<String>, DesktopProblem> {
+        let args = vec!["getactivewindow".to_string()];
+        let output = run_command_output("xdotool", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to query active window: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            if output.status.code() == Some(1) && output.stdout.is_empty() {
+                return Ok(None);
+            }
+            return Err(DesktopProblem::runtime_failed(
+                format!(
+                    "active window query failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ));
+        }
+        let window_id = String::from_utf8_lossy(&output.stdout).trim().to_string();
+        if window_id.is_empty() {
+            Ok(None)
+        } else {
+            Ok(Some(window_id))
+        }
+    }
+
+    async fn window_ids_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+    ) -> Result<Vec<String>, DesktopProblem> {
+        let args = vec![
+            "search".to_string(),
+            "--onlyvisible".to_string(),
+            "--name".to_string(),
+            "".to_string(),
+        ];
+        let output = run_command_output("xdotool", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to list desktop windows: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            if output.status.code() == Some(1) && output.stdout.is_empty() {
+                return Ok(Vec::new());
+            }
+            return Err(DesktopProblem::runtime_failed(
+                format!(
+                    "desktop window listing failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ));
+        }
+        Ok(String::from_utf8_lossy(&output.stdout)
+            .lines()
+            .map(str::trim)
+            .filter(|line| !line.is_empty())
+            .map(ToString::to_string)
+            .collect())
+    }
+
+    async fn window_title_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        window_id: &str,
+    ) -> Result<String, DesktopProblem> {
+        let args = vec!["getwindowname".to_string(), window_id.to_string()];
+        let output = run_command_output("xdotool", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to query window title: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            return Err(DesktopProblem::runtime_failed(
+                format!(
+                    "window title query failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ));
+        }
+        Ok(String::from_utf8_lossy(&output.stdout)
+            .trim_end()
+            .to_string())
+    }
+
+    async fn window_geometry_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        window_id: &str,
+    ) -> Result<(i32, i32, u32, u32), DesktopProblem> {
+        let args = vec!["getwindowgeometry".to_string(), window_id.to_string()];
+        let output = run_command_output("xdotool", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to query window geometry: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            return Err(DesktopProblem::runtime_failed(
+                format!(
+                    "window geometry query failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ));
+        }
+        parse_window_geometry(&output.stdout).map_err(|message| {
+            DesktopProblem::runtime_failed(
+                message,
+                state.install_command.clone(),
+                self.processes_locked(state),
+            )
+        })
+    }
+
+    async fn mouse_position_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+    ) -> Result<DesktopMousePositionResponse, DesktopProblem> {
+        let args = vec!["getmouselocation".to_string(), "--shell".to_string()];
+        let output = run_command_output("xdotool", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::input_failed(
+                    format!("failed to query mouse position: {err}"),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            return Err(DesktopProblem::input_failed(
+                format!(
+                    "mouse position command failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                self.processes_locked(state),
+            ));
+        }
+        parse_mouse_position(&output.stdout)
+            .map_err(|message| DesktopProblem::input_failed(message, self.processes_locked(state)))
+    }
+
+    async fn run_input_command_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        args: Vec<String>,
+    ) -> Result<(), DesktopProblem> {
+        let output = run_command_output("xdotool", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::input_failed(
+                    format!("failed to execute desktop input command: {err}"),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            return Err(DesktopProblem::input_failed(
+                format!(
+                    "desktop input command failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                self.processes_locked(state),
+            ));
+        }
+        Ok(())
+    }
+
+    async fn query_display_info_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+    ) -> Result<DesktopDisplayInfoResponse, DesktopProblem> {
+        let args = vec!["--current".to_string()];
+        let output = run_command_output("xrandr", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to query display info: {err}"),
+                    state.install_command.clone(),
+                    self.processes_locked(state),
+                )
+            })?;
+        if !output.status.success() {
+            return Err(DesktopProblem::runtime_failed(
+                format!(
+                    "display query failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                ),
+                state.install_command.clone(),
+                self.processes_locked(state),
+            ));
+        }
+        let resolution = parse_xrandr_resolution(&output.stdout).map_err(|message| {
+            DesktopProblem::runtime_failed(
+                message,
+                state.install_command.clone(),
+                self.processes_locked(state),
+            )
+        })?;
+        Ok(DesktopDisplayInfoResponse {
+            display: ready.display.clone(),
+            resolution: DesktopResolution {
+                dpi: ready.resolution.dpi,
+                ..resolution
+            },
+        })
+    }
+
+    fn detect_missing_dependencies(&self) -> Vec<String> {
+        let mut missing = Vec::new();
+        for (name, binary) in [
+            ("Xvfb", "Xvfb"),
+            ("openbox", "openbox"),
+            ("xdotool", "xdotool"),
+            ("import", "import"),
+            ("xrandr", "xrandr"),
+        ] {
+            if find_binary(binary).is_none() {
+                missing.push(name.to_string());
+            }
+        }
+        missing
+    }
+
+    fn install_command_for(&self, missing_dependencies: &[String]) -> Option<String> {
+        if !self.platform_supported() || missing_dependencies.is_empty() {
+            None
+        } else {
+            Some("sandbox-agent install desktop --yes".to_string())
+        }
+    }
+
+    fn platform_supported(&self) -> bool {
+        cfg!(target_os = "linux") || self.config.assume_linux_for_tests
+    }
+
+    fn choose_display_num(&self) -> Result<i32, DesktopProblem> {
+        self.choose_display_num_from(self.config.display_num)
+    }
+
+    fn choose_display_num_from(&self, start: i32) -> Result<i32, DesktopProblem> {
+        if start <= 0 {
+            return Err(DesktopProblem::invalid_action("displayNum must be > 0"));
+        }
+        for offset in 0..MAX_DISPLAY_PROBE {
+            let candidate = start + offset;
+            if !socket_path(candidate).exists() {
+                return Ok(candidate);
+            }
+        }
+        Err(DesktopProblem::runtime_failed(
+            format!("unable to find an available X display starting at :{start}"),
+            None,
+            Vec::new(),
+        ))
+    }
+
+    fn base_environment(&self, display: &str) -> Result<HashMap<String, String>, DesktopProblem> {
+        let mut environment = HashMap::new();
+        environment.insert("DISPLAY".to_string(), display.to_string());
+        environment.insert(
+            "HOME".to_string(),
+            self.config
+                .state_dir
+                .join("home")
+                .to_string_lossy()
+                .to_string(),
+        );
+        environment.insert(
+            "USER".to_string(),
+            std::env::var("USER").unwrap_or_else(|_| "sandbox-agent".to_string()),
+        );
+        environment.insert(
+            "PATH".to_string(),
+            std::env::var("PATH").unwrap_or_default(),
+        );
+        fs::create_dir_all(self.config.state_dir.join("home")).map_err(|err| {
+            DesktopProblem::runtime_failed(
+                format!("failed to create desktop home: {err}"),
+                None,
+                Vec::new(),
+            )
+        })?;
+        Ok(environment)
+    }
+
+    async fn wait_for_socket(&self, display_num: i32) -> Result<(), DesktopProblem> {
+        let socket = socket_path(display_num);
+        let parent = socket
+            .parent()
+            .map(Path::to_path_buf)
+            .unwrap_or_else(|| PathBuf::from("/tmp/.X11-unix"));
+        let _ = fs::create_dir_all(parent);
+
+        let start = tokio::time::Instant::now();
+        while start.elapsed() < STARTUP_TIMEOUT {
+            if socket.exists() {
+                return Ok(());
+            }
+            tokio::time::sleep(Duration::from_millis(100)).await;
+        }
+
+        Err(DesktopProblem::runtime_failed(
+            format!("timed out waiting for X socket {}", socket.display()),
+            None,
+            Vec::new(),
+        ))
+    }
+
+    fn snapshot_locked(&self, state: &DesktopRuntimeStateData) -> DesktopStatusResponse {
+        DesktopStatusResponse {
+            state: state.state,
+            display: state.display.clone(),
+            resolution: state.resolution.clone(),
+            started_at: state.started_at.clone(),
+            last_error: state.last_error.clone(),
+            missing_dependencies: state.missing_dependencies.clone(),
+            install_command: state.install_command.clone(),
+            processes: self.processes_locked(state),
+            runtime_log_path: Some(state.runtime_log_path.to_string_lossy().to_string()),
+            windows: Vec::new(),
+        }
+    }
+
+    fn processes_locked(&self, state: &DesktopRuntimeStateData) -> Vec<DesktopProcessInfo> {
+        let mut processes = Vec::new();
+        if let Some(process) = state.xvfb.as_ref() {
+            processes.push(DesktopProcessInfo {
+                name: process.name.to_string(),
+                pid: process.pid,
+                running: process.running,
+                log_path: None,
+            });
+        }
+        if let Some(process) = state.openbox.as_ref() {
+            processes.push(DesktopProcessInfo {
+                name: process.name.to_string(),
+                pid: process.pid,
+                running: process.running,
+                log_path: None,
+            });
+        }
+        if let Some(pid) = state.dbus_pid {
+            processes.push(DesktopProcessInfo {
+                name: "dbus".to_string(),
+                pid: Some(pid),
+                running: process_exists(pid),
+                log_path: None,
+            });
+        }
+        processes
+    }
+
+    /// Append neko streaming process info to the response, if a neko process
+    /// has been started by the streaming manager.
+    async fn append_neko_process(&self, response: &mut DesktopStatusResponse) {
+        if let Some(neko_info) = self.streaming_manager.process_info().await {
+            response.processes.push(neko_info);
+        }
+    }
+
+    fn record_problem_locked(&self, state: &mut DesktopRuntimeStateData, problem: &DesktopProblem) {
+        state.last_error = Some(problem.to_error_info());
+        self.write_runtime_log_locked(
+            state,
+            &format!("{}: {}", problem.code(), problem.to_error_info().message),
+        );
+    }
+
+    fn ensure_state_dir_locked(&self, state: &DesktopRuntimeStateData) -> Result<(), String> {
+        fs::create_dir_all(&self.config.state_dir).map_err(|err| {
+            format!(
+                "failed to create desktop state dir {}: {err}",
+                self.config.state_dir.display()
+            )
+        })?;
+        if let Some(parent) = state.runtime_log_path.parent() {
+            fs::create_dir_all(parent).map_err(|err| {
+                format!(
+                    "failed to create runtime log dir {}: {err}",
+                    parent.display()
+                )
+            })?;
+        }
+        Ok(())
+    }
+
+    fn write_runtime_log_locked(&self, state: &DesktopRuntimeStateData, message: &str) {
+        if let Some(parent) = state.runtime_log_path.parent() {
+            let _ = fs::create_dir_all(parent);
+        }
+        let line = format!("{} {}\n", chrono::Utc::now().to_rfc3339(), message);
+        let _ = OpenOptions::new()
+            .create(true)
+            .append(true)
+            .open(&state.runtime_log_path)
+            .and_then(|mut file| std::io::Write::write_all(&mut file, line.as_bytes()));
+    }
+
+    pub async fn get_clipboard(
+        &self,
+        selection: Option<String>,
+    ) -> Result<crate::desktop_types::DesktopClipboardResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let sel = selection.unwrap_or_else(|| "clipboard".to_string());
+        let args = vec!["-selection".to_string(), sel.clone(), "-o".to_string()];
+        let output = run_command_output("xclip", &args, &ready.environment, INPUT_TIMEOUT)
+            .await
+            .map_err(|err| {
+                DesktopProblem::clipboard_failed(format!("failed to read clipboard: {err}"))
+            })?;
+        if !output.status.success() {
+            // Empty clipboard is not an error
+            return Ok(crate::desktop_types::DesktopClipboardResponse {
+                text: String::new(),
+                selection: sel,
+            });
+        }
+        Ok(crate::desktop_types::DesktopClipboardResponse {
+            text: String::from_utf8_lossy(&output.stdout).to_string(),
+            selection: sel,
+        })
+    }
+
+    pub async fn set_clipboard(
+        &self,
+        request: crate::desktop_types::DesktopClipboardWriteRequest,
+    ) -> Result<DesktopActionResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let sel = request.selection.unwrap_or_else(|| "clipboard".to_string());
+        let selections: Vec<String> = if sel == "both" {
+            vec!["clipboard".to_string(), "primary".to_string()]
+        } else {
+            vec![sel]
+        };
+        for selection in &selections {
+            let args = vec![
+                "-selection".to_string(),
+                selection.clone(),
+                "-i".to_string(),
+            ];
+            let output = run_command_output_with_stdin(
+                "xclip",
+                &args,
+                &ready.environment,
+                INPUT_TIMEOUT,
+                request.text.as_bytes().to_vec(),
+            )
+            .await
+            .map_err(|err| {
+                DesktopProblem::clipboard_failed(format!("failed to write clipboard: {err}"))
+            })?;
+            if !output.status.success() {
+                return Err(DesktopProblem::clipboard_failed(format!(
+                    "clipboard write failed: {}",
+                    String::from_utf8_lossy(&output.stderr).trim()
+                )));
+            }
+        }
+        Ok(DesktopActionResponse { ok: true })
+    }
+
+    pub async fn focused_window(&self) -> Result<DesktopWindowInfo, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let window_id = self
+            .active_window_id_locked(&state, &ready)
+            .await?
+            .ok_or_else(DesktopProblem::no_focused_window)?;
+        let title = self.window_title_locked(&state, &ready, &window_id).await?;
+        let (x, y, width, height) = self
+            .window_geometry_locked(&state, &ready, &window_id)
+            .await?;
+        Ok(DesktopWindowInfo {
+            id: window_id,
+            title,
+            x,
+            y,
+            width,
+            height,
+            is_active: true,
+        })
+    }
+
+    pub async fn focus_window(&self, window_id: &str) -> Result<DesktopWindowInfo, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = vec![
+            "windowactivate".to_string(),
+            "--sync".to_string(),
+            window_id.to_string(),
+            "windowfocus".to_string(),
+            "--sync".to_string(),
+            window_id.to_string(),
+        ];
+        self.run_input_command_locked(&state, &ready, args)
+            .await
+            .map_err(|_| {
+                DesktopProblem::window_not_found(format!("Window {window_id} not found"))
+            })?;
+        self.window_info_locked(&state, &ready, window_id).await
+    }
+
+    pub async fn move_window(
+        &self,
+        window_id: &str,
+        request: crate::desktop_types::DesktopWindowMoveRequest,
+    ) -> Result<DesktopWindowInfo, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = vec![
+            "windowmove".to_string(),
+            window_id.to_string(),
+            request.x.to_string(),
+            request.y.to_string(),
+        ];
+        self.run_input_command_locked(&state, &ready, args)
+            .await
+            .map_err(|_| {
+                DesktopProblem::window_not_found(format!("Window {window_id} not found"))
+            })?;
+        self.window_info_locked(&state, &ready, window_id).await
+    }
+
+    pub async fn resize_window(
+        &self,
+        window_id: &str,
+        request: crate::desktop_types::DesktopWindowResizeRequest,
+    ) -> Result<DesktopWindowInfo, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+        let args = vec![
+            "windowsize".to_string(),
+            window_id.to_string(),
+            request.width.to_string(),
+            request.height.to_string(),
+        ];
+        self.run_input_command_locked(&state, &ready, args)
+            .await
+            .map_err(|_| {
+                DesktopProblem::window_not_found(format!("Window {window_id} not found"))
+            })?;
+        self.window_info_locked(&state, &ready, window_id).await
+    }
+
+    async fn window_info_locked(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        window_id: &str,
+    ) -> Result<DesktopWindowInfo, DesktopProblem> {
+        let active_id = self.active_window_id_locked(state, ready).await?;
+        let title = self.window_title_locked(state, ready, window_id).await?;
+        let (x, y, width, height) = self.window_geometry_locked(state, ready, window_id).await?;
+        Ok(DesktopWindowInfo {
+            id: window_id.to_string(),
+            title,
+            x,
+            y,
+            width,
+            height,
+            is_active: active_id
+                .as_deref()
+                .map(|a| a == window_id)
+                .unwrap_or(false),
+        })
+    }
+
+    pub async fn launch_app(
+        &self,
+        request: crate::desktop_types::DesktopLaunchRequest,
+    ) -> Result<crate::desktop_types::DesktopLaunchResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+
+        // Verify the app exists
+        if find_binary(&request.app).is_none() {
+            // Also try which via the desktop environment
+            let check = run_command_output(
+                "which",
+                &[request.app.clone()],
+                &ready.environment,
+                INPUT_TIMEOUT,
+            )
+            .await;
+            if check.is_err() || !check.as_ref().unwrap().status.success() {
+                return Err(DesktopProblem::app_not_found(format!(
+                    "Application '{}' not found in PATH",
+                    request.app
+                )));
+            }
+        }
+
+        let args = request.args.unwrap_or_default();
+        let snapshot = self
+            .process_runtime
+            .start_process(ProcessStartSpec {
+                command: request.app.clone(),
+                args,
+                cwd: None,
+                env: ready.environment.clone(),
+                tty: false,
+                interactive: false,
+                owner: ProcessOwner::Desktop,
+                restart_policy: None,
+            })
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to launch {}: {err}", request.app),
+                    None,
+                    self.processes_locked(&state),
+                )
+            })?;
+
+        let mut window_id = None;
+        if request.wait.unwrap_or(false) {
+            if let Some(pid) = snapshot.pid {
+                // Poll for window to appear
+                let deadline = tokio::time::Instant::now() + Duration::from_secs(5);
+                let search_args = vec!["search".to_string(), "--pid".to_string(), pid.to_string()];
+                loop {
+                    let output = run_command_output(
+                        "xdotool",
+                        &search_args,
+                        &ready.environment,
+                        INPUT_TIMEOUT,
+                    )
+                    .await;
+                    if let Ok(ref out) = output {
+                        if out.status.success() {
+                            let id = String::from_utf8_lossy(&out.stdout)
+                                .lines()
+                                .next()
+                                .map(|s| s.trim().to_string());
+                            if id.as_ref().is_some_and(|s| !s.is_empty()) {
+                                window_id = id;
+                                break;
+                            }
+                        }
+                    }
+                    if tokio::time::Instant::now() >= deadline {
+                        break;
+                    }
+                    tokio::time::sleep(Duration::from_millis(200)).await;
+                }
+            }
+        }
+
+        Ok(crate::desktop_types::DesktopLaunchResponse {
+            process_id: snapshot.id,
+            pid: snapshot.pid,
+            window_id,
+        })
+    }
+
+    pub async fn open_target(
+        &self,
+        request: crate::desktop_types::DesktopOpenRequest,
+    ) -> Result<crate::desktop_types::DesktopOpenResponse, DesktopProblem> {
+        let mut state = self.inner.lock().await;
+        let ready = self.ensure_ready_locked(&mut state).await?;
+
+        let snapshot = self
+            .process_runtime
+            .start_process(ProcessStartSpec {
+                command: "xdg-open".to_string(),
+                args: vec![request.target],
+                cwd: None,
+                env: ready.environment.clone(),
+                tty: false,
+                interactive: false,
+                owner: ProcessOwner::Desktop,
+                restart_policy: None,
+            })
+            .await
+            .map_err(|err| {
+                DesktopProblem::runtime_failed(
+                    format!("failed to open target: {err}"),
+                    None,
+                    self.processes_locked(&state),
+                )
+            })?;
+
+        Ok(crate::desktop_types::DesktopOpenResponse {
+            process_id: snapshot.id,
+            pid: snapshot.pid,
+        })
+    }
+
+    async fn composite_cursor(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        screenshot_bytes: Vec<u8>,
+        options: &DesktopScreenshotOptions,
+    ) -> Result<Vec<u8>, DesktopProblem> {
+        let pos = self.mouse_position_locked(state, ready).await?;
+        self.draw_cursor_on_image(screenshot_bytes, pos.x, pos.y, options, &ready.environment)
+            .await
+    }
+
+    async fn composite_cursor_region(
+        &self,
+        state: &DesktopRuntimeStateData,
+        ready: &DesktopReadyContext,
+        screenshot_bytes: Vec<u8>,
+        options: &DesktopScreenshotOptions,
+        region_x: i32,
+        region_y: i32,
+        _region_width: u32,
+        _region_height: u32,
+    ) -> Result<Vec<u8>, DesktopProblem> {
+        let pos = self.mouse_position_locked(state, ready).await?;
+        // Adjust cursor position relative to the region
+        let cursor_x = pos.x - region_x;
+        let cursor_y = pos.y - region_y;
+        if cursor_x < 0 || cursor_y < 0 {
+            // Cursor is outside the region, return screenshot as-is
+            return Ok(screenshot_bytes);
+        }
+        self.draw_cursor_on_image(
+            screenshot_bytes,
+            cursor_x,
+            cursor_y,
+            options,
+            &ready.environment,
+        )
+        .await
+    }
+
+    async fn draw_cursor_on_image(
+        &self,
+        image_bytes: Vec<u8>,
+        x: i32,
+        y: i32,
+        options: &DesktopScreenshotOptions,
+        environment: &HashMap<String, String>,
+    ) -> Result<Vec<u8>, DesktopProblem> {
+        // Draw a crosshair cursor using ImageMagick convert
+        let draw_cmd = format!(
+            "stroke red stroke-width 2 line {},{},{},{} line {},{},{},{}",
+            x - 10,
+            y,
+            x + 10,
+            y,
+            x,
+            y - 10,
+            x,
+            y + 10
+        );
+        let args = vec![
+            "-".to_string(), // read from stdin
+            "-draw".to_string(),
+            draw_cmd,
+            options.output_arg().to_string(),
+        ];
+        let output = run_command_output_with_stdin(
+            "convert",
+            &args,
+            environment,
+            SCREENSHOT_TIMEOUT,
+            image_bytes.clone(),
+        )
+        .await
+        .map_err(|err| {
+            DesktopProblem::screenshot_failed(
+                format!("failed to composite cursor: {err}"),
+                Vec::new(),
+            )
+        })?;
+        if !output.status.success() {
+            // Fall back to returning the original screenshot without cursor
+            return Ok(image_bytes);
+        }
+        Ok(output.stdout)
+    }
+
+    pub async fn stream_status(&self) -> DesktopStreamStatusResponse {
+        self.streaming_manager.status().await
+    }
+}
+
+fn desktop_problem_to_sandbox_error(problem: DesktopProblem) -> SandboxError {
+    SandboxError::Conflict {
+        message: problem.to_error_info().message,
+    }
+}
+
+fn default_state_dir() -> PathBuf {
+    if let Ok(value) = std::env::var("XDG_STATE_HOME") {
+        return PathBuf::from(value).join("sandbox-agent").join("desktop");
+    }
+    if let Some(home) = dirs::home_dir() {
+        return home
+            .join(".local")
+            .join("state")
+            .join("sandbox-agent")
+            .join("desktop");
+    }
+    std::env::temp_dir().join("sandbox-agent-desktop")
+}
+
+fn socket_path(display_num: i32) -> PathBuf {
+    PathBuf::from(format!("/tmp/.X11-unix/X{display_num}"))
+}
+
+fn find_binary(name: &str) -> Option<PathBuf> {
+    let path_env = std::env::var_os("PATH")?;
+    for path in std::env::split_paths(&path_env) {
+        let candidate = path.join(name);
+        if candidate.is_file() {
+            return Some(candidate);
+        }
+    }
+    None
+}
+
+async fn run_command_output(
+    command: &str,
+    args: &[String],
+    environment: &HashMap<String, String>,
+    timeout: Duration,
+) -> Result<Output, String> {
+    run_command_output_with_optional_stdin(command, args, environment, timeout, None).await
+}
+
+async fn run_command_output_with_stdin(
+    command: &str,
+    args: &[String],
+    environment: &HashMap<String, String>,
+    timeout: Duration,
+    stdin_bytes: Vec<u8>,
+) -> Result<Output, String> {
+    run_command_output_with_optional_stdin(command, args, environment, timeout, Some(stdin_bytes))
+        .await
+}
+
+async fn run_command_output_with_optional_stdin(
+    command: &str,
+    args: &[String],
+    environment: &HashMap<String, String>,
+    timeout: Duration,
+    stdin_bytes: Option<Vec<u8>>,
+) -> Result<Output, String> {
+    use tokio::io::{AsyncReadExt, AsyncWriteExt};
+
+    let mut child = Command::new(command);
+    child.args(args);
+    child.envs(environment);
+    child.stdin(if stdin_bytes.is_some() {
+        Stdio::piped()
+    } else {
+        Stdio::null()
+    });
+    child.stdout(Stdio::piped());
+    child.stderr(Stdio::piped());
+
+    let mut child = child.spawn().map_err(|err| err.to_string())?;
+    let stdout = child
+        .stdout
+        .take()
+        .ok_or_else(|| "failed to capture child stdout".to_string())?;
+    let stderr = child
+        .stderr
+        .take()
+        .ok_or_else(|| "failed to capture child stderr".to_string())?;
+
+    let stdin_task = if let Some(bytes) = stdin_bytes {
+        let mut stdin = child
+            .stdin
+            .take()
+            .ok_or_else(|| "failed to capture child stdin".to_string())?;
+        Some(tokio::spawn(async move {
+            stdin.write_all(&bytes).await?;
+            stdin.shutdown().await
+        }))
+    } else {
+        None
+    };
+
+    let stdout_task = tokio::spawn(async move {
+        let mut stdout = stdout;
+        let mut bytes = Vec::new();
+        stdout.read_to_end(&mut bytes).await.map(|_| bytes)
+    });
+    let stderr_task = tokio::spawn(async move {
+        let mut stderr = stderr;
+        let mut bytes = Vec::new();
+        stderr.read_to_end(&mut bytes).await.map(|_| bytes)
+    });
+
+    let status = match tokio::time::timeout(timeout, child.wait()).await {
+        Ok(result) => result.map_err(|err| err.to_string())?,
+        Err(_) => {
+            terminate_child(&mut child).await?;
+            if let Some(stdin_task) = stdin_task {
+                let _ = stdin_task.await;
+            }
+            let _ = stdout_task.await;
+            let _ = stderr_task.await;
+            return Err(format!("command timed out after {}s", timeout.as_secs()));
+        }
+    };
+
+    if let Some(stdin_task) = stdin_task {
+        stdin_task
+            .await
+            .map_err(|err| err.to_string())?
+            .map_err(|err| err.to_string())?;
+    }
+
+    let stdout = stdout_task
+        .await
+        .map_err(|err| err.to_string())?
+        .map_err(|err| err.to_string())?;
+    let stderr = stderr_task
+        .await
+        .map_err(|err| err.to_string())?
+        .map_err(|err| err.to_string())?;
+
+    Ok(Output {
+        status,
+        stdout,
+        stderr,
+    })
+}
+
+async fn terminate_child(child: &mut Child) -> Result<(), String> {
+    if let Ok(Some(_)) = child.try_wait() {
+        return Ok(());
+    }
+    child.start_kill().map_err(|err| err.to_string())?;
+    let _ = tokio::time::timeout(Duration::from_secs(5), child.wait()).await;
+    Ok(())
+}
+
+fn process_exists(pid: u32) -> bool {
+    #[cfg(unix)]
+    unsafe {
+        return libc::kill(pid as i32, 0) == 0
+            || std::io::Error::last_os_error().raw_os_error() != Some(libc::ESRCH);
+    }
+    #[cfg(not(unix))]
+    {
+        let _ = pid;
+        false
+    }
+}
+
+fn parse_xrandr_resolution(bytes: &[u8]) -> Result<DesktopResolution, String> {
+    let text = String::from_utf8_lossy(bytes);
+    for line in text.lines() {
+        if let Some(index) = line.find(" current ") {
+            let tail = &line[index + " current ".len()..];
+            let mut parts = tail.split(',');
+            if let Some(current) = parts.next() {
+                let dims: Vec<&str> = current.split_whitespace().collect();
+                if dims.len() >= 3 {
+                    let width = dims[0]
+                        .parse::<u32>()
+                        .map_err(|_| "failed to parse xrandr width".to_string())?;
+                    let height = dims[2]
+                        .parse::<u32>()
+                        .map_err(|_| "failed to parse xrandr height".to_string())?;
+                    return Ok(DesktopResolution {
+                        width,
+                        height,
+                        dpi: None,
+                    });
+                }
+            }
+        }
+    }
+    Err("unable to parse xrandr current resolution".to_string())
+}
+
+fn parse_mouse_position(bytes: &[u8]) -> Result<DesktopMousePositionResponse, String> {
+    let text = String::from_utf8_lossy(bytes);
+    let mut x = None;
+    let mut y = None;
+    let mut screen = None;
+    let mut window = None;
+    for line in text.lines() {
+        if let Some((key, value)) = line.split_once('=') {
+            match key {
+                "X" => x = value.parse::<i32>().ok(),
+                "Y" => y = value.parse::<i32>().ok(),
+                "SCREEN" => screen = value.parse::<i32>().ok(),
+                "WINDOW" => window = Some(value.to_string()),
+                _ => {}
+            }
+        }
+    }
+    match (x, y) {
+        (Some(x), Some(y)) => Ok(DesktopMousePositionResponse {
+            x,
+            y,
+            screen,
+            window,
+        }),
+        _ => Err("unable to parse xdotool mouse position".to_string()),
+    }
+}
+
+fn type_text_args(text: String, delay_ms: u32) -> Vec<String> {
+    vec![
+        "type".to_string(),
+        "--delay".to_string(),
+        delay_ms.to_string(),
+        "--".to_string(),
+        text,
+    ]
+}
+
+fn press_key_args(key: String, modifiers: Option<DesktopKeyModifiers>) -> Vec<String> {
+    vec![
+        "key".to_string(),
+        "--".to_string(),
+        key_with_modifiers(key, modifiers),
+    ]
+}
+
+fn key_transition_args(command: &str, key: String) -> Vec<String> {
+    vec![command.to_string(), "--".to_string(), key]
+}
+
+fn key_with_modifiers(key: String, modifiers: Option<DesktopKeyModifiers>) -> String {
+    let Some(modifiers) = modifiers else {
+        return key;
+    };
+
+    let mut parts = Vec::new();
+    if modifiers.ctrl == Some(true) {
+        parts.push("ctrl");
+    }
+    if modifiers.shift == Some(true) {
+        parts.push("shift");
+    }
+    if modifiers.alt == Some(true) {
+        parts.push("alt");
+    }
+    if modifiers.cmd == Some(true) {
+        parts.push("super");
+    }
+    parts.push(key.as_str());
+    parts.join("+")
+}
+
+fn mouse_button_transition_args(
+    command: &str,
+    coordinates: Option<(i32, i32)>,
+    button: u8,
+) -> Vec<String> {
+    let mut args = Vec::new();
+    if let Some((x, y)) = coordinates {
+        args.push("mousemove".to_string());
+        args.push(x.to_string());
+        args.push(y.to_string());
+    }
+    args.push(command.to_string());
+    args.push(button.to_string());
+    args
+}
+
+fn screenshot_options(
+    format: Option<DesktopScreenshotFormat>,
+    quality: Option<u8>,
+    scale: Option<f32>,
+) -> Result<DesktopScreenshotOptions, DesktopProblem> {
+    let quality = quality.unwrap_or(85);
+    if !(1..=100).contains(&quality) {
+        return Err(DesktopProblem::invalid_action(
+            "quality must be between 1 and 100",
+        ));
+    }
+
+    let scale = scale.unwrap_or(1.0);
+    if !(0.1..=1.0).contains(&scale) {
+        return Err(DesktopProblem::invalid_action(
+            "scale must be between 0.1 and 1.0",
+        ));
+    }
+
+    Ok(DesktopScreenshotOptions {
+        format: format.unwrap_or(DesktopScreenshotFormat::Png),
+        quality,
+        scale,
+    })
+}
+
+async fn maybe_convert_screenshot(
+    bytes: Vec<u8>,
+    options: &DesktopScreenshotOptions,
+    environment: &HashMap<String, String>,
+) -> Result<Vec<u8>, String> {
+    if !options.needs_convert() {
+        return Ok(bytes);
+    }
+
+    let mut args = vec!["png:-".to_string()];
+    if (options.scale - 1.0).abs() > f32::EPSILON {
+        args.push("-resize".to_string());
+        args.push(format!("{:.2}%", options.scale * 100.0));
+    }
+    if options.format != DesktopScreenshotFormat::Png {
+        args.push("-quality".to_string());
+        args.push(options.quality.to_string());
+    }
+    args.push(options.output_arg().to_string());
+
+    let output =
+        run_command_output_with_stdin("convert", &args, environment, SCREENSHOT_TIMEOUT, bytes)
+            .await?;
+    if !output.status.success() {
+        return Err(format!(
+            "desktop screenshot conversion failed: {}",
+            String::from_utf8_lossy(&output.stderr).trim()
+        ));
+    }
+    Ok(output.stdout)
+}
+
+fn validate_image_bytes(bytes: &[u8], format: DesktopScreenshotFormat) -> Result<(), String> {
+    match format {
+        DesktopScreenshotFormat::Png => {
+            if bytes.len() < PNG_SIGNATURE.len() || &bytes[..PNG_SIGNATURE.len()] != PNG_SIGNATURE {
+                return Err("desktop screenshot did not return PNG bytes".to_string());
+            }
+        }
+        DesktopScreenshotFormat::Jpeg => {
+            if bytes.len() < JPEG_SIGNATURE.len()
+                || &bytes[..JPEG_SIGNATURE.len()] != JPEG_SIGNATURE
+            {
+                return Err("desktop screenshot did not return JPEG bytes".to_string());
+            }
+        }
+        DesktopScreenshotFormat::Webp => {
+            if bytes.len() < 12
+                || &bytes[..WEBP_RIFF_SIGNATURE.len()] != WEBP_RIFF_SIGNATURE
+                || &bytes[8..12] != WEBP_WEBP_SIGNATURE
+            {
+                return Err("desktop screenshot did not return WebP bytes".to_string());
+            }
+        }
+    }
+    Ok(())
+}
+
+fn validate_start_request(width: u32, height: u32, dpi: u32) -> Result<(), DesktopProblem> {
+    if width == 0 || height == 0 {
+        return Err(DesktopProblem::invalid_action(
+            "Desktop width and height must be greater than 0",
+        ));
+    }
+    if dpi == 0 {
+        return Err(DesktopProblem::invalid_action(
+            "Desktop dpi must be greater than 0",
+        ));
+    }
+    Ok(())
+}
+
+fn validate_region(query: &DesktopRegionScreenshotQuery) -> Result<(), DesktopProblem> {
+    validate_coordinates(query.x, query.y)?;
+    if query.width == 0 || query.height == 0 {
+        return Err(DesktopProblem::invalid_action(
+            "Screenshot region width and height must be greater than 0",
+        ));
+    }
+    Ok(())
+}
+
+fn validate_optional_coordinates(
+    x: Option<i32>,
+    y: Option<i32>,
+) -> Result<Option<(i32, i32)>, DesktopProblem> {
+    match (x, y) {
+        (Some(x), Some(y)) => {
+            validate_coordinates(x, y)?;
+            Ok(Some((x, y)))
+        }
+        (None, None) => Ok(None),
+        _ => Err(DesktopProblem::invalid_action(
+            "x and y must both be provided when setting coordinates",
+        )),
+    }
+}
+
+fn validate_coordinates(x: i32, y: i32) -> Result<(), DesktopProblem> {
+    if x < 0 || y < 0 {
+        return Err(DesktopProblem::invalid_action(
+            "Desktop coordinates must be non-negative",
+        ));
+    }
+    Ok(())
+}
+
+fn mouse_button_code(button: DesktopMouseButton) -> u8 {
+    match button {
+        DesktopMouseButton::Left => 1,
+        DesktopMouseButton::Middle => 2,
+        DesktopMouseButton::Right => 3,
+    }
+}
+
+fn append_scroll_clicks(
+    args: &mut Vec<String>,
+    delta: i32,
+    positive_button: u8,
+    negative_button: u8,
+) {
+    if delta == 0 {
+        return;
+    }
+    let button = if delta > 0 {
+        positive_button
+    } else {
+        negative_button
+    };
+    let repeat = delta.unsigned_abs();
+    args.push("click".to_string());
+    if repeat > 1 {
+        args.push("--repeat".to_string());
+        args.push(repeat.to_string());
+    }
+    args.push(button.to_string());
+}
+
+fn parse_window_geometry(bytes: &[u8]) -> Result<(i32, i32, u32, u32), String> {
+    let text = String::from_utf8_lossy(bytes);
+    let mut position = None;
+    let mut geometry = None;
+    for line in text.lines() {
+        let trimmed = line.trim();
+        if let Some(value) = trimmed.strip_prefix("Position:") {
+            let coordinate_text = value
+                .trim()
+                .split_whitespace()
+                .next()
+                .ok_or_else(|| "unable to parse window position".to_string())?;
+            let (x, y) = coordinate_text
+                .split_once(',')
+                .ok_or_else(|| "unable to parse window position".to_string())?;
+            let x = x
+                .parse::<i32>()
+                .map_err(|_| "failed to parse window x coordinate".to_string())?;
+            let y = y
+                .parse::<i32>()
+                .map_err(|_| "failed to parse window y coordinate".to_string())?;
+            position = Some((x, y));
+        }
+        if let Some(value) = trimmed.strip_prefix("Geometry:") {
+            let (width, height) = value
+                .trim()
+                .split_once('x')
+                .ok_or_else(|| "unable to parse window geometry".to_string())?;
+            let width = width
+                .parse::<u32>()
+                .map_err(|_| "failed to parse window width".to_string())?;
+            let height = height
+                .parse::<u32>()
+                .map_err(|_| "failed to parse window height".to_string())?;
+            geometry = Some((width, height));
+        }
+    }
+
+    match (position, geometry) {
+        (Some((x, y)), Some((width, height))) => Ok((x, y, width, height)),
+        _ => Err("unable to parse xdotool window geometry".to_string()),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_xrandr_resolution_reads_current_geometry() {
+        let bytes = b"Screen 0: minimum 1 x 1, current 1440 x 900, maximum 32767 x 32767\n";
+        let parsed = parse_xrandr_resolution(bytes).expect("parse resolution");
+        assert_eq!(parsed.width, 1440);
+        assert_eq!(parsed.height, 900);
+    }
+
+    #[test]
+    fn parse_mouse_position_reads_shell_output() {
+        let bytes = b"X=123\nY=456\nSCREEN=0\nWINDOW=0\n";
+        let parsed = parse_mouse_position(bytes).expect("parse mouse position");
+        assert_eq!(parsed.x, 123);
+        assert_eq!(parsed.y, 456);
+        assert_eq!(parsed.screen, Some(0));
+        assert_eq!(parsed.window.as_deref(), Some("0"));
+    }
+
+    #[test]
+    fn png_validation_rejects_non_png_bytes() {
+        let error = validate_image_bytes(b"not png", DesktopScreenshotFormat::Png)
+            .expect_err("validation should fail");
+        assert!(error.contains("PNG"));
+    }
+
+    #[test]
+    fn type_text_args_insert_double_dash_before_user_text() {
+        let args = type_text_args("--help".to_string(), 5);
+        assert_eq!(args, vec!["type", "--delay", "5", "--", "--help"]);
+    }
+
+    #[test]
+    fn press_key_args_insert_double_dash_before_user_key() {
+        let args = press_key_args("--help".to_string(), None);
+        assert_eq!(args, vec!["key", "--", "--help"]);
+    }
+
+    #[test]
+    fn press_key_args_builds_key_sequence_from_modifiers() {
+        let args = press_key_args(
+            "a".to_string(),
+            Some(DesktopKeyModifiers {
+                ctrl: Some(true),
+                shift: Some(true),
+                alt: Some(false),
+                cmd: None,
+            }),
+        );
+        assert_eq!(args, vec!["key", "--", "ctrl+shift+a"]);
+    }
+
+    #[test]
+    fn append_scroll_clicks_uses_positive_direction_buttons() {
+        let mut args = Vec::new();
+        append_scroll_clicks(&mut args, 2, 5, 4);
+        append_scroll_clicks(&mut args, -3, 7, 6);
+        assert_eq!(
+            args,
+            vec!["click", "--repeat", "2", "5", "click", "--repeat", "3", "6"]
+        );
+    }
+
+    #[test]
+    fn parse_window_geometry_reads_xdotool_output() {
+        let bytes = b"Window 123\n  Position: 400,300 (screen: 0)\n  Geometry: 1440x900\n";
+        let parsed = parse_window_geometry(bytes).expect("parse geometry");
+        assert_eq!(parsed, (400, 300, 1440, 900));
+    }
+
+    #[cfg(unix)]
+    #[tokio::test]
+    async fn run_command_output_kills_child_on_timeout() {
+        let pid_file = std::env::temp_dir().join(format!(
+            "sandbox-agent-desktop-runtime-timeout-{}.pid",
+            std::process::id()
+        ));
+        let _ = std::fs::remove_file(&pid_file);
+        let command = format!("echo $$ > {}; exec sleep 30", pid_file.display());
+        let args = vec!["-c".to_string(), command];
+
+        let error = run_command_output("sh", &args, &HashMap::new(), Duration::from_millis(200))
+            .await
+            .expect_err("command should time out");
+        assert!(error.contains("timed out"));
+
+        let pid = std::fs::read_to_string(&pid_file)
+            .expect("pid file should exist")
+            .trim()
+            .parse::<u32>()
+            .expect("pid should parse");
+
+        for _ in 0..20 {
+            if !process_exists(pid) {
+                let _ = std::fs::remove_file(&pid_file);
+                return;
+            }
+            tokio::time::sleep(Duration::from_millis(50)).await;
+        }
+
+        let _ = std::fs::remove_file(&pid_file);
+        panic!("timed out child process {pid} still exists after timeout cleanup");
+    }
+}
diff --git a/server/packages/sandbox-agent/src/desktop_streaming.rs b/server/packages/sandbox-agent/src/desktop_streaming.rs
new file mode 100644
index 0000000..8629132
--- /dev/null
+++ b/server/packages/sandbox-agent/src/desktop_streaming.rs
@@ -0,0 +1,391 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::time::Duration;
+
+use tokio::sync::Mutex;
+
+use sandbox_agent_error::SandboxError;
+
+use crate::desktop_types::{DesktopProcessInfo, DesktopResolution, DesktopStreamStatusResponse};
+use crate::process_runtime::{ProcessOwner, ProcessRuntime, ProcessStartSpec};
+
+/// Internal port where neko listens for HTTP/WS traffic.
+const NEKO_INTERNAL_PORT: u16 = 18100;
+
+/// UDP ephemeral port range for WebRTC media.
+const NEKO_EPR: &str = "59050-59070";
+
+/// How long to wait for neko to become ready.
+const NEKO_READY_TIMEOUT: Duration = Duration::from_secs(15);
+
+/// How long between readiness polls.
+const NEKO_READY_POLL: Duration = Duration::from_millis(300);
+
+#[derive(Debug, Clone)]
+pub struct StreamingConfig {
+    pub video_codec: String,
+    pub audio_codec: String,
+    pub frame_rate: u32,
+    pub webrtc_port_range: String,
+}
+
+impl Default for StreamingConfig {
+    fn default() -> Self {
+        Self {
+            video_codec: "vp8".to_string(),
+            audio_codec: "opus".to_string(),
+            frame_rate: 30,
+            webrtc_port_range: NEKO_EPR.to_string(),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct DesktopStreamingManager {
+    inner: Arc<Mutex<DesktopStreamingState>>,
+    process_runtime: Arc<ProcessRuntime>,
+}
+
+#[derive(Debug)]
+struct DesktopStreamingState {
+    active: bool,
+    process_id: Option<String>,
+    /// Base URL for neko's internal HTTP server (e.g. "http://127.0.0.1:18100").
+    neko_base_url: Option<String>,
+    /// Session cookie obtained from neko login, used for WS auth.
+    neko_session_cookie: Option<String>,
+    display: Option<String>,
+    resolution: Option<DesktopResolution>,
+    streaming_config: StreamingConfig,
+    window_id: Option<String>,
+}
+
+impl Default for DesktopStreamingState {
+    fn default() -> Self {
+        Self {
+            active: false,
+            process_id: None,
+            neko_base_url: None,
+            neko_session_cookie: None,
+            display: None,
+            resolution: None,
+            streaming_config: StreamingConfig::default(),
+            window_id: None,
+        }
+    }
+}
+
+impl DesktopStreamingManager {
+    pub fn new(process_runtime: Arc<ProcessRuntime>) -> Self {
+        Self {
+            inner: Arc::new(Mutex::new(DesktopStreamingState::default())),
+            process_runtime,
+        }
+    }
+
+    /// Start the neko streaming subprocess targeting the given display.
+    pub async fn start(
+        &self,
+        display: &str,
+        resolution: DesktopResolution,
+        environment: &HashMap<String, String>,
+        config: Option<StreamingConfig>,
+        window_id: Option<String>,
+    ) -> Result<DesktopStreamStatusResponse, SandboxError> {
+        let config = config.unwrap_or_default();
+        let mut state = self.inner.lock().await;
+
+        if state.active {
+            return Ok(DesktopStreamStatusResponse {
+                active: true,
+                window_id: state.window_id.clone(),
+                process_id: state.process_id.clone(),
+            });
+        }
+
+        // Stop any stale process.
+        if let Some(ref old_id) = state.process_id {
+            let _ = self.process_runtime.stop_process(old_id, Some(2000)).await;
+            state.process_id = None;
+            state.neko_base_url = None;
+            state.neko_session_cookie = None;
+        }
+
+        let mut env = environment.clone();
+        env.insert("DISPLAY".to_string(), display.to_string());
+
+        let bind_addr = format!("0.0.0.0:{}", NEKO_INTERNAL_PORT);
+        let screen = format!(
+            "{}x{}@{}",
+            resolution.width, resolution.height, config.frame_rate
+        );
+
+        let snapshot = self
+            .process_runtime
+            .start_process(ProcessStartSpec {
+                command: "neko".to_string(),
+                args: vec![
+                    "serve".to_string(),
+                    "--server.bind".to_string(),
+                    bind_addr,
+                    "--desktop.screen".to_string(),
+                    screen,
+                    "--desktop.display".to_string(),
+                    display.to_string(),
+                    "--capture.video.display".to_string(),
+                    display.to_string(),
+                    "--capture.video.codec".to_string(),
+                    config.video_codec.clone(),
+                    "--capture.audio.codec".to_string(),
+                    config.audio_codec.clone(),
+                    "--webrtc.epr".to_string(),
+                    config.webrtc_port_range.clone(),
+                    "--webrtc.icelite".to_string(),
+                    "--webrtc.nat1to1".to_string(),
+                    "127.0.0.1".to_string(),
+                    "--member.provider".to_string(),
+                    "noauth".to_string(),
+                    // Disable the custom xf86-input-neko driver (defaults to true
+                    // in neko v3). The driver socket is not available outside
+                    // neko's official Docker images; XTEST is used instead.
+                    "--desktop.input.enabled=false".to_string(),
+                ],
+                cwd: None,
+                env,
+                tty: false,
+                interactive: false,
+                owner: ProcessOwner::Desktop,
+                restart_policy: None,
+            })
+            .await
+            .map_err(|e| SandboxError::Conflict {
+                message: format!("failed to start neko streaming process: {e}"),
+            })?;
+
+        let neko_base = format!("http://127.0.0.1:{}", NEKO_INTERNAL_PORT);
+        let process_id_clone = snapshot.id.clone();
+        state.process_id = Some(snapshot.id.clone());
+        state.neko_base_url = Some(neko_base.clone());
+        state.display = Some(display.to_string());
+        state.resolution = Some(resolution);
+        state.streaming_config = config;
+        state.window_id = window_id;
+        state.active = true;
+
+        // Drop the lock before waiting for readiness.
+        drop(state);
+
+        // Wait for neko to be ready by polling its login endpoint.
+        let deadline = tokio::time::Instant::now() + NEKO_READY_TIMEOUT;
+        let login_url = format!("{}/api/login", neko_base);
+        let client = reqwest::Client::builder()
+            .redirect(reqwest::redirect::Policy::none())
+            .build()
+            .unwrap_or_else(|_| reqwest::Client::new());
+
+        let mut session_cookie = None;
+
+        loop {
+            match client
+                .post(&login_url)
+                .json(&serde_json::json!({"username": "admin", "password": "admin"}))
+                .send()
+                .await
+            {
+                Ok(resp) if resp.status().is_success() => {
+                    // Extract NEKO_SESSION cookie from Set-Cookie header.
+                    if let Some(set_cookie) = resp.headers().get("set-cookie") {
+                        if let Ok(cookie_str) = set_cookie.to_str() {
+                            // Extract just the cookie value (before the first ';').
+                            if let Some(cookie_part) = cookie_str.split(';').next() {
+                                session_cookie = Some(cookie_part.to_string());
+                            }
+                        }
+                    }
+                    tracing::info!("neko streaming process ready, session obtained");
+
+                    // Take control so the connected client can send input.
+                    let control_url = format!("{}/api/room/control/take", neko_base);
+                    if let Some(ref cookie) = session_cookie {
+                        let _ = client
+                            .post(&control_url)
+                            .header("Cookie", cookie.as_str())
+                            .send()
+                            .await;
+                        tracing::info!("neko control taken");
+                    }
+                    break;
+                }
+                _ => {}
+            }
+
+            if tokio::time::Instant::now() >= deadline {
+                tracing::warn!("neko did not become ready within timeout, proceeding anyway");
+                break;
+            }
+            tokio::time::sleep(NEKO_READY_POLL).await;
+        }
+
+        // Store the session cookie.
+        if let Some(ref cookie) = session_cookie {
+            let mut state = self.inner.lock().await;
+            state.neko_session_cookie = Some(cookie.clone());
+        }
+
+        let state = self.inner.lock().await;
+        let state_window_id = state.window_id.clone();
+        drop(state);
+
+        Ok(DesktopStreamStatusResponse {
+            active: true,
+            window_id: state_window_id,
+            process_id: Some(process_id_clone),
+        })
+    }
+
+    /// Stop streaming and tear down neko subprocess.
+    pub async fn stop(&self) -> DesktopStreamStatusResponse {
+        let mut state = self.inner.lock().await;
+        if let Some(ref process_id) = state.process_id.take() {
+            let _ = self
+                .process_runtime
+                .stop_process(process_id, Some(3000))
+                .await;
+        }
+        state.active = false;
+        state.neko_base_url = None;
+        state.neko_session_cookie = None;
+        state.display = None;
+        state.resolution = None;
+        state.window_id = None;
+        DesktopStreamStatusResponse {
+            active: false,
+            window_id: None,
+            process_id: None,
+        }
+    }
+
+    pub async fn status(&self) -> DesktopStreamStatusResponse {
+        let state = self.inner.lock().await;
+        DesktopStreamStatusResponse {
+            active: state.active,
+            window_id: state.window_id.clone(),
+            process_id: state.process_id.clone(),
+        }
+    }
+
+    pub async fn ensure_active(&self) -> Result<(), SandboxError> {
+        if self.inner.lock().await.active {
+            Ok(())
+        } else {
+            Err(SandboxError::Conflict {
+                message: "desktop streaming is not active".to_string(),
+            })
+        }
+    }
+
+    /// Get the neko WebSocket URL for signaling proxy, including session cookie.
+    pub async fn neko_ws_url(&self) -> Option<String> {
+        self.inner
+            .lock()
+            .await
+            .neko_base_url
+            .as_ref()
+            .map(|base| base.replace("http://", "ws://") + "/api/ws")
+    }
+
+    /// Get the neko base HTTP URL (e.g. `http://127.0.0.1:18100`).
+    pub async fn neko_base_url(&self) -> Option<String> {
+        self.inner.lock().await.neko_base_url.clone()
+    }
+
+    /// Create a fresh neko login session and return the session cookie.
+    /// Each WebSocket proxy connection should call this to get its own
+    /// session, avoiding conflicts when multiple clients connect.
+    /// Uses a unique username per connection so neko treats them as
+    /// separate members (noauth provider allows any credentials).
+    pub async fn create_neko_session(&self) -> Option<String> {
+        let base_url = self.neko_base_url().await?;
+        let client = reqwest::Client::new();
+        let login_url = format!("{}/api/login", base_url);
+        let username = format!(
+            "user-{}",
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        tracing::debug!(
+            "creating neko session: username={}, url={}",
+            username,
+            login_url
+        );
+        let resp = match client
+            .post(&login_url)
+            .json(&serde_json::json!({"username": username, "password": "admin"}))
+            .send()
+            .await
+        {
+            Ok(r) => r,
+            Err(e) => {
+                tracing::warn!("neko login request failed: {e}");
+                return None;
+            }
+        };
+        if !resp.status().is_success() {
+            tracing::warn!("neko login returned status {}", resp.status());
+            return None;
+        }
+        let cookie = resp
+            .headers()
+            .get("set-cookie")
+            .and_then(|v| v.to_str().ok())
+            .map(|v| v.split(';').next().unwrap_or(v).to_string());
+        let cookie = match cookie {
+            Some(c) => c,
+            None => {
+                tracing::warn!("neko login response missing set-cookie header");
+                return None;
+            }
+        };
+        tracing::debug!("neko session created: {}", username);
+
+        // Take control for this session.
+        let control_url = format!("{}/api/room/control/take", base_url);
+        let _ = client
+            .post(&control_url)
+            .header("Cookie", &cookie)
+            .send()
+            .await;
+
+        Some(cookie)
+    }
+
+    /// Get the shared neko session cookie (used during startup).
+    pub async fn neko_session_cookie(&self) -> Option<String> {
+        self.inner.lock().await.neko_session_cookie.clone()
+    }
+
+    pub async fn resolution(&self) -> Option<DesktopResolution> {
+        self.inner.lock().await.resolution.clone()
+    }
+
+    pub async fn is_active(&self) -> bool {
+        self.inner.lock().await.active
+    }
+
+    /// Return process diagnostics for the neko streaming subprocess, if one
+    /// has been started.  The returned info mirrors the shape used by
+    /// `DesktopRuntime::processes_locked` for xvfb/openbox/dbus.
+    pub async fn process_info(&self) -> Option<DesktopProcessInfo> {
+        let state = self.inner.lock().await;
+        let process_id = state.process_id.as_ref()?;
+        let snapshot = self.process_runtime.snapshot(process_id).await.ok()?;
+        Some(DesktopProcessInfo {
+            name: "neko".to_string(),
+            pid: snapshot.pid,
+            running: snapshot.status == crate::process_runtime::ProcessStatus::Running,
+            log_path: None,
+        })
+    }
+}
diff --git a/server/packages/sandbox-agent/src/desktop_types.rs b/server/packages/sandbox-agent/src/desktop_types.rs
new file mode 100644
index 0000000..912e62f
--- /dev/null
+++ b/server/packages/sandbox-agent/src/desktop_types.rs
@@ -0,0 +1,397 @@
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use utoipa::{IntoParams, ToSchema};
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum DesktopState {
+    Inactive,
+    InstallRequired,
+    Starting,
+    Active,
+    Stopping,
+    Failed,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopResolution {
+    pub width: u32,
+    pub height: u32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub dpi: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopErrorInfo {
+    pub code: String,
+    pub message: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopProcessInfo {
+    pub name: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub pid: Option<u32>,
+    pub running: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub log_path: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopStatusResponse {
+    pub state: DesktopState,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub display: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub resolution: Option<DesktopResolution>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub started_at: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub last_error: Option<DesktopErrorInfo>,
+    #[serde(default)]
+    pub missing_dependencies: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub install_command: Option<String>,
+    #[serde(default)]
+    pub processes: Vec<DesktopProcessInfo>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub runtime_log_path: Option<String>,
+    /// Current visible windows (included when the desktop is active).
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub windows: Vec<DesktopWindowInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, IntoParams, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopStartRequest {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub width: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub height: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub dpi: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub display_num: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub state_dir: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub stream_video_codec: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub stream_audio_codec: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub stream_frame_rate: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub webrtc_port_range: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub recording_fps: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, IntoParams, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopScreenshotQuery {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub format: Option<DesktopScreenshotFormat>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub quality: Option<u8>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub scale: Option<f32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub show_cursor: Option<bool>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum DesktopScreenshotFormat {
+    Png,
+    Jpeg,
+    Webp,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, IntoParams)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopRegionScreenshotQuery {
+    pub x: i32,
+    pub y: i32,
+    pub width: u32,
+    pub height: u32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub format: Option<DesktopScreenshotFormat>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub quality: Option<u8>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub scale: Option<f32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub show_cursor: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMousePositionResponse {
+    pub x: i32,
+    pub y: i32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub screen: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub window: Option<String>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum DesktopMouseButton {
+    Left,
+    Middle,
+    Right,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMouseMoveRequest {
+    pub x: i32,
+    pub y: i32,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMouseClickRequest {
+    pub x: i32,
+    pub y: i32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub button: Option<DesktopMouseButton>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub click_count: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMouseDownRequest {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub x: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub y: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub button: Option<DesktopMouseButton>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMouseUpRequest {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub x: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub y: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub button: Option<DesktopMouseButton>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMouseDragRequest {
+    pub start_x: i32,
+    pub start_y: i32,
+    pub end_x: i32,
+    pub end_y: i32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub button: Option<DesktopMouseButton>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopMouseScrollRequest {
+    pub x: i32,
+    pub y: i32,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub delta_x: Option<i32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub delta_y: Option<i32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopKeyboardTypeRequest {
+    pub text: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub delay_ms: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopKeyboardPressRequest {
+    pub key: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub modifiers: Option<DesktopKeyModifiers>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopKeyModifiers {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub ctrl: Option<bool>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub shift: Option<bool>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub alt: Option<bool>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub cmd: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopKeyboardDownRequest {
+    pub key: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopKeyboardUpRequest {
+    pub key: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopActionResponse {
+    pub ok: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopDisplayInfoResponse {
+    pub display: String,
+    pub resolution: DesktopResolution,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopWindowInfo {
+    pub id: String,
+    pub title: String,
+    pub x: i32,
+    pub y: i32,
+    pub width: u32,
+    pub height: u32,
+    pub is_active: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopWindowListResponse {
+    pub windows: Vec<DesktopWindowInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopRecordingStartRequest {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub fps: Option<u32>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum DesktopRecordingStatus {
+    Recording,
+    Completed,
+    Failed,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopRecordingInfo {
+    pub id: String,
+    pub status: DesktopRecordingStatus,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub process_id: Option<String>,
+    pub file_name: String,
+    pub bytes: u64,
+    pub started_at: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub ended_at: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopRecordingListResponse {
+    pub recordings: Vec<DesktopRecordingInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopStreamStatusResponse {
+    pub active: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub window_id: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub process_id: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopClipboardResponse {
+    pub text: String,
+    pub selection: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, IntoParams, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopClipboardQuery {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub selection: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopClipboardWriteRequest {
+    pub text: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub selection: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopLaunchRequest {
+    pub app: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub args: Option<Vec<String>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub wait: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopLaunchResponse {
+    pub process_id: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub pid: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub window_id: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopOpenRequest {
+    pub target: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopOpenResponse {
+    pub process_id: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub pid: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopWindowMoveRequest {
+    pub x: i32,
+    pub y: i32,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct DesktopWindowResizeRequest {
+    pub width: u32,
+    pub height: u32,
+}
diff --git a/server/packages/sandbox-agent/src/lib.rs b/server/packages/sandbox-agent/src/lib.rs
index b5031e1..d7b92d6 100644
--- a/server/packages/sandbox-agent/src/lib.rs
+++ b/server/packages/sandbox-agent/src/lib.rs
@@ -3,6 +3,13 @@
 mod acp_proxy_runtime;
 pub mod cli;
 pub mod daemon;
+mod desktop_errors;
+mod desktop_install;
+mod desktop_recording;
+mod desktop_runtime;
+mod desktop_streaming;
+pub mod desktop_types;
+mod process_runtime;
 pub mod router;
 pub mod server_logs;
 pub mod telemetry;
diff --git a/server/packages/sandbox-agent/src/process_runtime.rs b/server/packages/sandbox-agent/src/process_runtime.rs
new file mode 100644
index 0000000..3f2ce8d
--- /dev/null
+++ b/server/packages/sandbox-agent/src/process_runtime.rs
@@ -0,0 +1,1152 @@
+use std::collections::{HashMap, VecDeque};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+use std::sync::Arc;
+use std::time::Instant;
+
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine;
+use serde::{Deserialize, Serialize};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncWriteExt};
+use tokio::process::{Child, ChildStdin, Command};
+use tokio::sync::{broadcast, Mutex, RwLock};
+
+use sandbox_agent_error::SandboxError;
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProcessStatus {
+    Running,
+    Exited,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProcessStream {
+    Stdout,
+    Stderr,
+    Pty,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProcessOwner {
+    User,
+    Desktop,
+    System,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum RestartPolicy {
+    Never,
+    Always,
+    OnFailure,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProcessStartSpec {
+    pub command: String,
+    pub args: Vec<String>,
+    pub cwd: Option<String>,
+    pub env: HashMap<String, String>,
+    pub tty: bool,
+    pub interactive: bool,
+    pub owner: ProcessOwner,
+    pub restart_policy: Option<RestartPolicy>,
+}
+
+#[derive(Debug, Clone)]
+pub struct RunSpec {
+    pub command: String,
+    pub args: Vec<String>,
+    pub cwd: Option<String>,
+    pub env: HashMap<String, String>,
+    pub timeout_ms: Option<u64>,
+    pub max_output_bytes: Option<usize>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RunOutput {
+    pub exit_code: Option<i32>,
+    pub timed_out: bool,
+    pub stdout: String,
+    pub stderr: String,
+    pub stdout_truncated: bool,
+    pub stderr_truncated: bool,
+    pub duration_ms: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessLogLine {
+    pub sequence: u64,
+    pub stream: ProcessStream,
+    pub timestamp_ms: i64,
+    pub data: String,
+    pub encoding: &'static str,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessSnapshot {
+    pub id: String,
+    pub command: String,
+    pub args: Vec<String>,
+    pub cwd: Option<String>,
+    pub tty: bool,
+    pub interactive: bool,
+    pub owner: ProcessOwner,
+    pub status: ProcessStatus,
+    pub pid: Option<u32>,
+    pub exit_code: Option<i32>,
+    pub created_at_ms: i64,
+    pub exited_at_ms: Option<i64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessRuntimeConfig {
+    pub max_concurrent_processes: usize,
+    pub default_run_timeout_ms: u64,
+    pub max_run_timeout_ms: u64,
+    pub max_output_bytes: usize,
+    pub max_log_bytes_per_process: usize,
+    pub max_input_bytes_per_request: usize,
+}
+
+impl Default for ProcessRuntimeConfig {
+    fn default() -> Self {
+        Self {
+            max_concurrent_processes: 64,
+            default_run_timeout_ms: 30_000,
+            max_run_timeout_ms: 300_000,
+            max_output_bytes: 1_048_576,
+            max_log_bytes_per_process: 10_485_760,
+            max_input_bytes_per_request: 65_536,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct ProcessRuntime {
+    config: Arc<RwLock<ProcessRuntimeConfig>>,
+    inner: Arc<ProcessRuntimeInner>,
+}
+
+#[derive(Debug)]
+struct ProcessRuntimeInner {
+    next_id: AtomicU64,
+    processes: RwLock<HashMap<String, Arc<ManagedProcess>>>,
+}
+
+#[derive(Debug)]
+struct ManagedProcess {
+    id: String,
+    command: String,
+    args: Vec<String>,
+    cwd: Option<String>,
+    tty: bool,
+    interactive: bool,
+    owner: ProcessOwner,
+    #[allow(dead_code)]
+    restart_policy: RestartPolicy,
+    spec: ProcessStartSpec,
+    created_at_ms: i64,
+    max_log_bytes: usize,
+    runtime: Mutex<ManagedRuntime>,
+    status: RwLock<ManagedStatus>,
+    sequence: AtomicU64,
+    logs: Mutex<VecDeque<StoredLog>>,
+    total_log_bytes: Mutex<usize>,
+    log_tx: broadcast::Sender<ProcessLogLine>,
+    stop_requested: AtomicBool,
+}
+
+#[derive(Debug)]
+struct ManagedRuntime {
+    pid: Option<u32>,
+    stdin: Option<ProcessStdin>,
+    #[cfg(unix)]
+    pty_resize_fd: Option<std::fs::File>,
+}
+
+#[derive(Debug)]
+enum ProcessStdin {
+    Pipe(ChildStdin),
+    Pty(tokio::fs::File),
+}
+
+#[derive(Debug, Clone)]
+struct StoredLog {
+    line: ProcessLogLine,
+    byte_len: usize,
+}
+
+#[derive(Debug, Clone)]
+struct ManagedStatus {
+    status: ProcessStatus,
+    exit_code: Option<i32>,
+    exited_at_ms: Option<i64>,
+}
+
+struct SpawnedPipeProcess {
+    child: Child,
+    stdout: tokio::process::ChildStdout,
+    stderr: tokio::process::ChildStderr,
+    runtime: ManagedRuntime,
+}
+
+#[cfg(unix)]
+struct SpawnedTtyProcess {
+    child: Child,
+    reader: tokio::fs::File,
+    runtime: ManagedRuntime,
+}
+
+impl ProcessRuntime {
+    pub fn new() -> Self {
+        Self {
+            config: Arc::new(RwLock::new(ProcessRuntimeConfig::default())),
+            inner: Arc::new(ProcessRuntimeInner {
+                next_id: AtomicU64::new(1),
+                processes: RwLock::new(HashMap::new()),
+            }),
+        }
+    }
+
+    pub async fn get_config(&self) -> ProcessRuntimeConfig {
+        self.config.read().await.clone()
+    }
+
+    pub async fn set_config(
+        &self,
+        mut value: ProcessRuntimeConfig,
+    ) -> Result<ProcessRuntimeConfig, SandboxError> {
+        if value.max_concurrent_processes == 0 {
+            return Err(SandboxError::InvalidRequest {
+                message: "maxConcurrentProcesses must be greater than 0".to_string(),
+            });
+        }
+        if value.default_run_timeout_ms == 0 || value.max_run_timeout_ms == 0 {
+            return Err(SandboxError::InvalidRequest {
+                message: "timeouts must be greater than 0".to_string(),
+            });
+        }
+        if value.default_run_timeout_ms > value.max_run_timeout_ms {
+            value.default_run_timeout_ms = value.max_run_timeout_ms;
+        }
+        if value.max_output_bytes == 0
+            || value.max_log_bytes_per_process == 0
+            || value.max_input_bytes_per_request == 0
+        {
+            return Err(SandboxError::InvalidRequest {
+                message: "byte limits must be greater than 0".to_string(),
+            });
+        }
+
+        *self.config.write().await = value.clone();
+        Ok(value)
+    }
+
+    pub async fn start_process(
+        &self,
+        spec: ProcessStartSpec,
+    ) -> Result<ProcessSnapshot, SandboxError> {
+        if spec.command.trim().is_empty() {
+            return Err(SandboxError::InvalidRequest {
+                message: "command must not be empty".to_string(),
+            });
+        }
+
+        let config = self.get_config().await;
+        if self.running_process_count().await >= config.max_concurrent_processes {
+            return Err(SandboxError::Conflict {
+                message: format!(
+                    "max concurrent process limit reached ({})",
+                    config.max_concurrent_processes
+                ),
+            });
+        }
+
+        let id_num = self.inner.next_id.fetch_add(1, Ordering::Relaxed);
+        let id = format!("proc_{id_num}");
+        let process = Arc::new(ManagedProcess {
+            id: id.clone(),
+            command: spec.command.clone(),
+            args: spec.args.clone(),
+            cwd: spec.cwd.clone(),
+            tty: spec.tty,
+            interactive: spec.interactive,
+            owner: spec.owner,
+            restart_policy: spec.restart_policy.unwrap_or(RestartPolicy::Never),
+            spec,
+            created_at_ms: now_ms(),
+            max_log_bytes: config.max_log_bytes_per_process,
+            runtime: Mutex::new(ManagedRuntime {
+                pid: None,
+                stdin: None,
+                #[cfg(unix)]
+                pty_resize_fd: None,
+            }),
+            status: RwLock::new(ManagedStatus {
+                status: ProcessStatus::Running,
+                exit_code: None,
+                exited_at_ms: None,
+            }),
+            sequence: AtomicU64::new(1),
+            logs: Mutex::new(VecDeque::new()),
+            total_log_bytes: Mutex::new(0),
+            log_tx: broadcast::channel(512).0,
+            stop_requested: AtomicBool::new(false),
+        });
+
+        self.spawn_existing_process(process.clone()).await?;
+        self.inner
+            .processes
+            .write()
+            .await
+            .insert(id, process.clone());
+        Ok(process.snapshot().await)
+    }
+
+    pub async fn run_once(&self, spec: RunSpec) -> Result<RunOutput, SandboxError> {
+        if spec.command.trim().is_empty() {
+            return Err(SandboxError::InvalidRequest {
+                message: "command must not be empty".to_string(),
+            });
+        }
+
+        let config = self.get_config().await;
+        let mut timeout_ms = spec.timeout_ms.unwrap_or(config.default_run_timeout_ms);
+        if timeout_ms == 0 {
+            timeout_ms = config.default_run_timeout_ms;
+        }
+        timeout_ms = timeout_ms.min(config.max_run_timeout_ms);
+
+        let max_output_bytes = spec
+            .max_output_bytes
+            .unwrap_or(config.max_output_bytes)
+            .min(config.max_output_bytes);
+
+        let mut cmd = Command::new(&spec.command);
+        cmd.args(&spec.args)
+            .stdin(std::process::Stdio::null())
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped());
+
+        if let Some(cwd) = &spec.cwd {
+            cmd.current_dir(cwd);
+        }
+
+        if !spec.env.contains_key("TERM") {
+            cmd.env("TERM", "xterm-256color");
+        }
+        for (key, value) in &spec.env {
+            cmd.env(key, value);
+        }
+
+        let mut child = cmd.spawn().map_err(|err| SandboxError::StreamError {
+            message: format!("failed to spawn process: {err}"),
+        })?;
+
+        let stdout = child
+            .stdout
+            .take()
+            .ok_or_else(|| SandboxError::StreamError {
+                message: "failed to capture stdout".to_string(),
+            })?;
+        let stderr = child
+            .stderr
+            .take()
+            .ok_or_else(|| SandboxError::StreamError {
+                message: "failed to capture stderr".to_string(),
+            })?;
+
+        let started = Instant::now();
+        let stdout_task = tokio::spawn(capture_output(stdout, max_output_bytes));
+        let stderr_task = tokio::spawn(capture_output(stderr, max_output_bytes));
+
+        let wait_result =
+            tokio::time::timeout(std::time::Duration::from_millis(timeout_ms), child.wait()).await;
+
+        let (exit_code, timed_out) = match wait_result {
+            Ok(Ok(status)) => (status.code(), false),
+            Ok(Err(err)) => {
+                let _ = child.kill().await;
+                return Err(SandboxError::StreamError {
+                    message: format!("failed to wait on process: {err}"),
+                });
+            }
+            Err(_) => {
+                let _ = child.kill().await;
+                let _ = child.wait().await;
+                (None, true)
+            }
+        };
+
+        let (stdout, stdout_truncated) = match stdout_task.await {
+            Ok(Ok(captured)) => captured,
+            _ => (Vec::new(), false),
+        };
+        let (stderr, stderr_truncated) = match stderr_task.await {
+            Ok(Ok(captured)) => captured,
+            _ => (Vec::new(), false),
+        };
+
+        Ok(RunOutput {
+            exit_code,
+            timed_out,
+            stdout: String::from_utf8_lossy(&stdout).to_string(),
+            stderr: String::from_utf8_lossy(&stderr).to_string(),
+            stdout_truncated,
+            stderr_truncated,
+            duration_ms: started.elapsed().as_millis() as u64,
+        })
+    }
+
+    pub async fn list_processes(&self, owner: Option<ProcessOwner>) -> Vec<ProcessSnapshot> {
+        let processes = self.inner.processes.read().await;
+        let mut items = Vec::with_capacity(processes.len());
+        for process in processes.values() {
+            if owner.is_none_or(|expected| process.owner == expected) {
+                items.push(process.snapshot().await);
+            }
+        }
+        items.sort_by(|a, b| a.id.cmp(&b.id));
+        items
+    }
+
+    pub async fn snapshot(&self, id: &str) -> Result<ProcessSnapshot, SandboxError> {
+        Ok(self.lookup_process(id).await?.snapshot().await)
+    }
+
+    pub async fn is_tty(&self, id: &str) -> Result<bool, SandboxError> {
+        Ok(self.lookup_process(id).await?.tty)
+    }
+
+    pub async fn max_input_bytes(&self) -> usize {
+        self.get_config().await.max_input_bytes_per_request
+    }
+
+    pub async fn delete_process(&self, id: &str) -> Result<(), SandboxError> {
+        let process = self.lookup_process(id).await?;
+        let status = process.status.read().await.clone();
+        if status.status == ProcessStatus::Running {
+            return Err(SandboxError::Conflict {
+                message: "process is still running; stop or kill it before delete".to_string(),
+            });
+        }
+
+        self.inner.processes.write().await.remove(id);
+        Ok(())
+    }
+
+    pub async fn stop_process(
+        &self,
+        id: &str,
+        wait_ms: Option<u64>,
+    ) -> Result<ProcessSnapshot, SandboxError> {
+        let process = self.lookup_process(id).await?;
+        process.stop_requested.store(true, Ordering::SeqCst);
+        process.send_signal(SIGTERM).await?;
+        maybe_wait_for_exit(process.clone(), wait_ms.unwrap_or(2_000)).await;
+        Ok(process.snapshot().await)
+    }
+
+    pub async fn kill_process(
+        &self,
+        id: &str,
+        wait_ms: Option<u64>,
+    ) -> Result<ProcessSnapshot, SandboxError> {
+        let process = self.lookup_process(id).await?;
+        process.stop_requested.store(true, Ordering::SeqCst);
+        process.send_signal(SIGKILL).await?;
+        maybe_wait_for_exit(process.clone(), wait_ms.unwrap_or(1_000)).await;
+        Ok(process.snapshot().await)
+    }
+
+    pub async fn write_input(&self, id: &str, data: &[u8]) -> Result<usize, SandboxError> {
+        self.lookup_process(id).await?.write_input(data).await
+    }
+
+    pub async fn resize_terminal(
+        &self,
+        id: &str,
+        cols: u16,
+        rows: u16,
+    ) -> Result<(), SandboxError> {
+        let process = self.lookup_process(id).await?;
+        if !process.tty {
+            return Err(SandboxError::Conflict {
+                message: "process is not running in tty mode".to_string(),
+            });
+        }
+
+        process.resize_pty(cols, rows).await?;
+        process.send_signal(SIGWINCH).await
+    }
+
+    pub async fn logs(
+        &self,
+        id: &str,
+        filter: ProcessLogFilter,
+    ) -> Result<Vec<ProcessLogLine>, SandboxError> {
+        self.lookup_process(id).await?.read_logs(filter).await
+    }
+
+    pub async fn subscribe_logs(
+        &self,
+        id: &str,
+    ) -> Result<broadcast::Receiver<ProcessLogLine>, SandboxError> {
+        let process = self.lookup_process(id).await?;
+        Ok(process.log_tx.subscribe())
+    }
+
+    async fn running_process_count(&self) -> usize {
+        let processes = self.inner.processes.read().await;
+        let mut running = 0usize;
+        for process in processes.values() {
+            if process.status.read().await.status == ProcessStatus::Running {
+                running += 1;
+            }
+        }
+        running
+    }
+
+    async fn lookup_process(&self, id: &str) -> Result<Arc<ManagedProcess>, SandboxError> {
+        let process = self.inner.processes.read().await.get(id).cloned();
+        process.ok_or_else(|| SandboxError::NotFound {
+            resource: "process".to_string(),
+            id: id.to_string(),
+        })
+    }
+
+    async fn spawn_existing_process(
+        &self,
+        process: Arc<ManagedProcess>,
+    ) -> Result<(), SandboxError> {
+        process.stop_requested.store(false, Ordering::SeqCst);
+        let mut runtime_guard = process.runtime.lock().await;
+        let mut status_guard = process.status.write().await;
+
+        if process.tty {
+            #[cfg(unix)]
+            {
+                let SpawnedTtyProcess {
+                    child,
+                    reader,
+                    runtime,
+                } = self.spawn_tty_process(&process.spec)?;
+                *runtime_guard = runtime;
+                status_guard.status = ProcessStatus::Running;
+                status_guard.exit_code = None;
+                status_guard.exited_at_ms = None;
+                drop(status_guard);
+                drop(runtime_guard);
+
+                let process_for_output = process.clone();
+                tokio::spawn(async move {
+                    pump_output(process_for_output, reader, ProcessStream::Pty).await;
+                });
+
+                let runtime = self.clone();
+                tokio::spawn(async move {
+                    watch_exit(runtime, process, child).await;
+                });
+
+                return Ok(());
+            }
+            #[cfg(not(unix))]
+            {
+                return Err(SandboxError::StreamError {
+                    message: "tty process mode is not supported on this platform".to_string(),
+                });
+            }
+        }
+
+        let SpawnedPipeProcess {
+            child,
+            stdout,
+            stderr,
+            runtime,
+        } = self.spawn_pipe_process(&process.spec)?;
+        *runtime_guard = runtime;
+        status_guard.status = ProcessStatus::Running;
+        status_guard.exit_code = None;
+        status_guard.exited_at_ms = None;
+        drop(status_guard);
+        drop(runtime_guard);
+
+        let process_for_stdout = process.clone();
+        tokio::spawn(async move {
+            pump_output(process_for_stdout, stdout, ProcessStream::Stdout).await;
+        });
+
+        let process_for_stderr = process.clone();
+        tokio::spawn(async move {
+            pump_output(process_for_stderr, stderr, ProcessStream::Stderr).await;
+        });
+
+        let runtime = self.clone();
+        tokio::spawn(async move {
+            watch_exit(runtime, process, child).await;
+        });
+
+        Ok(())
+    }
+
+    fn spawn_pipe_process(
+        &self,
+        spec: &ProcessStartSpec,
+    ) -> Result<SpawnedPipeProcess, SandboxError> {
+        let mut cmd = Command::new(&spec.command);
+        cmd.args(&spec.args)
+            .stdin(std::process::Stdio::piped())
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped());
+
+        if let Some(cwd) = &spec.cwd {
+            cmd.current_dir(cwd);
+        }
+
+        for (key, value) in &spec.env {
+            cmd.env(key, value);
+        }
+
+        let mut child = cmd.spawn().map_err(|err| SandboxError::StreamError {
+            message: format!("failed to spawn process: {err}"),
+        })?;
+
+        let stdin = child.stdin.take();
+        let stdout = child
+            .stdout
+            .take()
+            .ok_or_else(|| SandboxError::StreamError {
+                message: "failed to capture stdout".to_string(),
+            })?;
+        let stderr = child
+            .stderr
+            .take()
+            .ok_or_else(|| SandboxError::StreamError {
+                message: "failed to capture stderr".to_string(),
+            })?;
+
+        Ok(SpawnedPipeProcess {
+            runtime: ManagedRuntime {
+                pid: child.id(),
+                stdin: stdin.map(ProcessStdin::Pipe),
+                #[cfg(unix)]
+                pty_resize_fd: None,
+            },
+            child,
+            stdout,
+            stderr,
+        })
+    }
+
+    #[cfg(unix)]
+    fn spawn_tty_process(
+        &self,
+        spec: &ProcessStartSpec,
+    ) -> Result<SpawnedTtyProcess, SandboxError> {
+        use std::os::fd::AsRawFd;
+        use std::process::Stdio;
+
+        let (master_fd, slave_fd) = open_pty(80, 24)?;
+        let slave_raw = slave_fd.as_raw_fd();
+
+        let stdin_fd = dup_fd(slave_raw)?;
+        let stdout_fd = dup_fd(slave_raw)?;
+        let stderr_fd = dup_fd(slave_raw)?;
+
+        let mut cmd = Command::new(&spec.command);
+        cmd.args(&spec.args)
+            .stdin(Stdio::from(std::fs::File::from(stdin_fd)))
+            .stdout(Stdio::from(std::fs::File::from(stdout_fd)))
+            .stderr(Stdio::from(std::fs::File::from(stderr_fd)));
+
+        if let Some(cwd) = &spec.cwd {
+            cmd.current_dir(cwd);
+        }
+
+        for (key, value) in &spec.env {
+            cmd.env(key, value);
+        }
+
+        unsafe {
+            cmd.pre_exec(move || {
+                if libc::setsid() == -1 {
+                    return Err(std::io::Error::last_os_error());
+                }
+                if libc::ioctl(slave_raw, libc::TIOCSCTTY as _, 0) == -1 {
+                    return Err(std::io::Error::last_os_error());
+                }
+                Ok(())
+            });
+        }
+
+        let child = cmd.spawn().map_err(|err| SandboxError::StreamError {
+            message: format!("failed to spawn tty process: {err}"),
+        })?;
+        let pid = child.id();
+
+        drop(slave_fd);
+
+        let master_raw = master_fd.as_raw_fd();
+        let writer_fd = dup_fd(master_raw)?;
+        let resize_fd = dup_fd(master_raw)?;
+
+        let reader_file = tokio::fs::File::from_std(std::fs::File::from(master_fd));
+        let writer_file = tokio::fs::File::from_std(std::fs::File::from(writer_fd));
+        let resize_file = std::fs::File::from(resize_fd);
+
+        Ok(SpawnedTtyProcess {
+            runtime: ManagedRuntime {
+                pid,
+                stdin: Some(ProcessStdin::Pty(writer_file)),
+                pty_resize_fd: Some(resize_file),
+            },
+            child,
+            reader: reader_file,
+        })
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum ProcessLogFilterStream {
+    Stdout,
+    Stderr,
+    Combined,
+    Pty,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct ProcessLogFilter {
+    pub stream: ProcessLogFilterStream,
+    pub tail: Option<usize>,
+    pub since: Option<u64>,
+}
+
+impl ManagedProcess {
+    async fn snapshot(&self) -> ProcessSnapshot {
+        let status = self.status.read().await.clone();
+        let pid = self.runtime.lock().await.pid;
+        ProcessSnapshot {
+            id: self.id.clone(),
+            command: self.command.clone(),
+            args: self.args.clone(),
+            cwd: self.cwd.clone(),
+            tty: self.tty,
+            interactive: self.interactive,
+            owner: self.owner,
+            status: status.status,
+            pid,
+            exit_code: status.exit_code,
+            created_at_ms: self.created_at_ms,
+            exited_at_ms: status.exited_at_ms,
+        }
+    }
+
+    async fn append_log(&self, stream: ProcessStream, data: &[u8]) {
+        if data.is_empty() {
+            return;
+        }
+
+        let stream = if self.tty { ProcessStream::Pty } else { stream };
+        let line = ProcessLogLine {
+            sequence: self.sequence.fetch_add(1, Ordering::Relaxed),
+            stream,
+            timestamp_ms: now_ms(),
+            data: BASE64.encode(data),
+            encoding: "base64",
+        };
+        let stored = StoredLog {
+            line: line.clone(),
+            byte_len: data.len(),
+        };
+
+        {
+            let mut logs = self.logs.lock().await;
+            let mut total = self.total_log_bytes.lock().await;
+            logs.push_back(stored);
+            *total += data.len();
+
+            while *total > self.max_log_bytes {
+                if let Some(front) = logs.pop_front() {
+                    *total = total.saturating_sub(front.byte_len);
+                } else {
+                    break;
+                }
+            }
+        }
+
+        let _ = self.log_tx.send(line);
+    }
+
+    async fn write_input(&self, data: &[u8]) -> Result<usize, SandboxError> {
+        if self.status.read().await.status != ProcessStatus::Running {
+            return Err(SandboxError::Conflict {
+                message: "process is not running".to_string(),
+            });
+        }
+
+        let mut runtime = self.runtime.lock().await;
+        let stdin = runtime
+            .stdin
+            .as_mut()
+            .ok_or_else(|| SandboxError::Conflict {
+                message: "process does not accept stdin".to_string(),
+            })?;
+
+        match stdin {
+            ProcessStdin::Pipe(pipe) => {
+                pipe.write_all(data)
+                    .await
+                    .map_err(|err| SandboxError::StreamError {
+                        message: format!("failed to write stdin: {err}"),
+                    })?;
+                pipe.flush()
+                    .await
+                    .map_err(|err| SandboxError::StreamError {
+                        message: format!("failed to flush stdin: {err}"),
+                    })?;
+            }
+            ProcessStdin::Pty(pty_writer) => {
+                pty_writer
+                    .write_all(data)
+                    .await
+                    .map_err(|err| SandboxError::StreamError {
+                        message: format!("failed to write PTY input: {err}"),
+                    })?;
+                pty_writer
+                    .flush()
+                    .await
+                    .map_err(|err| SandboxError::StreamError {
+                        message: format!("failed to flush PTY input: {err}"),
+                    })?;
+            }
+        }
+
+        Ok(data.len())
+    }
+
+    async fn read_logs(
+        &self,
+        filter: ProcessLogFilter,
+    ) -> Result<Vec<ProcessLogLine>, SandboxError> {
+        let logs = self.logs.lock().await;
+
+        let mut entries: Vec<ProcessLogLine> = logs
+            .iter()
+            .filter_map(|entry| {
+                if let Some(since) = filter.since {
+                    if entry.line.sequence <= since {
+                        return None;
+                    }
+                }
+                if stream_matches(entry.line.stream, filter.stream) {
+                    Some(entry.line.clone())
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        if let Some(tail) = filter.tail {
+            if entries.len() > tail {
+                let start = entries.len() - tail;
+                entries = entries.split_off(start);
+            }
+        }
+
+        Ok(entries)
+    }
+
+    async fn send_signal(&self, signal: i32) -> Result<(), SandboxError> {
+        if self.status.read().await.status != ProcessStatus::Running {
+            return Ok(());
+        }
+        let Some(pid) = self.runtime.lock().await.pid else {
+            return Ok(());
+        };
+
+        send_signal(pid, signal)
+    }
+
+    async fn resize_pty(&self, cols: u16, rows: u16) -> Result<(), SandboxError> {
+        if !self.tty {
+            return Ok(());
+        }
+
+        #[cfg(unix)]
+        {
+            use std::os::fd::AsRawFd;
+
+            let runtime = self.runtime.lock().await;
+            let Some(fd) = runtime.pty_resize_fd.as_ref() else {
+                return Err(SandboxError::Conflict {
+                    message: "PTY resize handle unavailable".to_string(),
+                });
+            };
+            resize_pty(fd.as_raw_fd(), cols, rows)?;
+        }
+
+        #[cfg(not(unix))]
+        {
+            let _ = cols;
+            let _ = rows;
+        }
+
+        Ok(())
+    }
+
+    #[allow(dead_code)]
+    fn should_restart(&self, exit_code: Option<i32>) -> bool {
+        match self.restart_policy {
+            RestartPolicy::Never => false,
+            RestartPolicy::Always => true,
+            RestartPolicy::OnFailure => exit_code.unwrap_or(1) != 0,
+        }
+    }
+
+    async fn mark_exited(&self, exit_code: Option<i32>, exited_at_ms: Option<i64>) {
+        {
+            let mut status = self.status.write().await;
+            status.status = ProcessStatus::Exited;
+            status.exit_code = exit_code;
+            status.exited_at_ms = exited_at_ms;
+        }
+
+        let mut runtime = self.runtime.lock().await;
+        runtime.pid = None;
+        let _ = runtime.stdin.take();
+        #[cfg(unix)]
+        {
+            let _ = runtime.pty_resize_fd.take();
+        }
+    }
+}
+
+fn stream_matches(stream: ProcessStream, filter: ProcessLogFilterStream) -> bool {
+    match filter {
+        ProcessLogFilterStream::Stdout => stream == ProcessStream::Stdout,
+        ProcessLogFilterStream::Stderr => stream == ProcessStream::Stderr,
+        ProcessLogFilterStream::Combined => {
+            stream == ProcessStream::Stdout || stream == ProcessStream::Stderr
+        }
+        ProcessLogFilterStream::Pty => stream == ProcessStream::Pty,
+    }
+}
+
+async fn maybe_wait_for_exit(process: Arc<ManagedProcess>, wait_ms: u64) {
+    let deadline = tokio::time::Instant::now() + tokio::time::Duration::from_millis(wait_ms);
+    while tokio::time::Instant::now() < deadline {
+        if process.status.read().await.status == ProcessStatus::Exited {
+            break;
+        }
+        tokio::time::sleep(tokio::time::Duration::from_millis(25)).await;
+    }
+}
+
+async fn pump_output<R>(process: Arc<ManagedProcess>, mut reader: R, stream: ProcessStream)
+where
+    R: AsyncRead + Unpin,
+{
+    let mut buffer = [0_u8; 8192];
+    loop {
+        match reader.read(&mut buffer).await {
+            Ok(0) => break,
+            Ok(n) => {
+                process.append_log(stream, &buffer[..n]).await;
+            }
+            Err(err) => {
+                let msg = format!("\n[process stream error: {err}]\n");
+                process
+                    .append_log(
+                        if process.tty {
+                            ProcessStream::Pty
+                        } else {
+                            ProcessStream::Stderr
+                        },
+                        msg.as_bytes(),
+                    )
+                    .await;
+                break;
+            }
+        }
+    }
+}
+
+async fn watch_exit(runtime: ProcessRuntime, process: Arc<ManagedProcess>, mut child: Child) {
+    let _ = runtime;
+    let wait = child.wait().await;
+    let (exit_code, exited_at_ms) = match wait {
+        Ok(status) => (status.code(), Some(now_ms())),
+        Err(_) => (None, Some(now_ms())),
+    };
+
+    let _ = process.stop_requested.swap(false, Ordering::SeqCst);
+    process.mark_exited(exit_code, exited_at_ms).await;
+}
+
+async fn capture_output<R>(mut reader: R, max_bytes: usize) -> std::io::Result<(Vec<u8>, bool)>
+where
+    R: AsyncRead + Unpin,
+{
+    let mut output = Vec::new();
+    let mut buffer = [0_u8; 8192];
+    let mut truncated = false;
+
+    loop {
+        let n = reader.read(&mut buffer).await?;
+        if n == 0 {
+            break;
+        }
+
+        if output.len() < max_bytes {
+            let remaining = max_bytes - output.len();
+            let to_copy = remaining.min(n);
+            output.extend_from_slice(&buffer[..to_copy]);
+            if to_copy < n {
+                truncated = true;
+            }
+        } else {
+            truncated = true;
+        }
+    }
+
+    Ok((output, truncated))
+}
+
+fn now_ms() -> i64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|duration| duration.as_millis() as i64)
+        .unwrap_or(0)
+}
+
+#[cfg(unix)]
+const SIGTERM: i32 = libc::SIGTERM;
+#[cfg(unix)]
+const SIGKILL: i32 = libc::SIGKILL;
+#[cfg(unix)]
+const SIGWINCH: i32 = libc::SIGWINCH;
+
+#[cfg(unix)]
+fn send_signal(pid: u32, signal: i32) -> Result<(), SandboxError> {
+    let result = unsafe { libc::kill(pid as libc::pid_t, signal) };
+    if result == 0 {
+        return Ok(());
+    }
+
+    let err = std::io::Error::last_os_error();
+    if err.raw_os_error() == Some(libc::ESRCH) {
+        return Ok(());
+    }
+
+    Err(SandboxError::StreamError {
+        message: format!("failed to signal process {pid}: {err}"),
+    })
+}
+
+#[cfg(not(unix))]
+const SIGTERM: i32 = 15;
+#[cfg(not(unix))]
+const SIGKILL: i32 = 9;
+#[cfg(not(unix))]
+const SIGWINCH: i32 = 28;
+
+#[cfg(not(unix))]
+fn send_signal(_pid: u32, _signal: i32) -> Result<(), SandboxError> {
+    Err(SandboxError::StreamError {
+        message: "process signaling not supported on this platform".to_string(),
+    })
+}
+
+#[cfg(unix)]
+fn open_pty(
+    cols: u16,
+    rows: u16,
+) -> Result<(std::os::fd::OwnedFd, std::os::fd::OwnedFd), SandboxError> {
+    use std::os::fd::FromRawFd;
+
+    let mut master: libc::c_int = -1;
+    let mut slave: libc::c_int = -1;
+    let mut winsize = libc::winsize {
+        ws_row: rows,
+        ws_col: cols,
+        ws_xpixel: 0,
+        ws_ypixel: 0,
+    };
+
+    let rc = unsafe {
+        libc::openpty(
+            &mut master,
+            &mut slave,
+            std::ptr::null_mut(),
+            std::ptr::null_mut(),
+            &mut winsize,
+        )
+    };
+
+    if rc != 0 {
+        return Err(SandboxError::StreamError {
+            message: format!(
+                "failed to allocate PTY: {}",
+                std::io::Error::last_os_error()
+            ),
+        });
+    }
+
+    let master_fd = unsafe { std::os::fd::OwnedFd::from_raw_fd(master) };
+    let slave_fd = unsafe { std::os::fd::OwnedFd::from_raw_fd(slave) };
+    Ok((master_fd, slave_fd))
+}
+
+#[cfg(unix)]
+fn dup_fd(fd: std::os::fd::RawFd) -> Result<std::os::fd::OwnedFd, SandboxError> {
+    use std::os::fd::FromRawFd;
+
+    let duplicated = unsafe { libc::dup(fd) };
+    if duplicated == -1 {
+        return Err(SandboxError::StreamError {
+            message: format!("failed to dup fd: {}", std::io::Error::last_os_error()),
+        });
+    }
+
+    Ok(unsafe { std::os::fd::OwnedFd::from_raw_fd(duplicated) })
+}
+
+#[cfg(unix)]
+fn resize_pty(fd: std::os::fd::RawFd, cols: u16, rows: u16) -> Result<(), SandboxError> {
+    let winsize = libc::winsize {
+        ws_row: rows,
+        ws_col: cols,
+        ws_xpixel: 0,
+        ws_ypixel: 0,
+    };
+
+    let rc = unsafe { libc::ioctl(fd, libc::TIOCSWINSZ as _, &winsize) };
+    if rc == -1 {
+        return Err(SandboxError::StreamError {
+            message: format!("failed to resize PTY: {}", std::io::Error::last_os_error()),
+        });
+    }
+
+    Ok(())
+}
+
+pub fn decode_input_bytes(data: &str, encoding: &str) -> Result<Vec<u8>, SandboxError> {
+    match encoding {
+        "base64" => BASE64
+            .decode(data)
+            .map_err(|err| SandboxError::InvalidRequest {
+                message: format!("invalid base64 input: {err}"),
+            }),
+        "utf8" | "text" => Ok(data.as_bytes().to_vec()),
+        _ => Err(SandboxError::InvalidRequest {
+            message: "encoding must be one of: base64, utf8, text".to_string(),
+        }),
+    }
+}
diff --git a/server/packages/sandbox-agent/src/router.rs b/server/packages/sandbox-agent/src/router.rs
index 99971ff..195a5cd 100644
--- a/server/packages/sandbox-agent/src/router.rs
+++ b/server/packages/sandbox-agent/src/router.rs
@@ -1,4 +1,5 @@
 use std::collections::{BTreeMap, HashMap};
+use std::convert::Infallible;
 use std::fs;
 use std::io::Cursor;
 use std::path::{Path as StdPath, PathBuf};
@@ -6,6 +7,7 @@ use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
 use axum::body::Bytes;
+use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade};
 use axum::extract::{Path, Query, State};
 use axum::http::{header, HeaderMap, Request, StatusCode};
 use axum::middleware::Next;
@@ -13,6 +15,8 @@ use axum::response::sse::KeepAlive;
 use axum::response::{IntoResponse, Response, Sse};
 use axum::routing::{delete, get, post};
 use axum::{Json, Router};
+use futures::stream;
+use futures::StreamExt;
 use sandbox_agent_agent_management::agents::{
     AgentId, AgentManager, InstallOptions, InstallResult, InstallSource, InstalledArtifactKind,
 };
@@ -27,11 +31,20 @@ use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tar::Archive;
+use tokio_stream::wrappers::BroadcastStream;
 use tower_http::trace::TraceLayer;
 use tracing::Span;
-use utoipa::{Modify, OpenApi, ToSchema};
+use utoipa::{IntoParams, Modify, OpenApi, ToSchema};
 
 use crate::acp_proxy_runtime::{AcpProxyRuntime, ProxyPostOutcome};
+use crate::desktop_errors::DesktopProblem;
+use crate::desktop_runtime::DesktopRuntime;
+use crate::desktop_types::*;
+use crate::process_runtime::{
+    decode_input_bytes, ProcessLogFilter, ProcessLogFilterStream,
+    ProcessOwner as RuntimeProcessOwner, ProcessRuntime, ProcessRuntimeConfig, ProcessSnapshot,
+    ProcessStartSpec, ProcessStatus, ProcessStream, RunSpec,
+};
 use crate::ui;
 
 mod support;
@@ -77,6 +90,8 @@ pub struct AppState {
     agent_manager: Arc<AgentManager>,
     acp_proxy: Arc<AcpProxyRuntime>,
     opencode_server_manager: Arc<OpenCodeServerManager>,
+    process_runtime: Arc<ProcessRuntime>,
+    desktop_runtime: Arc<DesktopRuntime>,
     pub(crate) branding: BrandingMode,
     version_cache: Mutex<HashMap<AgentId, CachedAgentVersion>>,
 }
@@ -100,11 +115,15 @@ impl AppState {
                 auto_restart: true,
             },
         ));
+        let process_runtime = Arc::new(ProcessRuntime::new());
+        let desktop_runtime = Arc::new(DesktopRuntime::new(process_runtime.clone()));
         Self {
             auth,
             agent_manager,
             acp_proxy,
             opencode_server_manager,
+            process_runtime,
+            desktop_runtime,
             branding,
             version_cache: Mutex::new(HashMap::new()),
         }
@@ -122,6 +141,14 @@ impl AppState {
         self.opencode_server_manager.clone()
     }
 
+    pub(crate) fn process_runtime(&self) -> Arc<ProcessRuntime> {
+        self.process_runtime.clone()
+    }
+
+    pub(crate) fn desktop_runtime(&self) -> Arc<DesktopRuntime> {
+        self.desktop_runtime.clone()
+    }
+
     pub(crate) fn purge_version_cache(&self, agent: AgentId) {
         self.version_cache.lock().unwrap().remove(&agent);
     }
@@ -156,6 +183,82 @@ pub fn build_router(state: AppState) -> Router {
 pub fn build_router_with_state(shared: Arc<AppState>) -> (Router, Arc<AppState>) {
     let mut v1_router = Router::new()
         .route("/health", get(get_v1_health))
+        .route("/desktop/status", get(get_v1_desktop_status))
+        .route("/desktop/start", post(post_v1_desktop_start))
+        .route("/desktop/stop", post(post_v1_desktop_stop))
+        .route("/desktop/screenshot", get(get_v1_desktop_screenshot))
+        .route(
+            "/desktop/screenshot/region",
+            get(get_v1_desktop_screenshot_region),
+        )
+        .route(
+            "/desktop/mouse/position",
+            get(get_v1_desktop_mouse_position),
+        )
+        .route("/desktop/mouse/move", post(post_v1_desktop_mouse_move))
+        .route("/desktop/mouse/click", post(post_v1_desktop_mouse_click))
+        .route("/desktop/mouse/down", post(post_v1_desktop_mouse_down))
+        .route("/desktop/mouse/up", post(post_v1_desktop_mouse_up))
+        .route("/desktop/mouse/drag", post(post_v1_desktop_mouse_drag))
+        .route("/desktop/mouse/scroll", post(post_v1_desktop_mouse_scroll))
+        .route(
+            "/desktop/keyboard/type",
+            post(post_v1_desktop_keyboard_type),
+        )
+        .route(
+            "/desktop/keyboard/press",
+            post(post_v1_desktop_keyboard_press),
+        )
+        .route(
+            "/desktop/keyboard/down",
+            post(post_v1_desktop_keyboard_down),
+        )
+        .route("/desktop/keyboard/up", post(post_v1_desktop_keyboard_up))
+        .route("/desktop/display/info", get(get_v1_desktop_display_info))
+        .route("/desktop/windows", get(get_v1_desktop_windows))
+        .route(
+            "/desktop/windows/focused",
+            get(get_v1_desktop_windows_focused),
+        )
+        .route(
+            "/desktop/windows/:id/focus",
+            post(post_v1_desktop_window_focus),
+        )
+        .route(
+            "/desktop/windows/:id/move",
+            post(post_v1_desktop_window_move),
+        )
+        .route(
+            "/desktop/windows/:id/resize",
+            post(post_v1_desktop_window_resize),
+        )
+        .route(
+            "/desktop/clipboard",
+            get(get_v1_desktop_clipboard).post(post_v1_desktop_clipboard),
+        )
+        .route("/desktop/launch", post(post_v1_desktop_launch))
+        .route("/desktop/open", post(post_v1_desktop_open))
+        .route(
+            "/desktop/recording/start",
+            post(post_v1_desktop_recording_start),
+        )
+        .route(
+            "/desktop/recording/stop",
+            post(post_v1_desktop_recording_stop),
+        )
+        .route("/desktop/recordings", get(get_v1_desktop_recordings))
+        .route(
+            "/desktop/recordings/:id",
+            get(get_v1_desktop_recording).delete(delete_v1_desktop_recording),
+        )
+        .route(
+            "/desktop/recordings/:id/download",
+            get(get_v1_desktop_recording_download),
+        )
+        .route("/desktop/stream/start", post(post_v1_desktop_stream_start))
+        .route("/desktop/stream/stop", post(post_v1_desktop_stream_stop))
+        .route("/desktop/stream/status", get(get_v1_desktop_stream_status))
+        .route("/desktop/stream/signaling", get(get_v1_desktop_stream_ws))
         .route("/agents", get(get_v1_agents))
         .route("/agents/:agent", get(get_v1_agent))
         .route("/agents/:agent/install", post(post_v1_agent_install))
@@ -166,6 +269,28 @@ pub fn build_router_with_state(shared: Arc<AppState>) -> (Router, Arc<AppState>)
         .route("/fs/move", post(post_v1_fs_move))
         .route("/fs/stat", get(get_v1_fs_stat))
         .route("/fs/upload-batch", post(post_v1_fs_upload_batch))
+        .route(
+            "/processes/config",
+            get(get_v1_processes_config).post(post_v1_processes_config),
+        )
+        .route("/processes", get(get_v1_processes).post(post_v1_processes))
+        .route("/processes/run", post(post_v1_processes_run))
+        .route(
+            "/processes/:id",
+            get(get_v1_process).delete(delete_v1_process),
+        )
+        .route("/processes/:id/stop", post(post_v1_process_stop))
+        .route("/processes/:id/kill", post(post_v1_process_kill))
+        .route("/processes/:id/logs", get(get_v1_process_logs))
+        .route("/processes/:id/input", post(post_v1_process_input))
+        .route(
+            "/processes/:id/terminal/resize",
+            post(post_v1_process_terminal_resize),
+        )
+        .route(
+            "/processes/:id/terminal/ws",
+            get(get_v1_process_terminal_ws),
+        )
         .route(
             "/config/mcp",
             get(get_v1_config_mcp)
@@ -278,12 +403,49 @@ async fn opencode_unavailable() -> Response {
 pub async fn shutdown_servers(state: &Arc<AppState>) {
     state.acp_proxy().shutdown_all().await;
     state.opencode_server_manager().shutdown().await;
+    state.desktop_runtime().shutdown().await;
 }
 
 #[derive(OpenApi)]
 #[openapi(
     paths(
         get_v1_health,
+        get_v1_desktop_status,
+        post_v1_desktop_start,
+        post_v1_desktop_stop,
+        get_v1_desktop_screenshot,
+        get_v1_desktop_screenshot_region,
+        get_v1_desktop_mouse_position,
+        post_v1_desktop_mouse_move,
+        post_v1_desktop_mouse_click,
+        post_v1_desktop_mouse_down,
+        post_v1_desktop_mouse_up,
+        post_v1_desktop_mouse_drag,
+        post_v1_desktop_mouse_scroll,
+        post_v1_desktop_keyboard_type,
+        post_v1_desktop_keyboard_press,
+        post_v1_desktop_keyboard_down,
+        post_v1_desktop_keyboard_up,
+        get_v1_desktop_display_info,
+        get_v1_desktop_windows,
+        get_v1_desktop_windows_focused,
+        post_v1_desktop_window_focus,
+        post_v1_desktop_window_move,
+        post_v1_desktop_window_resize,
+        get_v1_desktop_clipboard,
+        post_v1_desktop_clipboard,
+        post_v1_desktop_launch,
+        post_v1_desktop_open,
+        get_v1_desktop_stream_status,
+        post_v1_desktop_recording_start,
+        post_v1_desktop_recording_stop,
+        get_v1_desktop_recordings,
+        get_v1_desktop_recording,
+        get_v1_desktop_recording_download,
+        delete_v1_desktop_recording,
+        post_v1_desktop_stream_start,
+        post_v1_desktop_stream_stop,
+        get_v1_desktop_stream_ws,
         get_v1_agents,
         get_v1_agent,
         post_v1_agent_install,
@@ -295,6 +457,19 @@ pub async fn shutdown_servers(state: &Arc<AppState>) {
         post_v1_fs_move,
         get_v1_fs_stat,
         post_v1_fs_upload_batch,
+        get_v1_processes_config,
+        post_v1_processes_config,
+        post_v1_processes,
+        post_v1_processes_run,
+        get_v1_processes,
+        get_v1_process,
+        post_v1_process_stop,
+        post_v1_process_kill,
+        delete_v1_process,
+        get_v1_process_logs,
+        post_v1_process_input,
+        post_v1_process_terminal_resize,
+        get_v1_process_terminal_ws,
         get_v1_config_mcp,
         put_v1_config_mcp,
         delete_v1_config_mcp,
@@ -309,6 +484,46 @@ pub async fn shutdown_servers(state: &Arc<AppState>) {
     components(
         schemas(
             HealthResponse,
+            DesktopState,
+            DesktopResolution,
+            DesktopErrorInfo,
+            DesktopProcessInfo,
+            DesktopStatusResponse,
+            DesktopStartRequest,
+            DesktopScreenshotQuery,
+            DesktopScreenshotFormat,
+            DesktopRegionScreenshotQuery,
+            DesktopMousePositionResponse,
+            DesktopMouseButton,
+            DesktopMouseMoveRequest,
+            DesktopMouseClickRequest,
+            DesktopMouseDownRequest,
+            DesktopMouseUpRequest,
+            DesktopMouseDragRequest,
+            DesktopMouseScrollRequest,
+            DesktopKeyboardTypeRequest,
+            DesktopKeyboardPressRequest,
+            DesktopKeyModifiers,
+            DesktopKeyboardDownRequest,
+            DesktopKeyboardUpRequest,
+            DesktopActionResponse,
+            DesktopDisplayInfoResponse,
+            DesktopWindowInfo,
+            DesktopWindowListResponse,
+            DesktopRecordingStartRequest,
+            DesktopRecordingStatus,
+            DesktopRecordingInfo,
+            DesktopRecordingListResponse,
+            DesktopStreamStatusResponse,
+            DesktopClipboardResponse,
+            DesktopClipboardQuery,
+            DesktopClipboardWriteRequest,
+            DesktopLaunchRequest,
+            DesktopLaunchResponse,
+            DesktopOpenRequest,
+            DesktopOpenResponse,
+            DesktopWindowMoveRequest,
+            DesktopWindowResizeRequest,
             ServerStatus,
             ServerStatusInfo,
             AgentCapabilities,
@@ -329,6 +544,24 @@ pub async fn shutdown_servers(state: &Arc<AppState>) {
             FsMoveResponse,
             FsActionResponse,
             FsUploadBatchResponse,
+            ProcessConfig,
+            ProcessOwner,
+            ProcessCreateRequest,
+            ProcessRunRequest,
+            ProcessRunResponse,
+            ProcessState,
+            ProcessInfo,
+            ProcessListResponse,
+            ProcessListQuery,
+            ProcessLogsStream,
+            ProcessLogsQuery,
+            ProcessLogEntry,
+            ProcessLogsResponse,
+            ProcessInputRequest,
+            ProcessInputResponse,
+            ProcessSignalQuery,
+            ProcessTerminalResizeRequest,
+            ProcessTerminalResizeResponse,
             AcpPostQuery,
             AcpServerInfo,
             AcpServerListResponse,
@@ -361,12 +594,27 @@ impl Modify for ServerAddon {
 pub enum ApiError {
     #[error(transparent)]
     Sandbox(#[from] SandboxError),
+    #[error("problem: {0:?}")]
+    Problem(ProblemDetails),
+}
+
+impl From<ProblemDetails> for ApiError {
+    fn from(value: ProblemDetails) -> Self {
+        Self::Problem(value)
+    }
+}
+
+impl From<DesktopProblem> for ApiError {
+    fn from(value: DesktopProblem) -> Self {
+        Self::Problem(value.to_problem_details())
+    }
 }
 
 impl IntoResponse for ApiError {
     fn into_response(self) -> Response {
         let problem = match &self {
             ApiError::Sandbox(error) => problem_from_sandbox_error(error),
+            ApiError::Problem(problem) => problem.clone(),
         };
         let status =
             StatusCode::from_u16(problem.status).unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
@@ -400,6 +648,833 @@ async fn get_v1_health() -> Json<HealthResponse> {
     })
 }
 
+/// Get desktop runtime status.
+///
+/// Returns the current desktop runtime state, dependency status, active
+/// display metadata, and supervised process information.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/status",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop runtime status", body = DesktopStatusResponse),
+        (status = 401, description = "Authentication required", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_status(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopStatusResponse>, ApiError> {
+    Ok(Json(state.desktop_runtime().status().await))
+}
+
+/// Start the private desktop runtime.
+///
+/// Lazily launches the managed Xvfb/openbox stack, validates display health,
+/// and returns the resulting desktop status snapshot.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/start",
+    tag = "v1",
+    request_body = DesktopStartRequest,
+    responses(
+        (status = 200, description = "Desktop runtime status after start", body = DesktopStatusResponse),
+        (status = 400, description = "Invalid desktop start request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is already transitioning", body = ProblemDetails),
+        (status = 501, description = "Desktop API unsupported on this platform", body = ProblemDetails),
+        (status = 503, description = "Desktop runtime could not be started", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_start(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopStartRequest>,
+) -> Result<Json<DesktopStatusResponse>, ApiError> {
+    let status = state.desktop_runtime().start(body).await?;
+    Ok(Json(status))
+}
+
+/// Stop the private desktop runtime.
+///
+/// Terminates the managed openbox/Xvfb/dbus processes owned by the desktop
+/// runtime and returns the resulting status snapshot.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/stop",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop runtime status after stop", body = DesktopStatusResponse),
+        (status = 409, description = "Desktop runtime is already transitioning", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_stop(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopStatusResponse>, ApiError> {
+    let status = state.desktop_runtime().stop().await?;
+    Ok(Json(status))
+}
+
+/// Capture a full desktop screenshot.
+///
+/// Performs a health-gated full-frame screenshot of the managed desktop and
+/// returns the requested image bytes.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/screenshot",
+    tag = "v1",
+    params(DesktopScreenshotQuery),
+    responses(
+        (status = 200, description = "Desktop screenshot as image bytes"),
+        (status = 400, description = "Invalid screenshot query", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or screenshot capture failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_screenshot(
+    State(state): State<Arc<AppState>>,
+    Query(query): Query<DesktopScreenshotQuery>,
+) -> Result<Response, ApiError> {
+    let screenshot = state.desktop_runtime().screenshot(query).await?;
+    Ok((
+        [(header::CONTENT_TYPE, screenshot.content_type)],
+        Bytes::from(screenshot.bytes),
+    )
+        .into_response())
+}
+
+/// Capture a desktop screenshot region.
+///
+/// Performs a health-gated screenshot crop against the managed desktop and
+/// returns the requested region image bytes.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/screenshot/region",
+    tag = "v1",
+    params(DesktopRegionScreenshotQuery),
+    responses(
+        (status = 200, description = "Desktop screenshot region as image bytes"),
+        (status = 400, description = "Invalid screenshot region", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or screenshot capture failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_screenshot_region(
+    State(state): State<Arc<AppState>>,
+    Query(query): Query<DesktopRegionScreenshotQuery>,
+) -> Result<Response, ApiError> {
+    let screenshot = state.desktop_runtime().screenshot_region(query).await?;
+    Ok((
+        [(header::CONTENT_TYPE, screenshot.content_type)],
+        Bytes::from(screenshot.bytes),
+    )
+        .into_response())
+}
+
+/// Get the current desktop mouse position.
+///
+/// Performs a health-gated mouse position query against the managed desktop.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/mouse/position",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop mouse position", body = DesktopMousePositionResponse),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input check failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_mouse_position(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().mouse_position().await?;
+    Ok(Json(position))
+}
+
+/// Move the desktop mouse.
+///
+/// Performs a health-gated absolute pointer move on the managed desktop and
+/// returns the resulting mouse position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/mouse/move",
+    tag = "v1",
+    request_body = DesktopMouseMoveRequest,
+    responses(
+        (status = 200, description = "Desktop mouse position after move", body = DesktopMousePositionResponse),
+        (status = 400, description = "Invalid mouse move request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_mouse_move(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopMouseMoveRequest>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().move_mouse(body).await?;
+    Ok(Json(position))
+}
+
+/// Click on the desktop.
+///
+/// Performs a health-gated pointer move and click against the managed desktop
+/// and returns the resulting mouse position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/mouse/click",
+    tag = "v1",
+    request_body = DesktopMouseClickRequest,
+    responses(
+        (status = 200, description = "Desktop mouse position after click", body = DesktopMousePositionResponse),
+        (status = 400, description = "Invalid mouse click request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_mouse_click(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopMouseClickRequest>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().click_mouse(body).await?;
+    Ok(Json(position))
+}
+
+/// Press and hold a desktop mouse button.
+///
+/// Performs a health-gated optional pointer move followed by `xdotool mousedown`
+/// and returns the resulting mouse position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/mouse/down",
+    tag = "v1",
+    request_body = DesktopMouseDownRequest,
+    responses(
+        (status = 200, description = "Desktop mouse position after button press", body = DesktopMousePositionResponse),
+        (status = 400, description = "Invalid mouse down request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_mouse_down(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopMouseDownRequest>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().mouse_down(body).await?;
+    Ok(Json(position))
+}
+
+/// Release a desktop mouse button.
+///
+/// Performs a health-gated optional pointer move followed by `xdotool mouseup`
+/// and returns the resulting mouse position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/mouse/up",
+    tag = "v1",
+    request_body = DesktopMouseUpRequest,
+    responses(
+        (status = 200, description = "Desktop mouse position after button release", body = DesktopMousePositionResponse),
+        (status = 400, description = "Invalid mouse up request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_mouse_up(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopMouseUpRequest>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().mouse_up(body).await?;
+    Ok(Json(position))
+}
+
+/// Drag the desktop mouse.
+///
+/// Performs a health-gated drag gesture against the managed desktop and
+/// returns the resulting mouse position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/mouse/drag",
+    tag = "v1",
+    request_body = DesktopMouseDragRequest,
+    responses(
+        (status = 200, description = "Desktop mouse position after drag", body = DesktopMousePositionResponse),
+        (status = 400, description = "Invalid mouse drag request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_mouse_drag(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopMouseDragRequest>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().drag_mouse(body).await?;
+    Ok(Json(position))
+}
+
+/// Scroll the desktop mouse wheel.
+///
+/// Performs a health-gated scroll gesture at the requested coordinates and
+/// returns the resulting mouse position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/mouse/scroll",
+    tag = "v1",
+    request_body = DesktopMouseScrollRequest,
+    responses(
+        (status = 200, description = "Desktop mouse position after scroll", body = DesktopMousePositionResponse),
+        (status = 400, description = "Invalid mouse scroll request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_mouse_scroll(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopMouseScrollRequest>,
+) -> Result<Json<DesktopMousePositionResponse>, ApiError> {
+    let position = state.desktop_runtime().scroll_mouse(body).await?;
+    Ok(Json(position))
+}
+
+/// Type desktop keyboard text.
+///
+/// Performs a health-gated `xdotool type` operation against the managed
+/// desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/keyboard/type",
+    tag = "v1",
+    request_body = DesktopKeyboardTypeRequest,
+    responses(
+        (status = 200, description = "Desktop keyboard action result", body = DesktopActionResponse),
+        (status = 400, description = "Invalid keyboard type request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_keyboard_type(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopKeyboardTypeRequest>,
+) -> Result<Json<DesktopActionResponse>, ApiError> {
+    let response = state.desktop_runtime().type_text(body).await?;
+    Ok(Json(response))
+}
+
+/// Press a desktop keyboard shortcut.
+///
+/// Performs a health-gated `xdotool key` operation against the managed
+/// desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/keyboard/press",
+    tag = "v1",
+    request_body = DesktopKeyboardPressRequest,
+    responses(
+        (status = 200, description = "Desktop keyboard action result", body = DesktopActionResponse),
+        (status = 400, description = "Invalid keyboard press request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_keyboard_press(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopKeyboardPressRequest>,
+) -> Result<Json<DesktopActionResponse>, ApiError> {
+    let response = state.desktop_runtime().press_key(body).await?;
+    Ok(Json(response))
+}
+
+/// Press and hold a desktop keyboard key.
+///
+/// Performs a health-gated `xdotool keydown` operation against the managed
+/// desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/keyboard/down",
+    tag = "v1",
+    request_body = DesktopKeyboardDownRequest,
+    responses(
+        (status = 200, description = "Desktop keyboard action result", body = DesktopActionResponse),
+        (status = 400, description = "Invalid keyboard down request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_keyboard_down(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopKeyboardDownRequest>,
+) -> Result<Json<DesktopActionResponse>, ApiError> {
+    let response = state.desktop_runtime().key_down(body).await?;
+    Ok(Json(response))
+}
+
+/// Release a desktop keyboard key.
+///
+/// Performs a health-gated `xdotool keyup` operation against the managed
+/// desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/keyboard/up",
+    tag = "v1",
+    request_body = DesktopKeyboardUpRequest,
+    responses(
+        (status = 200, description = "Desktop keyboard action result", body = DesktopActionResponse),
+        (status = 400, description = "Invalid keyboard up request", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop runtime health or input failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_keyboard_up(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopKeyboardUpRequest>,
+) -> Result<Json<DesktopActionResponse>, ApiError> {
+    let response = state.desktop_runtime().key_up(body).await?;
+    Ok(Json(response))
+}
+
+/// Get desktop display information.
+///
+/// Performs a health-gated display query against the managed desktop and
+/// returns the current display identifier and resolution.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/display/info",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop display information", body = DesktopDisplayInfoResponse),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 503, description = "Desktop runtime health or display query failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_display_info(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopDisplayInfoResponse>, ApiError> {
+    let info = state.desktop_runtime().display_info().await?;
+    Ok(Json(info))
+}
+
+/// List visible desktop windows.
+///
+/// Performs a health-gated visible-window enumeration against the managed
+/// desktop and returns the current window metadata.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/windows",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Visible desktop windows", body = DesktopWindowListResponse),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 503, description = "Desktop runtime health or window query failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_windows(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopWindowListResponse>, ApiError> {
+    let windows = state.desktop_runtime().list_windows().await?;
+    Ok(Json(windows))
+}
+
+/// Get the currently focused desktop window.
+///
+/// Returns information about the window that currently has input focus.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/windows/focused",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Focused window info", body = DesktopWindowInfo),
+        (status = 404, description = "No window is focused", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_windows_focused(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopWindowInfo>, ApiError> {
+    let window = state.desktop_runtime().focused_window().await?;
+    Ok(Json(window))
+}
+
+/// Focus a desktop window.
+///
+/// Brings the specified window to the foreground and gives it input focus.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/windows/{id}/focus",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "X11 window ID")
+    ),
+    responses(
+        (status = 200, description = "Window info after focus", body = DesktopWindowInfo),
+        (status = 404, description = "Window not found", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_window_focus(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> Result<Json<DesktopWindowInfo>, ApiError> {
+    let window = state.desktop_runtime().focus_window(&id).await?;
+    Ok(Json(window))
+}
+
+/// Move a desktop window.
+///
+/// Moves the specified window to the given position.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/windows/{id}/move",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "X11 window ID")
+    ),
+    request_body = DesktopWindowMoveRequest,
+    responses(
+        (status = 200, description = "Window info after move", body = DesktopWindowInfo),
+        (status = 404, description = "Window not found", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_window_move(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Json(body): Json<DesktopWindowMoveRequest>,
+) -> Result<Json<DesktopWindowInfo>, ApiError> {
+    let window = state.desktop_runtime().move_window(&id, body).await?;
+    Ok(Json(window))
+}
+
+/// Resize a desktop window.
+///
+/// Resizes the specified window to the given dimensions.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/windows/{id}/resize",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "X11 window ID")
+    ),
+    request_body = DesktopWindowResizeRequest,
+    responses(
+        (status = 200, description = "Window info after resize", body = DesktopWindowInfo),
+        (status = 404, description = "Window not found", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_window_resize(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Json(body): Json<DesktopWindowResizeRequest>,
+) -> Result<Json<DesktopWindowInfo>, ApiError> {
+    let window = state.desktop_runtime().resize_window(&id, body).await?;
+    Ok(Json(window))
+}
+
+/// Read the desktop clipboard.
+///
+/// Returns the current text content of the X11 clipboard.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/clipboard",
+    tag = "v1",
+    params(DesktopClipboardQuery),
+    responses(
+        (status = 200, description = "Clipboard contents", body = DesktopClipboardResponse),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 500, description = "Clipboard read failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_clipboard(
+    State(state): State<Arc<AppState>>,
+    Query(query): Query<DesktopClipboardQuery>,
+) -> Result<Json<DesktopClipboardResponse>, ApiError> {
+    let clipboard = state
+        .desktop_runtime()
+        .get_clipboard(query.selection)
+        .await?;
+    Ok(Json(clipboard))
+}
+
+/// Write to the desktop clipboard.
+///
+/// Sets the text content of the X11 clipboard.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/clipboard",
+    tag = "v1",
+    request_body = DesktopClipboardWriteRequest,
+    responses(
+        (status = 200, description = "Clipboard updated", body = DesktopActionResponse),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails),
+        (status = 500, description = "Clipboard write failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_clipboard(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopClipboardWriteRequest>,
+) -> Result<Json<DesktopActionResponse>, ApiError> {
+    let result = state.desktop_runtime().set_clipboard(body).await?;
+    Ok(Json(result))
+}
+
+/// Launch a desktop application.
+///
+/// Launches an application by name on the managed desktop, optionally waiting
+/// for its window to appear.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/launch",
+    tag = "v1",
+    request_body = DesktopLaunchRequest,
+    responses(
+        (status = 200, description = "Application launched", body = DesktopLaunchResponse),
+        (status = 404, description = "Application not found", body = ProblemDetails),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_launch(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopLaunchRequest>,
+) -> Result<Json<DesktopLaunchResponse>, ApiError> {
+    let result = state.desktop_runtime().launch_app(body).await?;
+    Ok(Json(result))
+}
+
+/// Open a file or URL with the default handler.
+///
+/// Opens a file path or URL using xdg-open on the managed desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/open",
+    tag = "v1",
+    request_body = DesktopOpenRequest,
+    responses(
+        (status = 200, description = "Target opened", body = DesktopOpenResponse),
+        (status = 409, description = "Desktop runtime is not ready", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_open(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopOpenRequest>,
+) -> Result<Json<DesktopOpenResponse>, ApiError> {
+    let result = state.desktop_runtime().open_target(body).await?;
+    Ok(Json(result))
+}
+
+/// Start desktop recording.
+///
+/// Starts an ffmpeg x11grab recording against the managed desktop and returns
+/// the created recording metadata.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/recording/start",
+    tag = "v1",
+    request_body = DesktopRecordingStartRequest,
+    responses(
+        (status = 200, description = "Desktop recording started", body = DesktopRecordingInfo),
+        (status = 409, description = "Desktop runtime is not ready or a recording is already active", body = ProblemDetails),
+        (status = 502, description = "Desktop recording failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_recording_start(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<DesktopRecordingStartRequest>,
+) -> Result<Json<DesktopRecordingInfo>, ApiError> {
+    let recording = state.desktop_runtime().start_recording(body).await?;
+    Ok(Json(recording))
+}
+
+/// Stop desktop recording.
+///
+/// Stops the active desktop recording and returns the finalized recording
+/// metadata.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/recording/stop",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop recording stopped", body = DesktopRecordingInfo),
+        (status = 409, description = "No active desktop recording", body = ProblemDetails),
+        (status = 502, description = "Desktop recording stop failed", body = ProblemDetails)
+    )
+)]
+async fn post_v1_desktop_recording_stop(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopRecordingInfo>, ApiError> {
+    let recording = state.desktop_runtime().stop_recording().await?;
+    Ok(Json(recording))
+}
+
+/// List desktop recordings.
+///
+/// Returns the current desktop recording catalog.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/recordings",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop recordings", body = DesktopRecordingListResponse),
+        (status = 502, description = "Desktop recordings query failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_recordings(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopRecordingListResponse>, ApiError> {
+    let recordings = state.desktop_runtime().list_recordings().await?;
+    Ok(Json(recordings))
+}
+
+/// Get desktop recording metadata.
+///
+/// Returns metadata for a single desktop recording.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/recordings/{id}",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Desktop recording ID")
+    ),
+    responses(
+        (status = 200, description = "Desktop recording metadata", body = DesktopRecordingInfo),
+        (status = 404, description = "Unknown desktop recording", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_recording(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> Result<Json<DesktopRecordingInfo>, ApiError> {
+    let recording = state.desktop_runtime().get_recording(&id).await?;
+    Ok(Json(recording))
+}
+
+/// Download a desktop recording.
+///
+/// Serves the recorded MP4 bytes for a completed desktop recording.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/recordings/{id}/download",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Desktop recording ID")
+    ),
+    responses(
+        (status = 200, description = "Desktop recording as MP4 bytes"),
+        (status = 404, description = "Unknown desktop recording", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_recording_download(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> Result<Response, ApiError> {
+    let path = state.desktop_runtime().recording_download_path(&id).await?;
+    let bytes = tokio::fs::read(&path)
+        .await
+        .map_err(|err| SandboxError::StreamError {
+            message: format!("failed to read desktop recording {}: {err}", path.display()),
+        })?;
+    Ok(([(header::CONTENT_TYPE, "video/mp4")], Bytes::from(bytes)).into_response())
+}
+
+/// Delete a desktop recording.
+///
+/// Removes a completed desktop recording and its file from disk.
+#[utoipa::path(
+    delete,
+    path = "/v1/desktop/recordings/{id}",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Desktop recording ID")
+    ),
+    responses(
+        (status = 204, description = "Desktop recording deleted"),
+        (status = 404, description = "Unknown desktop recording", body = ProblemDetails),
+        (status = 409, description = "Desktop recording is still active", body = ProblemDetails)
+    )
+)]
+async fn delete_v1_desktop_recording(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> Result<StatusCode, ApiError> {
+    state.desktop_runtime().delete_recording(&id).await?;
+    Ok(StatusCode::NO_CONTENT)
+}
+
+/// Start desktop streaming.
+///
+/// Enables desktop websocket streaming for the managed desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/stream/start",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop streaming started", body = DesktopStreamStatusResponse)
+    )
+)]
+async fn post_v1_desktop_stream_start(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopStreamStatusResponse>, ApiError> {
+    Ok(Json(state.desktop_runtime().start_streaming().await?))
+}
+
+/// Stop desktop streaming.
+///
+/// Disables desktop websocket streaming for the managed desktop.
+#[utoipa::path(
+    post,
+    path = "/v1/desktop/stream/stop",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop streaming stopped", body = DesktopStreamStatusResponse)
+    )
+)]
+async fn post_v1_desktop_stream_stop(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopStreamStatusResponse>, ApiError> {
+    Ok(Json(state.desktop_runtime().stop_streaming().await))
+}
+
+/// Get desktop stream status.
+///
+/// Returns the current state of the desktop WebRTC streaming session.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/stream/status",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Desktop stream status", body = DesktopStreamStatusResponse)
+    )
+)]
+async fn get_v1_desktop_stream_status(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<DesktopStreamStatusResponse>, ApiError> {
+    Ok(Json(state.desktop_runtime().stream_status().await))
+}
+
+/// Open a desktop WebRTC signaling session.
+///
+/// Upgrades the connection to a WebSocket used for WebRTC signaling between
+/// the browser client and the desktop streaming process. Also accepts mouse
+/// and keyboard input frames as a fallback transport.
+#[utoipa::path(
+    get,
+    path = "/v1/desktop/stream/signaling",
+    tag = "v1",
+    params(
+        ("access_token" = Option<String>, Query, description = "Bearer token alternative for WS auth")
+    ),
+    responses(
+        (status = 101, description = "WebSocket upgraded"),
+        (status = 409, description = "Desktop runtime or streaming session is not ready", body = ProblemDetails),
+        (status = 502, description = "Desktop stream failed", body = ProblemDetails)
+    )
+)]
+async fn get_v1_desktop_stream_ws(
+    State(state): State<Arc<AppState>>,
+    Query(_query): Query<ProcessWsQuery>,
+    ws: WebSocketUpgrade,
+) -> Result<Response, ApiError> {
+    state.desktop_runtime().ensure_streaming_active().await?;
+    Ok(ws
+        .on_upgrade(move |socket| desktop_stream_ws_session(socket, state.desktop_runtime()))
+        .into_response())
+}
+
 #[utoipa::path(
     get,
     path = "/v1/agents",
@@ -1075,6 +2150,796 @@ async fn post_v1_fs_upload_batch(
     }))
 }
 
+/// Get process runtime configuration.
+///
+/// Returns the current runtime configuration for the process management API,
+/// including limits for concurrency, timeouts, and buffer sizes.
+#[utoipa::path(
+    get,
+    path = "/v1/processes/config",
+    tag = "v1",
+    responses(
+        (status = 200, description = "Current runtime process config", body = ProcessConfig),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn get_v1_processes_config(
+    State(state): State<Arc<AppState>>,
+) -> Result<Json<ProcessConfig>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let config = state.process_runtime().get_config().await;
+    Ok(Json(map_process_config(config)))
+}
+
+/// Update process runtime configuration.
+///
+/// Replaces the runtime configuration for the process management API.
+/// Validates that all values are non-zero and clamps default timeout to max.
+#[utoipa::path(
+    post,
+    path = "/v1/processes/config",
+    tag = "v1",
+    request_body = ProcessConfig,
+    responses(
+        (status = 200, description = "Updated runtime process config", body = ProcessConfig),
+        (status = 400, description = "Invalid config", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_processes_config(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<ProcessConfig>,
+) -> Result<Json<ProcessConfig>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let runtime = state.process_runtime();
+    let updated = runtime
+        .set_config(into_runtime_process_config(body))
+        .await?;
+    Ok(Json(map_process_config(updated)))
+}
+
+/// Create a long-lived managed process.
+///
+/// Spawns a new process with the given command and arguments. Supports both
+/// pipe-based and PTY (tty) modes. Returns the process descriptor on success.
+#[utoipa::path(
+    post,
+    path = "/v1/processes",
+    tag = "v1",
+    request_body = ProcessCreateRequest,
+    responses(
+        (status = 200, description = "Started process", body = ProcessInfo),
+        (status = 400, description = "Invalid request", body = ProblemDetails),
+        (status = 409, description = "Process limit or state conflict", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_processes(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<ProcessCreateRequest>,
+) -> Result<Json<ProcessInfo>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let runtime = state.process_runtime();
+    let snapshot = runtime
+        .start_process(ProcessStartSpec {
+            command: body.command,
+            args: body.args,
+            cwd: body.cwd,
+            env: body.env.into_iter().collect(),
+            tty: body.tty,
+            interactive: body.interactive,
+            owner: RuntimeProcessOwner::User,
+            restart_policy: None,
+        })
+        .await?;
+
+    Ok(Json(map_process_snapshot(snapshot)))
+}
+
+/// Run a one-shot command.
+///
+/// Executes a command to completion and returns its stdout, stderr, exit code,
+/// and duration. Supports configurable timeout and output size limits.
+#[utoipa::path(
+    post,
+    path = "/v1/processes/run",
+    tag = "v1",
+    request_body = ProcessRunRequest,
+    responses(
+        (status = 200, description = "One-off command result", body = ProcessRunResponse),
+        (status = 400, description = "Invalid request", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_processes_run(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<ProcessRunRequest>,
+) -> Result<Json<ProcessRunResponse>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let runtime = state.process_runtime();
+    let output = runtime
+        .run_once(RunSpec {
+            command: body.command,
+            args: body.args,
+            cwd: body.cwd,
+            env: body.env.into_iter().collect(),
+            timeout_ms: body.timeout_ms,
+            max_output_bytes: body.max_output_bytes,
+        })
+        .await?;
+
+    Ok(Json(ProcessRunResponse {
+        exit_code: output.exit_code,
+        timed_out: output.timed_out,
+        stdout: output.stdout,
+        stderr: output.stderr,
+        stdout_truncated: output.stdout_truncated,
+        stderr_truncated: output.stderr_truncated,
+        duration_ms: output.duration_ms,
+    }))
+}
+
+/// List all managed processes.
+///
+/// Returns a list of all processes (running and exited) currently tracked
+/// by the runtime, sorted by process ID.
+#[utoipa::path(
+    get,
+    path = "/v1/processes",
+    tag = "v1",
+    params(ProcessListQuery),
+    responses(
+        (status = 200, description = "List processes", body = ProcessListResponse),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn get_v1_processes(
+    State(state): State<Arc<AppState>>,
+    Query(query): Query<ProcessListQuery>,
+) -> Result<Json<ProcessListResponse>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let snapshots = state
+        .process_runtime()
+        .list_processes(query.owner.map(into_runtime_process_owner))
+        .await;
+    Ok(Json(ProcessListResponse {
+        processes: snapshots.into_iter().map(map_process_snapshot).collect(),
+    }))
+}
+
+/// Get a single process by ID.
+///
+/// Returns the current state of a managed process including its status,
+/// PID, exit code, and creation/exit timestamps.
+#[utoipa::path(
+    get,
+    path = "/v1/processes/{id}",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID")
+    ),
+    responses(
+        (status = 200, description = "Process details", body = ProcessInfo),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn get_v1_process(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> Result<Json<ProcessInfo>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let snapshot = state.process_runtime().snapshot(&id).await?;
+    Ok(Json(map_process_snapshot(snapshot)))
+}
+
+/// Send SIGTERM to a process.
+///
+/// Sends SIGTERM to the process and optionally waits up to `waitMs`
+/// milliseconds for the process to exit before returning.
+#[utoipa::path(
+    post,
+    path = "/v1/processes/{id}/stop",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID"),
+        ("waitMs" = Option<u64>, Query, description = "Wait up to N ms for process to exit")
+    ),
+    responses(
+        (status = 200, description = "Stop signal sent", body = ProcessInfo),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_process_stop(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Query(query): Query<ProcessSignalQuery>,
+) -> Result<Json<ProcessInfo>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let snapshot = state
+        .process_runtime()
+        .stop_process(&id, query.wait_ms)
+        .await?;
+    Ok(Json(map_process_snapshot(snapshot)))
+}
+
+/// Send SIGKILL to a process.
+///
+/// Sends SIGKILL to the process and optionally waits up to `waitMs`
+/// milliseconds for the process to exit before returning.
+#[utoipa::path(
+    post,
+    path = "/v1/processes/{id}/kill",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID"),
+        ("waitMs" = Option<u64>, Query, description = "Wait up to N ms for process to exit")
+    ),
+    responses(
+        (status = 200, description = "Kill signal sent", body = ProcessInfo),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_process_kill(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Query(query): Query<ProcessSignalQuery>,
+) -> Result<Json<ProcessInfo>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let snapshot = state
+        .process_runtime()
+        .kill_process(&id, query.wait_ms)
+        .await?;
+    Ok(Json(map_process_snapshot(snapshot)))
+}
+
+/// Delete a process record.
+///
+/// Removes a stopped process from the runtime. Returns 409 if the process
+/// is still running; stop or kill it first.
+#[utoipa::path(
+    delete,
+    path = "/v1/processes/{id}",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID")
+    ),
+    responses(
+        (status = 204, description = "Process deleted"),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 409, description = "Process is still running", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn delete_v1_process(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> Result<StatusCode, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    state.process_runtime().delete_process(&id).await?;
+    Ok(StatusCode::NO_CONTENT)
+}
+
+/// Fetch process logs.
+///
+/// Returns buffered log entries for a process. Supports filtering by stream
+/// type, tail count, and sequence-based resumption. When `follow=true`,
+/// returns an SSE stream that replays buffered entries then streams live output.
+#[utoipa::path(
+    get,
+    path = "/v1/processes/{id}/logs",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID"),
+        ("stream" = Option<ProcessLogsStream>, Query, description = "stdout|stderr|combined|pty"),
+        ("tail" = Option<usize>, Query, description = "Tail N entries"),
+        ("follow" = Option<bool>, Query, description = "Follow via SSE"),
+        ("since" = Option<u64>, Query, description = "Only entries with sequence greater than this")
+    ),
+    responses(
+        (status = 200, description = "Process logs", body = ProcessLogsResponse),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn get_v1_process_logs(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    headers: HeaderMap,
+    Query(query): Query<ProcessLogsQuery>,
+) -> Result<Response, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let runtime = state.process_runtime();
+    let default_stream = if runtime.is_tty(&id).await? {
+        ProcessLogsStream::Pty
+    } else {
+        ProcessLogsStream::Combined
+    };
+    let requested_stream = query.stream.unwrap_or(default_stream);
+    let since = match (query.since, parse_last_event_id(&headers)?) {
+        (Some(query_since), Some(last_event_id)) => Some(query_since.max(last_event_id)),
+        (Some(query_since), None) => Some(query_since),
+        (None, Some(last_event_id)) => Some(last_event_id),
+        (None, None) => None,
+    };
+    let filter = ProcessLogFilter {
+        stream: into_runtime_log_stream(requested_stream),
+        tail: query.tail,
+        since,
+    };
+
+    let entries = runtime.logs(&id, filter).await?;
+    let response_entries: Vec<ProcessLogEntry> =
+        entries.iter().cloned().map(map_process_log_line).collect();
+
+    if query.follow.unwrap_or(false) {
+        let rx = runtime.subscribe_logs(&id).await?;
+        let replay_stream = stream::iter(response_entries.into_iter().map(|entry| {
+            Ok::<axum::response::sse::Event, Infallible>(
+                axum::response::sse::Event::default()
+                    .event("log")
+                    .id(entry.sequence.to_string())
+                    .data(serde_json::to_string(&entry).unwrap_or_else(|_| "{}".to_string())),
+            )
+        }));
+
+        let requested_stream_copy = requested_stream;
+        let follow_stream = BroadcastStream::new(rx).filter_map(move |item| {
+            let requested_stream_copy = requested_stream_copy;
+            async move {
+                match item {
+                    Ok(line) => {
+                        let entry = map_process_log_line(line);
+                        if process_log_matches(&entry, requested_stream_copy) {
+                            Some(Ok(axum::response::sse::Event::default()
+                                .event("log")
+                                .id(entry.sequence.to_string())
+                                .data(
+                                    serde_json::to_string(&entry)
+                                        .unwrap_or_else(|_| "{}".to_string()),
+                                )))
+                        } else {
+                            None
+                        }
+                    }
+                    Err(_) => None,
+                }
+            }
+        });
+
+        let stream = replay_stream.chain(follow_stream);
+        let response =
+            Sse::new(stream).keep_alive(KeepAlive::new().interval(Duration::from_secs(15)));
+        return Ok(response.into_response());
+    }
+
+    Ok(Json(ProcessLogsResponse {
+        process_id: id,
+        stream: requested_stream,
+        entries: response_entries,
+    })
+    .into_response())
+}
+
+/// Write input to a process.
+///
+/// Sends data to a process's stdin (pipe mode) or PTY writer (tty mode).
+/// Data can be encoded as base64, utf8, or text. Returns 413 if the decoded
+/// payload exceeds the configured `maxInputBytesPerRequest` limit.
+#[utoipa::path(
+    post,
+    path = "/v1/processes/{id}/input",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID")
+    ),
+    request_body = ProcessInputRequest,
+    responses(
+        (status = 200, description = "Input accepted", body = ProcessInputResponse),
+        (status = 400, description = "Invalid request", body = ProblemDetails),
+        (status = 413, description = "Input exceeds configured limit", body = ProblemDetails),
+        (status = 409, description = "Process not writable", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_process_input(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Json(body): Json<ProcessInputRequest>,
+) -> Result<Json<ProcessInputResponse>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let encoding = body.encoding.unwrap_or_else(|| "base64".to_string());
+    let input = decode_input_bytes(&body.data, &encoding)?;
+    let runtime = state.process_runtime();
+    let max_input = runtime.max_input_bytes().await;
+    if input.len() > max_input {
+        return Err(SandboxError::InvalidRequest {
+            message: format!("input payload exceeds maxInputBytesPerRequest ({max_input})"),
+        }
+        .into());
+    }
+
+    let bytes_written = runtime.write_input(&id, &input).await?;
+    Ok(Json(ProcessInputResponse { bytes_written }))
+}
+
+/// Resize a process terminal.
+///
+/// Sets the PTY window size (columns and rows) for a tty-mode process and
+/// sends SIGWINCH so the child process can adapt.
+#[utoipa::path(
+    post,
+    path = "/v1/processes/{id}/terminal/resize",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID")
+    ),
+    request_body = ProcessTerminalResizeRequest,
+    responses(
+        (status = 200, description = "Resize accepted", body = ProcessTerminalResizeResponse),
+        (status = 400, description = "Invalid request", body = ProblemDetails),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 409, description = "Not a terminal process", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn post_v1_process_terminal_resize(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Json(body): Json<ProcessTerminalResizeRequest>,
+) -> Result<Json<ProcessTerminalResizeResponse>, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    state
+        .process_runtime()
+        .resize_terminal(&id, body.cols, body.rows)
+        .await?;
+    Ok(Json(ProcessTerminalResizeResponse {
+        cols: body.cols,
+        rows: body.rows,
+    }))
+}
+
+/// Open an interactive WebSocket terminal session.
+///
+/// Upgrades the connection to a WebSocket for bidirectional PTY I/O. Accepts
+/// `access_token` query param for browser-based auth (WebSocket API cannot
+/// send custom headers). Streams raw PTY output as binary frames and accepts
+/// JSON control frames for input, resize, and close.
+#[utoipa::path(
+    get,
+    path = "/v1/processes/{id}/terminal/ws",
+    tag = "v1",
+    params(
+        ("id" = String, Path, description = "Process ID"),
+        ("access_token" = Option<String>, Query, description = "Bearer token alternative for WS auth")
+    ),
+    responses(
+        (status = 101, description = "WebSocket upgraded"),
+        (status = 400, description = "Invalid websocket frame or upgrade request", body = ProblemDetails),
+        (status = 404, description = "Unknown process", body = ProblemDetails),
+        (status = 409, description = "Not a terminal process", body = ProblemDetails),
+        (status = 501, description = "Process API unsupported on this platform", body = ProblemDetails)
+    )
+)]
+async fn get_v1_process_terminal_ws(
+    State(state): State<Arc<AppState>>,
+    Path(id): Path<String>,
+    Query(_query): Query<ProcessWsQuery>,
+    ws: WebSocketUpgrade,
+) -> Result<Response, ApiError> {
+    if !process_api_supported() {
+        return Err(process_api_not_supported().into());
+    }
+
+    let runtime = state.process_runtime();
+    if !runtime.is_tty(&id).await? {
+        return Err(SandboxError::Conflict {
+            message: "process is not running in tty mode".to_string(),
+        }
+        .into());
+    }
+
+    Ok(ws
+        .on_upgrade(move |socket| process_terminal_ws_session(socket, runtime, id))
+        .into_response())
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+enum TerminalClientFrame {
+    Input {
+        data: String,
+        #[serde(default)]
+        encoding: Option<String>,
+    },
+    Resize {
+        cols: u16,
+        rows: u16,
+    },
+    Close,
+}
+
+async fn process_terminal_ws_session(
+    mut socket: WebSocket,
+    runtime: Arc<ProcessRuntime>,
+    id: String,
+) {
+    let _ = send_ws_json(
+        &mut socket,
+        json!({
+            "type": "ready",
+            "processId": &id,
+        }),
+    )
+    .await;
+
+    let mut log_rx = match runtime.subscribe_logs(&id).await {
+        Ok(rx) => rx,
+        Err(err) => {
+            let _ = send_ws_error(&mut socket, &err.to_string()).await;
+            let _ = socket.close().await;
+            return;
+        }
+    };
+    let mut exit_poll = tokio::time::interval(Duration::from_millis(150));
+
+    loop {
+        tokio::select! {
+            ws_in = socket.recv() => {
+                match ws_in {
+                    Some(Ok(Message::Binary(_))) => {
+                        let _ = send_ws_error(&mut socket, "binary input is not supported; use text JSON frames").await;
+                    }
+                    Some(Ok(Message::Text(text))) => {
+                        let parsed = serde_json::from_str::<TerminalClientFrame>(&text);
+                        match parsed {
+                            Ok(TerminalClientFrame::Input { data, encoding }) => {
+                                let input = match decode_input_bytes(&data, encoding.as_deref().unwrap_or("utf8")) {
+                                    Ok(input) => input,
+                                    Err(err) => {
+                                        let _ = send_ws_error(&mut socket, &err.to_string()).await;
+                                        continue;
+                                    }
+                                };
+                                let max_input = runtime.max_input_bytes().await;
+                                if input.len() > max_input {
+                                    let _ = send_ws_error(&mut socket, &format!("input payload exceeds maxInputBytesPerRequest ({max_input})")).await;
+                                    continue;
+                                }
+                                if let Err(err) = runtime.write_input(&id, &input).await {
+                                    let _ = send_ws_error(&mut socket, &err.to_string()).await;
+                                }
+                            }
+                            Ok(TerminalClientFrame::Resize { cols, rows }) => {
+                                if let Err(err) = runtime.resize_terminal(&id, cols, rows).await {
+                                    let _ = send_ws_error(&mut socket, &err.to_string()).await;
+                                }
+                            }
+                            Ok(TerminalClientFrame::Close) => {
+                                let _ = socket.close().await;
+                                break;
+                            }
+                            Err(err) => {
+                                let _ = send_ws_error(&mut socket, &format!("invalid terminal frame: {err}")).await;
+                            }
+                        }
+                    }
+                    Some(Ok(Message::Ping(payload))) => {
+                        let _ = socket.send(Message::Pong(payload)).await;
+                    }
+                    Some(Ok(Message::Close(_))) | None => break,
+                    Some(Ok(Message::Pong(_))) => {}
+                    Some(Err(_)) => break,
+                }
+            }
+            log_in = log_rx.recv() => {
+                match log_in {
+                    Ok(line) => {
+                        if line.stream != ProcessStream::Pty {
+                            continue;
+                        }
+                        let bytes = {
+                            use base64::engine::general_purpose::STANDARD as BASE64_ENGINE;
+                            use base64::Engine;
+                            BASE64_ENGINE.decode(&line.data).unwrap_or_default()
+                        };
+                        if socket.send(Message::Binary(bytes)).await.is_err() {
+                            break;
+                        }
+                    }
+                    Err(tokio::sync::broadcast::error::RecvError::Lagged(_)) => {}
+                    Err(tokio::sync::broadcast::error::RecvError::Closed) => break,
+                }
+            }
+            _ = exit_poll.tick() => {
+                if let Ok(snapshot) = runtime.snapshot(&id).await {
+                    if snapshot.status == ProcessStatus::Exited {
+                        let _ = send_ws_json(
+                            &mut socket,
+                            json!({
+                                "type": "exit",
+                                "exitCode": snapshot.exit_code,
+                            }),
+                        )
+                        .await;
+                        let _ = socket.close().await;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// WebRTC signaling proxy session.
+///
+/// Proxies the WebSocket bidirectionally between the browser client and neko's
+/// internal WebSocket endpoint. All neko signaling messages (SDP offers/answers,
+/// ICE candidates, system events) are relayed transparently.
+async fn desktop_stream_ws_session(mut client_ws: WebSocket, desktop_runtime: Arc<DesktopRuntime>) {
+    use futures::SinkExt;
+    use tokio_tungstenite::tungstenite::Message as TungsteniteMessage;
+
+    // Get neko's internal WS URL from the streaming manager.
+    let neko_ws_url = match desktop_runtime.streaming_manager().neko_ws_url().await {
+        Some(url) => url,
+        None => {
+            let _ = send_ws_error(&mut client_ws, "streaming process is not available").await;
+            let _ = client_ws.close().await;
+            return;
+        }
+    };
+
+    // Create a fresh neko login session for this connection.
+    // Each proxy connection gets its own neko session to avoid conflicts
+    // when multiple clients connect (neko sends signal/close to shared sessions).
+    let session_cookie = desktop_runtime
+        .streaming_manager()
+        .create_neko_session()
+        .await;
+
+    // Build a WS request with the neko session cookie for authentication.
+    let ws_req = {
+        use tokio_tungstenite::tungstenite::client::IntoClientRequest;
+        let mut req = neko_ws_url
+            .into_client_request()
+            .expect("valid neko WS URL");
+        if let Some(ref cookie) = session_cookie {
+            req.headers_mut()
+                .insert("Cookie", cookie.parse().expect("valid cookie header"));
+        }
+        req
+    };
+
+    // Connect to neko's internal WebSocket.
+    let (neko_ws, _) = match tokio_tungstenite::connect_async(ws_req).await {
+        Ok(conn) => conn,
+        Err(err) => {
+            let _ = send_ws_error(
+                &mut client_ws,
+                &format!("failed to connect to streaming process: {err}"),
+            )
+            .await;
+            let _ = client_ws.close().await;
+            return;
+        }
+    };
+
+    let (mut neko_sink, mut neko_stream) = neko_ws.split();
+
+    // Relay messages bidirectionally between client and neko.
+    loop {
+        tokio::select! {
+            // Client → Neko (signaling passthrough; input goes via WebRTC data channel)
+            client_msg = client_ws.recv() => {
+                match client_msg {
+                    Some(Ok(Message::Text(text))) => {
+                        if neko_sink.send(TungsteniteMessage::Text(text.into())).await.is_err() {
+                            break;
+                        }
+                    }
+                    Some(Ok(Message::Binary(data))) => {
+                        if neko_sink.send(TungsteniteMessage::Binary(data.into())).await.is_err() {
+                            break;
+                        }
+                    }
+                    Some(Ok(Message::Ping(payload))) => {
+                        let _ = client_ws.send(Message::Pong(payload)).await;
+                    }
+                    Some(Ok(Message::Close(_))) | None => break,
+                    Some(Ok(Message::Pong(_))) => {}
+                    Some(Err(_)) => break,
+                }
+            }
+            // Neko → Client
+            neko_msg = neko_stream.next() => {
+                match neko_msg {
+                    Some(Ok(TungsteniteMessage::Text(text))) => {
+                        if client_ws.send(Message::Text(text.into())).await.is_err() {
+                            break;
+                        }
+                    }
+                    Some(Ok(TungsteniteMessage::Binary(data))) => {
+                        if client_ws.send(Message::Binary(data.into())).await.is_err() {
+                            break;
+                        }
+                    }
+                    Some(Ok(TungsteniteMessage::Ping(payload))) => {
+                        if neko_sink.send(TungsteniteMessage::Pong(payload.clone())).await.is_err() {
+                            break;
+                        }
+                    }
+                    Some(Ok(TungsteniteMessage::Close(_))) | None => break,
+                    Some(Ok(TungsteniteMessage::Pong(_))) => {}
+                    Some(Ok(TungsteniteMessage::Frame(_))) => {}
+                    Some(Err(_)) => break,
+                }
+            }
+        }
+    }
+
+    let _ = neko_sink.close().await;
+    let _ = client_ws.close().await;
+}
+
+async fn send_ws_json(socket: &mut WebSocket, payload: Value) -> Result<(), ()> {
+    socket
+        .send(Message::Text(
+            serde_json::to_string(&payload).map_err(|_| ())?,
+        ))
+        .await
+        .map_err(|_| ())
+}
+
+async fn send_ws_error(socket: &mut WebSocket, message: &str) -> Result<(), ()> {
+    send_ws_json(
+        socket,
+        json!({
+            "type": "error",
+            "message": message,
+        }),
+    )
+    .await
+}
+
 #[utoipa::path(
     get,
     path = "/v1/config/mcp",
@@ -1386,6 +3251,109 @@ async fn delete_v1_acp(
     Ok(StatusCode::NO_CONTENT)
 }
 
+fn process_api_supported() -> bool {
+    !cfg!(windows)
+}
+
+fn process_api_not_supported() -> ProblemDetails {
+    ProblemDetails {
+        type_: ErrorType::InvalidRequest.as_urn().to_string(),
+        title: "Not Implemented".to_string(),
+        status: 501,
+        detail: Some("process API is not implemented on Windows".to_string()),
+        instance: None,
+        extensions: serde_json::Map::new(),
+    }
+}
+
+fn map_process_config(config: ProcessRuntimeConfig) -> ProcessConfig {
+    ProcessConfig {
+        max_concurrent_processes: config.max_concurrent_processes,
+        default_run_timeout_ms: config.default_run_timeout_ms,
+        max_run_timeout_ms: config.max_run_timeout_ms,
+        max_output_bytes: config.max_output_bytes,
+        max_log_bytes_per_process: config.max_log_bytes_per_process,
+        max_input_bytes_per_request: config.max_input_bytes_per_request,
+    }
+}
+
+fn into_runtime_process_config(config: ProcessConfig) -> ProcessRuntimeConfig {
+    ProcessRuntimeConfig {
+        max_concurrent_processes: config.max_concurrent_processes,
+        default_run_timeout_ms: config.default_run_timeout_ms,
+        max_run_timeout_ms: config.max_run_timeout_ms,
+        max_output_bytes: config.max_output_bytes,
+        max_log_bytes_per_process: config.max_log_bytes_per_process,
+        max_input_bytes_per_request: config.max_input_bytes_per_request,
+    }
+}
+
+fn into_runtime_process_owner(owner: ProcessOwner) -> RuntimeProcessOwner {
+    match owner {
+        ProcessOwner::User => RuntimeProcessOwner::User,
+        ProcessOwner::Desktop => RuntimeProcessOwner::Desktop,
+        ProcessOwner::System => RuntimeProcessOwner::System,
+    }
+}
+
+fn map_process_snapshot(snapshot: ProcessSnapshot) -> ProcessInfo {
+    ProcessInfo {
+        id: snapshot.id,
+        command: snapshot.command,
+        args: snapshot.args,
+        cwd: snapshot.cwd,
+        tty: snapshot.tty,
+        interactive: snapshot.interactive,
+        owner: match snapshot.owner {
+            RuntimeProcessOwner::User => ProcessOwner::User,
+            RuntimeProcessOwner::Desktop => ProcessOwner::Desktop,
+            RuntimeProcessOwner::System => ProcessOwner::System,
+        },
+        status: match snapshot.status {
+            ProcessStatus::Running => ProcessState::Running,
+            ProcessStatus::Exited => ProcessState::Exited,
+        },
+        pid: snapshot.pid,
+        exit_code: snapshot.exit_code,
+        created_at_ms: snapshot.created_at_ms,
+        exited_at_ms: snapshot.exited_at_ms,
+    }
+}
+
+fn into_runtime_log_stream(stream: ProcessLogsStream) -> ProcessLogFilterStream {
+    match stream {
+        ProcessLogsStream::Stdout => ProcessLogFilterStream::Stdout,
+        ProcessLogsStream::Stderr => ProcessLogFilterStream::Stderr,
+        ProcessLogsStream::Combined => ProcessLogFilterStream::Combined,
+        ProcessLogsStream::Pty => ProcessLogFilterStream::Pty,
+    }
+}
+
+fn map_process_log_line(line: crate::process_runtime::ProcessLogLine) -> ProcessLogEntry {
+    ProcessLogEntry {
+        sequence: line.sequence,
+        stream: match line.stream {
+            ProcessStream::Stdout => ProcessLogsStream::Stdout,
+            ProcessStream::Stderr => ProcessLogsStream::Stderr,
+            ProcessStream::Pty => ProcessLogsStream::Pty,
+        },
+        timestamp_ms: line.timestamp_ms,
+        data: line.data,
+        encoding: line.encoding.to_string(),
+    }
+}
+
+fn process_log_matches(entry: &ProcessLogEntry, stream: ProcessLogsStream) -> bool {
+    match stream {
+        ProcessLogsStream::Stdout => entry.stream == ProcessLogsStream::Stdout,
+        ProcessLogsStream::Stderr => entry.stream == ProcessLogsStream::Stderr,
+        ProcessLogsStream::Combined => {
+            entry.stream == ProcessLogsStream::Stdout || entry.stream == ProcessLogsStream::Stderr
+        }
+        ProcessLogsStream::Pty => entry.stream == ProcessLogsStream::Pty,
+    }
+}
+
 fn validate_named_query(value: &str, field_name: &str) -> Result<(), SandboxError> {
     if value.trim().is_empty() {
         return Err(SandboxError::InvalidRequest {
diff --git a/server/packages/sandbox-agent/src/router/support.rs b/server/packages/sandbox-agent/src/router/support.rs
index 173017d..6bcc103 100644
--- a/server/packages/sandbox-agent/src/router/support.rs
+++ b/server/packages/sandbox-agent/src/router/support.rs
@@ -33,7 +33,18 @@ pub(super) async fn require_token(
         .and_then(|value| value.to_str().ok())
         .and_then(|value| value.strip_prefix("Bearer "));
 
-    if bearer == Some(expected.as_str()) {
+    let allow_query_token = request.uri().path().ends_with("/terminal/ws")
+        || request.uri().path().ends_with("/stream/ws");
+    let query_token = if allow_query_token {
+        request
+            .uri()
+            .query()
+            .and_then(|query| query_param(query, "access_token"))
+    } else {
+        None
+    };
+
+    if bearer == Some(expected.as_str()) || query_token.as_deref() == Some(expected.as_str()) {
         return Ok(next.run(request).await);
     }
 
@@ -42,6 +53,50 @@ pub(super) async fn require_token(
     }))
 }
 
+fn query_param(query: &str, key: &str) -> Option<String> {
+    query
+        .split('&')
+        .filter_map(|part| part.split_once('='))
+        .find_map(|(k, v)| {
+            if k == key {
+                Some(percent_decode(v))
+            } else {
+                None
+            }
+        })
+}
+
+fn percent_decode(input: &str) -> String {
+    let mut output = Vec::with_capacity(input.len());
+    let bytes = input.as_bytes();
+    let mut i = 0;
+    while i < bytes.len() {
+        if bytes[i] == b'%' && i + 2 < bytes.len() {
+            if let (Some(hi), Some(lo)) = (hex_nibble(bytes[i + 1]), hex_nibble(bytes[i + 2])) {
+                output.push((hi << 4) | lo);
+                i += 3;
+                continue;
+            }
+        }
+        if bytes[i] == b'+' {
+            output.push(b' ');
+        } else {
+            output.push(bytes[i]);
+        }
+        i += 1;
+    }
+    String::from_utf8(output).unwrap_or_else(|_| input.to_string())
+}
+
+fn hex_nibble(b: u8) -> Option<u8> {
+    match b {
+        b'0'..=b'9' => Some(b - b'0'),
+        b'a'..=b'f' => Some(b - b'a' + 10),
+        b'A'..=b'F' => Some(b - b'A' + 10),
+        _ => None,
+    }
+}
+
 pub(super) type PinBoxSseStream = crate::acp_proxy_runtime::PinBoxSseStream;
 
 pub(super) fn credentials_available_for(
@@ -90,6 +145,9 @@ pub(super) fn fallback_config_options(agent: AgentId) -> Vec<Value> {
         AgentId::Codex => CODEX.clone(),
         AgentId::Opencode => OPENCODE.clone(),
         AgentId::Cursor => CURSOR.clone(),
+        // Amp returns empty configOptions from session/new but exposes modes via
+        // the `modes` field. The model is hardcoded. Modes discovered from ACP
+        // session/new response (amp-acp v0.7.0).
         AgentId::Amp => vec![
             json!({
                 "id": "model",
@@ -106,12 +164,10 @@ pub(super) fn fallback_config_options(agent: AgentId) -> Vec<Value> {
                 "name": "Mode",
                 "category": "mode",
                 "type": "select",
-                "currentValue": "smart",
+                "currentValue": "default",
                 "options": [
-                    { "value": "smart", "name": "Smart" },
-                    { "value": "deep", "name": "Deep" },
-                    { "value": "free", "name": "Free" },
-                    { "value": "rush", "name": "Rush" }
+                    { "value": "default", "name": "Default" },
+                    { "value": "bypass", "name": "Bypass" }
                 ]
             }),
         ],
@@ -125,41 +181,76 @@ pub(super) fn fallback_config_options(agent: AgentId) -> Vec<Value> {
                 { "value": "default", "name": "Default" }
             ]
         })],
-        AgentId::Mock => vec![json!({
-            "id": "model",
-            "name": "Model",
-            "category": "model",
-            "type": "select",
-            "currentValue": "mock",
-            "options": [
-                { "value": "mock", "name": "Mock" }
-            ]
-        })],
+        AgentId::Mock => vec![
+            json!({
+                "id": "model",
+                "name": "Model",
+                "category": "model",
+                "type": "select",
+                "currentValue": "mock",
+                "options": [
+                    { "value": "mock", "name": "Mock" },
+                    { "value": "mock-fast", "name": "Mock Fast" }
+                ]
+            }),
+            json!({
+                "id": "mode",
+                "name": "Mode",
+                "category": "mode",
+                "type": "select",
+                "currentValue": "normal",
+                "options": [
+                    { "value": "normal", "name": "Normal" },
+                    { "value": "plan", "name": "Plan" }
+                ]
+            }),
+            json!({
+                "id": "thought_level",
+                "name": "Thought Level",
+                "category": "thought_level",
+                "type": "select",
+                "currentValue": "low",
+                "options": [
+                    { "value": "low", "name": "Low" },
+                    { "value": "medium", "name": "Medium" },
+                    { "value": "high", "name": "High" }
+                ]
+            }),
+        ],
     }
 }
 
 /// Parse an agent config JSON file (from `scripts/agent-configs/resources/`) into
 /// ACP `SessionConfigOption` values. The JSON format is:
 /// ```json
-/// { "defaultModel": "...", "models": [{id, name}], "defaultMode?": "...", "modes?": [{id, name}] }
+/// {
+///   "defaultModel": "...", "models": [{id, name}],
+///   "defaultMode?": "...", "modes?": [{id, name}],
+///   "defaultThoughtLevel?": "...", "thoughtLevels?": [{id, name}]
+/// }
 /// ```
+///
+/// Note: Claude and Codex don't report configOptions from `session/new`, so these
+/// JSON resource files are the source of truth for the capabilities report.
+/// Claude modes (plan, default) were discovered via manual ACP probing —
+/// `session/set_mode` works but `session/set_config_option` is not implemented.
+/// Codex modes/thought levels were discovered from its `session/new` response.
 fn parse_agent_config(json_str: &str) -> Vec<Value> {
     #[derive(serde::Deserialize)]
     struct AgentConfig {
         #[serde(rename = "defaultModel")]
         default_model: String,
-        models: Vec<ModelEntry>,
+        models: Vec<ConfigEntry>,
         #[serde(rename = "defaultMode")]
         default_mode: Option<String>,
-        modes: Option<Vec<ModeEntry>>,
+        modes: Option<Vec<ConfigEntry>>,
+        #[serde(rename = "defaultThoughtLevel")]
+        default_thought_level: Option<String>,
+        #[serde(rename = "thoughtLevels")]
+        thought_levels: Option<Vec<ConfigEntry>>,
     }
     #[derive(serde::Deserialize)]
-    struct ModelEntry {
-        id: String,
-        name: String,
-    }
-    #[derive(serde::Deserialize)]
-    struct ModeEntry {
+    struct ConfigEntry {
         id: String,
         name: String,
     }
@@ -185,7 +276,7 @@ fn parse_agent_config(json_str: &str) -> Vec<Value> {
             "name": "Mode",
             "category": "mode",
             "type": "select",
-            "currentValue": config.default_mode.unwrap_or_else(|| modes[0].id.clone()),
+            "currentValue": config.default_mode.or_else(|| modes.first().map(|m| m.id.clone())).unwrap_or_default(),
             "options": modes.iter().map(|m| json!({
                 "value": m.id,
                 "name": m.name,
@@ -193,6 +284,20 @@ fn parse_agent_config(json_str: &str) -> Vec<Value> {
         }));
     }
 
+    if let Some(thought_levels) = config.thought_levels {
+        options.push(json!({
+            "id": "thought_level",
+            "name": "Thought Level",
+            "category": "thought_level",
+            "type": "select",
+            "currentValue": config.default_thought_level.or_else(|| thought_levels.first().map(|t| t.id.clone())).unwrap_or_default(),
+            "options": thought_levels.iter().map(|t| json!({
+                "value": t.id,
+                "name": t.name,
+            })).collect::<Vec<_>>(),
+        }));
+    }
+
     options
 }
 
@@ -497,8 +602,17 @@ pub(super) fn problem_from_sandbox_error(error: &SandboxError) -> ProblemDetails
     let mut problem = error.to_problem_details();
 
     match error {
-        SandboxError::InvalidRequest { .. } => {
-            problem.status = 400;
+        SandboxError::InvalidRequest { message } => {
+            if message.starts_with("input payload exceeds maxInputBytesPerRequest") {
+                problem.status = 413;
+                problem.title = "Payload Too Large".to_string();
+            } else {
+                problem.status = 400;
+            }
+        }
+        SandboxError::NotFound { .. } => {
+            problem.status = 404;
+            problem.title = "Not Found".to_string();
         }
         SandboxError::Timeout { .. } => {
             problem.status = 504;
diff --git a/server/packages/sandbox-agent/src/router/types.rs b/server/packages/sandbox-agent/src/router/types.rs
index 481850b..218ad77 100644
--- a/server/packages/sandbox-agent/src/router/types.rs
+++ b/server/packages/sandbox-agent/src/router/types.rs
@@ -362,3 +362,189 @@ pub struct AcpEnvelope {
     #[serde(default)]
     pub error: Option<Value>,
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessConfig {
+    pub max_concurrent_processes: usize,
+    pub default_run_timeout_ms: u64,
+    pub max_run_timeout_ms: u64,
+    pub max_output_bytes: usize,
+    pub max_log_bytes_per_process: usize,
+    pub max_input_bytes_per_request: usize,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessCreateRequest {
+    pub command: String,
+    #[serde(default)]
+    pub args: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub env: BTreeMap<String, String>,
+    #[serde(default)]
+    pub tty: bool,
+    #[serde(default)]
+    pub interactive: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessRunRequest {
+    pub command: String,
+    #[serde(default)]
+    pub args: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub env: BTreeMap<String, String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub timeout_ms: Option<u64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub max_output_bytes: Option<usize>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessRunResponse {
+    pub exit_code: Option<i32>,
+    pub timed_out: bool,
+    pub stdout: String,
+    pub stderr: String,
+    pub stdout_truncated: bool,
+    pub stderr_truncated: bool,
+    pub duration_ms: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProcessState {
+    Running,
+    Exited,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProcessOwner {
+    User,
+    Desktop,
+    System,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessInfo {
+    pub id: String,
+    pub command: String,
+    pub args: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    pub tty: bool,
+    pub interactive: bool,
+    pub owner: ProcessOwner,
+    pub status: ProcessState,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub pid: Option<u32>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub exit_code: Option<i32>,
+    pub created_at_ms: i64,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub exited_at_ms: Option<i64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessListResponse {
+    pub processes: Vec<ProcessInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema, IntoParams)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessListQuery {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub owner: Option<ProcessOwner>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, ToSchema, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProcessLogsStream {
+    Stdout,
+    Stderr,
+    Combined,
+    Pty,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessLogsQuery {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub stream: Option<ProcessLogsStream>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tail: Option<usize>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub follow: Option<bool>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub since: Option<u64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessLogEntry {
+    pub sequence: u64,
+    pub stream: ProcessLogsStream,
+    pub timestamp_ms: i64,
+    pub data: String,
+    pub encoding: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessLogsResponse {
+    pub process_id: String,
+    pub stream: ProcessLogsStream,
+    pub entries: Vec<ProcessLogEntry>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessInputRequest {
+    pub data: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub encoding: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessInputResponse {
+    pub bytes_written: usize,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessSignalQuery {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub wait_ms: Option<u64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessTerminalResizeRequest {
+    pub cols: u16,
+    pub rows: u16,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessTerminalResizeResponse {
+    pub cols: u16,
+    pub rows: u16,
+}
+
+#[derive(Debug, Clone, Deserialize, JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct ProcessWsQuery {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub access_token: Option<String>,
+}
diff --git a/server/packages/sandbox-agent/tests/agent-flows/pi_rpc_integration.rs b/server/packages/sandbox-agent/tests/agent-flows/pi_rpc_integration.rs
deleted file mode 100644
index 3113ae7..0000000
--- a/server/packages/sandbox-agent/tests/agent-flows/pi_rpc_integration.rs
+++ /dev/null
@@ -1,410 +0,0 @@
-// Pi RPC integration tests (gated via SANDBOX_TEST_PI + PATH).
-include!("../common/http.rs");
-
-fn pi_test_config() -> Option<TestAgentConfig> {
-    let configs = match test_agents_from_env() {
-        Ok(configs) => configs,
-        Err(err) => {
-            eprintln!("Skipping Pi RPC integration test: {err}");
-            return None;
-        }
-    };
-    configs
-        .into_iter()
-        .find(|config| config.agent == AgentId::Pi)
-}
-
-async fn create_pi_session_with_native(app: &Router, session_id: &str) -> String {
-    let payload = create_pi_session(app, session_id, None, None).await;
-    let native_session_id = payload
-        .get("native_session_id")
-        .and_then(Value::as_str)
-        .unwrap_or("")
-        .to_string();
-    assert!(
-        !native_session_id.is_empty(),
-        "expected native_session_id for pi session"
-    );
-    native_session_id
-}
-
-async fn create_pi_session(
-    app: &Router,
-    session_id: &str,
-    model: Option<&str>,
-    variant: Option<&str>,
-) -> Value {
-    let mut body = Map::new();
-    body.insert("agent".to_string(), json!("pi"));
-    body.insert(
-        "permissionMode".to_string(),
-        json!(test_permission_mode(AgentId::Pi)),
-    );
-    if let Some(model) = model {
-        body.insert("model".to_string(), json!(model));
-    }
-    if let Some(variant) = variant {
-        body.insert("variant".to_string(), json!(variant));
-    }
-    let (status, payload) = send_json(
-        app,
-        Method::POST,
-        &format!("/v1/sessions/{session_id}"),
-        Some(Value::Object(body)),
-    )
-    .await;
-    assert_eq!(status, StatusCode::OK, "create pi session");
-    payload
-}
-
-async fn fetch_pi_models(app: &Router) -> Vec<Value> {
-    let (status, payload) = send_json(app, Method::GET, "/v1/agents/pi/models", None).await;
-    assert_eq!(status, StatusCode::OK, "pi models endpoint");
-    payload
-        .get("models")
-        .and_then(Value::as_array)
-        .cloned()
-        .unwrap_or_default()
-}
-
-fn model_variant_ids(model: &Value) -> Vec<&str> {
-    model
-        .get("variants")
-        .and_then(Value::as_array)
-        .map(|values| values.iter().filter_map(Value::as_str).collect::<Vec<_>>())
-        .unwrap_or_default()
-}
-
-fn assert_strictly_increasing_sequences(events: &[Value], label: &str) {
-    let mut last_sequence = 0u64;
-    for event in events {
-        let sequence = event
-            .get("sequence")
-            .and_then(Value::as_u64)
-            .expect("missing sequence");
-        assert!(
-            sequence > last_sequence,
-            "{label}: sequence did not increase (prev {last_sequence}, next {sequence})"
-        );
-        last_sequence = sequence;
-    }
-}
-
-fn assert_all_events_for_session(events: &[Value], session_id: &str) {
-    for event in events {
-        let event_session_id = event
-            .get("session_id")
-            .and_then(Value::as_str)
-            .unwrap_or_default();
-        assert_eq!(
-            event_session_id, session_id,
-            "cross-session event detected in {session_id}: {event}"
-        );
-    }
-}
-
-fn assert_item_started_ids_unique(events: &[Value], label: &str) {
-    let mut ids = std::collections::HashSet::new();
-    for event in events {
-        let event_type = event
-            .get("type")
-            .and_then(Value::as_str)
-            .unwrap_or_default();
-        if event_type != "item.started" {
-            continue;
-        }
-        let Some(item_id) = event
-            .get("data")
-            .and_then(|data| data.get("item"))
-            .and_then(|item| item.get("item_id"))
-            .and_then(Value::as_str)
-        else {
-            continue;
-        };
-        assert!(
-            ids.insert(item_id.to_string()),
-            "{label}: duplicate item.started id {item_id}"
-        );
-    }
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_rpc_session_and_stream() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let session_id = "pi-rpc-session";
-    let _native_session_id = create_pi_session_with_native(&app.app, session_id).await;
-
-    let events = read_turn_stream_events(&app.app, session_id, Duration::from_secs(120)).await;
-    assert!(!events.is_empty(), "no events from pi stream");
-    assert!(
-        !events.iter().any(is_unparsed_event),
-        "agent.unparsed event encountered"
-    );
-    assert!(
-        should_stop(&events),
-        "turn stream did not reach a terminal event"
-    );
-    assert_strictly_increasing_sequences(&events, "pi_rpc_session_and_stream");
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_variant_high_applies_for_thinking_model() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let models = fetch_pi_models(&app.app).await;
-    let thinking_model = models.iter().find_map(|model| {
-        let model_id = model.get("id").and_then(Value::as_str)?;
-        let variants = model_variant_ids(model);
-        if variants.contains(&"high") {
-            Some(model_id.to_string())
-        } else {
-            None
-        }
-    });
-    let Some(model_id) = thinking_model else {
-        eprintln!("Skipping PI variant thinking-model test: no model advertises high");
-        return;
-    };
-
-    let session_id = "pi-variant-thinking-high";
-    create_pi_session(&app.app, session_id, Some(&model_id), Some("high")).await;
-
-    let events = read_turn_stream_events(&app.app, session_id, Duration::from_secs(120)).await;
-    assert!(
-        !events.is_empty(),
-        "no events from pi thinking-variant stream"
-    );
-    assert!(
-        !events.iter().any(is_unparsed_event),
-        "agent.unparsed event encountered for thinking-variant session"
-    );
-    assert!(
-        should_stop(&events),
-        "thinking-variant turn stream did not reach a terminal event"
-    );
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_variant_high_on_non_thinking_model_uses_pi_native_clamping() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let models = fetch_pi_models(&app.app).await;
-    let non_thinking_model = models.iter().find_map(|model| {
-        let model_id = model.get("id").and_then(Value::as_str)?;
-        let variants = model_variant_ids(model);
-        if variants == vec!["off"] {
-            Some(model_id.to_string())
-        } else {
-            None
-        }
-    });
-    let Some(model_id) = non_thinking_model else {
-        eprintln!("Skipping PI non-thinking variant test: no off-only model reported");
-        return;
-    };
-
-    let session_id = "pi-variant-nonthinking-high";
-    create_pi_session(&app.app, session_id, Some(&model_id), Some("high")).await;
-
-    let events = read_turn_stream_events(&app.app, session_id, Duration::from_secs(120)).await;
-    assert!(
-        !events.is_empty(),
-        "no events from pi non-thinking variant stream"
-    );
-    assert!(
-        !events.iter().any(is_unparsed_event),
-        "agent.unparsed event encountered for non-thinking variant session"
-    );
-    assert!(
-        should_stop(&events),
-        "non-thinking variant turn stream did not reach a terminal event"
-    );
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_parallel_sessions_turns() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let session_a = "pi-parallel-a";
-    let session_b = "pi-parallel-b";
-    create_pi_session_with_native(&app.app, session_a).await;
-    create_pi_session_with_native(&app.app, session_b).await;
-
-    let app_a = app.app.clone();
-    let app_b = app.app.clone();
-    let send_a = send_message(&app_a, session_a);
-    let send_b = send_message(&app_b, session_b);
-    tokio::join!(send_a, send_b);
-
-    let app_a = app.app.clone();
-    let app_b = app.app.clone();
-    let poll_a = poll_events_until(&app_a, session_a, Duration::from_secs(120));
-    let poll_b = poll_events_until(&app_b, session_b, Duration::from_secs(120));
-    let (events_a, events_b) = tokio::join!(poll_a, poll_b);
-
-    assert!(!events_a.is_empty(), "no events for session A");
-    assert!(!events_b.is_empty(), "no events for session B");
-    assert!(
-        should_stop(&events_a),
-        "session A did not reach a terminal event"
-    );
-    assert!(
-        should_stop(&events_b),
-        "session B did not reach a terminal event"
-    );
-    assert!(
-        !events_a.iter().any(is_unparsed_event),
-        "session A encountered agent.unparsed"
-    );
-    assert!(
-        !events_b.iter().any(is_unparsed_event),
-        "session B encountered agent.unparsed"
-    );
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_event_isolation() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let session_a = "pi-isolation-a";
-    let session_b = "pi-isolation-b";
-    create_pi_session_with_native(&app.app, session_a).await;
-    create_pi_session_with_native(&app.app, session_b).await;
-
-    let app_a = app.app.clone();
-    let app_b = app.app.clone();
-    let send_a = send_message(&app_a, session_a);
-    let send_b = send_message(&app_b, session_b);
-    tokio::join!(send_a, send_b);
-
-    let app_a = app.app.clone();
-    let app_b = app.app.clone();
-    let poll_a = poll_events_until(&app_a, session_a, Duration::from_secs(120));
-    let poll_b = poll_events_until(&app_b, session_b, Duration::from_secs(120));
-    let (events_a, events_b) = tokio::join!(poll_a, poll_b);
-
-    assert!(should_stop(&events_a), "session A did not complete");
-    assert!(should_stop(&events_b), "session B did not complete");
-    assert_all_events_for_session(&events_a, session_a);
-    assert_all_events_for_session(&events_b, session_b);
-    assert_strictly_increasing_sequences(&events_a, "session A");
-    assert_strictly_increasing_sequences(&events_b, "session B");
-    assert_item_started_ids_unique(&events_a, "session A");
-    assert_item_started_ids_unique(&events_b, "session B");
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_terminate_one_session_does_not_affect_other() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let session_a = "pi-terminate-a";
-    let session_b = "pi-terminate-b";
-    create_pi_session_with_native(&app.app, session_a).await;
-    create_pi_session_with_native(&app.app, session_b).await;
-
-    let terminate_status = send_status(
-        &app.app,
-        Method::POST,
-        &format!("/v1/sessions/{session_a}/terminate"),
-        None,
-    )
-    .await;
-    assert_eq!(
-        terminate_status,
-        StatusCode::NO_CONTENT,
-        "terminate session A"
-    );
-
-    send_message(&app.app, session_b).await;
-    let events_b = poll_events_until(&app.app, session_b, Duration::from_secs(120)).await;
-    assert!(!events_b.is_empty(), "no events for session B");
-    assert!(
-        should_stop(&events_b),
-        "session B did not complete after A terminated"
-    );
-
-    let events_a = poll_events_until(&app.app, session_a, Duration::from_secs(10)).await;
-    assert!(
-        events_a.iter().any(|event| {
-            event
-                .get("type")
-                .and_then(Value::as_str)
-                .is_some_and(|ty| ty == "session.ended")
-        }),
-        "session A missing session.ended after terminate"
-    );
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn pi_runtime_restart_scope() {
-    let Some(config) = pi_test_config() else {
-        return;
-    };
-
-    let app = TestApp::new();
-    let _guard = apply_credentials(&config.credentials);
-    install_agent(&app.app, config.agent).await;
-
-    let session_a = "pi-restart-scope-a";
-    let session_b = "pi-restart-scope-b";
-    create_pi_session_with_native(&app.app, session_a).await;
-    create_pi_session_with_native(&app.app, session_b).await;
-
-    let terminate_status = send_status(
-        &app.app,
-        Method::POST,
-        &format!("/v1/sessions/{session_a}/terminate"),
-        None,
-    )
-    .await;
-    assert_eq!(
-        terminate_status,
-        StatusCode::NO_CONTENT,
-        "terminate session A to stop only its runtime"
-    );
-
-    send_message(&app.app, session_b).await;
-    let events_b = poll_events_until(&app.app, session_b, Duration::from_secs(120)).await;
-    assert!(
-        should_stop(&events_b),
-        "session B did not continue after A stopped"
-    );
-    assert_all_events_for_session(&events_b, session_b);
-}
diff --git a/server/packages/sandbox-agent/tests/common_software.rs b/server/packages/sandbox-agent/tests/common_software.rs
new file mode 100644
index 0000000..c40eefc
--- /dev/null
+++ b/server/packages/sandbox-agent/tests/common_software.rs
@@ -0,0 +1,497 @@
+/// Integration tests that verify all software documented in docs/common-software.mdx
+/// is installed and working inside the sandbox.
+///
+/// These tests use `docker/test-common-software/Dockerfile` which extends the base
+/// test-agent image with all documented software pre-installed.
+///
+/// KEEP IN SYNC with docs/common-software.mdx and docker/test-common-software/Dockerfile.
+///
+/// Run with:
+///   cargo test -p sandbox-agent --test common_software
+use reqwest::header::HeaderMap;
+use reqwest::{Method, StatusCode};
+use serde_json::{json, Value};
+use serial_test::serial;
+
+#[path = "support/docker_common_software.rs"]
+mod docker_support;
+use docker_support::TestApp;
+
+async fn send_request(
+    app: &docker_support::DockerApp,
+    method: Method,
+    uri: &str,
+    body: Option<Value>,
+) -> (StatusCode, HeaderMap, Vec<u8>) {
+    let client = reqwest::Client::new();
+    let mut builder = client.request(method, app.http_url(uri));
+
+    let response = if let Some(body) = body {
+        builder = builder.header("content-type", "application/json");
+        builder
+            .body(body.to_string())
+            .send()
+            .await
+            .expect("request")
+    } else {
+        builder.send().await.expect("request")
+    };
+    let status = response.status();
+    let headers = response.headers().clone();
+    let bytes = response.bytes().await.expect("body");
+    (status, headers, bytes.to_vec())
+}
+
+fn parse_json(bytes: &[u8]) -> Value {
+    if bytes.is_empty() {
+        Value::Null
+    } else {
+        serde_json::from_slice(bytes).expect("valid json")
+    }
+}
+
+/// Run a command inside the sandbox and assert it exits with code 0.
+/// Returns the parsed JSON response.
+async fn run_ok(app: &docker_support::DockerApp, command: &str, args: &[&str]) -> Value {
+    run_ok_with_timeout(app, command, args, 30_000).await
+}
+
+async fn run_ok_with_timeout(
+    app: &docker_support::DockerApp,
+    command: &str,
+    args: &[&str],
+    timeout_ms: u64,
+) -> Value {
+    let (status, _, body) = send_request(
+        app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": command,
+            "args": args,
+            "timeoutMs": timeout_ms
+        })),
+    )
+    .await;
+    assert_eq!(
+        status,
+        StatusCode::OK,
+        "run {command} failed: {}",
+        String::from_utf8_lossy(&body)
+    );
+    let parsed = parse_json(&body);
+    assert_eq!(
+        parsed["exitCode"], 0,
+        "{command} exited with non-zero code.\nstdout: {}\nstderr: {}",
+        parsed["stdout"], parsed["stderr"]
+    );
+    parsed
+}
+
+// ---------------------------------------------------------------------------
+// Browsers
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn chromium_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "chromium", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("Chromium"),
+        "expected Chromium version string, got: {stdout}"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn firefox_esr_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "firefox-esr", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("Mozilla Firefox"),
+        "expected Firefox version string, got: {stdout}"
+    );
+}
+
+// ---------------------------------------------------------------------------
+// Languages and runtimes
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn nodejs_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "node", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.starts_with('v'),
+        "expected node version string, got: {stdout}"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn npm_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "npm", &["--version"]).await;
+}
+
+#[tokio::test]
+#[serial]
+async fn python3_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "python3", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("Python 3"),
+        "expected Python version string, got: {stdout}"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn pip3_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "pip3", &["--version"]).await;
+}
+
+#[tokio::test]
+#[serial]
+async fn java_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    // java --version prints to stdout on modern JDKs
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "java",
+            "args": ["--version"],
+            "timeoutMs": 30000
+        })),
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["exitCode"], 0);
+    let combined = format!(
+        "{}{}",
+        parsed["stdout"].as_str().unwrap_or(""),
+        parsed["stderr"].as_str().unwrap_or("")
+    );
+    assert!(
+        combined.contains("openjdk") || combined.contains("OpenJDK") || combined.contains("java"),
+        "expected Java version string, got: {combined}"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn ruby_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "ruby", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("ruby"),
+        "expected Ruby version string, got: {stdout}"
+    );
+}
+
+// ---------------------------------------------------------------------------
+// Databases
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn sqlite3_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "sqlite3", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(!stdout.is_empty(), "expected sqlite3 version output");
+}
+
+#[tokio::test]
+#[serial]
+async fn redis_server_is_installed() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "redis-server", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("Redis") || stdout.contains("redis"),
+        "expected Redis version string, got: {stdout}"
+    );
+}
+
+// ---------------------------------------------------------------------------
+// Build tools
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn gcc_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "gcc", &["--version"]).await;
+}
+
+#[tokio::test]
+#[serial]
+async fn make_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "make", &["--version"]).await;
+}
+
+#[tokio::test]
+#[serial]
+async fn cmake_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "cmake", &["--version"]).await;
+}
+
+#[tokio::test]
+#[serial]
+async fn pkg_config_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "pkg-config", &["--version"]).await;
+}
+
+// ---------------------------------------------------------------------------
+// CLI tools
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn git_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "git", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("git version"),
+        "expected git version string, got: {stdout}"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn jq_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    // Pipe a simple JSON through jq
+    let result = run_ok(&test_app.app, "sh", &["-c", "echo '{\"a\":1}' | jq '.a'"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("").trim();
+    assert_eq!(stdout, "1", "jq did not parse JSON correctly: {stdout}");
+}
+
+#[tokio::test]
+#[serial]
+async fn tmux_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "tmux", &["-V"]).await;
+}
+
+// ---------------------------------------------------------------------------
+// Media and graphics
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn ffmpeg_is_installed_and_runs() {
+    let test_app = TestApp::new();
+    // ffmpeg prints version to stderr, so just check exit code via -version
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "ffmpeg",
+            "args": ["-version"],
+            "timeoutMs": 10000
+        })),
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["exitCode"], 0);
+    let combined = format!(
+        "{}{}",
+        parsed["stdout"].as_str().unwrap_or(""),
+        parsed["stderr"].as_str().unwrap_or("")
+    );
+    assert!(
+        combined.contains("ffmpeg version"),
+        "expected ffmpeg version string, got: {combined}"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn imagemagick_is_installed() {
+    let test_app = TestApp::new();
+    run_ok(&test_app.app, "convert", &["--version"]).await;
+}
+
+#[tokio::test]
+#[serial]
+async fn poppler_pdftoppm_is_installed() {
+    let test_app = TestApp::new();
+    // pdftoppm -v prints to stderr and exits 0
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "pdftoppm",
+            "args": ["-v"],
+            "timeoutMs": 10000
+        })),
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["exitCode"], 0);
+}
+
+// ---------------------------------------------------------------------------
+// Desktop applications (verify binary exists, don't launch GUI)
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn gimp_is_installed() {
+    let test_app = TestApp::new();
+    let result = run_ok(&test_app.app, "gimp", &["--version"]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("GIMP") || stdout.contains("gimp") || stdout.contains("Image Manipulation"),
+        "expected GIMP version string, got: {stdout}"
+    );
+}
+
+// ---------------------------------------------------------------------------
+// Functional tests: verify tools actually work, not just that they're present
+// ---------------------------------------------------------------------------
+
+#[tokio::test]
+#[serial]
+async fn python3_can_run_script() {
+    let test_app = TestApp::new();
+    let result = run_ok(
+        &test_app.app,
+        "python3",
+        &["-c", "import json; print(json.dumps({'ok': True}))"],
+    )
+    .await;
+    let stdout = result["stdout"].as_str().unwrap_or("").trim();
+    let parsed: Value = serde_json::from_str(stdout).expect("python json output");
+    assert_eq!(parsed["ok"], true);
+}
+
+#[tokio::test]
+#[serial]
+async fn node_can_run_script() {
+    let test_app = TestApp::new();
+    let result = run_ok(
+        &test_app.app,
+        "node",
+        &["-e", "console.log(JSON.stringify({ok: true}))"],
+    )
+    .await;
+    let stdout = result["stdout"].as_str().unwrap_or("").trim();
+    let parsed: Value = serde_json::from_str(stdout).expect("node json output");
+    assert_eq!(parsed["ok"], true);
+}
+
+#[tokio::test]
+#[serial]
+async fn ruby_can_run_script() {
+    let test_app = TestApp::new();
+    let result = run_ok(
+        &test_app.app,
+        "ruby",
+        &["-e", "require 'json'; puts JSON.generate({ok: true})"],
+    )
+    .await;
+    let stdout = result["stdout"].as_str().unwrap_or("").trim();
+    let parsed: Value = serde_json::from_str(stdout).expect("ruby json output");
+    assert_eq!(parsed["ok"], true);
+}
+
+#[tokio::test]
+#[serial]
+async fn gcc_can_compile_and_run_hello_world() {
+    let test_app = TestApp::new();
+
+    // Write a C file
+    run_ok(
+        &test_app.app,
+        "sh",
+        &["-c", r#"printf '#include <stdio.h>\nint main(){printf("hello\\n");return 0;}\n' > /tmp/hello.c"#],
+    )
+    .await;
+
+    // Compile it
+    run_ok(&test_app.app, "gcc", &["-o", "/tmp/hello", "/tmp/hello.c"]).await;
+
+    // Run it
+    let result = run_ok(&test_app.app, "/tmp/hello", &[]).await;
+    let stdout = result["stdout"].as_str().unwrap_or("").trim();
+    assert_eq!(stdout, "hello");
+}
+
+#[tokio::test]
+#[serial]
+async fn sqlite3_can_create_and_query() {
+    let test_app = TestApp::new();
+    let result = run_ok(
+        &test_app.app,
+        "sh",
+        &[
+            "-c",
+            "sqlite3 /tmp/test.db 'CREATE TABLE t(v TEXT); INSERT INTO t VALUES(\"ok\"); SELECT v FROM t;'",
+        ],
+    )
+    .await;
+    let stdout = result["stdout"].as_str().unwrap_or("").trim();
+    assert_eq!(stdout, "ok");
+}
+
+#[tokio::test]
+#[serial]
+async fn git_can_init_and_commit() {
+    let test_app = TestApp::new();
+    run_ok(
+        &test_app.app,
+        "sh",
+        &[
+            "-c",
+            "cd /tmp && mkdir -p testrepo && cd testrepo && git init && git config user.email 'test@test.com' && git config user.name 'Test' && touch file && git add file && git commit -m 'init'",
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+#[serial]
+async fn chromium_headless_can_dump_dom() {
+    let test_app = TestApp::new();
+    // Use headless mode to dump the DOM of a blank page
+    let result = run_ok_with_timeout(
+        &test_app.app,
+        "chromium",
+        &[
+            "--headless",
+            "--no-sandbox",
+            "--disable-gpu",
+            "--dump-dom",
+            "data:text/html,<h1>hello</h1>",
+        ],
+        30_000,
+    )
+    .await;
+    let stdout = result["stdout"].as_str().unwrap_or("");
+    assert!(
+        stdout.contains("hello"),
+        "expected hello in DOM dump, got: {stdout}"
+    );
+}
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/events.test.ts b/server/packages/sandbox-agent/tests/opencode-compat/events.test.ts
index 367e6e8..fd0bda3 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/events.test.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/events.test.ts
@@ -21,10 +21,7 @@ describe("OpenCode-compatible Event Streaming", () => {
     return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   }
 
-  async function initSessionViaHttp(
-    sessionId: string,
-    body: Record<string, unknown>
-  ): Promise<void> {
+  async function initSessionViaHttp(sessionId: string, body: Record<string, unknown>): Promise<void> {
     const response = await fetch(`${handle.baseUrl}/opencode/session/${sessionId}/init`, {
       method: "POST",
       headers: {
@@ -113,10 +110,7 @@ describe("OpenCode-compatible Event Streaming", () => {
             for await (const event of (eventStream as any).stream) {
               events.push(event);
               // Look for message part updates or completion
-              if (
-                event.type === "message.part.updated" ||
-                event.type === "session.idle"
-              ) {
+              if (event.type === "message.part.updated" || event.type === "session.idle") {
                 if (events.length >= 3) {
                   clearTimeout(timeout);
                   resolve();
@@ -175,10 +169,7 @@ describe("OpenCode-compatible Event Streaming", () => {
       const statuses: string[] = [];
 
       const collectIdle = new Promise<void>((resolve, reject) => {
-        const timeout = setTimeout(
-          () => reject(new Error("Timed out waiting for session.idle")),
-          15_000
-        );
+        const timeout = setTimeout(() => reject(new Error("Timed out waiting for session.idle")), 15_000);
         (async () => {
           try {
             for await (const event of (eventStream as any).stream) {
@@ -223,10 +214,7 @@ describe("OpenCode-compatible Event Streaming", () => {
       let busySnapshot: string | undefined;
 
       const waitForIdle = new Promise<void>((resolve, reject) => {
-        const timeout = setTimeout(
-          () => reject(new Error("Timed out waiting for busy status snapshot + session.idle")),
-          15_000
-        );
+        const timeout = setTimeout(() => reject(new Error("Timed out waiting for busy status snapshot + session.idle")), 15_000);
         (async () => {
           try {
             for await (const event of (eventStream as any).stream) {
@@ -276,10 +264,7 @@ describe("OpenCode-compatible Event Streaming", () => {
       const idles: any[] = [];
 
       const collectErrorAndIdle = new Promise<void>((resolve, reject) => {
-        const timeout = setTimeout(
-          () => reject(new Error("Timed out waiting for session.error + session.idle")),
-          15_000
-        );
+        const timeout = setTimeout(() => reject(new Error("Timed out waiting for session.error + session.idle")), 15_000);
         (async () => {
           try {
             for await (const event of (eventStream as any).stream) {
@@ -428,9 +413,7 @@ describe("OpenCode-compatible Event Streaming", () => {
       expect(idleEvents.length).toBe(1);
 
       // All tool parts should have been emitted before idle
-      const toolParts = allEvents.filter(
-        (e) => e.type === "message.part.updated" && e.properties?.part?.type === "tool"
-      );
+      const toolParts = allEvents.filter((e) => e.type === "message.part.updated" && e.properties?.part?.type === "tool");
       expect(toolParts.length).toBeGreaterThan(0);
     });
 
@@ -459,12 +442,7 @@ describe("OpenCode-compatible Event Streaming", () => {
                 if (!targetMessageId && partType === "tool" && typeof messageId === "string") {
                   targetMessageId = messageId;
                 }
-                if (
-                  targetMessageId &&
-                  messageId === targetMessageId &&
-                  typeof partId === "string" &&
-                  !seenPartIds.includes(partId)
-                ) {
+                if (targetMessageId && messageId === targetMessageId && typeof partId === "string" && !seenPartIds.includes(partId)) {
                   seenPartIds.push(partId);
                 }
               }
@@ -497,17 +475,12 @@ describe("OpenCode-compatible Event Streaming", () => {
       expect(targetMessageId).toBeTruthy();
       expect(seenPartIds.length).toBeGreaterThan(0);
 
-      const response = await fetch(
-        `${handle.baseUrl}/opencode/session/${sessionId}/message/${targetMessageId}`,
-        {
-          headers: { Authorization: `Bearer ${handle.token}` },
-        }
-      );
+      const response = await fetch(`${handle.baseUrl}/opencode/session/${sessionId}/message/${targetMessageId}`, {
+        headers: { Authorization: `Bearer ${handle.token}` },
+      });
       expect(response.ok).toBe(true);
       const message = (await response.json()) as any;
-      const returnedPartIds = (message?.parts ?? [])
-        .map((part: any) => part?.id)
-        .filter((id: any) => typeof id === "string");
+      const returnedPartIds = (message?.parts ?? []).map((part: any) => part?.id).filter((id: any) => typeof id === "string");
 
       const expectedSet = new Set(seenPartIds);
       const returnedFiltered = returnedPartIds.filter((id: string) => expectedSet.has(id));
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/helpers/spawn.ts b/server/packages/sandbox-agent/tests/opencode-compat/helpers/spawn.ts
index bb01e22..3dbd707 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/helpers/spawn.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/helpers/spawn.ts
@@ -33,10 +33,7 @@ function findBinary(): string | null {
   }
 
   // Check cargo build outputs (relative to tests/opencode-compat/helpers)
-  const cargoPaths = [
-    resolve(__dirname, "../../../../../../target/debug/sandbox-agent"),
-    resolve(__dirname, "../../../../../../target/release/sandbox-agent"),
-  ];
+  const cargoPaths = [resolve(__dirname, "../../../../../../target/debug/sandbox-agent"), resolve(__dirname, "../../../../../../target/release/sandbox-agent")];
 
   for (const p of cargoPaths) {
     if (existsSync(p)) {
@@ -65,12 +62,7 @@ async function getFreePort(host: string): Promise<number> {
 /**
  * Wait for the server to become healthy
  */
-async function waitForHealth(
-  baseUrl: string,
-  token: string,
-  timeoutMs: number,
-  child: ChildProcess
-): Promise<void> {
+async function waitForHealth(baseUrl: string, token: string, timeoutMs: number, child: ChildProcess): Promise<void> {
   const start = Date.now();
   let lastError: string | undefined;
 
@@ -130,9 +122,7 @@ export interface SpawnOptions {
 export async function spawnSandboxAgent(options: SpawnOptions = {}): Promise<SandboxAgentHandle> {
   const binaryPath = findBinary();
   if (!binaryPath) {
-    throw new Error(
-      "sandbox-agent binary not found. Run 'cargo build -p sandbox-agent' first or set SANDBOX_AGENT_BIN."
-    );
+    throw new Error("sandbox-agent binary not found. Run 'cargo build -p sandbox-agent' first or set SANDBOX_AGENT_BIN.");
   }
 
   const host = options.host ?? "127.0.0.1";
@@ -222,7 +212,7 @@ export async function buildSandboxAgent(): Promise<void> {
 
   console.log("Building sandbox-agent...");
   const projectRoot = resolve(__dirname, "../../../../../..");
-  
+
   return new Promise((resolve, reject) => {
     const proc = spawn("cargo", ["build", "-p", "sandbox-agent"], {
       cwd: projectRoot,
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/models.test.ts b/server/packages/sandbox-agent/tests/opencode-compat/models.test.ts
index 8e90d0e..200fb70 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/models.test.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/models.test.ts
@@ -60,8 +60,6 @@ describe("OpenCode-compatible Model API", () => {
     expect(providerIds.has("claude")).toBe(true);
     expect(providerIds.has("codex")).toBe(true);
     expect(providerIds.has("pi")).toBe(true);
-    expect(
-      providerIds.has("opencode") || Array.from(providerIds).some((id) => id.startsWith("opencode:"))
-    ).toBe(true);
+    expect(providerIds.has("opencode") || Array.from(providerIds).some((id) => id.startsWith("opencode:"))).toBe(true);
   });
 });
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/permissions.test.ts b/server/packages/sandbox-agent/tests/opencode-compat/permissions.test.ts
index 8168d9d..356bb35 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/permissions.test.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/permissions.test.ts
@@ -9,7 +9,7 @@
  */
 
 import { describe, it, expect, beforeAll, beforeEach, afterEach } from "vitest";
-import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/v1";
+import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk";
 import { spawnSandboxAgent, buildSandboxAgent, type SandboxAgentHandle } from "./helpers/spawn";
 
 describe("OpenCode-compatible Permission API", () => {
@@ -53,11 +53,7 @@ describe("OpenCode-compatible Permission API", () => {
     throw new Error("Timed out waiting for permission request");
   }
 
-  async function waitForCondition(
-    check: () => boolean | Promise<boolean>,
-    timeoutMs = 10_000,
-    intervalMs = 100,
-  ) {
+  async function waitForCondition(check: () => boolean | Promise<boolean>, timeoutMs = 10_000, intervalMs = 100) {
     const start = Date.now();
     while (Date.now() - start < timeoutMs) {
       if (await check()) {
@@ -68,11 +64,7 @@ describe("OpenCode-compatible Permission API", () => {
     throw new Error("Timed out waiting for condition");
   }
 
-  async function waitForValue<T>(
-    getValue: () => T | undefined | Promise<T | undefined>,
-    timeoutMs = 10_000,
-    intervalMs = 100,
-  ): Promise<T> {
+  async function waitForValue<T>(getValue: () => T | undefined | Promise<T | undefined>, timeoutMs = 10_000, intervalMs = 100): Promise<T> {
     const start = Date.now();
     while (Date.now() - start < timeoutMs) {
       const value = await getValue();
@@ -175,13 +167,7 @@ describe("OpenCode-compatible Permission API", () => {
       });
       expect(firstReply.error).toBeUndefined();
 
-      await waitForCondition(() =>
-        repliedEvents.some(
-          (event) =>
-            event?.properties?.requestID === firstRequestId &&
-            event?.properties?.reply === "always",
-        ),
-      );
+      await waitForCondition(() => repliedEvents.some((event) => event?.properties?.requestID === firstRequestId && event?.properties?.reply === "always"));
 
       await client.session.prompt({
         sessionID: sessionId,
@@ -190,11 +176,7 @@ describe("OpenCode-compatible Permission API", () => {
       });
 
       const autoReplyEvent = await waitForValue(() =>
-        repliedEvents.find(
-          (event) =>
-            event?.properties?.requestID !== firstRequestId &&
-            event?.properties?.reply === "always",
-        ),
+        repliedEvents.find((event) => event?.properties?.requestID !== firstRequestId && event?.properties?.reply === "always"),
       );
       const autoRequestId = autoReplyEvent?.properties?.requestID;
       expect(autoRequestId).toBeDefined();
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/questions.test.ts b/server/packages/sandbox-agent/tests/opencode-compat/questions.test.ts
index 5a65006..c3a92f5 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/questions.test.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/questions.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { describe, it, expect, beforeAll, beforeEach, afterEach } from "vitest";
-import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/v1";
+import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk";
 import { spawnSandboxAgent, buildSandboxAgent, type SandboxAgentHandle } from "./helpers/spawn";
 
 describe("OpenCode-compatible Question API", () => {
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/real-agent.test.ts b/server/packages/sandbox-agent/tests/opencode-compat/real-agent.test.ts
index 141e274..d1b4b52 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/real-agent.test.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/real-agent.test.ts
@@ -15,11 +15,7 @@
 
 import { describe, it, expect, beforeAll, beforeEach, afterEach } from "vitest";
 import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk";
-import {
-  spawnSandboxAgent,
-  buildSandboxAgent,
-  type SandboxAgentHandle,
-} from "./helpers/spawn";
+import { spawnSandboxAgent, buildSandboxAgent, type SandboxAgentHandle } from "./helpers/spawn";
 
 const MODEL = process.env.TEST_AGENT_MODEL;
 
@@ -62,22 +58,11 @@ describe.skipIf(!MODEL)("Real agent round-trip", () => {
    * Uses a manual iterator to avoid closing the stream (for-await-of calls
    * iterator.return() on early exit, which would close the SSE connection).
    */
-  function collectUntilIdle(
-    iter: AsyncIterator<any>,
-    timeoutMs = 30_000,
-  ): Promise<{ events: any[]; text: string }> {
+  function collectUntilIdle(iter: AsyncIterator<any>, timeoutMs = 30_000): Promise<{ events: any[]; text: string }> {
     const events: any[] = [];
     let text = "";
     return new Promise((resolve, reject) => {
-      const timeout = setTimeout(
-        () =>
-          reject(
-            new Error(
-              `Timed out after ${timeoutMs}ms. Events: ${JSON.stringify(events.map((e) => e.type))}`,
-            ),
-          ),
-        timeoutMs,
-      );
+      const timeout = setTimeout(() => reject(new Error(`Timed out after ${timeoutMs}ms. Events: ${JSON.stringify(events.map((e) => e.type))}`)), timeoutMs);
       (async () => {
         try {
           while (true) {
@@ -88,10 +73,7 @@ describe.skipIf(!MODEL)("Real agent round-trip", () => {
               return;
             }
             events.push(event);
-            if (
-              event.type === "message.part.updated" &&
-              event.properties?.part?.type === "text"
-            ) {
+            if (event.type === "message.part.updated" && event.properties?.part?.type === "text") {
               // Prefer the delta (chunk) if present; otherwise use the full
               // accumulated part.text (for non-streaming single-shot events).
               text += event.properties.delta ?? event.properties.part.text ?? "";
@@ -103,11 +85,7 @@ describe.skipIf(!MODEL)("Real agent round-trip", () => {
             }
             if (event.type === "session.error") {
               clearTimeout(timeout);
-              reject(
-                new Error(
-                  `session.error: ${JSON.stringify(event.properties?.error)}`,
-                ),
-              );
+              reject(new Error(`session.error: ${JSON.stringify(event.properties?.error)}`));
               return;
             }
           }
diff --git a/server/packages/sandbox-agent/tests/opencode-compat/session.test.ts b/server/packages/sandbox-agent/tests/opencode-compat/session.test.ts
index 30371f6..29601ed 100644
--- a/server/packages/sandbox-agent/tests/opencode-compat/session.test.ts
+++ b/server/packages/sandbox-agent/tests/opencode-compat/session.test.ts
@@ -55,10 +55,7 @@ describe("OpenCode-compatible Session API", () => {
     return (sessions ?? []).find((item: any) => item.id === sessionId);
   }
 
-  async function initSessionViaHttp(
-    sessionId: string,
-    body: Record<string, unknown> = {}
-  ): Promise<{ response: Response; data: any }> {
+  async function initSessionViaHttp(sessionId: string, body: Record<string, unknown> = {}): Promise<{ response: Response; data: any }> {
     const response = await fetch(`${handle.baseUrl}/opencode/session/${sessionId}/init`, {
       method: "POST",
       headers: {
@@ -300,7 +297,7 @@ describe("OpenCode-compatible Session API", () => {
       });
       expect(changed.response.status).toBe(400);
       expect(changed.data?.errors?.[0]?.message).toBe(
-        "OpenCode compatibility currently does not support changing the model after creating a session. Export with /export and load in to a new session."
+        "OpenCode compatibility currently does not support changing the model after creating a session. Export with /export and load in to a new session.",
       );
     });
 
@@ -337,9 +334,7 @@ describe("OpenCode-compatible Session API", () => {
 
     it("should keep session.get available during first prompt after /new-style creation", async () => {
       const providers = await getProvidersViaHttp();
-      const providerId = providers.connected.find(
-        (provider) => provider !== "mock" && typeof providers.default?.[provider] === "string"
-      );
+      const providerId = providers.connected.find((provider) => provider !== "mock" && typeof providers.default?.[provider] === "string");
       if (!providerId) {
         return;
       }
@@ -478,7 +473,7 @@ describe("OpenCode-compatible Session API", () => {
 
         expect(response.status).toBe(400);
         expect(data?.errors?.[0]?.message).toBe(
-          "OpenCode compatibility currently does not support changing the model after creating a session. Export with /export and load in to a new session."
+          "OpenCode compatibility currently does not support changing the model after creating a session. Export with /export and load in to a new session.",
         );
       }
     });
@@ -511,7 +506,7 @@ describe("OpenCode-compatible Session API", () => {
 
       expect(response.status).toBe(400);
       expect(data?.errors?.[0]?.message).toBe(
-        "OpenCode compatibility currently does not support changing the model after creating a session. Export with /export and load in to a new session."
+        "OpenCode compatibility currently does not support changing the model after creating a session. Export with /export and load in to a new session.",
       );
     });
   });
diff --git a/server/packages/sandbox-agent/tests/support/docker.rs b/server/packages/sandbox-agent/tests/support/docker.rs
new file mode 100644
index 0000000..9305d95
--- /dev/null
+++ b/server/packages/sandbox-agent/tests/support/docker.rs
@@ -0,0 +1,593 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::fs;
+use std::io::{Read, Write};
+use std::net::TcpStream;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::OnceLock;
+use std::thread;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use sandbox_agent::router::AuthConfig;
+use serial_test::serial;
+use tempfile::TempDir;
+
+const CONTAINER_PORT: u16 = 3000;
+const DEFAULT_PATH: &str = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
+const DEFAULT_IMAGE_TAG: &str = "sandbox-agent-test:dev";
+const STANDARD_PATHS: &[&str] = &[
+    "/usr/local/sbin",
+    "/usr/local/bin",
+    "/usr/sbin",
+    "/usr/bin",
+    "/sbin",
+    "/bin",
+];
+
+static IMAGE_TAG: OnceLock<String> = OnceLock::new();
+static DOCKER_BIN: OnceLock<PathBuf> = OnceLock::new();
+static CONTAINER_COUNTER: AtomicU64 = AtomicU64::new(0);
+
+#[derive(Clone)]
+pub struct DockerApp {
+    base_url: String,
+}
+
+impl DockerApp {
+    pub fn http_url(&self, path: &str) -> String {
+        format!("{}{}", self.base_url, path)
+    }
+
+    pub fn ws_url(&self, path: &str) -> String {
+        let suffix = self
+            .base_url
+            .strip_prefix("http://")
+            .unwrap_or(&self.base_url);
+        format!("ws://{suffix}{path}")
+    }
+}
+
+pub struct TestApp {
+    pub app: DockerApp,
+    install_dir: PathBuf,
+    _root: TempDir,
+    container_id: String,
+}
+
+#[derive(Default)]
+pub struct TestAppOptions {
+    pub env: BTreeMap<String, String>,
+    pub extra_paths: Vec<PathBuf>,
+    pub replace_path: bool,
+}
+
+impl TestApp {
+    pub fn new(auth: AuthConfig) -> Self {
+        Self::with_setup(auth, |_| {})
+    }
+
+    pub fn with_setup<F>(auth: AuthConfig, setup: F) -> Self
+    where
+        F: FnOnce(&Path),
+    {
+        Self::with_options(auth, TestAppOptions::default(), setup)
+    }
+
+    pub fn with_options<F>(auth: AuthConfig, options: TestAppOptions, setup: F) -> Self
+    where
+        F: FnOnce(&Path),
+    {
+        let root = tempfile::tempdir().expect("create docker test root");
+        let layout = TestLayout::new(root.path());
+        layout.create();
+        setup(&layout.install_dir);
+
+        let container_id = unique_container_id();
+        let image = ensure_test_image();
+        let env = build_env(&layout, &auth, &options);
+        let mounts = build_mounts(root.path(), &env);
+        let base_url = run_container(&container_id, &image, &mounts, &env, &auth);
+
+        Self {
+            app: DockerApp { base_url },
+            install_dir: layout.install_dir,
+            _root: root,
+            container_id,
+        }
+    }
+
+    pub fn install_path(&self) -> &Path {
+        &self.install_dir
+    }
+
+    pub fn root_path(&self) -> &Path {
+        self._root.path()
+    }
+}
+
+impl Drop for TestApp {
+    fn drop(&mut self) {
+        let _ = Command::new(docker_bin())
+            .args(["rm", "-f", &self.container_id])
+            .output();
+    }
+}
+
+pub struct LiveServer {
+    base_url: String,
+}
+
+impl LiveServer {
+    pub async fn spawn(app: DockerApp) -> Self {
+        Self {
+            base_url: app.base_url,
+        }
+    }
+
+    pub fn http_url(&self, path: &str) -> String {
+        format!("{}{}", self.base_url, path)
+    }
+
+    pub fn ws_url(&self, path: &str) -> String {
+        let suffix = self
+            .base_url
+            .strip_prefix("http://")
+            .unwrap_or(&self.base_url);
+        format!("ws://{suffix}{path}")
+    }
+
+    pub async fn shutdown(self) {}
+}
+
+struct TestLayout {
+    home: PathBuf,
+    xdg_data_home: PathBuf,
+    xdg_state_home: PathBuf,
+    appdata: PathBuf,
+    local_appdata: PathBuf,
+    install_dir: PathBuf,
+}
+
+impl TestLayout {
+    fn new(root: &Path) -> Self {
+        let home = root.join("home");
+        let xdg_data_home = root.join("xdg-data");
+        let xdg_state_home = root.join("xdg-state");
+        let appdata = root.join("appdata").join("Roaming");
+        let local_appdata = root.join("appdata").join("Local");
+        let install_dir = xdg_data_home.join("sandbox-agent").join("bin");
+        Self {
+            home,
+            xdg_data_home,
+            xdg_state_home,
+            appdata,
+            local_appdata,
+            install_dir,
+        }
+    }
+
+    fn create(&self) {
+        for dir in [
+            &self.home,
+            &self.xdg_data_home,
+            &self.xdg_state_home,
+            &self.appdata,
+            &self.local_appdata,
+            &self.install_dir,
+        ] {
+            fs::create_dir_all(dir).expect("create docker test dir");
+        }
+    }
+}
+
+fn ensure_test_image() -> String {
+    IMAGE_TAG
+        .get_or_init(|| {
+            let repo_root = repo_root();
+            let image_tag = std::env::var("SANDBOX_AGENT_TEST_IMAGE")
+                .unwrap_or_else(|_| DEFAULT_IMAGE_TAG.to_string());
+            let output = Command::new(docker_bin())
+                .args(["build", "--tag", &image_tag, "--file"])
+                .arg(
+                    repo_root
+                        .join("docker")
+                        .join("test-agent")
+                        .join("Dockerfile"),
+                )
+                .arg(&repo_root)
+                .output()
+                .expect("build sandbox-agent test image");
+            if !output.status.success() {
+                panic!(
+                    "failed to build sandbox-agent test image: {}",
+                    String::from_utf8_lossy(&output.stderr)
+                );
+            }
+            image_tag
+        })
+        .clone()
+}
+
+fn build_env(
+    layout: &TestLayout,
+    auth: &AuthConfig,
+    options: &TestAppOptions,
+) -> BTreeMap<String, String> {
+    let mut env = BTreeMap::new();
+    env.insert(
+        "HOME".to_string(),
+        layout.home.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "USERPROFILE".to_string(),
+        layout.home.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "XDG_DATA_HOME".to_string(),
+        layout.xdg_data_home.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "XDG_STATE_HOME".to_string(),
+        layout.xdg_state_home.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "APPDATA".to_string(),
+        layout.appdata.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "LOCALAPPDATA".to_string(),
+        layout.local_appdata.to_string_lossy().to_string(),
+    );
+
+    for (key, value) in std::env::vars() {
+        if key == "PATH" {
+            continue;
+        }
+        if key == "XDG_STATE_HOME" || key == "HOME" || key == "USERPROFILE" {
+            continue;
+        }
+        if key.starts_with("SANDBOX_AGENT_") || key.starts_with("OPENCODE_COMPAT_") {
+            env.insert(key.clone(), rewrite_localhost_url(&key, &value));
+        }
+    }
+
+    if let Some(token) = auth.token.as_ref() {
+        env.insert("SANDBOX_AGENT_TEST_AUTH_TOKEN".to_string(), token.clone());
+    }
+
+    if options.replace_path {
+        env.insert(
+            "PATH".to_string(),
+            options.env.get("PATH").cloned().unwrap_or_default(),
+        );
+    } else {
+        let mut custom_path_entries =
+            custom_path_entries(layout.install_dir.parent().expect("install base"));
+        custom_path_entries.extend(explicit_path_entries());
+        custom_path_entries.extend(
+            options
+                .extra_paths
+                .iter()
+                .filter(|path| path.is_absolute() && path.exists())
+                .cloned(),
+        );
+        custom_path_entries.sort();
+        custom_path_entries.dedup();
+
+        if custom_path_entries.is_empty() {
+            env.insert("PATH".to_string(), DEFAULT_PATH.to_string());
+        } else {
+            let joined = custom_path_entries
+                .iter()
+                .map(|path| path.to_string_lossy().to_string())
+                .collect::<Vec<_>>()
+                .join(":");
+            env.insert("PATH".to_string(), format!("{joined}:{DEFAULT_PATH}"));
+        }
+    }
+
+    for (key, value) in &options.env {
+        if key == "PATH" {
+            continue;
+        }
+        env.insert(key.clone(), rewrite_localhost_url(key, value));
+    }
+
+    env
+}
+
+fn build_mounts(root: &Path, env: &BTreeMap<String, String>) -> Vec<PathBuf> {
+    let mut mounts = BTreeSet::new();
+    mounts.insert(root.to_path_buf());
+
+    for key in [
+        "HOME",
+        "USERPROFILE",
+        "XDG_DATA_HOME",
+        "XDG_STATE_HOME",
+        "APPDATA",
+        "LOCALAPPDATA",
+        "SANDBOX_AGENT_DESKTOP_FAKE_STATE_DIR",
+    ] {
+        if let Some(value) = env.get(key) {
+            let path = PathBuf::from(value);
+            if path.is_absolute() {
+                mounts.insert(path);
+            }
+        }
+    }
+
+    if let Some(path_value) = env.get("PATH") {
+        for entry in path_value.split(':') {
+            if entry.is_empty() || STANDARD_PATHS.contains(&entry) {
+                continue;
+            }
+            let path = PathBuf::from(entry);
+            if path.is_absolute() && path.exists() {
+                mounts.insert(path);
+            }
+        }
+    }
+
+    mounts.into_iter().collect()
+}
+
+fn run_container(
+    container_id: &str,
+    image: &str,
+    mounts: &[PathBuf],
+    env: &BTreeMap<String, String>,
+    auth: &AuthConfig,
+) -> String {
+    let mut args = vec![
+        "run".to_string(),
+        "-d".to_string(),
+        "--rm".to_string(),
+        "--name".to_string(),
+        container_id.to_string(),
+        "-p".to_string(),
+        format!("127.0.0.1::{CONTAINER_PORT}"),
+    ];
+
+    #[cfg(unix)]
+    {
+        args.push("--user".to_string());
+        args.push(format!("{}:{}", unsafe { libc::geteuid() }, unsafe {
+            libc::getegid()
+        }));
+    }
+
+    if cfg!(target_os = "linux") {
+        args.push("--add-host".to_string());
+        args.push("host.docker.internal:host-gateway".to_string());
+    }
+
+    for mount in mounts {
+        args.push("-v".to_string());
+        args.push(format!("{}:{}", mount.display(), mount.display()));
+    }
+
+    for (key, value) in env {
+        args.push("-e".to_string());
+        args.push(format!("{key}={value}"));
+    }
+
+    args.push(image.to_string());
+    args.push("server".to_string());
+    args.push("--host".to_string());
+    args.push("0.0.0.0".to_string());
+    args.push("--port".to_string());
+    args.push(CONTAINER_PORT.to_string());
+    match auth.token.as_ref() {
+        Some(token) => {
+            args.push("--token".to_string());
+            args.push(token.clone());
+        }
+        None => args.push("--no-token".to_string()),
+    }
+
+    let output = Command::new(docker_bin())
+        .args(&args)
+        .output()
+        .expect("start docker test container");
+    if !output.status.success() {
+        panic!(
+            "failed to start docker test container: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+
+    let port_output = Command::new(docker_bin())
+        .args(["port", container_id, &format!("{CONTAINER_PORT}/tcp")])
+        .output()
+        .expect("resolve mapped docker port");
+    if !port_output.status.success() {
+        panic!(
+            "failed to resolve docker test port: {}",
+            String::from_utf8_lossy(&port_output.stderr)
+        );
+    }
+
+    let mapping = String::from_utf8(port_output.stdout)
+        .expect("docker port utf8")
+        .trim()
+        .to_string();
+    let host_port = mapping.rsplit(':').next().expect("mapped host port").trim();
+    let base_url = format!("http://127.0.0.1:{host_port}");
+    wait_for_health(&base_url, auth.token.as_deref());
+    base_url
+}
+
+fn wait_for_health(base_url: &str, token: Option<&str>) {
+    let started = SystemTime::now();
+    loop {
+        if probe_health(base_url, token) {
+            return;
+        }
+
+        if started
+            .elapsed()
+            .unwrap_or_else(|_| Duration::from_secs(0))
+            .gt(&Duration::from_secs(30))
+        {
+            panic!("timed out waiting for sandbox-agent docker test server");
+        }
+        thread::sleep(Duration::from_millis(200));
+    }
+}
+
+fn probe_health(base_url: &str, token: Option<&str>) -> bool {
+    let address = base_url.strip_prefix("http://").unwrap_or(base_url);
+    let mut stream = match TcpStream::connect(address) {
+        Ok(stream) => stream,
+        Err(_) => return false,
+    };
+    let _ = stream.set_read_timeout(Some(Duration::from_secs(2)));
+    let _ = stream.set_write_timeout(Some(Duration::from_secs(2)));
+
+    let mut request =
+        format!("GET /v1/health HTTP/1.1\r\nHost: {address}\r\nConnection: close\r\n");
+    if let Some(token) = token {
+        request.push_str(&format!("Authorization: Bearer {token}\r\n"));
+    }
+    request.push_str("\r\n");
+
+    if stream.write_all(request.as_bytes()).is_err() {
+        return false;
+    }
+
+    let mut response = String::new();
+    if stream.read_to_string(&mut response).is_err() {
+        return false;
+    }
+
+    response.starts_with("HTTP/1.1 200") || response.starts_with("HTTP/1.0 200")
+}
+
+fn custom_path_entries(root: &Path) -> Vec<PathBuf> {
+    let mut entries = Vec::new();
+    if let Some(value) = std::env::var_os("PATH") {
+        for entry in std::env::split_paths(&value) {
+            if !entry.exists() {
+                continue;
+            }
+            if entry.starts_with(root) || entry.starts_with(std::env::temp_dir()) {
+                entries.push(entry);
+            }
+        }
+    }
+    entries.sort();
+    entries.dedup();
+    entries
+}
+
+fn explicit_path_entries() -> Vec<PathBuf> {
+    let mut entries = Vec::new();
+    if let Some(value) = std::env::var_os("SANDBOX_AGENT_TEST_EXTRA_PATHS") {
+        for entry in std::env::split_paths(&value) {
+            if entry.is_absolute() && entry.exists() {
+                entries.push(entry);
+            }
+        }
+    }
+    entries
+}
+
+fn rewrite_localhost_url(key: &str, value: &str) -> String {
+    if key.ends_with("_URL") || key.ends_with("_URI") {
+        return value
+            .replace("http://127.0.0.1", "http://host.docker.internal")
+            .replace("http://localhost", "http://host.docker.internal");
+    }
+    value.to_string()
+}
+
+fn unique_container_id() -> String {
+    let millis = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|value| value.as_millis())
+        .unwrap_or(0);
+    let counter = CONTAINER_COUNTER.fetch_add(1, Ordering::Relaxed);
+    format!(
+        "sandbox-agent-test-{}-{millis}-{counter}",
+        std::process::id()
+    )
+}
+
+fn repo_root() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("../../..")
+        .canonicalize()
+        .expect("repo root")
+}
+
+fn docker_bin() -> &'static Path {
+    DOCKER_BIN
+        .get_or_init(|| {
+            if let Some(value) = std::env::var_os("SANDBOX_AGENT_TEST_DOCKER_BIN") {
+                let path = PathBuf::from(value);
+                if path.exists() {
+                    return path;
+                }
+            }
+
+            for candidate in [
+                "/usr/local/bin/docker",
+                "/opt/homebrew/bin/docker",
+                "/usr/bin/docker",
+            ] {
+                let path = PathBuf::from(candidate);
+                if path.exists() {
+                    return path;
+                }
+            }
+
+            PathBuf::from("docker")
+        })
+        .as_path()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    struct EnvVarGuard {
+        key: &'static str,
+        old: Option<std::ffi::OsString>,
+    }
+
+    impl EnvVarGuard {
+        fn set(key: &'static str, value: &Path) -> Self {
+            let old = std::env::var_os(key);
+            std::env::set_var(key, value);
+            Self { key, old }
+        }
+    }
+
+    impl Drop for EnvVarGuard {
+        fn drop(&mut self) {
+            match self.old.as_ref() {
+                Some(value) => std::env::set_var(self.key, value),
+                None => std::env::remove_var(self.key),
+            }
+        }
+    }
+
+    #[test]
+    #[serial]
+    fn build_env_keeps_test_local_xdg_state_home() {
+        let root = tempfile::tempdir().expect("create docker support tempdir");
+        let host_state = tempfile::tempdir().expect("create host xdg state tempdir");
+        let _guard = EnvVarGuard::set("XDG_STATE_HOME", host_state.path());
+
+        let layout = TestLayout::new(root.path());
+        layout.create();
+
+        let env = build_env(&layout, &AuthConfig::disabled(), &TestAppOptions::default());
+        assert_eq!(
+            env.get("XDG_STATE_HOME"),
+            Some(&layout.xdg_state_home.to_string_lossy().to_string())
+        );
+    }
+}
diff --git a/server/packages/sandbox-agent/tests/support/docker_common_software.rs b/server/packages/sandbox-agent/tests/support/docker_common_software.rs
new file mode 100644
index 0000000..4b29ed6
--- /dev/null
+++ b/server/packages/sandbox-agent/tests/support/docker_common_software.rs
@@ -0,0 +1,332 @@
+/// Docker support for common-software integration tests.
+///
+/// Builds the `docker/test-common-software/Dockerfile` image (which extends the
+/// base test-agent image with pre-installed common software) and provides a
+/// `TestApp` that runs a container from it.
+///
+/// KEEP IN SYNC with docs/common-software.mdx and docker/test-common-software/Dockerfile.
+use std::collections::BTreeMap;
+use std::io::{Read, Write};
+use std::net::TcpStream;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::OnceLock;
+use std::thread;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use tempfile::TempDir;
+
+const CONTAINER_PORT: u16 = 3000;
+const DEFAULT_PATH: &str = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
+const BASE_IMAGE_TAG: &str = "sandbox-agent-test:dev";
+const COMMON_SOFTWARE_IMAGE_TAG: &str = "sandbox-agent-test-common-software:dev";
+
+static IMAGE_TAG: OnceLock<String> = OnceLock::new();
+static DOCKER_BIN: OnceLock<PathBuf> = OnceLock::new();
+static CONTAINER_COUNTER: AtomicU64 = AtomicU64::new(0);
+
+#[derive(Clone)]
+pub struct DockerApp {
+    base_url: String,
+}
+
+impl DockerApp {
+    pub fn http_url(&self, path: &str) -> String {
+        format!("{}{}", self.base_url, path)
+    }
+}
+
+pub struct TestApp {
+    pub app: DockerApp,
+    _root: TempDir,
+    container_id: String,
+}
+
+impl TestApp {
+    pub fn new() -> Self {
+        let root = tempfile::tempdir().expect("create docker test root");
+        let layout = TestLayout::new(root.path());
+        layout.create();
+
+        let container_id = unique_container_id();
+        let image = ensure_common_software_image();
+        let env = build_env(&layout);
+        let mounts = build_mounts(root.path());
+        let base_url = run_container(&container_id, &image, &mounts, &env);
+
+        Self {
+            app: DockerApp { base_url },
+            _root: root,
+            container_id,
+        }
+    }
+}
+
+impl Drop for TestApp {
+    fn drop(&mut self) {
+        let _ = Command::new(docker_bin())
+            .args(["rm", "-f", &self.container_id])
+            .output();
+    }
+}
+
+struct TestLayout {
+    home: PathBuf,
+    xdg_data_home: PathBuf,
+    xdg_state_home: PathBuf,
+}
+
+impl TestLayout {
+    fn new(root: &Path) -> Self {
+        Self {
+            home: root.join("home"),
+            xdg_data_home: root.join("xdg-data"),
+            xdg_state_home: root.join("xdg-state"),
+        }
+    }
+
+    fn create(&self) {
+        for dir in [&self.home, &self.xdg_data_home, &self.xdg_state_home] {
+            std::fs::create_dir_all(dir).expect("create docker test dir");
+        }
+    }
+}
+
+fn ensure_base_image() -> String {
+    let repo_root = repo_root();
+    let image_tag =
+        std::env::var("SANDBOX_AGENT_TEST_IMAGE").unwrap_or_else(|_| BASE_IMAGE_TAG.to_string());
+    let output = Command::new(docker_bin())
+        .args(["build", "--tag", &image_tag, "--file"])
+        .arg(
+            repo_root
+                .join("docker")
+                .join("test-agent")
+                .join("Dockerfile"),
+        )
+        .arg(&repo_root)
+        .output()
+        .expect("build base test image");
+    if !output.status.success() {
+        panic!(
+            "failed to build base test image: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+    image_tag
+}
+
+fn ensure_common_software_image() -> String {
+    IMAGE_TAG
+        .get_or_init(|| {
+            let base_image = ensure_base_image();
+            let repo_root = repo_root();
+            let image_tag = std::env::var("SANDBOX_AGENT_TEST_COMMON_SOFTWARE_IMAGE")
+                .unwrap_or_else(|_| COMMON_SOFTWARE_IMAGE_TAG.to_string());
+            let output = Command::new(docker_bin())
+                .args([
+                    "build",
+                    "--tag",
+                    &image_tag,
+                    "--build-arg",
+                    &format!("BASE_IMAGE={base_image}"),
+                    "--file",
+                ])
+                .arg(
+                    repo_root
+                        .join("docker")
+                        .join("test-common-software")
+                        .join("Dockerfile"),
+                )
+                .arg(&repo_root)
+                .output()
+                .expect("build common-software test image");
+            if !output.status.success() {
+                panic!(
+                    "failed to build common-software test image: {}",
+                    String::from_utf8_lossy(&output.stderr)
+                );
+            }
+            image_tag
+        })
+        .clone()
+}
+
+fn build_env(layout: &TestLayout) -> BTreeMap<String, String> {
+    let mut env = BTreeMap::new();
+    env.insert(
+        "HOME".to_string(),
+        layout.home.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "XDG_DATA_HOME".to_string(),
+        layout.xdg_data_home.to_string_lossy().to_string(),
+    );
+    env.insert(
+        "XDG_STATE_HOME".to_string(),
+        layout.xdg_state_home.to_string_lossy().to_string(),
+    );
+    env.insert("PATH".to_string(), DEFAULT_PATH.to_string());
+    env
+}
+
+fn build_mounts(root: &Path) -> Vec<PathBuf> {
+    vec![root.to_path_buf()]
+}
+
+fn run_container(
+    container_id: &str,
+    image: &str,
+    mounts: &[PathBuf],
+    env: &BTreeMap<String, String>,
+) -> String {
+    let mut args = vec![
+        "run".to_string(),
+        "-d".to_string(),
+        "--rm".to_string(),
+        "--name".to_string(),
+        container_id.to_string(),
+        "-p".to_string(),
+        format!("127.0.0.1::{CONTAINER_PORT}"),
+    ];
+
+    if cfg!(target_os = "linux") {
+        args.push("--add-host".to_string());
+        args.push("host.docker.internal:host-gateway".to_string());
+    }
+
+    for mount in mounts {
+        args.push("-v".to_string());
+        args.push(format!("{}:{}", mount.display(), mount.display()));
+    }
+
+    for (key, value) in env {
+        args.push("-e".to_string());
+        args.push(format!("{key}={value}"));
+    }
+
+    args.push(image.to_string());
+    args.push("server".to_string());
+    args.push("--host".to_string());
+    args.push("0.0.0.0".to_string());
+    args.push("--port".to_string());
+    args.push(CONTAINER_PORT.to_string());
+    args.push("--no-token".to_string());
+
+    let output = Command::new(docker_bin())
+        .args(&args)
+        .output()
+        .expect("start docker test container");
+    if !output.status.success() {
+        panic!(
+            "failed to start docker test container: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+
+    let port_output = Command::new(docker_bin())
+        .args(["port", container_id, &format!("{CONTAINER_PORT}/tcp")])
+        .output()
+        .expect("resolve mapped docker port");
+    if !port_output.status.success() {
+        panic!(
+            "failed to resolve docker test port: {}",
+            String::from_utf8_lossy(&port_output.stderr)
+        );
+    }
+
+    let mapping = String::from_utf8(port_output.stdout)
+        .expect("docker port utf8")
+        .trim()
+        .to_string();
+    let host_port = mapping.rsplit(':').next().expect("mapped host port").trim();
+    let base_url = format!("http://127.0.0.1:{host_port}");
+    wait_for_health(&base_url);
+    base_url
+}
+
+fn wait_for_health(base_url: &str) {
+    let started = SystemTime::now();
+    loop {
+        if probe_health(base_url) {
+            return;
+        }
+        if started
+            .elapsed()
+            .unwrap_or_else(|_| Duration::from_secs(0))
+            .gt(&Duration::from_secs(60))
+        {
+            panic!("timed out waiting for common-software docker test server");
+        }
+        thread::sleep(Duration::from_millis(200));
+    }
+}
+
+fn probe_health(base_url: &str) -> bool {
+    let address = base_url.strip_prefix("http://").unwrap_or(base_url);
+    let mut stream = match TcpStream::connect(address) {
+        Ok(stream) => stream,
+        Err(_) => return false,
+    };
+    let _ = stream.set_read_timeout(Some(Duration::from_secs(2)));
+    let _ = stream.set_write_timeout(Some(Duration::from_secs(2)));
+
+    let request =
+        format!("GET /v1/health HTTP/1.1\r\nHost: {address}\r\nConnection: close\r\n\r\n");
+    if stream.write_all(request.as_bytes()).is_err() {
+        return false;
+    }
+
+    let mut response = String::new();
+    if stream.read_to_string(&mut response).is_err() {
+        return false;
+    }
+
+    response.starts_with("HTTP/1.1 200") || response.starts_with("HTTP/1.0 200")
+}
+
+fn unique_container_id() -> String {
+    let millis = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|value| value.as_millis())
+        .unwrap_or(0);
+    let counter = CONTAINER_COUNTER.fetch_add(1, Ordering::Relaxed);
+    format!(
+        "sandbox-agent-common-sw-{}-{millis}-{counter}",
+        std::process::id()
+    )
+}
+
+fn repo_root() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("../../..")
+        .canonicalize()
+        .expect("repo root")
+}
+
+fn docker_bin() -> &'static Path {
+    DOCKER_BIN
+        .get_or_init(|| {
+            if let Some(value) = std::env::var_os("SANDBOX_AGENT_TEST_DOCKER_BIN") {
+                let path = PathBuf::from(value);
+                if path.exists() {
+                    return path;
+                }
+            }
+
+            for candidate in [
+                "/usr/local/bin/docker",
+                "/opt/homebrew/bin/docker",
+                "/usr/bin/docker",
+            ] {
+                let path = PathBuf::from(candidate);
+                if path.exists() {
+                    return path;
+                }
+            }
+
+            PathBuf::from("docker")
+        })
+        .as_path()
+}
diff --git a/server/packages/sandbox-agent/tests/v1_agent_process_matrix.rs b/server/packages/sandbox-agent/tests/v1_agent_process_matrix.rs
index 029ca25..fc88c4c 100644
--- a/server/packages/sandbox-agent/tests/v1_agent_process_matrix.rs
+++ b/server/packages/sandbox-agent/tests/v1_agent_process_matrix.rs
@@ -1,37 +1,14 @@
 use std::fs;
 use std::path::Path;
 
-use axum::body::Body;
-use axum::http::{Method, Request, StatusCode};
 use futures::StreamExt;
-use http_body_util::BodyExt;
-use sandbox_agent::router::{build_router, AppState, AuthConfig};
-use sandbox_agent_agent_management::agents::AgentManager;
+use reqwest::{Method, StatusCode};
+use sandbox_agent::router::AuthConfig;
 use serde_json::{json, Value};
-use tempfile::TempDir;
-use tower::util::ServiceExt;
 
-struct TestApp {
-    app: axum::Router,
-    _install_dir: TempDir,
-}
-
-impl TestApp {
-    fn with_setup<F>(setup: F) -> Self
-    where
-        F: FnOnce(&Path),
-    {
-        let install_dir = tempfile::tempdir().expect("create temp install dir");
-        setup(install_dir.path());
-        let manager = AgentManager::new(install_dir.path()).expect("create agent manager");
-        let state = AppState::new(AuthConfig::disabled(), manager);
-        let app = build_router(state);
-        Self {
-            app,
-            _install_dir: install_dir,
-        }
-    }
-}
+#[path = "support/docker.rs"]
+mod docker_support;
+use docker_support::TestApp;
 
 fn write_executable(path: &Path, script: &str) {
     fs::write(path, script).expect("write executable");
@@ -101,28 +78,29 @@ fn setup_stub_agent_process_only(install_dir: &Path, agent: &str) {
 }
 
 async fn send_request(
-    app: &axum::Router,
+    app: &docker_support::DockerApp,
     method: Method,
     uri: &str,
     body: Option<Value>,
 ) -> (StatusCode, Vec<u8>) {
-    let mut builder = Request::builder().method(method).uri(uri);
-    let request_body = if let Some(body) = body {
-        builder = builder.header("content-type", "application/json");
-        Body::from(body.to_string())
+    let client = reqwest::Client::new();
+    let response = if let Some(body) = body {
+        client
+            .request(method, app.http_url(uri))
+            .header("content-type", "application/json")
+            .body(body.to_string())
+            .send()
+            .await
+            .expect("request handled")
     } else {
-        Body::empty()
+        client
+            .request(method, app.http_url(uri))
+            .send()
+            .await
+            .expect("request handled")
     };
-
-    let request = builder.body(request_body).expect("build request");
-    let response = app.clone().oneshot(request).await.expect("request handled");
     let status = response.status();
-    let bytes = response
-        .into_body()
-        .collect()
-        .await
-        .expect("collect body")
-        .to_bytes();
+    let bytes = response.bytes().await.expect("collect body");
 
     (status, bytes.to_vec())
 }
@@ -145,7 +123,7 @@ async fn agent_process_matrix_smoke_and_jsonrpc_conformance() {
         .chain(agent_process_only_agents.iter())
         .copied()
         .collect();
-    let test_app = TestApp::with_setup(|install_dir| {
+    let test_app = TestApp::with_setup(AuthConfig::disabled(), |install_dir| {
         for agent in native_agents {
             setup_stub_artifacts(install_dir, agent);
         }
@@ -201,21 +179,15 @@ async fn agent_process_matrix_smoke_and_jsonrpc_conformance() {
         assert_eq!(new_json["id"], 2, "{agent}: session/new id");
         assert_eq!(new_json["result"]["echoedMethod"], "session/new");
 
-        let request = Request::builder()
-            .method(Method::GET)
-            .uri(format!("/v1/acp/{agent}-server"))
-            .body(Body::empty())
-            .expect("build sse request");
-
-        let response = test_app
-            .app
-            .clone()
-            .oneshot(request)
+        let response = reqwest::Client::new()
+            .get(test_app.app.http_url(&format!("/v1/acp/{agent}-server")))
+            .header("accept", "text/event-stream")
+            .send()
             .await
             .expect("sse response");
         assert_eq!(response.status(), StatusCode::OK);
 
-        let mut stream = response.into_body().into_data_stream();
+        let mut stream = response.bytes_stream();
         let chunk = tokio::time::timeout(std::time::Duration::from_secs(5), async move {
             while let Some(item) = stream.next().await {
                 let bytes = item.expect("sse chunk");
diff --git a/server/packages/sandbox-agent/tests/v1_api.rs b/server/packages/sandbox-agent/tests/v1_api.rs
index 89efde0..02558a7 100644
--- a/server/packages/sandbox-agent/tests/v1_api.rs
+++ b/server/packages/sandbox-agent/tests/v1_api.rs
@@ -4,73 +4,16 @@ use std::net::{TcpListener, TcpStream};
 use std::path::Path;
 use std::time::Duration;
 
-use axum::body::Body;
-use axum::http::{header, HeaderMap, Method, Request, StatusCode};
-use axum::Router;
 use futures::StreamExt;
-use http_body_util::BodyExt;
-use sandbox_agent::router::{build_router, AppState, AuthConfig};
-use sandbox_agent_agent_management::agents::AgentManager;
+use reqwest::header::{self, HeaderMap, HeaderName, HeaderValue};
+use reqwest::{Method, StatusCode};
+use sandbox_agent::router::AuthConfig;
 use serde_json::{json, Value};
 use serial_test::serial;
-use tempfile::TempDir;
-use tower::util::ServiceExt;
 
-struct TestApp {
-    app: Router,
-    install_dir: TempDir,
-}
-
-impl TestApp {
-    fn new(auth: AuthConfig) -> Self {
-        Self::with_setup(auth, |_| {})
-    }
-
-    fn with_setup<F>(auth: AuthConfig, setup: F) -> Self
-    where
-        F: FnOnce(&Path),
-    {
-        let install_dir = tempfile::tempdir().expect("create temp install dir");
-        setup(install_dir.path());
-        let manager = AgentManager::new(install_dir.path()).expect("create agent manager");
-        let state = AppState::new(auth, manager);
-        let app = build_router(state);
-        Self { app, install_dir }
-    }
-
-    fn install_path(&self) -> &Path {
-        self.install_dir.path()
-    }
-}
-
-struct EnvVarGuard {
-    key: &'static str,
-    previous: Option<std::ffi::OsString>,
-}
-
-impl EnvVarGuard {
-    fn set(key: &'static str, value: &str) -> Self {
-        let previous = std::env::var_os(key);
-        std::env::set_var(key, value);
-        Self { key, previous }
-    }
-
-    fn set_os(key: &'static str, value: &std::ffi::OsStr) -> Self {
-        let previous = std::env::var_os(key);
-        std::env::set_var(key, value);
-        Self { key, previous }
-    }
-}
-
-impl Drop for EnvVarGuard {
-    fn drop(&mut self) {
-        if let Some(previous) = self.previous.as_ref() {
-            std::env::set_var(self.key, previous);
-        } else {
-            std::env::remove_var(self.key);
-        }
-    }
-}
+#[path = "support/docker.rs"]
+mod docker_support;
+use docker_support::{LiveServer, TestApp};
 
 fn write_executable(path: &Path, script: &str) {
     fs::write(path, script).expect("write executable");
@@ -83,18 +26,51 @@ fn write_executable(path: &Path, script: &str) {
     }
 }
 
+fn write_fake_npm(path: &Path) {
+    write_executable(
+        path,
+        r#"#!/usr/bin/env sh
+set -e
+prefix=""
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    install|--no-audit|--no-fund)
+      shift
+      ;;
+    --prefix)
+      prefix="$2"
+      shift 2
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+[ -n "$prefix" ] || exit 1
+mkdir -p "$prefix/node_modules/.bin"
+for bin in claude-code-acp codex-acp amp-acp pi-acp cursor-agent-acp; do
+  echo '#!/usr/bin/env sh' > "$prefix/node_modules/.bin/$bin"
+  echo 'exit 0' >> "$prefix/node_modules/.bin/$bin"
+  chmod +x "$prefix/node_modules/.bin/$bin"
+done
+exit 0
+"#,
+    );
+}
+
 fn serve_registry_once(document: Value) -> String {
-    let listener = TcpListener::bind("127.0.0.1:0").expect("bind registry server");
-    let address = listener.local_addr().expect("registry address");
+    let listener = TcpListener::bind("0.0.0.0:0").expect("bind registry server");
+    let port = listener.local_addr().expect("registry address").port();
     let body = document.to_string();
 
-    std::thread::spawn(move || {
-        if let Ok((mut stream, _)) = listener.accept() {
-            respond_json(&mut stream, &body);
+    std::thread::spawn(move || loop {
+        match listener.accept() {
+            Ok((mut stream, _)) => respond_json(&mut stream, &body),
+            Err(_) => break,
         }
     });
 
-    format!("http://{address}/registry.json")
+    format!("http://127.0.0.1:{port}/registry.json")
 }
 
 fn respond_json(stream: &mut TcpStream, body: &str) {
@@ -112,74 +88,96 @@ fn respond_json(stream: &mut TcpStream, body: &str) {
 }
 
 async fn send_request(
-    app: &Router,
+    app: &docker_support::DockerApp,
     method: Method,
     uri: &str,
     body: Option<Value>,
     headers: &[(&str, &str)],
 ) -> (StatusCode, HeaderMap, Vec<u8>) {
-    let mut builder = Request::builder().method(method).uri(uri);
+    let client = reqwest::Client::new();
+    let mut builder = client.request(method, app.http_url(uri));
     for (name, value) in headers {
-        builder = builder.header(*name, *value);
+        let header_name = HeaderName::from_bytes(name.as_bytes()).expect("header name");
+        let header_value = HeaderValue::from_str(value).expect("header value");
+        builder = builder.header(header_name, header_value);
     }
 
-    let request_body = if let Some(body) = body {
-        builder = builder.header(header::CONTENT_TYPE, "application/json");
-        Body::from(body.to_string())
+    let response = if let Some(body) = body {
+        builder
+            .header(header::CONTENT_TYPE, "application/json")
+            .body(body.to_string())
+            .send()
+            .await
+            .expect("request handled")
     } else {
-        Body::empty()
+        builder.send().await.expect("request handled")
     };
-
-    let request = builder.body(request_body).expect("build request");
-    let response = app.clone().oneshot(request).await.expect("request handled");
     let status = response.status();
     let headers = response.headers().clone();
-    let bytes = response
-        .into_body()
-        .collect()
-        .await
-        .expect("collect body")
-        .to_bytes();
+    let bytes = response.bytes().await.expect("collect body");
 
     (status, headers, bytes.to_vec())
 }
 
 async fn send_request_raw(
-    app: &Router,
+    app: &docker_support::DockerApp,
     method: Method,
     uri: &str,
     body: Option<Vec<u8>>,
     headers: &[(&str, &str)],
     content_type: Option<&str>,
 ) -> (StatusCode, HeaderMap, Vec<u8>) {
-    let mut builder = Request::builder().method(method).uri(uri);
+    let client = reqwest::Client::new();
+    let mut builder = client.request(method, app.http_url(uri));
     for (name, value) in headers {
-        builder = builder.header(*name, *value);
+        let header_name = HeaderName::from_bytes(name.as_bytes()).expect("header name");
+        let header_value = HeaderValue::from_str(value).expect("header value");
+        builder = builder.header(header_name, header_value);
     }
 
-    let request_body = if let Some(body) = body {
+    let response = if let Some(body) = body {
         if let Some(content_type) = content_type {
             builder = builder.header(header::CONTENT_TYPE, content_type);
         }
-        Body::from(body)
+        builder.body(body).send().await.expect("request handled")
     } else {
-        Body::empty()
+        builder.send().await.expect("request handled")
     };
-
-    let request = builder.body(request_body).expect("build request");
-    let response = app.clone().oneshot(request).await.expect("request handled");
     let status = response.status();
     let headers = response.headers().clone();
-    let bytes = response
-        .into_body()
-        .collect()
-        .await
-        .expect("collect body")
-        .to_bytes();
+    let bytes = response.bytes().await.expect("collect body");
 
     (status, headers, bytes.to_vec())
 }
 
+async fn launch_desktop_focus_window(app: &docker_support::DockerApp, display: &str) {
+    let command = r#"nohup xterm -geometry 80x24+40+40 -title 'Sandbox Desktop Test' -e sh -lc 'sleep 60' >/tmp/sandbox-agent-xterm.log 2>&1 < /dev/null & for _ in $(seq 1 50); do wid="$(xdotool search --onlyvisible --name 'Sandbox Desktop Test' 2>/dev/null | head -n 1 || true)"; if [ -n "$wid" ]; then xdotool windowactivate "$wid"; exit 0; fi; sleep 0.1; done; exit 1"#;
+    let (status, _, body) = send_request(
+        app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", command],
+            "env": {
+                "DISPLAY": display,
+            },
+            "timeoutMs": 10_000
+        })),
+        &[],
+    )
+    .await;
+
+    assert_eq!(
+        status,
+        StatusCode::OK,
+        "unexpected desktop focus window launch response: {}",
+        String::from_utf8_lossy(&body)
+    );
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["exitCode"], 0);
+}
+
 fn parse_json(bytes: &[u8]) -> Value {
     if bytes.is_empty() {
         Value::Null
@@ -200,7 +198,7 @@ fn initialize_payload() -> Value {
     })
 }
 
-async fn bootstrap_server(app: &Router, server_id: &str, agent: &str) {
+async fn bootstrap_server(app: &docker_support::DockerApp, server_id: &str, agent: &str) {
     let initialize = initialize_payload();
     let (status, _, _body) = send_request(
         app,
@@ -213,17 +211,17 @@ async fn bootstrap_server(app: &Router, server_id: &str, agent: &str) {
     assert_eq!(status, StatusCode::OK);
 }
 
-async fn read_first_sse_data(app: &Router, server_id: &str) -> String {
-    let request = Request::builder()
-        .method(Method::GET)
-        .uri(format!("/v1/acp/{server_id}"))
-        .body(Body::empty())
-        .expect("build request");
-
-    let response = app.clone().oneshot(request).await.expect("sse response");
+async fn read_first_sse_data(app: &docker_support::DockerApp, server_id: &str) -> String {
+    let client = reqwest::Client::new();
+    let response = client
+        .get(app.http_url(&format!("/v1/acp/{server_id}")))
+        .header("accept", "text/event-stream")
+        .send()
+        .await
+        .expect("sse response");
     assert_eq!(response.status(), StatusCode::OK);
 
-    let mut stream = response.into_body().into_data_stream();
+    let mut stream = response.bytes_stream();
     tokio::time::timeout(Duration::from_secs(5), async move {
         while let Some(chunk) = stream.next().await {
             let bytes = chunk.expect("stream chunk");
@@ -239,21 +237,21 @@ async fn read_first_sse_data(app: &Router, server_id: &str) -> String {
 }
 
 async fn read_first_sse_data_with_last_id(
-    app: &Router,
+    app: &docker_support::DockerApp,
     server_id: &str,
     last_event_id: u64,
 ) -> String {
-    let request = Request::builder()
-        .method(Method::GET)
-        .uri(format!("/v1/acp/{server_id}"))
+    let client = reqwest::Client::new();
+    let response = client
+        .get(app.http_url(&format!("/v1/acp/{server_id}")))
+        .header("accept", "text/event-stream")
         .header("last-event-id", last_event_id.to_string())
-        .body(Body::empty())
-        .expect("build request");
-
-    let response = app.clone().oneshot(request).await.expect("sse response");
+        .send()
+        .await
+        .expect("sse response");
     assert_eq!(response.status(), StatusCode::OK);
 
-    let mut stream = response.into_body().into_data_stream();
+    let mut stream = response.bytes_stream();
     tokio::time::timeout(Duration::from_secs(5), async move {
         while let Some(chunk) = stream.next().await {
             let bytes = chunk.expect("stream chunk");
@@ -291,3 +289,7 @@ mod acp_transport;
 mod config_endpoints;
 #[path = "v1_api/control_plane.rs"]
 mod control_plane;
+#[path = "v1_api/desktop.rs"]
+mod desktop;
+#[path = "v1_api/processes.rs"]
+mod processes;
diff --git a/server/packages/sandbox-agent/tests/v1_api/acp_transport.rs b/server/packages/sandbox-agent/tests/v1_api/acp_transport.rs
index 46b0198..147d844 100644
--- a/server/packages/sandbox-agent/tests/v1_api/acp_transport.rs
+++ b/server/packages/sandbox-agent/tests/v1_api/acp_transport.rs
@@ -33,6 +33,51 @@ done
     write_executable(path, &script);
 }
 
+fn write_strict_pi_agent_process(path: &Path) {
+    // This stub intentionally mirrors the strict bootstrap validation behavior
+    // observed in pi-acp:
+    // - initialize.params.protocolVersion must be numeric
+    // - session/new.params.mcpServers must be present (array)
+    //
+    // The proxy normalization layer should adapt legacy/raw client payloads so
+    // requests still succeed against this stricter contract.
+    let script = r#"#!/usr/bin/env sh
+if [ "${1:-}" = "--help" ] || [ "${1:-}" = "--version" ] || [ "${1:-}" = "version" ] || [ "${1:-}" = "-V" ]; then
+  echo "pi-agent-process 0.0.1"
+  exit 0
+fi
+
+while IFS= read -r line; do
+  method=$(printf '%s\n' "$line" | sed -n 's/.*"method"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p')
+  id=$(printf '%s\n' "$line" | sed -n 's/.*"id"[[:space:]]*:[[:space:]]*\([^,}]*\).*/\1/p')
+
+  if [ "$method" = "initialize" ] && [ -n "$id" ]; then
+    if printf '%s\n' "$line" | grep -Eq '"protocolVersion"[[:space:]]*:[[:space:]]*"'; then
+      printf '{"jsonrpc":"2.0","id":%s,"error":{"code":-32603,"message":"Internal error","data":[{"expected":"number","code":"invalid_type","path":["protocolVersion"],"message":"Invalid input: expected number, received string"}]}}\n' "$id"
+    else
+      printf '{"jsonrpc":"2.0","id":%s,"result":{"ok":true,"echoedMethod":"initialize"}}\n' "$id"
+    fi
+    continue
+  fi
+
+  if [ "$method" = "session/new" ] && [ -n "$id" ]; then
+    if printf '%s\n' "$line" | grep -Eq '"mcpServers"[[:space:]]*:[[:space:]]*\['; then
+      printf '{"jsonrpc":"2.0","id":%s,"result":{"sessionId":"pi-session","echoedMethod":"session/new"}}\n' "$id"
+    else
+      printf '{"jsonrpc":"2.0","id":%s,"error":{"code":-32603,"message":"Internal error","data":[{"expected":"array","code":"invalid_type","path":["mcpServers"],"message":"Invalid input: expected array, received undefined"}]}}\n' "$id"
+    fi
+    continue
+  fi
+
+  if [ -n "$method" ] && [ -n "$id" ]; then
+    printf '{"jsonrpc":"2.0","id":%s,"result":{"ok":true,"echoedMethod":"%s"}}\n' "$id" "$method"
+  fi
+done
+"#;
+
+    write_executable(path, script);
+}
+
 fn setup_stub_artifacts(install_dir: &Path, agent: &str) {
     let native = install_dir.join(agent);
     write_stub_native(&native, agent);
@@ -47,6 +92,17 @@ fn setup_stub_artifacts(install_dir: &Path, agent: &str) {
     write_stub_agent_process(&launcher, agent);
 }
 
+fn setup_strict_pi_agent_process_only(install_dir: &Path) {
+    let agent_processes = install_dir.join("agent_processes");
+    fs::create_dir_all(&agent_processes).expect("create agent processes dir");
+    let launcher = if cfg!(windows) {
+        agent_processes.join("pi-acp.cmd")
+    } else {
+        agent_processes.join("pi-acp")
+    };
+    write_strict_pi_agent_process(&launcher);
+}
+
 #[tokio::test]
 async fn acp_bootstrap_requires_agent_query() {
     let test_app = TestApp::new(AuthConfig::disabled());
@@ -115,6 +171,44 @@ async fn acp_round_trip_and_replay() {
     assert!(second_event_id > first_event_id);
 }
 
+#[cfg(unix)]
+#[tokio::test]
+async fn pi_initialize_and_session_new_are_normalized() {
+    let test_app = TestApp::with_setup(AuthConfig::disabled(), |install_dir| {
+        setup_strict_pi_agent_process_only(install_dir);
+    });
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/acp/server-pi?agent=pi",
+        Some(initialize_payload()),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["result"]["echoedMethod"], "initialize");
+
+    let session_new = json!({
+        "jsonrpc": "2.0",
+        "id": 2,
+        "method": "session/new",
+        "params": {
+            "cwd": "/tmp"
+        }
+    });
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/acp/server-pi",
+        Some(session_new),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["result"]["echoedMethod"], "session/new");
+}
+
 #[cfg(unix)]
 #[tokio::test]
 async fn acp_agent_mismatch_returns_conflict() {
diff --git a/server/packages/sandbox-agent/tests/v1_api/config_endpoints.rs b/server/packages/sandbox-agent/tests/v1_api/config_endpoints.rs
index 3aec8ca..e212c86 100644
--- a/server/packages/sandbox-agent/tests/v1_api/config_endpoints.rs
+++ b/server/packages/sandbox-agent/tests/v1_api/config_endpoints.rs
@@ -22,8 +22,9 @@ async fn mcp_config_requires_directory_and_name() {
 #[tokio::test]
 async fn mcp_config_crud_round_trip() {
     let test_app = TestApp::new(AuthConfig::disabled());
-    let project = tempfile::tempdir().expect("tempdir");
-    let directory = project.path().to_string_lossy().to_string();
+    let project = test_app.root_path().join("mcp-config-project");
+    fs::create_dir_all(&project).expect("create project dir");
+    let directory = project.to_string_lossy().to_string();
 
     let entry = json!({
         "type": "local",
@@ -99,8 +100,9 @@ async fn skills_config_requires_directory_and_name() {
 #[tokio::test]
 async fn skills_config_crud_round_trip() {
     let test_app = TestApp::new(AuthConfig::disabled());
-    let project = tempfile::tempdir().expect("tempdir");
-    let directory = project.path().to_string_lossy().to_string();
+    let project = test_app.root_path().join("skills-config-project");
+    fs::create_dir_all(&project).expect("create project dir");
+    let directory = project.to_string_lossy().to_string();
 
     let entry = json!({
         "sources": [
diff --git a/server/packages/sandbox-agent/tests/v1_api/control_plane.rs b/server/packages/sandbox-agent/tests/v1_api/control_plane.rs
index 1728f8b..fdd4131 100644
--- a/server/packages/sandbox-agent/tests/v1_api/control_plane.rs
+++ b/server/packages/sandbox-agent/tests/v1_api/control_plane.rs
@@ -1,4 +1,5 @@
 use super::*;
+use std::collections::BTreeMap;
 
 #[tokio::test]
 async fn v1_health_removed_legacy_and_opencode_unmounted() {
@@ -137,10 +138,19 @@ async fn v1_filesystem_endpoints_round_trip() {
 #[tokio::test]
 #[serial]
 async fn require_preinstall_blocks_missing_agent() {
-    let test_app = {
-        let _preinstall = EnvVarGuard::set("SANDBOX_AGENT_REQUIRE_PREINSTALL", "true");
-        TestApp::new(AuthConfig::disabled())
-    };
+    let mut env = BTreeMap::new();
+    env.insert(
+        "SANDBOX_AGENT_REQUIRE_PREINSTALL".to_string(),
+        "true".to_string(),
+    );
+    let test_app = TestApp::with_options(
+        AuthConfig::disabled(),
+        docker_support::TestAppOptions {
+            env,
+            ..Default::default()
+        },
+        |_| {},
+    );
 
     let (status, _, body) = send_request(
         &test_app.app,
@@ -176,23 +186,26 @@ async fn lazy_install_runs_on_first_bootstrap() {
         ]
     }));
 
-    let _registry = EnvVarGuard::set("SANDBOX_AGENT_ACP_REGISTRY_URL", &registry_url);
-    let test_app = TestApp::with_setup(AuthConfig::disabled(), |install_path| {
-        fs::create_dir_all(install_path.join("agent_processes"))
-            .expect("create agent processes dir");
-        write_executable(&install_path.join("codex"), "#!/usr/bin/env sh\nexit 0\n");
-        fs::create_dir_all(install_path.join("bin")).expect("create bin dir");
-        write_executable(
-            &install_path.join("bin").join("npx"),
-            "#!/usr/bin/env sh\nwhile IFS= read -r _line; do :; done\n",
-        );
-    });
+    let helper_bin_root = tempfile::tempdir().expect("helper bin tempdir");
+    let helper_bin = helper_bin_root.path().join("bin");
+    fs::create_dir_all(&helper_bin).expect("create helper bin dir");
+    write_fake_npm(&helper_bin.join("npm"));
 
-    let original_path = std::env::var_os("PATH").unwrap_or_default();
-    let mut paths = vec![test_app.install_path().join("bin")];
-    paths.extend(std::env::split_paths(&original_path));
-    let merged_path = std::env::join_paths(paths).expect("join PATH");
-    let _path_guard = EnvVarGuard::set_os("PATH", merged_path.as_os_str());
+    let mut env = BTreeMap::new();
+    env.insert("SANDBOX_AGENT_ACP_REGISTRY_URL".to_string(), registry_url);
+    let test_app = TestApp::with_options(
+        AuthConfig::disabled(),
+        docker_support::TestAppOptions {
+            env,
+            extra_paths: vec![helper_bin.clone()],
+            ..Default::default()
+        },
+        |install_path| {
+            fs::create_dir_all(install_path.join("agent_processes"))
+                .expect("create agent processes dir");
+            write_executable(&install_path.join("codex"), "#!/usr/bin/env sh\nexit 0\n");
+        },
+    );
 
     let (status, _, _) = send_request(
         &test_app.app,
diff --git a/server/packages/sandbox-agent/tests/v1_api/desktop.rs b/server/packages/sandbox-agent/tests/v1_api/desktop.rs
new file mode 100644
index 0000000..76d9389
--- /dev/null
+++ b/server/packages/sandbox-agent/tests/v1_api/desktop.rs
@@ -0,0 +1,494 @@
+use super::*;
+use futures::{SinkExt, StreamExt};
+use serial_test::serial;
+use std::collections::BTreeMap;
+use tokio_tungstenite::connect_async;
+use tokio_tungstenite::tungstenite::Message;
+
+fn png_dimensions(bytes: &[u8]) -> (u32, u32) {
+    assert!(bytes.starts_with(b"\x89PNG\r\n\x1a\n"));
+    let width = u32::from_be_bytes(bytes[16..20].try_into().expect("png width bytes"));
+    let height = u32::from_be_bytes(bytes[20..24].try_into().expect("png height bytes"));
+    (width, height)
+}
+
+async fn recv_ws_message(
+    ws: &mut tokio_tungstenite::WebSocketStream<
+        tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>,
+    >,
+) -> Message {
+    tokio::time::timeout(Duration::from_secs(5), ws.next())
+        .await
+        .expect("timed out waiting for websocket frame")
+        .expect("websocket stream ended")
+        .expect("websocket frame")
+}
+
+#[tokio::test]
+#[serial]
+async fn v1_desktop_status_reports_install_required_when_dependencies_are_missing() {
+    let temp = tempfile::tempdir().expect("create empty path tempdir");
+    let mut env = BTreeMap::new();
+    env.insert(
+        "PATH".to_string(),
+        temp.path().to_string_lossy().to_string(),
+    );
+
+    let test_app = TestApp::with_options(
+        AuthConfig::disabled(),
+        docker_support::TestAppOptions {
+            env,
+            replace_path: true,
+            ..Default::default()
+        },
+        |_| {},
+    );
+
+    let (status, _, body) =
+        send_request(&test_app.app, Method::GET, "/v1/desktop/status", None, &[]).await;
+
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["state"], "install_required");
+    assert!(parsed["missingDependencies"]
+        .as_array()
+        .expect("missingDependencies array")
+        .iter()
+        .any(|value| value == "Xvfb"));
+    assert_eq!(
+        parsed["installCommand"],
+        "sandbox-agent install desktop --yes"
+    );
+}
+
+#[tokio::test]
+#[serial]
+async fn v1_desktop_lifecycle_and_actions_work_with_real_runtime() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/start",
+        Some(json!({
+            "width": 1440,
+            "height": 900,
+            "dpi": 96
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(
+        status,
+        StatusCode::OK,
+        "unexpected start response: {}",
+        String::from_utf8_lossy(&body)
+    );
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["state"], "active");
+    let display = parsed["display"]
+        .as_str()
+        .expect("desktop display")
+        .to_string();
+    assert!(display.starts_with(':'));
+    assert_eq!(parsed["resolution"]["width"], 1440);
+    assert_eq!(parsed["resolution"]["height"], 900);
+
+    let (status, headers, body) = send_request_raw(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/screenshot",
+        None,
+        &[],
+        None,
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(
+        headers
+            .get(header::CONTENT_TYPE)
+            .and_then(|value| value.to_str().ok()),
+        Some("image/png")
+    );
+    assert!(body.starts_with(b"\x89PNG\r\n\x1a\n"));
+    assert_eq!(png_dimensions(&body), (1440, 900));
+
+    let (status, headers, body) = send_request_raw(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/screenshot?format=jpeg&quality=50",
+        None,
+        &[],
+        None,
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(
+        headers
+            .get(header::CONTENT_TYPE)
+            .and_then(|value| value.to_str().ok()),
+        Some("image/jpeg")
+    );
+    assert!(body.starts_with(&[0xff, 0xd8, 0xff]));
+
+    let (status, headers, body) = send_request_raw(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/screenshot?scale=0.5",
+        None,
+        &[],
+        None,
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(
+        headers
+            .get(header::CONTENT_TYPE)
+            .and_then(|value| value.to_str().ok()),
+        Some("image/png")
+    );
+    assert_eq!(png_dimensions(&body), (720, 450));
+
+    let (status, _, body) = send_request_raw(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/screenshot/region?x=10&y=20&width=30&height=40",
+        None,
+        &[],
+        None,
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert!(body.starts_with(b"\x89PNG\r\n\x1a\n"));
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/display/info",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let display_info = parse_json(&body);
+    assert_eq!(display_info["display"], display);
+    assert_eq!(display_info["resolution"]["width"], 1440);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/move",
+        Some(json!({ "x": 400, "y": 300 })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let mouse = parse_json(&body);
+    assert_eq!(mouse["x"], 400);
+    assert_eq!(mouse["y"], 300);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/drag",
+        Some(json!({
+            "startX": 100,
+            "startY": 110,
+            "endX": 220,
+            "endY": 230,
+            "button": "left"
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let dragged = parse_json(&body);
+    assert_eq!(dragged["x"], 220);
+    assert_eq!(dragged["y"], 230);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/click",
+        Some(json!({
+            "x": 220,
+            "y": 230,
+            "button": "left",
+            "clickCount": 1
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let clicked = parse_json(&body);
+    assert_eq!(clicked["x"], 220);
+    assert_eq!(clicked["y"], 230);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/down",
+        Some(json!({
+            "x": 220,
+            "y": 230,
+            "button": "left"
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let mouse_down = parse_json(&body);
+    assert_eq!(mouse_down["x"], 220);
+    assert_eq!(mouse_down["y"], 230);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/move",
+        Some(json!({ "x": 260, "y": 280 })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let moved_while_down = parse_json(&body);
+    assert_eq!(moved_while_down["x"], 260);
+    assert_eq!(moved_while_down["y"], 280);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/up",
+        Some(json!({ "button": "left" })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let mouse_up = parse_json(&body);
+    assert_eq!(mouse_up["x"], 260);
+    assert_eq!(mouse_up["y"], 280);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/mouse/scroll",
+        Some(json!({
+            "x": 220,
+            "y": 230,
+            "deltaY": -3
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let scrolled = parse_json(&body);
+    assert_eq!(scrolled["x"], 220);
+    assert_eq!(scrolled["y"], 230);
+
+    let (status, _, body) =
+        send_request(&test_app.app, Method::GET, "/v1/desktop/windows", None, &[]).await;
+    assert_eq!(status, StatusCode::OK);
+    assert!(parse_json(&body)["windows"].is_array());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/mouse/position",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let position = parse_json(&body);
+    assert_eq!(position["x"], 220);
+    assert_eq!(position["y"], 230);
+
+    launch_desktop_focus_window(&test_app.app, &display).await;
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/keyboard/type",
+        Some(json!({ "text": "hello world", "delayMs": 5 })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["ok"], true);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/keyboard/press",
+        Some(json!({ "key": "ctrl+l" })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["ok"], true);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/keyboard/press",
+        Some(json!({
+            "key": "l",
+            "modifiers": {
+                "ctrl": true
+            }
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["ok"], true);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/keyboard/down",
+        Some(json!({ "key": "shift" })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["ok"], true);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/keyboard/up",
+        Some(json!({ "key": "shift" })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["ok"], true);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/recording/start",
+        Some(json!({ "fps": 8 })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let recording = parse_json(&body);
+    let recording_id = recording["id"].as_str().expect("recording id").to_string();
+    assert_eq!(recording["status"], "recording");
+
+    tokio::time::sleep(Duration::from_secs(2)).await;
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/recording/stop",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let stopped_recording = parse_json(&body);
+    assert_eq!(stopped_recording["id"], recording_id);
+    assert_eq!(stopped_recording["status"], "completed");
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/desktop/recordings",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert!(parse_json(&body)["recordings"].is_array());
+
+    let (status, headers, body) = send_request_raw(
+        &test_app.app,
+        Method::GET,
+        &format!("/v1/desktop/recordings/{recording_id}/download"),
+        None,
+        &[],
+        None,
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(
+        headers
+            .get(header::CONTENT_TYPE)
+            .and_then(|value| value.to_str().ok()),
+        Some("video/mp4")
+    );
+    assert!(body.windows(4).any(|window| window == b"ftyp"));
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/stream/start",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["active"], true);
+
+    let (mut ws, _) = connect_async(test_app.app.ws_url("/v1/desktop/stream/ws"))
+        .await
+        .expect("connect desktop stream websocket");
+
+    let ready = recv_ws_message(&mut ws).await;
+    match ready {
+        Message::Text(text) => {
+            let value: Value = serde_json::from_str(&text).expect("desktop stream ready frame");
+            assert_eq!(value["type"], "ready");
+            assert_eq!(value["width"], 1440);
+            assert_eq!(value["height"], 900);
+        }
+        other => panic!("expected text ready frame, got {other:?}"),
+    }
+
+    let frame = recv_ws_message(&mut ws).await;
+    match frame {
+        Message::Binary(bytes) => assert!(bytes.starts_with(&[0xff, 0xd8, 0xff])),
+        other => panic!("expected binary jpeg frame, got {other:?}"),
+    }
+
+    ws.send(Message::Text(
+        json!({
+            "type": "moveMouse",
+            "x": 320,
+            "y": 330
+        })
+        .to_string()
+        .into(),
+    ))
+    .await
+    .expect("send desktop stream mouse move");
+    let _ = ws.close(None).await;
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/stream/stop",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["active"], false);
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::DELETE,
+        &format!("/v1/desktop/recordings/{recording_id}"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::NO_CONTENT);
+
+    let (status, _, body) =
+        send_request(&test_app.app, Method::POST, "/v1/desktop/stop", None, &[]).await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["state"], "inactive");
+}
diff --git a/server/packages/sandbox-agent/tests/v1_api/processes.rs b/server/packages/sandbox-agent/tests/v1_api/processes.rs
new file mode 100644
index 0000000..136a51c
--- /dev/null
+++ b/server/packages/sandbox-agent/tests/v1_api/processes.rs
@@ -0,0 +1,742 @@
+use super::*;
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine;
+use futures::{SinkExt, StreamExt};
+use serial_test::serial;
+use tokio_tungstenite::connect_async;
+use tokio_tungstenite::tungstenite::Message;
+
+async fn wait_for_exited(test_app: &TestApp, process_id: &str) {
+    for _ in 0..30 {
+        let (status, _, body) = send_request(
+            &test_app.app,
+            Method::GET,
+            &format!("/v1/processes/{process_id}"),
+            None,
+            &[],
+        )
+        .await;
+        assert_eq!(status, StatusCode::OK);
+        let parsed = parse_json(&body);
+        if parsed["status"] == "exited" {
+            return;
+        }
+        tokio::time::sleep(Duration::from_millis(100)).await;
+    }
+
+    panic!("process did not exit in time");
+}
+
+fn decode_log_entries(entries: &[Value]) -> String {
+    entries
+        .iter()
+        .filter_map(|entry| entry.get("data").and_then(Value::as_str))
+        .filter_map(|encoded| BASE64.decode(encoded).ok())
+        .map(|bytes| String::from_utf8_lossy(&bytes).to_string())
+        .collect::<Vec<_>>()
+        .join("")
+}
+
+async fn recv_ws_message(
+    ws: &mut tokio_tungstenite::WebSocketStream<
+        tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>,
+    >,
+) -> Message {
+    tokio::time::timeout(Duration::from_secs(3), ws.next())
+        .await
+        .expect("timed out waiting for websocket frame")
+        .expect("websocket stream ended")
+        .expect("websocket frame")
+}
+
+#[tokio::test]
+async fn v1_processes_config_round_trip() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/processes/config",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["maxConcurrentProcesses"], 64);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/config",
+        Some(json!({
+            "maxConcurrentProcesses": 8,
+            "defaultRunTimeoutMs": 1000,
+            "maxRunTimeoutMs": 5000,
+            "maxOutputBytes": 4096,
+            "maxLogBytesPerProcess": 32768,
+            "maxInputBytesPerRequest": 1024
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["maxConcurrentProcesses"], 8);
+    assert_eq!(parsed["defaultRunTimeoutMs"], 1000);
+}
+
+#[tokio::test]
+async fn v1_process_lifecycle_requires_stop_before_delete() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "sleep 30"],
+            "tty": false,
+            "interactive": false
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::DELETE,
+        &format!("/v1/processes/{process_id}"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::CONFLICT);
+    assert_eq!(parse_json(&body)["status"], 409);
+
+    let (status, _, _body) = send_request(
+        &test_app.app,
+        Method::POST,
+        &format!("/v1/processes/{process_id}/stop"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+
+    wait_for_exited(&test_app, &process_id).await;
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::DELETE,
+        &format!("/v1/processes/{process_id}"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::NO_CONTENT);
+}
+
+#[tokio::test]
+async fn v1_process_run_returns_output_and_timeout() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "echo hi"],
+            "timeoutMs": 1000
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["timedOut"], false);
+    assert_eq!(parsed["exitCode"], 0);
+    assert!(parsed["stdout"].as_str().unwrap_or_default().contains("hi"));
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "sleep 2"],
+            "timeoutMs": 50
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["timedOut"], true);
+}
+
+#[tokio::test]
+async fn v1_process_run_reports_truncation() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/run",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "printf 'abcdefghijklmnopqrstuvwxyz'"],
+            "maxOutputBytes": 5
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let parsed = parse_json(&body);
+    assert_eq!(parsed["stdoutTruncated"], true);
+    assert_eq!(parsed["stderrTruncated"], false);
+    assert_eq!(parsed["stdout"].as_str().unwrap_or_default().len(), 5);
+}
+
+#[tokio::test]
+async fn v1_process_tty_input_and_logs() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "cat",
+            "tty": true,
+            "interactive": true
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    let (status, _, _body) = send_request(
+        &test_app.app,
+        Method::POST,
+        &format!("/v1/processes/{process_id}/input"),
+        Some(json!({
+            "data": "aGVsbG8K",
+            "encoding": "base64"
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+
+    tokio::time::sleep(Duration::from_millis(150)).await;
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        &format!("/v1/processes/{process_id}/logs?stream=pty&tail=20"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let entries = parse_json(&body)["entries"]
+        .as_array()
+        .cloned()
+        .unwrap_or_default();
+    assert!(!entries.is_empty());
+
+    let (status, _, _body) = send_request(
+        &test_app.app,
+        Method::POST,
+        &format!("/v1/processes/{process_id}/kill"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+
+    wait_for_exited(&test_app, &process_id).await;
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::DELETE,
+        &format!("/v1/processes/{process_id}"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::NO_CONTENT);
+}
+
+#[tokio::test]
+#[serial]
+async fn v1_processes_owner_filter_separates_user_and_desktop_processes() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "sleep 30"],
+            "tty": false,
+            "interactive": false
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let user_process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/desktop/start",
+        Some(json!({
+            "width": 1024,
+            "height": 768
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["state"], "active");
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/processes?owner=user",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let user_processes = parse_json(&body)["processes"]
+        .as_array()
+        .cloned()
+        .unwrap_or_default();
+    assert!(user_processes
+        .iter()
+        .any(|process| process["id"] == user_process_id));
+    assert!(user_processes
+        .iter()
+        .all(|process| process["owner"] == "user"));
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/processes?owner=desktop",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let desktop_processes = parse_json(&body)["processes"]
+        .as_array()
+        .cloned()
+        .unwrap_or_default();
+    assert!(desktop_processes.len() >= 2);
+    assert!(desktop_processes
+        .iter()
+        .all(|process| process["owner"] == "desktop"));
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::POST,
+        &format!("/v1/processes/{user_process_id}/kill"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+
+    let (status, _, body) =
+        send_request(&test_app.app, Method::POST, "/v1/desktop/stop", None, &[]).await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(parse_json(&body)["state"], "inactive");
+}
+
+#[tokio::test]
+async fn v1_process_not_found_returns_404() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/processes/does-not-exist",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::NOT_FOUND);
+    assert_eq!(parse_json(&body)["status"], 404);
+}
+
+#[tokio::test]
+async fn v1_process_input_limit_returns_413() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes/config",
+        Some(json!({
+            "maxConcurrentProcesses": 8,
+            "defaultRunTimeoutMs": 1000,
+            "maxRunTimeoutMs": 5000,
+            "maxOutputBytes": 4096,
+            "maxLogBytesPerProcess": 32768,
+            "maxInputBytesPerRequest": 4
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "cat",
+            "tty": true,
+            "interactive": true
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        &format!("/v1/processes/{process_id}/input"),
+        Some(json!({
+            "data": "aGVsbG8=",
+            "encoding": "base64"
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::PAYLOAD_TOO_LARGE);
+    assert_eq!(parse_json(&body)["status"], 413);
+}
+
+#[tokio::test]
+async fn v1_tty_process_is_real_terminal() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "tty"],
+            "tty": true,
+            "interactive": false
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    wait_for_exited(&test_app, &process_id).await;
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::GET,
+        &format!("/v1/processes/{process_id}/logs?stream=pty"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let entries = parse_json(&body)["entries"]
+        .as_array()
+        .cloned()
+        .unwrap_or_default();
+    let joined = decode_log_entries(&entries);
+    assert!(!joined.to_lowercase().contains("not a tty"));
+    assert!(joined.contains("/dev/"));
+}
+
+#[tokio::test]
+async fn v1_process_logs_follow_sse_streams_entries() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "sh",
+            "args": ["-lc", "echo first; sleep 0.3; echo second"],
+            "tty": false,
+            "interactive": false
+        })),
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    let response = reqwest::Client::new()
+        .get(test_app.app.http_url(&format!(
+            "/v1/processes/{process_id}/logs?stream=stdout&follow=true"
+        )))
+        .header("accept", "text/event-stream")
+        .send()
+        .await
+        .expect("sse response");
+    assert_eq!(response.status(), StatusCode::OK);
+
+    let mut stream = response.bytes_stream();
+    let chunk = tokio::time::timeout(Duration::from_secs(5), async move {
+        while let Some(chunk) = stream.next().await {
+            let bytes = chunk.expect("stream chunk");
+            let text = String::from_utf8_lossy(&bytes).to_string();
+            if text.contains("data:") {
+                return text;
+            }
+        }
+        panic!("SSE stream ended before log chunk");
+    })
+    .await
+    .expect("timed out reading process log sse");
+
+    let payload = parse_sse_data(&chunk);
+    assert!(payload["sequence"].as_u64().is_some());
+    assert_eq!(payload["stream"], "stdout");
+}
+
+#[tokio::test]
+async fn v1_access_token_query_only_allows_terminal_ws() {
+    let test_app = TestApp::new(AuthConfig::with_token("secret-token".to_string()));
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::GET,
+        "/v1/health?access_token=secret-token",
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::UNAUTHORIZED);
+
+    let (status, _, body) = send_request(
+        &test_app.app,
+        Method::POST,
+        "/v1/processes",
+        Some(json!({
+            "command": "cat",
+            "tty": true,
+            "interactive": true
+        })),
+        &[("authorization", "Bearer secret-token")],
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    let process_id = parse_json(&body)["id"]
+        .as_str()
+        .expect("process id")
+        .to_string();
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::GET,
+        &format!("/v1/processes/{process_id}/terminal/ws"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::UNAUTHORIZED);
+
+    let (status, _, _) = send_request(
+        &test_app.app,
+        Method::GET,
+        &format!("/v1/processes/{process_id}/terminal/ws?access_token=secret-token"),
+        None,
+        &[],
+    )
+    .await;
+    assert_eq!(status, StatusCode::BAD_REQUEST);
+}
+
+#[tokio::test]
+async fn v1_process_terminal_ws_e2e_is_deterministic() {
+    let test_app = TestApp::new(AuthConfig::disabled());
+    let live_server = LiveServer::spawn(test_app.app.clone()).await;
+    let http = reqwest::Client::new();
+
+    let create_response = http
+        .post(live_server.http_url("/v1/processes"))
+        .json(&json!({
+            "command": "sh",
+            "args": ["-lc", "stty -echo; IFS= read -r line; printf 'got:%s\\n' \"$line\""],
+            "tty": true,
+            "interactive": true
+        }))
+        .send()
+        .await
+        .expect("create process response");
+    assert_eq!(create_response.status(), reqwest::StatusCode::OK);
+    let create_body: Value = create_response.json().await.expect("create process json");
+    let process_id = create_body["id"].as_str().expect("process id").to_string();
+
+    let ws_url = live_server.ws_url(&format!("/v1/processes/{process_id}/terminal/ws"));
+    let (mut ws, _) = connect_async(&ws_url).await.expect("connect websocket");
+
+    let ready = recv_ws_message(&mut ws).await;
+    let ready_payload: Value =
+        serde_json::from_str(ready.to_text().expect("ready text frame")).expect("ready json");
+    assert_eq!(ready_payload["type"], "ready");
+    assert_eq!(ready_payload["processId"], process_id);
+
+    ws.send(Message::Text(
+        json!({
+            "type": "input",
+            "data": "hello from ws\n"
+        })
+        .to_string(),
+    ))
+    .await
+    .expect("send input frame");
+
+    let mut saw_binary_output = false;
+    let mut saw_exit = false;
+    for _ in 0..10 {
+        let frame = recv_ws_message(&mut ws).await;
+        match frame {
+            Message::Binary(bytes) => {
+                let text = String::from_utf8_lossy(&bytes);
+                if text.contains("got:hello from ws") {
+                    saw_binary_output = true;
+                }
+            }
+            Message::Text(text) => {
+                let payload: Value = serde_json::from_str(&text).expect("ws json");
+                if payload["type"] == "exit" {
+                    saw_exit = true;
+                    break;
+                }
+                assert_ne!(payload["type"], "error");
+            }
+            Message::Close(_) => break,
+            Message::Ping(_) | Message::Pong(_) => {}
+            _ => {}
+        }
+    }
+
+    assert!(
+        saw_binary_output,
+        "expected pty binary output over websocket"
+    );
+    assert!(saw_exit, "expected exit control frame over websocket");
+
+    let _ = ws.close(None).await;
+
+    let delete_response = http
+        .delete(live_server.http_url(&format!("/v1/processes/{process_id}")))
+        .send()
+        .await
+        .expect("delete process response");
+    assert_eq!(delete_response.status(), reqwest::StatusCode::NO_CONTENT);
+
+    live_server.shutdown().await;
+}
+
+#[tokio::test]
+async fn v1_process_terminal_ws_auth_e2e() {
+    let token = "secret-token";
+    let test_app = TestApp::new(AuthConfig::with_token(token.to_string()));
+    let live_server = LiveServer::spawn(test_app.app.clone()).await;
+    let http = reqwest::Client::new();
+
+    let create_response = http
+        .post(live_server.http_url("/v1/processes"))
+        .bearer_auth(token)
+        .json(&json!({
+            "command": "cat",
+            "tty": true,
+            "interactive": true
+        }))
+        .send()
+        .await
+        .expect("create process response");
+    assert_eq!(create_response.status(), reqwest::StatusCode::OK);
+    let create_body: Value = create_response.json().await.expect("create process json");
+    let process_id = create_body["id"].as_str().expect("process id").to_string();
+
+    let unauth_ws_url = live_server.ws_url(&format!("/v1/processes/{process_id}/terminal/ws"));
+    let unauth_err = connect_async(&unauth_ws_url)
+        .await
+        .expect_err("unauthenticated websocket handshake should fail");
+    match unauth_err {
+        tokio_tungstenite::tungstenite::Error::Http(response) => {
+            assert_eq!(response.status().as_u16(), 401);
+        }
+        other => panic!("unexpected websocket auth error: {other:?}"),
+    }
+
+    let auth_ws_url = live_server.ws_url(&format!(
+        "/v1/processes/{process_id}/terminal/ws?access_token={token}"
+    ));
+    let (mut ws, _) = connect_async(&auth_ws_url)
+        .await
+        .expect("authenticated websocket handshake");
+
+    let ready = recv_ws_message(&mut ws).await;
+    let ready_payload: Value =
+        serde_json::from_str(ready.to_text().expect("ready text frame")).expect("ready json");
+    assert_eq!(ready_payload["type"], "ready");
+    assert_eq!(ready_payload["processId"], process_id);
+
+    let _ = ws
+        .send(Message::Text(json!({ "type": "close" }).to_string()))
+        .await;
+    let _ = ws.close(None).await;
+
+    let kill_response = http
+        .post(live_server.http_url(&format!("/v1/processes/{process_id}/kill?waitMs=1000")))
+        .bearer_auth(token)
+        .send()
+        .await
+        .expect("kill process response");
+    assert_eq!(kill_response.status(), reqwest::StatusCode::OK);
+
+    let delete_response = http
+        .delete(live_server.http_url(&format!("/v1/processes/{process_id}")))
+        .bearer_auth(token)
+        .send()
+        .await
+        .expect("delete process response");
+    assert_eq!(delete_response.status(), reqwest::StatusCode::NO_CONTENT);
+
+    live_server.shutdown().await;
+}